banner修复

src/apis/model/dacang.model.ts

@@ -17,6 +17,7 @@ export interface QueryDcHomeParams {
 }
 // 大仓商品
 export type DcProductModel = {
+     banner:string
      product_id: string
      mer_id: string
      image: string//图片

src/apis/product.ts

@@ -68,9 +68,20 @@ enum API {
     // 抖音商品列表搜索
     DY_SEARCH = '/api/dy/get_search',
     // 抖音商品详情
-    DY_DETAIL = '/api/dy/get_detail'
+    DY_DETAIL = '/api/dy/get_detail',
+    //大仓banner展示图片
+    DC_BANNER='/api/newhome/nologin/banner/da_cang'
 }
 
+
+/**获取大仓banner展示图片 */
+export function getBannerImg (){
+    return defHttp.get({
+        url:API.DC_BANNER
+    })
+}
+
+
 /**
  * 获取分享ID
  * @param params

src/config/app.ts

@@ -5,8 +5,8 @@ let VUE_APP_WS_URL = `ws://${location.hostname}?type=user`
 // 网络接口修改此字符 小程序域名要求https
 
 // let httpApi = 'https://mer1.crmeb.net'
-// let httpApi = 'https://test.bjtdba.com'
-let httpApi = 'https://app.bjtdba.com'
+let httpApi = 'https://test.bjtdba.com'
+// let httpApi = 'https://app.bjtdba.com'
 // let httpApi = 'https://test.bjtdba.com'
 
 // let httpApi = 'http://192.168.1.77:8324'

src/pages/dacang/list/index.vue

@@ -1,29 +1,30 @@
 <script lang="ts" setup>
 import FNavBar from "~/components/FNavBar/FNavBar.vue";
-import {getDcProductClassify, getDcProductList} from "~/apis/dacang";
+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 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";
-import {getProductShare} from "~/apis/common";
-import {useUserStore} from "~/stores/userStore";
+import { getProductShare } from "~/apis/common";
+import { useUserStore } from "~/stores/userStore";
 import Cache from "~/utils/cache";
-const headerImage = CDN_URL + `/static/assets/banner-dacang.png`
+import { getBannerImg } from '~/apis/product'
+import Banner from "./components/banner.vue";
+
+
 const usePageStore = usePageStoreWidthOut()
 
 
 const state = reactive({
-  tabs: [{store_category_id: '-1', cate_name: '全部'}],
+  tabs: [{ store_category_id: '-1', cate_name: '全部' }],
   productList: <Array<DcProductModel>>[],
-
   currentClassify: '',
   keyword: '',
-
   status: 'noMore',
-
+  banner:'',
   currentPage: 1,
   pageSize: 10,
   totalPage: 1
@@ -35,14 +36,16 @@ let Scroll_X = ref(0)
 const dacangStore = useDacangStore()
 const userStore = useUserStore()
 
+
 onLoad(async (option) => {
-  state.tabs = [{store_category_id: '-1', cate_name: '全部'}]
+  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'
+      url: '/pages/dacang/list/index'
     }
   })
 
@@ -57,7 +60,12 @@ onLoad(async (option) => {
     // 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);
+    
+  })
 
 })
 
@@ -85,26 +93,25 @@ onShow(async (options) => {
   usePageStore.setPageConfig({
     currentPage: {
       type: 'tab',
-      url:  '/pages/dacang/list/index'
+      url: '/pages/dacang/list/index'
     }
   })
   loadList('reload')
 })
 
 function loadList(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 (dacangStore.currentClassify !== '-1') {
     params.classify = dacangStore.currentClassify
   }
 
-  if (action === 'reload') {
-    params.page = 1
-  }
+
 
   getDcProductList({
     ...params
@@ -136,7 +143,7 @@ const headerClass = ref('')
 onPageScroll((page) => {
   Scroll_X.value = Number(page.scrollTop.toFixed())
   // page.scrollTop
-  if (page.scrollTop >= 76 ) {
+  if (page.scrollTop >= 76) {
     headerClass.value = '!bg-primary !text-white'
   } else {
     headerClass.value = ''
@@ -150,7 +157,7 @@ onReachBottom(() => {
   state.currentPage += 1
   loadList('page', (items) => {
     uni.hideLoading()
-    // console.log(items)
+    console.log(items)
     if (!items.length > 0) {
       // console.log('没有更多了')
       state.status = 'noMore'
@@ -169,12 +176,12 @@ onPullDownRefresh(() => {
 </script>
 <template>
   <div class="h-screen">
-    <DacangHeader :ex-class="headerClass" :tabs="state.tabs" @click:item="handleTabItemClick"/>
+    <DacangHeader :ex-class="headerClass" :tabs="state.tabs" @click:item="handleTabItemClick" />
 
     <div class="flex flex-col gap-2 ">
-      <CXBBackTop :Scroll_X="Scroll_X"/>
-      <image :src="headerImage" mode="widthFix" class="w-full h-50"></image>
-    <ProductList :list="state.productList" />
+      <CXBBackTop :Scroll_X="Scroll_X" :isCss="1" />
+      <image lazy-load :src="state.banner" mode="widthFix" class="w-full h-50"></image>
+      <ProductList :list="state.productList" />
       <div class="pb-safe flex justify-center items-center text-[12px] text-gray-500" v-if="state.productList.length > 0">
         <div v-if="state.status === 'loading'">
           加载中...
@@ -195,8 +202,6 @@ page {
 .nut-tab-pane {
   display: none !important;
 }
-
-
 </style>
 <route lang="yaml" >
 style:

src/pages/payment/index.vue

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

src/pages/vip/index.vue

@@ -2,27 +2,27 @@
   <!--  <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="loadList('reload')" @clear="loadList('reload')">
-        <!--      <template v-slot:leftout>-->
-        <!--        <div @tap="navBack">-->
-        <!--          <nut-icon name="left"></nut-icon>-->
-        <!--        </div>-->
-        <!--      </template>-->
-        <template v-slot:rightout>
-          <div @tap="loadList('reload')">
-            搜索
-          </div>
-        </template>
-      </nut-searchbar>
-    </div>
+    <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="loadList('reload')" @clear="loadList('reload')">
+          <!--      <template v-slot:leftout>-->
+          <!--        <div @tap="navBack">-->
+          <!--          <nut-icon name="left"></nut-icon>-->
+          <!--        </div>-->
+          <!--      </template>-->
+          <template v-slot:rightout>
+            <div @tap="loadList('reload')">
+              搜索
+            </div>
+          </template>
+        </nut-searchbar>
+      </div>
     </div>
-   
-    
+
+
     <!--      <image :src="homeBanner" mode="widthFix" class="h-10 w-full "></image>-->
 
-    <div class="w-screen h-45"  >
+    <div class="w-screen h-45">
       <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">
@@ -45,10 +45,11 @@
               <div class="line-clamp-1">
                 {{ item.store_name }}
               </div>
-              <div  v-if="item.type!=15" class="border border-solid border-1 border-red rounded flex text-xs items-center text-[#FE0032] w-fit">
+              <div v-if="item.type != 15"
+                class="border border-solid border-1 border-red rounded flex text-xs items-center text-[#FE0032] w-fit">
                 <image src="https://cdn.bjtdba.com/vod/image/2023-09-15/20230915160858609.png" mode="widthFix"
                   class="!w-8 "></image>
-                <div  class="px-2 flex items-center jusitify-center">
+                <div class="px-2 flex items-center jusitify-center">
                   <div>
                     养老金 ¥{{ item.yanglao }}
                   </div>
@@ -120,7 +121,7 @@ const state = reactive({
   pageSize: 10,
   totalPage: 1,
   banners: [],
-
+  count: 0,
   keyword: '',
   status: 'noMore',
   indicatorDots: true,
@@ -130,7 +131,8 @@ const state = reactive({
   duration: 500,
   currents: "0",
 })
-const list = ref()
+const list = ref([])
+const count = ref()
 
 onLoad((option) => {
   if (option && option.shareId) {
@@ -179,6 +181,8 @@ onShareTimeline(() => {
 
 
 function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+
+
   // console.log(state.keyword)
   const params = {
     page: state.currentPage,
@@ -188,16 +192,25 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     params.keyword = state.keyword
   }
   console.log(params)
+
   getVipAreaList({
     // page: state.currentPage,
     // limit: state.pageSize
     ...params
   }).then(res => {
+    // console.log(res.count)
     // console.log(res.list)
-    console.log(res.list)
-    if (res) {
+    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) {
@@ -209,21 +222,28 @@ function handleItemClick(item) {
 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)
-  }
+  // console.log(state.currentPage)
+  // console.log(state.totalPage)
+  // if (count.value > (state.currentPage*state.pageSize)) {
+  //   loadList('page')
+  // } else {
+  //   state.status = 'noMore';
+  //   setTimeout(() => {
+  //     loadList('page')
+  //   }, 300)
+  // }
+  loadList('page', (items) => {
+    console.log('items', items);
+    if (!items.length > 0) {
+      // console.log('没有更多了')
+      state.status = 'noMore'
+    }
+  })
 }
 
 onReachBottom(() => {
-  console.log('到底了。。。')
-
+  // console.log('到底了。。。')
   handleScrollToLower()
-
 })
 
 onPullDownRefresh(() => {

src/stores/userStore.ts

@@ -27,7 +27,7 @@ export const useUserStore = defineStore('userStore', {
         yanglao: 0,
         shareId: null,
         redirectPage: null,
-        permissionList: null // 权限列表
+        permissionList: null, // 权限列表
     }) as UserStoreState,
     actions: {
         // getYanglaojinStatistics().then(res => {