guhongwei %!s(int64=2) %!d(string=hai) anos
pai
achega
33e30c9545
Modificáronse 1 ficheiros con 45 adicións e 33 borrados
  1. 45 33
      pagesMy/order/index.vue

+ 45 - 33
pagesMy/order/index.vue

@@ -14,7 +14,7 @@
 								</view>
 								<view class="list_2" v-for="(item,index) in list" :key="index" v-else-if="tabs.active=='0'">
 									<view class="status">
-										{{item.status=='0'?'待付款':'已付款'}}
+										{{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>
 									<view class="goods" v-for="(tag,indexs) in item.goods" :key="indexs">
 										<view class="goods_1">
@@ -53,48 +53,47 @@
 										<button class="toRefund" v-if="item.status=='3'" type="default" size="mini" @click="toRefund(item)">申请退款</button>
 									</view>
 								</view>
-								<view class="list_3" v-else>
-									其他情况
-								</view>
-								<!-- 	<view class="list" v-for="(item,index) in list" :key="index">
-									<view class="list_1">
-										<view class="l">
-											<text class="iconfont icon-shangdian"></text>
-											<text>{{item.shop}}</text>
-										</view>
-										<view class="r">
-											{{item.status=='0'?'待付款':'已付款'}}
-										</view>
+								<view class="list_2" v-for="(item,index) in list" :key="index" v-else>
+									<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>
-									<view class="list_2">
-										<view class="l">
-											<image class="image" :src="item.url&&item.url.length>0?item.url[0].url:''" mode=""></image>
-										</view>
-										<view class="c">
-											<view class="name">
-												{{item.name}}
+									<view class="goods" v-for="(tag,indexs) in item.order.goods" :key="indexs">
+										<view class="goods_1">
+											<view class="shopname">
+												<text class="iconfont icon-shangdian"></text>
+												<text>{{tag.shop_name}}</text>
 											</view>
 										</view>
-										<view class="r">
-											<view class="price">
-												¥{{item.price}}
-											</view>
-											<view class="num">
-												×{{item.buy_num}}
+										<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>
+												</view>
+												<view class="goodsname">
+													{{tags.name}}
+												</view>
+												<view class="goodsother">
+													<view class="price">
+														¥{{tags.sell_money}}
+													</view>
+													<view class="num">
+														×{{tags.buy_num}}
+													</view>
+												</view>
 											</view>
 										</view>
 									</view>
 									<view class="other">
-										<text>共{{item.market_num}}件商品</text>
+										<text>共{{item.total_detail.freight_total}}件商品</text>
 										<text>总价¥{{item.total_detail.goods_total}}</text>
 									</view>
 									<view class="btn">
-										<button v-if="item.status=='0'" type="default" @click="toCancel(item)" size="mini">取消订单</button>
-										<button v-if="item.status=='0'" type="default" @click="toPay(item)" size="mini">付款</button>
-										<button v-if="item.status=='3'" type="default" @click="toAfter(item)" size="mini">申请售后</button>
-										<button v-if="item.status=='3'" type="default" @click="toRefund(item)" size="mini">申请退款</button>
+										<button class="toCancel" v-if="item.status=='0'" type="default" size="mini" @click="toCancel(item)">取消订单</button>
+										<button class="toPay" v-if="item.status=='0'" type="default" size="mini" @click="toPay(item)">付款</button>
+										<button class="toAfter" v-if="item.status=='3'" type="default" size="mini" @click="toAfter(item)">申请售后</button>
+										<button class="toRefund" v-if="item.status=='3'" type="default" size="mini" @click="toRefund(item)">申请退款</button>
 									</view>
-								</view> -->
+								</view>
 							</view>
 						</scroll-view>
 					</view>
@@ -195,7 +194,19 @@
 						});
 					}
 				} else {
-
+					const res = await that.$api(`/orderDetail`, 'GET', {
+						status: that.status,
+						customer: user._id
+					});
+					if (res.errcode == '0') {
+						let list = [...that.list, ...res.data];
+						that.$set(that, `list`, list)
+						that.$set(that, `total`, res.total)
+					} else {
+						uni.showToast({
+							title: res.errmsg,
+						});
+					}
 				}
 			},
 			// 分页
@@ -313,6 +324,7 @@
 				const that = this;
 				that.$set(that.tabs, `active`, e.active)
 				that.$set(that, `status`, e.active);
+				that.clearPage();
 				that.search()
 			},
 			// 清空列表