增加鼎盛联盟页面，修改首页滋补养生位置，隐藏学生，修改首页大仓为精品大仓

src/apis/common.ts

@@ -47,6 +47,7 @@ enum API {
     HOT_KEYWORD = '/api/common/hot_keyword',
 
     HOME_BANNER = '/api/newhome/nologin/banner/home_banner_new',
+	BANNER = '/api/newhome/nologin/banner/',
 
     GET_PRODUCT_SHARE = '/api/get_product_share',
     // /api/get_product_share
@@ -61,9 +62,9 @@ export function getProductShare() {
 /**
  * 获取首页轮播图
  */
-export function getHomeBanner() {
+export function getHomeBanner(type="home_banner_new") {
     return defHttp.get({
-        url: API.HOME_BANNER,
+        url: API.BANNER+type,
     })
 }
 

src/apis/merchant.ts

@@ -14,7 +14,9 @@ enum API {
     // 产品推荐列表
     GET_PRODUCT_RECOMMEND_LIST = '/api/store/product/recommend/lst',
     // 会员产商品
-    GET_VIP_AREA_LIST = '/api/store/merchant/product/lst/324'
+    GET_VIP_AREA_LIST = '/api/store/merchant/product/lst/324',
+	
+	GET_TYPE_PRODUCT_LIST = '/api/store/merchant/product/type_lst.html'
 }
 
 /**
@@ -62,12 +64,12 @@ export function getMerchantCategory(id: string): Promise<Array<MerchantCategoryM
  * 滋补保健
  * @param id
  */
-export function getProductList(id: string): Promise<ZibubaojianResult> {
+export function getProductList(id: string,page=1,limit=10): Promise<ZibubaojianResult> {
     return defHttp.get({
         url: API.GET_PRODUCT_LIST + `/${id}`,
         params: {
-            page: 1,
-            limit: 10
+            'page': page,
+            'limit': limit
         }
     })
 }
@@ -112,4 +114,21 @@ export function getVipAreaList(pageParams: PageModel): Promise<VipAreaResult> {
             // limit: pageParams.limit === undefined ? 20 : pageParams.limit
         }
     })
+}
+
+
+/**
+ * 获取鼎盛联盟商品
+ * @param pageParams
+ */
+export function getTypeProductList(pageParams: PageModel): Promise<VipAreaResult> {
+
+    return defHttp.get({
+        url: API.GET_TYPE_PRODUCT_LIST,
+        params: {
+            ...pageParams
+            // page: pageParams.page === undefined ? 1 : pageParams.page,
+            // limit: pageParams.limit === undefined ? 20 : pageParams.limit
+        }
+    })
 }

src/pages/home/components/navs.vue

@@ -6,8 +6,8 @@ import {CDN_URL} from "~/config/app";
 
 const navList = ref([{
   image: CDN_URL + '/static/home-nav/home_dacang_220614.png',
-  title: '大仓',
-  key: PLATFORM_NAME.DC
+  title: '精品大仓',
+  key: 'jingpin'
 }, {
   image: CDN_URL + '/static/home-nav/home_xianshimiaosha_220614.png',
   title: '限时秒杀',
@@ -18,9 +18,9 @@ const navList = ref([{
   key: PLATFORM_NAME.JD
 }, {
   image: '',
-  title: '滋补保健',
-  key: 'zibu',
-  categoryId: '430'
+  title: '鼎盛联盟',
+  key: 'dingsheng',
+  // categoryId: '430'
   // 测试库
   // categoryId: '149'
 },{
@@ -52,12 +52,23 @@ const navList = ref([{
   title: '老年专区',
   key: PLATFORM_NAME.DC,
   categoryId: '571'
-}, {
-  image: CDN_URL + '/static/home-nav/the_student_zone_220920.png',
-  title: '学生专区',
-  key: PLATFORM_NAME.DC,
-  categoryId: '576'
-}, {
+}, 
+ {
+  image: '',
+  title: '滋补保健',
+  key: 'zibu',
+  categoryId: '430'
+  // 测试库
+  // categoryId: '149'
+},
+
+// {
+//   image: CDN_URL + '/static/home-nav/the_student_zone_220920.png',
+//   title: '学生专区',
+//   key: PLATFORM_NAME.DC,
+//   categoryId: '576'
+// }, 
+{
   image: CDN_URL + '/static/home-nav/vip_img.png',
   title: '会员专区',
   key: 'member',
@@ -78,7 +89,9 @@ const navList = ref([{
 onBeforeMount(() => {
   getHomeQuickLink().then(res => {
     if (res) {
-      navList.value[3] = res[0]
+		navList.value[11] = res[0]
+		navList.value[3] = res[1]
+		// navList.value[3] = res[0]
       // console.log(res)
     }
   })
@@ -122,6 +135,18 @@ function handleItemClick(item: any) {
       })
       break;
     }
+	case 'dingsheng': {
+	  uni.navigateTo({
+	    url: `/pages/product/dingshenglianmeng?type=`+item.key
+	  })
+	  break;
+	}
+	case 'jingpin': {
+	  uni.navigateTo({
+	    url: `/pages/product/dingshenglianmeng?type=`+item.key
+	  })
+	  break;
+	}
     // 积分通兑
     case 'integral': {
       uni.navigateTo({

src/pages/product/dingshenglianmeng.vue

@@ -0,0 +1,171 @@
+<template>
+  <CXBBasePage>
+    <scroll-view>
+		<div class="h-45">
+		  <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=" h-full"
+		  >
+		    <swiper-item v-for="(item, index) in state.banners" :key="index">
+		      <image :src="item.pic" class="!w-full !h-full" mode="aspectFill"/>
+		    </swiper-item>
+		  </swiper>
+		</div>
+      <div class="p-3">
+        <div>
+          <grid-view type="masonry" cross-axis-count="2" 	cross-axis-gap="10px" main-axis-gap="10px">
+            <div v-for="(item, index) in list"
+                 @tap="handleItemClick(item)"
+                 :key="index"
+            >
+
+              <div class="bg-white rounded-lg">
+                <image :src="item.image" mode="widthFix" 	:fade-in="true" class="rounded-t-lg  !w-full aspect-square" />
+                <div class="text-sm p-2 flex flex-col gap-2">
+                  <div class="line-clamp-2">
+                    {{ item.store_name }}
+                  </div>
+                  <CXBYaojinTag :amount="item.yanglao" />
+                  <div class="text-[#fe0032] flex items-end gap-2">
+                    <div class="text-[20px]">¥{{ item.price }}</div>
+                  </div>
+                  <div class="line-through text-xs font-bold text-gray-400 flex ">
+                    <div>
+                      ¥ {{item.ot_price}}
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </grid-view>
+        </div>
+      </div>
+    </scroll-view>
+  </CXBBasePage>
+</template>
+
+<script setup lang="ts">
+import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
+import {getTypeProductList} from "~/apis/merchant";
+import {getHomeBanner} from "~/apis/common";
+
+const state = reactive({
+  currentPage: 1,
+  pageSize: 10,
+  totalPage: 1,
+  banners: [],
+  keyword: '' ,
+  status: 'noMore',
+  indicatorDots: true,
+  circular: true,
+  autoplay: true,
+  interval: 5000,
+  duration: 500,
+  currents: "0",
+  title:'',
+  type:'',
+})
+const list = ref()
+
+function handleItemClick(item) {
+  uni.navigateTo({
+    url: `/pages/store/product/detail?id=`+item.product_id
+  })
+}
+
+onLoad((option) => {
+	state.type=option.type;	//获取url参数
+	if(state.type=='jingpin'){
+		state.title='精品大仓'
+	}else if(state.type=='dingsheng'){
+		state.title='鼎盛联盟'
+	}
+
+
+	getHomeBanner(state.type+"_banner").then(res => {
+		state.banners = res
+	})
+	loadList('reload')
+	
+})
+
+
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+	if (action === 'reload') {
+	  state.currentPage = 1
+	}
+	
+	const params = {
+		type :state.type,
+		page: state.currentPage,
+		limit: state.pageSize
+	}
+	getTypeProductList({
+		...params
+	}).then(res => {
+		if (res) {
+			if (action === 'reload') {
+				list.value = res.list
+			}else if (action === 'page') {
+			  list.value = list.value.concat(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.currentPage+"----------"+state.totalPage)
+  if (state.currentPage > state.totalPage) {
+    state.status = 'noMore';
+  } else {
+    setTimeout(() => {
+      loadList('page')
+    }, 300)
+  }
+}
+
+onReachBottom(() => {
+  console.log('到底了。。。')
+  handleScrollToLower()
+
+})
+
+onPullDownRefresh(() => {
+  loadList('reload', function() {
+    setTimeout(() => {
+      uni.stopPullDownRefresh()
+    }, 300)
+  })
+})
+
+onShow(() =>{
+    uni.setNavigationBarTitle({
+      title: state.title // 设置新的导航栏标题
+    });
+})
+
+
+</script>
+
+<route lang="yaml">
+style:
+  enablePullDownRefresh: true
+</route>

src/pages/product/zibuyangsheng.vue

@@ -4,19 +4,96 @@ import ProductCard from "~/components/ProductCard/ProductCard.vue";
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import {getProductList} from "~/apis/merchant";
 import CXBYaojinTag from "~/components/CXBYaojinTag/CXBYaojinTag.vue";
+const state = reactive({
+	currentPage: 1,
+	pageSize: 10,
+	totalPage: 1,
+	status: 'noMore',
+	id:''
+})
 const list = ref()
 onLoad((options) => {
-  getProductList(options.id).then(res => {
-    list.value = res.list
-  })
+	state.id=options.id;
+	loadList('reload')
 })
 
 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: `/pages/store/product/detail?id=`+item.product_id
   })
 }
+
+
+
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+	if (action === 'reload') {
+		state.currentPage = 1
+	}
+	
+	getProductList(state.id,state.currentPage,state.pageSize).then(res => {
+		if (res) {
+			if (action === 'reload') {
+				list.value = res.list
+			}else if (action === 'page') {
+			  list.value = list.value.concat(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.currentPage+"----------"+state.totalPage)
+  if (state.currentPage > state.totalPage) {
+    state.status = 'noMore';
+  } else {
+    setTimeout(() => {
+      loadList('page')
+    }, 300)
+  }
+}
+
+onReachBottom(() => {
+  console.log('到底了。。。')
+  handleScrollToLower()
+
+})
+
+onPullDownRefresh(() => {
+  loadList('reload', function() {
+    setTimeout(() => {
+      uni.stopPullDownRefresh()
+    }, 300)
+  })
+})
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 </script>
 <template>
   <CXBBasePage>

src/pages/vip/index.vue

@@ -163,7 +163,7 @@ onLoad((option) => {
   })
   userStore.setRedirectPage(`/pages/vip/index`, 'page')
 
-  getHomeBanner().then(res => {
+  getHomeBanner("user_banner").then(res => {
     console.log(res)
     state.banners = res
   })