|
@@ -12,7 +12,7 @@
|
|
|
@click="viewRow(item)">
|
|
|
<view class="check-row">
|
|
|
<view class="createDate">{{item.createDate}}</view>
|
|
|
- <view>{{item.orderState}}</view>
|
|
|
+ <view>{{item.orderStateDictValue}}</view>
|
|
|
</view>
|
|
|
<view class="bundle-list" v-for="row in item.orderGoodsList" :key="row.id">
|
|
|
<view class="img-cont">
|
|
@@ -31,27 +31,27 @@
|
|
|
<text class="total-text">
|
|
|
共{{item.goodsNum}}件商品
|
|
|
</text>
|
|
|
- <text v-if="item.orderState=='待支付'"><text class="money-total">应付</text><text class="price-num">{{item.originalGold}}</text>
|
|
|
+ <text v-if="item.orderStateDictValue=='待支付'"><text class="money-total">应付</text><text class="price-num">{{item.originalGold}}</text>
|
|
|
<text class="price-text">乐豆</text></text>
|
|
|
<text v-else><text class="money-total">实付</text><text class="price-num">{{item.payGold}}</text> <text class="price-text">乐豆</text></text>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="check-row">
|
|
|
- <view v-if="item.orderState=='WAIT_PAY'" class="text-right left-time">
|
|
|
+ <view v-if="item.orderStateDictValue=='待支付'" class="text-right left-time">
|
|
|
<text style="margin-right: 20upx;">
|
|
|
支付剩余
|
|
|
</text>
|
|
|
<u-count-down @end="getRow" style="margin-right: 20upx;" separator ="zh" :timestamp="filterTime(item.orderTime)" :show-days="false" :show-hours="false"></u-count-down>
|
|
|
<u-button :custom-style="btnStyle" @click="toPay(item)" shape="circle" type="error" size="medium">去支付</u-button>
|
|
|
</view>
|
|
|
- <view v-if="item.orderState=='WAIT_SEND'" class="text-right">
|
|
|
+ <view v-if="item.orderStateDictValue=='待发货'" class="text-right">
|
|
|
<u-button :custom-style="btnStyle" @click="showTip" shape="circle" size="medium">提醒发货</u-button>
|
|
|
</view>
|
|
|
- <view v-if="item.orderState=='SEND_ALL'" class="text-right">
|
|
|
+ <view v-if="item.orderStateDictValue=='已发货'" class="text-right">
|
|
|
<u-button @click="showLog(item)" :custom-style="btnStyle" style="margin-right: 20upx;" shape="circle" size="medium">查看物流</u-button>
|
|
|
<u-button :custom-style="btnStyle" shape="circle" type="primary" size="medium">确认收货</u-button>
|
|
|
</view>
|
|
|
- <view v-if="item.orderState=='FINISH'" class="text-right">
|
|
|
+ <view v-if="item.orderStateDictValue=='已完成'" class="text-right">
|
|
|
<u-button @click="showLog(item)" :custom-style="btnStyle" shape="circle" size="medium">查看物流</u-button>
|
|
|
</view>
|
|
|
</view>
|
|
@@ -340,10 +340,13 @@
|
|
|
this.btnLoading = false
|
|
|
if(res.status == 200) {
|
|
|
this.showLeavePsw = false
|
|
|
- // 跳转到支付完成界面
|
|
|
- uni.navigateTo({
|
|
|
- url:"/pages/toOrder/payFinish?id=" + this.orderId
|
|
|
- })
|
|
|
+ setTimeout(()=>{
|
|
|
+ // 跳转到支付完成界面
|
|
|
+ uni.navigateTo({
|
|
|
+ url:"/pages/toOrder/payFinish?id=" + this.orderId
|
|
|
+ })
|
|
|
+ },300)
|
|
|
+
|
|
|
} else{
|
|
|
uni.showToast({
|
|
|
title: res.message,
|