From 8e42d1fa81e5866e2b8b972123cce816b4c6cb9f Mon Sep 17 00:00:00 2001
From: sjeam <359824901@qq.com>
Date: Sat, 6 Sep 2025 13:54:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/about/index.vue |  6 +++---
 src/pages/index/index.vue | 12 +++++++-----
 src/pages/my/setting.vue  | 26 +++++++++++++++-----------
 src/style/index.scss      |  3 ---
 src/utils/index.ts        |  2 +-
 5 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/src/pages/about/index.vue b/src/pages/about/index.vue
index bcded52..79b32f8 100644
--- a/src/pages/about/index.vue
+++ b/src/pages/about/index.vue
@@ -44,7 +44,7 @@
                 <wd-img radius="10rpx" :width="'160rpx'" :height="'100rpx'" :src="item.image" />
 
                 <view
-                  class="absolute bottom-5 text-center left-5 right-5 text-white text-center text-gray-500 font-size-3 bg-black bg-opacity-20"
+                  class="absolute bottom-5 text-center left-5 right-5 text-white text-center font-size-3 bg-black bg-opacity-20"
                 >
                   {{ item.name }}
                 </view>
@@ -71,12 +71,12 @@
             </view>
             <view class="relative" style="width: 280rpx; height: 200rpx">
               <wd-img :width="'100%'" :height="'100%'" radius="20rpx" :src="item.cover" alt="joy" />
-              <view
+              <!-- <view
                 class="m-2 p-1 absolute bottom-0 text-right right-0 text-white bg-black bg-opacity-20"
                 style="backdrop-filter: blur(2rpx); border-radius: 10rpx"
               >
                 <text class="block font-size-3 text-left">{{ item.category_name }}</text>
-              </view>
+              </view> -->
             </view>
           </view>
         </wd-card>
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 34a79e1..b9bd745 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -172,7 +172,7 @@
         <template #title>
           <view class="title">
             <view>
-              <text class="text-xl text-sm font-size-4 font-bold">美丽乡村</text>
+              <text class="text-xl text-sm font-size-4 font-bold color-black">美丽乡村</text>
               <text class="ps-2 text-xl text-sm font-size-3 color-black">美丽乡村风貌展示厅</text>
             </view>
             <wd-button type="primary" size="small" @click="switchTab(eat_id)">
@@ -201,7 +201,9 @@
               class="m-2 p-2 absolute bottom-0 text-center left-0 right-0 text-white bg-gray-300 bg-opacity-5"
               style="backdrop-filter: blur(2rpx); border-radius: 10rpx"
             >
-              <text class="block font-size-4 text-left ellipsis-2">{{ current_item.title }}</text>
+              <text class="block font-size-4 text-left ellipsis-2">
+                {{ current_item.title }}
+              </text>
               <view class="font-size-3 text-left ellipsis-2">
                 {{ current_item.description }}
               </view>
@@ -230,7 +232,7 @@
         <template #title>
           <view class="title">
             <view>
-              <text class="text-xl text-sm font-size-4 font-bold">特产好物</text>
+              <text class="text-xl text-sm font-size-4 font-bold color-black">特产好物</text>
               <text class="ps-2 text-xl text-sm font-size-3 color-black">精选好物，不容错过</text>
             </view>
             <wd-button type="primary" size="small" @click="switchTab(live_id)">
@@ -273,7 +275,7 @@
         <template #title>
           <view class="title">
             <view>
-              <text class="text-xl text-sm font-size-4 font-bold">热门咨询</text>
+              <text class="text-xl text-sm font-size-4 font-bold color-black">热门咨询</text>
               <text class="ps-2 text-xl text-sm font-size-3 color-black">
                 热门咨询，一键掌握新鲜事
               </text>
@@ -315,7 +317,7 @@
         <template #title>
           <view class="title">
             <view>
-              <text class="text-xl text-sm font-size-4 font-bold">景区旅游</text>
+              <text class="text-xl text-sm font-size-4 font-bold color-black">景区旅游</text>
               <text class="ps-2 text-xl text-sm font-size-3 color-black">好玩儿路线一网打尽</text>
             </view>
             <wd-button type="primary" size="small" @click="switchTab(purchase_id)">
diff --git a/src/pages/my/setting.vue b/src/pages/my/setting.vue
index 5bc9380..d7f53f4 100644
--- a/src/pages/my/setting.vue
+++ b/src/pages/my/setting.vue
@@ -146,7 +146,7 @@
         </wd-popup>
       </wd-card>
     </view>
-    <!-- <button v-if="hasLogin" class="mt-2" @click="logout">退出登录</button> -->
+    <button v-if="hasLogin" class="mt-2" @click="logout">退出登录</button>
   </view>
 </template>
 
@@ -180,10 +180,11 @@ export default defineComponent({
   data() {
     return {
       type: 0, // 0 点击进入 1 跳转登录
+      show: false,
       hasLogin: false,
       showPhone: false,
       showName: false,
-      show: false,
+
       address_string: '',
 
       propShowOrder: false,
@@ -217,16 +218,19 @@ export default defineComponent({
     }
   },
   async onLoad(option) {
-    this.type = option.type || 0
-    if (this.type === 1) {
-      //跳转登录
-    } else {
-      //点击进入
-      this.show = true
-    }
-
     this.getArea()
     this.getUserInfo()
+    console.log(option)
+    this.type = parseInt(option.type) || 0
+    console.log('type值', this.type)
+    if (this.type === 1) {
+      //跳转登录
+      this.show = true
+    } else {
+      //点击进入
+      this.show = false
+    }
+    console.log('type值', this.show)
   },
   methods: {
     logout() {
@@ -327,7 +331,7 @@ export default defineComponent({
     },
     async submitGroup() {
       const res = await setGroupAPI(this.addressinfo)
-      console.log(res)
+      // console.log(res)
       this.show = false
       //重新获取地址信息
       userStore.getUserInfo()
diff --git a/src/style/index.scss b/src/style/index.scss
index 438999f..e8ecdf0 100644
--- a/src/style/index.scss
+++ b/src/style/index.scss
@@ -142,7 +142,6 @@ $container-width: 100%;
 $padding-width: 20rpx;
 .ellipsis {
   display: inline-block;
-  color: #333333ff !important;
 
   width: calc($container-width - $padding-width); /* 确保容器有宽度 */
   /* 防止文字换行 */
@@ -153,7 +152,6 @@ $padding-width: 20rpx;
   /* 确保元素有宽度 */
 }
 .ellipsis-2 {
-  color: #333333ff !important;
   display: -webkit-box;
   // font-weight: 500;
   font-size: 40rpx;
@@ -168,7 +166,6 @@ $padding-width: 20rpx;
 }
 
 .ellipsis-5 {
-  color: #333333ff !important;
   display: -webkit-box;
   // font-weight: 500;
   font-size: 40rpx;
diff --git a/src/utils/index.ts b/src/utils/index.ts
index c14e1b5..36d309a 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -220,7 +220,7 @@ import { useUserStore } from '@/store'
 export function hasLogin() {
   const hasLogin = useUserStore().userInfo.id ? true : false
   // console.log(useUserStore().userInfo)
-  console.log('是否登录', hasLogin)
+  // console.log('是否登录', hasLogin)
   console.log('是否登录sss', useUserStore().userInfo)
   //强制跳转设置村庄
   if (hasLogin && !useUserStore().userInfo.isset) {