准备合并

src/pages/home/components/navs.vue

@@ -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
 }, {

src/pages/payment/index.vue

@@ -101,8 +101,8 @@ function handleConfirm() {
       OrderLists: state.orderList,
       type: 'tdbaspzf'
     },
-    // envVersion: 'trial', // develop（开发版），trial（体验版），release（正式版）
-    envVersion: 'release', // develop（开发版），trial（体验版），release（正式版）
+    envVersion: 'trial', // develop（开发版），trial（体验版），release（正式版）
+    // envVersion: 'release', // develop（开发版），trial（体验版），release（正式版）
     success(res) {
       // 打开成功
       uni.showToast({

src/pages/user/index.vue

@@ -2,7 +2,7 @@
 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 { 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";
@@ -55,6 +55,10 @@ const contactUsList = [{
 //市/区代表弹框标识
 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',
@@ -241,38 +245,39 @@ function handleShowMyAllOrder(tab?: number) {
 
 const userType = computed(() => {
   const userRichType = userStore.userInfo?.user_rich_type
+ 
   // console.log(userStore.userInfo)
   // 普通用户
   if (userRichType == 0) {
 
-    return ['../../static/img-hy/用户.png']
+    return '../../static/img-hy/用户.png'
   }
   // 会员
   if (userRichType == 1) {
 
-    return ['../../static/img-hy/会员.png']
+    return '../../static/img-hy/会员.png'
 
   }
   if (userRichType == 3) {
 
-    return ['../../static/img-hy/创始人.png']
+    return '../../static/img-hy/创始人.png'
   }
   // 高级会员
   if (userRichType == 4) {
 
-    return ['../../static/img-hy/高级会员.png']
+    return '../../static/img-hy/高级会员.png'
   }
   if (userRichType == 8) {
 
-    return ['../../static/img-hy/合伙人.png']
+    return '../../static/img-hy/合伙人.png'
   }
   if (userRichType == 9) {
 
-    return ['../../static/img-hy/联合创始人.png']
+    return '../../static/img-hy/联合创始人.png'
   }
   if (!userRichType) {
 
-    return ['']
+    return ''
   }
 })
 
@@ -281,11 +286,11 @@ const AlholderType = computed(() => {
   const stockholder = userStore.userInfo?.stockholder
   // 普通用户
   if (stockholder == 0) {
-    return ['']
+    return ''
   }
   // 股东
   if (stockholder == 1) {
-    return ['../../static/img-hy/股东.png']
+    return '../../static/img-hy/股东.png'
   }
 
 })
@@ -295,15 +300,15 @@ const areaType = computed(() => {
     const areamanage = userStore.userInfo?.area_manage_type
     // 县/区代理
     if (areamanage == 'district') {
-      return ['../../static/img-hy/district.png']
+      return '../../static/img-hy/district.png'
     }
     // 市代理
     if (areamanage == 'city') {
-      return ['../../static/img-hy/city.png']
+      return '../../static/img-hy/city.png'
     }
     //普通用户
     if (!areamanage) {
-      return ['']
+      return ''
     }
 
   }
@@ -326,11 +331,11 @@ const backImg = computed(() => {
     const areamanage = userStore.userInfo?.area_manage_type
     // 县/区代理
     if (areamanage == 'district') {
-      return ['../../static/dl/xqdl.png']
+      return CDM_URL+'/image/2023-11-24/20231124154421388.png'
     }
     // 市代理
     if (areamanage == 'city') {
-      return ['../../static/dl/city.png']
+      return CDM_URL+'/image/2023-11-24/20231124154612477.png'
     }
   }
 
@@ -408,31 +413,31 @@ function handleShowMyRulePage() {
             </div>
             <div class="btm flex gap-1 px-1">
               <!-- 用户 -->
-              <div v-for="(item, index) in userType" :key="index" @click="handleShowMyRulePage()"
+              <div v-if="userType" @click="handleShowMyRulePage()"
                 class="flex rounded-full  text-[12px] text-white w-12 h-5  w-fit px-1">
-                <image class="vip_img" :src="item"></image>
+                <image lazy-load class="vip_img" :src="userType"></image>
               </div>
               <!-- 市区县代理 -->
-              <div @click="openPopup" v-for="(item, index) in areaType" :key="index"
+              <div @click="openPopup" v-if="areaType"
                 class="flex rounded-full  text-[12px] text-white w-12 h-5  w-fit px-1">
-                <image class="vip_img" :src="item"></image>
+                <image lazy-load class="vip_img" :src="areaType"></image>
               </div>
               <!-- 股东 -->
-              <div v-for="(item, index) in AlholderType" :key="index"
+              <div v-if="AlholderType" 
                 class="flex rounded-full  text-[12px] text-white w-12 h-5   w-fit px-1">
-                <image class="vip_img" :src="item"></image>
+                <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-for="(item, index) in backImg " :key="index">
-                <image class="img_1" :src="item"></image>
+              <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 class="off_3" src="../../static/dl/DLqy.png" />
+                    <image lazy-load class="off_3" src="../../static/img-hy/DLqy.png" />
                     <span class="pan">代理区域</span>
                   </div>
                   <div class="blue_2 height1 ">
@@ -441,7 +446,7 @@ function handleShowMyRulePage() {
                 </div>
                 <div class="div_box pong2 ">
                   <div class="blue_1">
-                    <image class="off_3" src="../../static/dl/QYDL.png" />
+                    <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 ">
@@ -454,7 +459,7 @@ function handleShowMyRulePage() {
               </div>
             </div>
             <div @click="onCancel" class="off_1">
-              <image class="off_2" src="../../static/dl/关闭.png" />
+              <image lazy-load class="off_2" src="../../static/img-hy/关闭.png" />
             </div>
           </FPopup>
 
@@ -635,7 +640,7 @@ page {
 }
 
 .pan {
-  font-size: 14rpx;
+  font-size: 28rpx;
   margin-left: 10rpx;
   font-family: SourceHanSansCN, SourceHanSansCN;
   font-weight: 500;

src/pages/vip/index.vue

@@ -16,10 +16,10 @@
         </template>
       </nut-searchbar>
     </div>
-    <div></div>
+    
     <!--      <image :src="homeBanner" mode="widthFix" class="h-10 w-full "></image>-->
 
-    <div class="w-screen h-45">
+    <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">