1

pagesHome/order/detail.vue

@@ -635,7 +635,7 @@
 			toGroup() {
 				const that = this;
 				uni.navigateTo({
-					url: `/pagesHome/group/index?shop=${that.info.shop._id}&goods=${that.id}`
+					url: `/pagesHome/group/index?shop=${that.info?.shop?._id}&goods=${that.id}`
 				})
 			},
 			// 关闭弹框

pagesMy/order/afterInfo.vue

@@ -1,34 +1,6 @@
 <template>
 	<mobile-frame>
 		<view class="main">
-			<view class="goods" v-if="status == '0'">
-				<view class="url">
-					<image class="image"
-						:src="info.goods.goods.file&&info.goods.goods.file.length>0?info.goods.goods.file[0].url:''"
-						mode=""></image>
-				</view>
-				<view class="goodsname">
-					{{info.goods.goods.name}}
-					<view class="specs">
-						{{info.goods.name}}
-					</view>
-					<view class="other">
-						<text v-if="info.goods.gift.length>0" class="gift">赠品</text>
-						<text v-if="info.goods.sp_price" class="act">特价</text>
-					</view>
-				</view>
-				<view class="goodsother">
-					<view v-if="info.order_detail.type=='0'" class="price">
-						¥{{info.goods.price||info.goods.sell_money}}
-					</view>
-					<view v-else class="price">
-						¥{{info.goods.group_config.money}}
-					</view>
-					<view class="num">
-						×{{info.goods.buy_num}}
-					</view>
-				</view>
-			</view>
 			<view class="info">
 				<view class="one">
 					<view class="left">售后状态</view>
@@ -164,64 +136,6 @@
 		width: 100vw;
 		height: 100vh;
 
-		.goods {
-			display: flex;
-			border-bottom: 1px dashed #f1f1f1;
-			padding: 2vw;
-			width: 96vw;
-
-			.url {
-				width: 20vw;
-
-				.image {
-					width: 100%;
-					height: 20vw;
-					border-radius: 5px;
-
-				}
-			}
-
-			.goodsname {
-				display: flex;
-				flex-direction: column;
-				width: 60vw;
-				padding: 0 2vw;
-				font-size: 16px;
-
-				.specs {
-					color: var(--f85Color);
-					font-size: var(--font12Size);
-				}
-
-				.other {
-					display: flex;
-					padding: 1vw 0 0 0;
-
-					.gift {
-						margin: 0 1vw 0 0;
-						font-size: 12px;
-						color: #FFA500;
-						border: 1px solid #FFA500;
-						border-radius: 5px;
-						padding: 0 1vw;
-					}
-
-					.act {
-						font-size: 12px;
-						border: 1px solid var(--fFB1Color);
-						color: var(--fFB1Color);
-						border-radius: 5px;
-						padding: 0 1vw;
-					}
-				}
-			}
-
-			.goodsother {
-				width: 15vw;
-				text-align: right;
-			}
-		}
-
 		.info {
 			padding: 2vw;
 

pagesMy/order/all.vue

@@ -6,7 +6,7 @@
 					<view class="tabsList">
 						<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage">
 							<view class="list-scroll-view">
-								<view class="one_1">
+								<view class="one_1" v-if="tabs.active=='1'">
 									<button size="mini" @tap="toDislog">查询条件</button>
 								</view>
 								<view class="one_2">
@@ -315,6 +315,15 @@
 					type: '1'
 				})
 			},
+			// 状态选择
+			statusChange(e) {
+				const that = this;
+				let data = that.statusList[e.detail.value];
+				if (data) {
+					that.$set(that.searchInfo, `status`, data.value);
+					that.$set(that, `status_name`, data.label);
+				}
+			},
 			// 订单详细信息
 			toView(item, type) {
 				const that = this;
@@ -325,7 +334,7 @@
 					})
 				} else {
 					uni.navigateTo({
-						url: `/pagesMy/order/info?id=${item._id}`
+						url: `/pagesMy/order/info?id=${item._id}&status=${item.status}`
 					})
 				}
 			},