大仓 分类 偏移量定位

.env.development

@@ -1 +1 @@
-VITE_GLOB_API_URL = 'https://test.bjtdba.com'
+VITE_GLOB_API_URL = 'https://app.bjtdba.com'

src/components/ProductCard/ProductCard.vue

@@ -1,14 +1,14 @@
 <script lang="ts" setup>
-import type {ExtractPropTypes, PropType} from "vue";
-import type {ProductDetailModel} from "~/apis/model/storeModel";
-import {debounce} from "lodash-es";
-import {throttle} from "~/utils/throttle";
+import type { ExtractPropTypes, PropType } from 'vue'
+import type { ProductDetailModel } from '~/apis/model/storeModel'
+
+import { throttle } from '~/utils/throttle'
 
 const props = defineProps({
   item: {
     type: Object as PropType<ProductDetailModel>,
-    required: true
-  }
+    required: true,
+  },
 })
 
 const emit = defineEmits<{
@@ -20,49 +20,46 @@ function handleClick() {
   //   emit('click:item', props.item)
 
   throttle(() => {
-    // uni.navigateTo({
-    //   url: `/pages/store/product/detail?id=${item.product_id}`
-    // })
     emit('click:item', props.item)
-
   })
   // }, 100)
-
 }
 </script>
 
 <template>
   <div
-      @tap.stop="handleClick"
-      class="bg-white rounded-lg"
+    class="bg-white rounded-lg"
+    @tap.stop="handleClick"
   >
-    <image :src="item.image" style="width: 341rpx; height: 341rpx;" 	:fade-in="true" class="rounded-t-lg  !w-full aspect-square" v-if="item.type == 5"></image>
-    <image :src="item.thumb" style="width: 341rpx; height: 341rpx;"   :fade-in="true" class="rounded-t-lg  !w-full aspect-square" v-if="item.type == 6"></image>
-    <image :src="item.image" style="width: 341rpx; height: 341rpx;"   :fade-in="true" class="rounded-t-lg  !w-full aspect-square" v-if="item.type == 1 ||item.type == 14 ||item.type == 10 ||item.type == 8 ||item.type == 15 ||item.type == 16"></image>
+    <image v-if="item.type == 5" :src="item.image" style="width: 341rpx; height: 341rpx;" :fade-in="true" class="rounded-t-lg  !w-full aspect-square" />
+    <image v-if="item.type == 6" :src="item.thumb" style="width: 341rpx; height: 341rpx;" :fade-in="true" class="rounded-t-lg  !w-full aspect-square" />
+    <image v-if="item.type == 1 || item.type == 14 || item.type == 10 || item.type == 8 || item.type == 15 || item.type == 16" :src="item.image" style="width: 341rpx; height: 341rpx;" :fade-in="true" class="rounded-t-lg  !w-full aspect-square" />
 
     <div class="text-sm p-2 flex flex-col gap-1">
       <div v-if="item.type == 5" class="line-clamp-2">
         {{ item.store_name }}
       </div>
-      <div v-if="item.type == 1 ||item.type == 14 ||item.type == 10 ||item.type == 8 ||item.type == 15 ||item.type == 16" class="line-clamp-2">
+      <div v-if="item.type == 1 || item.type == 14 || item.type == 10 || item.type == 8 || item.type == 15 || item.type == 16" class="line-clamp-2">
         {{ item.store_name }}
       </div>
       <div v-if="item.type == 6" class="line-clamp-2">
         {{ item.name }}
       </div>
       <div 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 h-4"></image>
-        <div class="px-2 flex items-center jusitify-center"  >
+        <image
+          src="https://cdn.bjtdba.com/vod/image/2023-09-15/20230915160858609.png"
+          mode="widthFix" class="!w-8 h-4"
+        />
+        <div class="px-2 flex items-center jusitify-center">
           <div v-if="item.type == 5">
-            养老金 ¥{{item.yanglao||item.yanglao_price}}
+            养老金 ¥{{ item.yanglao || item.yanglao_price }}
           </div>
-          <div v-if="item.type == 1 ||item.type == 14 ||item.type == 10 ||item.type == 8 ||item.type == 15 ||item.type == 16">
-            养老金 ¥{{item.yanglao_price}}
+          <div v-if="item.type == 1 || item.type == 14 || item.type == 10 || item.type == 8 || item.type == 15 || item.type == 16">
+            养老金 ¥{{ item.yanglao_price }}
           </div>
 
-          <div v-if="item.type==6">
-            养老金 ¥{{item.commission}}
+          <div v-if="item.type == 6">
+            养老金 ¥{{ item.commission }}
           </div>
         </div>
       </div>
@@ -74,40 +71,35 @@ function handleClick() {
           <div v-if="item.type == 5">
             {{ item.price }}
           </div>
-          <div v-if="item.type == 1 ||item.type == 14 ||item.type == 10 ||item.type == 8 ||item.type == 15 ||item.type == 16">
+          <div v-if="item.type == 1 || item.type == 14 || item.type == 10 || item.type == 8 || item.type == 15 || item.type == 16">
             {{ item.price }}
           </div>
           <div v-if="item.type == 6">
-            {{item.lowestCouponPrice}}
+            {{ item.lowestCouponPrice }}
           </div>
         </div>
 
-        <div  v-if="item.type == 5" 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 v-if="item.type == 5" 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 v-if="item.type == 6"  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 v-if="item.type == 6" 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 class="line-through text-xs font-bold flex ">
         <div v-if="item.type == 5">
-          ¥ {{item.ot_price}}
+          ¥ {{ item.ot_price }}
         </div>
-        <div v-if="item.type == 1 ||item.type == 14 ||item.type == 10 ||item.type == 8 ||item.type == 15 ||item.type == 16">
-          ¥ {{item.ot_price}}
+        <div v-if="item.type == 1 || item.type == 14 || item.type == 10 || item.type == 8 || item.type == 15 || item.type == 16">
+          ¥ {{ item.ot_price }}
         </div>
         <div v-if="item.type == 6">
-          ¥ {{item.price}}
+          ¥ {{ item.price }}
         </div>
       </div>
     </div>

src/pages/dacang/list/index.vue

@@ -1,256 +1,272 @@
-<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";
-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()
-
-
-const state = reactive({
-  tabs: [],
-  lists: {},
-  productList: <Array<DcProductModel>>[],
-  currentClassify: '-1',
-  keyword: '',
-  status: 'noMore',
-  banner: '',
-  currentPage: 1,
-  pageSize: 10,
-  totalPage: 1
-})
-
-// 距离顶部距离
-let Scroll_X = ref(0)
-
-let scrollPositions = reactive({})
-const dacangStore = useDacangStore()
-const userStore = useUserStore()
-
-
-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'
-    }
-  })
-
-  if (option && option.shareId) {
-    userStore.setShareId(option.shareId)
-  }
-  getProductShare().then(res => {
-    if (res) {
-      userStore.setShareId(res.share_id)
-    }
-  }).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);
-
-  })
-
-})
-
-
-onShareAppMessage(() => {
-  const shareId = Cache.get('SHARE_ID')
-
-  return {
-    title: `消费储蓄 保障未来`,
-    path: `/pages/dacang/list/index?shareId=${shareId}`,
-    imageUrl: 'https://cdn.bjtdba.com/vod/image/2023-10-09/20231009202402136.png'
-  }
-})
-
-onShareTimeline(() => {
-  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}`
-  }
-})
-
-onShow((options) => {
-
-  usePageStore.setPageConfig({
-    currentPage: {
-      type: 'tab',
-      url: '/pages/dacang/list/index'
-    }
-  })
-  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
-  })
-  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
-  // uni.pageScrollTo({
-  //   scrollTop: 0
-  // });
-  state.currentPage = 1
-  state.pageSize = 10
-
-  setTimeout(() => {
-    loadList('reload')
-  }, 300)
-
-}
-
-// function handleTabItemClick(classifyId) {
-//   // 保存当前分类页的滚动位置
-//   scrollPositions[state.currentClassify] = Scroll_X.value;
-
-//   console.log(111, scrollPositions[classifyId]);
-
-//   // 切换当前分类页
-//   state.currentClassify = classifyId;
-
-//   // 检查当前分类页是否有保存的滚动位置
-//   if (scrollPositions[classifyId] !== undefined) {
-//     // 如果有保存的滚动位置，恢复滚动位置
-//     uni.pageScrollTo({
-//       scrollTop: scrollPositions[classifyId],
-//     });
-//   } else {
-//     // 如果没有保存的滚动位置，重新加载数据
-//     state.currentPage = 1;
-//     state.pageSize = 10;
-//     loadList('reload');
-//   }
-// }
-
-function toHuiyuan() {
-  
-  uni.navigateTo({
-    url: `/pages/guest_member_new/index?is_merchant=${userStore.userInfo.is_merchant}`
-  })
-}
-
-
-const headerClass = ref('')
-
-onPageScroll((page) => {
-
-
-  Scroll_X.value = Number(page.scrollTop.toFixed())
-
-  // page.scrollTop
-  if (page.scrollTop >= 76) {
-    headerClass.value = '!bg-primary !text-white'
-  } else {
-    headerClass.value = ''
-  }
-})
-
-onReachBottom(() => {
-  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'
-    }
-  })
-})
-onPullDownRefresh(() => {
-  // uni.showLoading()
-  // state.currentPage = 1
-  // state.pageSize = 10
-  // loadList('reload', (items) => {
-  //   uni.hideLoading()
-  //   uni.stopPullDownRefresh()
-  // })
-})
-
-
+<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";
+	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()
+
+
+	const state = reactive({
+		tabs: [],
+		lists: {},
+		productList: <Array<DcProductModel>>[],
+		currentClassify: '-1',
+		keyword: '',
+		status: 'noMore',
+		banner: '',
+		currentPage: 1,
+		pageSize: 10,
+		totalPage: 1,
+		isResponseReachBotton: true, // 是否详情触底事件
+
+	})
+
+	// 距离顶部距离
+	let Scroll_X = ref(0)
+
+	let scrollPositions = reactive({})
+	const dacangStore = useDacangStore()
+	const userStore = useUserStore()
+
+
+	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'
+			}
+		})
+
+		if (option && option.shareId) {
+			userStore.setShareId(option.shareId)
+		}
+		getProductShare().then(res => {
+			if (res) {
+				userStore.setShareId(res.share_id)
+			}
+		}).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);
+
+		})
+
+		if (dacangStore) {
+			state.currentClassify = dacangStore.currentClassify
+		}
+		loadList('reload')
+	})
+
+
+	onShareAppMessage(() => {
+		const shareId = Cache.get('SHARE_ID')
+
+		return {
+			title: `消费储蓄 保障未来`,
+			path: `/pages/dacang/list/index?shareId=${shareId}`,
+			imageUrl: 'https://cdn.bjtdba.com/vod/image/2023-10-09/20231009202402136.png'
+		}
+	})
+
+	onShareTimeline(() => {
+		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}`
+		}
+	})
+
+	onShow((options) => {
+
+		usePageStore.setPageConfig({
+			currentPage: {
+				type: 'tab',
+				url: '/pages/dacang/list/index'
+			}
+		})
+
+		
+	})
+
+	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
+		})
+		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 toHuiyuan() {
+		uni.navigateTo({
+			url: `/pages/guest_member_new/index?is_merchant=${userStore.userInfo.is_merchant}`
+		})
+	}
+
+	const headerClass = ref('')
+	onPageScroll((page) => {
+
+		Scroll_X.value = Number(page.scrollTop.toFixed())
+
+		// 保存当前分类页的滚动位置
+		scrollPositions[state.currentClassify] = Scroll_X.value;
+
+		// page.scrollTop
+		if (page.scrollTop >= 76) {
+			headerClass.value = '!bg-primary !text-white'
+		} else {
+			headerClass.value = ''
+		}
+	})
+
+	onReachBottom(() => {
+
+		console.log('是否出发触底事件 = ', state.isResponseReachBotton)
+
+		if (!state.isResponseReachBotton) {
+			return
+		}
+		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'
+			}
+		})
+	})
+	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>
-<template>
-  <div class="h-screen">
-    <DacangHeader :ex-class="headerClass" :tabs="state.tabs" @click:item="handleTabItemClick" />
-	<!-- gap-2 -->
-    <div class="flex flex-col">
-      <CXBBackTop :Scroll_X="Scroll_X" :isCss="1" />
-      <image lazy-load :src="state.banner" mode="widthFix" @click="toHuiyuan" class="w-full h-50"></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>
-
-  </div>
-</template>
-<style>
-page {
-  background-color: #f8f8f8;
-}
-
-.nut-tab-pane {
-  display: none !important;
-}
+
+<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>
+
+	</div>
+</template>
+<style>
+	page {
+		background-color: #f8f8f8;
+	}
+
+	.nut-tab-pane {
+		display: none !important;
+	}
 </style>
+
 <route lang="yaml" >
 style:
   navigationStyle: custom
   navigationBarTitleText: 储蓄保
   enablePullDownRefresh: true
-</route>
+</route>

src/pages/home/components/navs.vue

@@ -96,6 +96,7 @@ function handleItemClick(item: any) {
   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',

src/pages/payment/index.vue

@@ -65,8 +65,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({