From 0ee7347883db663ef24c9d452af9b8f539cbd851 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Sat, 5 Jul 2025 09:42:12 +0800
Subject: [PATCH] =?UTF-8?q?feat(gloabl)=EF=BC=9A=20v0=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E5=8F=AA=E8=83=BD=E7=9C=8B=E5=88=B0=E5=8D=87=E7=BA=A7=E4=B8=93?=
 =?UTF-8?q?=E5=8C=BA=EF=BC=8C=E4=B8=94=E5=8D=87=E7=BA=A7=E4=B8=93=E5=8C=BA?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=B8=BA=E4=BC=9A=E5=91=98=E4=B8=93=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../special-area-wrapper.vue                  | 22 ++++++--
 pages/index/index.vue                         | 55 +------------------
 pages/specialArea/index.vue                   |  6 +-
 pages/specialArea/list.vue                    | 15 +++--
 pages/upgrade/index.vue                       | 10 +++-
 5 files changed, 39 insertions(+), 69 deletions(-)

diff --git a/components/area-product-list/special-area-wrapper.vue b/components/area-product-list/special-area-wrapper.vue
index 91e92fc..fcf78d5 100644
--- a/components/area-product-list/special-area-wrapper.vue
+++ b/components/area-product-list/special-area-wrapper.vue
@@ -28,7 +28,11 @@
     </view>
     <!-- 复购 -->
 
-    <view key="repurchase" v-if="repurchaseList.length > 0" class="goods-flexs">
+    <view
+      key="repurchase"
+      v-if="repurchaseList.length > 0 && !isZeroLevel"
+      class="goods-flexs"
+    >
       <view class="goods-view">
         <area-product-list
           :list="repurchaseList"
@@ -75,6 +79,10 @@ export default {
       default: 'normal', // 'normal' or 'small'
       validator: value => ['normal', 'small'].includes(value),
     },
+    userInfo: {
+      type: Object,
+      default: () => {},
+    },
   },
   components: {
     'area-product-list': areaProductList,
@@ -95,12 +103,14 @@ export default {
     ...mapGetters(['isZeroLevel']),
   },
   created() {
-    const userInfo = uni.getStorageSync('userInfo')
-    if (userInfo.memberSign != MEMBER_SIGN.ZERO_LEVEL) {
-      this.getAreaListById(REISSUE_AREA.id, this.rescissionList)
-      this.getAreaListById(REGIEST_AREA.id, this.registList)
+    const userInfo = uni.getStorageSync('userInfo') || this.userInfo
+    if (userInfo.memberSign == MEMBER_SIGN.ZERO_LEVEL) {
+      this.getAreaListById(UPGRADE_AREA.id, this.upgradeList)
+      this.upgrade.name = '会员专区'
+      return
     }
-    this.getAreaListById(UPGRADE_AREA.id, this.upgradeList)
+    this.getAreaListById(REISSUE_AREA.id, this.rescissionList)
+    this.getAreaListById(REGIEST_AREA.id, this.registList)
     this.getAreaListById(REPURCHASE_AREA.id, this.repurchaseList)
   },
   methods: {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a42e698..6dd4eb7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -28,59 +28,10 @@
           </swiper>
         </view>
       </view>
-      <special-area-wrapper size="small" />
-      <view class="goods-sort">
-        <view class="goods_content" style="padding-bottom: 130rpx">
-          <view
-            class="goods-center-lists"
-            v-for="item in goodsList"
-            :key="item.waresId"
-            @click="goDetails(item)"
-          >
-            <view
-              class="fly"
-              v-show="item.preSaleStatus == 3 || item.isSale == 1"
-            ></view>
-            <view class="goods-flex-s">
-              <view class="goods-img">
-                <image :src="item.cover1"></image>
-              </view>
-              <view class="padding_s goods-info">
-                <view class="goods-name">{{ item.waresName }}</view>
-                <view class="goods-sales-wrapper">
-                  <view class="goods-sales"
-                    >累计销量{{ formatSales(item.sales) }}</view
-                  >
-                  <view
-                    class="goods-price"
-                    v-if="item.specialArea == 31 && userInfo.isMakerSpace == 1"
-                  >
-                    <span v-if="priceSymbolVisible" class="price-symbol">
-                      {{ priceSymbol }}
-                    </span>
-                    <span>{{ formatCurrency(item.vipPrice) }}</span>
-                  </view>
-                  <view class="goods-price" v-if="item.specialArea != 31">
-                    <span v-if="priceSymbolVisible" class="price-symbol">
-                      {{ priceSymbol }}
-                    </span>
-                    <span>{{ formatCurrency(item.waresPrice) }}</span>
-                  </view>
-                  <view
-                    class="goods-price"
-                    v-if="item.specialArea == 31 && userInfo.isMakerSpace == 0"
-                  >
-                    <span v-if="priceSymbolVisible" class="price-symbol">
-                      {{ priceSymbol }}
-                    </span>
-                    <span>{{ formatCurrency(item.waresPrice) }}</span>
-                  </view>
-                </view>
-              </view>
-            </view>
-          </view>
-        </view>
+      <view style="padding-bottom: 140rpx">
+        <special-area-wrapper :userInfo="userInfo" size="small" />
       </view>
+
       <cl-tabbar :current="0"></cl-tabbar>
       <div>
         <!-- 公告弹窗 -->
diff --git a/pages/specialArea/index.vue b/pages/specialArea/index.vue
index a673037..3fa8a08 100644
--- a/pages/specialArea/index.vue
+++ b/pages/specialArea/index.vue
@@ -6,7 +6,7 @@
 -->
 <template>
   <view class="content">
-    <special-area-wrapper />
+    <special-area-wrapper :userInfo="userInfo" />
 
     <cl-tabbar :current="1"></cl-tabbar>
   </view>
@@ -22,7 +22,9 @@ export default {
   },
 
   data() {
-    return {}
+    return {
+      userInfo: uni.getStorageSync('User'),
+    }
   },
   onLoad() {},
 
diff --git a/pages/specialArea/list.vue b/pages/specialArea/list.vue
index 1280f43..99681bb 100644
--- a/pages/specialArea/list.vue
+++ b/pages/specialArea/list.vue
@@ -249,9 +249,17 @@ export default {
     //   })
     // }
     // 修改标题
+
+    // 获取一级分类并获取商品列表
+    // this.getClassIfy()
+
+    this.userInfo = uni.getStorageSync('User')
     const areaMap = {
       [REGIEST_AREA.id]: REGIEST_AREA.name,
-      [UPGRADE_AREA.id]: UPGRADE_AREA.name,
+      [UPGRADE_AREA.id]:
+        this.userInfo.memberSign == MEMBER_SIGN.ZERO_LEVEL
+          ? '会员专区'
+          : UPGRADE_AREA.name,
       [REPURCHASE_AREA.id]: REPURCHASE_AREA.name,
       [REISSUE_AREA.id]: REISSUE_AREA.name,
     }
@@ -260,11 +268,6 @@ export default {
       title: this.titLabel,
       success: () => {},
     })
-    // 获取一级分类并获取商品列表
-    // this.getClassIfy()
-
-    this.userInfo = uni.getStorageSync('User')
-
     this.pkCountry = this.userInfo.pkCountry || 1
     this.setSpecial({
       value: this.specialArea,
diff --git a/pages/upgrade/index.vue b/pages/upgrade/index.vue
index 08d21b9..4534342 100644
--- a/pages/upgrade/index.vue
+++ b/pages/upgrade/index.vue
@@ -337,6 +337,7 @@ import mustAgreeMent from '@/components/mustAgreeMent.vue'
 import * as api from '@/config/regiest'
 import agreement from '@/components/agreement.vue'
 import { upgradeOrder } from '@/config/order'
+import { MEMBER_SIGN } from '@/util/common'
 import {
   REGIEST_AREA,
   UPGRADE_AREA,
@@ -372,7 +373,7 @@ export default {
       isTrans: false,
       countryIndex: 0,
       isCountry: false,
-      userInfo: '',
+      userInfo: uni.getStorageSync('User'),
       countryList: [],
       isClick: 0,
       specialArea: '',
@@ -528,9 +529,9 @@ export default {
     // 幂等性
     this.getGenerate()
     //  登录信息
-    this.userInfo = uni.getStorageSync('User')
     this.$set(this.form, 'memberCode', this.userInfo.memberCode)
     this.$set(this.form, 'memberName', this.userInfo.memberName)
+    console.log(this.userInfo, '...a?')
     this.setPageTitle(this.specialArea)
   },
   onShow() {
@@ -547,7 +548,10 @@ export default {
       ]
       const title = areaList.find(item => item.id == areaId)?.name
       uni.setNavigationBarTitle({
-        title,
+        title:
+          this.userInfo.memberSign == MEMBER_SIGN.ZERO_LEVEL
+            ? '会员专区'
+            : title,
       })
     },
     toAgree() {