1

package2/group/groupBuySingle.vue

@@ -838,6 +838,7 @@
 				navigatingFromPayPopup: false,
 				freeOrderEffectVisible: false,
 				freeOrderAmount: '0.00',
+				pendingFreeOrderAutoPay: false,
 				popupPageStyle: '',
 				bottomPopupOpenCount: 0
 			}
@@ -1825,15 +1826,15 @@
 						this.createdOrderInfo = res.result;
 						if (res.result.isFreeOrder == 1) {
 							this.showFreeOrderEffect(res.result);
-						}
+							this.pendingFreeOrderAutoPay = !!autoPay;
-						this.pendingPaySpecChoices = null;
+						} else if (autoPay) {
-						if (autoPay) {
 							this.$nextTick(() => {
 								this.wxPayment();
 							});
 						} else {
 							this.$refs.payPopup.open('bottom');
 						}
+						this.pendingPaySpecChoices = null;
 						if (this.$refs.pintuanPopup) this.$refs.pintuanPopup.close();
 					} else {
 						uni.showToast({
@@ -1859,6 +1860,12 @@
 			},
 			closeFreeOrderEffect() {
 				this.freeOrderEffectVisible = false;
+				if (this.pendingFreeOrderAutoPay) {
+					this.pendingFreeOrderAutoPay = false;
+					this.$nextTick(() => {
+						this.wxPayment();
+					});
+				}
 			},
 			addToCart(item, specs) {
 				let specStr = specs ? JSON.stringify(specs) : '';

package2/group/shopEvaluate.vue

@@ -54,7 +54,7 @@
 						</view>
 					</view>
 					<view class="eval-content">
-						<view class="goods-list" v-if="item.goodsList && item.goodsList.length > 0">
+						<!-- <view class="goods-list" v-if="item.goodsList && item.goodsList.length > 0">
 							<view class="goods-card" v-for="(goods,goodsIndex) in item.goodsList" :key="goodsIndex">
 								<image class="goods-img" :src="goods.productPicture" mode="aspectFill"></image>
 								<view class="goods-info">
@@ -66,7 +66,7 @@
 									</view>
 								</view>
 							</view>
-						</view>
+						</view> -->
 						<view style="display: flex;height: 50rpx;line-height: 50rpx;font-size: 24rpx;">
 							
 							<view style="padding: 12rpx 0 0 10rpx;">

package2/shop/afterService.vue

@@ -75,7 +75,7 @@
 								<view class="contact-btn" @tap.stop="openContactPopup(item)">联系</view>
 							</view>
 						</view>
-						<view style="text-align: right;">退款金额: <text style="color:red;font-size: 34rpx;font-weight: 700;">￥{{item.refundAmount}}</text></view>
+						<view style="text-align: right;">退款/售后金额: <text style="color:red;font-size: 34rpx;font-weight: 700;">￥{{item.settlementAmount || item.refundAmount}}</text></view>
 					</view>
 				</view>
 				<view style="height: 80rpx;border-top: 1px solid #eee;display: flex;">
@@ -182,12 +182,12 @@
 						<text>联系用户</text>
 						<text class="contact-popup-phone">{{contactItem.mallOrder.receiverPhone}}</text>
 					</view>
-					<view class="contact-popup-item" v-if="contactItem.mallOrder && contactItem.mallOrder.shopPhone"
+					<view class="contact-popup-item" v-if="contactItem.mallOrder && contactItem.mallOrder.shopPhone && type=='worker'"
 						@tap="makeCall(contactItem.mallOrder.shopPhone)">
 						<text>联系商家</text>
 						<text class="contact-popup-phone">{{contactItem.mallOrder.shopPhone}}</text>
 					</view>
-					<view class="contact-popup-item" v-if="contactItem.mallOrder && contactItem.mallOrder.deliveryType == 1 && contactItem.mallDeliveryOrder && contactItem.mallDeliveryOrder.workerPhone"
+					<view class="contact-popup-item" v-if="contactItem.mallOrder && contactItem.mallOrder.deliveryType == 1 && contactItem.mallDeliveryOrder && contactItem.mallDeliveryOrder.workerPhone  && type!='worker'"
 						@tap="makeCall(contactItem.mallDeliveryOrder.workerPhone)">
 						<text>联系配送员</text>
 						<text class="contact-popup-phone">{{contactItem.mallDeliveryOrder.workerPhone}}</text>
@@ -220,7 +220,8 @@
 					pageSize:100,
 					statusList:[0,3],
 					startDate:'',
-					endDate:''
+					endDate:'',
+					orderDesc:false
 				},
 				type:'worker',
 				mode:'pending',
@@ -289,9 +290,11 @@
 			if(this.mode == 'record'){
 				this.searchCountForm.statusList = [1,2,4,5]
 				this.searchCountForm.pageSize = 10
+				this.searchCountForm.orderDesc = true
 			}else{
 				this.searchCountForm.statusList = [0,3]
 				this.searchCountForm.pageSize = 100
+				this.searchCountForm.orderDesc = false
 			}
 			this.getReturnCount()
 		},
@@ -606,20 +609,20 @@
 	}
 
 	.after-service-fixed-holder {
-		height: 260rpx;
+		height: 170rpx;
 	}
 
 	.title {
 		background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/8bc15960c2dc40268e295d6dd23aecce.png') no-repeat;
 		width: 100%;
-		height: 260rpx;
+		height: 170rpx;
 		background-size: 100% 100%;
 	}
 
 	.title-sreach {
 		width: 100%;
 		display: flex;
-		height: 200rpx;
+		height: 120rpx;
 		position: relative;
 	}
 
@@ -630,14 +633,14 @@
 	}
 
 	.title-name {
-		padding-top: 110rpx;
+		padding-top: 88rpx;
 		font-size: 36rpx;
 		font-weight: 700;
 		flex: 1;
 		text-align: center;
 	}
 	.content{
-		margin: 20rpx auto 0;
+		margin: 0 auto;
 		padding-bottom: 60rpx;
 	}
 	.record-search {