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 14:08:26 +08:00
parent b3e25d7459 26b8b4f2af
commit 85e2c074f7
4 changed files with 25 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pages/index/components/diamond.vue
View File

@@ -54,9 +54,7 @@
let tableCode = this.getQueryString(decodeURIComponent(res.result), 'code') let tableCode = this.getQueryString(decodeURIComponent(res.result), 'code')
uni.cache.set('tableCode', tableCode) uni.cache.set('tableCode', tableCode)
if (tableCode) { if (tableCode) {
uni.pro.navigateTo('order_food/order_food', { uni.pro.navigateTo('order_food/order_food')
tableCode: tableCode,
})
} }
} }
}); });

22
pages/login/login.vue
View File

@@ -34,10 +34,10 @@
</view> </view>
</view> </view>
</view> </view>
<view class="top_box_tow flex-between" v-if="showbox"> <!-- <view class="top_box_tow flex-between" v-if="showbox">
<text @click="register">注册账号</text> <text @click="register">注册账号</text>
<text @click="passwords">忘记密码？</text> <text @click="passwords">忘记密码？</text>
</view> </view> -->
<!-- #ifdef MP-WEIXIN --> <!-- #ifdef MP-WEIXIN -->
<button class="toLogin" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" v-if="!showbox">手机号快速登录 <button class="toLogin" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" v-if="!showbox">手机号快速登录
</button> </button>
@@ -150,7 +150,6 @@
this.agreeShow = false; this.agreeShow = false;
}, },
blurinput(e) { blurinput(e) {
console.log(e);
uni.conf.baseUrl = e; uni.conf.baseUrl = e;
this.baseUrl = e; this.baseUrl = e;
this.showpopup = false; this.showpopup = false;
@@ -235,7 +234,6 @@
} }
}, },
rightClick() { rightClick() {
console.log(11);
uni.switchTab({ uni.switchTab({
url: '/pages/device_shop/index' url: '/pages/device_shop/index'
}); });
@@ -269,13 +267,13 @@
}); });
return false; return false;
} }
if (this.radioChangeItem == false) { // if (this.radioChangeItem == false) {
uni.showToast({ // uni.showToast({
icon: 'none', // icon: 'none',
title: '请先阅读《用户协议》和《隐私政策》' // title: '请先阅读《用户协议》和《隐私政策》'
}); // });
return; // return;
} // }
let res = await this.api.loginapplogin({ let res = await this.api.loginapplogin({
username: this.form.loginName, username: this.form.loginName,
password: this.form.password, password: this.form.password,
@@ -352,11 +350,9 @@
} }
}, },
fail: (err) => { fail: (err) => {
console.log(err)
} }
}); });
} catch (e) { } catch (e) {
console.log(e)
} }
} }
}); });

4
pages/order_detail/order_detail.vue
View File

@@ -171,7 +171,7 @@
以优惠¥{{emitorderfoodform.couponsPrice}} 以优惠¥{{emitorderfoodform.couponsPrice}}
</view> </view>
</view> </view>
<view class="fixedview_tow" @tap="fangdouevent"> <view class="fixedview_tow" @tap="$u.debounce(showpopupclick, 1000)">
立即付款 立即付款
</view> </view>
</view> </view>
@@ -340,10 +340,8 @@
orderId: this.listinfoid orderId: this.listinfoid
}) })
}, },
// 去结算 // 去结算
showpopupclick() { showpopupclick() {
console.log(1212121)
if (this.numValue == 0) { if (this.numValue == 0) {
let data = { //定义socket数据传参 let data = { //定义socket数据传参
"skuId": '', "skuId": '',

24
pages/order_food/order_food.vue
View File

@@ -274,21 +274,21 @@
}, },
async onLoad(e) { async onLoad(e) {
if (e.q) { if (e.q) {
this.tableCode = this.getQueryString(decodeURIComponent(e.q), 'code') let tableCode = this.getQueryString(decodeURIComponent(e.q), 'code')
uni.cache.set('tableCode', this.tableCode) uni.cache.set('tableCode', tableCode)
// this.scanCodehandle() // this.scanCodehandle()
uni.pro.navigateTo('login/login', {
type: 0
})
} else {
this.tableCode = uni.cache.get('tableCode')
this.productqueryShopIdByTableCode() //获取shop User id
} }
if (!uni.cache.get('token') && uni.cache.get('tableCode')) {
uni.reLaunch({
url: '/pages/login/login?type=' + 0
});
// uni.pro.navigateTo('login/login', {
// type: 0
// })
}
uni.$on('message', this.getMessage) uni.$on('message', this.getMessage)
this.$nextTick(() => { this.$nextTick(() => {
this.countTitleTopNum(); this.countTitleTopNum(); //导航栏
}); });
}, },
onUnload() { onUnload() {
@@ -296,7 +296,7 @@
uni.$off('message') uni.$off('message')
}, },
onShow() { onShow() {
if (uni.cache.get('token')) { if (uni.cache.get('token') && uni.cache.get('tableCode')) {
this.productqueryShopIdByTableCode() //获取shop User id this.productqueryShopIdByTableCode() //获取shop User id
} }
}, },