Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
5ac1194b19
@ -5,7 +5,7 @@
|
||||
{{item.createTime}}
|
||||
<span>{{item.orderStatus=='WAIT_PAY'?'待付款':''}}
|
||||
{{item.orderStatus=='PAY'?'已付款':''}}
|
||||
{{item.orderStatus=='WAIT_DISPATCH'?'待派单':''}}
|
||||
{{item.orderStatus=='WAIT_DISPATCH'?'待服务':''}}
|
||||
{{item.orderStatus=='NOT_FINISH'?'待完成':''}}
|
||||
{{item.orderStatus=='COMPLETE'?'服务完成':''}}
|
||||
{{item.orderStatus=='WAIT_REFUND'?'退款中':''}}
|
||||
@ -28,11 +28,12 @@
|
||||
<view class="submit" @tap='buy(item)' style="background-color:coral;" v-if="item.orderStatus=='WAIT_PAY'">
|
||||
去支付
|
||||
</view>
|
||||
<view class="submit" style="background-color: crimson;" v-if="item.orderStatus=='WAIT_REFUND'">退款进度</view>
|
||||
<view class="submit"
|
||||
<view class="submit" style="background-color: crimson;" v-if="item.orderStatus=='WAIT_REFUND'"
|
||||
@tap="gorefund()">退款进度</view>
|
||||
<!-- <view class="submit"
|
||||
v-if="item.orderStatus=='PAY'||item.orderStatus=='WAIT_DISPATCH'||item.orderStatus=='NOT_FINISH'">
|
||||
确认完成
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@ -80,6 +81,11 @@
|
||||
url: `/pages/ServiceDetails/ServiceDetails?stationId=${item.stationId}&stationItemId=${item.stationItemId}&stationItemPriceId=${item.stationItemPriceId}&orderNo=${item.orderNo}&orderStatus=${item.orderStatus}`
|
||||
})
|
||||
},
|
||||
gorefund() {
|
||||
uni.navigateTo({
|
||||
url: `/pages/ServiceDetails/ServiceDetails?stationId=${item.stationId}&stationItemId=${item.stationItemId}&stationItemPriceId=${item.stationItemPriceId}&orderNo=${item.orderNo}&orderStatus=${item.orderStatus}`
|
||||
})
|
||||
},
|
||||
},
|
||||
onReachBottom() { //下滑加载
|
||||
if (this.list.length >= this.total) {} else {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user