|
|
@@ -108,7 +108,7 @@
|
|
|
</view>
|
|
|
|
|
|
<!-- 骑手评价区域 -->
|
|
|
- <view class="store" style="margin-top: 20rpx" v-if="orderType == 2">
|
|
|
+ <view class="store" style="margin-top: 20rpx" v-if="orderTypeExtra == 2">
|
|
|
<view class="store_box">
|
|
|
<image class="store_box_img" src="/static/logo.png" mode="aspectFill"></image>
|
|
|
<view class="store_box_msg">
|
|
|
@@ -182,7 +182,7 @@ export default {
|
|
|
goodsId: '',
|
|
|
ordersId: '',
|
|
|
|
|
|
- orderType: '',
|
|
|
+ orderTypeExtra: '',
|
|
|
info: {},
|
|
|
//画板边长默认是屏幕宽度,正方形画布
|
|
|
cw: uni.getSystemInfoSync().windowWidth
|
|
|
@@ -195,7 +195,7 @@ export default {
|
|
|
this.sendDate.orderNumber = e.orderNumber
|
|
|
this.sendDate.shopId = e.shopId
|
|
|
this.sendDate.riderUserId = e.riderUserId
|
|
|
- this.orderType = e.orderType
|
|
|
+ this.orderTypeExtra = e.orderTypeExtra
|
|
|
this.info = JSON.parse(decodeURIComponent(e.info))
|
|
|
|
|
|
// let deviceInfo = {
|
|
|
@@ -281,8 +281,8 @@ export default {
|
|
|
}, 2000),
|
|
|
|
|
|
send() {
|
|
|
- // console.log(this.orderType)
|
|
|
- if (this.orderType == 1) {
|
|
|
+ // console.log(this.orderTypeExtra)
|
|
|
+ if (this.orderTypeExtra == 1 || this.orderTypeExtra == 3) {
|
|
|
// 到店取餐
|
|
|
if (!this.value) {
|
|
|
uni.showToast({
|
|
|
@@ -308,7 +308,7 @@ export default {
|
|
|
return
|
|
|
}
|
|
|
this.sendReq()
|
|
|
- } else if (this.orderType == 2) {
|
|
|
+ } else if (this.orderTypeExtra == 2) {
|
|
|
// 外卖配送
|
|
|
if (!this.value && !this.valueRider) {
|
|
|
uni.showToast({
|