|
|
@@ -12,8 +12,7 @@
|
|
|
<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>
|
|
|
@@ -27,9 +26,7 @@
|
|
|
<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.goods.name}}
|
|
|
@@ -56,20 +53,14 @@
|
|
|
<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="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>
|
|
|
+ <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">
|
|
|
@@ -85,9 +76,7 @@
|
|
|
<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.goods.name}}
|
|
|
@@ -114,18 +103,12 @@
|
|
|
<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="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>
|
|
|
+ <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>
|
|
|
@@ -310,11 +293,13 @@
|
|
|
success: async function(res) {
|
|
|
// 微信小程序支付
|
|
|
if (res.data.uniPlatform == "mp-weixin") {
|
|
|
+ uni.showLoading({
|
|
|
+ title: '加载中'
|
|
|
+ })
|
|
|
const res = await that.$api('/pay/toPayOrder', 'POST', {
|
|
|
order_id: e,
|
|
|
type: '0'
|
|
|
})
|
|
|
- console.log(res);
|
|
|
uni.requestPayment({
|
|
|
"provider": "wxpay",
|
|
|
...res.data,
|
|
|
@@ -323,12 +308,15 @@
|
|
|
title: '支付成功',
|
|
|
icon: 'none'
|
|
|
})
|
|
|
+ uni.hideLoading();
|
|
|
that.clearPage();
|
|
|
that.search();
|
|
|
},
|
|
|
fail(e) {
|
|
|
console.log('in fail');
|
|
|
- console.log(e)
|
|
|
+ uni.hideLoading();
|
|
|
+ that.clearPage();
|
|
|
+ that.search();
|
|
|
}
|
|
|
})
|
|
|
} else if (res.data.uniPlatform == "app") {
|
