Merge branch 'master' of http://8.140.253.224:3000/root/school_uni

package1/buyFood/buyFood.vue

@@ -361,7 +361,7 @@
 								alt=""
 								style="width: 90rpx;height: 90rpx;border-radius: 90rpx;margin: 0 auto;display: block;" />
 						</view>
-						<view class="kaituan22" v-for="n in groupItem.groupRule.groupCount - 1">
+						<view class="kaituan22" v-for="(n,index) in groupItem.groupRule.groupCount - 1" :key="index">
 							<view class="weipincheng">
 								+
 							</view>

package2/partTimeJob/partTimeJobCenter.vue

@@ -6,7 +6,7 @@
 					<uni-icons type="left" size="28"></uni-icons>
 				</view>
 				<view class="title-name" :style="{'padding-top': menuButtonInfo.top +'px'}">
-					兼职主页
+					待退款/售后{{returnCount}}
 				</view>
 			</view>
 		</view>
@@ -16,7 +16,7 @@
 					待退款/售后{{returnCount}}
 				</view>
 			</view> -->
-			<view class="box1" @tap="goDetail(item.id)" v-for="(item,index) in returnData" :key="index">
+			<view class="box1" v-for="(item,index) in returnData" :key="index">
 				<view style="display: flex;height: 50rpx;border-bottom: 1px solid #eee;">
 					<view style="display: flex;">
 						{{'#' + item.mallOrder.numberCode}}
@@ -43,9 +43,6 @@
 							查看订单
 						</view>
 					</view>
-					<view v-if="item.mallOrder.orderType != 1" @tap.stop="getGroupOrders(item.mallOrder.id)" class="pinzi">
-						拼
-					</view>
 					<view class="btn" @tap="returnAmountAllow(item,0)" style="background: rgba(0, 35, 28, 1);color: rgba(166, 255, 234, 1);">
 						不同意
 					</view>

package2/shop/merchantCenter.vue

@@ -188,10 +188,11 @@
 		},
 		onShow() {
 			this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
-		},
-		onLoad(option) {
 			this.getBusinessStatus()
 			this.getData()
+		},
+		onLoad(option) {
+			
 		},
 		methods: {
 			getData(){

package2/shop/orderDetail.vue

@@ -91,7 +91,7 @@
 							平台服务费
 						</view>
 						<view class="">
-							￥{{(data.chouyong).toFixed(2)}}
+							￥{{data.chouyong ?data.chouyong:0}}
 						</view>
 					</view>
 				</view>
@@ -139,7 +139,7 @@
 					预计收入
 				</view>
 				<view style="color: red;font-weight: 700;">
-					￥{{(data.yujishouru).toFixed(2)}}
+					￥{{data.yujishouru?data.yujishouru:0}}
 				</view>
 			</view>
 			<view style="margin-top: 20rpx;">
@@ -158,7 +158,7 @@
 					<text>{{data.groupInfo.targetMembers}}人团/</text><text>已拼{{data.groupInfo.currentMembers}}人</text>
 				</view>
 				<view class="kaituan2">
-					<view class="kaituan22" style="display: flex;">
+					<view class="kaituan22" style="display: flex;" v-if="data.groupInfo">
 						<view class="" @tap="goDetail(item)" v-for="(item,index) in data.groupInfo.groupIdList" :key="index" style="width: 90rpx;height: 90rpx;margin: 0 auto;position: relative;">
 							<view style="z-index: 99;position: absolute;top:0;width: 90rpx;height: 90rpx;border-radius: 90rpx;border:4rpx solid #48D1CC"></view>
 							<view style="">
@@ -225,13 +225,13 @@
 						//商家预计收入的计算
 						let price = that.data.goodsAmount+that.data.packageFee
 						if(that.data.orderType == 1){
-							that.data.chouyong = price/100 * uni.getStorageSync('shopTakeaway').commissionRateOne
+							that.data.chouyong = (price/100 * uni.getStorageSync('shopTakeaway').commissionRateOne).toFixed(2)
-							that.data.yujishouru = price - that.data.chouyong
+							that.data.yujishouru = (price - that.data.chouyong).toFixed(2)
 						}else{
-							that.data.chouyong = price/100 * uni.getStorageSync('shopTakeaway').commissionRateMore
+							that.data.chouyong = (price/100 * uni.getStorageSync('shopTakeaway').commissionRateMore).toFixed(2)
-							that.data.yujishouru = price - that.data.chouyong
+							that.data.yujishouru = (price - that.data.chouyong).toFixed(2)
 						}
-						if(that.data.groupInfo != null){
+						if(that.data.groupInfo != null && that.data.groupInfo != undefined){
 							that.data.groupInfo.groupIdList = that.data.groupInfo.groupOrderIds.split(',');
 						}
 						

package2/shop/shopOrderList.vue

@@ -201,7 +201,7 @@
 			if (this.searchForm.pageNum >= this.totalPages) return;
 			// this.status = 'loading';
 			this.searchForm.pageNum++;
-			this.getOrderList();
+			this.getList();
 		},
 		filters: {
 			formatISOTime(isoString) {