From 33c2164b1785a4b3c128f71ff577a989e2d91bdc Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 15:09:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/settings/settings.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/small-program/pages/settings/settings.vue b/small-program/pages/settings/settings.vue
index 28be189..bb5d768 100644
--- a/small-program/pages/settings/settings.vue
+++ b/small-program/pages/settings/settings.vue
@@ -34,12 +34,6 @@
<u-icon name="arrow-right" color="#999999" size="17"></u-icon>
</view>
</view>
- <view class="list-item" @click="jumpxy">
- <view class="list-item-label">鍗忚涓庤鏄�</view>
- <view class="list-item-val">
- <u-icon name="arrow-right" color="#999999" size="17"></u-icon>
- </view>
- </view>
</view>
<view class="loginOut" @click="tuichu">閫�鍑虹櫥褰�</view>
<!-- 鏇存崲鎵嬫満鍙� -->
@@ -48,7 +42,7 @@
<view class="tc-contemt">
<view class="tc-contemt-title">鏇存崲缁戝畾鎵嬫満鍙凤紵</view>
<view class="tc-contemt-nr">
- 鏇存崲鍚庣幇鎵嬫満鍙穥{returnPhone(form.phone)}}灏嗕笉鑳界敤浜庣櫥褰曪紝180澶╁唴鍙彲鏇存崲涓�娆�
+ 鏇存崲鍚庣幇鎵嬫満鍙穥{returnPhone(userInfo.telephone)}}灏嗕笉鑳界敤浜庣櫥褰�
</view>
</view>
<view class="tc-btn">
@@ -57,6 +51,7 @@
</view>
</view>
</u-popup>
+ <auth-login v-if="showLogin" @close="showLogin = false"></auth-login>
</view>
</template>
@@ -70,6 +65,7 @@
data() {
return {
show: false,
+ showLogin: false,
form: {
nickName: '',
name: '',
@@ -104,8 +100,11 @@
jumpPhone() {
this.show = false
uni.navigateTo({
- url: '/pages/change-binding/change-binding'
+ url: '/shop/pages/change-binding/change-binding'
})
+ },
+ handleBindPhone() {
+ this.showLogin = true
},
jumpAddr() {
uni.navigateTo({
@@ -153,6 +152,7 @@
.then(res => {
if (res.code === 200) {
this.$store.commit('empty')
+ uni.$emit('loginOut')
uni.switchTab({
url: '/pages/index/index'
})
--
Gitblit v1.9.3