czg_team/cashier_weapp
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'wwz_x' of e.coding.net:g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_d

Browse Source
This commit is contained in:
duan
2024-05-28 16:41:07 +08:00
parent f49aa283f9 407a5c7e52
commit b2e8d69c61
2 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
pages/order_detail/order_detail.vue
View File

@@ -171,7 +171,7 @@
以优惠¥{{emitorderfoodform.couponsPrice}}
</view>
</view>
<view class="fixedview_tow" @tap="$u.debounce(showpopupclick, 1000)">
<view class="fixedview_tow" @tap="$u.debounce(showpopupclick, 500)">
立即付款
</view>
</view>
@@ -210,7 +210,6 @@
// 输入支付密码 123
passwordArr: [],
ispws: false,
numValue: 0
};
},
@@ -222,7 +221,7 @@
// })
},
onLoad(e) {
// console.log(e, 140)
let res = JSON.parse(e.tableId)
this.listinfo.detailList = res
@@ -255,11 +254,11 @@
})
},
methods: {
fangdouevent() {
this.$u.debounce(() => {
this.showpopupclick()
}, 1000)
},
// fangdouevent() {
// this.$u.debounce(() => {
// this.showpopupclick()
// }, 1000)
// },
async getcoupon() {
let res = await this.api.userCoupon({
"orderNum": this.listinfo.amount,
@@ -320,7 +319,7 @@
orderfoodindex() {
uni.pro.navigateTo('index/coupons/index', {
orderfood: 0,
orderId :this.listinfoid,
orderId: this.listinfoid,
amount: this.listinfo.amounts
})
},
@@ -342,24 +341,19 @@
},
// 去结算
showpopupclick() {
if (this.numValue == 0) {
let data = { //定义socket数据传参
"skuId": '',
"num": '', //数量
"type": "createOrder", //“addcart:添加购物车，create0rder:生成订单，clearCart:庆康购物车”，
"couponsId": this.emitorderfoodform.id ? this.emitorderfoodform.id : '', //优惠券ID,
"isYhq": this.emitorderfoodform.id ? 1 : 0, // 是否使用优惠券（ 1： 使用， 0： 不使用）,
"isBuyYhq": this.emitorderfoodform.clickiconone == 1 ? 1 : 0, // 是否购买优惠券（ 1： 购买， 0： 不够买）
"productId": '', //商品id
"shopId": uni.cache.get('shopUser'),
"userId": uni.cache.get('userInfo').id,
// tableId:uni.cache.get('tableCode')
}
this.numValue = 1
uni.$u.debounce(this.socketSendMsg(data), 500)
} else {
this.showpopupclickdd()
let data = { //定义socket数据传参
"skuId": '',
"num": '', //数量
"type": "createOrder", //“addcart:添加购物车，create0rder:生成订单，clearCart:庆康购物车”，
"couponsId": this.emitorderfoodform.id ? this.emitorderfoodform.id : '', //优惠券ID,
"isYhq": this.emitorderfoodform.id ? 1 : 0, // 是否使用优惠券（ 1： 使用， 0： 不使用）,
"isBuyYhq": this.emitorderfoodform.clickiconone == 1 ? 1 : 0, // 是否购买优惠券（ 1： 购买， 0： 不够买）
"productId": '', //商品id
"shopId": uni.cache.get('shopUser'),
"userId": uni.cache.get('userInfo').id,
// tableId:uni.cache.get('tableCode')
}
this.socketSendMsg(data)
},
// 去充值
goRecharge() {
@@ -369,7 +363,6 @@
},
async showpopupclickdd(i) {
if (this.radiovalue1 == 1) {
let res = await this.api.payorderPay({
orderId: this.listinfoid
@@ -399,7 +392,8 @@
uni.redirectTo({
url: '/pages/order/successful?orderId=' + this
.listinfoid + '&orderInfo=' + JSON.stringify(
this.orderInfo) + '&payType' + this.radiovalue1
this.orderInfo) + '&payType' + this
.radiovalue1
});
}, 1000)
// uni.redirectTo({
@@ -408,11 +402,11 @@
// });
},
fail: (err) => {
uni.showToast({
icon: 'none',
title: '支付失败'
})
uni.hideLoading()
uni.showToast({
icon: 'none',
title: '支付失败'
})
uni.hideLoading()
// uni.redirectTo({
// url: '/pages/order/order_detail?orderId=' + this.listinfoid
// });
@@ -426,7 +420,7 @@
} else {
// 判断是否有绑定支付密码
// 先判断是否设置支付密码。0是没设置。没设置的情况下跳转到设置页面。有的话输入支付密码
let isVip = uni.cache.get('userInfo').isPwd
let isVip = uni.cache.get('userInfo').isPwd
if (isVip == 0) {
uni.pro.navigateTo('/pages/user/repairpassword', {
shopId_id: uni.cache.get('shopUser')
@@ -456,7 +450,8 @@
uni.redirectTo({
url: '/pages/order/successful?orderId=' + this
.listinfoid + '&orderInfo=' + JSON.stringify(
this.orderInfo)+ '&radiovalue1=' + this.radiovalue1
this.orderInfo) + '&radiovalue1=' + this
.radiovalue1
});
}, 1000)

17
pages/order_food/order_food.vue
View File

@@ -282,9 +282,6 @@
uni.reLaunch({
url: '/pages/login/login?type=' + 0
});
// uni.pro.navigateTo('login/login', {
// type: 0
// })
}
uni.$on('message', this.getMessage)
this.$nextTick(() => {
@@ -292,13 +289,18 @@
});
},
onUnload() {
this.socketSendMsg({ //定义socket数据传参
"type": "close", //“addcart:添加购物车，create0rder:生成订单，clearCart:庆康购物车”，
})
this.socketTicket.Close()
uni.$off('message')
},
onShow() {
if (uni.cache.get('token') && uni.cache.get('tableCode')) {
this.productqueryShopIdByTableCode() //获取shop User id
}
setTimeout(() => {
if (uni.cache.get('token') && uni.cache.get('tableCode')) {
this.productqueryShopIdByTableCode() //获取shop User id
}
}, 500)
},
methods: {
// 单独获取他的shopUserid
@@ -322,6 +324,9 @@
icon: "none",
})
if (msg.msg == '桌码不存在') { //卓码不存在直接退出
this.socketSendMsg({ //定义socket数据传参
"type": "close", //“addcart:添加购物车，create0rder:生成订单，clearCart:庆康购物车”，
})
this.socketTicket.Close()
uni.$off('message')
uni.navigateBack()