zs 2 years ago
parent
commit
f58ee9b415
5 changed files with 66 additions and 10 deletions
  1. 9 3
      pagesMy/order/after.vue
  2. 17 2
      pagesMy/order/index.vue
  3. 23 2
      pagesMy/order/info.vue
  4. 7 0
      pagesMy/order/noService.vue
  5. 10 3
      pagesMy/order/service.vue

+ 9 - 3
pagesMy/order/after.vue

@@ -7,7 +7,7 @@
 			<view class="two">
 				<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage">
 					<view class="list-scroll-view">
-						<view class="list" v-for="(item,index) in list" :key="index">
+						<view class="list" v-for="(item,index) in list" :key="index" @tap="toInfo(item)">
 							<view class="list_1">
 								<view class="shopname">
 									<text class="iconfont icon-shangdian"></text>
@@ -39,9 +39,9 @@
 								</view>
 							</view>
 							<view class="btn">
-								<button type="default" size="mini" @click="toCancel(item)">取消售后</button>
+								<button type="default" size="mini" @tap.stop="toCancel(item)">取消售后</button>
 								<button v-if="item.type!='0'" type="default" size="mini"
-									@click="toRevise(item)">维护信息</button>
+									@tap.stop="toRevise(item)">维护信息</button>
 							</view>
 						</view>
 					</view>
@@ -73,6 +73,12 @@
 			await that.watchLogin();
 		},
 		methods: {
+			// 订单详细
+			toInfo(item) {
+				uni.navigateTo({
+					url: `/pagesMy/order/info?id=${item.order_detail._id}&status=${item.order_detail.status}`
+				})
+			},
 			// 维护信息
 			toRevise(e) {
 				uni.navigateTo({

+ 17 - 2
pagesMy/order/index.vue

@@ -32,7 +32,10 @@
 														mode=""></image>
 												</view>
 												<view class="goodsname">
-													{{tags.name}}
+													{{tags.goods.name}}
+													<view class="specs">
+														{{tags.name}}
+													</view>
 												</view>
 												<view class="goodsother">
 													<view v-if="item.type=='0'" class="price">
@@ -87,7 +90,10 @@
 														mode=""></image>
 												</view>
 												<view class="goodsname">
-													{{tag.name}}
+													{{tag.goods.name}}
+													<view class="specs">
+														{{tag.name}}
+													</view>
 												</view>
 												<view class="goodsother">
 													<view v-if="item.type=='0'" class="price">
@@ -485,10 +491,19 @@
 								}
 
 								.goodsname {
+									display: flex;
+									flex-direction: column;
 									width: 60vw;
 									padding: 0 2vw;
+
+									.specs {
+										color: var(--f85Color);
+										font-size: var(--font12Size);
+									}
 								}
 
+
+
 								.goodsother {
 									width: 15vw;
 									text-align: right;

+ 23 - 2
pagesMy/order/info.vue

@@ -39,7 +39,10 @@
 													mode=""></image>
 											</view>
 											<view class="goodsname">
-												{{tag.name}}
+												{{tag.goods.name}}
+												<view class="specs">
+													{{tag.name}}
+												</view>
 											</view>
 											<view class="goodsother">
 												<view v-if="info.type=='0'" class="price">
@@ -69,7 +72,10 @@
 												mode=""></image>
 										</view>
 										<view class="goodsname">
-											{{item.name}}
+											{{item.goods.name}}
+											<view class="specs">
+												{{item.name}}
+											</view>
 										</view>
 										<view class="goodsother">
 											<view v-if="info.type=='0'" class="price">
@@ -264,9 +270,17 @@
 								}
 
 								.goodsname {
+									display: flex;
+									flex-direction: column;
 									width: 60vw;
 									padding: 0 2vw;
 									font-size: 16px;
+
+									.specs {
+										color: var(--f85Color);
+										font-size: var(--font12Size);
+									}
+
 								}
 
 								.goodsother {
@@ -309,9 +323,16 @@
 							}
 
 							.goodsname {
+								display: flex;
+								flex-direction: column;
 								width: 60vw;
 								padding: 0 2vw;
 								font-size: 16px;
+
+								.specs {
+									color: var(--f85Color);
+									font-size: var(--font12Size);
+								}
 							}
 
 							.goodsother {

+ 7 - 0
pagesMy/order/noService.vue

@@ -14,6 +14,9 @@
 						</view>
 						<view class="c">
 							<view class="name">
+								{{item.goods.name}}
+							</view>
+							<view class="specs">
 								{{item.name}}
 							</view>
 						</view>
@@ -160,6 +163,10 @@
 					.c {
 						width: 50vw;
 						padding: 0 2vw;
+						.specs{
+							color: var(--f85Color);
+							font-size: var(--font12Size);
+						}
 					}
 
 					.r {

+ 10 - 3
pagesMy/order/service.vue

@@ -14,15 +14,18 @@
 						</view>
 						<view class="c">
 							<view class="name">
+								{{info.goods.name}}
+							</view>
+							<view class="specs">
 								{{info.name}}
 							</view>
 						</view>
 						<view class="r">
-							<view v-if="item.type=='0'" class="price">
-								¥{{item.sell_money}}
+							<view v-if="info.type=='0'" class="price">
+								¥{{info.sell_money}}
 							</view>
 							<view v-else class="price">
-								¥{{item.group_config.money}}
+								¥{{info.group_config.money}}
 							</view>
 							<view class="num">
 								×{{info.buy_num}}
@@ -330,6 +333,10 @@
 					.c {
 						width: 50vw;
 						padding: 0 2vw;
+						.specs{
+							color: var(--f85Color);
+							font-size: var(--font12Size);
+						}
 					}
 
 					.r {