feat:提交代码

.env.development

@@ -1,2 +1,2 @@
-VITE_GLOB_API_URL = 'https://api.gdjbp.com'
+VITE_GLOB_API_URL = 'https://api.hxxfb.com'
 

.env.production

@@ -1 +1 @@
-VITE_GLOB_API_URL = 'https://api.gdjbp.com'
+VITE_GLOB_API_URL = 'https://api.hxxfb.com'

pages.config.ts

@@ -25,7 +25,7 @@ export default defineUniPages({
       pagePath: 'pages/dacang/list/index',
       iconPath: 'static/icon/dacang-off.png',
       selectedIconPath: 'static/icon/dacang-on.png',
-      text: '大仓'
+      text: '精品商城'
     }, {
       pagePath: 'pages/order_addcart/index',
       iconPath: 'static/icon/shopcart-off.png',

src/apis/home.ts

@@ -9,7 +9,30 @@ enum API {
 	GET_JD_PRODUCT = '/api/jd/list',
 	GET_PDD_PRODUCT = '/api/pdd/list',//拼多多
 	GET_WPH_PRODUCT = '/api/vip/goods',//唯品会
+	GET_DENOMINATION = '/api/huafei/denomination',//充值话费lab
+	RECHARGE_INFO = '/api/huafei/recharge',//充值话费
 }
+
+
+/**
+ * 充值充值话费lab
+ */
+export function apiRecharge(phone:any,money:any) {
+	return defHttp.post({
+		url: API.RECHARGE_INFO,
+		data:{phone:phone,money:money}
+	})
+}
+/**
+ * 获取充值话费lab
+ */
+export function getDenomination() {
+	return defHttp.post({
+		url: API.GET_DENOMINATION
+	})
+}
+
+
 /**
  * 获取滚动消息
  */

src/apis/order.api.ts

@@ -17,13 +17,14 @@ export interface CartIdRequest {
 export interface CreateOrderRequest {
     address_id: string//地址id
     distribution_mode: string//配送方式:  1: 快递, 2: 自提
-    cart_id: Array<string>//购物车id
+    cart_id: string//购物车id
     // mark: json
     mark: string//备注
-    dacang_id: string//大仓id
+    // dacang_id: string//大仓id
     pay_type: string//支付方式：0: 余额: string1: 微信: string2: 小程序: string4: 支付宝: string5: 特殊商户积分
-    mer_id: string//商户id
-    share_id: string
+    // mer_id: string//商户id
+    // share_id: string,
+	fzone_paytype:string,//支付类型
 }
 
 enum API {

src/apis/quickLink.ts

@@ -1,35 +1,199 @@
 import { defHttp } from '~/utils/http'
-
+import { KINGKONGKEY } from '~/apis/model/common.model'
 
 enum API {
-    GET_CATEGORY = '/gateway/wares_service/waresServiceMerchant/selectMerchantSort',
-	GET_PRODUCT_TYPE='/gateway/wares_service/waresServiceMerchant/selectMerchant?pageNum=1&pageSize=30',
-	GET_PRODUCT_LIST='/gateway/wares_service/waresService/selectProductList?pageNum=1&pageSize=10'
+	GET_CATEGORY = '/gateway/wares_service/waresServiceMerchant/selectMerchantSort',
+	GET_PRODUCT_TYPE = '/gateway/wares_service/waresServiceMerchant/selectMerchant?pageNum=1&pageSize=30',
+	GET_PRODUCT_LIST = '/gateway/wares_service/waresService/selectProductList?pageNum=1&pageSize=10',
+
+	GET_CLASSIFY = '/api/dacang/nologin/classify',
+	GET_PDD_CLASSIFY = '/api/pdd/cat?parentId=0',
+	GET_WPH_CLASSIFY = '/api/get_third_category?type=5',
+	GET_SU_CLASSIFY = '/api/get_third_category?type=4',
+
+
+	GET_BANNER = '/api/newhome/nologin/banner/dingsheng_banner',
+	GET_VIP_BANNER = '/api/newhome/nologin/banner/user_banner',
+
+	GET_PRODUCT = '/api/store/merchant/product/type_lst?type=jingpin&',
+	GET_VIP_PRODUCT = '/api/store/merchant/product/lst/496?limit=10&',
+
+
+	GET_JD_PRODUCT = '/api/jd/list?limit=10&',
+	GET_JD_SEARCH_PRODUCT = '/api/jd/search?limit=10&',
+	GET_PDD_PRODUCT = '/api/pdd/list?limit=10&',
+	GET_PDD_SEARCH_PRODUCT = '/api/pdd/list?limit=10&',
+	
+	
+	GET_WPH_PRODUCT = '/api/vip/goods?limit=10&',
+	GET_WPH_SEARCH_PRODUCT = '/api/vip/search?limit=10&',
+	
+	
+	GET_SU_PRODUCT = '/api/su/list?limit=10&',
+	GET_SU_SEARCH_PRODUCT = '/api/su/search?limit=10&',
+ 
+
+}
+
+
+
+/**
+ * 京东/拼多多/唯品会等相关列表
+ */
+export function apigetShopProduct(data : any) {
+	let url = API.GET_JD_PRODUCT
+	if (data.type == KINGKONGKEY.JD) {//京东
+		url = API.GET_JD_PRODUCT + `cid=${data.cid}&page=${data.page}`
+	} else if (data.type == KINGKONGKEY.PDD) {//拼多多
+		url = API.GET_PDD_PRODUCT + `cat_id=${data.cid}&page=${data.page}`
+	} else if (data.type == KINGKONGKEY.WPH) {//唯品会
+		url = API.GET_WPH_PRODUCT + `cid=${data.cid}&page=${data.page}`
+	} else if (data.type == KINGKONGKEY.SN) {//苏宁易购
+		url = API.GET_SU_PRODUCT + `cid=${data.cid}&page=${data.page}`
+	}
+	return defHttp.get({
+		url: url
+	})
+}
+export function apigetSearchProduct(data : any) {
+	console.log("===apigetSearchProduct", data);
+	let url = API.GET_JD_PRODUCT
+	if (data.type == KINGKONGKEY.JD) {//京东
+		if (data.keyword) {
+			url = API.GET_JD_SEARCH_PRODUCT + `page=${data.page}&keyword=${data.keyword}`
+		} else {
+			url = API.GET_JD_PRODUCT + `page=${data.page}`
+		}
+	} else if (data.type == KINGKONGKEY.PDD) {//拼多多
+		if (data.keyword) {
+			url = API.GET_PDD_SEARCH_PRODUCT + `page=${data.page}&keyword=${data.keyword}`
+		} else {
+			url = API.GET_PDD_PRODUCT + `page=${data.page}`
+		}
+
+	} else if (data.type == KINGKONGKEY.WPH) {//唯品会
+		if (data.keyword) {
+			url = API.GET_WPH_SEARCH_PRODUCT + `page=${data.page}&keyword=${data.keyword}`
+		} else {
+			url = API.GET_WPH_PRODUCT + `page=${data.page}`
+		}
+
+	} else if (data.type == KINGKONGKEY.SN) {//苏宁易购
+		if (data.keyword) {
+			url = API.GET_SU_SEARCH_PRODUCT + `page=${data.page}&keyword=${data.keyword}`
+		} else {
+			url = API.GET_SU_PRODUCT + `page=${data.page}`
+		}
+	}
+	return defHttp.get({
+		url: url
+	})
+}
+
+/**
+ * 京东/拼多多/唯品会等相关分类
+ */
+export function apiGetShopClassity(type : any) {
+	let url = API.GET_PDD_CLASSIFY
+	if (type == KINGKONGKEY.PDD) {//拼多多
+		url = API.GET_PDD_CLASSIFY
+	} else if (type == KINGKONGKEY.WPH) {//唯品会
+		url = API.GET_WPH_CLASSIFY
+	} else if (type == KINGKONGKEY.SN) {//苏宁易购
+		url = API.GET_SU_CLASSIFY
+	}
+	return defHttp.get({
+		url: url
+	})
+}
+
+
+/**
+ * vip产品列表
+ */
+export function apiGetVipProduct(data : any) {
+	return defHttp.get({
+		url: API.GET_VIP_PRODUCT + `page=${data.page}&keyword=${data.keyword}`
+	})
+}
+
+/**
+ * 精品商城产品列表
+ */
+export function apiGetJPProduct(data : any) {
+
+	let params = `pageNum=${data.pageNum}&pageSize=${data.pageSize}&keyword=${data.keyword}`
+	if (data.cate_id) {
+		params = `pageNum=${data.pageNum}&pageSize=${data.pageSize}&keyword=${data.keyword}&cate_id=${data.cate_id}`
+	}
+	return defHttp.get({
+		url: API.GET_PRODUCT + params
+	})
+}
+/**
+ * 精彩生活产品列表
+ */
+export function apiGetProduct(data : any) {
+
+	let params = `pageNum=${data.pageNum}&pageSize=${data.pageSize}&keyword=${data.keyword}`
+	if (data.cate_id) {
+		params = `pageNum=${data.pageNum}&pageSize=${data.pageSize}&keyword=${data.keyword}&cate_id=${data.cate_id}`
+	}
+	return defHttp.get({
+		url: API.GET_PRODUCT + params
+	})
+}
+/**
+ * vip头部banner
+ */
+export function apiVipBanner() {
+	return defHttp.get({
+		url: API.GET_VIP_BANNER
+	})
 }
 /**
+ * 精彩生活头部banner
+ */
+export function apiBanner() {
+	return defHttp.get({
+		url: API.GET_BANNER
+	})
+}
+
+
+
+/**
+ * 精彩生活头部分类
+ */
+export function apiGetClassity() {
+	return defHttp.get({
+		url: API.GET_CLASSIFY
+	})
+}
+
+/**
  * 头部分类
  */
 export function apiGetCategoryList() {
-    return defHttp.get({
-        url: API.GET_CATEGORY
-    },{withToken:false})
+	return defHttp.get({
+		url: API.GET_CATEGORY
+	}, { withToken: false })
 }
 
 /**
  * 列表分类
  */
-export function apiGetProductType(id:any) {
-    return defHttp.get({
-        url: id?(API.GET_PRODUCT_TYPE+"&category_id="+id):API.GET_PRODUCT_TYPE
-    },{withToken:false})
+export function apiGetProductType(id : any) {
+	return defHttp.get({
+		url: id ? (API.GET_PRODUCT_TYPE + "&category_id=" + id) : API.GET_PRODUCT_TYPE
+	}, { withToken: false })
 }
 
 /**
  *产品
  */
-export function apiGetProductList(id:any) {
-    return defHttp.get({
-        url: API.GET_PRODUCT_LIST+"&mer_id="+id
-    },{withToken:false,joinTime:false})
-}
-
+export function apiGetProductList(id : any) {
+	return defHttp.get({
+		url: API.GET_PRODUCT_LIST + "&mer_id=" + id
+	}, { withToken: false, joinTime: false })
+}

src/apis/user.ts

@@ -177,8 +177,223 @@ enum API {
 
     // 绑定微信小程序关系
     XCX_BANDING = '/api/entropy/xcx_banding',
+	
+	//获取贡献值
+	GONGXIAN_INFO ='/api/user/gongxian_info',
+	//获取相关的列表
+	GONGXIAN_LIST='/api/user/gongxian_list?limit=10&',
+	
+	//获取京豆
+	JINGDOU_INFO ='/api/user/jingdou_info',
+	//获取相关的列表
+	JINGDOU_LIST='/api/user/jingdou_list?limit=10&',
+	
+	//获取VR
+	VR_INFO ='/api/user/vr_info',
+	//获取相关的列表
+	VR_LIST='/api/user/vr_list?limit=10&',
+    VR_NAME='/vr_name?uid=',
+	
+	//获取复购金
+	FGJ_INFO ='/api/user/fugou_info',
+	//获取相关的列表
+	FGJ_LIST='/api/user/fugou_list?limit=10&',
+	FGJ_NAME='/api/order/number',
+	
+	
+	//获取红包
+	HB_INFO ='/api/user/hongbao_info',
+	//获取相关的列表
+	HB_LIST='/api/user/hongbao_list?limit=10&',
+	
+	
+	//获取积分
+	JF_INFO ='/api/user/spread_info_yhc',
+	//获取相关的列表
+	JF_LIST='/api/user/green_integral_list?limit=10&',
+	
+	//获取部门相关数据
+	DEPARTMENT_INFO ='/api/user/team_list?limit=100&',
+	
+	//获取佣金
+	BROKERAGE_INFO ='/api/user/get_brokerage_info',
+	
+	//获取转VR列表
+	TRANSITION_VR_INFO ='/api/user/transition_vr_log?limit=10&type=1&',
+	
+	
+	//获取收益详情列表
+	INVITE_PROFIT_INFO ='/api/user/user_invite_profit_list?limit=1000&',
+	
+	//转VR数量
+	TRANSITION_VR ='/api/user/transition_vr',
+	
+	//获取账户
+	GETACCOUNT_INFO ='/api/user/getAccount',
+	
+	GET_BANK_LIST= '/api/bank/list',
+	BANK_CREATE ='/api/bank/create',
+	//发送验证码
+	AUTH_VERIFY ='/api/auth/verify',
+	//提现
+	EXTRACT_CREATE='/api/user/extract/create',
+	
+	
+}
+
+export function apiExtractCreate(data:any) {
+    return defHttp.post({
+        url: API.EXTRACT_CREATE,
+		data:data
+    })
+}
+
+export function apiAuthVerify(phone:any) {
+    return defHttp.post({
+        url: API.AUTH_VERIFY,
+		data:{phone:phone}
+    })
+}
+
+export function apiBankCreate(data:any) {
+    return defHttp.post({
+        url: API.BANK_CREATE,
+		data:data
+    })
+}
+
+export function apigetBankList() {
+    return defHttp.get({
+        url: API.GET_BANK_LIST,
+    })
+}
+export function apigetAccount() {
+    return defHttp.post({
+        url: API.GETACCOUNT_INFO,
+    })
+}
+
+export function apiTransitionVr(num:any) {
+    return defHttp.post({
+        url: API.TRANSITION_VR,
+		data:{extract_amount:num}
+    })
+}
+
+export function apiGetInviteInfo(data:any) {
+	let url =API.INVITE_PROFIT_INFO+`uid=${data.uid}&month=${data.month}`
+	if(data.type!=0){
+		url =API.INVITE_PROFIT_INFO+`uid=${data.uid}&month=${data.month}&commission_type=${data.type}`
+	}
+    return defHttp.get({
+        url: url
+    })
+}
+
+export function apiGetBrokerageInfo() {
+    return defHttp.get({
+        url: API.BROKERAGE_INFO
+    })
+}
+
+export function apiGetTrVrInfo(data:any) {
+    return defHttp.get({
+        url: API.TRANSITION_VR_INFO+data.page
+    })
+}
+export function apiGetDPInfo(data:any) {
+    return defHttp.get({
+        url: API.DEPARTMENT_INFO+`page=${data.page}&type=${data.type}`
+    })
+}
+
+export function apiGetJFInfo() {
+    return defHttp.get({
+        url: API.JF_INFO
+    })
+}
+
+export function apiGetJFList(data:any) {
+    return defHttp.get({
+        url: API.JF_LIST+`page=${data.page}&pm=${data.pm}`
+    })
+}
 
+export function apiGetHBInfo() {
+    return defHttp.get({
+        url: API.HB_INFO
+    })
 }
+
+export function apiGetHBList(data:any) {
+    return defHttp.get({
+        url: API.HB_LIST+`page=${data.page}&pm=${data.pm}`
+    })
+}
+
+
+
+export function apiGetFGJNumber(uid:any) {
+    return defHttp.get({
+        url: API.FGJ_NAME
+    })
+}
+
+export function apiGetFGJInfo() {
+    return defHttp.get({
+        url: API.FGJ_INFO
+    })
+}
+
+export function apiGetFGJList(data:any) {
+    return defHttp.get({
+        url: API.FGJ_LIST+`page=${data.page}&pm=${data.pm}`
+    })
+}
+
+
+export function apiGetVRName(uid:any) {
+    return defHttp.get({
+        url: API.VR_NAME+uid
+    })
+}
+
+export function apiGetVRInfo() {
+    return defHttp.get({
+        url: API.VR_INFO
+    })
+}
+
+export function apiGetVRList(data:any) {
+    return defHttp.get({
+        url: API.VR_LIST+`page=${data.page}&pm=${data.pm}`
+    })
+}
+
+export function apiGetGongXianInfo() {
+    return defHttp.get({
+        url: API.GONGXIAN_INFO
+    })
+}
+
+export function apiGetGongXianList(data:any) {
+    return defHttp.get({
+        url: API.GONGXIAN_LIST+`page=${data.page}&pm=${data.pm}`
+    })
+}
+
+export function apiGetJingDouInfo() {
+    return defHttp.get({
+        url: API.JINGDOU_INFO
+    })
+}
+
+export function apiGetJingDouList(data:any) {
+    return defHttp.get({
+        url: API.JINGDOU_LIST+`page=${data.page}&pm=${data.pm}`
+    })
+}
+
 // 绑定微信小程序关系
 export function xcxBanding(params: { mer_id: string, share_id: string }) {
     return defHttp.get({

src/components/CXBBackTop/CXBBackTop.vue

@@ -1,14 +1,15 @@
 <template>
 <div v-show="flag" class="backtop1" v-if="isShow" >
-  <img @click="scrollToTop" class="backTopImg" src="../../static/icon/返回顶部@2x.png" alt="">
+  <img @click="scrollToTop" class="backTopImg" :src="ICON_CDN_URL+'返回顶部@2x.png'" alt="">
 </div>
 <div v-show="flag" class="backtop2" v-else >
-  <img @click="scrollToTop" class="backTopImg" src="../../static/icon/返回顶部@2x.png" alt="">
+  <img @click="scrollToTop" class="backTopImg" :src="ICON_CDN_URL+'返回顶部@2x.png'" alt="">
 </div>
 </template>
 
 <script setup lang='ts'>
 import { ref, reactive ,defineProps} from 'vue'
+import { ICON_CDN_URL } from '~/config/app'
 
 let flag = ref(false)
 let isShow = ref(true)

src/components/CXBDyLive/CXBDyLiveRecommend.vue

@@ -12,7 +12,7 @@ const props = defineProps({
 })
 function handleItemClick(item: DyLiveModel) {
   uni.navigateTo({
-    url: `/pages/store/product/dy-live-product-list?data=${encodeBase64(item)}`
+    url: `/subPages/pages/store/product/dy-live-product-list?data=${encodeBase64(item)}`
   })
 }
 </script>

src/components/CXBPhoneLoginButton/CXBPhoneLoginButton.vue

@@ -13,8 +13,7 @@ const props = defineProps({
   }
 })
 function getPhoneNumber(e) {
-  // console.log(e.detail)
-  // console.log(e)
+ 
   if (e.detail.errMsg === 'getPhoneNumber:ok') {
     uni.login({
       provider: 'weixin',
@@ -24,13 +23,7 @@ function getPhoneNumber(e) {
           code: result.code,
           source,
         }).then(unionRes => {
-          console.log(111111, unionRes)
-          // const shareId = Cache.get('SHARE_ID')
-          //存储openid
-          // userStore.setOpenid(unionRes.openid)
-          // getShareId(shareI)
           const shareId = Cache.get('SHARE_ID')
-
           let params = {
             sessionKey: unionRes.session_key,
             encryptedData: e.detail.encryptedData,
@@ -62,8 +55,6 @@ function getPhoneNumber(e) {
               third_user_id: unionRes.unionid,
               type: 1
             }).then(bindRes => {
-              // console.log('已绑定手机')
-              // console.log(bindRes)
               Cache.clear('SHARE_ID')
               if (redirectPageObj) {
                 if (redirectPageObj.type === 'page') {
@@ -112,16 +103,8 @@ function getPhoneNumber(e) {
               }
             })
 
-
-            // console.log(authRes)
-            // authRes.token
           })
-          // 手机号绑定
-          // res.openid
-          // res.session_key
-          // bindPhone({
-          //
-          // })
+         
         })
       }
     })

src/components/FSearch/FSearch.vue

@@ -24,7 +24,7 @@ const {
 } = useNavBar(props, emit)
 function handleClick() {
   uni.navigateTo({
-    url: '/pages/search/index'
+    url: '/subPages/pages/search/index'
   })
 }
 </script>

src/components/ProductList/ProductList.vue

@@ -19,7 +19,7 @@ function handleClickItem(item) {
   // console.log(item)
   userStore.isPushToProductDetail = true
   uni.navigateTo({
-    url: `/pages/store/product/detail?id=${item.product_id}`,
+    url: `/subPages/pages/store/product/detail?id=${item.product_id}`,
   })
 }
 </script>

src/config/app.ts

@@ -6,7 +6,7 @@ let VUE_APP_WS_URL = `ws://${location.hostname}?type=user`
 
 // let httpApi = 'https://mer1.crmeb.net'
 //let httpApi = 'https://test.bjtdba.com'
-let httpApi = 'https://api.gdjbp.com'
+let httpApi = 'https://api.hxxfb.com'
  
 // let httpApi = 'https://app.bjtdba.com'
 // let httpApi = 'https://test.bjtdba.com'
@@ -14,8 +14,9 @@ let httpApi = 'https://api.gdjbp.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'
-export const IMG_CDN_URL='https://api.gdjbp.com/share/xcx/'
-export const ICON_CDN_URL='https://api.gdjbp.com/share/xcx/icon/'
+export const IMG_CDN_URL='https://api.hxxfb.com/share/xcx/'
+export const IMG_CDN_NEW_URL='https://api.hxxfb.com/share/img/'
+export const ICON_CDN_URL='https://api.hxxfb.com/share/xcx/icon/'
 
 // 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer.crmeb.net
 let wsApi = ''

src/manifest.json

@@ -51,7 +51,7 @@
     /* 小程序特有相关 */
     "mp-weixin" : {
         "__usePrivacyCheck__" : true, //隐私政策
-        "appid" : "wxfb755febdb800f23",
+        "appid" : "wx7b4d857deb0447f3",
         "setting" : {
             "urlCheck" : false
         },

src/pages/annuity/index.vue

@@ -118,7 +118,7 @@ function handleThirdBind() {
 
 function handlePensionAccount() {
   uni.navigateTo({
-    url: '/pages/pension_account/index',
+    url: '/subPages/pages/pension_account/index',
   })
 }
 

src/pages/dacang/list/components/banner.vue

@@ -1,10 +0,0 @@
-<template>
-  <div>
-    <image :src="bannerImage" mode="widthFix" class="w-full"></image>
-  </div>
-</template>
-<script setup lang="ts">
-import {CDN_URL} from "~/config/app";
-
-const bannerImage = CDN_URL + '/static/assets/banner-dacang.png'
-</script>

src/pages/dacang/list/components/dacang-header.vue

@@ -1,135 +0,0 @@
-<script lang="ts" setup>
-import { computed } from 'vue'
-import { useUserStore } from '~/stores/userStore'
-import { useDacangStore } from '~/stores/dacangStore'
-
-const props = defineProps({
-  exClass: {
-    type: String,
-  },
-  tabs: {
-    type: Array,
-  },
-  // userInfo: {
-  //   type: Object as PropType<UserInfoModel>,
-  //   required: true
-  // },
-  yanglaojin: {
-    type: Number,
-    default: Number.NaN,
-  },
-  current: {
-    type: String,
-    default: '-1',
-  },
-})
-// function handleShowSearchPage() {
-//
-// }
-const emit = defineEmits<{
-  (e: 'click:item', value: string): void
-}>()
-// import {useUserStore} from "~/stores/userStore";
-const userStore = useUserStore()
-const dacangStore = useDacangStore()
-
-const systemInfo = uni.getSystemInfoSync()
-const statusBarHeight = systemInfo.statusBarHeight ?? 0
-const navBarHeight = computed(() => {
-  // const propsHeight = Number(props.height)
-  let defaultHeight = 44
-  // #ifdef MP
-  // if (props.fixed) {
-  const menuButtonInfo = uni.getMenuButtonBoundingClientRect()
-  const menuHeight = menuButtonInfo.height
-  const menuTop = menuButtonInfo.top
-  defaultHeight = (menuTop - statusBarHeight) * 2 + menuHeight
-  // }
-  // #endif
-  // return propsHeight || defaultHeight
-  return defaultHeight
-})
-
-const navBarStyle = computed(() => {
-  return {
-    paddingTop: `${statusBarHeight}px`,
-  }
-})
-
-const tabValue = ref(dacangStore.currentClassify)
-
-watch(() => dacangStore.currentClassify, (val) => {
-  tabValue.value = val
-})
-function handleClick() {
-  if (userStore.userInfo) {
-    uni.navigateTo({
-      url: '/pages/annuity/index',
-    })
-  }
-  else {
-    uni.navigateTo({
-      url: '/pages/user/login/index?key=30',
-    })
-  }
-}
-
-function handleTabItemClick(currentTab) {
-  emit('click:item', tabValue.value)
-}
-function handleShowSearchPage() {
-  uni.navigateTo({
-    url: '/pages/search/search-dacang',
-  })
-}
-</script>
-
-<template>
-  <div class="dacang-header fixed w-screen text-white z-10 w-full h-20" :style="navBarStyle" :class="exClass">
-    <div class="pl-2 pt-2">
-      <div
-        class="w-60% bg-white rounded-full flex flex-row justify-between items-center border-solid border-1 border-red"
-      >
-        <image
-          src="https://cdn.bjtdba.com/vod/image/2023-02-15/20230215112840149.png" mode="widthFix"
-          class="w-4 h-4  pl-2 py-1"
-        />
-        <div class="flex flex-1 items-center w-100%" @tap.stop="handleShowSearchPage">
-          <div class="flex-1 pl-2  font_size ">
-            搜索商品关键词
-          </div>
-          <div class="bg-[#D71608] text-white text-xs w-11 rounded-full text-center py-1 my-0.5 mr-0.5 ">
-            搜索
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <!--    <div class="p-3"> -->
-    <div class=" ">
-      <nut-tabs v-model="tabValue" title-scroll title-gutter="10" name="catePanel" @change="handleTabItemClick">
-        <!--         <nut-tab-panel :title="全部"></nut-tab-panel> -->
-        <nut-tab-pane
-          v-for="item in tabs" :key="item.store_category_id" :title="item.cate_name"
-          :pane-key="item.store_category_id"
-        />
-      </nut-tabs>
-    </div>
-    <!--    </div> -->
-  </div>
-</template>
-
-<style>
-.dacang-header {
-  --nut-tabs-horizontal-tab-line-color: #fff;
-  --nut-tabs-titles-background-color: none;
-  --nut-tabs-titles-item-color: #fff;
-  --nut-tabs-titles-item-active-color: #fff;
-}
-
-.font_size {
-  font-size: 24rpx;
-  line-height: 42rpx;
-  color: #c0c5cc;
-}
-</style>

src/pages/dacang/list/components/life-product.vue

@@ -0,0 +1,212 @@
+<script lang="ts" setup>
+	import { encodeBase64 } from "~/utils/http/helper";
+	const props = defineProps({
+		list: {
+			type: Array,
+			required: true,
+			default: () => {
+				return []
+			}
+		},
+		pageType:{
+			type:Number,
+			default:0
+		}
+	})
+
+	function dealNum(value) {
+		return parseFloat(value).toFixed(2)
+	}
+	
+	
+	function handleProductItemClick(item) {
+		 uni.navigateTo({
+			url: `/subPages/pages/store/product/detail?id=${item.product_id}`
+		})
+	}
+</script>
+
+<template>
+	<view class="product-container">
+		<view @click="handleProductItemClick(item)" class="product-card-content" v-for="(item,index) in list"
+			:key="'product-card-content-'+index">
+			<image class="card-img" :src="item.image" mode="aspectFill"></image>
+			<view class="title-content">
+				<text class="card-title line-clamp-2">{{item.store_name}}</text>
+			</view>
+
+			<!-- <view class="shop-content">
+				<image class="shop-icon" src="/static/icon/icon_shop_name.png" mode="widthFix"></image>
+				<text class="shop-name">{{item.shopName}}</text>
+			</view> -->
+
+			<view class="annuity-content">
+				<view v-if="item.yanglao" class="annuity-value-x mr-10">养老金:￥{{dealNum(item.yanglao+'')}}</view>
+				<view v-if="item.pv" class="annuity-value">pv:{{dealNum(item.pv+'')}}</view>
+			</view>
+
+			<view class="price-content">
+				<text class="price">{{item.price}}</text>
+				<text class="price-x">{{item.ot_price}}</text>
+				<view v-if="pageType==0" class="jf-content">积分</view>
+				<view v-if="pageType==0" class="jd-content">京豆</view>
+				<text v-if="pageType==1"  class="sell">已售{{item.sales}}件</text>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<style scoped lang="scss">
+	.product-container {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: wrap;
+		margin-left: 10rpx;
+		
+
+		.product-card-content {
+			width: 348rpx;
+			background-color: #fff;
+			border-radius: 20rpx;
+			margin-right: 10rpx;
+			margin-left: 10rpx;
+			margin-bottom: 20rpx;
+			align-items: center;
+
+			.price-content {
+				display: flex;
+				flex-direction: row;
+				margin-top: 20rpx;
+				margin-bottom: 20rpx;
+				align-items: center;
+
+				.price {
+					font-size: 28rpx;
+					font-weight: bolder;
+					color: #F83554;
+					margin-left: 20rpx;
+					margin-right: 10rpx;
+				}
+
+				.price-x {
+					font-size: 24rpx;
+					color: #999;
+					text-decoration: line-through;
+					flex: 1;
+				}
+
+				.sell {
+					font-size: 24rpx;
+					color: #999;
+					margin-right: 20rpx;
+				}
+				.jf-content{
+					background-color: #118013;
+					border-radius: 4rpx;
+					margin-right: 6rpx;
+					font-size: 24rpx;
+					padding-left: 4rpx;
+					color: #fff;
+					padding-right: 4rpx;
+				}
+				.jd-content{
+					background-color: #ffcb17;
+					border-radius: 4rpx;
+					font-size: 24rpx;
+					padding-left: 4rpx;
+					padding-right: 4rpx;
+					color: #F83554;
+					margin-right: 10rpx;
+				}
+			}
+
+			.annuity-content {
+				display: flex;
+				margin-left: 20rpx;
+				flex-direction: row;
+				align-items: center;
+				margin-top: 20rpx;
+
+				.annuity-value {
+					background-color: antiquewhite;
+					color: #F83554;
+					font-size: 24rpx;
+					border-radius: 4rpx;
+					padding-left: 4rpx;
+					padding-right: 4rpx;
+				}
+				.annuity-value-x {
+					background-color: #faf0f1;
+					color: #F83554;
+					font-size: 24rpx;
+					border-radius: 4rpx;
+					padding-left: 4rpx;
+					padding-right: 4rpx;
+				}
+
+				.mr-10 {
+					margin-right: 10rpx;
+				}
+
+			}
+
+			.card-img {
+				width: 348rpx;
+				height: 348rpx;
+				border-top-left-radius: 20rpx;
+				border-top-right-radius: 20rpx;
+			}
+
+			.shop-content {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				margin-top: 10rpx;
+				margin-left: 20rpx;
+
+				.shop-icon {
+					width: 30rpx;
+					height: 30rpx;
+					margin-right: 10rpx;
+				}
+
+				.shop-name {
+					color: #666;
+					font-size: 24rpx;
+				}
+			}
+
+
+			.title-content {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				padding-left: 10rpx;
+				padding-right: 10rpx;
+				position: relative;
+
+				.title-icon {
+					width: 30rpx;
+					height: 30rpx;
+					min-width: 30rpx;
+					position: absolute;
+					top: 0;
+					left: 0;
+					margin-left: 20rpx;
+				}
+
+				.card-title {
+					width: 348rpx;
+					font-size: 26rpx;
+					color: #333;
+				}
+			}
+
+
+		}
+
+
+
+	}
+</style>

src/pages/dacang/list/index.vue

@@ -1,60 +1,105 @@
-<script lang="ts" setup>
-	import FNavBar from "~/components/FNavBar/FNavBar.vue";
-	import { getDcProductClassify, getDcProductList } from "~/apis/dacang";
-	import FTabs from "~/components/FTabs/FTabs.vue";
-	import ProductList from "~/components/ProductList/ProductList.vue";
-	import type { DcProductModel } from "~/apis/model/dacang.model";
-	import { useDacangStore } from "~/stores/dacangStore";
-	import { CDN_URL } from "~/config/app";
-	import DacangHeader from "~/pages/dacang/list/components/dacang-header.vue";
-	import CXBBackTop from "~/components/CXBBackTop/CXBBackTop.vue";
+<template>
+
+	<div class="dacang-container">
+         <view class="swiper-content">
+			 <div class="w-screen swiper-height" v-if='state.banners && state.banners.length!=0'>
+			 	<div class="swiper-height">
+			 		<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 rounded-md overflow-hidden ">
+			 			<swiper-item v-for="(item, index) in state.banners" :key="index">
+			 				<image :src="item.pic" class="w-full h-full object-cover swiper-bg" mode="aspectFill" />
+			 			</swiper-item>
+			 		</swiper>
+			 	</div>
+			 </div>
+		 </view>
+		
+		<view class="lab-content">
+			<scroll-view scroll-x="true" class="lab-item">
+				<view class="lab-item-x" v-for="(item,index) in tabList" :key="'lab-item-x-'+index">
+					<view class="lab-item-small" @click="onTabClick(index,item.store_category_id)">
+						<text :class="currentIndex==index?'lab-title':'lab-default-title'">{{item.cate_name}}</text>
+						<view :class="currentIndex==index?'lab-line':'lab-default-line'"></view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="bottom-content">
+			<ProductList :list="pageList" :pageType='1' v-if="pageList && pageList.length!=0" />
+			<CXBEmpty v-else></CXBEmpty>
+		</view>
+	</div>
+	<CXBBackTop :Scroll_X="Scroll_X" :isCss="1" />
+</template>
+
+<script setup lang="ts">
+	import FSearch from "~/components/FSearch/FSearch.vue";
+	import type CXBBackTop from "~/components/CXBBackTop/CXBBackTop.vue";
+	import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 	import { getProductShare } from "~/apis/common";
 	import { useUserStore } from "~/stores/userStore";
 	import Cache from "~/utils/cache";
-	import { getBannerImg } from '~/apis/product'
-	import Banner from "./components/banner.vue";
-
-
-	const usePageStore = usePageStoreWidthOut()
-
-
+	import { apiGetClassity, apiBanner, apiGetProduct } from '~/apis/quickLink'
+	import ProductList from './components/life-product.vue'
+	import { IMG_CDN_URL } from '~/config/app.ts'
+	const pageStore = usePageStoreWidthOut()
+	const userStore = useUserStore()
 	const state = reactive({
-		tabs: [],
-		lists: {},
-		productList: <Array<DcProductModel>>[],
-		currentClassify: '-1',
-		keyword: '',
-		status: 'noMore',
-		banner: '',
 		currentPage: 1,
 		pageSize: 10,
+		page: 1,
+		limit: 10,
+		cid: 0,
 		totalPage: 1,
-		isResponseReachBotton: true, // 是否详情触底事件
+		banners: [],
+		count: 0,
+		pageType: 0,
+		keyword: '',
+		status: 'noMore',
+		indicatorDots: true,
+		circular: true,
+		autoplay: true,
+		interval: 5000,
+		duration: 500,
+		currents: "0",
+		title: '',
+		type: '',
 	})
 
-	// 距离顶部距离
-	let Scroll_X = ref(0)
-
-	let scrollPositions = reactive({})
-	const dacangStore = useDacangStore()
-	const userStore = useUserStore()
-
-	let count = 0
-	
-	onLoad(async (option) => {
-		state.tabs = [{ store_category_id: '-1', cate_name: '全部' }]
-		const classifyRes = await getDcProductClassify()
-		state.tabs.push(...classifyRes)
-		usePageStore.setPageConfig({
-			currentPage: {
-				type: 'tab',
-				url: '/pages/dacang/list/index'
-			}
-		})
+	const pageList = ref([])
+	const tabList = ref([{ category_name: '测试' }])
+	const currentIndex = ref(0)
+	const count = ref(1)
+
+
+	onShow(() => {
+		if (!uni.getStorageSync('UID')) {
+			pageStore.setPageConfig({
+				currentPage: {
+					type: 'tab',
+					url: '/pages/home/index'
+				}
+			})
+			return uni.redirectTo({
+				url: '/pages/user/login/index'
+			})
+		}
+	})
 
+	onLoad((option) => {
 		if (option && option.shareId) {
 			userStore.setShareId(option.shareId)
 		}
+		getClassity()
+		getBanner()
+		getProduct()
+		getProductShareInfo()
+		userStore.setRedirectPage(`/pages/vip/index?type` + state.type, 'page')
+	})
+
+	function getProductShareInfo() {
 		getProductShare().then(res => {
 			if (res) {
 				userStore.setShareId(res.share_id)
@@ -62,22 +107,63 @@
 		}).catch(message => {
 			console.log(message)
 		})
-		userStore.setRedirectPage(`/pages/dacang/list/index`, 'tab')
-		getBannerImg().then(res => {
-			console.log('banner', res);
-			state.banner = res[0].pic
-			console.log(state.banner);
+	}
 
+	function getProduct() {
+		uni.showLoading()
+		apiGetProduct({
+			pageNum: state.page,
+			pageSize: state.limit,
+			cate_id: state.cid,
+			keyword: state.keyword
+		}).then(res => {
+			count.value = res.count
+			if (state.page === 1) {
+				pageList.value = res.list
+			} else {
+				setTimeout(() => {
+					pageList.value.push(...res.list)
+				}, 300)
+			}
+			uni.hideLoading()
 		})
-	})
+	}
 
+	function getBanner() {
+		apiBanner().then(res => {
+			state.banners = res
+		})
+	}
+
+	function getClassity() {
+		apiGetClassity().then(res => {
+			tabList.value = [{ cate_name: '全部' }, ...res]
+		})
+	}
+
+	function onTabClick(index, store_category_id) {
+		state.cid = store_category_id
+		state.page = 1
+		currentIndex.value = index
+		getProduct()
+	}
+	//搜索全部筛选
+	function searchkwd() {
+		if (!state.keyword) {
+			return uni.showToast({
+				title: '请输入搜索关键字',
+				icon: 'none'
+			})
+		}
+		state.page = 1
+		getProduct()
+	}
 
 	onShareAppMessage(() => {
 		const shareId = Cache.get('SHARE_ID')
-
 		return {
 			title: `消费储蓄 保障未来`,
-			path: `/pages/dacang/list/index?shareId=${shareId}`,
+			path: `/pages/vip/index?shareId=${shareId}`,
 			imageUrl: 'https://cdn.bjtdba.com/vod/image/2023-10-09/20231009202402136.png'
 		}
 	})
@@ -86,117 +172,41 @@
 		const shareId = Cache.get('SHARE_ID')
 		return {
 			title: `消费储蓄 保障未来`,
-			imageUrl: 'https://cdn.bjtdba.com/vod/image/2023-10-11/20231011062523504.png',
-			query: `from=share&shareId=${shareId}`
+			query: `from=share&shareId=${shareId}`,
+			imageUrl: 'https://cdn.bjtdba.com/vod/image/2023-10-11/20231011062523504.png'
 		}
 	})
 
-	onShow((options) => {
-
-		usePageStore.setPageConfig({
-			currentPage: {
-				type: 'tab',
-				url: '/pages/dacang/list/index'
-			}
-		})
-		
-		count = count + 1
-		console.log('count ---> ',count)
-		if (count > 1) {
-			userStore.isPushToProductDetail = false
-			count = 1
-			return
-		}
-		
-		// if (userStore.isPushToProductDetail) {
-		// 	userStore.isPushToProductDetail = false
-		// 	return
-		// }
-		
-		if (dacangStore) {
-			state.currentClassify = dacangStore.currentClassify
-		}
-		loadList('reload')
-		
-	})
-
-	const loadList = async (action : 'page' | 'reload', callback ?: (items) => void) => {
-		console.log(action);
-		let params : any = {
-			page: state.currentPage,
-			limit: state.pageSize,
-			keyword: state.keyword
-		}
-		console.log(params);
-		if (state.currentClassify !== '-1') {
-			params.classify = state.currentClassify
-		}
-		let res = await getDcProductList({
-			...params
+	function handleItemClick(item) {
+		uni.navigateTo({
+			url: `/subPages/pages/store/product/detail?id=${item.product_id}`
 		})
-		console.log('res>>>>', res);
-		if (action === 'page') {
-			state.lists[state.currentClassify] = state.lists[state.currentClassify].concat(res)
-		}
-		if (action === 'reload') {
-			state.lists[state.currentClassify] = res
-		}
-
-		if (callback) {
-			callback(res)
-		}
-
-
 	}
 
-	// function handleTabItemClick(classifyId: string) {
-	//   state.currentClassify = classifyId
-	//   state.currentPage = 1
-	//   state.pageSize = 10
-
-	//   setTimeout(() => {
-	//     loadList('reload')
-	//   }, 300)
-
-	// }
-
-	function handleTabItemClick(classifyId : string) {
-		
-		state.isResponseReachBotton = false;
-		// 切换当前分类页
-		state.currentClassify = classifyId;
-		// 检查当前分类页是否有保存的滚动位置
-		if (scrollPositions[classifyId] !== undefined) {
-			// 如果有保存的滚动位置，恢复滚动位置
-			uni.pageScrollTo({
-				scrollTop: scrollPositions[classifyId],
-				duration: 1
-			});
-		} else {
-			// 如果没有保存的滚动位置，重新加载数据
-			state.currentPage = 1;
-			state.pageSize = 10;
-			setTimeout(() => {
-				loadList('reload')
-			}, 300)
-		}
-		// state.isResponseReachBotton = true;
+	function clearSearch() {
+		state.page = 1
+		getProduct()
 	}
 
-	function toHuiyuan() {
-		uni.navigateTo({
-			url: `/pages/guest_member_new/index?is_merchant=${userStore.userInfo.is_merchant}`
-		})
-	}
+	onPullDownRefresh(() => {
+		state.page = 1
+		getClassity()
+		getBanner()
+		getProduct()
+		uni.stopPullDownRefresh()
+	})
 
+	onReachBottom(() => {
+		if (pageList.value.length < count.value) {
+			state.page += 1
+			getProduct()
+		}
+	})
+	// 距离顶部距离
+	let Scroll_X = ref(0)
 	const headerClass = ref('')
 	onPageScroll((page) => {
-
 		Scroll_X.value = Number(page.scrollTop.toFixed())
-		console.log('Scroll_X ----> ', Scroll_X.value)
-		// 保存当前分类页的滚动位置
-		scrollPositions[state.currentClassify] = Scroll_X.value;
-
 		// page.scrollTop
 		if (page.scrollTop >= 76) {
 			headerClass.value = '!bg-primary !text-white'
@@ -204,80 +214,118 @@
 			headerClass.value = ''
 		}
 	})
+</script>
 
-	onReachBottom(() => {
+<route lang="yaml">
+style:
+  navigationBarTitleText: 精彩生活
+  enablePullDownRefresh: true
+  navigationStyle: custom
+</route>
+
+<style>
+	page {
+		background: #f8f8f8;
+		--nut-searchbar-background: #fff;
+		--nut-searchbar-input-background: #f8f8f8;
+		--nut-searchbar-input-box-shadow: none;
+	}
+</style>
+<style scoped lang="scss">
+	
+	.dacang-container{
+		display: flex;
+		flex-direction: column;
+	}
+	.mt-90 {
+		margin-top: 90rpx;
+	}
+
+	.bottom-content {
+		display: flex;
+		flex-direction: column;
+		margin-top: 470rpx;
+	}
+
+	.top-info-content {
+		display: flex;
+		flex-direction: column;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 22;
+	
+	}
 
-		console.log('是否出发触底事件 = ', state.isResponseReachBotton)
+	.swiper-height {
+		height: 380rpx;
+	}
+	
+	.swiper-content{
+		display: flex;
+		flex-direction: row;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 99999;
+	}
 
-		if (!state.isResponseReachBotton) {
-			return
+	.lab-content {
+		width: 100%;
+		height: 90rpx;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		background-color: #fff;
+		z-index: 99999;
+		position: fixed;
+		top: 0;
+		margin-top: 380rpx;
+		left: 0;
+
+		.lab-item {
+			display: flex;
+			flex-direction: row;
+			white-space: nowrap;
+			width: 100%;
 		}
-		console.log('触发了')
-		uni.showLoading()
 
-		state.status = 'loading'
-		state.currentPage += 1
-		loadList('page', (items) => {
-			uni.hideLoading()
-			console.log(items)
-			if (!items.length > 0) {
-				// console.log('没有更多了')
-				state.status = 'noMore'
+		.lab-item-x {
+			display: inline-block;
+			margin-right: 10px;
+			text-align: center;
+		}
+
+		.lab-item-small {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			width: 124rpx;
+
+			.lab-default-title {
+				font-size: 28rpx;
+				margin-bottom: 10rpx;
 			}
-		})
-	})
-	onPullDownRefresh(() => {
-		uni.showLoading()
-		state.currentPage = 1
-		state.pageSize = 10
-		loadList('reload', (items) => {
-			uni.hideLoading()
-			uni.stopPullDownRefresh()
-		})
-	})
 
-	function moving(event) {
-		// console.log('event = ', event)
-		state.isResponseReachBotton = true
-	}
-</script>
+			.lab-title {
+				font-size: 32rpx;
+				margin-bottom: 10rpx;
+				color: #FE0032;
+			}
 
-<template>
-	<div class="h-screen" @touchmove="moving">
-		<DacangHeader :ex-class="headerClass" :tabs="state.tabs" @click:item="handleTabItemClick" />
-		<!-- gap-2 -->
-		<div class="flex flex-col gap-2">
-			<CXBBackTop :Scroll_X="Scroll_X" :isCss="1" />
-			<image lazy-load :src="state.banner" mode="widthFix" @click="toHuiyuan" class="w-full h-50 mt--2"></image>
-			<div>
-				<ProductList :list="state.lists[state.currentClassify]" />
-			</div>
-			<div class="pb-safe flex justify-center items-center text-[12px] text-gray-500"
-				v-if="state.lists[state.currentClassify]?.length > 0">
-				<div v-if="state.status === 'loading'">
-					加载中...
-				</div>
-				<div v-if="state.status === 'noMore'">
-					没有更多了～
-				</div>
-			</div>
-		</div>
+			.lab-line {
+				width: 50rpx;
+				height: 6rpx;
+				background-color: #FE0032;
+				border-radius: 4rpx;
+			}
 
-	</div>
-</template>
-<style>
-	page {
-		background-color: #f8f8f8;
-	}
+			.lab-default-line {
+				width: 50rpx;
+				height: 6rpx;
+				border-radius: 4rpx;
+			}
 
-	.nut-tab-pane {
-		display: none !important;
+		}
 	}
-</style>
-
-<route lang="yaml" >
-style:
-  navigationStyle: custom
-  navigationBarTitleText: 储蓄保
-  enablePullDownRefresh: true
-</route>
+</style>

src/pages/home/components/banner.vue

@@ -7,11 +7,11 @@ function handleGuestMemberNew() {
   
   if (userStore.uid) {
     uni.navigateTo({
-      url: `/pages/guest_member_new/index?is_merchant=${userStore.userInfo.is_merchant}`
+      url: `/subPages/pages/guest_member_new/index?is_merchant=${userStore.userInfo.is_merchant}`
     })
   } else {
     uni.navigateTo({
-      url: '/pages/guest_member_new/index'
+      url: '/subPages/pages/guest_member_new/index'
     })
   }
 }

src/pages/home/components/header.vue

@@ -4,7 +4,9 @@
 	import type { UserInfoModel } from "~/apis/model/userInfoModel";
 	import { useUserStore } from "~/stores/userStore";
 	import { TOP_LAB_ARR } from '../constants.js';
+	import { IMG_CDN_URL,IMG_CDN_NEW_URL } from '~/config/app'
     const emit = defineEmits(['onTabClick'])
+	const topBannerBg =ref(`${IMG_CDN_URL}jd_bg.png`)
 
 	// import {useUserStore} from "~/stores/userStore";
 	const userStore = useUserStore()
@@ -41,10 +43,7 @@
 		exClass: {
 			type: String
 		},
-		// userInfo: {
-		//   type: Object as PropType<UserInfoModel>,
-		//   required: true
-		// },
+	
 		yanglaojin: {
 			type: Number,
 			default: NaN
@@ -61,10 +60,7 @@
 			})
 		}
 	}
-	// function handleShowSearchPage() {
-	//
-	// }
-
+	
 	function handleShowMessage() {
 		uni.navigateTo({
 			url: '/pages/message/index'
@@ -72,7 +68,7 @@
 	}
 	function handleClickser() {
 		uni.navigateTo({
-			url: '/pages/search/index'
+			url: '/subPages/pages/search/index'
 		})
 	}
 	
@@ -81,13 +77,24 @@
 		currentIndex.value=position
 		emit('onTabClick', position)
 	}
+	function onYljClick(){
+		if (userStore.userInfo && userStore.uid) {
+			uni.navigateTo({
+				url: '/pages/annuity/index'
+			})
+		} else {
+			uni.navigateTo({
+				url: '/pages/user/login/index?key=30'
+			})
+		}
+	}
 </script>
 <template>
 	<div class="home-header-content home-header fixed w-screen text-white z-10" :style="navBarStyle">
-		<image  class="top-bg" src="/static/img/jd_bg.png" mode="widthFix"></image>
+		<image  class="top-bg" :src="topBannerBg" mode="widthFix"></image>
 		<div class="flex user-info">
 			<div @click="handleClick" class="flex gap-2 mb-2 pl-2 flex-1">
-				<image v-if="userStore && userStore.userInfo && userStore.userInfo.avatar"
+				<!-- <image v-if="userStore && userStore.userInfo && userStore.userInfo.avatar"
 					:src="userStore.userInfo.avatar" style="width:74rpx; height:74rpx;" class="rounded-full" />
 				<image v-else src="https://app.bjtdba.com/uploads/logo.jpg" mode="widthFix"
 					class="w-9 h-9 rounded-full" />
@@ -99,13 +106,12 @@
 					<div v-else class="text-xs">
 						领取养老金
 					</div>
-				</div>
+				</div> -->
+				<image @click="handleShowMessage" :src="IMG_CDN_NEW_URL+'icon_msg_white.png'" mode="widthFix" class="w-6 h-6" ></image>
 			</div>
-			<div class=" right-26 flex flex-col text-[10px] justify-center items-center " @tap.stop="handleShowMessage"
-				:style="{ marginRight: `${menuButtonInfo.width + 15}px` }">
-				<image src="/static/icon/message-dark.png" mode="widthFix" class="w-4 h-4" v-if="exClass"></image>
-				<image src="/static/icon/message.png" mode="widthFix" class="w-4 h-4" v-else></image>
-				<div>消息</div>
+			<div class=" right-26 flex flex-col text-[10px] justify-center items-center " 
+				:style="{ marginRight: `${menuButtonInfo.width + 15}px` }" @click="onYljClick">
+				<image :src="IMG_CDN_NEW_URL+'icon_yanglaojin.png'" mode="widthFix" class="w-6 h-6" ></image>
 			</div>
 		</div>
 
@@ -218,6 +224,7 @@
 	.head-conent {
 		z-index: 666;
 		display: flex;
+		margin-top: 10rpx;
 		flex-direction: column;
 	}
 

src/pages/home/components/movies.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-	import { IMG_CDN_URL ,ICON_CDN_URL} from '~/config/app.ts'
+	import { IMG_CDN_URL ,ICON_CDN_URL} from '~/config/app'
 	const currentIndex = ref(0)
 
 	const moviesList = ref([
@@ -23,7 +23,7 @@
 			<text class="small-title">即将上映</text>
 			<view class="right-title" @click="onItemClick">
 				<text class="more-title">查看全部</text>
-				<image class="more-icon" src="/static/icon/order_store_entry_220624.png" mode="widthFix"></image>
+				<image class="more-icon" :src="ICON_CDN_URL+'order_store_entry_220624.png'" mode="widthFix"></image>
 			</view>
 		</view>
 

src/pages/home/components/navs.vue

@@ -9,19 +9,6 @@
 	
 	
 	const navList = ref(NAVS_HOT_ARR)
-
-	onBeforeMount(() => {
-		// getHomeQuickLink().then((res) => {
-		// 	// console.log('res>>>>>', res);
-
-		// 	if (res) {
-		// 		navList.value[12] = res[0]
-		// 		navList.value[3] = res[1]
-		// 		// navList.value[3] = res[0]
-		// 		// console.log(res)
-		// 	}
-		// })
-	})
 	
 	function onTabClikc(position:number){
 		currentIndex.value = position
@@ -36,116 +23,48 @@
 		}
 	}
 
-	// function goTo()
+	
 	function handleItemClick(item : any) {
-		// console.log(item.key)
-		// console.log(item)
+	
 		switch (item.key) {
-			case PLATFORM_NAME.DC: {
-				const dacangStore = useDacangStore()
-				console.log('categoryId = ', item.categoryId)
-				dacangStore.setClassify(item.categoryId)
-				uni.switchTab({
-					url: '/pages/dacang/list/index',
-				})
-				break
-			}
-			// 会员专区
-			case 'user': {
-				// uni.navigateTo({
-				//   url: `/pages/vip/index?type=`+item.key
-				// })
-				uni.navigateToMiniProgram({
-					appId: 'wx9082e5ac2fdb513f',
-					path: 'pages/home/index',
-					envVersion: 'release', // develop（开发版），trial（体验版），release（正式版）
-					success(res) {
-						// 打开成功
-						console.log(res)
-					},
-					fail: (error) => {
-						console.log(error)
-					},
-				})
-
-				break
-			}
-			// 秒杀
-			case 'miaosha': {
+			case KINGKONGKEY.RECHARGE:{
 				uni.navigateTo({
-					url: '/pages/miaosha/index?type_show=1',
+					url: `/subPages/pages/phone-bill/index`,
 				})
 				break
 			}
-			case 'zibu': {
-				// if ()
-				const id = 430
-				uni.navigateTo({
-					url: `/pages/product/zibuyangsheng?id=${id}`,
-				})
-				break
-			}
-			case 'dingsheng': {
-				uni.navigateTo({
-					url: `/pages/product/dingshenglianmeng?type=${item.key}`,
-				})
-				break
-			}
-			// 工厂直供
-			case 'gongchang': {
-				uni.navigateTo({
-					url: `/pages/vip/index?type=${item.key}`,
-				})
-				break
-			}
-			case 'jingpin': {
-				uni.navigateTo({
-					url: `/pages/product/dingshenglianmeng?type=${item.key}`,
-				})
-				break
-			}
-			// 积分通兑
-			case 'integral': {
-				uni.navigateTo({
-					url: '/pages/product/integral',
-				})
-				break
-			}
-			case 'chuangke': {
-				uni.switchTab({
-					url: '/pages/store/nearby/index',
-				})
-				break
-			}
-		
 			case KINGKONGKEY.VIP:{
 				uni.navigateTo({
-					url: `/pages/quick-fuc/vip?type=${item.key}&title=会员专区`,
+					url: `/subPages/pages/quick-fuc/vip`,
 				})
 				break
 			}
 			case KINGKONGKEY.JCSH:{
 				uni.navigateTo({
-					
-					url: `/pages/quick-fuc/life?type=${item.key}&title=精彩生活`,
+					url: `/subPages/pages/quick-fuc/life`,
 				})
 				break
 			}
 			case KINGKONGKEY.SMZQ:{
 				uni.navigateTo({
-					url: `/pages/quick-fuc/business?type=${item.key}&title=商贸专区`,
+					url: `/subPages/pages/quick-fuc/business`,
 				})
 				break
 			}
 			case KINGKONGKEY.JD:
 			case KINGKONGKEY.PDD:
-			case KINGKONGKEY.DY:
-			case KINGKONGKEY.TB:
+			case KINGKONGKEY.WPH:
 			case KINGKONGKEY.SN:
 				uni.navigateTo({
-					url: `/pages/search/index?platform=${item.key}`,
+					url: `/subPages/pages/quick-fuc/shop?type=${item.key}`,
 				})
 				break
+			default:
+			uni.showToast({
+				title:'功能升级中...',
+				icon:'none'
+			})
+			break
 		}
 	}
 </script>

src/pages/home/components/product-list.vue

@@ -34,7 +34,7 @@ function handleProductItemClick(
   // console.log(item)
 
   function navigateToDetail(params) {
-    let otherDetailUrl = `/pages/store/product/other`
+    let otherDetailUrl = `/subPages/pages/store/product/other`
     // throttle(() => {
 
       return uni.navigateTo({
@@ -42,17 +42,16 @@ function handleProductItemClick(
       })
     // })
   }
+  
+
   // 大仓
   if (item.type === '5') {
-    // throttle(() => {
-      // uni.navigateTo({
-      //   url: `/pages/store/product/detail?id=${item.product_id}`
-      // })
+    
       return uni.navigateTo({
-        url: `/pages/store/product/detail?id=${item.product_id}`
+        url: `/subPages/pages/store/product/detail?id=${item.product_id}`
       })
 
-    // })
+    
 
   }
   // 京东
@@ -96,9 +95,7 @@ function handleProductItemClick(
     }
 
     return navigateToDetail(encodeBase64(productParams))
-    // uni.navigateTo({
-    //   url: `/pages/store/product/other?platform=${item.type}&id=${item.id}`
-    // })
+    
   }
 
   // 拼多多
@@ -122,9 +119,7 @@ function handleProductItemClick(
     }
     // console.log(productParams)
     return navigateToDetail(encodeBase64(productParams))
-    // uni.navigateTo({
-    //   url: `/pages/store/product/other?platform=${item.type}&id=${item.id}&allowance=${item.commission}`
-    // })
+    
   }
   // 唯品会
   if (item.type === 2) {
@@ -185,25 +180,10 @@ function handleProductItemClick(
 
 function handleLiveRecommendTitleClick() {
   uni.navigateTo({
-    url: `/pages/store/product/dy-live`
+    url: `/subPages/pages/store/product/dy-live`
   })
 }
-// function handleClickItem(item) {
-//   handleProductItemClick(item)
-  // console.log(item)
-  // if (item.type === 5 || item.type === '5') {
-  //   uni.navigateTo({
-  //     url: `/pages/store/product/detail?id=${item.product_id}`
-  //   })
-  // } else {
-  //   // let otherDetailUrl = `/pages/store/product/other`
-  //   // uni.navigateTo({
-  //   //   url: `${otherDetailUrl}?params=${params}`
-  //   // })
-  // }
-  // uni.navigateTo({
-  // })
-// }
+
 </script>
 <template>
 <!--  <scroll-view type="custom">-->

src/pages/home/components/product-new.vue

@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 	import { encodeBase64 } from "~/utils/http/helper";
+	import{ICON_CDN_URL} from '~/config/app'
 	const props = defineProps({
 		list: {
 			type: Array,
@@ -18,21 +19,21 @@
 	function dealIcon(customType, shopType) {
 		let icon = ''
 		if (customType == 6) { //淘宝
-			icon = '/static/icon/jingdong_x.png'
+			icon = ICON_CDN_URL+'jingdong_x.png'
 		} else if (customType == 5) {
 			if (shopType == 1) {
-				icon = '/static/icon/tianmao.png'
+				icon = ICON_CDN_URL+'tianmao.png'
 			} else {
-				icon = '/static/icon/taobaoyanglao_x.png'
+				icon = ICON_CDN_URL+'taobaoyanglao_x.png'
 			}
 		} else if (customType == 4) {
-			icon = '/static/icon/douyin_x_230313.png'
+			icon = ICON_CDN_URL+'douyin_x_230313.png'
 		} else if (customType == 3) {
-			icon = '/static/icon/suningyigou_x.png'
+			icon = ICON_CDN_URL+'suningyigou_x.png'
 		} else if (customType == 2) {
-			icon = '/static/icon/weipinhui_x.png'
+			icon = ICON_CDN_URL+'weipinhui_x.png'
 		} else {
-			icon = '/static/icon/pinduoduo_x.png'
+			icon = ICON_CDN_URL+'pinduoduo_x.png'
 		}
 		return icon
 	}
@@ -40,7 +41,7 @@
 	function handleProductItemClick(item) {
 		if (item.type === '5') {//大仓
 			return uni.navigateTo({
-				url: `/pages/store/product/detail?id=${item.product_id}`
+				url: `/subPages/pages/store/product/detail?id=${item.product_id}`
 			})
 		} else {
 			 let  productParams = {}
@@ -124,7 +125,7 @@
 			}
             let param = encodeBase64(productParams)
 			uni.navigateTo({
-				url: `/pages/store/product/other?params=${param}`
+				url: `/subPages/pages/store/product/other?params=${param}`
 			})
 		}
 
@@ -143,12 +144,12 @@
 			</view>
 
 			<view class="shop-content">
-				<image class="shop-icon" src="/static/icon/icon_shop_name.png" mode="widthFix"></image>
+				<image class="shop-icon" :src="ICON_CDN_URL+'icon_shop_name.png'" mode="widthFix"></image>
 				<text class="shop-name">{{item.shopName}}</text>
 			</view>
 
 			<view class="annuity-content">
-				<view v-if="item.yanglaojin" class="annuity-value mr-10">养老金:￥{{dealNum(item.yanglaojin+'')}}</view>
+				<view v-if="item.yanglaojin" class="annuity-value-x mr-10">养老金:￥{{dealNum(item.yanglaojin+'')}}</view>
 				<view v-if="item.pv" class="annuity-value">pv:{{dealNum(item.pv+'')}}</view>
 			</view>
 
@@ -170,7 +171,7 @@
 		margin-left: 10rpx;
 
 		.product-card-content {
-			width: 340rpx;
+			width: 348rpx;
 			background-color: #fff;
 			border-radius: 20rpx;
 			margin-right: 10rpx;
@@ -222,6 +223,14 @@
 					padding-left: 4rpx;
 					padding-right: 4rpx;
 				}
+				.annuity-value-x {
+					background-color: #faf0f1;
+					color: #F83554;
+					font-size: 24rpx;
+					border-radius: 4rpx;
+					padding-left: 4rpx;
+					padding-right: 4rpx;
+				}
 
 				.mr-10 {
 					margin-right: 10rpx;
@@ -230,8 +239,8 @@
 			}
 
 			.card-img {
-				width: 340rpx;
-				height: 340rpx;
+				width: 348rpx;
+				height: 348rpx;
 				border-top-left-radius: 20rpx;
 				border-top-right-radius: 20rpx;
 			}
@@ -275,11 +284,10 @@
 				}
 
 				.card-title {
-					text-indent: 20px;
-					width: 340rpx;
+					text-indent: 24px;
+					width: 348rpx;
 					font-size: 26rpx;
 					color: #333;
-					text-align: center;
 				}
 			}
 

src/pages/home/index.vue

@@ -384,7 +384,7 @@
 	// 秒杀跳转详情页
 	function handleToDeatil(product_id : any) {
 		uni.navigateTo({
-			url: `/pages/store/product/detail?id=${product_id}`,
+			url: `/subPages/pages/store/product/detail?id=${product_id}`,
 		})
 	}
 

src/pages/miaosha/index-bak-old.vue

@@ -90,7 +90,7 @@ function handleSeckillDateClick(seckill) {
 
 function handleItemClick(seckillItem) {
   uni.navigateTo({
-    url: `/pages/store/product/detail?id=${seckillItem.product_id}`
+    url: `/subPages/pages/store/product/detail?id=${seckillItem.product_id}`
   })
 }
 </script>

src/pages/miaosha/index-bak.vue

@@ -32,7 +32,7 @@ function handleSeckillDateClick(seckill) {
 
 function handleItemClick(seckillItem) {
   uni.navigateTo({
-    url: `/pages/store/product/detail?id=${seckillItem.product_id}`
+    url: `/subPages/pages/store/product/detail?id=${seckillItem.product_id}`
   })
 }
 </script>

src/pages/miaosha/index.vue

@@ -189,7 +189,7 @@ function handleItemClick(seckillItem) {
     })
   }
   uni.navigateTo({
-    url: `/pages/store/product/detail?id=${seckillItem.product_id}`
+    url: `/subPages/pages/store/product/detail?id=${seckillItem.product_id}`
   })
 }
 

src/pages/my-invitation/index.vue

@@ -90,7 +90,7 @@ function handleClick(item: { url: string, title: string }) {
 function handleClickTomo() {
   if (userStore.userInfo.is_ertification == 1) {
     uni.navigateTo({
-      url: '/pages/immediate-withdrawal/index?type=1'
+      url: '/subPages/pages/immediate-withdrawal/index?type=1'
     })
   } else {
     setTimeout(() => {
@@ -152,10 +152,7 @@ function handleShowAgreement() {
           <div class="font-bold">{{ userInviteProfit.UserUnsettledInviteProfit ?
             userInviteProfit.UserUnsettledInviteProfit : '0' }}</div>
         </div>
-        <!-- {
-                title: '去提现',
-                  url: '/pages/immediate-withdrawal/index?type=1'
-        },-->
+       
 
         <div class="flex-1 flex flex-col justify-center items-center gap-2">
           <div class="text-xs text-gray">累计收益（元）</div>

src/pages/my-relation-merchant/index.vue

@@ -39,7 +39,7 @@ function loadMyRelationMerchantList(keywords = '') {
 function handleItemClick(item) {
   console.log(item)
   uni.navigateTo({
-    url: '/pages/store/home/index?id=' + item.mer_id
+    url: '/subPages/pages/store/home/index?id=' + item.mer_id
   })
 }
 

src/pages/my-relation-product/index.vue

@@ -38,7 +38,7 @@ function loadMyFavorite(keywords = '') {
 function handleShowDetail(item) {
   console.log(item)
   uni.navigateTo({
-    url: `/pages/store/product/detail?id=${item.product_id}`
+    url: `/subPages/pages/store/product/detail?id=${item.product_id}`
   })
 }
 function handleRemoveMyRelationProduct(item: any, index: number) {

src/pages/my-rules/index.vue

@@ -4,7 +4,7 @@ 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 { CDM_URL } from '~/config/app';
+import { CDM_URL ,ICON_CDN_URL} from '~/config/app';
 
 const userStore = useUserStore()
 const ruleDetail = ref<{
@@ -44,14 +44,14 @@ const userType = computed(() => {
     // if (bangfu) {
     //   return ['../../static/img-hy/帮扶中心.png', bangfu]
     // }
-    return ['../../static/img-hy/用户.png']
+    return [ICON_CDN_URL+'用户.png']
   }
   // 会员
   if (userRichType == 1) {
     // if (bangfu) {
     //   return ['../../static/img-hy/帮扶中心.png', bangfu]
     // }
-    return ['../../static/img-hy/会员.png']
+    return [ICON_CDN_URL+'会员.png']
 
   }
   // 创始人
@@ -59,7 +59,7 @@ const userType = computed(() => {
     // if (bangfu) {
     //   return ['../../static/img-hy/帮扶中心.png', bangfu]
     // }
-    return ['../../static/img-hy/创始人.png']
+    return [ICON_CDN_URL+'创始人.png']
   }
   // 合伙人
   if (userRichType == 4) {
@@ -67,19 +67,19 @@ const userType = computed(() => {
     // if (bangfu) {
     //   return ['../../static/img-hy/帮扶中心.png', bangfu]
     // }
-    return ['../../static/img-hy/高级会员.png']
+    return [ICON_CDN_URL+'高级会员.png']
   }
   if (userRichType == 8) {
     // if (bangfu) {
     //   return ['../../static/img-hy/帮扶中心.png', bangfu]
     // }
-    return ['../../static/img-hy/合伙人.png']
+    return [ICON_CDN_URL+'合伙人.png']
   }
   if (userRichType == 9) {
     // if (bangfu) {
     //   return ['../../static/img-hy/帮扶中心.png', bangfu]
     // }
-    return ['../../static/img-hy/联合创始人.png']
+    return [ICON_CDN_URL+'联合创始人.png']
   }
   if (!userRichType) {
     // if (bangfu) {
@@ -144,7 +144,7 @@ function handleShowMyIntegral() {
 }
 function handleShowMyAllOrder(tab?: number) {
   uni.navigateTo({
-    url: '/pages/order/index?tabIndex=' + tab
+    url: '/subPages/pages/order/index?tabIndex=' + tab
   })
 }
 function handleToRedIntegral() {

src/pages/order-confirm/index.vue

@@ -1,417 +1,404 @@
 <script setup lang="ts">
-import { reactive } from 'vue'
-import { getUserAddressList, getUserVipInfo } from '~/apis/user'
-import type { CreateOrderRequest } from '~/apis/order.api'
-import { cartChange, orderCheck, orderCreate } from '~/apis/order.api'
-import CXBYaojinTag from '~/components/CXBYaojinTag/CXBYaojinTag.vue'
-import FCell from '~/components/FCell/FCell.vue'
-import { encodePhone } from '~/utils'
-import { CDN_URL } from '~/config/app'
-import { useAddressStore } from '~/stores/addressStore'
-import FField from '~/components/FField/FField.vue'
-
-const addressIcon = `${CDN_URL}/static/assets/dingwi_220624.png`
-// const addressInfo = ref({})
-const addressStore = useAddressStore()
-const userStore = useUserStore()
-
-const data = reactive({
-  cartOrder: [],
-
-  type: '',
-  addressInfo: {},
-  cartId: '',
-  addressId: '',
-  productId: '',
-  // da_type
-  // dahy
-  vipType: '',
-  is_dacang_vip_product: '',
-  totalPrice: '',
-  orderStatus: '',
-  mark: '',
-  // 商品总价？
-  // proPrice: ''
-
-  enabled: false,
-})
-onLoad(async (options) => {
-  if (options && options.type)
-    data.type = options.type
-
-  // console.log(options.cartId)
-  if (options && options.cartId)
-    data.cartId = options.cartId
-
-  if (options && options.product_id)
-    data.productId = options.product_id
-
-  // console.log(data)
-  // if (options && options.addressId) {
-  //   // getUserAddressDetail(options.addressId).then(res => {
-  //   //   data.addressInfo = res
-  //   //   data.addressId = res.address_id || 0
-  //   // })
-  // } else {
-  //   getUserAddressList().then(res => {
-  //     data.addressInfo = res.list.length > 0 ? res.list[0] : {}
-  //     data.addressId = res.list.length > 0 ? res.list[0].address_id : '0'
-  //   })
-  // }
-  const res = await getUserAddressList()
-  console.log('我可是res啊', res)
-  if (res.list && res.list.length > 0) {
-    data.addressInfo = res.list[0]
-    data.addressId = res.list[0].address_id
-  }
-  // await addressStore.getCurrentAddress()
-  // console.log(addressStore.address)
-  // data.addressInfo = addressStore.address
-  // data.addressId = addressStore.address.address_id
-  // console.log(  data.addressId )
-
-  // console.log(addressStore.address)
-  /// 查看用户VIP信息
-  getUserVipInfo().then((res) => {
-    console.log(res)
-    data.vipType = res.da_type
-  })
-  /// 检查商品
-  // checkProductDaCang(data.productId).then(res => {
-  //   console.log(res)
-  // })
-  /// 获取订单商品数据
-  uni.showLoading({
-    title: '数据加载中',
-    icon: 'none',
-  })
-  orderCheck({
-    cart_id: data.cartId.split(','),
-    address_id: data.addressId,
-  }).then((res) => {
-    console.log(15999999, res)
-    data.is_dacang_vip_product = res.is_dacang_vip_product
-    data.cartOrder = res.order
-    data.totalPrice = res.order_price
-    data.orderStatus = res.status
-    // data.proPrice = res.proPrice
-    uni.hideLoading()
-  }).catch((error) => {
-    uni.hideLoading()
-    uni.showToast({
-      title: error,
-      icon: 'none',
-    })
-  })
-})
-
-watch(() => addressStore.address, (val) => {
-  data.addressInfo = val
-  data.addressId = val.address_id
-})
-function handleSubmit() {
-  if (!data.addressId) {
-    return uni.showToast({
-      title: '请选择收货地址',
-      icon: 'none',
-    })
-  }
-
-  // if (data.orderStatus != 'finish') {
-  //   return uni.showToast({
-  //     title: '请选择收货地址',
-  //     icon: 'none'
-  //   })
-  // }
-
-  if (data.orderStatus == 'noDeliver') {
-    return uni.showToast({
-      title: '暂不发货',
-    })
-  }
-
-  // if (data.is_dacang_vip_product == 1) {
-  //   if (data.is_dacang == '') {
-  //     return uni.showToast({
-  //       title: '请选择大仓',
-  //       icon: 'none'
-  //     })
-  //   }
-  // }
-  console.log(data.type)
-  const paymentData: CreateOrderRequest = {
-    cart_id: data.cartId.split(','),
-    address_id: data.addressId,
-    // 优惠券
-    // coupon:
-    // pay_type;//支付方式：0: 余额;1: 微信;2: 小程序;4: 支付宝;5: 特殊商户积分
-    pay_type: data.type && data.type == '3' ? '5' : '2',
-    // pay_type: data.type,
-    mer_id: data.type && data.type == '3' ? '148' : '',
-    // 用户留言
-    mark: data.mark,
-    // take: [],
-    share_id: '1',
-    // dacang_id:
-    // distribution_address: ''
-    // distribution_mode: ''
-  }
-
-  // 判断是否自提，附加自提商铺
-  // paymentData.take.push(mer_id)
-
-  data.enabled = true
-  payment(paymentData)
-}
-
-function payment(createOrderData: CreateOrderRequest) {
-  uni.showLoading({
-    title: '加载中',
-    mask: false,
-  })
-
-  if (createOrderData.mer_id == '148') {
-    orderCreate(createOrderData).then((res) => {
-      if (res) {
-		  data.enabled = false
-        uni.hideLoading()
-        console.log(res)
-        // uni.navigateTo({
-        //   url: '/pages/payment/success'
-        // })
-        uni.showToast({
-          title: '积分兑换成功',
-          icon: 'none',
-        }).then(() => {
-          setTimeout(() => {
-            uni.switchTab({
-              url: '/pages/home/index',
-            })
-          }, 500)
-        })
-        // uni.navigateTo({
-        //   // url: '/pages/payment/index?' + `cardId=${data.cartId}&type=1&product_id=${data.productId}`
-        // url: '/pages/payment/index?' + `pay_price=${res.groupOrder.pay_price}&order_id=${res.order_id}&OrderList=${JSON.stringify(res.groupOrder)}`
-        // })
-      }
-    }).catch((err) => {
-      data.enabled = false
-      uni.hideLoading()
-      return uni.showToast({
-        title: err,
-        icon: 'none',
-      })
-    })
-  }
-  else {
-    orderCreate(createOrderData).then((res) => {
-      if (res) {
-		  data.enabled = false
-        console.log(res)
-        // console.log('order_create')
-        console.log(res)
-        uni.hideLoading()
-        uni.navigateTo({
-          //   // url: '/pages/payment/index?' + `cardId=${data.cartId}&type=1&product_id=${data.productId}`
-          url: '/pages/payment/index?' + `pay_price=${res.groupOrder.pay_price}&order_id=${res.order_id}&OrderList=${JSON.stringify(res.groupOrder)}`,
-        })
-      }
-    }).catch((err) => {
-      data.enabled = false
-      uni.hideLoading()
-      return uni.showToast({
-        title: err,
-        icon: 'none',
-      })
-    })
-  }
-}
-
-function handleAddressSelect() {
-  uni.navigateTo({
-    url: '/pages/user/address/index?from=order',
-  })
-}
-function gotoCoupon() {
-  uni.navigateTo({
-    url: '/pages/to-coupon/to-coupon',
-  })
-}
-function handleNumberChange(num, goodItem) {
-  console.log(goodItem)
-  uni.showLoading()
-  console.log(num)
-  cartChange(goodItem.cart_id, num).then((res) => {
-    reTotal()
-    uni.hideLoading()
-  }).catch((error) => {
-	  // uni.hideLoading()
-
-	  return uni.showToast({
-	    title: error,
-	    icon: 'none',
-	  })
-  })
-}
-
-function reTotal() {
-  orderCheck({
-    cart_id: data.cartId.split(','),
-    address_id: data.addressId,
-  }).then((res) => {
-    console.log('我可是res啊', res)
-    data.is_dacang_vip_product = res.is_dacang_vip_product
-    data.cartOrder = res.order
-    console.log('data.cartOrder', data.cartOrder)
-
-    data.totalPrice = res.order_price
-    data.orderStatus = res.status
-    // data.proPrice = res.proPrice
-    uni.hideLoading()
-  }).catch((error) => {
-    uni.hideLoading()
-    console.log(`${error}----`)
-    uni.showToast({
-      title: error,
-      icon: 'none',
-    })
-  })
-  // let allArr = []
-  // let totalMoney = 0
-  // let totalNum = 0
-
-  // shopping.value?.list.forEach((goods, index) => {
-  //   // 总金额｜总数
-  //   goods.list.forEach(goodItem => {
-  //     if (goodItem.check) {
-  //       totalMoney += (goodItem.productAttr.price * goodItem.cart_num)
-  //       totalNum += Number.parseFloat(goodItem.cart_num)
-  //       // state.cart_id.push(goodItem.cart_id)
-  //     }
-  //   })
-  // })
-  //
-  // // isAllSelect.value = allArr.length === shopping.value?.list.length
-  // // state.totalCartCount = totalNum
-  // state.totalPrice = totalMoney
-}
+	import { reactive } from 'vue'
+	import { getUserAddressList, getUserVipInfo } from '~/apis/user'
+	import type { CreateOrderRequest } from '~/apis/order.api'
+	import { cartChange, orderCheck, orderCreate } from '~/apis/order.api'
+	import CXBYaojinTag from '~/components/CXBYaojinTag/CXBYaojinTag.vue'
+	import FCell from '~/components/FCell/FCell.vue'
+	import { encodePhone } from '~/utils'
+	import { CDN_URL,IMG_CDN_NEW_URL } from '~/config/app'
+	import { useAddressStore } from '~/stores/addressStore'
+	import FField from '~/components/FField/FField.vue'
+
+	const addressIcon = `${CDN_URL}/static/assets/dingwi_220624.png`
+	// const addressInfo = ref({})
+	const addressStore = useAddressStore()
+	const userStore = useUserStore()
+
+	const data = reactive({
+		cartOrder: [],
+
+		type: '',
+		addressInfo: {},
+		cartId: '',
+		addressId: '',
+		productId: '',
+		// da_type
+		// dahy
+		vipType: '',
+		is_dacang_vip_product: '',
+		totalPrice: '',
+		orderStatus: '',
+		mark: '',
+		// 商品总价？
+		// proPrice: ''
+
+		enabled: false,
+	})
+
+	const defautRadioIcon = ref(IMG_CDN_NEW_URL+'SingleChoice_nor.png')
+	const checkRadioIcon = ref(IMG_CDN_NEW_URL+'SingleChoice_sel.png')
+	onLoad(async (options) => {
+		if (options && options.type)
+			data.type = options.type
+
+		if (options && options.cartId)
+			data.cartId = options.cartId
+
+		if (options && options.product_id)
+			data.productId = options.product_id
+
+		const res = await getUserAddressList()
+		console.log('我可是res啊', res)
+		if (res.list && res.list.length > 0) {
+			data.addressInfo = res.list[0]
+			data.addressId = res.list[0].address_id
+		}
+
+		/// 查看用户VIP信息
+		getUserVipInfo().then((res) => {
+			console.log(res)
+			data.vipType = res.da_type
+		})
+
+		/// 获取订单商品数据
+		uni.showLoading({
+			title: '数据加载中',
+			icon: 'none',
+		})
+		orderCheck({
+			cart_id: data.cartId.split(','),
+			address_id: data.addressId,
+		}).then((res) => {
+			console.log(15999999, res)
+			data.is_dacang_vip_product = res.is_dacang_vip_product
+			data.cartOrder = res.order
+			data.totalPrice = res.order_price
+			data.orderStatus = res.status
+			// data.proPrice = res.proPrice
+			uni.hideLoading()
+		}).catch((error) => {
+			uni.hideLoading()
+			uni.showToast({
+				title: error,
+				icon: 'none',
+			})
+		})
+	})
+
+	watch(() => addressStore.address, (val) => {
+		data.addressInfo = val
+		data.addressId = val.address_id
+	})
+	function handleSubmit() {
+		if (!data.addressId) {
+			return uni.showToast({
+				title: '请选择收货地址',
+				icon: 'none',
+			})
+		}
+		if (data.orderStatus == 'noDeliver') {
+			return uni.showToast({
+				title: '暂不发货',
+			})
+		}
+        let fzone_paytypeX 
+		for (var i = 0; i < data.cartOrder.length; i++) {
+			let cartOrderList = data.cartOrder[i].list
+			for (var j = 0; j < cartOrderList.length; j++) {
+			fzone_paytypeX	= cartOrderList[j].fzone_paytypeX
+				if (!fzone_paytypeX) {
+					uni.showToast({
+						title: '请选择支付方式！',
+						icon: 'none'
+					})
+					return
+				}
+			}
+		}
+
+		const paymentData : CreateOrderRequest = {
+			cart_id: data.cartId,
+			address_id: data.addressId,
+			// pay_type;//支付方式：0: 余额;1: 微信;2: 小程序;4: 支付宝;5: 特殊商户积分
+			pay_type: '1',
+			// 用户留言
+			mark: data.mark,
+			distribution_mode: '1',
+			fzone_paytype: JSON.stringify(fzone_paytypeX)
+		}
+		data.enabled = true
+		payment(paymentData)
+	}
+
+	function payment(createOrderData : CreateOrderRequest) {
+		uni.showLoading({
+			title: '加载中',
+			mask: false,
+		})
+
+		if (createOrderData.mer_id == '148') {
+			orderCreate(createOrderData).then((res) => {
+				if (res) {
+					data.enabled = false
+					uni.hideLoading()
+					console.log(res)
+					uni.showToast({
+						title: '积分兑换成功',
+						icon: 'none',
+					}).then(() => {
+						setTimeout(() => {
+							uni.switchTab({
+								url: '/pages/home/index',
+							})
+						}, 500)
+					})
+				}
+			}).catch((err) => {
+				data.enabled = false
+				uni.hideLoading()
+				return uni.showToast({
+					title: err,
+					icon: 'none',
+				})
+			})
+		}
+		else {
+			orderCreate(createOrderData).then((res) => {
+				if (res) {
+					data.enabled = false
+					console.log(res)
+					// console.log('order_create')
+					console.log(res)
+					uni.hideLoading()
+					uni.navigateTo({
+						//   // url: '/pages/payment/index?' + `cardId=${data.cartId}&type=1&product_id=${data.productId}`
+						url: '/pages/payment/index?' + `pay_price=${res.groupOrder.pay_price}&order_id=${res.order_id}&OrderList=${JSON.stringify(res.groupOrder)}`,
+					})
+				}
+			}).catch((err) => {
+				data.enabled = false
+				uni.hideLoading()
+				return uni.showToast({
+					title: err,
+					icon: 'none',
+				})
+			})
+		}
+	}
+
+	function handleAddressSelect() {
+		uni.navigateTo({
+			url: '/subPages/pages/user/address/index?from=order',
+		})
+	}
+	function gotoCoupon() {
+		uni.navigateTo({
+			url: '/pages/to-coupon/to-coupon',
+		})
+	}
+	function handleNumberChange(num, goodItem) {
+		uni.showLoading()
+		cartChange(goodItem.cart_id, num).then((res) => {
+			reTotal()
+			uni.hideLoading()
+		}).catch((error) => {
+			return uni.showToast({
+				title: error,
+				icon: 'none',
+			})
+		})
+	}
+
+
+
+	function onRadioClick(index, fIndex, childIndex) {
+		let _list = data.cartOrder[index].list[fIndex].fzone_paytype
+		for (let s of _list) {
+			s.checked = false
+		}
+		data.cartOrder[index].list[fIndex].fzone_paytype[childIndex].checked = true
+		data.cartOrder[index].list[fIndex].fzone_paytypeX = data.cartOrder[index].list[fIndex].fzone_paytype[childIndex]
+	}
+
+	function onNumClick(index, fIndex, type) {
+		let _data = JSON.parse(JSON.stringify(data.cartOrder))
+		let _num = data.cartOrder[index].list[fIndex].cart_num
+		let currentNum = _num
+		if (type == 0) {//减
+			if (_num == 1) {
+				uni.showToast({
+					title: '最少购买一件哦！',
+					icon: 'none'
+				})
+			} else {
+				currentNum = parseInt(currentNum) - 1
+			}
+		} else {//加
+			currentNum = parseInt(currentNum) + 1
+		}
+		data.cartOrder[index].list[fIndex].cart_num = currentNum
+		handleNumberChange(currentNum, data.cartOrder[index].list[fIndex])
+	}
+
+	function reTotal() {
+		orderCheck({
+			cart_id: data.cartId.split(','),
+			address_id: data.addressId,
+		}).then((res) => {
+			console.log('我可是res啊', res)
+			data.is_dacang_vip_product = res.is_dacang_vip_product
+			data.cartOrder = res.order
+			console.log('data.cartOrder', data.cartOrder)
+
+			data.totalPrice = res.order_price
+			data.orderStatus = res.status
+			// data.proPrice = res.proPrice
+			uni.hideLoading()
+		}).catch((error) => {
+			uni.hideLoading()
+			console.log(`${error}----`)
+			uni.showToast({
+				title: error,
+				icon: 'none',
+			})
+		})
+	}
 </script>
 
 <template>
-  <div class="p-3 flex flex-col gap-3 pb-safe">
-    <div class="rounded bg-white p-3 flex" @click="handleAddressSelect">
-      <div class="flex flex-col flex-1 gap-2">
-        <div class="flex items-center gap-2">
-          <div class="flex text-sm text-gray-500 justify-between items-center w-full">
-            <div class="flex-1 flex items-center gap-2">
-              <div class="w-fit flex">
-                <image :src="addressIcon" mode="aspectFit" class="w-4 h-4" />
-              </div>
-              <div v-if="data.addressId" class="flex-1 flex">
-                {{ `${data.addressInfo.province} ${data.addressInfo.city} ${data.addressInfo.district} ${
+	<div class="p-3 flex flex-col gap-3 pb-safe">
+		<div class="rounded bg-white p-3 flex" @click="handleAddressSelect">
+			<div class="flex flex-col flex-1 gap-2">
+				<div class="flex items-center gap-2">
+					<div class="flex text-sm text-gray-500 justify-between items-center w-full">
+						<div class="flex-1 flex items-center gap-2">
+							<div class="w-fit flex">
+								<image :src="addressIcon" mode="aspectFit" class="w-4 h-4" />
+							</div>
+							<div v-if="data.addressId" class="flex-1 flex">
+								{{ `${data.addressInfo.province} ${data.addressInfo.city} ${data.addressInfo.district} ${
                   data.addressInfo.detail}` }}
-              </div>
-              <div v-else class="flex-1 flex">
-                请选择收货地址
-              </div>
-            </div>
-
-            <div class="w-4 flex i-tabler-chevron-right text-gray" />
-          </div>
-        </div>
-        <!--          <div class="flex text-sm font-bold">{{ data.addressInfo.detail }}</div> -->
-        <div class="flex gap-2 items-center text-xs text-gray-500">
-          <div>
-            {{ data.addressInfo.real_name }}
-          </div>
-          <div v-if="data.addressInfo && data.addressInfo.phone">
-            {{ encodePhone(data.addressInfo.phone) }}
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div class="pb-15">
-      <div v-for="(item, index) in data.cartOrder" :key="index" class=" bg-white rounded">
-        <div class="flex items-center gap-2 text-sm font-bold f-hairline-bottom p-3">
-          <image :src="item.mer_avatar" mode="widthFix" class="w-5 h-5" />
-          <div>{{ item.mer_name }}</div>
-          <!--            <div>{{ item.mer_id}}</div> -->
-        </div>
-
-        <div v-for="(orderProductItem, orderProductItemIndex) in item.list" :key="orderProductItemIndex">
-          <div class="p-3 flex gap-3 f-hairline-bottom">
-            <div>
-              <image :src="orderProductItem.product.image" mode="aspectFit" class="rounded w-20 h-20" />
-            </div>
-            <div class="flex flex-col w-full">
-              <div class="flex flex-col ">
-                <div class="line-clamp-1 text-xs">
-                  {{ orderProductItem.product.store_name }}
-                </div>
-                <div class="text-[11px] text-gray-500">
-                  {{ orderProductItem.productAttr.sku }}
-                </div>
-              </div>
-              <div class="flex">
-                <CXBYaojinTag v-if="item.mer_id != '148'" :amount="orderProductItem.yanglao" />
-              </div>
-              <div class="flex justify-between ">
-                <div v-if="item.mer_id != '148'" style="color:#fa4032">
-                  ￥{{ orderProductItem.productAttr.price }}
-                </div>
-                <div v-if="item.mer_id == '148'" style="color:#fa4032">
-                  {{ Math.round(orderProductItem.productAttr.price
+							</div>
+							<div v-else class="flex-1 flex">
+								请选择收货地址
+							</div>
+						</div>
+
+						<div class="w-4 flex i-tabler-chevron-right text-gray" />
+					</div>
+				</div>
+				<!--          <div class="flex text-sm font-bold">{{ data.addressInfo.detail }}</div> -->
+				<div class="flex gap-2 items-center text-xs text-gray-500">
+					<div>
+						{{ data.addressInfo.real_name }}
+					</div>
+					<div v-if="data.addressInfo && data.addressInfo.phone">
+						{{ encodePhone(data.addressInfo.phone) }}
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<div class="pb-15">
+			<div v-for="(item, index) in data.cartOrder" :key="index" class=" bg-white rounded">
+				<div class="flex items-center gap-2 text-sm font-bold f-hairline-bottom p-3">
+					<image :src="item.mer_avatar" mode="widthFix" class="w-5 h-5" />
+					<div>{{ item.mer_name }}</div>
+					<!--            <div>{{ item.mer_id}}</div> -->
+				</div>
+
+				<div v-for="(orderProductItem, orderProductItemIndex) in item.list" :key="orderProductItemIndex">
+					<div class="p-3 flex gap-3 f-hairline-bottom">
+						<div>
+							<image :src="orderProductItem.product.image" mode="aspectFit" class="rounded w-20 h-20" />
+						</div>
+						<div class="flex flex-col w-full">
+							<div class="flex flex-col ">
+								<div class="line-clamp-1 text-xs">
+									{{ orderProductItem.product.store_name }}
+								</div>
+								<div class="text-[11px] text-gray-500">
+									{{ orderProductItem.productAttr.sku }}
+								</div>
+							</div>
+							<div class="flex">
+								<CXBYaojinTag v-if="item.mer_id != '148'" :amount="orderProductItem.yanglao" />
+							</div>
+							<div class="flex justify-between ">
+								<div v-if="item.mer_id != '148'" style="color:#fa4032">
+									￥{{ orderProductItem.productAttr.price }}
+								</div>
+								<div v-if="item.mer_id == '148'" style="color:#fa4032">
+									{{ Math.round(orderProductItem.productAttr.price
                     * 30) }}积分
-                </div>
-                <nut-input-number
-                  v-model="orderProductItem.cart_num"
-                  @change="(num) => handleNumberChange(num, orderProductItem)"
-                />
-              </div>
-            </div>
-          </div>
-        </div>
-        <div>
-          <!-- 优惠券数据 先写死 -->
-          <FCell
-            v-if="item.mer_id != '148'" title="优惠劵"
-            :value="item.order.youhui_price != 0 ? item.order.youhui_price : '暂无优惠券'" arrow @click="gotoCoupon"
-          />
-          <FCell
-            v-if="item.mer_id == '148'" title="积分"
-            :value="userStore.userInfo.score != '0' ? userStore.userInfo.score : '暂无积分'" arrow
-          />
-          <FCell title="运费" :value="item.order.postage_price > 0 ? item.order.postage_price : '免运费'" arrow />
-          <!--            <FCell -->
-          <!--                title="留言" -->
-          <!--                value="建议留言前先与商家沟通确认" -->
-          <!--                arrow -->
-          <!--            ></FCell> -->
-          <FField v-model="data.mark" label="留言" placeholder="建议留言前先与商家沟通确认" :ex-class="['text-right']" />
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <div class="fixed bottom-0 pb-safe w-full bg-white">
-    <div class="flex justify-between items-center p-3">
-      <div class="flex-1 flex text-sm font-bold">
-        应付金额：
-        <div v-if="data.type && data.type == '3'" style="color:#fa4032">
-          {{ Math.round(data.totalPrice * 30) }}积分
-        </div>
-        <div v-else style="color:#fa4032">
-          ￥{{ data.totalPrice }}
-        </div>
-      </div>
-      <div class="flex">
-        <nut-button :disabled="data.enabled" type="primary" @click="handleSubmit">
-          提交订单
-        </nut-button>
-      </div>
-    </div>
-  </div>
+								</div>
+								<!-- <nut-input-number
+				  v-model="orderProductItem.cart_num"
+				  @change="(num) => handleNumberChange(num, orderProductItem)"
+				/> -->
+								<view class="number-content">
+									<view @click="onNumClick(index,orderProductItemIndex,0)" class="del">-</view>
+									<text class="num-value">{{orderProductItem.cart_num}}</text>
+									<view @click="onNumClick(index,orderProductItemIndex,1)" class="add">+</view>
+								</view>
+							</div>
+						</div>
+					</div>
+					<view class="radio-content">
+						<view @click="onRadioClick(index,orderProductItemIndex,labIndex)" :key="'radio-item-'+index"
+							class="radio-item" v-for="(labItem,labIndex) in orderProductItem.fzone_paytype">
+							<text class="radio-note">{{labItem.note}}</text>
+							<image :src="labItem.checked==1?checkRadioIcon:defautRadioIcon" class="radio-icon"></image>
+							<text v-if="labItem.type=='b1'"
+								class="radio-name">{{labItem.price}}VR+{{labItem.other}}积分</text>
+							<text v-if="labItem.type=='b2'"
+								class="radio-name">￥{{labItem.price}}+{{labItem.other}}积分</text>
+							<text v-if="labItem.type=='b5'" class="radio-name">{{labItem.price}}VR</text>
+							<text v-if="labItem.type=='b6'" class="radio-name">￥{{labItem.price}}</text>
+						</view>
+					</view>
+
+				</div>
+
+
+				<div>
+					<!-- 优惠券数据 先写死 -->
+					<FCell v-if="item.mer_id != '148'" title="优惠劵"
+						:value="item.order.youhui_price != 0 ? item.order.youhui_price : '暂无优惠券'" arrow
+						@click="gotoCoupon" />
+					<FCell v-if="item.mer_id == '148'" title="积分"
+						:value="userStore.userInfo.score != '0' ? userStore.userInfo.score : '暂无积分'" arrow />
+					<FCell title="运费" :value="item.order.postage_price > 0 ? item.order.postage_price : '免运费'" arrow />
+					<!--            <FCell -->
+					<!--                title="留言" -->
+					<!--                value="建议留言前先与商家沟通确认" -->
+					<!--                arrow -->
+					<!--            ></FCell> -->
+					<FField v-model="data.mark" label="留言" placeholder="建议留言前先与商家沟通确认" :ex-class="['text-right']" />
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div class="fixed bottom-0 pb-safe w-full bg-white">
+		<div class="flex justify-between items-center p-3">
+			<div class="flex-1 flex text-sm font-bold">
+				应付金额：
+				<div v-if="data.type && data.type == '3'" style="color:#fa4032">
+					{{ Math.round(data.totalPrice * 30) }}积分
+				</div>
+				<div v-else style="color:#fa4032">
+					￥{{ data.totalPrice }}
+				</div>
+			</div>
+			<div class="flex">
+				<nut-button :disabled="data.enabled" type="primary" @click="handleSubmit">
+					提交订单
+				</nut-button>
+			</div>
+		</div>
+	</div>
 </template>
 
 <route lang="yaml">
@@ -419,8 +406,70 @@ style:
   navigationBarTitleText: 提交订单
 </route>
 
-<style>
-page {
-  background: #f8f8f8;
-}
-</style>
+<style lang="scss">
+	.number-content {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+
+		.del {
+			font-size: 38rpx;
+			margin-right: 20rpx;
+			color: #333;
+			font-weight: bolder;
+		}
+
+		.num-value {
+			background-color: #f8f8f8;
+			border-radius: 10rpx;
+			font-size: 30rpx;
+			color: #333;
+			padding: 10rpx 40rpx;
+		}
+
+		.add {
+			margin-left: 20rpx;
+			font-size: 38rpx;
+			color: #333;
+			font-weight: bolder;
+		}
+	}
+
+	.radio-content {
+		display: flex;
+		flex-direction: column;
+		margin-top: 20rpx;
+		margin-bottom: 20rpx;
+
+		.radio-item {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			padding-left: 30rpx;
+			padding-right: 30rpx;
+			padding-bottom: 10rpx;
+			padding-top: 10rpx;
+
+			.radio-note {
+				flex: 1;
+				font-size: 28rpx;
+				color: #333;
+			}
+
+			.radio-name {
+				font-size: 26rpx;
+				color: #333;
+			}
+
+			.radio-icon {
+				width: 40rpx;
+				height: 40rpx;
+				margin-right: 10rpx;
+			}
+		}
+	}
+
+	page {
+		background: #f8f8f8;
+	}
+</style>

src/pages/order/components/OrderItem.vue

@@ -83,7 +83,7 @@ function getStatusText(orderItem: OrderListModel) {
 
 function handleHeaderClick() {
   uni.navigateTo({
-    url: `/pages/store/home/index?id=${props.orderItem.merchant.mer_id}`
+    url: `/subPages/pages/store/home/index?id=${props.orderItem.merchant.mer_id}`
   })
 }
 
@@ -134,7 +134,7 @@ function handlePayment() {
 function handleShowOrderDetail(order) {
   console.log(111212121, order)
   uni.navigateTo({
-    url: '/pages/order/detail?detail=' + `${encodeBase64(order)}`
+    url: '/subPages/pages/order/detail?detail=' + `${encodeBase64(order)}`
   })
   // if (order.status === '5') {
   //   uni.navigateTo({
@@ -158,7 +158,7 @@ function handleShowLogistics(orderItem) {
   // console.log(orderItem)
   // console.log('查看物流信息')
   uni.navigateTo({
-    url: `/pages/order/logistics?id=${orderItem.order_id}`
+    url: `/subPages/pages/order/logistics?id=${orderItem.order_id}`
   })
 }
 
@@ -198,23 +198,18 @@ function handleTakeOrder(orderItem) {
 
 function handleComment(orderItem) {
   uni.navigateTo({
-    url: '/pages/order/comment?detail=' + encodeBase64(orderItem)
+    url: '/subPages/pages/order/comment?detail=' + encodeBase64(orderItem)
   })
 }
 
 function handleProductItemClick(
   item
 ) {
-  // function navigateToDetail(params) {
-  //   let otherDetailUrl = `/pages/store/product/other`
-  //   return uni.navigateTo({
-  //     url: `${otherDetailUrl}?params=${params}`
-  //   })
-  // }
+ 
   console.log('我是item', item)
   // 大仓
   uni.navigateTo({
-    url: `/pages/store/product/detail?id=${(item.orderProduct[0])?.product_id}`
+    url: `/subPages/pages/store/product/detail?id=${(item.orderProduct[0])?.product_id}`
   })
 }
 
@@ -223,20 +218,20 @@ function handeRefund(orderItem) {
   console.log('售后详情', orderItem);
 
   uni.navigateTo({
-    // url: `/pages/refund/drawback?detail=${encodeBase64(orderItem)}`
-    url: `/pages/refund/option?detail=${encodeBase64(orderItem)}&from=${props.tabValue}`
+
+    url: `/subPages/pages/refund/option?detail=${encodeBase64(orderItem)}&from=${props.tabValue}`
   })
 }
 
 function handeDetail(orderItem: any) {
   uni.navigateTo({
-    url: '/pages/refund/detail?id=' + orderItem.refund_order_id
+    url: '/subPages/pages/refund/detail?id=' + orderItem.refund_order_id
   })
 }
 function handleShowObligationOrderDetail(orderItem) {
   console.log("hhhhhhhh", orderItem)
   uni.navigateTo({
-    url: '/pages/order/obligation-detail?detail=' + `${encodeBase64(orderItem)}`
+    url: '/subPages/pages/order/obligation-detail?detail=' + `${encodeBase64(orderItem)}`
   })
 }
 
@@ -294,7 +289,7 @@ onUnload(() => {
 function handleShowDetail(orderItem: any) {
   console.log(orderItem)
   uni.navigateTo({
-    url: '/pages/refund/detail?id=' + orderItem.refund_order_id
+    url: '/subPages/pages/refund/detail?id=' + orderItem.refund_order_id
   })
 }
 

src/pages/order/components/OrderObligationItem.vue

@@ -76,7 +76,7 @@ function getStatusText(orderItem: OrderListModel) {
 
 function handleHeaderClick() {
   uni.navigateTo({
-    url: `/pages/store/home/index?id=${props.orderItem.merchant.mer_id}`
+    url: `/subPages/pages/store/home/index?id=${props.orderItem.merchant.mer_id}`
   })
 }
 
@@ -125,7 +125,7 @@ function handlePayment() {
 function handleShowOrderDetail(order) {
   console.log(order)
   uni.navigateTo({
-    url: '/pages/order/detail?detail=' + `${encodeBase64(order)}`
+    url: '/subPages/pages/order/detail?detail=' + `${encodeBase64(order)}`
   })
 }
 
@@ -141,7 +141,7 @@ function handleShowLogistics(orderItem) {
   // console.log(orderItem)
   // console.log('查看物流信息')
   uni.navigateTo({
-    url: `/pages/order/logistics?id=${orderItem.order_id}`
+    url: `/subPages/pages/order/logistics?id=${orderItem.order_id}`
   })
 }
 
@@ -172,37 +172,31 @@ function handleTakeOrder(orderItem) {
 
 function handleComment(orderItem) {
   uni.navigateTo({
-    url: '/pages/order/comment?detail=' + encodeBase64(orderItem)
+    url: '/subPages/pages/order/comment?detail=' + encodeBase64(orderItem)
   })
 }
 
 function handleProductItemClick(
   item
 ) {
-  // function navigateToDetail(params) {
-  //   let otherDetailUrl = `/pages/store/product/other`
-  //   return uni.navigateTo({
-  //     url: `${otherDetailUrl}?params=${params}`
-  //   })
-  // }
+  
   console.log(item)
   // 大仓
   uni.navigateTo({
-    url: `/pages/store/product/detail?id=${item.orderProduct[0].product_id}`
+    url: `/subPages/pages/store/product/detail?id=${item.orderProduct[0].product_id}`
   })
 }
 
 
 function handeRefund(orderItem) {
   uni.navigateTo({
-    // url: `/pages/refund/drawback?detail=${encodeBase64(orderItem)}`
-    url: `/pages/refund/option?detail=${encodeBase64(orderItem)}`
+    url: `/subPages/pages/refund/option?detail=${encodeBase64(orderItem)}`
   })
 }
 
 function handleShowObligationOrderDetail(orderItem) {
   uni.navigateTo({
-    url: '/pages/order/obligation-detail?detail=' + `${encodeBase64(orderItem)}&type=1`
+    url: '/subPages/pages/order/obligation-detail?detail=' + `${encodeBase64(orderItem)}&type=1`
   })
 }
 

src/pages/order/components/OtherOrderItem.vue

@@ -35,7 +35,7 @@ const sourceType = computed(() => {
 })
 
 function navigateToDetail(params) {
-  let otherDetailUrl = `/pages/store/product/other`
+  let otherDetailUrl = `/subPages/pages/store/product/other`
   return uni.navigateTo({
     url: `${otherDetailUrl}?params=${params}`
   })

src/pages/order/components/RefundOrderItem.vue

@@ -73,7 +73,7 @@ function getStatusText(orderItem) {
 
 function handleHeaderClick() {
   uni.navigateTo({
-    url: `/pages/store/home/index?id=${props.orderItem.merchant.mer_id}`
+    url: `/subPages/pages/store/home/index?id=${props.orderItem.merchant.mer_id}`
   })
 }
 
@@ -107,7 +107,7 @@ function handlePayment() {
 function handleShowOrderDetail(order) {
   console.log(order)
   uni.navigateTo({
-    url: '/pages/order/detail?detail=' + `${encodeBase64(order)}`
+    url: '/subPages/pages/order/detail?detail=' + `${encodeBase64(order)}`
   })
 }
 
@@ -123,7 +123,7 @@ function handleShowLogistics(orderItem) {
   // console.log(orderItem)
   // console.log('查看物流信息')
   uni.navigateTo({
-    url: `/pages/order/logistics?id=${orderItem.order_id}`
+    url: `/subPages/pages/order/logistics?id=${orderItem.order_id}`
   })
 }
 
@@ -154,23 +154,18 @@ function handleTakeOrder(orderItem) {
 
 function handleComment(orderItem) {
   uni.navigateTo({
-    url: '/pages/order/comment?detail=' + encodeBase64(orderItem)
+    url: '/subPages/pages/order/comment?detail=' + encodeBase64(orderItem)
   })
 }
 
 function handleProductItemClick(
   item
 ) {
-  // function navigateToDetail(params) {
-  //   let otherDetailUrl = `/pages/store/product/other`
-  //   return uni.navigateTo({
-  //     url: `${otherDetailUrl}?params=${params}`
-  //   })
-  // }
+  
   console.log(item)
   // 大仓
   uni.navigateTo({
-    url: `/pages/store/product/detail?id=${item.orderProduct[0].product_id}`
+    url: `/subPages/pages/store/product/detail?id=${item.orderProduct[0].product_id}`
   })
 }
 
@@ -178,7 +173,7 @@ function handleProductItemClick(
 function handleShowDetail(orderItem) {
   console.log(orderItem)
   uni.navigateTo({
-    url: '/pages/refund/detail?id=' + orderItem.refund_order_id
+    url: '/subPages/pages/refund/detail?id=' + orderItem.refund_order_id
   })
 }
 </script>

src/pages/order_addcart/index-bak.vue

@@ -1,642 +0,0 @@
-<script lang="ts" setup>
-import {getRecommendList} from "~/apis/merchant";
-import MerchantProductCard from "~/pages/store/home/components/MerchantProductCard.vue";
-import {deleteCartItem, getCartList} from "~/apis/user";
-import type {ShoppingResult} from "~/apis/model/shopping.model";
-import FPrice from "~/components/FPrice/FPrice.vue";
-import FButton from "~/components/FButton/FButton.vue";
-import CXBYaojinTag from "~/components/CXBYaojinTag/CXBYaojinTag.vue";
-import {
-  DyProductModel, IProductDetail,
-  JdProductModel,
-  SuNingProductModel,
-  TaobaoProductThirdPartyWaresModel, VipProductModel
-} from "~/apis/model/product.model";
-import {DcProductModel} from "~/apis/model/dacang.model";
-import {encodeBase64} from "~/utils/http/helper";
-import {CDN_URL} from "~/config/app";
-import {uniq} from "lodash-es";
-import {cartChange} from "~/apis/order.api";
-const gouwucheImage = CDN_URL + '/static/assets/gouwuche.png'
-const like_adorn_220628Image = CDN_URL + '/static/assets/like_adorn_220628.png'
-const state = reactive({
-  recommendList: [],
-  currentPage: 1,
-  pageSize: 10,
-  total: 0,
-  totalPage: 0,
-
-
-  totalCartCount: 0,
-  totalPrice: 0,
-  selectAllIndeterminate: false,
-
-  cart_id: [],
-  isManage: true,
-
-  currentType: '',
-})
-
-const shopping = ref<ShoppingResult>()
-
-onShow(() => {
-  state.cart_id = []
-  loadCartList()
-  if (!state.isManage) {
-    state.isManage = true
-  }
-
-  loadList('reload')
-})
-function loadList(action: 'page' | 'reload', callback?: (items) => void) {
-  const params = {
-    page: state.currentPage,
-    limit: state.pageSize
-  }
-
-  if (action === 'reload') {
-    params.page = 1
-  }
-
-  getRecommendList({
-    ...params
-  }).then(res => {
-    if (action === 'page') {
-      state.recommendList = state.recommendList.concat(res.list)
-    }
-    if (action === 'reload') {
-      // state.list = state.list.concat(res.list)
-      state.recommendList = res.list
-    }
-    state.totalPage = Math.ceil(res.count / state.pageSize);
-    state.status = 'more'
-    if (callback) {
-      callback(res.list)
-    }
-  })
-}
-
-function handleScrollToLower() {
-  state.status = 'loading';
-  state.currentPage += 1;
-  // console.log(state.totalPage)
-  if (state.currentPage > state.totalPage) {
-    state.status = 'noMore';
-  } else {
-    setTimeout(() => {
-      loadList('page')
-    }, 300)
-  }
-}
-
-onReachBottom(() => {
-  handleScrollToLower()
-
-})
-
-// 加载购物车数据
-function loadCartList() {
-  state.totalCartCount = 0
-  getCartList().then(res => {
-    shopping.value = res
-
-    console.log(res)
-    shopping.value?.list.forEach((shopItem, index) => {
-      // shopItem.allCheck = true
-
-      shopItem.allCheck = false
-      shopItem.indeterminate = false
-      shopItem.list.forEach(goodItem => {
-        goodItem.check = false
-        // state.cart_id.push(goodItem.cart_id)
-        // if (goodItem.cart_num === 1) {}
-        state.totalCartCount += Number.parseInt(goodItem.cart_num)
-      })
-      // console.log(shopItem)
-
-    })
-    // cartAllCheck("all")
-    // if (shopping.value) {
-    //   handleSelectAll()
-    // }
-  })
-}
-const hasShopping = computed(() => {
-  return shopping.value && shopping.value?.list.length > 0
-})
-
-const totalCartInfo = computed(() => {
-  let totalPrice = 0
-  let goodsNum = 0
-  if (shopping.value && shopping.value?.list.length > 0) {
-    for (let i = 0; i < shopping.value?.list.length; i++) {
-      for (let j = 0; j < shopping.value?.list[i].list.length; j++) {
-        let num = Number.parseInt(shopping.value?.list[i].list[j].cart_num);
-        let price = Number.parseFloat(shopping.value?.list[i].list[j].productAttr.price)
-        totalPrice += (num * price)
-        goodsNum += num
-      }
-    }
-  }
-
-  return {
-    totalPrice,
-    goodsNum
-  }
-})
-const totalMoney = ref(0)
-const isAllSelect = ref(false)
-
-function handleGoodsItemCheck(check) {
-  // console.log('good item check....')
-  // console.log(check)
-  // if (isAllSelect.value) {return}
-  // cartAllCheck('single')
-  _singleCheck()
-}
-
-function shopCheck(shopItem) {
-  console.log('shop check...')
-  // console.log(shopItem)
-  if (shopItem.allCheck && !shopItem.indeterminate) {
-    console.log(shopItem)
-    shopItem.list.forEach((good, index) => {
-      good.check = true
-    })
-
-  } else {
-    shopItem.list.forEach((good, index) => {
-      good.check = false
-    })
-  }
-}
-function cartAllCheck(type: 'single' | 'all') {
-  let allArr = []
-  let totalMoney = 0
-  let totalNum = 0
-  state.currentType = type
-
-  console.log(type)
-  shopping.value?.list.forEach((goods, index) => {
-    if (type === 'single') {
-      // 如果单选的情况下, 获取已选中的
-      let tempArr = goods.list.filter(goodItem => {
-        // if (goodItem.check) {
-          return goodItem.check === true
-        // }
-      })
-      console.log(goods.list.length + '购物车长度')
-      if (goods.list.length === tempArr.length) {
-        console.log('这里是全选状态了。。。。')
-        goods.allCheck = true
-        allArr.push(goods)
-        goods.indeterminate = false
-        return
-      }
-
-      console.log(tempArr.length + '---当长长度')
-      if (tempArr.length > 0) {
-        goods.indeterminate = true
-        return
-      }
-      if (tempArr.length <= 0) {
-        goods.allCheck = false
-        state.currentType = 'all'
-        state.indeterminate = false
-        return
-      }
-    } else {
-      console.log('alll type......')
-      goods.list.forEach(goodItem => {
-        goodItem.check = isAllSelect.value
-      })
-      goods.allCheck = isAllSelect.value
-      if (goods.allCheck) {
-        allArr.push(goods)
-      }
-    }
-
-    // 总金额｜总数
-    goods.list.forEach(goodItem => {
-      if (goodItem.check) {
-        totalMoney += (goodItem.productAttr.price * goodItem.cart_num)
-        totalNum += Number.parseFloat(goodItem.cart_num)
-        state.cart_id.push(goodItem.cart_id)
-      }
-    })
-  })
-
-  isAllSelect.value = allArr.length === shopping.value?.list.length
-  // state.totalCartCount = totalNum
-  state.totalPrice = totalMoney
-}
-
-function _singleCheck() {
-  console.log(state.currentType)
-  if (state.currentType === 'all') {
-    return
-    //   _singleCheck()
-  }
-  state.currentType = 'single'
-  let allArr = []
-  let totalMoney = 0
-  let totalNum = 0
-  state.cart_id = []
-  shopping.value?.list.forEach((goods, index) => {
-      // 如果单选的情况下, 获取已选中的
-      let tempArr = goods.list.filter(goodItem => {
-        // if (goodItem.check) {
-        return goodItem.check === true
-        // }
-      })
-      if (goods.list.length === tempArr.length) {
-        goods.allCheck = true
-        allArr.push(goods)
-        goods.indeterminate = false
-      }
-
-      if (tempArr.length > 0) {
-        goods.indeterminate = true
-      }
-      if (tempArr.length <= 0) {
-        console.log('没有选中的了。。。')
-        goods.allCheck = false
-        state.currentType = 'all'
-        goods.indeterminate = false
-      }
-
-    // 总金额｜总数
-    goods.list.forEach(goodItem => {
-      if (goodItem.check) {
-        console.log(goodItem)
-
-        totalMoney += (goodItem.productAttr.price * goodItem.cart_num)
-        console.log(totalMoney)
-        totalNum += Number.parseFloat(goodItem.cart_num)
-        state.cart_id.push(goodItem.cart_id)
-      }
-    })
-  })
-  if (allArr.length === shopping.value?.list.length) {
-    isAllSelect.value = true
-    state.currentType = 'all'
-  } else if (allArr.length > 0){
-    state.selectAllIndeterminate = true
-  } else {
-    isAllSelect.value = false
-
-  }
-  state.totalPrice = totalMoney
-}
-function _selectAll() {
-  // if current == single 说明刚才操作的置为多选是从这里来的？
-  state.currentType = 'all'
-  let allArr = []
-  let totalMoney = 0
-  let totalNum = 0
-  // state.currentType = type
-  //
-  // console.log(type)
-  shopping.value?.list.forEach((goods, index) => {
-
-      goods.list.forEach(goodItem => {
-        goodItem.check = isAllSelect.value
-      })
-      goods.allCheck = isAllSelect.value
-      if (goods.allCheck) {
-        allArr.push(goods)
-      }
-
-    // 总金额｜总数
-    goods.list.forEach(goodItem => {
-      if (goodItem.check) {
-        totalMoney += (goodItem.productAttr.price * goodItem.cart_num)
-        totalNum += Number.parseFloat(goodItem.cart_num)
-        state.cart_id.push(goodItem.cart_id)
-      }
-    })
-  })
-
-  isAllSelect.value = allArr.length === shopping.value?.list.length
-  // state.totalCartCount = totalNum
-  state.totalPrice = totalMoney
-}
-
-// watch(() => isAllSelect.value, (val) => {
-//   if (!val) {
-//     state.cart_id = []
-//   }
-// })
-
-function reTotal() {
-  let allArr = []
-  let totalMoney = 0
-  let totalNum = 0
-
-  shopping.value?.list.forEach((goods, index) => {
-    // 总金额｜总数
-    goods.list.forEach(goodItem => {
-      if (goodItem.check) {
-        totalMoney += (goodItem.productAttr.price * goodItem.cart_num)
-        totalNum += Number.parseFloat(goodItem.cart_num)
-        // state.cart_id.push(goodItem.cart_id)
-      }
-    })
-  })
-
-  // isAllSelect.value = allArr.length === shopping.value?.list.length
-  // state.totalCartCount = totalNum
-  state.totalPrice = totalMoney
-}
-function handleSelectAll(checked: boolean) {
-  // 如何区分是由当前的 checkbox 发起的？要区
-  // console.log(state.currentType + '这里是当前类型。。。。')
-
-  if (state.currentType === 'single') {
-    return
-  //   _singleCheck()
-  }
-  _selectAll()
-  // if (state.currentType == 'single') {
-  //   return
-  // }
-  // console.log(isAllSelect.value)
-  // if (isAllSelect.value) {
-  // cartAllCheck('all')
-
-  // }
-  // console.log('000')
-  // isAllSelect.value = !isAllSelect.value
-  // isAllSelect.value = checked
-  // 这里需要修改 checkbox 的检查
-}
-
-function handleManageCart() {
-  state.isManage = !state.isManage
-}
-
-function handleSubmit() {
-  console.log(state.isManage)
-
-  if (!state.isManage) {
-    handleDelete()
-  } else { // submit
-    state.cart_id = uniq(state.cart_id)
-
-    // console.log(state.cart_id)
-    if (state.cart_id && state.cart_id.length > 0) {
-      uni.navigateTo({
-        url: `/pages/order-confirm/index?cartId=${state.cart_id.join(',')}`
-      })
-    } else {
-      return uni.showToast({
-        title: '请选择商品',
-        icon: 'none'
-      })
-    }
-  }
-
-}
-
-function handleDelete() {
-  // const cart_id = <any>[]
-  shopping.value?.list.forEach(shopItem => {
-    shopItem.list.forEach(goodItem => {
-      if (goodItem.check) {
-        state.cart_id.push(goodItem.cart_id)
-      }
-    })
-  })
-  state.cart_id = uniq(state.cart_id)
-
-  // console.log(cart_id)
-  if (state.cart_id.length === 0) {
-    return uni.showToast({
-      title: '请选择产品',
-      icon: "none"
-    })
-  } else {
-    uni.showModal({
-      title: '温馨提示',
-      content: '确认将宝贝删除?',
-      success: (res) => {
-        if (res.confirm) {
-          deleteCartItem(state.cart_id).then(res => {
-            uni.showToast({
-              title: '删除成功'
-            })
-            state.isManage = true
-            state.cart_id = []
-            state.totalPrice = ''
-            loadCartList()
-          })
-
-        } else if (res.cancel) {
-        }
-      }
-    })
-  }
-}
-
-
-function handleProductItemClick(
-    item:
-        JdProductModel
-        & DcProductModel
-        & DyProductModel
-        & SuNingProductModel
-        & TaobaoProductThirdPartyWaresModel
-        & VipProductModel
-) {
-  // function navigateToDetail(params) {
-  //   let otherDetailUrl = `/pages/store/product/other`
-  //   return uni.navigateTo({
-  //     url: `${otherDetailUrl}?params=${params}`
-  //   })
-  // }
-  // 大仓
-    uni.navigateTo({
-      url: `/pages/store/product/detail?id=${item.product_id}`
-    })
-}
-
-function handleNumberChange(num, goodItem) {
-  console.log(goodItem)
-  uni.showLoading()
-  console.log(num)
-  cartChange(goodItem.cart_id, num).then(res => {
-    reTotal()
-    uni.hideLoading()
-  })
-  // console.log(goodItem)
-  // console.log(num)
-  // const
-  // goodItem.productAttr.price = goodItem.productAttr.price * num
-  // goodItem.productAttr.price = goodItem.productAttr.price * goodItem.cart_num
-}
-</script>
-<template>
-  <div class="">
-    <div
-        v-if="hasShopping"
-        class="bg-white h-10 fixed top-0 w-full z-1 flex justify-end "
-    >
-      <div class="pr-3">
-        <FButton size="small"
-                 @click="handleManageCart"
-        >
-          <div>{{ state.isManage ? '管理' : '完成'}}</div>
-        </FButton>
-      </div>
-    </div>
-    <div
-        v-if="!hasShopping"
-        class="flex flex-col justify-center items-center bg-white rounded-lg gap-3 text-xs py-8">
-      <div>
-        <image :src="gouwucheImage" mode="widthFix" class="w-20 h-20"></image>
-      </div>
-      <div>
-        暂无商品，去添加喜欢的商品
-      </div>
-    </div>
-    <div v-else class="mt-10">
-
-      <div
-          v-if="shopping && shopping.list"
-          class="flex flex-col gap-4 p-3"
-      >
-        <div
-            v-for="(shopItem, index) in shopping.list"
-            :key="index"
-            class="bg-white rounded-lg  "
-        >
-          <div
-              class="f-hairline-bottom flex  items-center font-bold p-3"
-          >
-            <nut-checkbox v-model="shopItem.allCheck"
-                          @change="shopCheck(shopItem)"
-                          :indeterminate="shopItem.indeterminate"
-                          label="全选"
-                          class="!text-primary"
-            >
-              {{ shopItem.mer_name }}
-            </nut-checkbox>
-          </div>
-          <div v-for="(goodItem, goodIndex) in shopItem.list"
-               :key="goodIndex"
-               class="flex f-hairline-bottom p-3 gap-2"
-          >
-            <div class="flex">
-              <nut-checkbox v-model="goodItem.check"
-                            @change="handleGoodsItemCheck"
-                            label="单选"
-                            class="!text-primary"
-              ></nut-checkbox>
-              <image
-                  :src="goodItem.product.image"
-                  mode="aspectFill" class="w-18 h-18 rounded"
-              ></image>
-            </div>
-
-            <div class="flex flex-col gap-1 w-full">
-              <div
-                  @click="handleProductItemClick(goodItem)"
-                  class="text-overflow line-clamp-2 text-xs">{{ goodItem.product.store_name }}</div>
-              <div class="flex flex-col justify-start gap-1">
-                <div
-                    class="text-[10px] text-gray min-w-5  p-1  items-center flex">
-                  {{ goodItem.productAttr.sku }}
-                </div>
-                <div class="flex">
-                  <CXBYaojinTag :amount="goodItem.yanglao"/>
-
-                </div>
-              </div>
-              <div class="flex  justify-between ">
-                <FPrice :price="goodItem.productAttr.price"
-                        ex-class="font-bold text-dark"
-                />
-                <nut-input-number v-model="goodItem.cart_num" @change="(num) => handleNumberChange(num, goodItem)"/>
-              </div>
-            </div>
-          </div>
-        </div>
-
-      </div>
-    </div>
-
-    <div class="pb-12">
-      <div class="flex flex-row justify-center items-center gap-3 font-bold text-sm p-3 ">
-        <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
-        <div>
-      精品推荐
-        </div>
-        <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
-      </div>
-
-      <div class="pb-3 px-3" v-if="state.recommendList">
-        <grid-view type="masonry" cross-axis-count="2" cross-axis-gap="10px" main-axis-gap="10px">
-          <div v-for="(item, index) in state.recommendList"
-               :key="index"
-               @click="handleProductItemClick(item)"
-          >
-            <MerchantProductCard :item="item" />
-
-          </div>
-        </grid-view>
-
-        <div class=" 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>
-
-      </div>
-    </div>
-  </div>
-
-  <div v-if="hasShopping"
-      class="fixed bottom-0 w-full z-3">
-    <div class="bg-white h-10 flex justify-between" v-if="shopping && shopping.list">
-      <div class="flex justify-center items-center gap-2 pl-3">
-        <nut-checkbox v-model="isAllSelect"
-                      @change="handleSelectAll"
-                      :indeterminate="state.selectAllIndeterminate"
-                      label="全选"
-                      class="!text-primary"
-        >全选
-        </nut-checkbox>
-        <div class="text-xs text-gray">共 {{ state.totalCartCount }} 件</div>
-      </div>
-
-      <div class="flex justify-center items-center gap-2 pr-3">
-        <div class="flex text-[12px]" v-if="state.isManage">
-          合计：
-          <FPrice :price="state.totalPrice"></FPrice>
-<!--          {{totalCartInfo.totalPrice}}-->
-        </div>
-        <FButton
-            @click="handleSubmit"
-            size="small"
-            :exClass="['rounded-full','!text-[14px]', 'text-white', 'bg-primary', 'w-full']"
-        >
-          {{ state.isManage? '去结算' : '删除'}}
-        </FButton>
-      </div>
-    </div>
-  </div>
-</template>
-<style>
-page {
-  background-color: #f8f8f8;
-}
-</style>
-<route lang="yaml">
-style:
-  navigationBarTitleText: 购物车
-  enablePullDownRefresh: false
-</route>

src/pages/order_addcart/index-new.vue

@@ -1,511 +0,0 @@
-<script lang="ts" setup>
-import {getRecommendList} from "~/apis/merchant";
-import MerchantProductCard from "~/pages/store/home/components/MerchantProductCard.vue";
-import {deleteCartItem, getCartList} from "~/apis/user";
-import type {ShoppingResult} from "~/apis/model/shopping.model";
-import FPrice from "~/components/FPrice/FPrice.vue";
-import FButton from "~/components/FButton/FButton.vue";
-import CXBYaojinTag from "~/components/CXBYaojinTag/CXBYaojinTag.vue";
-import {
-  DyProductModel, IProductDetail,
-  JdProductModel,
-  SuNingProductModel,
-  TaobaoProductThirdPartyWaresModel, VipProductModel
-} from "~/apis/model/product.model";
-import {DcProductModel} from "~/apis/model/dacang.model";
-import {encodeBase64} from "~/utils/http/helper";
-import {CDN_URL} from "~/config/app";
-import {uniq} from "lodash-es";
-import {cartChange} from "~/apis/order.api";
-const gouwucheImage = CDN_URL + '/static/assets/gouwuche.png'
-const like_adorn_220628Image = CDN_URL + '/static/assets/like_adorn_220628.png'
-const state = reactive({
-  recommendList: [],
-  currentPage: 1,
-  pageSize: 10,
-  total: 0,
-  totalPage: 0,
-
-
-  totalCartCount: 0,
-  totalPrice: 0,
-  selectAll: false,
-
-  cart_id: [],
-  isManage: true,
-})
-
-const shopping = ref<ShoppingResult>()
-
-onShow(() => {
-  state.cart_id = []
-  loadCartList()
-  if (!state.isManage) {
-    state.isManage = true
-  }
-
-  loadList('reload')
-})
-function loadList(action: 'page' | 'reload', callback?: (items) => void) {
-  const params = {
-    page: state.currentPage,
-    limit: state.pageSize
-  }
-
-  if (action === 'reload') {
-    params.page = 1
-  }
-
-  getRecommendList({
-    ...params
-  }).then(res => {
-    if (action === 'page') {
-      state.recommendList = state.recommendList.concat(res.list)
-    }
-    if (action === 'reload') {
-      // state.list = state.list.concat(res.list)
-      state.recommendList = res.list
-    }
-    state.totalPage = Math.ceil(res.count / state.pageSize);
-    state.status = 'more'
-    if (callback) {
-      callback(res.list)
-    }
-  })
-}
-
-function handleScrollToLower() {
-  state.status = 'loading';
-  state.currentPage += 1;
-  // console.log(state.totalPage)
-  if (state.currentPage > state.totalPage) {
-    state.status = 'noMore';
-  } else {
-    setTimeout(() => {
-      loadList('page')
-    }, 300)
-  }
-}
-
-onReachBottom(() => {
-  handleScrollToLower()
-
-})
-
-// 加载购物车数据
-function loadCartList() {
-  getCartList().then(res => {
-    shopping.value = res
-
-    console.log(res)
-    shopping.value?.list.forEach((shopItem, index) => {
-      // shopItem.allCheck = true
-      shopItem.indeterminate = false
-      shopItem.allCheck = false
-      shopItem.list.forEach(goodItem => {
-        goodItem.check = false
-        // state.cart_id.push(goodItem.cart_id)
-        // if (goodItem.cart_num === 1) {}
-      })
-      console.log(shopItem)
-    })
-    // cartAllCheck("all")
-    // if (shopping.value) {
-    //   handleSelectAll()
-    // }
-  })
-}
-const hasShopping = computed(() => {
-  return shopping.value && shopping.value?.list.length > 0
-})
-
-const totalCartInfo = computed(() => {
-  let totalPrice = 0
-  let goodsNum = 0
-  if (shopping.value && shopping.value?.list.length > 0) {
-    for (let i = 0; i < shopping.value?.list.length; i++) {
-      for (let j = 0; j < shopping.value?.list[i].list.length; j++) {
-        let num = Number.parseInt(shopping.value?.list[i].list[j].cart_num);
-        let price = Number.parseFloat(shopping.value?.list[i].list[j].productAttr.price)
-        totalPrice += (num * price)
-        goodsNum += num
-      }
-    }
-  }
-
-  return {
-    totalPrice,
-    goodsNum
-  }
-})
-const totalMoney = ref(0)
-const isAllSelect = ref(false)
-
-function handleGoodsItemCheck() {
-  cartAllCheck('single')
-}
-
-function shopCheck(shopItem) {
-  if (shopItem.allCheck) {
-    console.log(shopItem)
-    shopItem.list.forEach((good, index) => {
-      good.check = true
-    })
-  } else {
-    shopItem.list.forEach((good, index) => {
-      good.check = false
-    })
-  }
-}
-function cartAllCheck(type: 'single' | 'all') {
-  let allArr = []
-  let totalMoney = 0
-  let totalNum = 0
-
-  shopping.value?.list.forEach((goods, index) => {
-    if (type === 'single') {
-      let tempArr = goods.list.filter(goodItem => {
-        // if (goodItem.check) {
-          return goodItem.check === true
-        // }
-      })
-      if (tempArr && goods.list.length === tempArr.length) {
-        goods.allCheck = true
-        allArr.push(goods)
-      } else {
-        goods.allCheck = false
-      }
-    } else {
-      goods.list.forEach(goodItem => {
-        goodItem.check = isAllSelect.value
-      })
-      goods.allCheck = isAllSelect.value
-      if (goods.allCheck) {
-        allArr.push(goods)
-      }
-    }
-
-    // 总金额｜总数
-    goods.list.forEach(goodItem => {
-      if (goodItem.check) {
-        totalMoney += (goodItem.productAttr.price * goodItem.cart_num)
-        totalNum += Number.parseFloat(goodItem.cart_num)
-        state.cart_id.push(goodItem.cart_id)
-      }
-    })
-  })
-
-  isAllSelect.value = allArr.length === shopping.value?.list.length
-  state.totalCartCount = totalNum
-  state.totalPrice = totalMoney
-}
-
-function reTotal() {
-  let allArr = []
-  let totalMoney = 0
-  let totalNum = 0
-
-  shopping.value?.list.forEach((goods, index) => {
-    // 总金额｜总数
-    goods.list.forEach(goodItem => {
-      if (goodItem.check) {
-        totalMoney += (goodItem.productAttr.price * goodItem.cart_num)
-        totalNum += Number.parseFloat(goodItem.cart_num)
-        // state.cart_id.push(goodItem.cart_id)
-      }
-    })
-  })
-
-  isAllSelect.value = allArr.length === shopping.value?.list.length
-  state.totalCartCount = totalNum
-  state.totalPrice = totalMoney
-}
-function handleSelectAll(checked: boolean) {
-  // console.log('000')
-  // isAllSelect.value = !isAllSelect.value
-  // isAllSelect.value = checked
-  // 这里需要修改 checkbox 的检查
-  cartAllCheck('all')
-}
-
-function handleManageCart() {
-  state.isManage = !state.isManage
-}
-
-function handleSubmit() {
-  console.log(state.isManage)
-
-  if (!state.isManage) {
-    handleDelete()
-  } else { // submit
-    state.cart_id = uniq(state.cart_id)
-
-    // console.log(state.cart_id)
-    if (state.cart_id && state.cart_id.length > 0) {
-      uni.navigateTo({
-        url: `/pages/order-confirm/index?cartId=${state.cart_id.join(',')}`
-      })
-    } else {
-      return uni.showToast({
-        title: '请选择商品',
-        icon: 'none'
-      })
-    }
-  }
-
-}
-
-function handleDelete() {
-  // const cart_id = <any>[]
-  shopping.value?.list.forEach(shopItem => {
-    shopItem.list.forEach(goodItem => {
-      if (goodItem.check) {
-        state.cart_id.push(goodItem.cart_id)
-      }
-    })
-  })
-  state.cart_id = uniq(state.cart_id)
-
-  // console.log(cart_id)
-  if (state.cart_id.length === 0) {
-    return uni.showToast({
-      title: '请选择产品',
-      icon: "none"
-    })
-  } else {
-    uni.showModal({
-      title: '温馨提示',
-      content: '确认将宝贝删除?',
-      success: (res) => {
-        if (res.confirm) {
-          deleteCartItem(state.cart_id).then(res => {
-            uni.showToast({
-              title: '删除成功'
-            })
-            state.isManage = true
-            state.cart_id = []
-            state.totalPrice = ''
-            loadCartList()
-          })
-
-        } else if (res.cancel) {
-        }
-      }
-    })
-  }
-}
-
-
-function handleProductItemClick(
-    item:
-        JdProductModel
-        & DcProductModel
-        & DyProductModel
-        & SuNingProductModel
-        & TaobaoProductThirdPartyWaresModel
-        & VipProductModel
-) {
-  // function navigateToDetail(params) {
-  //   let otherDetailUrl = `/pages/store/product/other`
-  //   return uni.navigateTo({
-  //     url: `${otherDetailUrl}?params=${params}`
-  //   })
-  // }
-  // 大仓
-    uni.navigateTo({
-      url: `/pages/store/product/detail?id=${item.product_id}`
-    })
-}
-
-function handleNumberChange(num, goodItem) {
-  console.log(goodItem)
-  uni.showLoading()
-  console.log(num)
-  cartChange(goodItem.cart_id, num).then(res => {
-    reTotal()
-    uni.hideLoading()
-  })
-  // console.log(goodItem)
-  // console.log(num)
-  // const
-  // goodItem.productAttr.price = goodItem.productAttr.price * num
-  // goodItem.productAttr.price = goodItem.productAttr.price * goodItem.cart_num
-}
-</script>
-<template>
-  <div class="">
-    <div
-        v-if="hasShopping"
-        class="bg-white h-10 fixed top-0 w-full z-1 flex justify-end "
-    >
-      <div class="pr-3">
-        <FButton size="small"
-                 @click="handleManageCart"
-        >
-          <div>{{ state.isManage ? '管理' : '完成'}}</div>
-        </FButton>
-      </div>
-    </div>
-    <div
-        v-if="!hasShopping"
-        class="flex flex-col justify-center items-center bg-white rounded-lg gap-3 text-xs py-8">
-      <div>
-        <image :src="gouwucheImage" mode="widthFix" class="w-20 h-20"></image>
-      </div>
-      <div>
-        暂无商品，去添加喜欢的商品
-      </div>
-    </div>
-    <div v-else class="mt-10">
-
-      <div
-          v-if="shopping && shopping.list"
-          class="flex flex-col gap-4 p-3"
-      >
-        <div
-            v-for="(shopItem, index) in shopping.list"
-            :key="index"
-            class="bg-white rounded-lg  "
-        >
-
-<!--          <nut-cell-group>-->
-<!--            <nut-cell>-->
-<!--              <nut-checkbox :indeterminate="shopItem.indeterminate" v-model="shopItem.allCheck" @change="changeBox5">-->
-<!--                {{shopItem.mer_name}}-->
-<!--              </nut-checkbox>-->
-<!--            </nut-cell>-->
-<!--            <nut-checkbox-group v-model="checkboxgroup5" ref="group2" @change="changeBox6">-->
-<!--              <nut-cell><nut-checkbox label="1" style="margin: 2px 20px 0 0">组合复选框</nut-checkbox></nut-cell>-->
-<!--              <nut-cell><nut-checkbox label="2">组合复选框</nut-checkbox></nut-cell>-->
-<!--              <nut-cell><nut-checkbox label="3">组合复选框</nut-checkbox></nut-cell>-->
-<!--              <nut-cell><nut-checkbox label="4">组合复选框</nut-checkbox></nut-cell>-->
-<!--            </nut-checkbox-group>-->
-<!--          </nut-cell-group>-->
-
-
-          <div
-              class="f-hairline-bottom flex  items-center font-bold p-3"
-          >
-            <nut-checkbox v-model="shopItem.allCheck" @change="shopCheck(shopItem)" label="全选"
-                          class="!text-primary"
-            >
-              {{ shopItem.mer_name }}
-            </nut-checkbox>
-          </div>
-          <div v-for="(goodItem, goodIndex) in shopItem.list"
-               :key="goodIndex"
-               class="flex f-hairline-bottom p-3 gap-2"
-          >
-            <div class="flex">
-              <nut-checkbox v-model="goodItem.check"
-                            @change="handleGoodsItemCheck"
-                            label="单选"
-                            class="!text-primary"
-              ></nut-checkbox>
-              <image
-                  :src="goodItem.product.image"
-                  mode="aspectFill" class="w-18 h-18 rounded"
-              ></image>
-            </div>
-
-            <div class="flex flex-col gap-1 w-full">
-              <div
-                  @click="handleProductItemClick(goodItem)"
-                  class="text-overflow line-clamp-1">{{ goodItem.product.store_name }}</div>
-              <div class="flex flex-col justify-start gap-1">
-                <div
-                    class="text-[10px] text-gray min-w-5  p-1  items-center flex">
-                  {{ goodItem.productAttr.sku }}
-                </div>
-                <div class="flex">
-                  <CXBYaojinTag :amount="goodItem.yanglao"/>
-
-                </div>
-              </div>
-              <div class="flex  justify-between ">
-                <FPrice :price="goodItem.productAttr.price"
-                        ex-class="font-bold text-dark"
-                />
-                <nut-input-number v-model="goodItem.cart_num" @change="(num) => handleNumberChange(num, goodItem)"/>
-              </div>
-            </div>
-          </div>
-        </div>
-
-      </div>
-    </div>
-
-    <div class="pb-12">
-      <div class="flex flex-row justify-center items-center gap-3 font-bold text-sm p-3 ">
-        <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
-        <div>
-          精品推荐
-        </div>
-        <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
-      </div>
-
-      <div class="pb-3 px-3" v-if="state.recommendList">
-        <grid-view type="masonry" cross-axis-count="2" cross-axis-gap="10px" main-axis-gap="10px">
-          <div v-for="(item, index) in state.recommendList"
-               :key="index"
-               @click="handleProductItemClick(item)"
-          >
-            <MerchantProductCard :item="item" />
-
-          </div>
-        </grid-view>
-
-        <div class=" 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>
-
-      </div>
-    </div>
-  </div>
-
-  <div v-if="hasShopping"
-      class="fixed bottom-0 w-full">
-    <div class="bg-white h-10 flex justify-between" v-if="shopping && shopping.list">
-      <div class="flex justify-center items-center gap-2 pl-3">
-        <nut-checkbox v-model="isAllSelect"
-                      @change="handleSelectAll"
-                      label="全选"
-                      class="!text-primary"
-        >全选
-        </nut-checkbox>
-        <div class="text-xs text-gray">共 {{ state.totalCartCount }} 件</div>
-      </div>
-
-      <div class="flex justify-center items-center gap-2 pr-3">
-        <div class="flex text-[12px]">
-          合计：
-          <FPrice :price="state.totalPrice"></FPrice>
-<!--          {{totalCartInfo.totalPrice}}-->
-        </div>
-        <FButton
-            @click="handleSubmit"
-            size="small"
-            :exClass="['rounded-full','!text-[14px]', 'text-white', 'bg-primary', 'w-full']"
-        >
-          {{ state.isManage? '去结算' : '删除'}}
-        </FButton>
-      </div>
-    </div>
-  </div>
-</template>
-<style>
-page {
-  background-color: #f8f8f8;
-}
-</style>
-<route lang="yaml">
-style:
-  navigationBarTitleText: 购物车
-  enablePullDownRefresh: true
-</route>

src/pages/order_addcart/index.vue

@@ -16,7 +16,7 @@ import {
 import { DcProductModel } from "~/apis/model/dacang.model";
 import { createShopping, changeProdoctSku } from "~/apis/order.api";
 import { encodeBase64 } from "~/utils/http/helper";
-import { CDN_URL } from "~/config/app";
+import { CDN_URL,ICON_CDN_URL } from "~/config/app";
 import { uniq, values } from "lodash-es";
 import { cartChange } from "~/apis/order.api";
 import type CXBBackTop from "~/components/CXBBackTop/CXBBackTop.vue";
@@ -61,42 +61,20 @@ const detail: any = ref(null)
 
 
 function onSelectedSku(currentSku: any) {
-  console.log("item", currentSku);
-
   state.currentSku = currentSku
-
 }
 
 
 function handleCreateShopping() {
-  // console.log(state.flag)
+
   console.log(state.currentSku.unique, '切换sku展示的商品', state.changeSkuCart_id)
   uniqueclone.value = state.currentSku.unique
   changeProdoctSku(
-    // product_attr_unique: JSON.stringify(state.currentSku),
-    // detail.value.unique
+   
     state.changeSkuCart_id,
     state.currentSku.unique
   ).then(res => {
-    console.log('我是res123', res)
-
-    // if (res.cart_id) {
-    //   // console.log(state.flag)
-    //   if (state.flag == '1' || state.flag == '3') {
-    //     uni.navigateTo({
-    //       url: `/pages/order-confirm/index?cartId=${res.cart_id}&type=${state.flag}&product_id=${detail.value.product_id}`
-    //     })
-    //   } else {
-    //     uni.$emit('cart-reload')
-    //     uni.showToast({
-    //       title: '添加购物车成功',
-    //       icon: 'none'
-    //     })
-    //     loadCartCount()
-    //     state.isShowSku = false
-    //   }
-    // }
-
+  
     if (res.status === 200) {
       state.isShowSku = false
       console.log("修改后", state.currentSku);
@@ -116,13 +94,9 @@ function handleCreateShopping() {
 }
 
 function handleCountChange(val) {
-  // console.log(val)
-  // detail.value.
-  // if (val > 0) {
-  console.log(val);
 
   state.cartNum = val
-  // }
+
 }
 
 // 距离顶部距离
@@ -583,15 +557,10 @@ function handleProductItemClick(
     & TaobaoProductThirdPartyWaresModel
     & VipProductModel
 ) {
-  // function navigateToDetail(params) {
-  //   let otherDetailUrl = `/pages/store/product/other`
-  //   return uni.navigateTo({
-  //     url: `${otherDetailUrl}?params=${params}`
-  //   })
-  // }
+ 
   // 大仓
   uni.navigateTo({
-    url: `/pages/store/product/detail?id=${item.product_id}`
+    url: `/subPages/pages/store/product/detail?id=${item.product_id}`
   })
 }
 
@@ -784,7 +753,7 @@ function handlePageClick() {
                           {{ goodItem.productAttr.sku }}
                         </span>
                         <span class="m-lift">
-                          <img class="thumbnail_1" referrerpolicy="no-referrer" src="../../static/icon/下拉.png" />
+                          <img class="thumbnail_1" referrerpolicy="no-referrer" :src="ICON_CDN_URL+'下拉.png'" />
                         </span>
                       </div>
                     </div>

src/pages/payment/index.vue

@@ -4,12 +4,7 @@ import { CDN_URL } from '~/config/app'
 import { checkGroupOrder } from '~/apis/order.api'
 import FNavBar from '~/components/FNavBar/FNavBar.vue'
 
-// usePageStore.setPageConfig({
-//   orderBack: {
-//     type: 'page',
-//     url: '/pages/store/product/detail?id=' + state.id
-//   }
-// })
+
 
 const pageStore = usePageStoreWidthOut()
 
@@ -26,6 +21,8 @@ const state = reactive({
 onLoad((options) => {
   // console.log('我是options',options)
   if (options) {
+	  
+	  console.log("===options",options);
     state.orderList = options.OrderList
     state.payPrice = options.pay_price
     state.orderId = options.order_id
@@ -65,7 +62,7 @@ function handleConfirm() {
       OrderLists: state.orderList,
       type: 'tdbaspzf',
     },
-    envVersion: 'trial', // develop（开发版），trial（体验版），release（正式版）
+    envVersion: 'release', // develop（开发版），trial（体验版），release（正式版）
     // envVersion: 'release', // develop（开发版），trial（体验版），release（正式版）
     success(res) {
       // 打开成功
@@ -97,10 +94,7 @@ function onClickLeft() {
       if (res.cancel) {
         // uni.navigateBack()
         uni.$emit('cart-reload')
-        // let url = '/pages/order/index?tabIndex=1'
-        // if (usePageStore.orderBack) {
-        //   url += `&from=${usePageStore.orderBack}`
-        // }
+        
         console.log(state.tabIndex)
 
         if (state.tabIndex) {
@@ -114,7 +108,7 @@ function onClickLeft() {
         // setTimeout(() => {
         if (state.tabIndex == 0) {
           uni.navigateTo({
-            url: '/pages/order/index',
+            url: '/subPages/pages/order/index',
           })
         }
         if (state.tabIndex > 0) {
@@ -125,13 +119,13 @@ function onClickLeft() {
           }
           else {
             uni.navigateTo({
-				  url: `/pages/order/index?tabIndex=${state.tabIndex}&from=payment`,
+				  url: `/subPages/pages/order/index?tabIndex=${state.tabIndex}&from=payment`,
             })
           }
         }
         else {
           uni.navigateTo({
-            url: '/pages/order/index?tabIndex=1&from=payment',
+            url: '/subPages/pages/order/index?tabIndex=1&from=payment',
           })
         }
         // const tabIndex =

src/pages/payment/success.vue

@@ -7,7 +7,7 @@ const icon = 'https://cdn.bjtdba.com/vod/image/2023-09-21/20230921160115229.png'
 function onClickLeft() {
   uni.redirectTo({
     // url: '/pages/my-integral/index'
-    url: '/pages/order/index'
+    url: '/subPages/pages/order/index'
   })
 }
 function goHome() {

src/pages/product/dingshenglianmeng.vue

@@ -66,7 +66,7 @@ const list = ref([])
 
 function handleItemClick(item) {
   uni.navigateTo({
-    url: `/pages/store/product/detail?id=` + item.product_id
+    url: `/subPages/pages/store/product/detail?id=` + item.product_id
   })
 }
 

src/pages/product/integral.vue

@@ -92,7 +92,7 @@ onPullDownRefresh(() => {
 function handleItemClick(item) {
   // console.log(item)
   uni.navigateTo({
-    url: `/pages/store/product/detail?id=${item.product_id}&mer_id=148`
+    url: `/subPages/pages/store/product/detail?id=${item.product_id}&mer_id=148`
   })
 }
 </script>

src/pages/product/zibuyangsheng.vue

@@ -19,8 +19,7 @@ onLoad((options) => {
 
 function handleItemClick(item) {
   uni.navigateTo({
-    // url: `/pages/store/product/detail?id=${item.product_id}&mer_id=148`
-    url: `/pages/store/product/detail?id=`+item.product_id
+    url: `/subPages/pages/store/product/detail?id=`+item.product_id
   })
 }
 

src/pages/quick-fuc/business.vue

@@ -1,472 +0,0 @@
-<template>
-	<view class="business-container">
-		<view class="lab-content">
-			<scroll-view scroll-x="true" class="lab-item">
-				<view class="lab-item-x" v-for="(item,index) in tabList" :key="'lab-item-x-'+index">
-					<view class="lab-item-small" @click="onTabClick(index,item.merchant_category_id)">
-						<text :class="currentIndex==index?'lab-title':'lab-default-title'">{{item.category_name}}</text>
-						<view :class="currentIndex==index?'lab-line':'lab-default-line'"></view>
-					</view>
-				</view>
-			</scroll-view>
-		</view>
-		<view class="banner-content">
-			<image class="top-banner" src="/static/img/img_banner_dslm.png" mode="aspectFill"></image>
-		</view>
-
-		<view class="fuc-content">
-			<view @click="onFucClick" class="fuc-item" v-for="(item,index) in MU_TABLE_LIST" :key="'fuc-item-'+index">
-				<text class="item-title">{{item.title}}</text>
-				<text class="item-des">{{item.des}}</text>
-				<image class="item-img" :src="item.icon" mode=""></image>
-			</view>
-		</view>
-
-		<view v-if="goodsList&& goodsList.length!=0" v-for="(item,index) in goodsList" :key="'goods-x-'+index">
-			<view class="vip-content" v-if="item.childList&& item.childList.length!=0"
-				@click="goShopClick(item.mer_id)">
-				<image class="vip-bg" src="/static/img/item_smq_bg.png" mode="aspectFill"></image>
-				<view class="left-lab-content">
-					<image class="lab-icon" :src="item.mer_avatar" mode="widthFix"></image>
-					<text class="lab-title">{{item.mer_name}}</text>
-					<view class="small-lab">补充养老</view>
-				</view>
-
-				<view class="right-lab-content">
-					<text class="right-tx">进入店铺</text>
-					<image class="right-icon" src="/static/icon/img_jt_right.png" mode="widthFix"></image>
-				</view>
-			</view>
-
-			<view class="goods-scoll-content">
-				<scroll-view scroll-x="true" class="goods-scoll-item">
-					<view @click="onDetailClick(childItem.product_id)" class="goods-scoll-item-x"
-						v-for="(childItem,childIndex) in item.childList" :key="'goods-scoll-item-x-'+childIndex">
-						<view class="goods-item">
-							<image class="goods-img" :src="childItem.image" mode="aspectFill"></image>
-							<text class="goods-title">{{childItem.store_name}}</text>
-							<view class="price-content">
-								<text class="goods-des">{{childItem.price}}</text>
-								<text class="goods-des">pv:{{childItem.pv?childItem.pv:0}}</text>
-							</view>
-						</view>
-					</view>
-				</scroll-view>
-			</view>
-		</view>
-		
-		<CXBEmpty v-else />
-	</view>
-</template>
-
-<script setup>
-	import {
-		MU_TABLE_LIST
-	} from "./constants.js"
-	import {
-		apiGetCategoryList,
-		apiGetProductType,
-		apiGetProductList
-	} from '~/apis/quickLink'
-	import { getProductShare } from "~/apis/common";
-	const currentIndex = ref(0)
-	const tabList = ref([])
-	const goodsList = ref([])
-	let id=''
-
-
-	onLoad((option) => {
-		console.log();
-		getCategoryList()
-		getProductType()
-		
-		if (option && option.shareId) {
-		  userStore.setShareId(option.shareId)
-		}
-		getProductShare().then(res => {
-		  if (res) userStore.setShareId(res.share_id)
-		}).catch(message => {
-		})
-	})
-
-	onShareAppMessage(() => {
-		const shareId = Cache.get('SHARE_ID')
-		return {
-			title: `消费储蓄 保障未来`,
-			path: `/pages/vip/index?shareId=${shareId}`,
-			imageUrl: 'https://cdn.bjtdba.com/vod/image/2023-10-09/20231009202402136.png'
-		}
-	})
-
-	onShareTimeline(() => {
-		const shareId = Cache.get('SHARE_ID')
-		return {
-			title: `消费储蓄 保障未来`,
-			query: `from=share&shareId=${shareId}`,
-			imageUrl: 'https://cdn.bjtdba.com/vod/image/2023-10-11/20231011062523504.png'
-		}
-	})
-
-	onReachBottom(() => {
-		console.log('到底了。。。')
-	})
-
-	onPullDownRefresh(() => {
-		getProductType()
-		uni.stopPullDownRefresh()
-	})
-
-	function onTabClick(position, id) {
-		currentIndex.value = position
-		id.value = id
-		getProductType()
-	}
-
-	function goShopClick(id) {
-		uni.navigateTo({
-			url: `/pages/store/home/index?id=${id}`
-		})
-	}
-
-	function onDetailClick(id) {
-		uni.navigateTo({
-			url: `/pages/store/product/detail?id=${id}`
-		})
-	}
-
-	function onFucClick() {
-		uni.showToast({
-			title: '升级中',
-			icon: 'none'
-		})
-	}
-
-	function getCategoryList() {
-		apiGetCategoryList().then((res) => {
-			let _list = new Array()
-			_list.push({
-				category_name: '全部',
-				merchant_category_id: ''
-			})
-			if (res.merchantCategory && res.merchantCategory.length != 0) {
-				_list.push(...res.merchantCategory)
-			}
-			tabList.value = _list
-		})
-	}
-
-	function getProductType() {
-		uni.showLoading({
-			title:'加载中...'
-		})
-		apiGetProductType(id.value).then((res) => {
-			if (res && res.pageInfo && res.pageInfo.list) {
-				goodsList.value = res.pageInfo.list
-				dealData()
-			}
-			uni.hideLoading()
-		})
-	}
-
-	function dealData() {
-		for (let i = 0; i < goodsList.value.length; i++) {
-			let _id = goodsList.value[i].mer_id
-			apiGetProductList(_id).then(resx => {
-				if (resx.pageInfo.list && resx.pageInfo.list.length != 0) {
-					goodsList.value[i].childList = resx.pageInfo.list
-				}
-			})
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.business-container {
-		display: flex;
-		flex-direction: column;
-		min-height: 100VH;
-		background-color: #f8f8f8;
-		box-sizing: border-box;
-
-		.goods-content {
-			display: flex;
-			flex-direction: row;
-			margin-left: 10rpx;
-			margin-right: 10rpx;
-
-
-		}
-
-		.goods-item {
-			display: flex;
-			margin-left: 10rpx;
-			margin-right: 10rpx;
-			width: 230rpx;
-			align-items: center;
-			justify-content: center;
-			flex-direction: column;
-			background-color: #fff;
-			border-radius: 20rpx;
-
-			.goods-img {
-				width: 230rpx;
-				height: 230rpx;
-				border-top-right-radius: 20rpx;
-				border-top-left-radius: 20rpx;
-				background-color: #333;
-			}
-
-			.goods-title {
-				width: 230rpx;
-				font-size: 28rpx;
-				color: #333;
-				margin-top: 10rpx;
-				text-overflow: ellipsis;
-				overflow: hidden;
-				margin-left: 10rpx;
-				margin-right: 10rpx;
-				word-break: break-all;
-				white-space: nowrap;
-			}
-
-			.price-content {
-				margin-top: 10rpx;
-				display: flex;
-				margin-bottom: 20rpx;
-				flex-direction: row;
-				align-items: center;
-				justify-content: space-between;
-				padding-left: 16rpx;
-				padding-right: 16rpx;
-				box-sizing: border-box;
-				width: 100%;
-
-				.price-left {
-					font-size: 28rpx;
-					color: #333;
-				}
-
-				.price-rifht {
-					font-size: 28rpx;
-					color: #333;
-				}
-			}
-
-
-		}
-
-		.vip-content {
-			margin: 20rpx;
-			position: relative;
-			height: 100rpx;
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			box-sizing: border-box;
-
-			.vip-bg {
-				position: absolute;
-				height: 100rpx;
-				width: 710rpx;
-				border-top-right-radius: 20rpx;
-				border-top-left-radius: 20rpx;
-			}
-
-			.right-lab-content {
-				display: flex;
-				flex-direction: row;
-				align-items: center;
-				flex: 1;
-				z-index: 22;
-				justify-content: flex-end;
-
-				.right-tx {
-					color: #fff;
-					font-size: 26rpx;
-					margin-right: 10rpx;
-				}
-
-				.right-icon {
-					width: 14rpx;
-					height: 10rpx;
-					margin-right: 20rpx;
-				}
-			}
-
-			.left-lab-content {
-				height: 50rpx;
-				background-color: #fff;
-				border-radius: 20rpx;
-				z-index: 222;
-				display: flex;
-				flex-direction: row;
-				align-items: center;
-				margin-left: 20rpx;
-
-				.lab-icon {
-					width: 30rpx;
-					height: 30rpx;
-					margin-left: 10rpx;
-				}
-
-				.lab-title {
-					font-size: 26rpx;
-					color: #333;
-					margin-left: 10rpx;
-				}
-
-				.small-lab {
-					border-radius: 20rpx;
-					background-color: #000;
-					margin-right: 10rpx;
-					color: #fff;
-					font-size: 24rpx;
-					padding-left: 6rpx;
-					padding-right: 6rpx;
-					margin-left: 20rpx;
-				}
-
-			}
-
-		}
-
-		.fuc-content {
-			display: flex;
-			padding-left: 14rpx;
-			padding-right: 14rpx;
-			margin-top: 20rpx;
-			flex-direction: row;
-
-			.fuc-item {
-				flex: 1;
-				display: flex;
-				flex-direction: column;
-				background-color: #fff;
-				border-radius: 10rpx;
-				margin-left: 6rpx;
-				margin-right: 6rpx;
-				padding-top: 30rpx;
-				padding-bottom: 30rpx;
-				align-items: center;
-				justify-content: center;
-
-				.item-img {
-					width: 80rpx;
-					height: 80rpx;
-				}
-
-				.item-title {
-					font-size: 30rpx;
-					font-weight: bolder;
-					color: #333;
-					margin-bottom: 10rpx;
-				}
-
-				.item-des {
-					font-size: 24rpx;
-					color: #999;
-					margin-bottom: 40rpx;
-				}
-
-			}
-		}
-
-		.banner-content {
-			background-color: #fff;
-			padding: 20rpx;
-			height: 360rpx;
-			display: flex;
-			flex-direction: column;
-			margin-top: 90rpx;
-			box-sizing: border-box;
-
-			.top-banner {
-				border-radius: 20rpx;
-				background: #999;
-				height: 360rpx;
-				width: 100%;
-			}
-		}
-
-		.goods-scoll-content {
-			width: 100%;
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-
-			.goods-scoll-item {
-				display: flex;
-				flex-direction: row;
-				white-space: nowrap;
-				width: 100%;
-				margin-left: 10rpx;
-				margin-right: 10rpx;
-			}
-
-			.goods-scoll-item-x {
-				display: inline-block;
-				text-align: center;
-				width: 230rpx;
-				margin-right: 16rpx;
-			}
-		}
-
-		.lab-content {
-			width: 100%;
-			height: 90rpx;
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			position: fixed;
-			top: 0;
-			left: 0;
-			background-color: #fff;
-			z-index: 99999;
-
-			.lab-item {
-				display: flex;
-				flex-direction: row;
-				white-space: nowrap;
-				width: 100%;
-			}
-
-			.lab-item-x {
-				display: inline-block;
-				margin-right: 10px;
-				text-align: center;
-			}
-
-			.lab-item-small {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				width: 124rpx;
-
-				.lab-default-title {
-					font-size: 28rpx;
-					margin-bottom: 10rpx;
-				}
-
-				.lab-title {
-					font-size: 32rpx;
-					margin-bottom: 10rpx;
-					color: #FE0032;
-				}
-
-				.lab-line {
-					width: 50rpx;
-					height: 6rpx;
-					background-color: #FE0032;
-					border-radius: 4rpx;
-				}
-
-				.lab-default-line {
-					width: 50rpx;
-					height: 6rpx;
-					border-radius: 4rpx;
-				}
-
-			}
-		}
-	}
-</style>

src/pages/quick-fuc/constants.js

@@ -1,26 +0,0 @@
-import { KINGKONGKEY } from '~/apis/model/common.model'
-export const MU_TABLE_LIST =  [{
-	title:'商家入驻',
-	key:KINGKONGKEY.SJRZ,
-	icon:'/static/icon/icon_sm_sjrz.png',
-	des:'入驻流程指南'
-},
-{
-	title:'店铺推荐',
-	key:KINGKONGKEY.DPTJ,
-	icon:'/static/icon/icon_sm_dptj.png',
-	des:'优质店铺推荐'
-},
-{
-	title:'官方客服',
-	key:KINGKONGKEY.GFKF,
-	icon:'/static/icon/icon_sm_gfkf.png',
-	des:'用户专属客服'
-},
-{
-	title:'店铺管理',
-	key:KINGKONGKEY.DPGL,
-	icon:'/static/icon/icon_sm_dpgl.png',
-	des:'商品订单管理'
-},
-]

src/pages/red-integral/index.vue

@@ -56,7 +56,7 @@ function handleToVipPage() {
 function handleImmediateWithdrawal() {
   if (userStore.userInfo.is_ertification == 1) {
     uni.navigateTo({
-      url: '/pages/immediate-withdrawal/index?type=2'
+      url: '/subPages/pages/immediate-withdrawal/index?type=2'
     })
   }else{
     setTimeout(() => {

src/pages/refund/components/GoodStatusPopup.vue

@@ -1,12 +1,16 @@
 <script setup lang="ts">
 import closeIcon from "~/static/icon/close.png";
-import radioOffIcon from "~/static/icon/radio-off.png";
-import radioOnIcon from "~/static/icon/radio-on.png";
+
 import {computed} from "vue";
 import {PopupProps} from "~/components/FPopup";
 import {CLOSE_EVENT, OPEN_EVENT, UPDATE_SHOW_EVENT} from "~/components/constants";
 import {CANCEL_EVENT, CONFIRM_EVENT} from "~/constants/event";
 import FPopup from "~/components/FPopup/FPopup.vue";
+import { ICON_CDN_URL } from "~/config/app";
+
+const radioOffIcon =ref(ICON_CDN_URL+'radio-off.png') 
+const radioOnIcon = ref(ICON_CDN_URL+'radio-on.png') 
+
 
 const emit = defineEmits()
 const props = defineProps({

src/pages/refund/components/RefundReasonPopup.vue

@@ -1,13 +1,14 @@
 <script setup lang="ts">
 import closeIcon from "~/static/icon/close.png";
-import radioOffIcon from "~/static/icon/radio-off.png";
-import radioOnIcon from "~/static/icon/radio-on.png";
+
 import {computed} from "vue";
 import {PopupProps} from "~/components/FPopup";
 import {CLOSE_EVENT, OPEN_EVENT, UPDATE_SHOW_EVENT} from "~/components/constants";
 import {CANCEL_EVENT, CONFIRM_EVENT} from "~/constants/event";
 import FPopup from "~/components/FPopup/FPopup.vue";
-
+import { ICON_CDN_URL } from "~/config/app";
+const radioOffIcon =ref(ICON_CDN_URL+'radio-off.png') 
+const radioOnIcon = ref(ICON_CDN_URL+'radio-on.png') 
 const emit = defineEmits()
 const props = defineProps({
   show: {

src/pages/search/index-bak.vue

@@ -1,655 +0,0 @@
-<script setup lang="ts">
-import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
-import {
-  getDyLiveList,
-  getDyProductList,
-  getJdProductList,
-  getPddProductList,
-  getSuProductList,
-  getTaobaoProductList,
-  getVipProductList,
-  searchDyProduct,
-  searchJdProduct,
-  searchPddProduct,
-  searchSuProduct, searchVipProduct
-} from "~/apis/product";
-import type {
-  DyProductModel,
-  IProductDetail,
-  JdProductModel,
-  SuNingProductModel,
-  TaobaoProductThirdPartyWaresModel,
-  VipProductModel
-} from "~/apis/model/product.model";
-import {getDcProductList} from "~/apis/dacang";
-import type {DcProductModel} from "~/apis/model/dacang.model";
-import FPrice from "~/components/FPrice/FPrice.vue";
-import {encodeBase64} from "~/utils/http/helper";
-import CXBDyLiveRecommend from "~/components/CXBDyLive/CXBDyLiveRecommend.vue";
-import {PLATFORM_NAME} from "~/apis/model/common.model";
-import {CDN_URL} from "~/config/app";
-
-const dyLeftImage = CDN_URL + '/static/assets/dy_zuo_230321.png'
-const dyRightImage = CDN_URL + '/static/assets/dy_you_230321.png'
-
-interface TabItem {
-  id: PLATFORM_NAME,
-  text: string,
-  iconPath: string,
-  selectedIconPath: string
-}
-
-const tabList = <Array<TabItem>>[{
-  id: PLATFORM_NAME.JD,
-  text: '京东',
-  iconPath: CDN_URL + '/static/assets/jingdong_x.png',
-  selectedIconPath: CDN_URL + '/static/assets/jingdong_d.png',
-}, {
-  id: PLATFORM_NAME.TB,
-  text: '淘宝',
-  iconPath: CDN_URL + '/static/assets/taobaoyanglao_x.png',
-  selectedIconPath: CDN_URL + '/static/assets/taobaoyanglao_d.png',
-}, {
-  id: PLATFORM_NAME.PDD,
-  text: '拼多多',
-  iconPath: CDN_URL + '/static/assets/pinduoduo_x.png',
-  selectedIconPath: CDN_URL + '/static/assets/pinduoduo_d.png',
-}, {
-  id: PLATFORM_NAME.DC,
-  text: '大仓',
-  iconPath: CDN_URL + '/static/assets/dacang_x_220914.png',
-  selectedIconPath: CDN_URL + '/static/assets/dacang_d_220914.png',
-}, {
-  id: PLATFORM_NAME.DY,
-  text: '抖音',
-  iconPath: CDN_URL + '/static/assets/douyin_x_230313.png',
-  selectedIconPath: CDN_URL + '/static/assets/douyin_d_230313.png',
-}, {
-  id: PLATFORM_NAME.VIP,
-  text: '唯品会',
-  iconPath: CDN_URL + '/static/assets/weipinhui_x.png',
-  selectedIconPath: CDN_URL + '/static/assets/weipinhui_d.png',
-}, {
-  id: PLATFORM_NAME.SU,
-  text: '苏宁',
-  iconPath: CDN_URL + '/static/assets/suningyigou_x.png',
-  selectedIconPath: CDN_URL + '/static/assets/suningyigou_d.png',
-}]
-const state = reactive({
-  currentTab: PLATFORM_NAME.JD,
-  // 列表高度
-  scrollHeight: 0,
-  triggered: false,
-  status: 'none',
-  currentPage: 1,
-  totalPage: 1
-})
-const { windowHeight } = uni.getSystemInfoSync()
-state.scrollHeight = windowHeight - 195
-const searchValue = ref('')
-
-onLoad((options) => {
-  const platform = options.platform
-  if (platform) {
-    state.currentTab = platform
-  }
-  loadProductList('reload')
-
-})
-const list = ref<Array<
-    JdProductModel
-    | DcProductModel
-    | DyProductModel
-    | SuNingProductModel
-    | TaobaoProductThirdPartyWaresModel
-    | VipProductModel
-    | any
->>()
-
-const dyLiveList = ref<Array<DyProductModel>>()
-
-function searchProduct() {
-  switch (state.currentTab) {
-    case PLATFORM_NAME.JD: {
-      searchJdProduct({keyword: searchValue.value, page: 1, limit: 20}).then(res => {
-        list.value = res
-      })
-      break;
-    }
-    case PLATFORM_NAME.DC: {
-      getDcProductList({
-        page: 1,
-        limit: 10,
-        classify: '',
-        keyword: searchValue.value
-      }).then(res => {
-        list.value = res
-      })
-      break;
-    }
-    case PLATFORM_NAME.DY: {
-      searchDyProduct({keyword: searchValue.value, page: 1, limit: 10}).then(res => {
-        list.value = res
-      })
-      break;
-    }
-    case PLATFORM_NAME.PDD: {
-      searchPddProduct({ keyword: searchValue.value, page: 1, limit: 10}).then(res => {
-        list.value = res
-      })
-      break;
-    }
-    case PLATFORM_NAME.SU: {
-      searchSuProduct({ keyword: searchValue.value, page: 1, limit: 10}).then(res => {
-        list.value = res
-      })
-      break;
-    }
-    case PLATFORM_NAME.TB: {
-      getTaobaoProductList({
-        pageNum: `1`,
-        pageSize: '10',
-        title: searchValue.value
-      }).then(res => {
-        list.value = res.thirdPartyWaresList
-      })
-      break;
-    }
-    case PLATFORM_NAME.VIP: {
-      searchVipProduct({ keyword: searchValue.value, page: 1, limit: 10}).then(res => {
-        list.value = res
-      })
-      break;
-    }
-  }
-}
-function loadProductList(action: 'page' | 'reload', callback?: (items) => void) {
-
-  switch (state.currentTab) {
-    case PLATFORM_NAME.JD: {
-      getJdProductList({
-        page: state.currentPage,
-        limit: 10
-      }).then(res => {
-        state.triggered = false
-
-        // list.value = res
-        if (action === 'page') {
-          list.value = list.value.concat(res)
-        }
-        if (action === 'reload') {
-          list.value = res
-        }
-        // state.totalPage = Math.ceil()
-        // res[0].
-        // console.log(res)
-      }).catch(error => {
-        uni.showToast({
-          title: error,
-          icon: "none"
-        })
-      })
-      break;
-    }
-    case PLATFORM_NAME.DC: {
-      getDcProductList({
-        page: state.currentPage,
-        limit: 10,
-        classify: '',
-        keyword: ''
-      }).then(res => {
-        list.value = res
-        state.triggered = false
-
-      })
-      break;
-    }
-    case PLATFORM_NAME.DY: {
-      getDyLiveList({
-        page: state.currentPage,
-        limit: 4,
-        // keyword: ''
-      }).then(res => {
-        // console.log(res)
-        // console.log(res.authorPic)
-      })
-      getDyLiveList({page: 1,limit: 4})
-          .then(res => {
-            // console.log(res)
-            if (res) {
-              dyLiveList.value = res
-            }
-          })
-      getDyProductList({
-        page: state.currentPage,
-        limit: 10,
-      }).then(res => {
-        list.value = res
-        state.triggered = false
-
-      })
-      break;
-    }
-    case PLATFORM_NAME.PDD: {
-      getPddProductList({
-        page: state.currentPage,
-        limit: 10
-      }).then(res => {
-        list.value = res
-      })
-      break;
-    }
-    case PLATFORM_NAME.SU: {
-      getSuProductList({
-        page: state.currentPage,
-        limit: 10
-      }).then(res => {
-        list.value = res
-        console.log(res)
-        state.triggered = false
-
-
-      })
-      break;
-    }
-    case PLATFORM_NAME.TB: {
-      getTaobaoProductList({
-        pageNum: `${state.currentPage}`,
-        pageSize: '10'
-      }).then(res => {
-        list.value = res.thirdPartyWaresList
-      })
-      break;
-    }
-    case PLATFORM_NAME.VIP: {
-      getVipProductList({
-        page: state.currentPage,
-        limit: 10
-      }).then(res => {
-        list.value = res
-        state.triggered = false
-
-
-      })
-      break;
-    }
-    // default: {
-    //   getJdProductList({
-    //     page: 1,
-    //     limit: 10
-    //   }).then(res => {
-    //     list.value = res
-    //   })
-    // }
-  }
-
-
-}
-
-function handleCategoryItemClick(item: TabItem) {
-  state.currentTab = item.id
-  loadProductList(item.id)
-}
-
-function handleProductItemClick(
-    item:
-        JdProductModel
-        & DcProductModel
-        & DyProductModel
-        & SuNingProductModel
-        & TaobaoProductThirdPartyWaresModel
-        & VipProductModel
-) {
-
-
-  function navigateToDetail(params) {
-    let otherDetailUrl = `/pages/store/product/other`
-    return uni.navigateTo({
-      url: `${otherDetailUrl}?params=${params}`
-    })
-  }
-  // 大仓
-  if (state.currentTab === PLATFORM_NAME.DC && item.type === '5') {
-    uni.navigateTo({
-      url: `/pages/store/product/detail?id=${item.product_id}`
-    })
-  }
-  // 京东
-  if (item.type === 6) {
-    // productParams.id = item.skuId
-    const productParams: Partial<IProductDetail> = {
-      platform: item.type,
-      id: item.skuId,
-      title: item.name,
-      featured: [item.thumb],
-      allowance: item.commission,
-      salePrice: item.lowestCouponPrice,
-      price: item.price,
-      coupon: {
-        amount: item.coupon_money[0].discount,
-        startTime: item.coupon_money[0].getStartTime,
-        endTime: item.coupon_money[0].getEndTime
-      },
-      spreadUrl: item.coupon_link
-    }
-    return navigateToDetail(encodeBase64(productParams))
-  }
-  // 淘宝
-  if (item.type === 5) {
-    const productParams: Partial<IProductDetail> = {
-      platform: item.type,
-      id: item.id,
-      title: item.name,
-      featured: [item.thumb],
-      allowance: item.commission,
-      salePrice: item.price,
-      // 原价
-      price: item.market_price,
-      coupon: {
-        amount: item.coupon_money
-        // amount: item.coupon_money[0].discount,
-        // startTime: item.coupon_money[0].getStartTime,
-        // endTime: item.coupon_money[0].getEndTime
-      },
-      spreadUrl: item.coupon_share_url
-    }
-
-    return navigateToDetail(encodeBase64(productParams))
-    // uni.navigateTo({
-    //   url: `/pages/store/product/other?platform=${item.type}&id=${item.id}`
-    // })
-  }
-
-  // 拼多多
-  if (item.type === 1) {
-    const productParams: Partial<IProductDetail> = {
-      platform: item.type,
-      id: item.id,
-      title: item.name,
-      featured: [item.thumb],
-      allowance: item.commission,
-      salePrice: item.price,
-      // 原价
-      price: item.market_price,
-      coupon: {
-        amount: item.coupon_money
-        // amount: item.coupon_money[0].discount,
-        // startTime: item.coupon_money[0].getStartTime,
-        // endTime: item.coupon_money[0].getEndTime
-      },
-      // spreadUrl: item.coupon_share_url
-    }
-    return navigateToDetail(encodeBase64(productParams))
-    // uni.navigateTo({
-    //   url: `/pages/store/product/other?platform=${item.type}&id=${item.id}&allowance=${item.commission}`
-    // })
-  }
-  // 唯品会
-  if (item.type === 2) {
-    const productParams: Partial<IProductDetail> = {
-      platform: item.type,
-      id: item.id,
-      title: item.name,
-      featured: [item.thumb],
-      allowance: item.commission,
-      salePrice: item.price,
-      // 原价
-      price: item.market_price,
-      // coupon: {
-        // amount: item.coupon_money
-      // },
-    }
-    return navigateToDetail(encodeBase64(productParams))
-  }
-
-  // 苏宁
-  if (item.type === 3) {
-    const productParams: Partial<IProductDetail> = {
-      platform: item.type,
-      id: item.id,
-      title: item.name,
-      featured: [item.thumb],
-      allowance: item.commission,
-      salePrice: item.price,
-      // 原价
-      price: item.market_price,
-      // coupon: {
-      //   amount: item.coupon_money
-      // },
-    }
-    return navigateToDetail(encodeBase64(productParams))
-  //
-  }
-
-  // 抖音 9
-  if (item.type === 9) {
-    console.log(item)
-    const productParams: Partial<IProductDetail> = {
-      platform: item.type,
-      id: item.id,
-      title: item.name,
-      featured: [item.thumb],
-      allowance: item.commission,
-      salePrice: item.price,
-      // 原价
-      price: item.market_price,
-      // coupon: {
-      //   amount: item.coupon_money
-      // },
-    }
-    return navigateToDetail(encodeBase64(productParams))
-  }
-}
-
-function handleLiveRecommendTitleClick() {
-  uni.navigateTo({
-    url: `/pages/store/product/dy-live`
-  })
-}
-
-// 下拉刷新被下拉
-const onRefresherPulling = e => {
-  state.triggered = true;
-};
-// 下拉刷新被复位
-const onRefresherRestore = e => {
-  state.triggered = false;
-};
-// 下拉刷新被中止
-const onRefresherAbort = e => {
-  state.triggered = false;
-}
-
-const onRefresherRefresh = e => {
-  loadProductList('reload')
-};
-
-function handleScrollToLower() {
-  state.status = 'loading';
-  state.currentPage += 1;
-  // if (state.currentPage > state.totalPage) {
-  //   state.status = 'noMore';
-  // } else {
-  //   // queryFavorites('page');
-  //   // loadSelectMerchant('page')
-  //   loadProductList(state.currentTab)
-  //
-  // }
-}
-</script>
-<template>
-
-    <div class="flex flex-col overflow-hidden fixed  h-fit z-1 bg-white">
-      <nut-searchbar
-          v-model="searchValue" @search="searchProduct" @clear="loadProductList('reload')">
-        <template v-slot:rightout>
-          <div @tap="searchProduct">
-            搜索
-          </div>
-        </template>
-      </nut-searchbar>
-      <div class="py-3">
-        <scroll-view
-            class="flex flex-row w-full gap-2 overflow-x whitespace-nowrap w-screen"
-            :scroll-with-animation="true"
-            :scroll-x="true"
-        >
-          <div
-              @tap="handleCategoryItemClick(item)"
-              v-for="(item, index) in tabList"
-              :key="index"
-              class="flex inline-flex pl-4 items-center justify-center relative "
-          >
-            <div class="flex flex-col justify-center items-center text-xs gap-2">
-              <image :src="item.id === state.currentTab ? item.selectedIconPath : item.iconPath" mode="widthFix"
-                     class="w-9 h-9"></image>
-              <div>{{ item.text }}</div>
-            </div>
-
-          </div>
-        </scroll-view>
-      </div>
-    </div>
-    <div class="pt-36 ">
-      <scroll-view
-          :scroll-y="true"
-          :style="{ height: `${state.scrollHeight}px` }"
-          scroll-with-animation
-          :refresher-enabled="true"
-          refresher-background="#f5f5f5"
-          refresher-default-style="black"
-          :refresher-triggered="state.triggered"
-          @scrolltolower="handleScrollToLower"
-          @refresherPulling="onRefresherPulling"
-          @refresherRestore="onRefresherRestore"
-          @refresherAbort="onRefresherAbort"
-          @refresherrefresh="onRefresherRefresh"
-
-      >
-      <div
-          v-if="state.currentTab === PLATFORM_NAME.DY"
-      >
-
-      <div
-          class="pb-4"
-      >
-        <CXBDyLiveRecommend :list="dyLiveList" v-if="dyLiveList" @title-click="handleLiveRecommendTitleClick"/>
-      </div>
-      <div class="flex justify-center items-center w-full pb-3">
-        <div class="flex justify-center items-center gap-2">
-          <image :src="dyLeftImage" mode="widthFix" class="w-12 h-2"></image>
-          <div class="font-bold">抖音好物</div>
-          <image :src="dyRightImage" mode="widthFix" class="w-12 h-2"></image>
-        </div>
-      </div>
-      </div>
-
-      <div class="px-3">
-        <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"
-               @tap="handleProductItemClick(item)"
-          >
-            <div class="bg-white rounded-lg text-dark">
-              <image :src="item.image"
-                     v-if="state.currentTab === PLATFORM_NAME.DC"
-                     mode="widthFix" :fade-in="true"
-                     class="rounded-t-lg  !w-full aspect-square" />
-              <image
-                  v-else
-                  :src="item.thumb"
-                  mode="widthFix" :fade-in="true"
-                  class="rounded-t-lg  !w-full aspect-square" />
-              <div class="text-sm p-2 flex flex-col gap-1">
-                <div class="line-clamp-2">
-                  <div v-if="state.currentTab === PLATFORM_NAME.DC">
-                    {{ item.store_name }}
-                  </div>
-                  <div v-else>
-                    {{ item.name }}
-                  </div>
-                </div>
-                <div
-                    class="border border-solid border-1 border-red rounded flex text-auto items-center text-[#FE0032] w-fit">
-                  <image src="https://cdn.bjtdba.com/vod/image/2023-09-15/20230915160858609.png"
-                         mode="widthFix" class="!w-8.5"></image>
-                  <div class="px-2 flex items-center jusitify-center text-xs">
-                    <div>
-                      养老金 ¥{{ item.commission }}
-                    </div>
-                  </div>
-                </div>
-                <div class="flex flex-col justify-center gap-2">
-                  <div v-if="state.currentTab === PLATFORM_NAME.JD">
-                    <FPrice :price="item.lowestCouponPrice" ex-class="text-[20px]" need-symbol/>
-                    <FPrice :price="item.price" ex-class="text-gray text-xs" need-symbol strike-through/>
-                  </div>
-                  <div v-if="state.currentTab === PLATFORM_NAME.TB">
-                    <FPrice :price="item.price" ex-class="text-[20px]" need-symbol/>
-                    <FPrice :price="item.market_price" ex-class="text-gray text-xs" need-symbol strike-through/>
-                  </div>
-
-                  <div v-if="state.currentTab === PLATFORM_NAME.PDD">
-                    <FPrice :price="item.market_price" ex-class="text-[20px]" need-symbol/>
-                    <FPrice :price="item.price" ex-class="text-gray text-xs" need-symbol strike-through/>
-                  </div>
-
-                  <div v-if="state.currentTab === PLATFORM_NAME.DC">
-
-                    <div class="flex flex-row gap-2">
-                      <FPrice :price="item.price" ex-class="text-[20px]" need-symbol/>
-                      <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>
-
-                    <FPrice :price="item.ot_price" ex-class="text-gray text-xs" need-symbol strike-through/>
-
-
-                  </div>
-
-                  <div v-if="state.currentTab === PLATFORM_NAME.DY">
-                    <FPrice :price="item.price" ex-class="text-[20px]" need-symbol/>
-                  </div>
-
-                  <div v-if="state.currentTab === PLATFORM_NAME.VIP">
-                    <FPrice :price="item.price" ex-class="text-[20px]" need-symbol/>
-                    <FPrice :price="item.market_price" ex-class="text-gray text-xs" need-symbol strike-through/>
-                  </div>
-
-                  <div v-if="state.currentTab === PLATFORM_NAME.SU">
-                    <FPrice :price="item.price" ex-class="text-[20px]" need-symbol/>
-                    <FPrice :price="item.market_price" ex-class="text-gray text-xs" need-symbol strike-through/>
-                  </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>
-
-            </div>
-          </div>
-        </grid-view>
-
-      </div>
-
-      </scroll-view>
-    </div>
-
-</template>
-
-<route lang="yaml">
-style:
-  navigationBarTitleText: 搜索
-  disableScroll: true
-</route>
-
-<style lang="scss">
-page {
-  //overflow: hidden;
-  //position: fixed;
-  background: #f8f8f8;
-}
-</style>

src/pages/search/index.vue

@@ -1,859 +0,0 @@
-<script setup lang="ts">
-import {
-  getDyLiveList,
-  getDyProductList,
-  getJdProductList,
-  getPddProductList,
-  getSuProductList,
-  getTaobaoProductList,
-  getVipProductList,
-  searchDyProduct,
-  searchJdProduct,
-  searchPddProduct,
-  searchSuProduct,
-  searchVipProduct
-} from "~/apis/product";
-import type {
-  DyProductModel,
-  IProductDetail,
-  JdProductModel,
-  SuNingProductModel,
-  TaobaoProductThirdPartyWaresModel,
-  VipProductModel
-} from "~/apis/model/product.model";
-import {getDcProductList} from "~/apis/dacang";
-import type {DcProductModel} from "~/apis/model/dacang.model";
-import FPrice from "~/components/FPrice/FPrice.vue";
-import {encodeBase64} from "~/utils/http/helper";
-import CXBDyLiveRecommend from "~/components/CXBDyLive/CXBDyLiveRecommend.vue";
-import {PLATFORM_NAME} from "~/apis/model/common.model";
-import {CDN_URL} from "~/config/app";
-import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
-
-const dyLeftImage = CDN_URL + '/static/assets/dy_zuo_230321.png'
-const dyRightImage = CDN_URL + '/static/assets/dy_you_230321.png'
-
-interface TabItem {
-  id: PLATFORM_NAME,
-  text: string,
-  iconPath: string,
-  selectedIconPath: string
-}
-
-const tabList = <Array<TabItem>>[{
-  id: PLATFORM_NAME.JD,
-  text: '京东',
-  iconPath: CDN_URL + '/static/assets/jingdong_x.png',
-  selectedIconPath: CDN_URL + '/static/assets/jingdong_d.png',
-}, {
-  id: PLATFORM_NAME.TB,
-  text: '淘宝',
-  iconPath: CDN_URL + '/static/assets/taobaoyanglao_x.png',
-  selectedIconPath: CDN_URL + '/static/assets/taobaoyanglao_d.png',
-}, {
-  id: PLATFORM_NAME.PDD,
-  text: '拼多多',
-  iconPath: CDN_URL + '/static/assets/pinduoduo_x.png',
-  selectedIconPath: CDN_URL + '/static/assets/pinduoduo_d.png',
-}, {
-  id: PLATFORM_NAME.DC,
-  text: '大仓',
-  iconPath: CDN_URL + '/static/assets/dacang_x_220914.png',
-  selectedIconPath: CDN_URL + '/static/assets/dacang_d_220914.png',
-}, {
-  id: PLATFORM_NAME.DY,
-  text: '抖音',
-  iconPath: CDN_URL + '/static/assets/douyin_x_230313.png',
-  selectedIconPath: CDN_URL + '/static/assets/douyin_d_230313.png',
-}, {
-  id: PLATFORM_NAME.VIP,
-  text: '唯品会',
-  iconPath: CDN_URL + '/static/assets/weipinhui_x.png',
-  selectedIconPath: CDN_URL + '/static/assets/weipinhui_d.png',
-}, {
-  id: PLATFORM_NAME.SU,
-  text: '苏宁',
-  iconPath: CDN_URL + '/static/assets/suningyigou_x.png',
-  selectedIconPath: CDN_URL + '/static/assets/suningyigou_d.png',
-}]
-const state = reactive({
-  currentTab: PLATFORM_NAME.JD,
-  // 列表高度
-  scrollHeight: 0,
-  triggered: false,
-  status: 'none',
-  currentPage: 1,
-  totalPage: 1
-})
-const { windowHeight } = uni.getSystemInfoSync()
-state.scrollHeight = windowHeight - 195
-const searchValue = ref('')
-
-onLoad((options) => {
-  const platform = options.platform
-  if (platform) {
-    state.currentTab = platform
-  }
-  loadProductList('reload')
-
-})
-
-// onShow(() => {
-//
-// })
-const list = ref<Array<
-    JdProductModel
-    | DcProductModel
-    | DyProductModel
-    | SuNingProductModel
-    | TaobaoProductThirdPartyWaresModel
-    | VipProductModel
-    | any
->>()
-
-const dyLiveList = ref<Array<DyProductModel>>()
-
-function searchProduct() {
-  switch (state.currentTab) {
-    case PLATFORM_NAME.JD: {
-      searchJdProduct({keyword: searchValue.value, page: 1, limit: 20}).then(res => {
-        list.value = res
-      })
-      break;
-    }
-    case PLATFORM_NAME.DC: {
-      getDcProductList({
-        page: 1,
-        limit: 10,
-        classify: '',
-        keyword: searchValue.value
-      }).then(res => {
-        list.value = res
-      })
-      break;
-    }
-    case PLATFORM_NAME.DY: {
-      searchDyProduct({keyword: searchValue.value, page: 1, limit: 10}).then(res => {
-        list.value = res
-      })
-      break;
-    }
-    case PLATFORM_NAME.PDD: {
-      searchPddProduct({ keyword: searchValue.value, page: 1, limit: 10}).then(res => {
-		  
-		  
-		  console.log('11111111111')
-		  console.log(res)
-		  
-		  let pddData
-		  
-		  if (res.message.length > 20) {
-			  pddData = JSON.parse(res.message)
-		  }
-		  console.log('11111111112')
-		  
-		  console.log(pddData)
-		  
-		  if(pddData) {
-			  console.log('122222222')
-			modalVisible.value = true
-			pddPath.value = pddData.we_app_info.page_path
-			return
-		  }else {
-			  
-			  console.log('1222223333')
-			  console.log(res.data)
-			list.value = res.data
-		  }
-		  
-        if(res.data.we_app_info){
-          const pddWx = res.data.we_app_info
-          console.log(pddWx)
-          if (pddWx) {
-            uni.navigateToMiniProgram({
-              appId: pddWx.app_id,
-              path: pddWx.page_path,
-              envVersion: 'release',
-              success(res) {
-                // 打开成功
-              },
-              fail: (error) => {
-                console.log(error);
-              }
-            })
-          } else {
-            uni.showToast({
-              title: '跳转失败请重试',
-              icon: 'none'
-            })
-          }
-        }else{
-          list.value = res.data
-        }
-
-      })
-      break;
-    }
-    case PLATFORM_NAME.SU: {
-      searchSuProduct({ keyword: searchValue.value, page: 1, limit: 10}).then(res => {
-        list.value = res
-      })
-      break;
-    }
-    case PLATFORM_NAME.TB: {
-      getTaobaoProductList({
-        pageNum: `1`,
-        pageSize: '10',
-        title: searchValue.value
-      }).then(res => {
-        list.value = res.thirdPartyWaresList
-      })
-      break;
-    }
-    case PLATFORM_NAME.VIP: {
-      searchVipProduct({ keyword: searchValue.value, page: 1, limit: 10}).then(res => {
-        list.value = res
-      })
-      break;
-    }
-  }
-}
-function loadProductList(action: 'page' | 'reload', callback?: (items) => void) {
-  if (action == 'reload') {
-    state.currentPage = 1
-  }
-  switch (state.currentTab) {
-    case PLATFORM_NAME.JD: {
-      getJdProductList({
-        page: state.currentPage,
-        limit: 10
-      }).then(res => {
-        state.triggered = false
-
-        // list.value = res
-        if (action === 'page') {
-          list.value = list.value.concat(res)
-        }
-        if (action === 'reload') {
-          list.value = res
-        }
-        uni.hideLoading()
-
-        if (callback) {
-          callback(res)
-        }
-        // state.totalPage = Math.ceil()
-        // res[0].
-        // console.log(res)
-      }).catch(error => {
-        uni.showToast({
-          title: error,
-          icon: "none"
-        })
-      })
-      break;
-    }
-    case PLATFORM_NAME.DC: {
-      getDcProductList({
-        page: state.currentPage,
-        limit: 10,
-        classify: '',
-        keyword: ''
-      }).then(res => {
-        // list.value = res
-        state.triggered = false
-        if (action === 'page') {
-          list.value = list.value.concat(res)
-        }
-        if (action === 'reload') {
-          list.value = res
-        }
-        uni.hideLoading()
-
-        if (callback) {
-          callback(res)
-        }
-      })
-      break;
-    }
-    case PLATFORM_NAME.DY: {
-      // getDyLiveList({
-      //   page: state.currentPage,
-      //   limit: 4,
-      //   // keyword: ''
-      // }).then(res => {
-      //   // console.log(res)
-      //   // console.log(res.authorPic)
-      // })
-      getDyLiveList({page: 1,limit: 4})
-          .then(res => {
-            // console.log(res)
-            if (res) {
-              dyLiveList.value = res
-
-            }
-          })
-      getDyProductList({
-        page: state.currentPage,
-        limit: 10,
-      }).then(res => {
-        // list.value = res
-        state.triggered = false
-        if (action === 'page') {
-          list.value = list.value.concat(res)
-        }
-        if (action === 'reload') {
-          list.value = res
-        }
-        uni.hideLoading()
-
-        if (callback) {
-          callback(res)
-        }
-      })
-      break;
-    }
-    case PLATFORM_NAME.PDD: {
-
-      getPddProductList({
-        page: state.currentPage,
-        limit: 10
-      }).then(res => {
-        // list.value = res
-        if (action === 'page') {
-          list.value = list.value.concat(res)
-        }
-        if (action === 'reload') {
-          list.value = res
-        }
-        uni.hideLoading()
-
-        if (callback) {
-          callback(res)
-        }
-      })
-      break;
-    }
-    case PLATFORM_NAME.SU: {
-      getSuProductList({
-        page: state.currentPage,
-        limit: 10
-      }).then(res => {
-        // list.value = res
-        // console.log(res)
-        // state.triggered = false
-        if (action === 'page') {
-          list.value = list.value.concat(res)
-        }
-        if (action === 'reload') {
-          list.value = res
-        }
-        uni.hideLoading()
-
-        if (callback) {
-          callback(res)
-        }
-
-      })
-      break;
-    }
-    case PLATFORM_NAME.TB: {
-      getTaobaoProductList({
-        pageNum: `${state.currentPage}`,
-        pageSize: '10'
-      }).then(res => {
-        // list.value = res.thirdPartyWaresList
-        if (action === 'page') {
-          list.value = list.value.concat(res.thirdPartyWaresList)
-        }
-        if (action === 'reload') {
-          list.value = res.thirdPartyWaresList
-        }
-        uni.hideLoading()
-
-        if (callback) {
-          callback(res.thirdPartyWaresList)
-        }
-      })
-      break;
-    }
-    case PLATFORM_NAME.VIP: {
-      getVipProductList({
-        page: state.currentPage,
-        limit: 10
-      }).then(res => {
-        // list.value = res
-        // state.triggered = false
-        if (action === 'page') {
-          list.value = list.value.concat(res)
-        }
-        if (action === 'reload') {
-          list.value = res
-        }
-        uni.hideLoading()
-
-        if (callback) {
-          callback(res)
-        }
-
-      })
-      break;
-    }
-    // default: {
-    //   getJdProductList({
-    //     page: 1,
-    //     limit: 10
-    //   }).then(res => {
-    //     list.value = res
-    //   })
-    // }
-  }
-
-
-}
-
-function handleCategoryItemClick(item: TabItem) {
-  list.value = []
-  state.currentTab = item.id
-  // loadProductList(item.id)
-  uni.showLoading({
-    title: '数据加载中',
-    icon: 'none'
-  })
-  loadProductList('reload')
-}
-
-function handleProductItemClick(
-    item:
-        JdProductModel
-        & DcProductModel
-        & DyProductModel
-        & SuNingProductModel
-        & TaobaoProductThirdPartyWaresModel
-        & VipProductModel
-) {
-console.log(5);
-console.log("5");
-
-console.log(item.type);
-console.log(state.currentTab);
-
-  function navigateToDetail(params) {
-    let otherDetailUrl = `/pages/store/product/other`
-    return uni.navigateTo({
-      url: `${otherDetailUrl}?params=${params}`
-    })
-  }
-  
-  let itemType = 0
-  if (typeof item.type === 'string') {
-	  itemType = parseInt(item.type)
-  } else {
-	  itemType = item.type
-  }
-  
-  // 大仓
-  if (state.currentTab === PLATFORM_NAME.DC && itemType === 5) {
-	  
-	  console.log('进来了', state.currentTab);
-	  
-    uni.navigateTo({
-      url: `/pages/store/product/detail?id=${item.product_id}`
-    })
-  }
-  
-  // 京东
-  if (item.type === 6) {
-    // productParams.id = item.skuId
-    const productParams: Partial<IProductDetail> = {
-      platform: item.type,
-      id: item.skuId,
-      title: item.name,
-      featured: [item.thumb],
-      allowance: item.commission,
-      salePrice: item.lowestCouponPrice,
-      price: item.price,
-      coupon: {
-        amount: item.coupon_money[0].discount,
-        startTime: item.coupon_money[0].getStartTime,
-        endTime: item.coupon_money[0].getEndTime
-      },
-      spreadUrl: item.coupon_link
-    }
-    return navigateToDetail(encodeBase64(productParams))
-  }
-  // 淘宝PLATFORM_NAME.TB
-  if ( state.currentTab === PLATFORM_NAME.TB && item.type === 5) {
-    const productParams: Partial<IProductDetail> = {
-      platform: item.type,
-      id: item.id,
-      title: item.name,
-      featured: [item.thumb],
-      allowance: item.commission,
-      salePrice: item.price,
-      // 原价
-      price: item.market_price,
-      coupon: {
-        amount: item.coupon_money
-        // amount: item.coupon_money[0].discount,
-        // startTime: item.coupon_money[0].getStartTime,
-        // endTime: item.coupon_money[0].getEndTime
-      },
-      spreadUrl: item.coupon_share_url
-    }
-
-    return navigateToDetail(encodeBase64(productParams))
-    // uni.navigateTo({
-    //   url: `/pages/store/product/other?platform=${item.type}&id=${item.id}`
-    // })
-  }
-
-  // 拼多多
-  if (item.type == 1) {
-    const productParams: Partial<IProductDetail> = {
-      platform: item.type,
-      id: item.id,
-      title: item.name,
-      featured: [item.thumb],
-      allowance: item.commission,
-      salePrice: item.market_price,
-      // 原价
-      price: item.price,
-      coupon: {
-        amount: item.coupon_money
-        // amount: item.coupon_money[0].discount,
-        // startTime: item.coupon_money[0].getStartTime,
-        // endTime: item.coupon_money[0].getEndTime
-      },
-      // spreadUrl: item.coupon_share_url
-    }
-    return navigateToDetail(encodeBase64(productParams))
-    // uni.navigateTo({
-    //   url: `/pages/store/product/other?platform=${item.type}&id=${item.id}&allowance=${item.commission}`
-    // })
-  }
-  // 唯品会
-  if (item.type === 2) {
-    const productParams: Partial<IProductDetail> = {
-      platform: item.type,
-      id: item.id,
-      title: item.name,
-      featured: [item.thumb],
-      allowance: item.commission,
-      salePrice: item.price,
-      // 原价
-      price: item.market_price,
-      // coupon: {
-        // amount: item.coupon_money
-      // },
-    }
-    return navigateToDetail(encodeBase64(productParams))
-  }
-
-  // 苏宁
-  if (item.type === 3) {
-    const productParams: Partial<IProductDetail> = {
-      platform: item.type,
-      id: item.id,
-      title: item.name,
-      featured: [item.thumb],
-      allowance: item.commission,
-      salePrice: item.price,
-      // 原价
-      price: item.market_price,
-      // coupon: {
-      //   amount: item.coupon_money
-      // },
-    }
-    return navigateToDetail(encodeBase64(productParams))
-  //
-  }
-
-  // 抖音 9
-  if (item.type === 9) {
-    console.log(item)
-    const productParams: Partial<IProductDetail> = {
-      platform: item.type,
-      id: item.id,
-      title: item.name,
-      featured: [item.thumb],
-      allowance: item.commission,
-      salePrice: item.price,
-      // 原价
-      price: item.price,
-      // coupon: {
-      //   amount: item.coupon_money
-      // },
-    }
-    return navigateToDetail(encodeBase64(productParams))
-  }
-}
-
-function handleLiveRecommendTitleClick() {
-  uni.navigateTo({
-    url: `/pages/store/product/dy-live`
-  })
-}
-
-// 下拉刷新被下拉
-const onRefresherPulling = e => {
-  state.triggered = true;
-};
-// 下拉刷新被复位
-const onRefresherRestore = e => {
-  state.triggered = false;
-};
-// 下拉刷新被中止
-const onRefresherAbort = e => {
-  state.triggered = false;
-}
-
-const onRefresherRefresh = e => {
-  loadProductList('reload')
-};
-onPullDownRefresh(() => {
-  uni.showLoading({
-    title: '数据加载中',
-    icon: 'none'
-  })
-  loadProductList('reload', items => {
-    setTimeout(() => {
-      uni.stopPullDownRefresh()
-      uni.hideLoading()
-    }, 300)
-  })
-})
-function handleScrollToLower() {
-  uni.showLoading({
-    title: '数据加载中',
-    icon: 'none'
-  })
-
-  state.status = 'loading';
-  state.currentPage += 1;
-
-  setTimeout(() => {
-    loadProductList('page', (items) => {
-      uni.hideLoading()
-      // uni.hideLoading()
-      if (!items.length > 0) {
-        console.log('没有更多了')
-        state.status = 'noMore'
-        state.currentPage -= 1;
-      }
-    })
-  }, 300)
-
-}
-
-onReachBottom(() => {
-  handleScrollToLower()
-})
-
-const modalVisible = ref(false)
-const pddPath = ref('')
-
-function onCancel() {
-  modalVisible.value = false
-}
-
-function onOk() {
-	uni.navigateToMiniProgram({
-	  appId: 'wxa918198f16869201',
-	  path: pddPath.value,
-	  envVersion: 'release',
-	  success(res) {
-	    // 打开成功
-	    // console.log(res);
-	  },
-	  fail: (error) => {
-	    console.log(error);
-	  }
-	})
-}
-
-
-</script>
-<template>
-
-    <div class="flex flex-col  fixed  top-0 left-0  h-fit z-1 bg-white">
-      <nut-searchbar
-          v-model="searchValue" @search="searchProduct" @clear="loadProductList('reload')">
-        <template v-slot:rightout>
-          <div @tap="searchProduct">
-            搜索
-          </div>
-        </template>
-      </nut-searchbar>
-      <div class="py-3">
-        <scroll-view
-            class="flex flex-row w-full gap-2 overflow-x whitespace-nowrap w-screen"
-            :scroll-with-animation="true"
-            :scroll-x="true"
-        >
-          <div
-              @tap="handleCategoryItemClick(item)"
-              v-for="(item, index) in tabList"
-              :key="index"
-              class="flex inline-flex pl-4 items-center justify-center relative "
-          >
-            <div class="flex flex-col justify-center items-center text-xs gap-2">
-              <image :src="item.id === state.currentTab ? item.selectedIconPath : item.iconPath" mode="widthFix"
-                     class="w-9 h-9"></image>
-              <div>{{ item.text }}</div>
-            </div>
-
-          </div>
-        </scroll-view>
-      </div>
-    </div>
-    <div class="pt-36 pb-safe " v-if="list && list.length > 0">
-
-      <div
-          v-if="state.currentTab === PLATFORM_NAME.DY"
-      >
-
-      <div
-          class="pb-4"
-      >
-        <CXBDyLiveRecommend :list="dyLiveList" v-if="dyLiveList" @title-click="handleLiveRecommendTitleClick"/>
-      </div>
-      <div class="flex justify-center items-center w-full pb-3">
-        <div class="flex justify-center items-center gap-2">
-          <image :src="dyLeftImage" mode="widthFix" class="w-12 h-2"></image>
-          <div class="font-bold">抖音好物</div>
-          <image :src="dyRightImage" mode="widthFix" class="w-12 h-2"></image>
-        </div>
-      </div>
-      </div>
-
-      <div class="px-3" >
-        <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="handleProductItemClick(item)"
-          >
-            <div class="bg-white rounded-lg text-dark">
-              <image :src="item.image"
-                     v-if="state.currentTab === PLATFORM_NAME.DC"
-                     mode="widthFix" :fade-in="true"
-                     class="rounded-t-lg  !w-full aspect-square" />
-              <image
-                  v-else
-                  :src="item.thumb"
-                  mode="widthFix" :fade-in="true"
-                  class="rounded-t-lg  !w-full aspect-square" />
-              <div class="text-sm p-2 flex flex-col gap-1">
-                <div class="line-clamp-2">
-                  <div v-if="state.currentTab === PLATFORM_NAME.DC">
-                    {{ item.store_name }}
-                  </div>
-                  <div v-else>
-                    {{ item.name }}
-                  </div>
-                </div>
-                <div
-                    class="border border-solid border-1 border-red rounded flex text-auto items-center text-[#FE0032] w-fit">
-                  <image src="https://cdn.bjtdba.com/vod/image/2023-09-15/20230915160858609.png"
-                         mode="widthFix" class="!w-8.5"></image>
-                  <div class="px-2 flex items-center jusitify-center text-xs">
-                    <div>
-                      养老金 ¥{{ state.currentTab === PLATFORM_NAME.DC ? item.yanglao : item.commission }}
-                    </div>
-                  </div>
-                </div>
-                <div class="flex flex-col justify-center gap-2">
-                  <div v-if="state.currentTab === PLATFORM_NAME.JD">
-                    <FPrice :price="item.lowestCouponPrice" ex-class="text-[20px]" need-symbol/>
-                    <FPrice :price="item.price" ex-class="text-gray text-xs" need-symbol strike-through/>
-                  </div>
-                  <div v-if="state.currentTab === PLATFORM_NAME.TB">
-                    <FPrice :price="item.price" ex-class="text-[20px]" need-symbol/>
-                    <FPrice :price="item.market_price" ex-class="text-gray text-xs" need-symbol strike-through/>
-                  </div>
-
-                  <div v-if="state.currentTab === PLATFORM_NAME.PDD">
-                    <FPrice :price="item.market_price" ex-class="text-[20px]" need-symbol/>
-                    <FPrice :price="item.price" ex-class="text-gray text-xs" need-symbol strike-through/>
-                  </div>
-
-                  <div v-if="state.currentTab === PLATFORM_NAME.DC">
-
-                    <div class="flex flex-row gap-2">
-                      <FPrice :price="item.price" ex-class="text-[20px]" need-symbol/>
-                      <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>
-
-                    <FPrice :price="item.ot_price" ex-class="text-gray text-xs" need-symbol strike-through/>
-
-
-                  </div>
-
-                  <div v-if="state.currentTab === PLATFORM_NAME.DY">
-                    <FPrice :price="item.price" ex-class="text-[20px]" need-symbol/>
-                  </div>
-
-                  <div v-if="state.currentTab === PLATFORM_NAME.VIP">
-                    <FPrice :price="item.price" ex-class="text-[20px]" need-symbol/>
-                    <FPrice :price="item.market_price" ex-class="text-gray text-xs" need-symbol strike-through/>
-                  </div>
-
-                  <div v-if="state.currentTab === PLATFORM_NAME.SU">
-                    <FPrice :price="item.price" ex-class="text-[20px]" need-symbol/>
-                    <FPrice :price="item.market_price" ex-class="text-gray text-xs" need-symbol strike-through/>
-                  </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>
-
-            </div>
-          </div>
-        </grid-view>
-        <div class=" flex justify-center items-center text-[12px] text-gray-500"
-             v-if="list && list.length > 0">
-          <div v-if="state.status === 'loading'">
-            加载中...
-          </div>
-          <div v-if="state.status === 'noMore'">
-            没有更多了～
-          </div>
-        </div>
-      </div>
-
-		
-		
-    </div>
-	
-	<div class="pt-36 flex flex-col justify-center items-center" v-else>
-		<CXBEmpty ></CXBEmpty>
-	</div>
-  
-	<nut-dialog
-		title="需要去拼多多授权"
-		v-model:visible="modalVisible"
-		@cancel="onCancel"
-		@ok="onOk"
-	/>
-  
-
-</template>
-
-<route lang="yaml">
-style:
-  navigationBarTitleText: 搜索
-  enablePullDownRefresh: true
-</route>
-
-<style lang="scss">
-page {
-  //overflow: hidden;
-  //position: fixed;
-  background: #f8f8f8;
-}
-</style>

src/pages/setting/index.vue

@@ -7,10 +7,10 @@ import {reLogin} from "~/apis/user";
 const modalVisible = ref(false)
 const list = [{
   title: '反馈回复',
-  url: '/pages/feedback/index'
+  url: '/subPages/pages/feedback/index'
 }, {
   title: '关于我们',
-  url: '/pages/user/about/index'
+  url: '/subPages/pages/user/about/index'
 }, {
   title: '版本更新',
   url: '/pages/version-update/index'

src/pages/store/home/components/MerchantProductList.vue

@@ -15,7 +15,7 @@ const props = defineProps({
 
 function handleItemClick (item) {
   uni.navigateTo({
-    url: `/pages/store/product/detail?id=${item.product_id}`
+    url: `/subPages/pages/store/product/detail?id=${item.product_id}`
   })
 }
 </script>

src/pages/store/nearby/index-bak.vue

@@ -128,7 +128,7 @@ function loadSelectMerchant(action: 'page' | 'reload', callback?: (items) => voi
 function handleShowMerchant(merchant) {
   console.log(merchant)
   uni.navigateTo({
-    url: '/pages/store/home/index?id=' + merchant.mer_id
+    url: '/subPages/pages/store/home/index?id=' + merchant.mer_id
   })
 }
 

src/pages/store/nearby/index.vue

@@ -6,7 +6,7 @@ import { USER_LATITUDE, USER_LONGITUDE } from '~/constants'
 import { getLocal, getProductShare } from '~/apis/common'
 import { useUserStore } from '~/stores/userStore'
 import Cache from '~/utils/cache'
-
+import { ICON_CDN_URL } from '~/config/app'
 const usePageStore = usePageStoreWidthOut()
 const userStore = useUserStore()
 
@@ -56,28 +56,19 @@ const { windowHeight } = uni.getSystemInfoSync()
 state.scrollHeight = windowHeight - 45
 
 onLoad(async (option) => {
-  console.log('11', uni.getSystemInfoSync())
-  console.log('12', state.scrollHeight)
-
   await getLocal()
   if (option && option.shareId)
     userStore.setShareId(option.shareId)
-
-  // getMerchantCategory()
   getSelectMerchantSort().then((res) => {
     state.merchantCategory = res.merchantCategory
-    // state.merchantCategory = state.merchantCategory.concat(res.merchantCategory)
   })
   loadAll()
   getProductShare().then((res) => {
     if (res)
       userStore.setShareId(res.share_id)
   }).catch((message) => {
-    // console.log(message)
   })
   userStore.setRedirectPage('/pages/store/nearby/index', 'tab')
-
-  // loadSelectMerchant('reload')
 })
 onShareAppMessage(() => {
   const shareId = Cache.get('SHARE_ID')
@@ -219,7 +210,7 @@ function loadSelectMerchant(action: 'page' | 'reload', callback?: (items) => voi
 function handleShowMerchant(merchant) {
   // console.log(merchant)
   uni.navigateTo({
-    url: `/pages/store/home/index?id=${merchant.mer_id}`,
+    url: `/subPages/pages/store/home/index?id=${merchant.mer_id}`,
   })
 }
 
@@ -336,7 +327,7 @@ function searchAction() {
       </div>
       <!-- 返回顶部 -->
       <div v-show="flag" class="back-top">
-        <img class="back-TopImg" src="../../static/icon/返回顶部@2x.png" alt="" @click="scrollToTop">
+        <img class="back-TopImg" :src="ICON_CDN_URL+'返回顶部@2x.png'" alt="" @click="scrollToTop">
       </div>
       <scroll-view
         v-if="state.merchantList && state.merchantList.length > 0" :scroll-y="true" :style="{ height: `${state.scrollHeight - 60}px` }"
@@ -349,7 +340,7 @@ function searchAction() {
         <div v-for="(item, index) in state.merchantList" :key="index" class="mb-3 " @click="handleShowMerchant(item)">
           <div class="flex">
             <div class="flex ">
-              <image :src="item.mer_avatar" mode="aspectFill" class="w-20 h-20 rounded-lg" />
+              <image :src="item.mer_avatar" mode="aspectFill" class="w-14 h-14 rounded-lg" />
             </div>
 
             <div class="flex flex-col justify-between px-2">

src/pages/vip/index.vue

@@ -1,15 +1,9 @@
 <template>
-  <!--  <CXBBasePage :show="true" title="">-->
 
   <div class="flex flex-col gap-3 ">
     <div style="height: 80rpx;">
       <div style="background-color: transparent  " class="overflow-hidden fixed top-0 w-full z-10">
         <nut-searchbar v-model="state.keyword" @search="searchkwd" @clear="clearSearch">
-          <!--      <template v-slot:leftout>-->
-          <!--        <div @tap="navBack">-->
-          <!--          <nut-icon name="left"></nut-icon>-->
-          <!--        </div>-->
-          <!--      </template>-->
           <template v-slot:rightout>
             <div @tap="searchkwd">
               搜索
@@ -20,8 +14,6 @@
     </div>
 
 
-    <!--      <image :src="homeBanner" mode="widthFix" class="h-10 w-full "></image>-->
-
     <div class="w-screen h-32">
       <CXBBackTop :Scroll_X="Scroll_X" :isCss="1" />
       <div class="px-3 h-32">
@@ -272,28 +264,12 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     })
 
   }
-  // getVipAreaList({
-  //   ...params
-  // }).then(res => {
-  //   console.log(res.count)
-  //   // console.log(res.list)
-  //   count.value = res.count
-  //   console.log(action);
-  //   if (action === 'page') {
-  //     list.value = list.value.concat(res.list)
-  //   }
-  //   if (action === 'reload') {
-  //     list.value = res.list
-  //   }
-  //   if (callback) {
-  //     callback(res)
-  //   }
-  // })
+ 
 }
 
 function handleItemClick(item) {
   uni.navigateTo({
-    url: `/pages/store/product/detail?id=${item.product_id}`
+    url: `/subPages/pages/store/product/detail?id=${item.product_id}`
   })
 }
 

src/pages/withdrawal-record/index.vue

@@ -1,76 +0,0 @@
-<script setup lang="ts">
-import {getWithdrawal} from "~/apis/user";
-import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
-import dayjs from "dayjs";
-import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
-const list = ref([])
-onLoad((option) => {
-  getWithdrawal({
-    type: 1
-  }).then(res => {
-    console.log('提现记录')
-    console.log(res)
-    list.value = res
-  })
-})
-</script>
-<template>
-  <CXBBasePage>
-    <!-- <div v-if="list.length > 0" class="flex flex-col gap-3  p-3">
-      <div v-for="(item, index) in list" :key="index" class="flex-1 text-xs f-hairline-bottom bg-white p-3">
-        <div class="flex justify-between">
-          <div>
-            <div>提现至{{ item.widthdrawal_type === '1' ? '微信' : '支付宝' }}</div>
-            <div class="text-gray text-[11px]">{{ dayjs(item.create_time).format('YYYY-MM-DD') }}</div>
-          </div>
-          <div>
-            <div>-{{ item.extract_price }}</div>
-            <div class="text-[11px]"
-                 :class="item.status === '0' ? 'text-primary' : 'text-gray'"
-            >{{ item.status === '-1' ? '已失败' : item.status === '0' ? '提现中' : item.status === '1'? '已到账' : ''}}</div>
-          </div>
-        </div>
-
-
-      </div>
-    </div> -->
-    <!-- 提现日期添加时分秒  -->
-    <div v-if="list.length > 0" class="flex flex-col gap-3  p-3">
-      <div v-for="(item, index) in list" :key="index" class="flex-1 text-xs f-hairline-bottom bg-white p-3">
-        <div class="flex justify-between">
-          <div>
-            <div>{{item.title}}</div>
-            <div class="text-gray text-[11px]">{{ dayjs(item.create_time).format('YYYY-MM-DD HH:mm:ss') }}</div>
-          </div>
-          <div>
-            <div>-{{ item.extract_price }}</div>
-            <div class="text-[11px]"
-                 :class="item.status === '0' ? 'text-primary' : 'text-gray'"
-            >{{ item.status === '-1' ? '已失败' : item.status === '0' ? '提现中' : item.status === '1'? '已到账' : ''}}</div>
-          </div>
-        </div>
-
-
-      </div>
-    </div>
-    <div v-else>
-      <CXBEmpty />
-    </div>
-  </CXBBasePage>
-</template>
-
-<style>
-page {
-  background: #f8f8f8;
-}
-.wx-radio-input {
-  height: 16px !important;
-  width: 16px !important;
-}
-</style>
-<route lang="yaml">
-style:
-  navigationBarTitleText: 提现记录
-  enablePullDownRefresh: false
-
-</route>

src/pages/zibuyangsheng/index.vue

@@ -1,11 +0,0 @@
-<script setup lang="ts">
-
-</script>
-<template>
-
-</template>
-
-<route lang="yaml">
-style:
-  navigationBarTitleText: 滋补保健
-</route>