From b6c47d11bbc3ef252c83b320f496ac07d66d6139 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 22 八月 2025 10:30:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/main.js | 1 +
small-program/store/index.js | 2 +-
small-program/pages/login/login.vue | 1 +
small-program/pages/index/index.vue | 21 +++++++++++++++++++--
4 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/small-program/main.js b/small-program/main.js
index 6b9b0a9..c6a73ff 100644
--- a/small-program/main.js
+++ b/small-program/main.js
@@ -16,6 +16,7 @@
Vue.prototype.$baseUrl = 'http://192.168.1.54:10011/'
// Vue.prototype.$baseUrl = 'https://test.doumee.cn/jinkuai_web/'
+
const app = new Vue({
store,
...App
diff --git a/small-program/pages/index/index.vue b/small-program/pages/index/index.vue
index ed7f456..5b2c779 100644
--- a/small-program/pages/index/index.vue
+++ b/small-program/pages/index/index.vue
@@ -447,6 +447,16 @@
this.form.estimatedAccount = ''
this.form.price = ''
this.form.address = ''
+ this.orderFood = []
+ })
+ // 鍒锋柊棣栭〉鏁版嵁
+ uni.$on('refresh', () => {
+ this.getCategoryLists()
+ this.getDictInfo()
+
+ if (this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}') {
+ this.form.linkPhone = this.userInfo.telephone
+ }
})
},
onShow(options) {
@@ -520,7 +530,9 @@
}
},
onReachBottom() {
- this.getOrderList()
+ if (this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}' && this.userInfo.useIdentity === 1) {
+ this.getOrderList()
+ }
},
methods: {
getDictInfo(){
@@ -1254,12 +1266,16 @@
padding: 30rpx 0;
box-sizing: border-box;
flex-direction: column;
- border-bottom: 1rpx solid #E5E5E5;
+ // border-bottom: 1rpx solid #E5E5E5;
.radio-item {
width: 100%;
display: flex;
align-items: self-end;
margin-bottom: 30rpx;
+ border-bottom: 1rpx solid #E5E5E5;
+ &:last-child {
+ border: none;
+ }
&:last-child {
margin: 0 !important;
}
@@ -1312,6 +1328,7 @@
align-items: center;
justify-content: flex-end;
margin-top: 42rpx;
+ margin-bottom: 34rpx;
text {
font-weight: 400;
font-size: 30rpx;
diff --git a/small-program/pages/login/login.vue b/small-program/pages/login/login.vue
index dcddbd1..972aa1e 100644
--- a/small-program/pages/login/login.vue
+++ b/small-program/pages/login/login.vue
@@ -53,6 +53,7 @@
if (result.code === 200) {
that.$store.commit('setUserInfo', result.data.member)
that.$store.commit('setToken', result.data.token)
+ uni.$emit('refresh')
uni.navigateBack({ delta: 1 });
}
})
diff --git a/small-program/store/index.js b/small-program/store/index.js
index 337989e..af4c2ea 100644
--- a/small-program/store/index.js
+++ b/small-program/store/index.js
@@ -16,7 +16,7 @@
statusbarHeight: statusbarHeight || '',
userInfo: userInfo || {},
token: token || '',
- openid: token || '',
+ openid: openid || '',
latitude: '',
longitude: '',
--
Gitblit v1.9.3