Merge branch 'li-yi' of https://git.bjtdba.com/TDBA/cxb-minapp-vue3 into li-yi

src/apis/model/userInfoModel.ts

@@ -7,10 +7,15 @@ export interface UpdateUserInfoRequestModel {
     avatar: string
     // addres: string
 }
-export interface UserInfoModel{
+export interface UserInfoModel {
     /** 用户id */
     uid: string
     /** 微信用户 id */
+    /** 市/县代理 */
+    area_manage_type: string
+    area_manage: manageModel
+    /**股东 id */
+    stockholder: number
     wechat_user_id: string
     /** 支付宝用户 id */
     ali_user_id: string
@@ -140,4 +145,9 @@ export interface UserInfoModel{
     /** 团队人数 */
     team_number: number
     is_bangfu: boolean
+}
+export interface manageModel {
+    area_name: []
+    code_list: string
+    type: string
 }

src/components/FPopup/FPopup.vue

@@ -7,7 +7,10 @@ import { usePopup } from './use-popup'
 const props = defineProps(popupProps)
 const emit = defineEmits(popupEmits)
 const { showValue, classes } = usePopup(props, emit)
-
+onLoad(()=>{
+  console.log(showValue, classes);
+  
+})
 const animationName = {
   center: 'fade',
   top: 'slide-down',

src/config/app.ts

@@ -11,6 +11,7 @@ let httpApi = 'https://app.bjtdba.com'
 
 // let httpApi = 'http://192.168.1.77:8324'
 export const CDN_URL = 'https://cdn.bjtdba.com/chuxubao'
+export const CDM_URL = 'https://cdn.bjtdba.com/vod'
 
 // 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer.crmeb.net
 let wsApi = ''

src/pages/home/components/navs.vue

@@ -2,11 +2,11 @@
 import {getHomeQuickLink} from "~/apis/common";
 import {PLATFORM_NAME} from "~/apis/model/common.model";
 import {useDacangStore} from "~/stores/dacangStore";
-import {CDN_URL} from "~/config/app";
+import {CDN_URL,CDM_URL} from "~/config/app";
 
 const navList = ref([{
-  image: CDN_URL + '/static/home-nav/home_dacang_220614.png',
-  title: '精品大仓',
+  image: CDM_URL + '/image/2023-11-20/20231120155257975.png',
+  title: '精品商城',
   key: 'jingpin'
 }, {
   image: CDN_URL + '/static/home-nav/home_xianshimiaosha_220614.png',
@@ -24,7 +24,7 @@ const navList = ref([{
   // 测试库
   // categoryId: '149'
 },{
-  image: CDN_URL + '/static/home-nav/pinduoduo_x.png',
+  image: CDM_URL + '/image/2023-11-24/20231124150424710.png',
   title: '拼多多',
   key: PLATFORM_NAME.PDD
 }, {
@@ -69,7 +69,7 @@ const navList = ref([{
 //   categoryId: '576'
 // }, 
 {
-  image: CDN_URL + '/static/home-nav/vip_img.png',
+  image: CDM_URL + '/image/2023-11-20/20231120155340358.png',
   title: '会员专区',
   key: 'member',
   // key: PLATFORM_NAME.DC,

src/pages/my-rules/index.vue

@@ -2,8 +2,8 @@
 // import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import mpHtml from 'mp-html/dist/uni-app/components/mp-html/mp-html'
 
-import {encodePhone} from "../../utils";
-import {getAgentInfo, getRules, getUserInfo} from "~/apis/user";
+import { encodePhone } from "../../utils";
+import { getAgentInfo, getRules, getUserInfo } from "~/apis/user";
 
 const userStore = useUserStore()
 const ruleDetail = ref<{
@@ -19,119 +19,205 @@ const ruleDetail = ref<{
 const currentType = ref<any>([])
 
 const showUpgradeInfo = ref(false)
+
+// const userType = computed(() => {
+//   const userRichType = userStore.userInfo?.user_rich_type
+//   // console.log(userStore.userInfo)
+//   const bangfu = userStore.userInfo?.is_bangfu ? '帮扶中心 ' : ''
+//   // 创始人
+//   if (userRichType == 3) {
+//     if (bangfu) {
+//       return ['创始人', bangfu]
+//     }
+//     return ['创始人']
+//     // return [].push()
+//   }
+//   // 普通用户
+//   if (userRichType == 0) {
+//     if (bangfu) {
+//       return ['用户', bangfu]
+//     }
+//     return ['用户']
+//   }
+//   // 会员
+//   if (userRichType == 1) {
+//     if (bangfu) {
+//       return ['会员', bangfu]
+//     }
+//     return ['会员']
+
+//   }
+//   if (userRichType == 3) {
+//     if (bangfu) {
+//       return ['创始人', bangfu]
+//     }
+//     return ['创始人']
+//   }
+//   // 合伙人
+//   if (userRichType == 4) {
+//     // return '高级会员'
+//     if (bangfu) {
+//       return ['VIP', bangfu]
+//     }
+//     return ['VIP']
+//   }
+//   if (userRichType == 5) {
+//     if (bangfu) {
+//       return ['初始级合伙人', bangfu]
+//     }
+//     return ['初始级合伙人']
+//   }
+//   if (userRichType == 6) {
+//     if (bangfu) {
+//       return ['中级合伙人', bangfu]
+//     }
+//     return ['中级合伙人']
+//   }
+//   if (userRichType == 7) {
+//     if (bangfu) {
+//       return ['高级合伙人', bangfu]
+//     }
+//     return ['高级合伙人']
+//   }
+//   if (!userRichType) {
+//     if (bangfu) {
+//       return ['用户', bangfu]
+//     }
+//     return ['用户']
+//   }
+// })
+// /*
+// const userType = computed(() => {
+//   const userRichType = userStore.userInfo?.user_rich_type
+
+//   // 创始人
+//   if (userRichType == 3) {
+//     return '创始人'
+//   }
+//   // 普通用户
+//   if (userRichType == 0) {
+//     return '用户'
+//   }
+//   // 会员
+//   if (userRichType == 1) {
+//     return '会员'
+//   }
+//   if (userRichType == 3) {
+//     return '创始人'
+//   }
+//   // 合伙人
+//   if (userRichType == 4) {
+//     // return '合伙人(VIP)'
+//     return 'VIP'
+//   }
+//   if (userRichType == 5) {
+//     return '初始级合伙人'
+//   }
+//   if (userRichType == 6) {
+//     return '中级合伙人'
+//   }
+//   if (userRichType == 7) {
+//     return '高级合伙人'
+//   }
+//   if (!userRichType) {
+//     return '用户'
+//   }
+// })
+// */
+
+//0:普通用户 1:会员  3:创始人 4:高级会员  8合伙人 9联合创始人
 const userType = computed(() => {
   const userRichType = userStore.userInfo?.user_rich_type
-  // console.log(userStore.userInfo)
+  // console.log('我是大哥',userStore.userInfo)
   const bangfu = userStore.userInfo?.is_bangfu ? '帮扶中心 ' : ''
-  // 创始人
-  if (userRichType == 3) {
-    if (bangfu) {
-      return ['创始人', bangfu]
-    }
-    return ['创始人']
-    // return [].push()
-  }
+  // console.log('我是帮扶',bangfu);
+  
   // 普通用户
   if (userRichType == 0) {
-    if (bangfu) {
-      return ['用户', bangfu]
-    }
-    return ['用户']
+    // if (bangfu) {
+    //   return ['../../static/img-hy/帮扶中心.png', bangfu]
+    // }
+    return ['../../static/img-hy/用户.png']
   }
   // 会员
   if (userRichType == 1) {
-    if (bangfu) {
-      return ['会员', bangfu]
-    }
-    return ['会员']
+    // if (bangfu) {
+    //   return ['../../static/img-hy/帮扶中心.png', bangfu]
+    // }
+    return ['../../static/img-hy/会员.png']
 
   }
+    // 创始人
   if (userRichType == 3) {
-    if (bangfu) {
-      return ['创始人', bangfu]
-    }
-    return ['创始人']
+    // if (bangfu) {
+    //   return ['../../static/img-hy/帮扶中心.png', bangfu]
+    // }
+    return ['../../static/img-hy/创始人.png']
   }
   // 合伙人
   if (userRichType == 4) {
     // return '高级会员'
-    if (bangfu) {
-      return ['VIP', bangfu]
-    }
-    return ['VIP']
-  }
-  if (userRichType == 5) {
-    if (bangfu) {
-      return ['初始级合伙人', bangfu]
-    }
-    return ['初始级合伙人']
-  }
-  if (userRichType == 6) {
-    if (bangfu) {
-      return ['中级合伙人', bangfu]
-    }
-    return ['中级合伙人']
-  }
-  if (userRichType == 7) {
-    if (bangfu) {
-      return ['高级合伙人', bangfu]
-    }
-    return ['高级合伙人']
-  }
-  if (!userRichType) {
-    if (bangfu) {
-      return ['用户', bangfu]
-    }
-    return ['用户']
-  }
-})
-/*
-const userType = computed(() => {
-  const userRichType = userStore.userInfo?.user_rich_type
-
-  // 创始人
-  if (userRichType == 3) {
-    return '创始人'
-  }
-  // 普通用户
-  if (userRichType == 0) {
-    return '用户'
+    // if (bangfu) {
+    //   return ['../../static/img-hy/帮扶中心.png', bangfu]
+    // }
+    return ['../../static/img-hy/高级会员.png']
   }
-  // 会员
-  if (userRichType == 1) {
-    return '会员'
-  }
-  if (userRichType == 3) {
-    return '创始人'
-  }
-  // 合伙人
-  if (userRichType == 4) {
-    // return '合伙人(VIP)'
-    return 'VIP'
-  }
-  if (userRichType == 5) {
-    return '初始级合伙人'
+  if (userRichType == 8) {
+    // if (bangfu) {
+    //   return ['../../static/img-hy/帮扶中心.png', bangfu]
+    // }
+    return ['../../static/img-hy/合伙人.png']
   }
-  if (userRichType == 6) {
-    return '中级合伙人'
-  }
-  if (userRichType == 7) {
-    return '高级合伙人'
+  if (userRichType == 9) {
+    // if (bangfu) {
+    //   return ['../../static/img-hy/帮扶中心.png', bangfu]
+    // }
+    return ['../../static/img-hy/联合创始人.png']
   }
   if (!userRichType) {
-    return '用户'
+    // if (bangfu) {
+    //   return ['../../static/img-hy/帮扶中心.png', bangfu]
+    // }
+    return ['']
   }
 })
-*/
-
+//0:普通用户 1:股东
+// const AlholderType = computed(() => {
+//   const stockholder = userStore.userInfo?.stockholder
+//   console.log('我是stockholder',userStore.userInfo.stockholder)
+//   // 普通用户
+//   if (stockholder == 0) {
+//     return ['']
+//   }
+//   // 股东
+//   if (stockholder == 1) {
+//     return ['../../static/img-hy/股东.png']
+//   }
+  
+// })
+// '':普通用户 district-区/县代 city-市代',
+// const areaType = computed(() => {
+//   const areamanage = userStore.userInfo?.area_manage_type
+//   console.log('我是area_manage_type',userStore.userInfo.area_manage_type)
+//   // 县/区代理
+//   if (areamanage == 'district') {
+//     return ['../../static/img-hy/district.png']
+//   }
+//   // 市代理
+//   if (areamanage == 'city') {
+//     return ['../../static/img-hy/city.png']
+//   }
+//   //普通用户
+//   if(!areamanage){
+//     return['']
+//   }
+  
+// })
+
+
+
+onLoad(async () => {
 
-onLoad(async (option) => {
-  // console.log(option)
-  if (option && option.userType) {
-    currentType.value = [option.userType]
-  } else {
-    currentType.value = userType
-  }
   await userStore.getUserInfo()
   await userStore.getUserYanglaoJin()
 })
@@ -208,9 +294,21 @@ onShow(() => {
 })
 
 function handleUserUpgrade() {
-  if (ruleId.value < 21) {
+  console.log('ruleid',ruleId.value);
+  
+  if (ruleId.value < 20) {
     const id = ruleId.value + 1
     getRules(id).then(res => {
+      console.log(res);
+      
+      ruleDetail.value = res
+      showUpgradeInfo.value = true
+    })
+  }else if(ruleId.value = 20){
+    const id = ruleId.value + 4
+    getRules(id).then(res => {
+      console.log(res);
+      
       ruleDetail.value = res
       showUpgradeInfo.value = true
     })
@@ -229,10 +327,8 @@ function handleToVipPage() {
     <div class="flex flex-col gap-4 relative px-3 pb-safe">
       <div class="pt-5 ">
         <div class="flex gap-2 mb-2 text-white mb-6">
-          <image v-if="userStore.userInfo && userStore.userInfo.avatar" :src="userStore.userInfo.avatar"
-                 mode="widthFix"
-                 class="w-9 h-9 rounded-full"
-          ></image>
+          <image v-if="userStore.userInfo && userStore.userInfo.avatar" :src="userStore.userInfo.avatar" mode="widthFix"
+            class="w-9 h-9 rounded-full"></image>
 
           <div class="flex">
             <div class="flex flex-col">
@@ -246,51 +342,38 @@ function handleToVipPage() {
               </div>
             </div>
             <div class="flex gap-1 items-center px-1">
-              <div
-                  v-for="(item, index) in currentType"
-                  :key="index"
-                  class="flex rounded-full border border-solid border-1px border-yellow text-[12px] text-white w-12 h-5 justify-center items-center w-fit px-1">
-                {{ item }}
+              <div class="flex rounded-full  text-[12px] text-white w-12 h-5 justify-center items-center w-fit px-1">
+                <image class="vip_img" :src="userType" v-if="userType"></image>
+                <!-- <image class="vip_img" :src="AlholderType" v-if="AlholderType
+                  "></image>
+                <image class="vip_img" :src="areaType" v-if="areaType"></image> -->
               </div>
             </div>
-<!--            <div-->
-<!--                class="flex rounded-full border border-solid border-1px border-yellow text-[12px] text-white w-12 h-5 justify-center items-center w-fit px-1">-->
-<!--              {{ userType }}-->
-<!--            </div>-->
+            <!--            <div-->
+            <!--                class="flex rounded-full border border-solid border-1px border-yellow text-[12px] text-white w-12 h-5 justify-center items-center w-fit px-1">-->
+            <!--              {{ userType }}-->
+            <!--            </div>-->
           </div>
 
 
         </div>
         <div class="bg-white rounded flex flex-col gap-6 py-4 text-xl">
-          <div
-              v-if="userStore.userInfo"
-              class="flex flex-wrap">
-            <div
-                @tap="handleShowAnnuityDetail"
-                class="w-1/3 flex flex-col justify-center items-center"
-            >
+          <div v-if="userStore.userInfo" class="flex flex-wrap">
+            <div @tap="handleShowAnnuityDetail" class="w-1/3 flex flex-col justify-center items-center">
               <div>{{ userStore.yanglao.all_yanglao }}</div>
               <div class="text-xs">养老金</div>
             </div>
-            <div
-                @tap="handleShowMyInvitation"
-                class="w-1/3  flex flex-col justify-center items-center">
+            <div @tap="handleShowMyInvitation" class="w-1/3  flex flex-col justify-center items-center">
               <div>{{ agentInfo.brokerage_price ? agentInfo.brokerage_price : '0' }}</div>
               <div class="text-xs">我的佣金</div>
             </div>
-            <div
-                @tap="handleShowMyIntegral"
-                class="w-1/3  flex flex-col justify-center items-center">
+            <div @tap="handleShowMyIntegral" class="w-1/3  flex flex-col justify-center items-center">
               <div>{{ userStore.userInfo.score }}</div>
               <div class="text-xs">我的积分</div>
             </div>
           </div>
-          <div
-              v-if="userStore.userInfo"
-              class="flex">
-            <div
-                @click="handleToRedIntegral"
-                class="w-1/2 flex flex-col justify-center items-center">
+          <div v-if="userStore.userInfo" class="flex">
+            <div @click="handleToRedIntegral" class="w-1/2 flex flex-col justify-center items-center">
               <div>{{ userStore.userInfo.red }}</div>
               <div class="text-xs">红积分提现</div>
             </div>
@@ -304,22 +387,14 @@ function handleToVipPage() {
 
       </div>
 
-      <div
-          v-if="ruleDetail && ruleDetail.content && !showUpgradeInfo"
-          class="p-3 bg-white text-sm text-gray-500"
-      >
+      <div v-if="ruleDetail && ruleDetail.content && !showUpgradeInfo" class="p-3 bg-white text-sm text-gray-500">
         <mpHtml :content="ruleDetail.content"></mpHtml>
       </div>
-      <div
-          v-else
-          class="p-3 bg-white text-sm text-gray-500"
-      >
+      <div v-else class="p-3 bg-white text-sm text-gray-500">
         <mpHtml :content="ruleDetail.content" v-if="ruleDetail && ruleDetail.content"></mpHtml>
 
         <div class="flex justify-center items-center">
-          <nut-button
-              @click="handleToVipPage"
-              type="primary" size="small">立即开通</nut-button>
+          <nut-button @click="handleToVipPage" type="primary" size="small">立即开通</nut-button>
 
         </div>
       </div>
@@ -330,10 +405,8 @@ function handleToVipPage() {
         <div class="font-bold">还有更多奖励权益</div>
         <div class="flex justify-end">
 
-          <div
-              @click="handleUserUpgrade"
-              class="text-[12px] border border-solid border-1px rounded px-1 border-gray text-gray-600"
-          >了解更多奖励</div>
+          <div @click="handleUserUpgrade"
+            class="text-[12px] border border-solid border-1px rounded px-1 border-gray text-gray-600">了解更多奖励</div>
         </div>
       </div>
 
@@ -341,8 +414,6 @@ function handleToVipPage() {
 
     </div>
   </div>
-
-
 </template>
 
 <route lang="yaml">
@@ -355,7 +426,13 @@ style:
 </route>
 
 <style>
-page{
+page {
   background: #f5f5f5;
 }
+
+.vip_img {
+  width: 48px;
+  height: 24px;
+  margin-left: 2px;
+}
 </style>

src/pages/user/index.vue

@@ -1,12 +1,14 @@
 <script lang="ts" setup>
-import {useUserStore} from "~/stores/userStore";
+import { useUserStore } from "~/stores/userStore";
 import CXBAuthorize from "~/components/CXBAuthorize/CXBAuthorize.vue";
-import {getAgentInfo, getUserInfo} from "~/apis/user";
-import {CDN_URL} from "~/config/app";
+import { getAgentInfo, getUserInfo } from "~/apis/user";
+import { CDN_URL,CDM_URL } from "~/config/app";
 import Routine from "~/libs/routine";
-import {totalOrderNumber} from "~/apis/order.api";
-import type {OrderQuantityModel} from "~/apis/model/order.model";
-import type {Ref} from "vue";
+import { totalOrderNumber } from "~/apis/order.api";
+import type { OrderQuantityModel } from "~/apis/model/order.model";
+import FPopup from "~/components/FPopup/FPopup.vue";
+import { CANCEL_EVENT, OPEN_EVENT } from "~/constants/event";
+import type { Ref } from "vue";
 const pageStore = usePageStoreWidthOut()
 const currentType = ref('')
 const myOrderList = [{
@@ -42,13 +44,22 @@ const contactUsList = [{
   icon: '/static/icon/kefu_icon.png',
   text: '联系客服',
   url: 'https://work.weixin.qq.com/kfid/kfce29f31a08fd53ee0'
-},{
+}, {
   type: 'link',
   icon: CDN_URL + '/static/assets/bangzhuzhongxin_220620.png',
   text: '帮助中心',
   url: '/pages/help-center/index'
 }]
 
+
+//市/区代表弹框标识
+const showValue = ref(false)
+
+//https://cdn.bjtdba.com/vod/image/2023-11-24/20231124154421388.png
+
+
+//https://cdn.bjtdba.com/vod/image/2023-11-24/20231124154612477.png
+
 const myServiceList = [{
   icon: CDN_URL + '/static/assets/wodeyaoqing_220620.png',
   text: '我的邀请',
@@ -234,71 +245,111 @@ function handleShowMyAllOrder(tab?: number) {
 
 const userType = computed(() => {
   const userRichType = userStore.userInfo?.user_rich_type
+ 
   // console.log(userStore.userInfo)
-  const bangfu = userStore.userInfo?.is_bangfu ? '帮扶中心 ' : ''
-  // 创始人
-  if (userRichType == 3) {
-    if (bangfu) {
-      return ['创始人', bangfu]
-    }
-    return ['创始人']
-    // return [].push()
-  }
   // 普通用户
   if (userRichType == 0) {
-    if (bangfu) {
-      return ['用户', bangfu]
-    }
-    return ['用户']
+
+    return '../../static/img-hy/用户.png'
   }
   // 会员
   if (userRichType == 1) {
-    if (bangfu) {
-      return ['会员', bangfu]
-    }
-    return ['会员']
+
+    return '../../static/img-hy/会员.png'
 
   }
   if (userRichType == 3) {
-    if (bangfu) {
-      return ['创始人', bangfu]
-    }
-    return ['创始人']
+
+    return '../../static/img-hy/创始人.png'
   }
-  // 合伙人
+  // 高级会员
   if (userRichType == 4) {
-    // return '高级会员'
-    if (bangfu) {
-      return ['VIP', bangfu]
-    }
-    return ['VIP']
+
+    return '../../static/img-hy/高级会员.png'
   }
-  if (userRichType == 5) {
-    if (bangfu) {
-      return ['初始级合伙人', bangfu]
-    }
-    return ['初始级合伙人']
+  if (userRichType == 8) {
+
+    return '../../static/img-hy/合伙人.png'
   }
-  if (userRichType == 6) {
-    if (bangfu) {
-      return ['中级合伙人', bangfu]
-    }
-    return ['中级合伙人']
+  if (userRichType == 9) {
+
+    return '../../static/img-hy/联合创始人.png'
+  }
+  if (!userRichType) {
+
+    return ''
   }
-  if (userRichType == 7) {
-    if (bangfu) {
-      return ['高级合伙人', bangfu]
+})
+
+//0:普通用户 1:股东
+const AlholderType = computed(() => {
+  const stockholder = userStore.userInfo?.stockholder
+  // 普通用户
+  if (stockholder == 0) {
+    return ''
+  }
+  // 股东
+  if (stockholder == 1) {
+    return '../../static/img-hy/股东.png'
+  }
+
+})
+// '':普通用户 district-区/县代 city-市代',
+const areaType = computed(() => {
+  if (userStore.userInfo?.area_manage.area_name.length>0) {
+    const areamanage = userStore.userInfo?.area_manage_type
+    // 县/区代理
+    if (areamanage == 'district') {
+      return '../../static/img-hy/district.png'
+    }
+    // 市代理
+    if (areamanage == 'city') {
+      return '../../static/img-hy/city.png'
+    }
+    //普通用户
+    if (!areamanage) {
+      return ''
     }
-    return ['高级合伙人']
+
   }
-  if (!userRichType) {
-    if (bangfu) {
-      return ['用户', bangfu]
+
+})
+
+//弹框展示
+function openPopup() {
+  showValue.value = true
+}
+//关闭弹框
+const onCancel = () => {
+  // show.value = false
+  showValue.value = false
+}
+
+//计算市区县展示图片
+const backImg = computed(() => {
+  if (userStore.userInfo?.area_manage_type) {
+    const areamanage = userStore.userInfo?.area_manage_type
+    // 县/区代理
+    if (areamanage == 'district') {
+      return CDM_URL+'/image/2023-11-24/20231124154421388.png'
+    }
+    // 市代理
+    if (areamanage == 'city') {
+      return CDM_URL+'/image/2023-11-24/20231124154612477.png'
     }
-    return ['用户']
   }
+
+})
+const textType = computed(() => {
+  if (userStore.userInfo?.area_manage?.area_name) {
+    const areamanage = userStore.userInfo?.area_manage.area_name
+    let res = areamanage.join("");
+    return res
+  }
+
 })
 
+
 function handleToRedIntegral() {
   uni.navigateTo({
     url: '/pages/red-integral/index'
@@ -333,9 +384,9 @@ function handleShowMyProfile() {
   })
 }
 
-function handleShowMyRulePage(item) {
+function handleShowMyRulePage() {
   uni.navigateTo({
-    url: `/pages/my-rules/index?userType=${item}`
+    url: `/pages/my-rules/index`
   })
 }
 </script>
@@ -346,71 +397,90 @@ function handleShowMyRulePage(item) {
       <div class="pt-15 ">
         <div class="flex gap-2 mb-2 text-white mb-6">
           <image v-if="userStore.userInfo && userStore.userInfo.avatar" :src="userStore.userInfo.avatar"
-                 @click="handleShowMyProfile"
-                 mode="widthFix"
-                 class="w-9 h-9 rounded-full"
-          ></image>
-          <image
-              v-else
-              @click="checkAuth"
-              src="https://app.bjtdba.com/uploads/logo.jpg"
-              mode="widthFix"
-              class="w-9 h-9 rounded-full"
-          />
-          <div class="flex">
-            <div class="flex flex-col">
+            @click="handleShowMyProfile" mode="widthFix" class="w-9 h-9 rounded-full"></image>
+          <image v-else @click="checkAuth" src="https://app.bjtdba.com/uploads/logo.jpg" mode="widthFix"
+            class="w-9 h-9 rounded-full" />
+          <div class="flex flex-col">
+            <div class="flex">
               <div class="text-sm">
                 <div class="text-sm" v-if="userStore.userInfo">
                   {{ userStore.userInfo.nickname ? userStore.userInfo.nickname : '登录' }}
                 </div>
               </div>
-              <div class="text-xs" v-if="userStore.userInfo && userStore.userInfo.phone">
+              <div class="text-sm flex-height " v-if="userStore.userInfo && userStore.userInfo.phone">
                 {{ encodePhone(userStore.userInfo.phone) }}
               </div>
             </div>
-            <div class="flex gap-1 items-center px-1">
-            <div
-                v-for="(item, index) in userType"
-                :key="index"
-                @click="handleShowMyRulePage(item)"
-                class="flex rounded-full border border-solid border-1px border-yellow text-[12px] text-white w-12 h-5 justify-center items-center w-fit px-1">
-              {{ item }}
-            </div>
+            <div class="btm flex gap-1 px-1">
+              <!-- 用户 -->
+              <div v-if="userType" @click="handleShowMyRulePage()"
+                class="flex rounded-full  text-[12px] text-white w-12 h-5  w-fit px-1">
+                <image lazy-load class="vip_img" :src="userType"></image>
+              </div>
+              <!-- 市区县代理 -->
+              <div @click="openPopup" v-if="areaType"
+                class="flex rounded-full  text-[12px] text-white w-12 h-5  w-fit px-1">
+                <image lazy-load class="vip_img" :src="areaType"></image>
+              </div>
+              <!-- 股东 -->
+              <div v-if="AlholderType" 
+                class="flex rounded-full  text-[12px] text-white w-12 h-5   w-fit px-1">
+                <image lazy-load class="vip_img" :src="AlholderType"></image>
+              </div>
             </div>
           </div>
-
+          <FPopup v-model:show="showValue" position="center" exClass="box_2 ">
+            <div class="box_2 flex-row">
+              <div class="box_2" v-if="backImg" >
+                <image  lazy-load class="img_1" :src="backImg"></image>
+              </div>
+              <div class="group_2 flex-col lolr ">
+                <div class="div_box pong1 ">
+                  <div class="blue_1">
+                    <image lazy-load class="off_3" src="../../static/img-hy/DLqy.png" />
+                    <span class="pan">代理区域</span>
+                  </div>
+                  <div class="blue_2 height1 ">
+                    {{ textType }}
+                  </div>
+                </div>
+                <div class="div_box pong2 ">
+                  <div class="blue_1">
+                    <image lazy-load class="off_3" src="../../static/img-hy/QYDL.png" />
+                    <span class="pan">代理权益</span>
+                  </div>
+                  <div class="block_1 flex-col blue_2 height2 ">
+                    <div class="text-group_4 flex-col justify-between">
+                      <div class=" pend">所辖区域的区域管理分红</div>
+                      <div class="text_5 pand ">(参照会员系统佣金逻辑）</div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div @click="onCancel" class="off_1">
+              <image lazy-load class="off_2" src="../../static/img-hy/关闭.png" />
+            </div>
+          </FPopup>
 
         </div>
         <div class="bg-white rounded flex flex-col gap-6 py-4 text-xl">
-          <div
-              v-if="userStore.userInfo"
-              class="flex flex-wrap">
-            <div
-                @tap="handleShowAnnuityDetail"
-                class="w-1/3 flex flex-col justify-center items-center"
-            >
+          <div v-if="userStore.userInfo" class="flex flex-wrap">
+            <div @tap="handleShowAnnuityDetail" class="w-1/3 flex flex-col justify-center items-center">
               <div>{{ userStore.yanglao.all_yanglao }}</div>
               <div class="text-xs">养老金</div>
             </div>
-            <div
-                @tap="handleShowMyInvitation"
-                class="w-1/3  flex flex-col justify-center items-center">
-              <div>{{ agentInfo.brokerage_price ? agentInfo.brokerage_price : '0.00'}}</div>
+            <div @tap="handleShowMyInvitation" class="w-1/3  flex flex-col justify-center items-center">
+              <div>{{ agentInfo.brokerage_price ? agentInfo.brokerage_price : '0.00' }}</div>
               <div class="text-xs">我的佣金</div>
             </div>
-            <div
-                @tap="handleShowMyIntegral"
-                class="w-1/3  flex flex-col justify-center items-center">
+            <div @tap="handleShowMyIntegral" class="w-1/3  flex flex-col justify-center items-center">
               <div>{{ userStore.userInfo.score }}</div>
               <div class="text-xs">我的积分</div>
             </div>
           </div>
-          <div
-              v-if="userStore.userInfo"
-              class="flex">
-            <div
-                @click="handleToRedIntegral"
-                class="w-1/2 flex flex-col justify-center items-center">
+          <div v-if="userStore.userInfo" class="flex">
+            <div @click="handleToRedIntegral" class="w-1/2 flex flex-col justify-center items-center">
               <div>{{ userStore.userInfo.red }}</div>
               <div class="text-xs">红积分提现</div>
             </div>
@@ -428,9 +498,7 @@ function handleShowMyRulePage(item) {
         <div class="flex justify-between pt-4 mb-4">
           <div>我的订单</div>
           <div class="flex items-center">
-            <div
-                @click="handleShowMyAllOrder(0)"
-                class="text-sm text-gray">查看全部
+            <div @click="handleShowMyAllOrder(0)" class="text-sm text-gray">查看全部
             </div>
             <div class="f-text-color-2 i-tabler-chevron-right"></div>
           </div>
@@ -438,51 +506,35 @@ function handleShowMyRulePage(item) {
 
         </div>
         <div class="flex pb-4">
-          <div
-              @click="handleShowMyAllOrder(index + 1)"
-              v-for="(item, index) in myOrderList" :key="index"
-              class="flex flex-col justify-center items-center w-1/5 gap-3"
-          >
+          <div @click="handleShowMyAllOrder(index + 1)" v-for="(item, index) in myOrderList" :key="index"
+            class="flex flex-col justify-center items-center w-1/5 gap-3">
             <div class="relative">
-              <div class="bg-primary rounded-full w-3 h-3 text-[9px] text-white flex justify-center items-center absolute top--1 right--2 text-center"
-                   v-if="
-                   item.id == 'noPay' && orderQuantity &&  orderQuantity.noPay != '0'"
-
-              >
-                {{ orderQuantity.noPay}}
+              <div
+                class="bg-primary rounded-full w-3 h-3 text-[9px] text-white flex justify-center items-center absolute top--1 right--2 text-center"
+                v-if="item.id == 'noPay' && orderQuantity && orderQuantity.noPay != '0'">
+                {{ orderQuantity.noPay }}
               </div>
-              <div class="bg-primary rounded-full w-3 h-3 text-[9px] text-white flex justify-center items-center absolute top--1 right--2 text-center"
-                   v-if="
-                   item.id == 'refund' && orderQuantity && orderQuantity.refund != '0'"
-
-              >
-                {{ orderQuantity.refund}}
+              <div
+                class="bg-primary rounded-full w-3 h-3 text-[9px] text-white flex justify-center items-center absolute top--1 right--2 text-center"
+                v-if="item.id == 'refund' && orderQuantity && orderQuantity.refund != '0'">
+                {{ orderQuantity.refund }}
               </div>
-              <div class="bg-primary rounded-full w-3 h-3 text-[9px] text-white flex justify-center items-center absolute top--1 right--2 text-center"
-                   v-if="
-                   item.id == 'noDeliver' && orderQuantity && orderQuantity.noDeliver != '0'"
-
-              >
-                {{ orderQuantity.noDeliver}}
+              <div
+                class="bg-primary rounded-full w-3 h-3 text-[9px] text-white flex justify-center items-center absolute top--1 right--2 text-center"
+                v-if="item.id == 'noDeliver' && orderQuantity && orderQuantity.noDeliver != '0'">
+                {{ orderQuantity.noDeliver }}
               </div>
-              <div class="bg-primary rounded-full w-3 h-3 text-[9px] text-white flex justify-center items-center absolute top--1 right--2 text-center"
-                   v-if="
-                   item.id == 'noPostage' && orderQuantity && orderQuantity.noPostage != '0'"
-
-              >
-                {{ orderQuantity.noPostage}}
+              <div
+                class="bg-primary rounded-full w-3 h-3 text-[9px] text-white flex justify-center items-center absolute top--1 right--2 text-center"
+                v-if="item.id == 'noPostage' && orderQuantity && orderQuantity.noPostage != '0'">
+                {{ orderQuantity.noPostage }}
               </div>
-              <div class="bg-primary rounded-full w-3 h-3 text-[9px] text-white flex justify-center items-center absolute top--1 right--2 text-center"
-                   v-if="
-                   item.id == 'noComment' && orderQuantity && orderQuantity.noComment != '0'"
-
-              >
-                {{ orderQuantity.noComment}}
+              <div
+                class="bg-primary rounded-full w-3 h-3 text-[9px] text-white flex justify-center items-center absolute top--1 right--2 text-center"
+                v-if="item.id == 'noComment' && orderQuantity && orderQuantity.noComment != '0'">
+                {{ orderQuantity.noComment }}
               </div>
-              <image :src="item.icon"
-                     mode="widthFix"
-                     class="w-7 h-7 "
-              />
+              <image :src="item.icon" mode="widthFix" class="w-7 h-7 " />
             </div>
 
             <div class="text-xs">{{ item.text }}</div>
@@ -495,15 +547,9 @@ function handleShowMyRulePage(item) {
           <div>我的服务</div>
         </div>
         <div class="flex flex-wrap ">
-          <div
-              v-for="(item, index) in myServiceList" :key="index"
-              @tap="handleService(item)"
-              class="flex flex-col justify-center items-center w-1/4 gap-2 mb-4"
-          >
-            <image :src="item.icon"
-                   mode="widthFix"
-                   class="w-6 h-6 "
-            />
+          <div v-for="(item, index) in myServiceList" :key="index" @tap="handleService(item)"
+            class="flex flex-col justify-center items-center w-1/4 gap-2 mb-4">
+            <image :src="item.icon" mode="widthFix" class="w-6 h-6 " />
             <div class="text-xs">{{ item.text }}</div>
           </div>
         </div>
@@ -515,15 +561,9 @@ function handleShowMyRulePage(item) {
           <div>联系我们</div>
         </div>
         <div class="flex flex-wrap ">
-          <div
-              v-for="(item, index) in contactUsList" :key="index"
-              @tap="handleToContact(item)"
-              class="flex flex-col justify-center items-center w-1/4 gap-2 mb-4"
-          >
-            <image :src="item.icon"
-                   mode="widthFix"
-                   class="w-6 h-6 "
-            />
+          <div v-for="(item, index) in contactUsList" :key="index" @tap="handleToContact(item)"
+            class="flex flex-col justify-center items-center w-1/4 gap-2 mb-4">
+            <image :src="item.icon" mode="widthFix" class="w-6 h-6 " />
             <div class="text-xs">{{ item.text }}</div>
           </div>
         </div>
@@ -539,6 +579,114 @@ function handleShowMyRulePage(item) {
 page {
   background-color: #f8f8f8;
 }
+
+.flex-height {
+  margin-left: 3px;
+}
+
+.btm {
+  margin-top: 1px;
+}
+
+.vip_img {
+  width: 116rpx;
+  height: 58rpx;
+}
+
+.box_2 {
+  background-color: #ffffff00;
+}
+
+.img_1 {
+  width: 560rpx;
+  height: 660rpx;
+}
+
+.off_1 {
+  width: 72rpx;
+  height: 72rpx;
+  position: absolute;
+  margin-top: 40rpx;
+  left: 50%;
+  margin-left: -36rpx;
+}
+
+.off_2 {
+  width: 100%;
+  height: 100%;
+}
+
+.off_3 {
+  width: 34rpx;
+  height: 34rpx;
+}
+
+.div_box {
+  width: 496rpx;
+  height: 152rpx;
+  background: #E5F9FF;
+  border-radius: 16rpx;
+  margin-left: 32rpx;
+}
+
+.blue_1 {
+  height: 80rpx;
+  line-height: 80rpx;
+}
+
+.blue_1 image {
+  margin-left: 26rpx;
+  margin-top: 14rpx;
+}
+
+.pan {
+  font-size: 28rpx;
+  margin-left: 10rpx;
+  font-family: SourceHanSansCN, SourceHanSansCN;
+  font-weight: 500;
+  color: #4D4D69;
+
+}
+
+.blue_2 {
+  font-size: 30rpx;
+  font-family: SourceHanSansCN, SourceHanSansCN;
+  font-weight: bold;
+  color: #4D4D69;
+  background: #C2F0FF;
+  padding-left: 26rpx;
+}
+
+.pand {
+  font-size: 22rpx;
+  font-family: SourceHanSansCN, SourceHanSansCN;
+  font-weight: bold;
+  color: black;
+}
+
+.height1 {
+  height: 74rpx;
+  line-height: 74rpx;
+}
+
+.pend {
+  padding-top: 14rpx
+}
+
+.height2 {
+  height: 90rpx;
+  border-radius: 0rpx 0rpx 16rpx 16rpx;
+}
+
+.pong1 {
+  position: absolute;
+  top: 255rpx
+}
+
+.pong2 {
+  position: absolute;
+  top: 447rpx
+}
 </style>
 <route lang="yaml">
 style:

src/pages/vip/index.vue

@@ -1,124 +1,111 @@
 <template>
-<!--  <CXBBasePage :show="true" title="">-->
-
-    <div class="flex flex-col gap-3 ">
-      <div
-          class="overflow-hidden fixed top-0 w-full z-10"
-      >
-        <nut-searchbar
-            v-model="state.keyword" @search="loadList('reload')" @clear="loadList('reload')">
-          <!--      <template v-slot:leftout>-->
-          <!--        <div @tap="navBack">-->
-          <!--          <nut-icon name="left"></nut-icon>-->
-          <!--        </div>-->
-          <!--      </template>-->
-          <template v-slot:rightout>
-            <div @tap="loadList('reload')">
-              搜索
-            </div>
-          </template>
-        </nut-searchbar>
-      </div>
-<!--      <image :src="homeBanner" mode="widthFix" class="h-10 w-full "></image>-->
-
-      <div class="w-screen h-65">
-        <swiper
-            v-if="state.banners"
-            :indicator-dots="state.indicatorDots"
-            indicator-active-color="#e93323"
-            :autoplay="state.autoplay"
-            :circular="state.circular"
-            :interval="state.interval"
-            :duration="state.duration"
-            class="w-full h-full"
-        >
-          <swiper-item v-for="(item, index) in state.banners" :key="index">
-            <image :src="item.pic" class="!w-full !h-full" mode="aspectFill"/>
-          </swiper-item>
-        </swiper>
-      </div>
+  <!--  <CXBBasePage :show="true" title="">-->
+
+  <div class="flex flex-col gap-3 ">
+    <div style="background-color: transparent" class="overflow-hidden fixed top-0 w-full z-10">
+      <nut-searchbar v-model="state.keyword" @search="loadList('reload')" @clear="loadList('reload')">
+        <!--      <template v-slot:leftout>-->
+        <!--        <div @tap="navBack">-->
+        <!--          <nut-icon name="left"></nut-icon>-->
+        <!--        </div>-->
+        <!--      </template>-->
+        <template v-slot:rightout>
+          <div @tap="loadList('reload')">
+            搜索
+          </div>
+        </template>
+      </nut-searchbar>
+    </div>
+    
+    <!--      <image :src="homeBanner" mode="widthFix" class="h-10 w-full "></image>-->
+
+    <div class="w-screen h-45" style="margin-top: 80rpx;" >
+      <swiper v-if="state.banners" :indicator-dots="state.indicatorDots" indicator-active-color="#e93323"
+        :autoplay="state.autoplay" :circular="state.circular" :interval="state.interval" :duration="state.duration"
+        class="w-full h-full">
+        <swiper-item v-for="(item, index) in state.banners" :key="index">
+          <image :src="item.pic" class="!w-full !h-full" mode="	aspectFit" />
+        </swiper-item>
+      </swiper>
+    </div>
 
-      <div class="flex px-3">
-        会员专区
-      </div>
-      <div  class="px-3" v-if="list && list.length > 0">
-        <grid-view type="masonry" cross-axis-count="2" 	cross-axis-gap="10px" main-axis-gap="10px">
-          <div v-for="(item, index) in list"
-               :key="index"
-               @click="handleItemClick(item)"
-          >
-            <div
-                class="bg-white rounded-lg"
-            >
-              <image :src="item.image" mode="widthFix" 	:fade-in="true" class="rounded-t-lg  !w-full aspect-square"></image>
-
-              <div class="text-sm p-2 flex flex-col gap-1">
-                <div class="line-clamp-1">
-                  {{item.store_name}}
-                </div>
-                <div class="border border-solid border-1 border-red rounded flex text-xs items-center text-[#FE0032] w-fit">
-                  <image src="https://cdn.bjtdba.com/vod/image/2023-09-15/20230915160858609.png"
-                         mode="widthFix" class="!w-8 "></image>
-                  <div class="px-2 flex items-center jusitify-center">
-                    <div>
-                      养老金 ¥{{item.yanglao}}
-                    </div>
+    <div class="flex px-3">
+      会员专区
+    </div>
+    <div class="px-3" v-if="list && list.length > 0">
+      <grid-view type="masonry" cross-axis-count="2" cross-axis-gap="10px" main-axis-gap="10px">
+        <div v-for="(item, index) in list" :key="index" @click="handleItemClick(item)">
+          <div class="bg-white rounded-lg">
+            <image :src="item.image" mode="widthFix" :fade-in="true" class="rounded-t-lg  !w-full aspect-square"></image>
+
+            <div class="text-sm p-2 flex flex-col gap-1">
+              <div class="line-clamp-1">
+                {{ item.store_name }}
+              </div>
+              <div class="border border-solid border-1 border-red rounded flex text-xs items-center text-[#FE0032] w-fit">
+                <image src="https://cdn.bjtdba.com/vod/image/2023-09-15/20230915160858609.png" mode="widthFix"
+                  class="!w-8 "></image>
+                <div class="px-2 flex items-center jusitify-center">
+                  <div>
+                    养老金 ¥{{ item.yanglao }}
                   </div>
                 </div>
-                <div class="flex flex-row items-center gap-2">
-                  <div class="flex text-[#FE0032] font-bold text-lg">
-                    <div>
-                      ￥
-                    </div>
-                    <div>
-                      {{ item.price }}
-                    </div>
-
+              </div>
+              <div class="flex flex-row items-center gap-2">
+                <div class="flex text-[#FE0032] font-bold text-lg">
+                  <div>
+                    ￥
                   </div>
-
-                  <div class="bg-[#202020] text-[#FFDD99] rounded-t-lg rounded-br-lg text-10px leading-none px-1 flex items-center justify-center h-4">
-
-                    <div>
-                      大仓
-                    </div>
+                  <div>
+                    {{ item.price }}
                   </div>
 
                 </div>
 
-                <div class="line-through text-xs font-bold flex ">
+                <div
+                  class="bg-[#202020] text-[#FFDD99] rounded-t-lg rounded-br-lg text-10px leading-none px-1 flex items-center justify-center h-4">
+
                   <div>
-                    ¥ {{item.ot_price}}
+                    大仓
                   </div>
                 </div>
+
               </div>
-            </div>
 
+              <div class="line-through text-xs font-bold flex ">
+                <div>
+                  ¥ {{ item.ot_price }}
+                </div>
+              </div>
+            </div>
           </div>
-        </grid-view>
-        <div class="pb-safe flex justify-center items-center text-[12px] text-gray-500" >
-          <div v-if="state.status === 'loading'">
-            加载中...
-          </div>
-          <div v-if="state.status === 'noMore'">
-            没有更多了～
-          </div>
+
+        </div>
+      </grid-view>
+      <div class="pb-safe flex justify-center items-center text-[12px] text-gray-500">
+        <div v-if="state.status === 'loading'">
+          加载中...
+        </div>
+        <div v-if="state.status === 'noMore'">
+          没有更多了～
         </div>
       </div>
-      <CXBEmpty v-else/>
     </div>
+    <CXBEmpty v-else />
+  </div>
 
-<!--  </CXBBasePage>-->
+  <!--  </CXBBasePage>-->
 </template>
 
 <script setup lang="ts">
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import FSearch from "~/components/FSearch/FSearch.vue";
-import {computed} from "vue";
-import {getVipAreaList} from "~/apis/merchant";
-import {CDN_URL} from "~/config/app";
+import { computed } from "vue";
+import { getVipAreaList } from "~/apis/merchant";
+import { CDN_URL } from "~/config/app";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
-import {getHomeBanner, getProductShare} from "~/apis/common";
-import {useUserStore} from "~/stores/userStore";
+import { getHomeBanner, getProductShare } from "~/apis/common";
+import { useUserStore } from "~/stores/userStore";
 import Cache from "~/utils/cache";
 
 const homeBanner = CDN_URL + '/static/assets/home-banner.png'
@@ -139,7 +126,7 @@ const state = reactive({
   totalPage: 1,
   banners: [],
 
-  keyword: '' ,
+  keyword: '',
   status: 'noMore',
   indicatorDots: true,
   circular: true,
@@ -255,7 +242,7 @@ onPullDownRefresh(() => {
 
 <route lang="yaml">
 style:
-  navigationBarTitleText: 储蓄保会员
+  navigationBarTitleText: 一壶茶会员中心
   enablePullDownRefresh: true
 </route>
 <style>