会员搜索功能ok

src/auto-imports.d.ts

@@ -96,7 +96,6 @@ declare global {
   const useCustomStyleProp: typeof import('./composables/useProps')['useCustomStyleProp']
   const useDacangStore: typeof import('./stores/dacangStore')['useDacangStore']
   const useDirectionProp: typeof import('./composables/useProps')['useDirectionProp']
-  const useOrderStore: typeof import('./stores/addressStore')['useOrderStore']
   const usePageStore: typeof import('./stores/page')['usePageStore']
   const usePageStoreWidthOut: typeof import('./stores/page')['usePageStoreWidthOut']
   const useSizeProp: typeof import('./composables/useProps')['useSizeProp']

src/components/FCell/FCell.vue

@@ -6,7 +6,7 @@ const props = defineProps(cellProps)
 const emit = defineEmits(cellEmits)
 onLoad(
   (options)=>{
-    console.log('我是点击options',options);
+    // console.log('我是点击options',options);
     
   }
 )

src/components/FSearch/FSearch.vue

@@ -41,7 +41,7 @@ function handleClick() {
                  class="w-5 h-5  pl-2 py-1"
           ></image>
         <div class="flex flex-1 w-100%">
-          <div class="flex-1"></div>
+          <div class="flex-1  "></div>
           <div
               class="bg-[#D71608] text-white text-xs w-11 rounded-full text-center p-1.5  mr-0.5 "
           >
@@ -53,3 +53,7 @@ function handleClick() {
       </div>
 
 </template>
+<style scoped>
+
+
+</style>

src/pages/dacang/list/index.vue

@@ -57,7 +57,7 @@ onLoad(async (option) => {
       userStore.setShareId(res.share_id)
     }
   }).catch(message => {
-    // console.log(message)
+    console.log(message)
   })
   userStore.setRedirectPage(`/pages/dacang/list/index`, 'tab')
   getBannerImg().then(res=>{

src/pages/home/components/header.vue

@@ -1,8 +1,8 @@
 <script lang="ts" setup>
-import {computed, PropType} from "vue";
+import { computed, PropType } from "vue";
 import FSearch from "~/components/FSearch/FSearch.vue";
-import type {UserInfoModel} from "~/apis/model/userInfoModel";
-import {useUserStore} from "~/stores/userStore";
+import type { UserInfoModel } from "~/apis/model/userInfoModel";
+import { useUserStore } from "~/stores/userStore";
 // import {useUserStore} from "~/stores/userStore";
 const userStore = useUserStore()
 
@@ -66,30 +66,22 @@ function handleShowMessage() {
     url: '/pages/message/index'
   })
 }
+function handleClickser() {
+  uni.navigateTo({
+    url: '/pages/search/index'
+  })
+}
 </script>
 <template>
-  <div class="home-header fixed w-screen text-white z-10"
-       :style="navBarStyle"
-       :class="exClass"
-  >
+  <div class="home-header fixed w-screen text-white z-10" :style="navBarStyle" :class="exClass">
     <div class="flex">
-      <div
-          @click="handleClick"
-          class="flex gap-2 mb-2 pl-2 flex-1"
-      >
-        <image v-if="userStore && userStore.userInfo && userStore.userInfo.avatar"
-               :src="userStore.userInfo.avatar"
-               mode="widthFix"
-               class="w-9 h-9 rounded-full"
-        />
-        <image
-            v-else
-            src="https://app.bjtdba.com/uploads/logo.jpg"
-            mode="widthFix"
-            class="w-9 h-9 rounded-full"
-        />
+      <div @click="handleClick" class="flex gap-2 mb-2 pl-2 flex-1">
+        <image v-if="userStore && userStore.userInfo && userStore.userInfo.avatar" :src="userStore.userInfo.avatar"
+          mode="widthFix" class="w-9 h-9 rounded-full" />
+        <image v-else src="https://app.bjtdba.com/uploads/logo.jpg" mode="widthFix" class="w-9 h-9 rounded-full" />
         <div class="flex flex-col ">
-          <div class="text-sm" v-if="userStore.userInfo && userStore.userInfo.nickname">{{ userStore.userInfo.nickname ? userStore.userInfo.nickname : '登录'}}</div>
+          <div class="text-sm" v-if="userStore.userInfo && userStore.userInfo.nickname">{{ userStore.userInfo.nickname ?
+            userStore.userInfo.nickname : '登录' }}</div>
           <div class="text-sm" v-else>登录</div>
           <div class="text-xs" v-if="!isNaN(yanglaojin) && userStore.userInfo">{{ yanglaojin }}元养老金</div>
           <div v-else class="text-xs">
@@ -98,7 +90,8 @@ function handleShowMessage() {
         </div>
 
       </div>
-      <div class=" right-26 flex flex-col text-[10px] justify-center items-center " @tap.stop="handleShowMessage" :style="{marginRight: `${menuButtonInfo.width + 15}px`}">
+      <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>
@@ -106,10 +99,36 @@ function handleShowMessage() {
 
 
     </div>
-    <div class="">
-      <FSearch />
+    <div class="p_3">
+      <!-- 搜索 -->
+      <div @click="handleClickser"
+        class="w-full bg-white rounded-full flex flex-row justify-between items-center border-solid border-1 border-red h-8">
+
+        <image src="https://cdn.bjtdba.com/vod/image/2023-02-15/20230215112840149.png" mode="widthFix"
+          class="w-5 h-5  pl-2 py-1"></image>
+        <div class="flex flex-1 w-100%">
+          <div class="flex-1 guand ">输入商品关键字</div>
+          <div class="bg-[#D71608] text-white text-xs w-11 rounded-full text-center p-1.5  mr-0.5 ">
+            搜索
+          </div>
+        </div>
+
+
+      </div>
 
     </div>
 
   </div>
 </template>
+<style  scoped>
+.p_3 {
+  padding-left: 24rpx;
+  padding-right: 24rpx;
+}
+
+.guand {
+  padding-left: 10rpx;
+  line-height: 56rpx;
+  color: #9ca3af
+}
+</style>

src/pages/store/product/detail.vue

@@ -95,6 +95,8 @@ uni.showShareMenu({
   menus: ['shareAppMessage', 'shareTimeline']
 })
 onLoad((option: any) => {
+  console.log("我是商品详情页");
+
   uni.showLoading({
     title: '数据加载中',
     icon: 'none'
@@ -170,7 +172,7 @@ function loadProductDetail() {
     }
 
   }).catch(error => {
-    // console.log(error)
+    console.log(error)
     uni.showToast({
       icon: "none",
       title: error
@@ -253,7 +255,6 @@ function loadCartCount() {
       //     url: '/pages/user/login/index?key=4'
       //   })
       // }, 500)
-
     }
   })
 }
@@ -369,10 +370,23 @@ function handleCreateShopping() {
     //       })
     // }
     console.log('我是error>>>', error);
-    uni.showToast({
-      title: error,
-      icon: 'none'
-    })
+
+    if (error === '请登录') {
+      uni.showToast({
+        title: '请登录',
+        icon: 'none'
+      })
+      setTimeout(() => {
+        uni.navigateTo({
+          url: '/pages/user/login/index'
+        })
+      }, 500)
+    } else {
+      uni.showToast({
+        title: error,
+        icon: 'none'
+      })
+    }
 
   })
 }
@@ -410,10 +424,24 @@ function handleBuyshow() {
     //   })
     // }
     console.log('我是error>>>', error);
-    uni.showToast({
-      title: error,
-      icon: 'none'
-    })
+
+    if (error === '请登录') {
+      uni.showToast({
+        title: '请登录',
+        icon: 'none'
+      })
+      setTimeout(() => {
+        uni.navigateTo({
+          url: '/pages/user/login/index'
+        })
+      }, 500)
+    } else {
+      uni.showToast({
+        title: error,
+        icon: 'none'
+      })
+    }
+
   })
 }
 function handleAddshow() {
@@ -457,10 +485,22 @@ function handleAddshow() {
     //   })
     // }
     console.log('我是error>>>', error);
-    uni.showToast({
-      title: error,
-      icon: 'none'
-    })
+    if (error === '请登录') {
+      uni.showToast({
+        title: '请登录',
+        icon: 'none'
+      })
+      setTimeout(() => {
+        uni.navigateTo({
+          url: '/pages/user/login/index'
+        })
+      }, 500)
+    } else {
+      uni.showToast({
+        title: error,
+        icon: 'none'
+      })
+    }
   })
 }
 // 规格显示双按钮
@@ -682,20 +722,24 @@ onPageScroll((page) => {
             原价 ¥ {{ detail.ot_price }}
           </div>
         </div>
-        <div v-if="!is148Merchant"
-          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" v-if="detail.yanglao">
-            <div>
-              养老金 ¥{{ detail.yanglao }}
+        <div v-if="detail.type != 15">
+          <div v-if="!is148Merchant"
+            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" v-if="detail.yanglao">
+              <div>
+                养老金 ¥{{ detail.yanglao }}
+              </div>
             </div>
           </div>
         </div>
 
+
         <div class="flex flex-col gap-2">
           <div class="flex font-bold flex items-center gap-1" v-if="detail && detail.store_name">
-            <div class="flex bg-primary text-white rounded text-[10px] text-center">
+            <div class="flex bg-primary text-white rounded text-[10px] text-center" v-if="detail.type == 5">
               <div class=" h-4 w-4 ">仓</div>
             </div>
             <div class=" justify-center items-center" v-html="detail.store_name">

src/pages/vip/index.vue

@@ -4,14 +4,14 @@
   <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')">
+        <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="loadList('reload')">
+            <div @tap="searchkwd">
               搜索
             </div>
           </template>
@@ -23,6 +23,7 @@
     <!--      <image :src="homeBanner" mode="widthFix" class="h-10 w-full "></image>-->
 
     <div class="w-screen h-45">
+      <CXBBackTop :Scroll_X="Scroll_X" :isCss="1" />
       <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">
@@ -97,6 +98,7 @@
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import FSearch from "~/components/FSearch/FSearch.vue";
 import { computed } from "vue";
+import type CXBBackTop from "~/components/CXBBackTop/CXBBackTop.vue";
 import { getVipAreaList } from "~/apis/merchant";
 import { CDN_URL } from "~/config/app";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
@@ -135,6 +137,8 @@ const list = ref([])
 const count = ref()
 
 onLoad((option) => {
+  console.log(option.shareId);
+
   if (option && option.shareId) {
     userStore.setShareId(option.shareId)
   }
@@ -143,12 +147,17 @@ onLoad((option) => {
       userStore.setShareId(res.share_id)
     }
   }).catch(message => {
-    // console.log(message)
+    console.log(message)
+    // if (message == '请登录') {
+    //   uni.navigateTo({
+    //     url: '/pages/user/login/index'
+    //   })
+    // }
   })
   userStore.setRedirectPage(`/pages/vip/index`, 'page')
 
   getHomeBanner("user_banner").then(res => {
-    console.log(res)
+    console.log("user_banner", res)
     state.banners = res
   })
   loadList('reload')
@@ -156,6 +165,20 @@ onLoad((option) => {
 
 })
 
+//搜索全部筛选
+function searchkwd() {
+  if (!state.keyword) {
+    return uni.showToast({
+      title: '请输入搜索关键字',
+      icon: 'none'
+    })
+  }
+  state.currentPage = 1
+  state.pageSize = 10
+  state.pageSize = state.count
+  console.log("1111111111", state.currentPage, state.pageSize);
+  loadList('reload')
+}
 
 onShareAppMessage(() => {
   const shareId = Cache.get('SHARE_ID')
@@ -191,14 +214,12 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
   if (state.keyword) {
     params.keyword = state.keyword
   }
-  console.log(params)
+  console.log('我是params', params)
 
   getVipAreaList({
-    // page: state.currentPage,
-    // limit: state.pageSize
     ...params
   }).then(res => {
-    // console.log(res.count)
+    console.log(res.count)
     // console.log(res.list)
     count.value = res.count
     console.log(action);
@@ -208,11 +229,12 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     if (action === 'reload') {
       list.value = res.list
     }
-    if(callback){
+    if (callback) {
       callback(res)
     }
   })
 }
+
 function handleItemClick(item) {
   uni.navigateTo({
     url: `/pages/store/product/detail?id=${item.product_id}`
@@ -222,16 +244,6 @@ function handleItemClick(item) {
 function handleScrollToLower() {
   state.status = 'loading';
   state.currentPage += 1;
-  // 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) {
@@ -246,13 +258,45 @@ onReachBottom(() => {
   handleScrollToLower()
 })
 
+//关闭搜索重新加载页面
+function clearSearch() {
+  console.log(222);
+  uni.showLoading()
+  state.currentPage = 1
+  state.pageSize = 10
+  loadList('reload', (items) => {
+    uni.hideLoading()
+    // uni.stopPullDownRefresh()
+  })
+
+}
+
 onPullDownRefresh(() => {
-  loadList('reload', items => {
-    setTimeout(() => {
-      uni.stopPullDownRefresh()
-    }, 300)
+  console.log(111);
+  uni.showLoading()
+  state.currentPage = 1
+  state.pageSize = 10
+  loadList('reload', (items) => {
+    uni.hideLoading()
+    uni.stopPullDownRefresh()
   })
 })
+
+
+// 距离顶部距离
+let Scroll_X = ref(0)
+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 = ''
+  }
+})
+
+
 </script>
 
 <route lang="yaml">