|
|
@@ -139,7 +139,7 @@
|
|
|
|
|
|
<view class="bottomHeight"></view>
|
|
|
|
|
|
- <view class="bottom1 flex-col" v-if="order.orderStatus == 6">
|
|
|
+ <view class="bottom1 flex-col" v-if="order.orderStatus != 3">
|
|
|
<text class="allMoney"></text>
|
|
|
<view class="bottomBtn flex-row justify-between">
|
|
|
<view class=" flex-row">
|
|
|
@@ -324,17 +324,8 @@ export default {
|
|
|
uni.scanCode({
|
|
|
scanType: ['qrCode'],
|
|
|
success: function (res) {
|
|
|
- let json = JSON.parse(res.result)
|
|
|
- if(json.storeId != order.storeId){
|
|
|
- uni.showToast({
|
|
|
- icon: 'error',
|
|
|
- duration: 3000,
|
|
|
- title: '请扫描订单门店二维码'
|
|
|
- });
|
|
|
- return
|
|
|
- }
|
|
|
uni.navigateTo({
|
|
|
- url:'/orderPages/serviceItems/index?serviceStationId='+ json.stationId + '&orderId='+order.orderId + '&serviceObjectId=' + order.serviceObjectId
|
|
|
+ url:'/orderPages/serviceItems/index?serviceStationId='+ res.result + '&orderId='+order.orderId + '&serviceObjectId=' + order.serviceObjectId
|
|
|
})
|
|
|
}
|
|
|
})
|