feat:提交代码，完成商贸专区得接口对接

.env.development

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

src/apis/quickLink.ts

@@ -1,16 +1,35 @@
 import { defHttp } from '~/utils/http'
-import type {PageModel} from "~/apis/model/pageModel";
-import type {HomeProduct} from "~/apis/model/product.model";
+
 
 enum API {
-    GET_CATEGORY = 'api/store/merchant/category/lst/',
+    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'
 }
 /**
- * 店铺分类
+ * 头部分类
  */
-export function getCategoryList(id) {
+export function apiGetCategoryList() {
     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 apiGetProductList(id:any) {
+    return defHttp.get({
+        url: API.GET_PRODUCT_LIST+"&mer_id="+id
+    },{withToken:false,joinTime:false})
 }
 

src/pages/home/index.vue

@@ -316,8 +316,7 @@
 			uni.stopPullDownRefresh()
 			if (state.page === 1) {
 				state.productList = res
-			}
-			else {
+			}else {
 				setTimeout(() => {
 					state.productList.push(...res)
 				}, 300)
@@ -325,6 +324,7 @@
 			uni.hideLoading()
 		}).catch((error) => {
 			console.error(`${error}->getProduct`)
+			uni.hideLoading()
 		})
 	}
 	const homeBanner = `${CDN_URL}/static/assets/home-banner.png`

src/pages/quick-fuc/business.vue

@@ -3,8 +3,8 @@
 		<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)">
-						<text :class="currentIndex==index?'lab-title':'lab-default-title'">111</text>
+					<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>
@@ -15,19 +15,20 @@
 		</view>
 
 		<view class="fuc-content">
-			<view class="fuc-item" v-for="(item,index) in MU_TABLE_LIST">
+			<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-for="(item,index) in goodsList">
-			<view class="vip-content">
+		<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="" mode=""></image>
-					<text class="lab-title">会员专区</text>
+					<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>
 
@@ -39,24 +40,22 @@
 
 			<view class="goods-scoll-content">
 				<scroll-view scroll-x="true" class="goods-scoll-item">
-					<view class="goods-scoll-item-x" v-for="(item,index) in goodsList"
-						:key="'goods-scoll-item-x-'+index">
+					<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="" mode="aspectFill"></image>
-							<text class="goods-title">11</text>
+							<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">20</text>
-								<text class="goods-des">pv:0</text>
+								<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>
 
@@ -64,14 +63,47 @@
 	import {
 		MU_TABLE_LIST
 	} from "./constants.js"
-	import {  getCategoryList } from '~/apis/quickLink'
+	import {
+		apiGetCategoryList,
+		apiGetProductType,
+		apiGetProductList
+	} from '~/apis/quickLink'
+	import { getProductShare } from "~/apis/common";
 	const currentIndex = ref(0)
-	const tabList = ref([1, 1, 1, 1])
-	const goodsList = ref([1, 1, 1, 1, 1, 1])
+	const tabList = ref([])
+	const goodsList = ref([])
 
 
 	onLoad((option) => {
-		console.log("===onLoad");
+		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(() => {
@@ -82,15 +114,67 @@
 		uni.stopPullDownRefresh()
 	})
 
-
-	function onTabClick(position) {
+	function onTabClick(position, id) {
 		currentIndex.value = position
+		getProductType(id)
+	}
+
+	function goShopClick(id) {
+		uni.navigateTo({
+			url: `/pages/store/home/index?id=${id}`
+		})
 	}
-	function getategoryCList(){
-		getCategoryList().then((res)=>{
-			console.log("===res",res);
+
+	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(id) {
+		uni.showLoading({
+			title:'加载中...'
+		})
+		apiGetProductType(id).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>
@@ -219,7 +303,6 @@
 				.lab-icon {
 					width: 30rpx;
 					height: 30rpx;
-					background-color: #333;
 					margin-left: 10rpx;
 				}
 

src/pages/store/product/detail.vue

@@ -111,6 +111,7 @@ uni.showShareMenu({
 onLoad((option: any) => {
   // console.log("我是商品详情页");
   //二维码扫码传id/shareid
+  console.log("===option",option);
   if (option.scene) {
     let queryString = decodeURIComponent(option.scene)
     // 将字符串按 '&' 分割成数组

src/utils/http/helper.ts

@@ -11,7 +11,7 @@ export function joinTimestamp(join: boolean, restful = false): string | object {
 
     const now = new Date().getTime()
     if (restful)
-        return `?_t=${now}`
+        return `&_t=${now}`
 
     return { _t: now }
 }

src/utils/http/http.ts

@@ -33,9 +33,9 @@ export class VRequest {
             urlPrefix, apiUrl, joinPrefix, joinTime = true, withToken, joinParamsToUrl,
             isReturnNativeResponse, isTransformResponse,
         } = optionsTemp
-
         // token header
         const token = getToken()
+		console.log("===token",token);
         if (token && withToken !== false) {
             // jwt token
             Object.assign(configTemp.header, {
@@ -50,28 +50,31 @@ export class VRequest {
             configTemp.url = `${urlPrefix}${configTemp.url}`
 
         const params = configTemp.params || {}
-        if (params) {
-            if (configTemp.method?.toUpperCase() === RequestEnum.GET) {
-                // add timestamp avoid cache
-                if (!isString(params)) {
-                    configTemp.params = Object.assign(params || {}, joinTimestamp(joinTime, false))
-                    if (joinParamsToUrl && configTemp.params) {
-                        configTemp.url = setObjToUrlParams(
-                            configTemp.url,
-                            Object.assign({}, configTemp.params, configTemp.data))
-                        configTemp.params = undefined
-                    }
-                }
-                else {
-                    // compatible with restful style
-                    configTemp.url = `${config.url + params}${joinTimestamp(joinTime, true)}`
-                    configTemp.params = undefined
-                }
-            }
-        }
+		
+		console.log("===params",params);
+        // if (params) {
+        //     if (configTemp.method?.toUpperCase() === RequestEnum.GET) {
+        //         // add timestamp avoid cache
+        //         if (!isString(params)) {
+        //             configTemp.params = Object.assign(params || {}, joinTimestamp(joinTime, false))
+        //             if (joinParamsToUrl && configTemp.params) {
+        //                 configTemp.url = setObjToUrlParams(
+        //                     configTemp.url,
+        //                     Object.assign({}, configTemp.params, configTemp.data))
+        //                 configTemp.params = undefined
+        //             }
+        //         }
+        //         else {
+        //             // compatible with restful style
+        //             configTemp.url = `${config.url + params}${joinTimestamp(joinTime, true)}`
+        //             configTemp.params = undefined
+        //         }
+        //     }
+        // }
 
         if (apiUrl && isString(apiUrl))
             configTemp.url = `${apiUrl}${configTemp.url}`
+			console.log("=== configTemp.url", configTemp.url);
 
         return new Promise((resolve, reject) => {
             uni.request({