From 848687c076a0bec2631c540f702b41451bef1b06 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Sat, 14 Jun 2025 10:32:23 +0800
Subject: [PATCH] =?UTF-8?q?feat(mine):=20=E6=88=91=E7=9A=84=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=94=B9=E7=89=88=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mine/index.vue | 986 ++++++++++++++++++-------------------------
 pages/pay/index.vue  |   6 +-
 2 files changed, 424 insertions(+), 568 deletions(-)

diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index b53ff68..7b4fd7f 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -1,400 +1,312 @@
 <template>
   <view class="content">
     <!-- 上方头部 -->
-    <view>
-      <view class="topBox">
-        <view class="top_inder">
-          <view class="top_left">
-            <view class="left_img">
-              <image
-                class="headerimg"
-                :src="
-                  userInfo.headPath
-                    ? userInfo.headPath
-                    : userInfo.settleCountryCircularIcon
-                "
-                mode=""
-              >
-              </image>
-            </view>
-
-            <view class="left_text">
-              <view class="name_box">
-                <view class="tTit1">{{ userInfo.memberCode }}</view>
-                <view
-                  style="margin-left: 20rpx"
-                  class="level_tag level_tag--primary"
-                >
-                  <text class="level_value">{{
-                    userInfo.pkGradeVal || '-'
-                  }}</text>
-                </view>
-              </view>
-              <view class="level_box">
-                <view style="display: flex; flex-direction: column; gap: 10rpx">
-                  <view class="level_tag">
-                    <u-icon name="star" color="#005BAC" size="14"></u-icon>
-                    <text class="level_label">荣誉奖衔</text>
-                    <text class="level_value">{{
-                      userInfo.pkMaxAwardsVal || userInfo.pkAwardsVal
-                    }}</text>
-                  </view>
-                  <view class="level_tag">
-                    <u-icon name="star" color="#005BAC" size="14"></u-icon>
-                    <text class="level_label">当月奖衔</text>
-                    <text class="level_value">{{
-                      userInfo.pkAwardsVal || '-'
-                    }}</text>
-                  </view>
-                </view>
-              </view>
+    <view class="header-container">
+      <view class="user-info-wrapper">
+        <view class="avatar-container">
+          <image
+            class="avatar-image"
+            :src="
+              userInfo.headPath
+                ? userInfo.headPath
+                : userInfo.settleCountryCircularIcon
+            "
+            mode="aspectFill"
+          >
+          </image>
+        </view>
+        <view class="user-details">
+          <view class="user-name-and-level">
+            <text class="user-name">{{ userInfo.memberCode }}</text>
+            <view class="svip-badge">
+              <text class="svip-text">{{ userInfo.pkGradeVal || '-' }}</text>
             </view>
           </view>
-          <view class="top_right" @click="goTo('/pages/userData/index')">
-            <view class="ricon">
-              <u-icon color="#ffffff" size="22" name="setting-fill"></u-icon>
+          <view class="awards-container">
+            <view class="award-tag">
+              <!-- <u-icon name="star-fill" color="#FAD65A" size="14"></u-icon> -->
+              <text class="award-label">荣誉奖衔:</text>
+              <text class="award-value">{{
+                userInfo.pkMaxAwardsVal || userInfo.pkAwardsVal || '无'
+              }}</text>
+            </view>
+            <view class="award-tag">
+              <!-- <u-icon name="star-fill" color="#FAD65A" size="14"></u-icon> -->
+              <text class="award-label">当月奖衔:</text>
+              <text class="award-value">{{
+                userInfo.pkAwardsVal || '无'
+              }}</text>
             </view>
           </view>
         </view>
       </view>
+      <view
+        class="settings-icon-container"
+        @click="goTo('/pages/userData/index')"
+      >
+        <u-icon color="#ffffff" size="22" name="setting-fill"></u-icon>
+      </view>
+    </view>
 
-      <!-- <view class="ju_grade" v-if="false">
-        <view class="jugrade_flex">
-          <view class="ju_left">
-            <view v-if="awards.tarAwardsName" class="yestDay">
-              <view class="yes_t">奖衔晋升</view>
-              <view class="ju_left_bottom sprint-progress-container">
-                <view
-                  class="sprint-current-progress"
-                  :style="{ width: sprintProgress.percentageString }"
-                ></view>
-                <view class="cha sprint-progress-text">
-                  晋升
-                  <span class="award-name">{{ awards.tarAwardsName }}</span>
-                  小区仅需
-                  <span class="award-amount">{{
-                    sprintProgress.achieved
-                  }}</span>
-                </view>
+    <!-- 新增信息展示 -->
+    <view
+      class="extra-info-card"
+      v-if="
+        [
+          MEMBER_SIGN.NORMAL_LEVEL,
+          MEMBER_SIGN.ZERO_LEVEL,
+          MEMBER_SIGN.V5_LEVEL,
+        ].includes(Number(userInfo.memberSign))
+      "
+    >
+      <view
+        class="info-grid"
+        :class="{
+          'multiple-items': userInfo.memberSign === MEMBER_SIGN.NORMAL_LEVEL,
+        }"
+      >
+        <view class="info-item">
+          <text class="info-value">{{ userInfo.pkGradeVal || '-' }}</text>
+          <text class="info-label">会员等级</text>
+        </view>
+        <template v-if="userInfo.memberSign === MEMBER_SIGN.NORMAL_LEVEL">
+          <view class="info-item">
+            <text class="info-value">{{ totalBox || '0' }}</text>
+            <text class="info-label">总盒数</text>
+          </view>
+          <view class="info-item">
+            <text class="info-value">
+              {{ smallAreaBox || '0' }}
+            </text>
+            <text class="info-label">小区盒数</text>
+          </view>
+        </template>
+      </view>
+    </view>
+    <!-- 市场动态 -->
+    <view class="my_order" v-if="true || marketWrapperVisible">
+      <view class="my_title">
+        <text class="thetitle">{{ '市场动态' }}</text>
+      </view>
+      <view class="market-stats-container">
+        <view
+          class="stat-block primary"
+          @click="goTo('/pages/mine/marketDynamic/achievement-list')"
+        >
+          <view class="stat-content">
+            <view class="stat-item">
+              <text class="stat-label">总业绩</text>
+              <view class="stat-value">
+                <text class="stat-value__integer">{{
+                  formattedTotalSumPv.integer
+                }}</text>
+                <text class="stat-value__decimal">{{
+                  formattedTotalSumPv.decimal
+                }}</text>
               </view>
             </view>
-            <view class="yestDay">
-              <view class="yes_t">昨日业绩</view>
-              <view
-                :class="
-                  awards.aNewPv != 0 && awards.bNewPv != 0
-                    ? 'ju_left_bottom1'
-                    : 'ju_left_bottom'
-                "
-              >
-                <view
-                  class="current-progress"
-                  :style="{
-                    width: yesPercent(awards.aNewPv, awards.bNewPv),
-                  }"
-                ></view>
-                <view class="cha">
-                  左区 {{ awards.aNewPv || 0 }}/右区 {{ awards.bNewPv || 0 }}
-                </view>
-              </view>
-            </view>
-            <view class="yestDay">
-              <view class="yes_t">当月业绩</view>
-              <view
-                :class="
-                  awards.aMonthPv != 0 && awards.bMonthPv != 0
-                    ? 'ju_left_bottom1'
-                    : 'ju_left_bottom'
-                "
-              >
-                <view
-                  class="current-progress"
-                  :style="{
-                    width: yesPercent(awards.aMonthPv, awards.bMonthPv),
-                  }"
-                ></view>
-                <view class="cha">
-                  左区 {{ awards.aMonthPv || '0.00' }}/右区
-                  {{ awards.bMonthPv || '0.00' }}
-                </view>
-              </view>
-            </view>
-            <view class="yestDay">
-              <view class="yes_t">{{ '历史业绩' }}</view>
-              <view
-                :class="
-                  awards.aSumPv != 0 && awards.bSumPv != 0
-                    ? 'ju_left_bottom1'
-                    : 'ju_left_bottom'
-                "
-              >
-                <view
-                  class="current-progress"
-                  :style="{
-                    width: yesPercent(awards.aSumPv, awards.bSumPv),
-                  }"
-                ></view>
-                <view class="cha">
-                  左区 {{ awards.aSumPv }}/右区 {{ awards.bSumPv }}</view
-                >
+            <view class="stat-divider"></view>
+            <view class="stat-item">
+              <text class="stat-label">小区业绩</text>
+              <view class="stat-value">
+                <text class="stat-value__integer">{{
+                  formattedSmallAreaPv.integer
+                }}</text>
+                <text class="stat-value__decimal">{{
+                  formattedSmallAreaPv.decimal
+                }}</text>
               </view>
             </view>
           </view>
+          <view class="stat-more-arrow">
+            <u-icon name="arrow-right" color="#fff" size="14"></u-icon>
+          </view>
         </view>
-      </view> -->
+        <view
+          class="stat-block secondary"
+          @click="goTo('/pages/mine/marketDynamic/box-list')"
+        >
+          <view class="stat-content">
+            <view class="stat-item">
+              <text class="stat-label">总盒数</text>
+              <view class="stat-value">
+                <text class="stat-value__integer">{{
+                  formattedTotalBox.integer
+                }}</text>
+                <!-- <text class="stat-value__decimal">{{
+                  formattedTotalBox.decimal
+                }}</text> -->
+              </view>
+            </view>
+            <view class="stat-divider"></view>
+            <view class="stat-item">
+              <text class="stat-label">小区盒数</text>
+              <view class="stat-value">
+                <text class="stat-value__integer">{{
+                  formattedSmallAreaBox.integer
+                }}</text>
+                <!-- <text class="stat-value__decimal">{{
+                  formattedSmallAreaBox.decimal
+                }}</text> -->
+              </view>
+            </view>
+          </view>
+          <view class="stat-more-arrow">
+            <u-icon name="arrow-right" color="#fff" size="14"></u-icon>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="my_order">
+      <view class="my_title">
+        <text class="thetitle">{{ '我的订单' }}</text>
+        <!-- <view class="findallorder" @click="goTo('/pages/mine/order/index')">
+          <text>{{ '全部订单' }}</text>
+          <u-icon name="arrow-right" color="#999999" size="16rpx"></u-icon>
+        </view> -->
+      </view>
+      <view class="order_flex thepadding" style="justify-content: center">
+        <view
+          class="theorderflex1"
+          style="margin-bottom: 0"
+          @click="goOrder('')"
+        >
+          <image class="order_img2" src="../../static/images/myorder_1.png" />
+          <view class="order_text">全部订单</view>
+        </view>
+        <view
+          class="theorderflex1"
+          style="margin-bottom: 0"
+          @click="goOrder(1)"
+        >
+          <image class="order_img2" src="../../static/images/myorder_2.png" />
+          <view class="order_text">{{ '待发货' }}</view>
+          <view v-if="payNum" class="qiu">{{ payNum }}</view>
+        </view>
+        <view
+          class="theorderflex1"
+          style="margin-bottom: 0"
+          @click="goOrder(3)"
+        >
+          <image class="order_img2" src="../../static/images/myorder_3.png" />
+          <view class="order_text">{{ '待收货' }}</view>
+        </view>
+        <view
+          class="theorderflex1"
+          style="margin-bottom: 0"
+          @click="goOrder(5)"
+        >
+          <image class="order_img2" src="../../static/images/myorder_4.png" />
+          <view class="order_text">{{ '已收货' }}</view>
+        </view>
+      </view>
+    </view>
 
-      <!-- 新增信息展示 -->
-      <view
-        class="extra-info-card"
+    <!-- 收益区域 -->
+    <view class="my_order" v-if="regionInfoVisible">
+      <view class="my_title">
+        <text class="thetitle">收益区域</text>
+      </view>
+      <template
         v-if="
-          [
-            MEMBER_SIGN.NORMAL_LEVEL,
-            MEMBER_SIGN.ZERO_LEVEL,
-            MEMBER_SIGN.V5_LEVEL,
-          ].includes(Number(userInfo.memberSign))
+          regionInfo.provinceVal || regionInfo.cityVal || regionInfo.countyVal
         "
       >
-        <view
-          class="info-grid"
-          :class="{
-            'multiple-items': userInfo.memberSign === MEMBER_SIGN.NORMAL_LEVEL,
-          }"
-        >
-          <view class="info-item">
-            <text class="info-value">{{ userInfo.pkGradeVal || '-' }}</text>
-            <text class="info-label">会员等级</text>
+        <view class="region-info-box">
+          <view class="region-info-item">
+            <text class="region-info-label">{{ '省' }}</text>
+            <text class="region-info-value">{{
+              regionInfo.provinceVal || '-'
+            }}</text>
           </view>
-          <template v-if="userInfo.memberSign === MEMBER_SIGN.NORMAL_LEVEL">
-            <view class="info-item">
-              <text class="info-value">{{ totalBox || '0' }}</text>
-              <text class="info-label">总盒数</text>
-            </view>
-            <view class="info-item">
-              <text class="info-value">
-                {{ smallAreaBox || '0' }}
-              </text>
-              <text class="info-label">小区盒数</text>
-            </view>
-          </template>
-        </view>
-      </view>
-      <!-- 市场动态 -->
-      <view class="my_order" v-if="true || marketWrapperVisible">
-        <view class="my_title">
-          <text class="thetitle">{{ '市场动态' }}</text>
-        </view>
-        <view class="market-stats-container">
-          <view
-            class="stat-block primary"
-            @click="goTo('/pages/mine/marketDynamic/achievement-list')"
-          >
-            <view class="stat-content">
-              <view class="stat-item">
-                <text class="stat-label">总业绩</text>
-                <view class="stat-value">
-                  <text class="stat-value__integer">{{
-                    formattedTotalSumPv.integer
-                  }}</text>
-                  <text class="stat-value__decimal">{{
-                    formattedTotalSumPv.decimal
-                  }}</text>
-                </view>
-              </view>
-              <view class="stat-divider"></view>
-              <view class="stat-item">
-                <text class="stat-label">小区业绩</text>
-                <view class="stat-value">
-                  <text class="stat-value__integer">{{
-                    formattedSmallAreaPv.integer
-                  }}</text>
-                  <text class="stat-value__decimal">{{
-                    formattedSmallAreaPv.decimal
-                  }}</text>
-                </view>
-              </view>
-            </view>
-            <view class="stat-more-arrow">
-              <u-icon name="arrow-right" color="#fff" size="14"></u-icon>
-            </view>
+          <view class="region-info-item">
+            <text class="region-info-label">{{ '市' }}</text>
+            <text class="region-info-value">{{
+              regionInfo.cityVal || '-'
+            }}</text>
           </view>
-          <view
-            class="stat-block secondary"
-            @click="goTo('/pages/mine/marketDynamic/box-list')"
-          >
-            <view class="stat-content">
-              <view class="stat-item">
-                <text class="stat-label">总盒数</text>
-                <view class="stat-value">
-                  <text class="stat-value__integer">{{
-                    formattedTotalBox.integer
-                  }}</text>
-                  <!-- <text class="stat-value__decimal">{{
-                    formattedTotalBox.decimal
-                  }}</text> -->
-                </view>
-              </view>
-              <view class="stat-divider"></view>
-              <view class="stat-item">
-                <text class="stat-label">小区盒数</text>
-                <view class="stat-value">
-                  <text class="stat-value__integer">{{
-                    formattedSmallAreaBox.integer
-                  }}</text>
-                  <!-- <text class="stat-value__decimal">{{
-                    formattedSmallAreaBox.decimal
-                  }}</text> -->
-                </view>
-              </view>
-            </view>
-            <view class="stat-more-arrow">
-              <u-icon name="arrow-right" color="#fff" size="14"></u-icon>
-            </view>
+          <view class="region-info-item">
+            <text class="region-info-label">{{ '区' }}</text>
+            <text class="region-info-value">{{
+              regionInfo.countyVal || '-'
+            }}</text>
           </view>
         </view>
-      </view>
-      <view class="my_order">
-        <view class="my_title">
-          <text class="thetitle">{{ '我的订单' }}</text>
-          <view class="findallorder" @click="goTo('/pages/mine/order/index')">
-            <text>{{ '全部订单' }}</text>
-            <u-icon name="arrow-right" color="#999999" size="16rpx"></u-icon>
-          </view>
+      </template>
+      <template v-else>
+        <view class="region-select-action">
+          <u-button
+            @click="openRegionSelect"
+            color="#005BAC"
+            shape="circle"
+            text="选择区域"
+          ></u-button>
         </view>
-        <view class="order_flex thepadding" style="justify-content: center">
-          <view
-            class="theorderflex1"
-            style="margin-bottom: 0"
-            @click="goOrder(1)"
-          >
-            <image class="order_img2" src="../../static/images/myorder_2.png" />
-            <view class="order_text">{{ '待发货' }}</view>
-            <view v-if="payNum" class="qiu">{{ payNum }}</view>
-          </view>
-          <view
-            class="theorderflex1"
-            style="margin-bottom: 0"
-            @click="goOrder(3)"
-          >
-            <image class="order_img2" src="../../static/images/myorder_3.png" />
-            <view class="order_text">{{ '待收货' }}</view>
-          </view>
-          <view
-            class="theorderflex1"
-            style="margin-bottom: 0"
-            @click="goOrder(5)"
-          >
-            <image class="order_img2" src="../../static/images/myorder_4.png" />
-            <view class="order_text">{{ '已收货' }}</view>
-          </view>
-        </view>
-      </view>
+      </template>
+    </view>
 
-      <!-- 收益区域 -->
-      <view class="my_order" v-if="regionInfoVisible">
-        <view class="my_title">
-          <text class="thetitle">收益区域</text>
-        </view>
-        <template
-          v-if="
-            regionInfo.provinceVal || regionInfo.cityVal || regionInfo.countyVal
-          "
-        >
-          <view class="region-info-box">
-            <view class="region-info-item">
-              <text class="region-info-label">{{ '省' }}</text>
-              <text class="region-info-value">{{
-                regionInfo.provinceVal || '-'
-              }}</text>
-            </view>
-            <view class="region-info-item">
-              <text class="region-info-label">{{ '市' }}</text>
-              <text class="region-info-value">{{
-                regionInfo.cityVal || '-'
-              }}</text>
-            </view>
-            <view class="region-info-item">
-              <text class="region-info-label">{{ '区' }}</text>
-              <text class="region-info-value">{{
-                regionInfo.countyVal || '-'
-              }}</text>
-            </view>
+    <view class="my_order">
+      <view class="order_flex">
+        <template v-for="(item, index) in otherMenuList">
+          <view
+            class="theorderflex1"
+            v-if="item.ifshow"
+            :key="index"
+            @click="goTo(item.url)"
+          >
+            <image class="order_img" :src="item.imgurl" />
+            <view class="order_text">{{ item.name }}</view>
           </view>
         </template>
-        <template v-else>
-          <view class="region-select-action">
-            <u-button
-              @click="openRegionSelect"
-              color="#005BAC"
-              shape="circle"
-              text="选择区域"
-            ></u-button>
-          </view>
-        </template>
-      </view>
-
-      <view class="my_order">
-        <view class="order_flex">
-          <template v-for="(item, index) in otherMenuList">
-            <view
-              class="theorderflex1"
-              v-if="item.ifshow"
-              :key="index"
-              @click="goTo(item.url)"
-            >
-              <image class="order_img" :src="item.imgurl" />
-              <view class="order_text">{{ item.name }}</view>
-            </view>
-          </template>
-          <!-- <view
-          class="theorderflex1"
-          @click="goTo('/pages/mine/feedBack/feedBack')"
-        >
-          <image class="order_img" src="../../static/images/my_icon12.png" />
-          <view class="order_text">{{ '意见反馈' }}</view>
-        </view> -->
-          <!-- <picker
-          :range="getLanguageList"
-          :value="index"
-          range-key="label"
-          @change="bindPickerChange"
-        >
-          <view class="theorderflex1" @click="goTo('')">
-            <image class="order_img" src="../../static/images/mark6.png" />
-            <view class="order_text">{{ '多语言切换' }}</view>
-          </view>
-        </picker> -->
-          <!-- <view
-          class="theorderflex1"
-          @click="goTo('/pages/mine/branchAddress/branchAddress')"
-        >
-          <image class="order_img" src="../../static/images/my_icon9.png" />
-          <view class="order_text"
-            >{{ '分公司' }}{{ '地址' }}</view
-          >
-        </view> -->
-
-          <!-- <view class="theorderflex1" @click="goYear">
-                    <image class='order_img' src="../../static/images/my_icon12.png" />
-                    <view class="order_text">{{ '年度奖衔' }}</view>
-                </view>  -->
-          <!-- <view class="theorderflex1" @click="goTo('')">
-                    <image class='order_img' src="../../static/images/my_icon12.png" />
-                    <view class="order_text">关于我们</view>
-                </view> -->
+        <!-- <view
+        class="theorderflex1"
+        @click="goTo('/pages/mine/feedBack/feedBack')"
+      >
+        <image class="order_img" src="../../static/images/my_icon12.png" />
+        <view class="order_text">{{ '意见反馈' }}</view>
+      </view> -->
+        <!-- <picker
+        :range="getLanguageList"
+        :value="index"
+        range-key="label"
+        @change="bindPickerChange"
+      >
+        <view class="theorderflex1" @click="goTo('')">
+          <image class="order_img" src="../../static/images/mark6.png" />
+          <view class="order_text">{{ '多语言切换' }}</view>
         </view>
-      </view>
+      </picker> -->
+        <!-- <view
+        class="theorderflex1"
+        @click="goTo('/pages/mine/branchAddress/branchAddress')"
+      >
+        <image class="order_img" src="../../static/images/my_icon9.png" />
+        <view class="order_text"
+          >{{ '分公司' }}{{ '地址' }}</view
+        >
+      </view> -->
 
-      <!-- 会员中心 -->
-
-      <view class="btnbox">
-        <u-button
-          shape="circle"
-          @click="loginOut()"
-          color="#005BAC"
-          :text="'退出登录'"
-        ></u-button>
+        <!-- <view class="theorderflex1" @click="goYear">
+                  <image class='order_img' src="../../static/images/my_icon12.png" />
+                  <view class="order_text">{{ '年度奖衔' }}</view>
+              </view>  -->
+        <!-- <view class="theorderflex1" @click="goTo('')">
+                  <image class='order_img' src="../../static/images/my_icon12.png" />
+                  <view class="order_text">关于我们</view>
+              </view> -->
       </view>
     </view>
+
+    <!-- 会员中心 -->
+
+    <view class="btnbox">
+      <u-button
+        shape="circle"
+        @click="loginOut()"
+        color="#005BAC"
+        :text="'退出登录'"
+      ></u-button>
+    </view>
     <cl-tabbar :current="4"></cl-tabbar>
     <u-popup
       :show="pswShow"
@@ -1085,220 +997,164 @@ export default {
     #005bac 25%,
     #f2f2f2 40%
   ); // background-position: top;
+}
 
-  .topBox {
-    padding: 43rpx 0 20rpx 0;
+.header-container {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  padding: 40rpx 0;
+  color: #ffffff;
+  position: relative;
+  padding-bottom: 30rpx; // Add some bottom padding
+}
 
-    .top_inder {
-      display: flex;
-      justify-content: space-between;
+.user-info-wrapper {
+  display: flex;
+  align-items: center;
+  gap: 24rpx;
+}
 
-      .top_left {
-        display: flex;
+.avatar-container {
+  width: 110rpx;
+  height: 110rpx;
+  border-radius: 50%;
+  border: 4rpx solid rgba(255, 255, 255, 0.5);
+  overflow: hidden;
+  box-shadow: 0 4rpx 10rpx rgba(0, 0, 0, 0.1);
 
-        .left_img {
-          width: 90rpx;
-          height: 90rpx;
-          border-radius: 50%;
-          border: 5rpx solid #ffffff;
-          margin-right: 18rpx;
-
-          .headerimg {
-            width: 100%;
-            height: 100%;
-            border-radius: 50%;
-          }
-        }
-
-        .left_text {
-          color: #ffffff;
-          display: flex;
-          flex-direction: column;
-          justify-content: center;
-          gap: 12rpx;
-
-          .name_box {
-            display: flex;
-            align-items: center;
-
-            .tTit1 {
-              font-size: 32rpx;
-              font-family: Source Han Sans CN;
-              font-weight: bold;
-              margin-right: 0;
-            }
-
-            .kuang {
-              background-color: rgba(0, 0, 0, 0.25);
-              padding: 14rpx 18rpx;
-              border-radius: 40rpx;
-              font-size: 20rpx;
-            }
-          }
-
-          .level_box {
-            display: flex;
-            flex-direction: column;
-            align-items: flex-start;
-            gap: 10rpx;
-          }
-
-          .level_tag {
-            background: linear-gradient(145deg, #c5d8e8, #afc8de, #9ab5d0);
-            border: 1rpx solid #8ca3b8;
-            padding: 6rpx 18rpx;
-            border-radius: 50px;
-            display: inline-flex;
-            align-items: center;
-            gap: 10rpx;
-            position: relative;
-            overflow: hidden;
-            color: #003e7c;
-            box-shadow:
-              inset 0 1px 1px rgba(255, 255, 255, 0.3),
-              0 1px 2px rgba(0, 0, 0, 0.15);
-          }
-
-          .level_tag--primary {
-            background: linear-gradient(145deg, #fde468, #fad02c, #e5b40a);
-            border: 1rpx solid #c8a000;
-            color: #5d4203;
-            box-shadow:
-              inset 0 1px 1px rgba(255, 255, 255, 0.4),
-              0 1px 2px rgba(0, 0, 0, 0.15);
-          }
-
-          .level_label {
-            font-size: 20rpx;
-            opacity: 0.9;
-          }
-
-          .level_value {
-            font-size: 22rpx;
-            font-weight: 600;
-          }
-        }
-      }
-
-      .top_right {
-        position: absolute;
-        top: 40rpx;
-        right: 3%;
-        color: #ffffff;
-        .rtitle {
-          font-size: 22rpx;
-          font-family: PingFang SC;
-          font-weight: 400;
-        }
-      }
-    }
-
-    .grade_left {
-      display: flex;
-      align-items: center;
-      font-size: 12px;
-      color: #005bac;
-      font-weight: 400;
-      // margin-left: 20rpx;
-      .gra_left1 {
-        background: #ffffff;
-        border: 1rpx solid #ffffff;
-        border-radius: 20rpx 0 20rpx 20rpx;
-        // margin-right: 30rpx;
-        padding: 6rpx 20rpx;
-        display: flex;
-        align-items: center;
-
-        .gra_icon {
-          width: 26rpx;
-          height: 26rpx;
-          margin-right: 6rpx;
-        }
-      }
-      // .gra_left1:last-child {
-      //   margin-left: 20rpx;
-      // }
-    }
-
-    .grade_flex {
-      display: flex;
-      align-items: center;
-      color: #ffffff;
-    }
-
-    .btom_inder {
-      display: flex;
-      align-items: center; // margin-top: 24rpx;
-
-      .jxbox {
-        width: 65rpx;
-        height: 65rpx;
-        margin-right: 26rpx;
-
-        .jximg {
-          width: 100%;
-          height: 100%;
-        }
-      }
-    }
+  .avatar-image {
+    width: 100%;
+    height: 100%;
   }
-  .jiangxian {
-    display: flex;
-    color: #ffffff;
-    align-items: center;
-    margin: 0rpx 0 10rpx 0;
+}
+
+.user-details {
+  display: flex;
+  flex-direction: column;
+  gap: 16rpx;
+}
+
+.user-name-and-level {
+  display: flex;
+  align-items: center;
+  gap: 16rpx;
+
+  .user-name {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: #fff;
   }
-  .yt1 {
+
+  .svip-badge {
+    background: linear-gradient(145deg, #fde468, #fad02c);
+    color: #5d4203;
+    padding: 4rpx 16rpx;
+    border-radius: 50px;
+    font-size: 22rpx;
     font-weight: 600;
-    font-size: 18px;
-    margin-left: 10rpx;
+    box-shadow:
+      inset 0 1px 1px rgba(255, 255, 255, 0.4),
+      0 1px 2px rgba(0, 0, 0, 0.15);
+    border: 1rpx solid #c8a000;
   }
-  .hisImg {
-    width: 50rpx;
-    height: 50rpx;
-    margin-left: 10rpx;
+}
+
+.awards-container {
+  display: flex;
+  flex-direction: column;
+  gap: 8rpx;
+  align-items: flex-start;
+}
+
+.award-tag {
+  background-color: rgba(255, 255, 255, 0.15);
+  padding: 8rpx 16rpx;
+  border-radius: 50px;
+  display: flex;
+  align-items: center;
+  gap: 8rpx;
+  font-size: 22rpx;
+
+  .award-label {
+    opacity: 0.8;
+  }
+  .award-value {
+    font-weight: 500;
+  }
+}
+
+.settings-icon-container {
+  padding: 10rpx;
+  background-color: rgba(255, 255, 255, 0.1);
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  margin-top: 10rpx; // Align vertically with user name
+}
+
+.jiangxian {
+  display: flex;
+  color: #ffffff;
+  align-items: center;
+  margin: 0rpx 0 10rpx 0;
+}
+
+.yt1 {
+  font-weight: 600;
+  font-size: 18px;
+  margin-left: 10rpx;
+}
+
+.hisImg {
+  width: 50rpx;
+  height: 50rpx;
+  margin-left: 10rpx;
+}
+
+.jxTit {
+  flex: 1;
+  text-align: center;
+}
+
+.jxTit1 {
+  font-weight: 600;
+  font-size: 24rpx;
+}
+
+.contentLink {
+  .linktitle {
+    font-size: 28rpx;
+    font-family: Source Han Sans CN;
+    font-weight: bold;
+    color: #333333;
+    margin-bottom: 25rpx;
   }
 
-  .jxTit {
-    flex: 1;
-    text-align: center;
+  background-color: #ffffff; // border-radius: 25px;
+  border-top-left-radius: 25px;
+  border-top-right-radius: 25px;
+  padding: 35rpx 25rpx;
+
+  .my_icon {
+    width: 39rpx;
+    height: 37rpx;
   }
-  .jxTit1 {
-    font-weight: 600;
-    font-size: 24rpx;
+
+  .my_icon2 {
+    width: 39rpx;
+    height: 43rpx;
   }
-  .contentLink {
-    .linktitle {
-      font-size: 28rpx;
-      font-family: Source Han Sans CN;
-      font-weight: bold;
-      color: #333333;
-      margin-bottom: 25rpx;
-    }
 
-    background-color: #ffffff; // border-radius: 25px;
-    border-top-left-radius: 25px;
-    border-top-right-radius: 25px;
-    padding: 35rpx 25rpx;
+  .my_icon3 {
+    width: 43rpx;
+    height: 37rpx;
+  }
 
-    .my_icon {
-      width: 39rpx;
-      height: 37rpx;
-    }
-
-    .my_icon2 {
-      width: 39rpx;
-      height: 43rpx;
-    }
-
-    .my_icon3 {
-      width: 43rpx;
-      height: 37rpx;
-    }
-
-    .u-cell-text {
-      margin-left: 25rpx;
-    }
+  .u-cell-text {
+    margin-left: 25rpx;
   }
 }
 
diff --git a/pages/pay/index.vue b/pages/pay/index.vue
index b4287d2..c955103 100644
--- a/pages/pay/index.vue
+++ b/pages/pay/index.vue
@@ -420,7 +420,7 @@
               <div style="white-space: nowrap">{{ '收货地址' }}</div>
               <div>
                 {{ orderData.recProvince }}{{ orderData.recCity
-                }}{{ orderData.recAddress }}
+                }}{{ orderData.recCounty }}{{ orderData.recAddress }}
               </div>
             </div>
           </div>
@@ -456,7 +456,7 @@
               <div style="white-space: nowrap">{{ '收货地址' }}</div>
               <div>
                 {{ orderData.recProvince }}{{ orderData.recCity
-                }}{{ orderData.recAddress }}
+                }}{{ orderData.recCounty }}{{ orderData.recAddress }}
               </div>
             </div>
           </div>
@@ -492,7 +492,7 @@
               <div style="white-space: nowrap">{{ '收货地址' }}</div>
               <div>
                 {{ orderData.recProvince }}{{ orderData.recCity
-                }}{{ orderData.recAddress }}
+                }}{{ orderData.recCounty }}{{ orderData.recAddress }}
               </div>
             </div>
           </div>