From b28105003efbefd158c7e8cdd0a0bc1d86bdb1f8 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Mon, 29 Apr 2024 17:00:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2=E6=9C=AA?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=B9=9F=E5=8F=AF=E4=BB=A5=E8=BF=9B=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/setup/setup.vue | 101 ++++++++++++++++++------------------------
 pages/user/user.vue   |   9 +++-
 2 files changed, 50 insertions(+), 60 deletions(-)

diff --git a/pages/setup/setup.vue b/pages/setup/setup.vue
index 12117106..9a85b3e0 100644
--- a/pages/setup/setup.vue
+++ b/pages/setup/setup.vue
@@ -1,8 +1,7 @@
 <template>
     <view :class="theme_view">
         <view class="page padding-main">
-            <!-- 主体内容 -->
-            <block v-if="data_list_loding_status == 3">
+            <block v-if="(user || null) != null">
                 <view class="padding-horizontal-main border-radius-main bg-white oh spacing-mb">
                     <view class="padding-top-xxl padding-bottom-xxl padding-right-xxxl arrow-right oh" data-value="/pages/personal/personal" @tap="url_event">
                         <image :src="user.avatar || default_avatar" mode="widthFix" class="circle br fl user-avatar"></image>
@@ -64,65 +63,58 @@
                         <text class="fr cr-grey">{{ $t('setup.setup.izg78g') }}</text>
                     </view>
                 </view>
+            </block>
 
-                <!-- 权限管理、清除缓存、客服电话、账号注销 -->
-                <view class="padding-horizontal-main border-radius-main bg-white oh spacing-mb">
-                    <!-- #ifdef MP || APP -->
-                    <view class="padding-top-xxl padding-bottom-xxl padding-right-xxxl arrow-right br-b" @tap="open_setting_event">
-                        <text>{{ $t('setup.setup.377uwg') }}</text>
-                        <text class="fr cr-grey">{{ $t('setup.setup.5eltza') }}</text>
+            <!-- 权限管理、清除缓存、客服电话、账号注销 -->
+            <view class="padding-horizontal-main border-radius-main bg-white oh spacing-mb">
+                <!-- #ifdef MP || APP -->
+                <view class="padding-top-xxl padding-bottom-xxl padding-right-xxxl arrow-right br-b" @tap="open_setting_event">
+                    <text>{{ $t('setup.setup.377uwg') }}</text>
+                    <text class="fr cr-grey">{{ $t('setup.setup.5eltza') }}</text>
+                </view>
+                <!-- #endif -->
+                <view class="padding-top-xxl padding-bottom-xxl padding-right-xxxl arrow-right br-b" @tap="remove_user_cache_event">
+                    <text>{{ $t('setup.setup.5493ui') }}</text>
+                    <text class="fr cr-grey">{{ $t('setup.setup.f53166') }}</text>
+                </view>
+                <view v-if="(common_app_customer_service_tel || null) != null" class="padding-top-xxl padding-bottom-xxl padding-right-xxxl arrow-right br-b" @tap="call_event">
+                    <text>{{ $t('setup.setup.656fv1') }}</text>
+                    <text class="fr cr-grey">{{ common_app_customer_service_tel || '' }} {{ $t('setup.setup.f25wcx') }}</text>
+                </view>
+                <view v-if="(user || null) != null" class="padding-top-xxl padding-bottom-xxl padding-right-xxxl arrow-right" data-value="/pages/logout/logout" @tap="url_event">
+                    <text>{{ $t('setup.setup.11k15d') }}</text>
+                    <text class="fr cr-grey">{{ $t('setup.setup.48r261') }}</text>
+                </view>
+            </view>
+
+            <!-- 打开语言选择弹层-->
+            <component-popup :propShow="popup_language_status" propPosition="bottom" :propIsRadius="false" @onclose="popup_language_close_event">
+                <view class="popup-language">
+                    <view class="flex-row align-c jc-sb padding-main">
+                        <view @tap="popup_language_close_event">
+                            <iconfont name="icon-close-o" size="28rpx"></iconfont>
+                        </view>
+                        <view class="text-size" @tap="popup_sub_language_event">{{ $t('common.confirm') }}</view>
                     </view>
-                    <!-- #endif -->
-                    <view class="padding-top-xxl padding-bottom-xxl padding-right-xxxl arrow-right br-b" @tap="remove_user_cache_event">
-                        <text>{{ $t('setup.setup.5493ui') }}</text>
-                        <text class="fr cr-grey">{{ $t('setup.setup.f53166') }}</text>
-                    </view>
-                    <view v-if="(common_app_customer_service_tel || null) != null" class="padding-top-xxl padding-bottom-xxl padding-right-xxxl arrow-right br-b" @tap="call_event">
-                        <text>{{ $t('setup.setup.656fv1') }}</text>
-                        <text class="fr cr-grey">{{ common_app_customer_service_tel || '' }} {{ $t('setup.setup.f25wcx') }}</text>
-                    </view>
-                    <view class="padding-top-xxl padding-bottom-xxl padding-right-xxxl arrow-right" data-value="/pages/logout/logout" @tap="url_event">
-                        <text>{{ $t('setup.setup.11k15d') }}</text>
-                        <text class="fr cr-grey">{{ $t('setup.setup.48r261') }}</text>
+                    <view class="br-t-f5 padding-main list">
+                        <view v-for="(value, key) in language_list" :key="key" class="spacing-mb flex-row jc-sb align-c" :class="language_key == key ? 'cr-main' : ''" :data-key="key" :data-value="value" @tap="checked_language_event">
+                            {{ value }}
+                            <iconfont v-if="language_key == key" name="icon-checked" size="32rpx"></iconfont>
+                        </view>
                     </view>
                 </view>
-
-                <!-- 打开语言选择弹层-->
-                <component-popup :propShow="popup_language_status" propPosition="bottom" :propIsRadius="false" @onclose="popup_language_close_event">
-                    <view class="popup-language">
-                        <view class="flex-row align-c jc-sb padding-main">
-                            <view @tap="popup_language_close_event">
-                                <iconfont name="icon-close-o" size="28rpx"></iconfont>
-                            </view>
-                            <view class="text-size" @tap="popup_sub_language_event">{{ $t('common.confirm') }}</view>
-                        </view>
-                        <view class="br-t-f5 padding-main list">
-                            <view v-for="(value, key) in language_list" :key="key" class="spacing-mb flex-row jc-sb align-c" :class="language_key == key ? 'cr-main' : ''" :data-key="key" :data-value="value" @tap="checked_language_event">
-                                {{ value }}
-                                <iconfont v-if="language_key == key" name="icon-checked" size="32rpx"></iconfont>
-                            </view>
-                        </view>
-                    </view>
-                </component-popup>
-            </block>
-            <block v-else>
-                <!-- 错误提示 -->
-                <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
-            </block>
+            </component-popup>
         </view>
     </view>
 </template>
 <script>
     const app = getApp();
-    import componentNoData from '../../components/no-data/no-data';
     import componentPopup from '@/components/popup/popup';
 
     export default {
         data() {
             return {
                 theme_view: app.globalData.get_theme_value_view(),
-                data_list_loding_status: 1,
-                data_list_loding_msg: '',
                 default_avatar: app.globalData.data.default_user_head_src,
                 user: null,
                 common_app_customer_service_tel: null,
@@ -147,8 +139,7 @@
         },
 
         components: {
-            componentNoData,
-            componentPopup,
+            componentPopup
         },
         onLoad(params) {
             // 调用公共事件方法
@@ -226,16 +217,10 @@
 
             // 获取数据
             init() {
-                var user = app.globalData.get_user_info(this, 'init');
-                if (user != false) {
+                var user = app.globalData.get_user_cache_info();
+                if (user != null) {
                     this.setData({
-                        data_list_loding_status: 3,
-                        user: user,
-                    });
-                } else {
-                    this.setData({
-                        data_list_loding_status: 0,
-                        data_list_loding_msg: this.$t('setup.setup.nwt4o1'),
+                        user: user
                     });
                 }
             },
@@ -339,4 +324,4 @@
 </script>
 <style>
     @import './setup.css';
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 7bdf3a90..562b8592 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -21,7 +21,7 @@
                         </view>
                         <!-- 右上角 -->
                         <view class="head-right cr-black">
-                            <view class="item pr dis-inline-block margin-left-xxl" data-value="/pages/setup/setup" @tap="url_event">
+                            <view class="item pr dis-inline-block margin-left-xxl" data-value="/pages/setup/setup" data-login="0" @tap="url_event">
                                 <iconfont name="icon-applet-me-settings-acquiesce" size="46rpx"></iconfont>
                             </view>
                             <view class="item pr dis-inline-block margin-left-xxl" data-value="/pages/message/message" @tap="url_event">
@@ -540,7 +540,12 @@
 
             // url事件
             url_event(e) {
-                if(this.is_login()) {
+                var login = e.currentTarget.dataset.login;
+                if(login === undefined || login == 1) {
+                    if(this.is_login()) {
+                        app.globalData.url_event(e);
+                    }
+                } else {
                     app.globalData.url_event(e);
                 }
             },