|
|
@@ -44,16 +44,16 @@
|
|
|
<!-- <view class="buttonItem" @click="call" v-if="currService && currService.callState == '2'">-->
|
|
|
<!-- <text>叫号</text>-->
|
|
|
<!-- </view>-->
|
|
|
- <view class="buttonItem" @click="next">
|
|
|
+ <view class="buttonItem" :class="{buttonState:buttonState[0]}" @click="next">
|
|
|
<text>下一位</text>
|
|
|
</view>
|
|
|
- <view class="buttonItem" @click="takePlace">
|
|
|
+ <view class="buttonItem" :class="{buttonState:buttonState[1]}" @click="takePlace">
|
|
|
<text>已就位</text>
|
|
|
</view>
|
|
|
- <view class="buttonItem" @click="settle">
|
|
|
+ <view class="buttonItem" :class="{buttonState:buttonState[2]}" @click="settle">
|
|
|
<text>结算</text>
|
|
|
</view>
|
|
|
- <view class="buttonItem" @click="addService">
|
|
|
+ <view class="buttonItem" :class="{buttonState:buttonState[3]}" @click="addService">
|
|
|
<text>添加服务</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -132,9 +132,9 @@
|
|
|
|
|
|
</view>
|
|
|
|
|
|
- <view class="flex-row justify-center" v-if="showLike">
|
|
|
+ <view class="flex-row justify-center" v-if="currService.status=8">
|
|
|
<view class="like">
|
|
|
- <text>{{currService.preference || '暂无'}}</text>
|
|
|
+ <text>{{currService.preference || ''}}</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -276,7 +276,7 @@
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
- showLike:false,
|
|
|
+ buttonState:[0,0,0,0],//0:不禁用按钮,1:禁用按钮。
|
|
|
previousServiceOrderId:'',
|
|
|
content:'',
|
|
|
selectServiceObjectList:[],
|
|
|
@@ -456,7 +456,6 @@
|
|
|
});
|
|
|
return
|
|
|
}
|
|
|
- this.showLike = true
|
|
|
this.$api.service.takePlace({
|
|
|
orderServiceId: this.currService.orderServiceId
|
|
|
}).then(res => {
|
|
|
@@ -470,12 +469,9 @@
|
|
|
}).then(res => {
|
|
|
console.log(res.data.data)
|
|
|
this.currService = res.data.data
|
|
|
+ this.setButtomState(this.currService)
|
|
|
this.currService.avatar=this.currService.avatar.replace(/^http:/, "https:")
|
|
|
- let serviceFee = 0
|
|
|
- res.data.data.childList.forEach(item=>{
|
|
|
- serviceFee += item.serviceFee *1
|
|
|
- })
|
|
|
- this.currService.serviceFee = serviceFee.toFixed(2)
|
|
|
+
|
|
|
})
|
|
|
})
|
|
|
},
|
|
|
@@ -556,7 +552,6 @@
|
|
|
});
|
|
|
return
|
|
|
}
|
|
|
- this.showLike = false
|
|
|
uni.showModal({
|
|
|
title:'温馨提示',
|
|
|
content:'是否确定下一位',
|
|
|
@@ -589,16 +584,28 @@
|
|
|
}).then(res => {
|
|
|
console.log(res.data.data)
|
|
|
this.currService = res.data.data
|
|
|
+ this.setButtomState(this.currService)
|
|
|
this.currService.avatar=this.currService.avatar.replace(/^http:/, "https:")
|
|
|
- let serviceFee = 0
|
|
|
- res.data.data.childList.forEach(item=>{
|
|
|
- serviceFee += item.serviceFee *1
|
|
|
- })
|
|
|
- this.currService.serviceFee = serviceFee.toFixed(2)
|
|
|
+
|
|
|
})
|
|
|
|
|
|
},
|
|
|
|
|
|
+ setButtomState(currService){
|
|
|
+ if (currService){
|
|
|
+ if (currService.status == 12){
|
|
|
+ //叫号中
|
|
|
+ this.buttonState=[0,0,1,1]
|
|
|
+ }else if (currService.status == 8){
|
|
|
+ //服务中
|
|
|
+ this.buttonState=[1,1,0,0]
|
|
|
+ }
|
|
|
+
|
|
|
+ }else {
|
|
|
+ this.buttonState=[0,1,1,1]
|
|
|
+ }
|
|
|
+ },
|
|
|
+
|
|
|
getUserInfo() {
|
|
|
this.$api.user.getUserInfo().then(res => {
|
|
|
this.userInfo = res.data.data
|