1

pages/my/index.vue

@@ -20,7 +20,7 @@
 					</view>
 					<text class="link">|</text>
 					<view class="one_2_1" @click="toCommon('pagesMy/collection/shop')">
-						<text v-if="user._id">{{shop_name||0}}</text>
+						<text v-if="user._id">{{shop_num||0}}</text>
 						<text>收藏的店铺</text>
 					</view>
 				</view>
@@ -136,7 +136,7 @@
 				// 收藏商品
 				market_num: '',
 				// 收藏店铺
-				shop_name: ''
+				shop_num: ''
 			};
 		},
 		onShow: async function() {
@@ -155,7 +155,6 @@
 					key: 'token',
 					success: async (res) => {
 						let user = that.$jwt(res.data);
-						that.$set(that, `user`, user);
 						if (user && user._id) {
 							let arr;
 							// 查询用户信息

pagesMy/order/index.vue

@@ -12,7 +12,8 @@
 								<view class="list_1" v-if="tabs.active=='-0'">
 									全部订单
 								</view>
-								<view class="list_2" v-for="(item,index) in list" :key="index" v-else-if="tabs.active=='0'" @tap="toInfo(item)">
+								<view class="list_2" v-for="(item,index) in list" :key="index"
+									v-else-if="tabs.active=='0'" @tap="toInfo(item)">
 									<view class="status">
 										{{item.status=='0'?'待付款':item.status=='1'?'已支付':item.status=='-1'?'取消订单':item.status=='2'?'发货中':item.status=='-2'?'已退款':item.status=='3'?'已收货':item.status=='-3'?'申请售后':item.status=='-4'?'正在售后中':item.status=='-5'?'售后已结束':'未识别'}}
 									</view>
@@ -26,7 +27,9 @@
 										<view class="goods_2">
 											<view class="market" v-for="(tags,indexss) in tag.goods" :key="indexss">
 												<view class="url">
-													<image class="image" :src="tags.goods.file&&tags.goods.file.length>0?tags.goods.file[0].url:''" mode=""></image>
+													<image class="image"
+														:src="tags.goods.file&&tags.goods.file.length>0?tags.goods.file[0].url:''"
+														mode=""></image>
 												</view>
 												<view class="goodsname">
 													{{tags.name}}
@@ -47,13 +50,20 @@
 										<text>总价¥{{item.total_detail.goods_total}}</text>
 									</view>
 									<view class="btn">
-										<button class="toCancel" v-if="item.status=='0'" type="default" size="mini" @tap.stop="toCancel(item)">取消订单</button>
-										<button class="toPay" v-if="item.status=='0'" type="default" size="mini" @tap.stop="toPay(item)">付款</button>
-										<button class="toAfter" v-if="item.status!='0'" type="default" size="mini" @tap.stop="toAfter(item)">申请售后</button>
-										<button class="toAfter" v-if="item.status=='3'" type="default" size="mini" @tap.stop="toAfter(item)">申请退款</button>
+										<button class="toCancel" v-if="item.status=='0'" type="default" size="mini"
+											@tap.stop="toCancel(item)">取消订单</button>
+										<button class="toPay" v-if="item.status=='0'" type="default" size="mini"
+											@tap.stop="toPay(item)">付款</button>
+										<button class="toConfirm" v-if="item.status=='2'" type="default" size="mini"
+											@tap.stop="toConfirm(item)">确认收货</button>
+										<button class="toAfter" v-if="item.status!='0'" type="default" size="mini"
+											@tap.stop="toAfter(item)">申请售后</button>
+										<button class="toAfter" v-if="item.status=='3'" type="default" size="mini"
+											@tap.stop="toAfter(item)">申请退款</button>
 									</view>
 								</view>
-								<view class="list_2 list_3" v-for="(item,index) in list" :key="index" @tap="toInfo(item)" v-else>
+								<view class="list_2 list_3" v-for="(item,index) in list" :key="index"
+									@tap="toInfo(item)" v-else>
 									<view class="list_3_1">
 										<view class="goods_1">
 											<view class="shopname">
@@ -69,7 +79,9 @@
 										<view class="goods_2">
 											<view class="market">
 												<view class="url">
-													<image class="image" :src="tag.goods.file&&tag.goods.file.length>0?tag.goods.file[0].url:''" mode=""></image>
+													<image class="image"
+														:src="tag.goods.file&&tag.goods.file.length>0?tag.goods.file[0].url:''"
+														mode=""></image>
 												</view>
 												<view class="goodsname">
 													{{tag.name}}
@@ -90,11 +102,18 @@
 										<text>总价¥{{item.total_detail.goods_total}}</text>
 									</view>
 									<view class="btn">
-										<button class="toCancel" v-if="item.status=='2'||item.status=='3'" type="default" size="mini" @tap.stop="toLogi(item)">查看物流</button>
-										<button class="toCancel" v-if="item.status=='0'" type="default" size="mini" @tap.stop="toCancel(item)">取消订单</button>
-										<button class="toPay" v-if="item.status=='0'" type="default" size="mini" @tap.stop="toPay(item)">付款</button>
-										<button class="toAfter" v-if="item.status!='0'" type="default" size="mini" @tap.stop="toAfter(item)">申请售后</button>
-										<button class="toAfter" v-if="item.status=='3'" type="default" size="mini" @tap.stop="toAfter(item)">申请退款</button>
+										<button class="toCancel" v-if="item.status=='2'||item.status=='3'"
+											type="default" size="mini" @tap.stop="toLogi(item)">查看物流</button>
+										<button class="toCancel" v-if="item.status=='0'" type="default" size="mini"
+											@tap.stop="toCancel(item)">取消订单</button>
+										<button class="toPay" v-if="item.status=='0'" type="default" size="mini"
+											@tap.stop="toPay(item)">付款</button>
+										<button class="toConfirm" v-if="item.status=='2'" type="default" size="mini"
+											@tap.stop="toConfirm(item)">确认收货</button>
+										<button class="toAfter" v-if="item.status!='0'" type="default" size="mini"
+											@tap.stop="toAfter(item)">申请售后</button>
+										<button class="toAfter" v-if="item.status=='3'" type="default" size="mini"
+											@tap.stop="toAfter(item)">申请退款</button>
 									</view>
 								</view>
 							</view>
@@ -322,6 +341,34 @@
 					fail: function(err) {}
 				})
 			},
+			// 确认收货
+			toConfirm(e) {
+				const that = this;
+				uni.showModal({
+					title: '提示',
+					content: '确定确认收货吗?',
+					success: async function(res) {
+						if (res.confirm) {
+							const arr = await that.$api(`/orderDetail/${e._id}`, 'POST', {
+								status: '3'
+							});
+							if (arr.errcode == '0') {
+								uni.showToast({
+									title: '确认收货成功',
+									icon: 'none'
+								})
+								that.clearPage();
+								that.search();
+							} else {
+								uni.showToast({
+									title: arr.errmsg,
+									icon: 'none'
+								})
+							}
+						}
+					}
+				});
+			},
 			// 申请售后 申请退款
 			toAfter(e) {
 				if (e.status == '3') {