Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
c32b69ceaf
@ -2,22 +2,22 @@
|
|||||||
<view class="app">
|
<view class="app">
|
||||||
<u-navbar :is-back="false" :background="background" class="u-navbar">
|
<u-navbar :is-back="false" :background="background" class="u-navbar">
|
||||||
<image src="@/static/pagesB/fanhui.png" mode="" @tap="goprevious"></image>
|
<image src="@/static/pagesB/fanhui.png" mode="" @tap="goprevious"></image>
|
||||||
<view class="title" v-if="list.orderStatus=='WAIT_PAY'">待付款</view>
|
<view class="title" v-if="list.orderStatus=='WAIT_PAY'" @tap="goprevious">待付款</view>
|
||||||
<view class="title" v-if="list.orderStatus=='WAIT_REFUND'">退款中</view>
|
<view class="title" v-if="list.orderStatus=='WAIT_REFUND'" @tap="goprevious">退款中</view>
|
||||||
<view class="title" v-if="list.orderStatus=='CANCEL'">已取消</view>
|
<view class="title" v-if="list.orderStatus=='CANCEL'" @tap="goprevious">已取消</view>
|
||||||
<view class="title" v-if="list.orderStatus=='WAIT_RECEIVED_GOODS'">待接单</view>
|
<view class="title" v-if="list.orderStatus=='WAIT_RECEIVED_GOODS'" @tap="goprevious">待接单</view>
|
||||||
<!-- <view class="title" v-if="list.orderStatus=='WAIT_RECEIVED_GOODS'&&list.orderType !='HEALTH_CONSULTATION'">
|
<!-- <view class="title" v-if="list.orderStatus=='WAIT_RECEIVED_GOODS'&&list.orderType !='HEALTH_CONSULTATION'">
|
||||||
待收货</view> -->
|
待收货</view> -->
|
||||||
<!-- <view class="title" v-if="list.orderStatus=='WAIT_RECEIVED_GOODS'&&list.orderType =='HEALTH_CONSULTATION'">
|
<!-- <view class="title" v-if="list.orderStatus=='WAIT_RECEIVED_GOODS'&&list.orderType =='HEALTH_CONSULTATION'">
|
||||||
待咨询</view> -->
|
待咨询</view> -->
|
||||||
<view class="title" v-if="list.orderStatus=='COMPLETED'">待评价</view>
|
<view class="title" v-if="list.orderStatus=='COMPLETED'" @tap="goprevious">待评价</view>
|
||||||
<view class="title" v-if="list.orderStatus=='RECEIVED_GOODS'">待服务</view>
|
<view class="title" v-if="list.orderStatus=='RECEIVED_GOODS'" @tap="goprevious">待服务</view>
|
||||||
<view class="title" v-if="list.orderStatus=='EVALUATED'">已评价</view>
|
<view class="title" v-if="list.orderStatus=='EVALUATED'" @tap="goprevious">已评价</view>
|
||||||
|
|
||||||
<view class="title" v-if="list.orderStatus=='PAY'">待发货</view>
|
<view class="title" v-if="list.orderStatus=='PAY'" @tap="goprevious">待发货</view>
|
||||||
<view class="title" v-if="list.orderStatus=='REFUNDED'">已退款</view>
|
<view class="title" v-if="list.orderStatus=='REFUNDED'" @tap="goprevious">已退款</view>
|
||||||
<view class="title" v-if="list.orderStatus=='WAIT_RETURNED_GOODS'">待退货</view>
|
<view class="title" v-if="list.orderStatus=='WAIT_RETURNED_GOODS'" @tap="goprevious">待退货</view>
|
||||||
<view class="title" v-if="list.orderStatus=='RETURNED_GOODS'">退款成功</view>
|
<view class="title" v-if="list.orderStatus=='RETURNED_GOODS'" @tap="goprevious">退款成功</view>
|
||||||
|
|
||||||
</u-navbar>
|
</u-navbar>
|
||||||
|
|
||||||
@ -239,7 +239,6 @@
|
|||||||
})
|
})
|
||||||
},
|
},
|
||||||
goodsOrderinfo() {
|
goodsOrderinfo() {
|
||||||
// console.log(this.list.orderStatus, '444')
|
|
||||||
ssgoodsOrder(this.orderTypeList).then(
|
ssgoodsOrder(this.orderTypeList).then(
|
||||||
res => {
|
res => {
|
||||||
this.order = res.rows[0]
|
this.order = res.rows[0]
|
||||||
@ -247,7 +246,7 @@
|
|||||||
var time = new Date(ordertimes).getTime() / 1000 + (60 * 60 * 2)
|
var time = new Date(ordertimes).getTime() / 1000 + (60 * 60 * 2)
|
||||||
var times = new Date().getTime() / 1000
|
var times = new Date().getTime() / 1000
|
||||||
this.timestamp = time - times
|
this.timestamp = time - times
|
||||||
console.log(this.timestamp, '8585')
|
// console.log(this.timestamp, '8585')
|
||||||
if (this.timestamp >= 0) {
|
if (this.timestamp >= 0) {
|
||||||
this.timecount = this.timestamp
|
this.timecount = this.timestamp
|
||||||
this.Timers = setInterval(() => {
|
this.Timers = setInterval(() => {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user