commit

src/pages/home/components/navs.vue

@@ -106,7 +106,7 @@ function handleItemClick(item: any) {
       // })
 	  
 	  uni.navigateToMiniProgram({
-	      appId: 'wx82986c4471ce7efc',
+	      appId: 'wx9082e5ac2fdb513f',
 	      path: 'pages/home/index',
 	  	  envVersion: 'release', // develop（开发版），trial（体验版），release（正式版）
 	      success(res) {

src/pages/user/index.vue

@@ -1,105 +1,101 @@
 <script lang="ts" setup>
-import { useUserStore } from "~/stores/userStore";
-import CXBAuthorize from "~/components/CXBAuthorize/CXBAuthorize.vue";
-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 FPopup from "~/components/FPopup/FPopup.vue";
-import { CANCEL_EVENT, OPEN_EVENT } from "~/constants/event";
-import type { Ref } from "vue";
+import type { Ref } from 'vue'
+import { useUserStore } from '~/stores/userStore'
+import { getAgentInfo } from '~/apis/user'
+import { CDM_URL, CDN_URL } from '~/config/app'
+import { totalOrderNumber } from '~/apis/order.api'
+import type { OrderQuantityModel } from '~/apis/model/order.model'
+import FPopup from '~/components/FPopup/FPopup.vue'
+
 const pageStore = usePageStoreWidthOut()
-const userStore = useUserStore();
+const userStore = useUserStore()
 const currentType = ref('')
 const myOrderList = [{
   id: 'noPay',
-  icon: CDN_URL + '/static/assets/obligation_220620.png',
+  icon: `${CDN_URL}/static/assets/obligation_220620.png`,
   text: '待付款',
   count: '',
-  url: ''
+  url: '',
 }, {
-  icon: CDN_URL + '/static/assets/daifahuo_220620.png',
+  icon: `${CDN_URL}/static/assets/daifahuo_220620.png`,
   id: 'noPostage',
   text: '待发货',
   count: '',
-  url: ''
+  url: '',
 }, {
-  icon: CDN_URL + '/static/assets/daishouhuo_220620.png',
+  icon: `${CDN_URL}/static/assets/daishouhuo_220620.png`,
   id: 'noDeliver',
   text: '待收货',
   count: '',
-  url: ''
+  url: '',
 }, {
-  icon: CDN_URL + '/static/assets/daipingjia_220620.png',
+  icon: `${CDN_URL}/static/assets/daipingjia_220620.png`,
   id: 'noComment',
   text: '待评价',
-  url: ''
+  url: '',
 }, {
-  icon: CDN_URL + '/static/assets/after_sale_220620.png',
+  icon: `${CDN_URL}/static/assets/after_sale_220620.png`,
   text: '退款/售后',
-  url: '/pages/refund/index'
+  url: '/pages/refund/index',
 }]
 const contactUsList = [{
   type: 'customer',
   icon: '/static/icon/kefu_icon.png',
   text: '联系客服',
-  url: 'https://work.weixin.qq.com/kfid/kfce29f31a08fd53ee0'
+  url: 'https://work.weixin.qq.com/kfid/kfce29f31a08fd53ee0',
 }, {
   type: 'link',
-  icon: CDN_URL + '/static/assets/bangzhuzhongxin_220620.png',
+  icon: `${CDN_URL}/static/assets/bangzhuzhongxin_220620.png`,
   text: '帮助中心',
-  url: '/pages/help-center/index'
+  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/20231124154421388.png
 
-//https://cdn.bjtdba.com/vod/image/2023-11-24/20231124154612477.png
+// https://cdn.bjtdba.com/vod/image/2023-11-24/20231124154612477.png
 
 const myServiceList = [{
-  icon: CDN_URL + '/static/assets/wodeyaoqing_220620.png',
+  icon: `${CDN_URL}/static/assets/wodeyaoqing_220620.png`,
   text: '我的邀请',
-  url: '/pages/my-invitation/index'
+  url: '/pages/my-invitation/index',
 }, {
-  icon: CDN_URL + '/static/assets/wodedizhi_220620.png',
+  icon: `${CDN_URL}/static/assets/wodedizhi_220620.png`,
   text: '我的地址',
-  url: '/pages/user/address/index'
+  url: '/pages/user/address/index',
 }, {
-  icon: CDN_URL + '/static/assets/wodeshoucang_220620.png',
+  icon: `${CDN_URL}/static/assets/wodeshoucang_220620.png`,
   text: '我的收藏',
-  url: '/pages/my-relation-product/index'
+  url: '/pages/my-relation-product/index',
 }, {
-  icon: CDN_URL + '/static/assets/wodeguanzhu_220620.png',
+  icon: `${CDN_URL}/static/assets/wodeguanzhu_220620.png`,
   text: '我的关注',
-  url: '/pages/my-relation-merchant/index'
+  url: '/pages/my-relation-merchant/index',
 }, {
-  icon: CDN_URL + '/static/assets/sanfangdingdan_220620.png',
+  icon: `${CDN_URL}/static/assets/sanfangdingdan_220620.png`,
   text: '三方订单',
-  url: '/pages/order/third-order'
+  url: '/pages/order/third-order',
 }, {
-  icon: CDN_URL + '/static/assets/wodepingjia_220620.png',
+  icon: `${CDN_URL}/static/assets/wodepingjia_220620.png`,
   text: '我的评价',
-  url: '/pages/my-reply/index'
+  url: '/pages/my-reply/index',
 }, {
-  icon: CDN_URL + '/static/assets/invite_friends_221023.png',
+  icon: `${CDN_URL}/static/assets/invite_friends_221023.png`,
   text: '邀请好友',
-  url: '/pages/invite-friends/index'
+  url: '/pages/invite-friends/index',
 }, {
-  icon: CDN_URL + '/static/assets/dianpuruzhu_220620.png',
-  text: userStore.userInfo?.is_merchant=="-1"?'商铺入驻':'我的店铺',
-  url: ''
+  icon: `${CDN_URL}/static/assets/dianpuruzhu_220620.png`,
+  text: userStore.userInfo?.is_merchant == '-1' ? '店铺入驻' : '我的店铺',
+  url: '',
 }, {
-  icon: CDN_URL + '/static/assets/mine_setting_220620.png',
+  icon: `${CDN_URL}/static/assets/mine_setting_220620.png`,
   text: '设置',
-  url: '/pages/setting/index'
+  url: '/pages/setting/index',
 }]
 const state = reactive({
-  isLogin: false
+  isLogin: false,
 })
 
 const orderQuantity: Ref<OrderQuantityModel> = ref()
@@ -128,7 +124,7 @@ onShow(async () => {
   //   title: '登录中',
   // })
   // if (userStore.token ? )
-  
+
   if (uni.getStorageSync('UID')) {
     state.isLogin = true
     uni.hideLoading()
@@ -136,11 +132,10 @@ onShow(async () => {
     await userStore.getUserYanglaoJin()
     agentInfo.value = await getAgentInfo()
   }
-  totalOrderNumber().then(res => {
+  totalOrderNumber().then((res) => {
     orderQuantity.value = res
   })
-  
-  
+
   // if (uni.getStorageSync('UID')) {
   //   state.isLogin = true
   //   uni.hideLoading()
@@ -153,12 +148,11 @@ onShow(async () => {
   //   })
   //   userStore.setUserInfo(null)
   // }
-  
 })
 
 function checkAuth() {
   uni.navigateTo({
-    url: '/pages/user/login/index?key=3'
+    url: '/pages/user/login/index?key=3',
   })
 }
 
@@ -179,94 +173,90 @@ function handleService(item: {
   text: string
   url: string
 }) {
-	
-	if (uni.getStorageSync('UID')) {
-		console.log('进来了1');
-		console.log(item.text);
-			
-		if (item.text === '商铺入驻'||item.text === '我的店铺') {
-			  
-			console.log('进来了2');
-			  
-			return uni.navigateToMiniProgram({
-				appId: 'wx9a3e4ab07f8a9ba2',
-				path: 'pages/index/index',
-				success(res) {
-				// 打开成功
-				console.log(res);
-				},
-				fail: (error) => {
-				console.log('error = ', error);
-				}
-			})
-		}
-		
-		uni.navigateTo({
-		  url: item.url
-		})
-	} else {
-		
-		if (item.text === '商铺入驻'||item.text === '我的店铺') {
-			return uni.navigateToMiniProgram({
+  if (uni.getStorageSync('UID')) {
+    console.log('进来了1')
+    console.log(item.text)
+
+    if (item.text === '店铺入驻' || item.text === '我的店铺') {
+      console.log('进来了2')
+
+      return uni.navigateToMiniProgram({
+        appId: 'wx9a3e4ab07f8a9ba2',
+        path: 'pages/index/index',
+        success(res) {
+          // 打开成功
+          console.log(res)
+        },
+        fail: (error) => {
+          console.log('error = ', error)
+        },
+      })
+    }
+
+    uni.navigateTo({
+		  url: item.url,
+    })
+  }
+  else {
+    if (item.text === '商铺入驻' || item.text === '我的店铺') {
+      return uni.navigateToMiniProgram({
 			  	appId: 'wx9a3e4ab07f8a9ba2',
 			  	path: 'pages/index/index',
 			  	success(res) {
 			  	// 打开成功
-			  	console.log(res);
+			  	console.log(res)
 			  	},
 			  	fail: (error) => {
-			  	console.log('error = ', error);
-			  	}
-			})
-		
-		} else if (item.text === '设置') {
-			uni.navigateTo({
-			  url: item.url
-			})
-		} else {
-			uni.navigateTo({
-				url: '/pages/user/login/index?key=3'
-			})
-			userStore.setUserInfo(null)
-		}
-	}
+			  	console.log('error = ', error)
+			  	},
+      })
+    }
+    else if (item.text === '设置') {
+      uni.navigateTo({
+			  url: item.url,
+      })
+    }
+    else {
+      uni.navigateTo({
+        url: '/pages/user/login/index?key=3',
+      })
+      userStore.setUserInfo(null)
+    }
+  }
 }
 
-
-
 function encodePhone(phone: string) {
   // let tel = '13600136000';
-  return phone.replace(/(\d{3})\d{4}(\d{4})/, "$1****$2")
+  return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2')
 }
 
 function handleShowAnnuityDetail() {
   uni.navigateTo({
-    url: '/pages/annuity/index'
+    url: '/pages/annuity/index',
   })
 }
 
 function handleShowMyInvitation() {
   uni.navigateTo({
-    url: '/pages/my-invitation/index'
+    url: '/pages/my-invitation/index',
   })
 }
 
 function handleShowMyIntegral() {
   uni.navigateTo({
-    url: '/pages/my-integral/index'
+    url: '/pages/my-integral/index',
   })
 }
 
 function handleShowMyAllOrder(tab?: number) {
-	
   if (tab <= 4) {
     uni.navigateTo({
-      url: '/pages/order/index?tabIndex=' + tab
+      url: `/pages/order/index?tabIndex=${tab}`,
     })
   }
   if (tab == 5) {
     uni.navigateTo({
-      url: '/pages/refund/index'
+      url: '/pages/refund/index',
     })
   }
 }
@@ -276,142 +266,128 @@ const userType = computed(() => {
 
   // console.log(userStore.userInfo)
   // 普通用户
-  if (userRichType == 0) {
+  if (userRichType == 0)
 
     return '../../static/img-hy/用户.png'
-  }
+
   // 会员
-  if (userRichType == 1) {
+  if (userRichType == 1)
 
     return '../../static/img-hy/会员.png'
 
-  }
-  if (userRichType == 3) {
+  if (userRichType == 3)
 
     return '../../static/img-hy/创始人.png'
-  }
+
   // 高级会员
-  if (userRichType == 4) {
+  if (userRichType == 4)
 
     return '../../static/img-hy/高级会员.png'
-  }
-  if (userRichType == 8) {
+
+  if (userRichType == 8)
 
     return '../../static/img-hy/合伙人.png'
-  }
-  if (userRichType == 9) {
+
+  if (userRichType == 9)
 
     return '../../static/img-hy/联合创始人.png'
-  }
-  if (!userRichType) {
+
+  if (!userRichType)
 
     return ''
-  }
 })
 
-//0:普通用户 1:股东
+// 0:普通用户 1:股东
 const AlholderType = computed(() => {
   const stockholder = userStore.userInfo?.stockholder
   // 普通用户
-  if (stockholder == 0) {
+  if (stockholder == 0)
     return ''
-  }
+
   // 股东
-  if (stockholder == 1) {
+  if (stockholder == 1)
     return '../../static/img-hy/股东.png'
-  }
-
 })
 // '':普通用户 district-区/县代 city-市代',
 const areaType = computed(() => {
   if (userStore.userInfo?.area_manage?.area_name) {
     const areamanage = userStore.userInfo?.area_manage_type
     // 县/区代理
-    if (areamanage == 'district') {
+    if (areamanage == 'district')
       return '../../static/img-hy/district.png'
-    }
+
     // 市代理
-    if (areamanage == 'city') {
+    if (areamanage == 'city')
       return '../../static/img-hy/city.png'
-    }
-    //普通用户
-    if (!areamanage) {
-      return ''
-    }
 
+    // 普通用户
+    if (!areamanage)
+      return ''
   }
-
 })
 
-//弹框展示
+// 弹框展示
 function openPopup() {
   showValue.value = true
 }
-//关闭弹框
-const onCancel = () => {
+// 关闭弹框
+function 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 == 'district')
+      return `${CDM_URL}/image/2023-11-24/20231124154421388.png`
+
     // 市代理
-    if (areamanage == 'city') {
-      return CDM_URL + '/image/2023-11-24/20231124154612477.png'
-    }
+    if (areamanage == 'city')
+      return `${CDM_URL}/image/2023-11-24/20231124154612477.png`
   }
-
 })
 const textType = computed(() => {
   if (userStore.userInfo?.area_manage?.area_name) {
     const areamanage = userStore.userInfo?.area_manage.area_name
-    let res = areamanage.join("");
+    const res = areamanage.join('')
     return res
   }
-
 })
 
-
 function handleToRedIntegral() {
   uni.navigateTo({
-    url: '/pages/red-integral/index'
+    url: '/pages/red-integral/index',
   })
 }
 
 function handleToContact(item) {
-	
-	
-	
   if (item.type === 'link') {
     return uni.navigateTo({
-      url: item.url
+      url: item.url,
     })
   }
-  
+
   if (item.type === 'customer') {
-	  
 	  if (uni.getStorageSync('UID')) {
 		  return uni.openCustomerServiceChat({
 		    extInfo: {
-		      url: 'https://work.weixin.qq.com/kfid/kfc8bd3f11a28aa81db'
+		      url: 'https://work.weixin.qq.com/kfid/kfc8bd3f11a28aa81db',
 		    },
 		    corpId: 'wwaeb55681929a37ae',
-		    success: (res => {
+		    success: (res) => {
 		      console.log(res)
-		    }),
-		    fail: (res => {
+		    },
+		    fail: (res) => {
 		      console.log(res)
-		    })
+		    },
 		  })
-	  } else {
+	  }
+    else {
 		  uni.navigateTo({
-		  	url: '/pages/user/login/index?key=3'
+		  	url: '/pages/user/login/index?key=3',
 		  })
 		  userStore.setUserInfo(null)
 	  }
@@ -420,57 +396,64 @@ function handleToContact(item) {
 
 function handleShowMyProfile() {
   uni.navigateTo({
-    url: '/pages/my-profile/index'
+    url: '/pages/my-profile/index',
   })
 }
 
 function handleShowMyRulePage() {
   uni.navigateTo({
-    url: `/pages/my-rules/index`
+    url: '/pages/my-rules/index',
   })
 }
 </script>
+
 <template>
-  <div  class="pb-safe">
-    <div class="bg-[#FD1642] h-40 w-full absolute top-0 left-0"></div>
+  <div class="pb-safe">
+    <div class="bg-[#FD1642] h-40 w-full absolute top-0 left-0" />
     <div class="flex flex-col gap-4 relative px-3 pb-safe">
       <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" style="width:74rpx; height:74rpx;" class="rounded-full"></image>
-          <image v-else @click="checkAuth" src="https://app.bjtdba.com/uploads/logo.jpg" 
-            class="rounded-full" style="width:74rpx; height:74rpx;" />
+          <image
+            v-if="userStore.userInfo && userStore.userInfo.avatar" :src="userStore.userInfo.avatar"
+            style="width:74rpx; height:74rpx;" class="rounded-full" @click="handleShowMyProfile"
+          />
+          <image
+            v-else src="https://app.bjtdba.com/uploads/logo.jpg" class="rounded-full"
+            style="width:74rpx; height:74rpx;" @click="checkAuth"
+          />
           <div class="flex flex-col">
             <div class="flex">
               <div class="text-sm">
-                <div class="text-sm" v-if="userStore.userInfo">
+                <div v-if="userStore.userInfo" class="text-sm">
                   {{ userStore.userInfo.nickname ? userStore.userInfo.nickname : '登录' }}
                 </div>
               </div>
-              <div class="text-sm flex-height " v-if="userStore.userInfo && userStore.userInfo.phone">
+              <div v-if="userStore.userInfo && userStore.userInfo.phone" class="text-sm flex-height ">
                 {{ encodePhone(userStore.userInfo.phone) }}
               </div>
             </div>
             <div class="btm flex gap-1 ">
               <!-- 用户 -->
-              <div v-if="userType" @click="handleShowMyRulePage()"
-                class="flex rounded-full  text-[12px] text-white w-12 h-5  w-fit ">
-                <image mode="heightFix" lazy-load class="vip_img" :src="userType"></image>
+              <div
+                v-if="userType" class="flex rounded-full  text-[12px] text-white w-12 h-5  w-fit "
+                @click="handleShowMyRulePage()"
+              >
+                <image mode="heightFix" lazy-load class="vip_img" :src="userType" />
               </div>
               <!-- 市区县代理 -->
-              <div @click="openPopup" v-if="areaType" class="flex rounded-full  text-[12px] text-white w-12 h-5  w-fit ">
-                <image mode="heightFix" lazy-load class="vip_img" :src="areaType"></image>
+              <div v-if="areaType" class="flex rounded-full  text-[12px] text-white w-12 h-5  w-fit " @click="openPopup">
+                <image mode="heightFix" lazy-load class="vip_img" :src="areaType" />
               </div>
               <!-- 股东 -->
               <div v-if="AlholderType" class="flex rounded-full  text-[12px] text-white w-12 h-5   w-fit">
-                <image mode="heightFix" lazy-load class="vip_img" :src="AlholderType"></image>
+                <image mode="heightFix" lazy-load class="vip_img" :src="AlholderType" />
               </div>
             </div>
           </div>
-          <FPopup v-model:show="showValue" position="center" exClass="box_2 ">
+          <FPopup v-model:show="showValue" position="center" ex-class="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 v-if="backImg" class="box_2">
+                <image lazy-load class="img_1" :src="backImg" />
               </div>
               <div class="group_2 flex-col lolr ">
                 <div class="div_box pong1 ">
@@ -489,111 +472,132 @@ function handleShowMyRulePage() {
                   </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 class=" pend">
+                        所辖区域的区域管理分红
+                      </div>
+                      <div class="text_5 pand ">
+                        (参照会员系统佣金逻辑）
+                      </div>
                     </div>
                   </div>
                 </div>
               </div>
             </div>
-            <div @click="onCancel" class="off_1">
+            <div class="off_1" @click="onCancel">
               <image lazy-load class="off_2" src="../../static/img-hy/关闭.png" />
             </div>
           </FPopup>
-
         </div>
         <div v-if="state.isLogin" style="border-radius: 16rpx;" class="bg-white flex flex-col gap-6 py-4 text-xl">
           <div v-if="userStore.userInfo" class="flex ">
-            <div @tap="handleShowAnnuityDetail" class="w-1/2 flex flex-col justify-center" style="padding-left: 48rpx;">
-              <div class="text-xs">养老金</div>
+            <div class="w-1/2 flex flex-col justify-center" style="padding-left: 48rpx;" @tap="handleShowAnnuityDetail">
+              <div class="text-xs">
+                养老金
+              </div>
               <div>{{ userStore.yanglao.all_yanglao }}</div>
             </div>
-            <div @tap="handleShowMyInvitation" class="w-1/2  flex flex-col justify-center " style="padding-left: 48rpx;">
-              <div class="text-xs">我的佣金</div>
+            <div class="w-1/2  flex flex-col justify-center " style="padding-left: 48rpx;" @tap="handleShowMyInvitation">
+              <div class="text-xs">
+                我的佣金
+              </div>
               <div>{{ agentInfo.brokerage_price }}</div>
             </div>
           </div>
           <div v-if="userStore.userInfo" class="flex">
-            <div @tap="handleShowMyIntegral" class="w-1/3  flex flex-col justify-center " style="padding-left: 48rpx;">
-              <div class="text-xs">我的积分</div>
+            <div class="w-1/3  flex flex-col justify-center " style="padding-left: 48rpx;" @tap="handleShowMyIntegral">
+              <div class="text-xs">
+                我的积分
+              </div>
               <div>{{ userStore.userInfo.score }}</div>
             </div>
-            <div class="icon_d"></div>
-            <div @click="handleToRedIntegral" class="w-1/3 flex flex-col justify-center " style="padding-left: 48rpx;">
-              <div class="text-xs">红积分提现</div>
+            <div class="icon_d" />
+            <div class="w-1/3 flex flex-col justify-center " style="padding-left: 48rpx;" @click="handleToRedIntegral">
+              <div class="text-xs">
+                红积分提现
+              </div>
               <div>{{ userStore.userInfo.member_brokerage_price }}</div>
             </div>
-            <div class="icon_d"></div>
+            <div class="icon_d" />
             <div class="w-1/3 flex flex-col  justify-center" style="padding-left: 48rpx;">
-              <div class="text-xs">团队人数</div>
+              <div class="text-xs">
+                团队人数
+              </div>
               <div>{{ userStore.userInfo.team_number }}</div>
             </div>
           </div>
-
         </div>
-
       </div>
 
       <div class="bg-white rounded px-3 text-sm">
         <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 class="text-sm text-gray" @click="handleShowMyAllOrder(0)">
+              查看全部
             </div>
-            <div class="f-text-color-2 i-tabler-chevron-right"></div>
+            <div class="f-text-color-2 i-tabler-chevron-right" />
           </div>
-
-
         </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
+            v-for="(item, index) in myOrderList" :key="index" class="flex flex-col justify-center items-center w-1/5 gap-3"
+            @click="handleShowMyAllOrder(index + 1)"
+          >
             <div class="relative">
               <div
+                v-if="item.id == 'noPay' && orderQuantity && orderQuantity.noPay != '0'"
                 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
+                v-if="item.id == 'refund' && orderQuantity && orderQuantity.refund != '0'"
                 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
+                v-if="item.id == 'noDeliver' && orderQuantity && orderQuantity.noDeliver != '0'"
                 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
+                v-if="item.id == 'noPostage' && orderQuantity && orderQuantity.noPostage != '0'"
                 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
+                v-if="item.id == 'noComment' && orderQuantity && orderQuantity.noComment != '0'"
                 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 " />
             </div>
 
-            <div class="text-xs">{{ item.text }}</div>
+            <div class="text-xs">
+              {{ item.text }}
+            </div>
           </div>
         </div>
-
       </div>
       <div class="bg-white rounded px-3">
         <div class="flex justify-between pt-4 mb-4">
           <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">
+          <div
+            v-for="(item, index) in myServiceList" :key="index" class="flex flex-col justify-center items-center w-1/4 gap-2 mb-4"
+            @tap="handleService(item)"
+          >
             <image :src="item.icon" mode="widthFix" class="w-6 h-6 " />
-            <div class="text-xs">{{ item.text }}</div>
+            <div class="text-xs">
+              {{ item.text }}
+            </div>
           </div>
         </div>
-
       </div>
 
       <div class="bg-white rounded px-3">
@@ -601,20 +605,23 @@ function handleShowMyRulePage() {
           <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">
+          <div
+            v-for="(item, index) in contactUsList" :key="index" class="flex flex-col justify-center items-center w-1/4 gap-2 mb-4"
+            @tap="handleToContact(item)"
+          >
             <image :src="item.icon" mode="widthFix" class="w-6 h-6 " />
-            <div class="text-xs">{{ item.text }}</div>
+            <div class="text-xs">
+              {{ item.text }}
+            </div>
           </div>
         </div>
-
       </div>
-
     </div>
   </div>
 
-  <!--  <CXBAuthorize v-else/>-->
+  <!--  <CXBAuthorize v-else/> -->
 </template>
+
 <style>
 page {
   background-color: #f8f8f8;
@@ -727,13 +734,13 @@ page {
   top: 447rpx
 }
 
-
 .icon_d {
   width: 1rpx;
   height: 40rpx;
   background: #D8D8D8;
 }
 </style>
+
 <route lang="yaml">
 style:
   navigationStyle: custom

src/pages/user/login/index.vue

@@ -1,11 +1,12 @@
 <script lang="ts" setup>
-import {getUserUnionId, wechatCheck} from "~/apis/user";
-import CXBBanner from "~/components/CXBBanner/CXBBanner.vue";
-import CXBPhoneLoginButton from "~/components/CXBPhoneLoginButton/CXBPhoneLoginButton.vue";
-import CXBNotLoginButton from "~/components/CXBNotLoginButton/CXBNotLoginButton.vue";
-import {useUserStore} from "~/stores/userStore";
-import FNavBar from "~/components/FNavBar/FNavBar.vue";
-import Cache from "~/utils/cache";
+import { getUserUnionId, wechatCheck } from '~/apis/user'
+import CXBBanner from '~/components/CXBBanner/CXBBanner.vue'
+import CXBPhoneLoginButton from '~/components/CXBPhoneLoginButton/CXBPhoneLoginButton.vue'
+import CXBNotLoginButton from '~/components/CXBNotLoginButton/CXBNotLoginButton.vue'
+import { useUserStore } from '~/stores/userStore'
+import FNavBar from '~/components/FNavBar/FNavBar.vue'
+import Cache from '~/utils/cache'
+
 // usePageStore.setPageConfig({
 //   currentPage: {
 //     type: 'tab',
@@ -18,13 +19,12 @@ const state = reactive({
   qrcode: '',
   uid: '',
   key: '',
-  isShow: false
+  isShow: false,
 })
 onLoad((option: any) => {
   state.qrcode = option.type
   state.uid = option.uid
   state.key = option.key
-
 })
 
 function getPhoneNumber(e) {
@@ -33,10 +33,10 @@ function getPhoneNumber(e) {
   if (!state.isShow) {
   	return 	uni.showToast({
   				title: '请阅读并勾选隐私协议',
-  				icon: 'none'
+  				icon: 'none',
   			})
   }
-  
+
   if (e.detail.errMsg === 'getPhoneNumber:ok') {
 
   }
@@ -44,136 +44,132 @@ function getPhoneNumber(e) {
 
 function handleViewXieyi(type: number) {
   uni.navigateTo({
-    url: `/pages/user/login/user-agreement?type=${type}`
+    url: `/pages/user/login/user-agreement?type=${type}`,
   })
 }
 
 async function handleWexinLogin() {
-	
-	if (!state.isShow) {
-		return 	uni.showToast({
-					title: '请阅读并勾选隐私协议',
-					icon: 'none'
-				})
-	}
-	
+  if (!state.isShow) {
+    return 	uni.showToast({
+      title: '请阅读并勾选隐私协议',
+      icon: 'none',
+    })
+  }
+
   await uni.showLoading({
-    title: '登录中'
-  });
+    title: '登录中',
+  })
   uni.login({
     provider: 'weixin',
     univerifyStyle: {
-      fullScreen: true
+      fullScreen: true,
     },
-    success: result => {
+    success: (result) => {
       // console.log(result)
       getUserUnionId({
         code: result.code,
-        source: 'cxb'
-      }).then(unionRes => {
-        console.log(111111,unionRes)
+        source: 'cxb',
+      }).then((unionRes) => {
+        console.log(111111, unionRes)
         // const shareId = Cache.get('SHARE_ID')
-        //存储openid
+        // 存储openid
         // userStore.setOpenid(unionRes.openid)
-        let redirectPageObj: {page: string, type: 'page' | 'tab'}
-        if (Cache.get('SHARE_REDIRECT_PAGE')) {
+        let redirectPageObj: { page: string; type: 'page' | 'tab' }
+        if (Cache.get('SHARE_REDIRECT_PAGE'))
           redirectPageObj = JSON.parse(Cache.get('SHARE_REDIRECT_PAGE'))
-        }
 
         // if (shareId) {
-          // params.share_id = shareId
-          // params = Object.assign({}, params, { shareId })
+        // params.share_id = shareId
+        // params = Object.assign({}, params, { shareId })
         // }
-        wechatCheck(unionRes.unionid).then(checkRes => {
-          
+        wechatCheck(unionRes.unionid).then((checkRes) => {
           userStore.login(checkRes.token, checkRes.exp)
           userStore.setUID(checkRes.user.uid)
           userStore.setUserInfo(checkRes.user)
           // console.log(checkRes)
-          uni.hideLoading();
-          console.log('我存在吗111',redirectPageObj);
-            uni.showToast({
-              title: '登录成功'
-            }).then(() => {
-              setTimeout(() => {
-                console.log('我存在吗222',redirectPageObj);
-                
-                if (redirectPageObj) {
-                  console.log('我存在吗333',redirectPageObj);
-                  if (redirectPageObj.type === 'page') {
-                    return uni.reLaunch({
-                      url: redirectPageObj.page
+          uni.hideLoading()
+          console.log('我存在吗111', redirectPageObj)
+          uni.showToast({
+            title: '登录成功',
+          }).then(() => {
+            setTimeout(() => {
+              console.log('我存在吗222', redirectPageObj)
+
+              if (redirectPageObj) {
+                console.log('我存在吗333', redirectPageObj)
+                if (redirectPageObj.type === 'page') {
+                  return uni.reLaunch({
+                    url: redirectPageObj.page,
+                  })
+                }
+                if (redirectPageObj.type === 'tab') {
+                  return uni.switchTab({
+                    url: redirectPageObj.page,
+                  })
+                }
+              }
+              else {
+                console.log('我是key>>>aaa', state.key)
+
+                switch (state.key) {
+                  case '10': {
+                    uni.switchTab({
+                      url: '/pages/user/index',
+                    })
+                    break
+                  }
+                  case '4': {
+                    uni.navigateBack({
+                      delta: 1,
+                    })
+                    break
+                  }
+                  case '1': {
+                    uni.switchTab({
+                      url: '/pages/order_addcart/index',
+                    })
+                    break
+                  }
+                  case undefined: {
+                    uni.switchTab({
+                      url: '/pages/user/index',
                     })
+                    break
                   }
-                   if (redirectPageObj.type === 'tab') {
-                    return uni.switchTab({
-                      url: redirectPageObj.page
+                  case '30': {
+                    uni.switchTab({
+                      url: '/pages/home/index',
                     })
+                    break
                   }
-                } else {
-                  console.log('我是key>>>aaa',state.key);
-                  
-                  switch (state.key) {
-                    case '10': {
-                      uni.switchTab({
-                        url: '/pages/user/index'
-                      })
-                      break;
-                    }
-                    case '4': {
-                      uni.navigateBack({
-                        delta: 1
-                      })
-                      break;
-                    }
-                    case '1': {
-                      uni.switchTab({
-                        url: '/pages/order_addcart/index'
-                      })
-                      break;
-                    }
-                    case undefined: {
-                      uni.switchTab({
-                        url: '/pages/user/index'
-                      })
-                      break;
-                    }
-                    case '30': {
-                      uni.switchTab({
-                        url: '/pages/home/index'
-                      })
-                      break;
-                    }
-                    default: {
-                      uni.switchTab({
-                        url: '/pages/home/index'
-                      })
-                    }
+                  default: {
+                    uni.switchTab({
+                      url: '/pages/home/index',
+                    })
                   }
                 }
-              }, 100);
-
-
-            })
-        }).catch(err => {
-          uni.hideLoading();
+              }
+            }, 100)
+          })
+        }).catch((err) => {
+          uni.hideLoading()
 
           console.log(err)
           if (err === '请绑定手机号') {
             uni.showToast({
               title: err,
-              icon: 'none'
+              icon: 'none',
             })
 
             setTimeout(() => {
               uni.navigateTo({
-                url: `/pages/user/login/bind-phone?type=1&third_user_id=${unionRes.unionid}&key=0`
+                url: `/pages/user/login/bind-phone?type=1&third_user_id=${unionRes.unionid}&key=0`,
               })
             }, 1000)
           }
         })
       })
-    }
+    },
   })
   // 换取Code
 }
@@ -184,14 +180,16 @@ function onClickLeft() {
   if (pageStore && pageStore.currentPage) {
     if (pageStore.currentPage.type === 'tab') {
       uni.switchTab({
-        url: pageStore.currentPage.url
+        url: pageStore.currentPage.url,
       })
-    } else {
+    }
+    else {
       uni.navigateTo({
-        url: pageStore.currentPage.url
+        url: pageStore.currentPage.url,
       })
     }
-  } else {
+  }
+  else {
     uni.navigateBack()
   }
   // uni.showModal({
@@ -203,96 +201,97 @@ function onClickLeft() {
   //     }
   //   },
   // })
-
 }
 
 function gou() {
-	state.isShow = !state.isShow
+  state.isShow = !state.isShow
 }
 
 function otherPhoneLogin() {
-	
-	if (!state.isShow) {
-		return 	uni.showToast({
-					title: '请阅读并勾选隐私协议',
-					icon: 'none'
-				})
-	}
-	
-	uni.navigateTo({
-		url: '/pages/user/login/other-phone'
-	})
+  if (!state.isShow) {
+    return 	uni.showToast({
+      title: '请阅读并勾选隐私协议',
+      icon: 'none',
+    })
+  }
+
+  uni.navigateTo({
+    url: '/pages/user/login/other-phone',
+  })
 }
 
 function phoneQuicklyLogin() {
-	if (!state.isShow) {
-		return 	uni.showToast({
-					title: '请阅读并勾选隐私协议',
-					icon: 'none'
-				})
-	}
+  if (!state.isShow) {
+    return 	uni.showToast({
+      title: '请阅读并勾选隐私协议',
+      icon: 'none',
+    })
+  }
 }
-
 </script>
+
 <template>
   <div>
     <FNavBar
-        title="" :left-arrow="true" fixed placeholder z-index="999"
-        ex-class="bg-white w-screen"
-        @click-left="onClickLeft"
+      title="" :left-arrow="true" fixed placeholder z-index="999"
+      ex-class="bg-white w-screen"
+      @click-left="onClickLeft"
     />
 
-
-    <CXBBanner/>
+    <CXBBanner />
 
     <div class="px-3 flex flex-col gap-3">
-      <div class="bg-primary text-white rounded-md py-3 gap-2 flex justify-center items-center"
-           @tap="handleWexinLogin"
+      <div
+        class="bg-primary text-white rounded-md py-3 gap-2 flex justify-center items-center"
+        @tap="handleWexinLogin"
       >
-<!--        <image-->
-<!--            src="https://test.bjtdba.com/applet/static/home/22fbc30945610a32c3b048fb1704b1e.png" mode="widthFix"-->
-<!--            class="w-8 h-8"-->
-<!--        ></image>-->
+        <!--        <image -->
+        <!--            src="https://test.bjtdba.com/applet/static/home/22fbc30945610a32c3b048fb1704b1e.png" mode="widthFix" -->
+        <!--            class="w-8 h-8" -->
+        <!--        ></image> -->
         <div>一键登录</div>
       </div>
 
-      
-	  <div v-if="state.isShow">
-		<CXBPhoneLoginButton :text="'手机号快捷登录'"/>
-	  </div>
-	  <div v-else>
-	  	<div
-	  	  class="bg-white border border-solid border-1 border-gray-300 rounded-md py-3 gap-2 flex justify-center items-center" @click="phoneQuicklyLogin">
-	  	  <image src="https://test.bjtdba.com/applet/static/home/4879edf0b6e2b0ad29fa7d4053d676b.png" mode="widthFix"
-	  	    class="w-4 h-4"></image>
-	  	  <button>手机号快捷登录</button>
-	  	</div>
-	  </div> 
-    
-	<div class="bg-white rounded-md py-3 gap-2 flex justify-center items-center text-sm" @click="otherPhoneLogin" >其他手机号登录</div>
-      
+      <div v-if="state.isShow">
+        <CXBPhoneLoginButton text="手机号快捷登录" />
+      </div>
+      <div v-else>
+        <div
+          class="bg-white border border-solid border-1 border-gray-300 rounded-md py-3 gap-2 flex justify-center items-center" @click="phoneQuicklyLogin"
+        >
+          <image
+            src="https://test.bjtdba.com/applet/static/home/4879edf0b6e2b0ad29fa7d4053d676b.png" mode="widthFix"
+            class="w-4 h-4"
+          />
+          <button>手机号快捷登录</button>
+        </div>
+      </div>
+
+      <div class="bg-white rounded-md py-3 gap-2 flex justify-center items-center text-sm" @click="otherPhoneLogin">
+        其他手机号登录
+      </div>
     </div>
-	
-	<div class="bg-white rounded-md py-3 gap-2 flex justify-center items-center text-sm" @click="onClickLeft">
-	  <div>暂不登录</div>
-	</div>
-	<CXBNotLoginButton :key="state.key"/>
-	<view class="bottom-index flex flex-row justify-center items-center">
-		<view class="bottom-index-in mr-2">
-			<image src="https://cdn.bjtdba.com/vod/image/2024-02-29/20240229180900986.png"  style="width: 28rpx; height: 28rpx;" v-if="state.isShow"
-					@click="gou" mode="widthFix"></image>
-			<image src="https://cdn.bjtdba.com/vod/image/2024-02-29/20240229180930865.png"  style="width: 28rpx; height: 28rpx;" v-else
-				@click="gou" mode="widthFix"></image>
-		</view>
-		<view class="bottom-index-ri text-xs">
-			<span class="text-xs">我已经阅读并同意</span>
-				<span class="text-red text-xs" @click="handleViewXieyi(2)">《注册协议》</span>和<span
-	     class="text-red text-xs" @click="handleViewXieyi(1)">《隐私协议》</span>
-		</view>
-	
-	</view>
-  </div>
 
+    <div class="bg-white rounded-md py-3 gap-2 flex justify-center items-center text-sm" @click="onClickLeft">
+      <div>暂不登录</div>
+    </div>
+    <CXBNotLoginButton :key="state.key" />
+    <view class="bottom-index flex flex-row justify-center items-center">
+      <view class="bottom-index-in mr-2" @click="gou">
+        <image
+          v-if="state.isShow" src="https://cdn.bjtdba.com/vod/image/2024-02-29/20240229180900986.png" style="width: 28rpx; height: 28rpx;"
+          mode="widthFix"
+        />
+        <image v-else src="https://cdn.bjtdba.com/vod/image/2024-02-29/20240229180930865.png" style="width: 28rpx; height: 28rpx;" mode="widthFix" />
+      </view>
+      <view class="bottom-index-ri text-xs">
+        <span class="text-xs" @click="gou">我已经阅读并同意</span>
+        <span class="text-red text-xs" @click="handleViewXieyi(2)">《注册协议》</span>和<span
+          class="text-red text-xs" @click="handleViewXieyi(1)"
+        >《隐私协议》</span>
+      </view>
+    </view>
+  </div>
 </template>
 
 <route lang="yaml">
@@ -300,6 +299,7 @@ style:
   enablePullDownRefresh: false
   navigationStyle: custom
 </route>
+
 <style>
 button {
   margin: 0;
@@ -312,6 +312,12 @@ button {
 
 .bottom-index-in {
 	margin-top: 2rpx;
+	width: 100rpx;
+	height: 100rpx;
+
+	display: flex;
+	justify-content: flex-end;
+	align-items: center;
 }
 
 button::after {