feat: fix

src/apis/auth.api.ts

@@ -23,9 +23,15 @@ enum API {
 }
 
 
-export function getUpdateAccount(): Promise<{wechat_user_id: string, ali_user_id: string}> {
+/**
+ * 更新绑定微信或支付宝账号
+ */
+export function getUpdateAccount(params: { type: string, openid: string, nickname: string, avatar: string }): Promise<{wechat_user_id: string, ali_user_id: string}> {
     return defHttp.post({
         url: API.USER_UPDATE_ACCOUNT,
+        data: {
+            ...params
+        }
     })
 }
 /**

src/apis/common.ts

@@ -81,6 +81,8 @@ export function closeAccount(phone: string) {
         data: {
             phone
         }
+    }, {
+        withToken: false
     })
 }
 

src/apis/dacang.ts

@@ -14,6 +14,7 @@ enum API {
 	DC_HOME_MERCHANT = '/api/dacang/nologin/dc_home_merchant',
 	// 大仓秒杀商品
 	DC_SECKILL = '/api/dacang/nologin/seckill',
+	DC_SECKILL_INDEX_TIME ='/api/store/product/seckill/select',
 	// 大仓商品列表
 	DC_PRODUCT_LIST = '/api/dacang/nologin/da_cang_product_lst',
 	// 大仓会员商品
@@ -29,6 +30,11 @@ enum API {
 }
 
 
+export function getSeckillIndexTime() {
+	return defHttp.get({
+		url: API.DC_SECKILL_INDEX_TIME
+	})
+}
 /**
  * 大仓 banner 列表
  */

src/apis/user.ts

@@ -57,7 +57,7 @@ enum API {
     GET_USER_UNION_ID = '/api/userMp/getUserUnionid',
     WECHAT_CHECK = '/api/wechat/check',
     AUTH_APPLET_PHONE = '/api/auth/applet_phone',
-    BIND_PHONE = '/api/thrid/binding',
+    BIND_PHONE = '/api/third/binding',
     AUTH_MP = '/api/auth/mp',
 
     // 提现服务费计算
@@ -169,10 +169,24 @@ enum API {
     SPREAD_IMAGE = '/api/user/spread_image?type=wechat'
 }
 
+/**
+ * 生成用户图片
+ * @param params
+ */
+export function getGenerateImage(params: {uid: string, img_id: string}) {
+    return defHttp.post({
+        url: API.POSTER_SERVICE_IMAGES,
+        data: {
+            ...params
+        }
+    }, {
+        withToken: false
+    })
+}
 export function getSpreadImage() {
     return defHttp.get({
+        timeout: 50 * 1000,
         url: API.SPREAD_IMAGE,
-
     })
 }
 /**
@@ -802,6 +816,9 @@ export function bindPhone(params: {
 }) {
     return defHttp.get({
         url: API.BIND_PHONE,
+        data: {
+            ...params
+        }
     })
 }
 

src/components/CXBAuthorize/CXBAuthorize.vue

@@ -83,10 +83,6 @@ const setUserInfo = () => {
   //   title: '正在登录中'
   // })
   Routine.getCode().then( (code: string) => {
-    // uni.navigateTo({
-    //   url: '/pages/users/login/index?key=3'
-    // })
-    // console.log(code)
     getUserInfo(code)
   }).catch( res => {
     uni.hideLoading()

src/components/CXBDialogSignIn/CXBDialogSIgnIn.vue

@@ -92,7 +92,7 @@ function getScoreText(day: number) {
 }
 
 const signInFor = computed(() => {
-  if (props.today === 0) {
+  if (props.today == 0) {
     return getScoreText(props.day)
   }
 })
@@ -101,7 +101,10 @@ function closeHandler(evt: MouseEvent) {
   show.value = false
   emit(CLOSE_EVENT, evt)
 }
-function confirmHandler() {
+function confirmHandler(evt) {
+  show.value = false
+  emit(CLOSE_EVENT, evt)
+
   // 执行签到
   getNewSignIn().then(res => {
     // res.score
@@ -127,12 +130,25 @@ function handleSignInSucceedClose() {
              class="absolute "
       ></image>
       <div class="flex flex-col justify-around items-center relative top-10 gap-3 ">
-        <div class="flex gap-4 mb-4 ">
-          <SignRedPacket
-              v-for="item in 6"
-              :key="item"
-              :day="item"
-          />
+        <div class="flex gap-2 justify-center items-center mb-4 " v-if="props.day <=6 ">
+          <template v-if="props.day > 0">
+
+            <SignRedPacket
+                v-for="item in props.day"
+                :key="item"
+                :day="item"
+                :text="'已签'"
+            />
+
+          </template>
+          <template v-if="(6 - props.day) > 0">
+
+            <SignRedPacket
+                v-for="item in (6 - props.day)"
+                :key="item"
+                :day="item + props.day"
+            />
+          </template>
         </div>
         <div class=" px-4 flex mb-4 ">
           <div class="flex gap-3 ">
@@ -145,6 +161,7 @@ function handleSignInSucceedClose() {
         </div>
 
         <div
+            v-if="props.today == 0"
             @click.stop="confirmHandler"
             class="relative h-13 flex justify-center items-center">
           <image :src="signInBtnImage" mode="widthFix"
@@ -154,6 +171,13 @@ function handleSignInSucceedClose() {
             <div class="text-[#ffe980]">{{ signInFor }}</div>
           </div>
         </div>
+        <div v-else
+             class="relative h-10 flex justify-center items-center rounded-full bg-gray-400">
+          <div class=" flex w-full text-white px-3">
+            明日再来签到吧
+          </div>
+
+        </div>
       </div>
     </div>
     <div

src/components/CXBDialogSignIn/SignRedPacket.vue

@@ -1,26 +1,60 @@
 <script setup lang="ts">
 import {CDN_URL} from "~/config/app";
 
-const signInRedPacketImage = CDN_URL + '/static/assets/sign_in_red_packet.png'
+const signInRedPacketImage = CDN_URL + 'https://cdn.bjtdba.com/chuxubao/static/assets/sign_in_red_packet.png'
 const props = defineProps({
   day: {
     type: Number,
     required: true
+  },
+  text: {
+    type: String,
+  }
+})
+
+const getScore =computed(() => {
+  if (props.day == 1) {
+    return '+2'
+  } else if (props.day == 2) {
+    return '+4'
+  } else if (props.day == 3) {
+    return '+6'
+  } else if (props.day == 4) {
+    return '+10'
+  } else if (props.day == 5) {
+    return '+14'
+  } else if (props.day == 6) {
+    return '+20'
   }
 })
 </script>
 <template>
-  <div class="flex ">
-    <div class="flex flex-col gap-1">
-      <div class="relative flex flex-col h-13 w-full justify-end items-center text-white text-xs">
-        <image :src="signInRedPacketImage"
-               mode="widthFix"
-               class="absolute w-9 h-10"
-        ></image>
-        <div class="relative text-[11px] mb-1">+2</div>
+   <div class=" flex flex-col   items-center  text-xs gap-2" >
+        <div class=" flex flex-col items-center justify-end "
+             :class="text ? 'activeBg' : 'defaultBg'"
+        >
+          <div class="text-[11px] text-white mb-1">{{ getScore }}</div>
+        </div>
+        <div>
+          <div class="relative text-[10px]" v-if="text"> {{ text}} </div>
+          <div class="relative text-[10px]" v-else> 第 {{ props.day }} 天</div>
+        </div>
+
       </div>
-      <div class="relative text-[10px]">第 {{ props.day }} 天</div>
-    </div>
-  </div>
 
-</template>
+</template>
+
+<style>
+.defaultBg {
+  width: 80rpx;
+  height: 116rpx;
+  background-image: url('https://cdn.bjtdba.com/chuxubao/static/assets/sign_in_red_packet.png');
+  background-size: 100% 100%;
+}
+.activeBg {
+  width: 80rpx;
+  height: 116rpx;
+  background-image: url('https://cdn.bjtdba.com/chuxubao/static/assets/hb_yiqiandao_220908.png');
+  background-size: 100% 100%;
+}
+</style>

src/components/CXBDyLive/CXBDyLiveRecommend.vue

@@ -35,10 +35,17 @@ function handleItemClick(item: DyLiveModel) {
     >
       <div v-for="(item,index) in list" :key="index"
            @tap="handleItemClick(item)"
-           class="flex inline-flex pl-2 items-center justify-center relative"
+           class="flex inline-flex pl-2 items-center justify-center"
       >
-          <image :src="item.authorPic" mode="widthFix" class="w-20 h-20 rounded"></image>
-      </div>
+        <div class=" relative">
+          <div class="bg-primary absolute top-0 left-0 w-6 h-6  rounded-br-md rounded-tl-md flex flex-col justify-center items-center">
+            <image src="/static/icon/playing.gif" mode="widthFIx" class="w-3 h-3"></image>
+
+          </div>
+          <image :src="item.authorPic" mode="widthFix" class="w-20 h-20 rounded  border border-solid border-1px border-primary"></image>
+        </div>
+        </div>
+
     </scroll-view>
   </div>
 </template>

src/components/CXBEmpty/CXBEmpty.vue

@@ -3,6 +3,9 @@ import {CDN_URL} from "~/config/app";
 
 const searchEmptyImg = CDN_URL + '/static/assets/search_zanwuxiangguan_220617.png'
 const addressEmptyImg = CDN_URL + '/static/assets/no_address_bg_220624.png'
+
+const messageEmptyImg = CDN_URL + '/static/assets/search_zanwuxiangguan_220617.png'
+
 // search
 const props = defineProps({
   type: {
@@ -24,6 +27,9 @@ const emptyImage = computed(() => {
     case 'address': {
       return addressEmptyImg
     }
+    case 'message': {
+      return messageEmptyImg
+    }
   }
 })
 </script>

src/components/CXBPhoneLoginButton/CXBPhoneLoginButton.vue

@@ -44,40 +44,42 @@ function getPhoneNumber(e) {
             }).then(bindRes => {
               console.log('已绑定手机')
               console.log(bindRes)
+
+              // 跳转
+              switch (props.key) {
+                case '10':
+                  uni.switchTab({
+                    url: '/pages/user/index'
+                  })
+                  break;
+                case '4':
+                  uni.navigateBack({
+                    delta: 2
+                  })
+                  break;
+                case '1':
+                  uni.switchTab({
+                    url: '/pages/order_addcart/index'
+                  })
+                  break;
+                case undefined:
+                  uni.switchTab({
+                    url: '/pages/user/index'
+                  })
+                  break;
+                case '30':
+                  uni.switchTab({
+                    url: '/pages/home/index'
+                  })
+                  break;
+                default:
+                  uni.switchTab({
+                    url: '/pages/home/index'
+                  })
+              }
             })
 
-            // 跳转
-            switch (props.key) {
-              case '10':
-                uni.switchTab({
-                  url: '/pages/user/index'
-                })
-                break;
-              case '4':
-                uni.navigateBack({
-                  delta: 2
-                })
-                break;
-              case '1':
-                uni.switchTab({
-                  url: '/pages/order_addcart/index'
-                })
-                break;
-              case undefined:
-                uni.switchTab({
-                  url: '/pages/user/index'
-                })
-                    break;
-              case '30':
-                uni.switchTab({
-                  url: '/pages/home/index'
-                })
-                    break;
-              default:
-                uni.switchTab({
-                  url: '/pages/home/index'
-                })
-            }
+
             // console.log(authRes)
             // authRes.token
           })

src/components/CXBSkuPopup/CXBSkuPopup.vue

@@ -176,7 +176,7 @@ function handleCountChange(value) {
         </div>
       </div>
 
-      <div class="px-3 ">
+      <div class="px-3 pb-10">
         <FButton
             @click="handleAddCart"
             size="small"

src/components/FSearch/FSearch.vue

@@ -32,18 +32,18 @@ function handleClick() {
       <div
           @click="handleClick"
 
-          class="w-full bg-white rounded-full flex flex-row justify-between items-center border-solid border-1 border-red"
+          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-4 h-4  pl-2 py-1"
+                 class="w-5 h-5  pl-2 py-1"
           ></image>
         <div class="flex flex-1 w-100%">
           <div class="flex-1"></div>
           <div
-              class="bg-[#D71608] text-white text-xs w-11 rounded-full text-center py-1 my-0.5 mr-0.5 "
+              class="bg-[#D71608] text-white text-xs w-11 rounded-full text-center p-1.5  mr-0.5 "
           >
             搜索
           </div>

src/libs/login.ts

@@ -32,7 +32,7 @@ export function easyToLogin(push, pathLogin) {
 		
 		
 	if(!pathLogin)
-		pathLogin = '/pages/users/login/index'
+		pathLogin = '/pages/user/login/index'
 	Cache.set('login_back_url',path);
 	// #ifdef H5 || APP-PLUS
 	// if (isWeixin()) {
@@ -40,9 +40,9 @@ export function easyToLogin(push, pathLogin) {
 	// } else {
 		if (path !== pathLogin) {
 		 push ? uni.navigateTo({
-		 	url:'/pages/users/login/index'
+		 	url:'/pages/user/login/index'
 		 }) : uni.navigateTo({
-		 	url: '/pages/users/login/index'
+		 	url: '/pages/user/login/index'
 		 });
 		}
 	//}
@@ -70,7 +70,7 @@ export function toLogin(push, pathLogin) {
 		// #endif
 		
 	if(!pathLogin)
-		pathLogin = '/pages/users/login/index'
+		pathLogin = '/pages/user/login/index'
 	Cache.set('login_back_url',path);
 	// #ifdef H5 || APP-PLUS
 	// if (isWeixin()) {

src/pages/account-cancel/index.vue

@@ -19,7 +19,14 @@ function handleCancel() {
 
 function onOk() {
   closeAccount(userStore.userInfo.phone).then(res => {
-    reLogin()
+    uni.showToast({
+      title: '注销成功',
+      icon: 'none'
+    }).then(() => {
+      setTimeout(() => {
+        reLogin()
+      }, 500)
+    })
   })
 }
 </script>

src/pages/accumulate-income/index.vue

@@ -3,6 +3,7 @@ import {getUserInviteProfitList} from "~/apis/user";
 import {useUserStore} from "~/stores/userStore";
 import type {AccumulateIncomeModel} from "~/apis/model/accumulateIncomeModel";
 import {Ref} from "vue";
+import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 const userStore = useUserStore()
 const accumulateIncome: Ref<AccumulateIncomeModel | undefined> = ref<AccumulateIncomeModel>()
 const state = reactive({
@@ -22,8 +23,11 @@ const state = reactive({
     // title: '分享收益',
     // createTime: '202020'
   }],
-})
+  scrollHeight: 0,
 
+})
+const {windowHeight} = uni.getSystemInfoSync()
+state.scrollHeight = windowHeight - 320
 onLoad((option: any) => {
   if (userStore.uid) {
     getUserInviteProfitList({
@@ -89,19 +93,25 @@ onLoad((option: any) => {
     </div>
 
     <div class="pb-safe">
-      <div v-if="state.list && state.list.length > 0" class="text-[12px]">
-        <div v-for="(item, index) in state.list" :key="index" class="bg-white p-3 f-hairline-bottom">
-          <div class="flex items-center">
-            <div class="flex flex-col gap-3 flex-1">
-              <div>{{ item.title }}</div>
-              <div class="text-gray">{{ item.createTime }}</div>
+      <scroll-view
+          v-if="state.list && state.list.length > 0"
+          :scroll-y="true"
+          :style="{ height: `${state.scrollHeight}px` }">
+        <div class="text-[12px]">
+          <div v-for="(item, index) in state.list" :key="index" class="bg-white p-3 f-hairline-bottom">
+            <div class="flex items-center">
+              <div class="flex flex-col gap-3 flex-1">
+                <div>{{ item.title }}</div>
+                <div class="text-gray">{{ item.createTime }}</div>
+              </div>
+              <div class="text-sm">+{{ item.number }}</div>
             </div>
-            <div class="text-sm">+{{ item.number }}</div>
+
           </div>
 
         </div>
+      </scroll-view>
 
-      </div>
         <CXBEmpty v-else/>
     </div>
 
@@ -113,7 +123,9 @@ page {
   background: #f8f8f8;
   --nut-menu-item-font-size: 12px;
   --nut-menu-bar-line-height: 24px;
-  --nut-menu-bar-box-shadow: none
+  --nut-menu-bar-box-shadow: none;
+  overflow: hidden;
+
 }
 </style>
 <route lang="yaml">
@@ -121,4 +133,6 @@ style:
   navigationBarBackgroundColor: "#FD1642"
   navigationBarTextStyle: "white"
   navigationBarTitleText: 累计收益
+  enablePullDownRefresh: false
+
 </route>

src/pages/annuity/index.vue

@@ -238,7 +238,7 @@ page {
 <route lang="yaml">
 style:
   navigationBarTitleText: 我的养老金
-  enablePullDownRefresh: true
+  enablePullDownRefresh: false
   navigationBarBackgroundColor: "#fe0032"
   navigationBarTextStyle: "white"
 </route>

src/pages/dacang/list/components/dacang-header.vue

@@ -3,8 +3,10 @@ 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 {useDacangStore} from "~/stores/dacangStore";
 // import {useUserStore} from "~/stores/userStore";
 const userStore = useUserStore()
+const dacangStore = useDacangStore()
 
 const systemInfo = uni.getSystemInfoSync()
 const statusBarHeight = systemInfo.statusBarHeight ?? 0
@@ -45,9 +47,17 @@ const props = defineProps({
     default: NaN
   },
   current: {
-    type: String
+    type: String,
+    default: '-1'
   }
 })
+
+const tabValue = ref(dacangStore.currentClassify)
+
+
+watch(() => dacangStore.currentClassify, (val) => {
+  tabValue.value = val
+})
 function handleClick() {
   if (userStore.userInfo) {
     uni.navigateTo({
@@ -67,24 +77,27 @@ const emit = defineEmits<{
   (e: 'click:item', value:string): void
 }>()
 function handleTabItemClick(currentTab) {
-  emit('click:item', currentTab)
+  emit('click:item', tabValue.value)
+}
+function handleShowSearchPage() {
+  uni.navigateTo({
+    url: '/pages/search/search-dacang'
+  })
 }
-
 </script>
 <template>
-  <div class="home-header fixed w-screen text-white z-10 w-full h-32"
+  <div class="dacang-header fixed w-screen text-white z-10 w-full h-20"
+       :style="navBarStyle"
        :class="exClass"
   >
-    <div class="pl-2 pt-2"
-         :style="navBarStyle"
-    >
+    <div class="pl-2 pt-2">
       <div class="w-60% bg-white rounded-full flex flex-row justify-between items-center border-solid border-1 border-red">
 
         <image src="https://cdn.bjtdba.com/vod/image/2023-02-15/20230215112840149.png"
                mode="widthFix"
                class="w-4 h-4  pl-2 py-1"
         ></image>
-        <div class="flex flex-1 items-center w-100%">
+        <div class="flex flex-1 items-center w-100%" @tap.stop="handleShowSearchPage">
           <div class="flex-1 pl-2 text-gray">搜索商品关键词</div>
           <div class="bg-[#D71608] text-white text-xs w-11 rounded-full text-center py-1 my-0.5 mr-0.5 ">
             搜索
@@ -97,11 +110,26 @@ function handleTabItemClick(currentTab) {
     </div>
 
 <!--    <div class="p-3">-->
-      <div class=" mr-6 mb-3">
-        <FTabs :tabs="tabs" :ex-class="exClass" @click:item="handleTabItemClick"/>
+      <div class=" ">
+       <nut-tabs v-model="tabValue" title-scroll title-gutter="10" name="catePanel" @change="handleTabItemClick">
+<!--         <nut-tab-panel :title="全部"></nut-tab-panel>-->
+          <nut-tab-pane v-for="item in tabs" :title="item.cate_name"
+                        :pane-key="item.store_category_id"
+                        :key="item.store_category_id"
+          >
+          </nut-tab-pane>
+       </nut-tabs>
 
       </div>
 <!--    </div>-->
 
   </div>
 </template>
+<style>
+.dacang-header {
+  --nut-tabs-horizontal-tab-line-color: #fff;
+  --nut-tabs-titles-background-color: none;
+  --nut-tabs-titles-item-color: #fff;
+  --nut-tabs-titles-item-active-color: #fff;
+}
+</style>

src/pages/dacang/list/index.vue

@@ -8,9 +8,11 @@ import {useDacangStore} from "~/stores/dacangStore";
 import {CDN_URL} from "~/config/app";
 import DacangHeader from "~/pages/dacang/list/components/dacang-header.vue";
 const headerImage = CDN_URL + `/static/assets/banner-dacang.png`
+const usePageStore = usePageStoreWidthOut()
+
 
 const state = reactive({
-  tabs: [],
+  tabs: [{store_category_id: '-1', cate_name: '全部'}],
   productList: <Array<DcProductModel>>[],
 
   currentClassify: '',
@@ -25,52 +27,44 @@ const state = reactive({
 
 const dacangStore = useDacangStore()
 
-const currentTab = ref()
-const classifyId = computed(() => {
-  return useDacangStore().$state.currentClassify
-})
-
-watch(() => classifyId.value, (val) => {
-  // currentTab.value = val
-  // state.currentClassify = val
-  // loadDcProductList(classifyId.value)
-  loadList('reload')
+onLoad(async () => {
+  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'
+    }
+  })
 })
-onShow((options) => {
-  // console.log(classifyId.value)
-
-  // if (options.id) {
-  // if (!classifyId.value) {
-    // loadDcProductList(dacangStore.currentClassify)
-    loadList('reload')
-  // }
-  // } else {
-  // }
-  getDcProductClassify().then(res => {
-    // console.log(res)
-    state.tabs = res
+onShow(async (options) => {
+  usePageStore.setPageConfig({
+    currentPage: {
+      type: 'tab',
+      url:  '/pages/dacang/list/index'
+    }
   })
-
+  loadList('reload')
 })
 
 function loadList(action: 'page' | 'reload', callback?: (items) => void) {
-  const params = {
+
+  let params: any = {
     page: state.currentPage,
     limit: state.pageSize,
-    // classify: state.currentClassify,
-    classify: classifyId.value,
     keyword: state.keyword
   }
+  if (dacangStore.currentClassify !== '-1') {
+    params.classify = dacangStore.currentClassify
+  }
+
   if (action === 'reload') {
     params.page = 1
   }
 
   getDcProductList({
     ...params
-    // page: state.currentPage,
-    // limit: state.pageSize,
-    // classify,
-    // keyword: ''
   }).then(res => {
     if (action === 'page') {
       state.productList = state.productList.concat(res)
@@ -82,16 +76,15 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     if (callback) {
       callback(res)
     }
-    // state.productList = res
   })
 }
 
-function handleTabItemClick(tabItem) {
-  state.currentClassify = tabItem
-  // if (!currentTab || currentTab == '') {
-  //   loadList(tabItem)
-  dacangStore.setClassify(tabItem)
-  loadList('reload')
+function handleTabItemClick(classifyId) {
+  state.currentClassify = classifyId
+  dacangStore.setClassify(classifyId)
+  setTimeout(() => {
+    loadList('reload')
+  }, 300)
   // }
 }
 
@@ -107,12 +100,7 @@ onPageScroll((page) => {
 })
 
 onReachBottom(() => {
-  console.log(classifyId)
   uni.showLoading()
-  console.log(state.currentClassify)
-  if (!state.currentClassify) {
-    state.currentClassify = classifyId
-  }
 
   state.status = 'loading'
   state.currentPage += 1
@@ -133,53 +121,14 @@ onPullDownRefresh(() => {
   })
 })
 
-function handleShowSearchPage() {
-  uni.navigateTo({
-    url: '/pages/search/search-dacang'
-  })
-}
+
 </script>
 <template>
   <div class="h-screen">
-<!--    <DacangHeader fixed-->
-<!--                  :tabs="state.tabs"-->
-<!--                  :ex-class="headerClass"-->
-<!--                  :current="classifyId"-->
-<!--                  @click:item="handleTabItemClick"-->
-<!--    />-->
-    <div class=" fixed"  :class="headerClass">
-      <div :class="headerClass">
-        <FNavBar :fixed="true" exClass="pl-2 z-10">
-          <div
-              @click="handleShowSearchPage"
-              class="w-60% bg-white rounded-full flex flex-row justify-between items-center border-solid border-1 border-red"
-          >
-
-            <image src="https://cdn.bjtdba.com/vod/image/2023-02-15/20230215112840149.png"
-                   mode="widthFix"
-                   class="w-4 h-4  pl-2 py-1"
-            ></image>
-            <div class="flex flex-1 items-center w-100%">
-              <div class="flex-1 pl-2 text-gray">搜索商品关键词</div>
-              <div class="bg-[#D71608] text-white text-xs w-11 rounded-full text-center py-1 my-0.5 mr-0.5 ">
-                搜索
-              </div>
-            </div>
-
-
-          </div>
-
-        </FNavBar>
-        <FTabs class="fixed" :tabs="state.tabs" :current="classifyId" @click:item="handleTabItemClick"/>
-      </div>
+    <DacangHeader :ex-class="headerClass" :tabs="state.tabs" @click:item="handleTabItemClick"/>
 
-    </div>
-
-<!--    <FSearch :fixed="true"/>-->
     <div class="flex flex-col gap-2 ">
       <image :src="headerImage" 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'">
@@ -197,8 +146,14 @@ function handleShowSearchPage() {
 page {
   background-color: #f8f8f8;
 }
+
+.nut-tab-pane {
+  display: none !important;
+}
+
+
 </style>
-<route lang="yaml">
+<route lang="yaml" >
 style:
   navigationStyle: custom
   navigationBarTitleText: 储蓄保

src/pages/dacang/test.json

@@ -0,0 +1,403 @@
+{
+  "status": 200,
+  "message": "success",
+  "data": {
+    "count": 17,
+    "list": [
+      {
+        "product_id": "5463",
+        "mer_id": "430",
+        "brand_id": "0",
+        "unit_name": "瓶",
+        "rate": "5",
+        "reply_count": "0",
+        "store_info": "每份含：维生素E                                        20.00毫克α-生育酚当量（mg α-TE）                                        \n维生素C(抗坏血酸)                                100.0毫克（mg）\n烟酸（烟酰胺）                                   20.00毫克（mg） 虾青素48   ",
+        "cate_id": "461",
+        "image": "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/2be1e202305181552239523.jpg",
+        "slider_image": [
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/23944202305181552315169.jpg",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/ae50b202305181552314235.jpg",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/cf414202305181552313904.jpg",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/442a2202305181552317781.jpg",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/2be1e202305181552239523.jpg"
+        ],
+        "store_name": "江中维生素C维生素E雨生红球藻片   ",
+        "keyword": "",
+        "sort": "0",
+        "is_show": "1",
+        "sales": 100,
+        "price": "29.90",
+        "refusal": null,
+        "cost": "14.00",
+        "ot_price": "29.90",
+        "stock": "2997",
+        "is_gift_bag": "0",
+        "care_count": null,
+        "status": "1",
+        "is_used": "1",
+        "create_time": "2023-05-18 15:57:07",
+        "seckill": "0",
+        "plate_mer_profit": null,
+        "type": "1",
+        "yanglao": "2.99",
+        "special_merchant": "beishengtang",
+        "issetCoupon": null
+      },
+      {
+        "product_id": "5462",
+        "mer_id": "430",
+        "brand_id": "0",
+        "unit_name": "瓶",
+        "rate": "5",
+        "reply_count": "0",
+        "store_info": "江中 DHA藻油核桃油",
+        "cate_id": "461",
+        "image": "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/cfd36202305181548281151.jpg",
+        "slider_image": [
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/88694202305181548455604.jpg",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/bcd3c202305181548453014.jpg",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/90a15202305181548452855.jpg",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/e180e202305181548451652.jpg",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/cfd36202305181548281151.jpg"
+        ],
+        "store_name": "江中 DHA藻油核桃油",
+        "keyword": "",
+        "sort": "0",
+        "is_show": "1",
+        "sales": 100,
+        "price": "59.90",
+        "refusal": null,
+        "cost": "21.00",
+        "ot_price": "59.90",
+        "stock": "2997",
+        "is_gift_bag": "0",
+        "care_count": null,
+        "status": "1",
+        "is_used": "1",
+        "create_time": "2023-05-18 15:51:59",
+        "seckill": "0",
+        "plate_mer_profit": null,
+        "type": "1",
+        "yanglao": "5.99",
+        "special_merchant": "beishengtang",
+        "issetCoupon": null
+      },
+      {
+        "product_id": "5461",
+        "mer_id": "430",
+        "brand_id": "0",
+        "unit_name": "瓶",
+        "rate": "5",
+        "reply_count": "0",
+        "store_info": "【原料】乳酸亚铁，叶酸\n【辅料】麦芽糊精，微晶纤维素，硬脂酸镁",
+        "cate_id": "0",
+        "image": "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/a5049202305181527302560.png",
+        "slider_image": [
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/d860f202305181527404017.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/37b2c20230518152740881.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/3c3b2202305181527405170.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/a5049202305181527302560.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/0a3bf202305181527409706.png"
+        ],
+        "store_name": "博客健牌铁叶酸片",
+        "keyword": "",
+        "sort": "0",
+        "is_show": "1",
+        "sales": 100,
+        "price": "32.90",
+        "refusal": null,
+        "cost": "12.00",
+        "ot_price": "35.90",
+        "stock": "2997",
+        "is_gift_bag": "0",
+        "care_count": null,
+        "status": "1",
+        "is_used": "1",
+        "create_time": "2023-05-18 15:35:02",
+        "seckill": "0",
+        "plate_mer_profit": null,
+        "type": "1",
+        "yanglao": "3.29",
+        "special_merchant": "beishengtang",
+        "issetCoupon": null
+      },
+      {
+        "product_id": "5460",
+        "mer_id": "430",
+        "brand_id": "0",
+        "unit_name": "瓶",
+        "rate": "5",
+        "reply_count": "0",
+        "store_info": "【标志性成分及含量】每粒含维生素E:10.5mg",
+        "cate_id": "461",
+        "image": "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/0aa9e202305181108113656.jpg",
+        "slider_image": [
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/95c20202305181108224720.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/7f6d5202305181108225737.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/90182202305181108221266.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/be54d202305181108223169.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/0aa9e202305181108113656.jpg"
+        ],
+        "store_name": "比博牌维生素E软胶囊",
+        "keyword": "",
+        "sort": "0",
+        "is_show": "1",
+        "sales": 100,
+        "price": "33.90",
+        "refusal": null,
+        "cost": "14.00",
+        "ot_price": "36.90",
+        "stock": "2997",
+        "is_gift_bag": "0",
+        "care_count": null,
+        "status": "1",
+        "is_used": "1",
+        "create_time": "2023-05-18 11:12:05",
+        "seckill": "0",
+        "plate_mer_profit": null,
+        "type": "1",
+        "yanglao": "3.39",
+        "special_merchant": "beishengtang",
+        "issetCoupon": null
+      },
+      {
+        "product_id": "5459",
+        "mer_id": "430",
+        "brand_id": "0",
+        "unit_name": "瓶",
+        "rate": "5",
+        "reply_count": "0",
+        "store_info": "【标志性成分及含量】每片含钙200mg，铁4.4mg，锌5.1mg，维生素c50mg，维生素e30mg",
+        "cate_id": "461",
+        "image": "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/b0795202305181103352751.png",
+        "slider_image": [
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/3c0fa2023051811035627.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/790cd202305181103563016.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/cd12c202305181103564928.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/fc98e202305181103559052.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/463a1202305181103564472.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/062ef202305181103566221.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/b0795202305181103352751.png"
+        ],
+        "store_name": "多种维生素矿物质片 ",
+        "keyword": "",
+        "sort": "0",
+        "is_show": "1",
+        "sales": 100,
+        "price": "33.90",
+        "refusal": null,
+        "cost": "13.00",
+        "ot_price": "39.90",
+        "stock": "2997",
+        "is_gift_bag": "0",
+        "care_count": null,
+        "status": "1",
+        "is_used": "1",
+        "create_time": "2023-05-18 11:07:44",
+        "seckill": "0",
+        "plate_mer_profit": null,
+        "type": "1",
+        "yanglao": "3.39",
+        "special_merchant": "beishengtang",
+        "issetCoupon": null
+      },
+      {
+        "product_id": "5458",
+        "mer_id": "430",
+        "brand_id": "0",
+        "unit_name": "瓶",
+        "rate": "5",
+        "reply_count": "0",
+        "store_info": "【标志性成分及含量】每100g含：大豆异黄酮7.0mg",
+        "cate_id": "461",
+        "image": "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/fc269202305181059314928.png",
+        "slider_image": [
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/65130202305181059511565.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/fc9c7202305181059515423.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/6b355202305181059514033.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/f9e85202305181059513551.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/fc269202305181059314928.png"
+        ],
+        "store_name": "大豆异黄酮维E软胶囊",
+        "keyword": "",
+        "sort": "0",
+        "is_show": "1",
+        "sales": 100,
+        "price": "69.90",
+        "refusal": null,
+        "cost": "23.00",
+        "ot_price": "69.90",
+        "stock": "2997",
+        "is_gift_bag": "0",
+        "care_count": null,
+        "status": "1",
+        "is_used": "1",
+        "create_time": "2023-05-18 11:03:05",
+        "seckill": "0",
+        "plate_mer_profit": null,
+        "type": "1",
+        "yanglao": "6.99",
+        "special_merchant": "beishengtang",
+        "issetCoupon": null
+      },
+      {
+        "product_id": "5457",
+        "mer_id": "430",
+        "brand_id": "0",
+        "unit_name": "瓶",
+        "rate": "5",
+        "reply_count": "0",
+        "store_info": "【原料】葛根提取物、苦瓜提取物、吡啶甲酸铭\n【辅料】硬脂酸镁\n",
+        "cate_id": "461",
+        "image": "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/9d4d120230518105519520.png",
+        "slider_image": [
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/e3fba202305181055524789.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/883d5202305181055527554.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/8ba3d202305181055528062.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/cd18a202305181055526984.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/45045202305181055528969.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/dff8b20230518105552436.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/9d4d120230518105519520.png"
+        ],
+        "store_name": "金奥力牌葛根苦瓜铬胶囊",
+        "keyword": "",
+        "sort": "0",
+        "is_show": "1",
+        "sales": 100,
+        "price": "66.90",
+        "refusal": null,
+        "cost": "23.00",
+        "ot_price": "69.90",
+        "stock": "2997",
+        "is_gift_bag": "0",
+        "care_count": null,
+        "status": "1",
+        "is_used": "1",
+        "create_time": "2023-05-18 10:59:00",
+        "seckill": "0",
+        "plate_mer_profit": null,
+        "type": "1",
+        "yanglao": "6.69",
+        "special_merchant": "beishengtang",
+        "issetCoupon": null
+      },
+      {
+        "product_id": "5456",
+        "mer_id": "430",
+        "brand_id": "0",
+        "unit_name": "瓶",
+        "rate": "5",
+        "reply_count": "0",
+        "store_info": "主要原料】蜂胶、聚乙二醇400、甘油、明胶、纯净水",
+        "cate_id": "461",
+        "image": "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/ffe5e202305181050185807.png",
+        "slider_image": [
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/4eeb7202305181050443996.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/48f57202305181050442235.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/9d884202305181050442685.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/ffe5e202305181050185807.png"
+        ],
+        "store_name": "蜂胶胶囊",
+        "keyword": "",
+        "sort": "0",
+        "is_show": "1",
+        "sales": 100,
+        "price": "66.90",
+        "refusal": null,
+        "cost": "32.00",
+        "ot_price": "69.90",
+        "stock": "2997",
+        "is_gift_bag": "0",
+        "care_count": null,
+        "status": "1",
+        "is_used": "1",
+        "create_time": "2023-05-18 10:54:44",
+        "seckill": "0",
+        "plate_mer_profit": null,
+        "type": "1",
+        "yanglao": "6.69",
+        "special_merchant": "beishengtang",
+        "issetCoupon": null
+      },
+      {
+        "product_id": "5455",
+        "mer_id": "430",
+        "brand_id": "0",
+        "unit_name": "瓶",
+        "rate": "5",
+        "reply_count": "0",
+        "store_info": "【原料】左旋肉城酒石酸盐、绿茶提取物\n【辅料】二氧化硅、硬脂酸镁\n",
+        "cate_id": "461",
+        "image": "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/e8aa5202305181044387021.png",
+        "slider_image": [
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/c19c1202305181044485542.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/f9bc5202305181044485264.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/74b93202305181044484139.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/c521920230518104448649.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/e8aa5202305181044387021.png"
+        ],
+        "store_name": "美林康牌左旋肉碱绿茶胶囊",
+        "keyword": "",
+        "sort": "0",
+        "is_show": "1",
+        "sales": 100,
+        "price": "66.00",
+        "refusal": null,
+        "cost": "24.00",
+        "ot_price": "69.00",
+        "stock": "2997",
+        "is_gift_bag": "0",
+        "care_count": null,
+        "status": "1",
+        "is_used": "1",
+        "create_time": "2023-05-18 10:48:47",
+        "seckill": "0",
+        "plate_mer_profit": null,
+        "type": "1",
+        "yanglao": "6.60",
+        "special_merchant": "beishengtang",
+        "issetCoupon": null
+      },
+      {
+        "product_id": "5454",
+        "mer_id": "430",
+        "brand_id": "0",
+        "unit_name": "瓶",
+        "rate": "5",
+        "reply_count": "0",
+        "store_info": "【原料】纳豆、红曲粉\n【辅料】硬脂酸镁",
+        "cate_id": "461",
+        "image": "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/896bb202305181040075571.png",
+        "slider_image": [
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/b7667202305181040166080.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/9ad59202305181040166801.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/d7899202305181040166781.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/d8d6d202305181040165060.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/1c44820230518104016981.png",
+          "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-05-18\/896bb202305181040075571.png"
+        ],
+        "store_name": "金奥力牌纳豆红曲胶囊",
+        "keyword": "",
+        "sort": "0",
+        "is_show": "1",
+        "sales": 100,
+        "price": "76.00",
+        "refusal": null,
+        "cost": "23.00",
+        "ot_price": "79.00",
+        "stock": "2997",
+        "is_gift_bag": "0",
+        "care_count": null,
+        "status": "1",
+        "is_used": "1",
+        "create_time": "2023-05-18 10:44:02",
+        "seckill": "0",
+        "plate_mer_profit": null,
+        "type": "1",
+        "yanglao": "7.60",
+        "special_merchant": "beishengtang",
+        "issetCoupon": null
+      }
+    ]
+  }
+}

src/pages/guest_member_new/index.vue

@@ -39,7 +39,12 @@ const chuangkeList = [{
   title: "推广引流",
   icon: CDN_URL + '/static/assets/tgyl_221013.png'
 }]
-
+const isMerchant = ref(0)
+onLoad((options) => {
+  if (options && options.is_merchant) {
+    isMerchant.value = options.is_merchant
+  }
+})
 function handleToShopApplet() {
   uni.navigateToMiniProgram({
     appId: 'wx9a3e4ab07f8a9ba2',
@@ -82,7 +87,8 @@ function handleToShopApplet() {
             @tap="handleToShopApplet"
             class="w-full flex flex-col justify-center items-center py-4"
         >
-          <image :src="immediately_available_221013Image" mode="widthFix" class="w-50"></image>
+          <nut-button type="primary" v-if="isMerchant == '1'">我的创客店</nut-button>
+          <image v-else :src="immediately_available_221013Image" mode="widthFix" class="w-50"></image>
         </div>
       </div>
     </div>

src/pages/home/components/banner.vue

@@ -1,10 +1,18 @@
 <script lang="ts" setup>
 import {CDN_URL} from "~/config/app";
+const userStore = useUserStore()
 
 function handleGuestMemberNew() {
-  uni.navigateTo({
-    url: '/pages/guest_member_new/index'
-  })
+  console.log(userStore.userInfo)
+  if (userStore.uid) {
+    uni.navigateTo({
+      url: `/pages/guest_member_new/index?is_merchant=${userStore.userInfo.is_merchant}`
+    })
+  } else {
+    uni.navigateTo({
+      url: '/pages/user/login/index'
+    })
+  }
 }
 const image = CDN_URL + '/static/assets/chuxubao_huiyuan_220818.png'
 </script>

src/pages/home/components/header.vue

@@ -8,6 +8,8 @@ const userStore = useUserStore()
 
 const systemInfo = uni.getSystemInfoSync()
 const statusBarHeight = systemInfo.statusBarHeight ?? 0
+const menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+
 const navBarHeight = computed(() => {
   // const propsHeight = Number(props.height)
   let defaultHeight = 44
@@ -16,6 +18,7 @@ const navBarHeight = computed(() => {
   const menuButtonInfo = uni.getMenuButtonBoundingClientRect()
   const menuHeight = menuButtonInfo.height
   const menuTop = menuButtonInfo.top
+  // console.log(menuButtonInfo)
   defaultHeight = (menuTop - statusBarHeight) * 2 + menuHeight
   // }
   // #endif
@@ -57,37 +60,52 @@ function handleClick() {
 // function handleShowSearchPage() {
 //
 // }
+
+function handleShowMessage() {
+  uni.navigateTo({
+    url: '/pages/message/index'
+  })
+}
 </script>
 <template>
   <div class="home-header fixed w-screen text-white z-10"
        :style="navBarStyle"
        :class="exClass"
   >
-    <div
-        @click="handleClick"
-        class="flex gap-2 mb-2 pl-2"
-    >
-      <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-else>登录</div>
-        <div class="text-xs" v-if="!isNaN(yanglaojin) && userStore.userInfo">{{ yanglaojin }}元养老金</div>
-        <div v-else class="text-xs">
-          领取养老金
+    <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 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-else>登录</div>
+          <div class="text-xs" v-if="!isNaN(yanglaojin) && userStore.userInfo">{{ yanglaojin }}元养老金</div>
+          <div v-else class="text-xs">
+            领取养老金
+          </div>
         </div>
+
+      </div>
+      <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>
       </div>
-    </div>
 
+
+    </div>
     <div class="p-3">
       <FSearch />
 

src/pages/home/components/navs.vue

@@ -6,7 +6,7 @@ import {CDN_URL} from "~/config/app";
 
 const navList = ref([{
   image: CDN_URL + '/static/home-nav/home_dacang_220614.png',
-  title: '城中大仓',
+  title: '大仓',
   key: PLATFORM_NAME.DC
 }, {
   image: CDN_URL + '/static/home-nav/home_xianshimiaosha_220614.png',

src/pages/home/index.vue

@@ -15,6 +15,14 @@ import {CDN_URL} from "~/config/app";
 // import CXBDialogSIgnIn from "~/components/CXBDialogSignIn/CXBDialogSIgnIn.vue";
 // import CXBDialogSIgnInSucceed from "~/components/CXBDialogSignInSucceed/CXBDialogSIgnInSucceed.vue";
 const userStore = useUserStore()
+const usePageStore = usePageStoreWidthOut()
+usePageStore.setPageConfig({
+  currentPage: {
+    type: 'tab',
+    url:  '/pages/home/index'
+  }
+})
+console.log(usePageStore.currentPage)
 
 // const list = ref([])
 const state = reactive({
@@ -34,6 +42,12 @@ const state = reactive({
   announcementList: []
 })
 onShow(() => {
+  usePageStore.setPageConfig({
+    currentPage: {
+      type: 'tab',
+      url:  '/pages/home/index'
+    }
+  })
   if (!userStore.uid) {
     state.closeMoney = ''
     state.openMoney = ''
@@ -45,6 +59,7 @@ onShow(() => {
       state.all_yanglao = res.all_yanglao
     })
   }
+
 })
 onLoad(() => {
   getLocal()
@@ -162,7 +177,7 @@ page {
   background-color: #f8f8f8;
 }
 </style>
-<route lang="yaml"  type="home">
+<route lang="yaml" >
 style:
   navigationStyle: custom
   navigationBarTitleText: 储蓄保

src/pages/immediate-withdrawal/index.vue

@@ -11,6 +11,7 @@ import {SpreadInfoModel} from "~/apis/model/spreadInfoModel";
 import type {UserYanglaoJinModel} from "~/apis/model/userYanglaoJinModel";
 import {CDN_URL} from "~/config/app";
 import {isNumber} from "~/utils";
+
 const zfb_logoImage = CDN_URL + '/static/assets/zfb_logo.png'
 const wx_logoImage = CDN_URL + '/static/assets/wx_logo.png'
 const userStore = useUserStore()
@@ -24,6 +25,7 @@ const widthdrawalConfig = ref({})
 const cashWithdrawalAmount = ref()
 
 const isDisabled = ref(true)
+const userBrokeragePrice = ref(0)
 // userSpreadInfo.value.brokerage_price
 onLoad(async () => {
   await userStore.getUserInfo()
@@ -34,6 +36,19 @@ onLoad(async () => {
 
   // 提现配置
   widthdrawalConfig.value = await getWithdrawalConfig()
+
+  console.log(widthdrawalConfig.value)
+  userBrokeragePrice.value = userSpreadInfo.value?.brokerage_price ? parseFloat(userSpreadInfo.value?.brokerage_price) : 0
+  console.log(userBrokeragePrice.value)
+  // if (userSpreadInfo.value?.brokerage_price) {
+    if (userBrokeragePrice.value < widthdrawalConfig.value.withdrawal_money) {
+      isDisabled.value = true
+      return uni.showToast({
+        title: '满' + widthdrawalConfig.value.withdrawal_money + '才可以提现~',
+        icon: 'none'
+      })
+    }
+  // }
 })
 
 watch(() => cashWithdrawalAmount.value, (val) => {
@@ -49,9 +64,10 @@ watch(() => cashWithdrawalAmount.value, (val) => {
     withdrawalCal.value = {}
   }
 })
+
 function handleInputAll() {
   // console.log(userSpreadInfo.value?.brokerage_price)
-  if (userSpreadInfo.value && userSpreadInfo.value.brokerage_price && Number.parseFloat(userSpreadInfo.value?.brokerage_price) >= 100 ) {
+  if (userSpreadInfo.value && userSpreadInfo.value.brokerage_price && Number.parseFloat(userSpreadInfo.value?.brokerage_price) >= widthdrawalConfig.value.widthdrawal_money) {
     cashWithdrawalAmount.value = userSpreadInfo.value.brokerage_price
   } else {
     uni.showToast({
@@ -60,6 +76,7 @@ function handleInputAll() {
     })
   }
 }
+
 /**
  * 立即提现
  */
@@ -67,13 +84,6 @@ function handleImmediateWithdrawal() {
   if (isDisabled.value) {
     return
   }
-  // 1 判断是否需要实名
-  if (!yanglaojin.value?.is_certification == 1) {
-    return uni.navigateTo({
-      url: '/pages/real-name-authentication/index'
-    })
-  }
-
   if (widthdrawalConfig.value.withdrawal_status == '0') {
     isDisabled.value = true
     return uni.showToast({
@@ -89,29 +99,48 @@ function handleImmediateWithdrawal() {
       icon: 'none'
     })
   }
-  if (Number.parseFloat(cashWithdrawalAmount.value) > Number.parseFloat(userSpreadInfo.value?.brokerage_price) ) {
-    isDisabled.value = true
+
+    if (userBrokeragePrice.value < widthdrawalConfig.value.withdrawal_money) {
+      return uni.showToast({
+        title: '满' + widthdrawalConfig.value.withdrawal_money + '才可以提现~',
+        icon: 'none'
+      })
+    }
+
+  if (Number.parseFloat(cashWithdrawalAmount.value) <= Number.parseFloat(userBrokeragePrice.value) < widthdrawalConfig.value.withdrawal_money) {
+    // 1 判断是否需要实名
+    if (!yanglaojin.value?.is_certification == 1) {
+      return uni.navigateTo({
+        url: '/pages/real-name-authentication/index'
+      })
+    }
+
+
     return uni.showToast({
-      title: '输入金额超过可提现余额',
+      title: '满' + widthdrawalConfig.value.withdrawal_money + '才可以提现~',
       icon: 'none'
     })
   }
 
-  if (userSpreadInfo.value?.brokerage_price) {
-    if (userSpreadInfo.value?.brokerage_price < widthdrawalConfig.value.withdrawal_money) {
-      isDisabled.value = true
-      return uni.showToast({
-        title: '满' + widthdrawalConfig.value.withdrawal_money + '才可以提现',
-        icon: 'none'
+  if (Number.parseFloat(cashWithdrawalAmount.value) >= Number.parseFloat(userBrokeragePrice.value) >= widthdrawalConfig.value.withdrawal_money) {
+    // 1 判断是否需要实名
+    if (!yanglaojin.value?.is_certification == 1) {
+      return uni.navigateTo({
+        url: '/pages/real-name-authentication/index'
       })
     }
-  } else {
-    return
+
+
+    return uni.showToast({
+      title: '输入金额超过可提现余额',
+      icon: 'none'
+    })
   }
 
 
 
-  getApplicationWithdrawal({ extract_price: cashWithdrawalAmount.value, extract_type: 1}).then(res => {
+
+  getApplicationWithdrawal({extract_price: cashWithdrawalAmount.value, extract_type: 1}).then(res => {
     // uni.showToast({
     //   title: res,
     //   icon: 'none'
@@ -124,6 +153,11 @@ function handleImmediateWithdrawal() {
         url: '/pages/immediate-withdrawal/index'
       })
     })
+  }).catch(error => {
+    uni.showToast({
+      title: error,
+      icon: 'none'
+    })
   })
 
 
@@ -151,7 +185,7 @@ function handleShowAgreement(type) {
     <div class="bg-white rounded-lg text-sm p-3 flex flex-col gap-4">
       <div class="flex justify-between">
         <div class="font-bold">提现金额</div>
-        <div class="text-xs text-gray" @click="handleShowAgreement(12)">提现规则</div>
+        <div class="text-xs text-gray" @click="handleShowAgreement(6)">提现规则</div>
       </div>
       <div class="flex justify-center items-center pt-4 f-hairline-bottom">
         <div class="text-lg font-bold">￥</div>
@@ -165,7 +199,7 @@ function handleShowAgreement(type) {
       </div>
       <div class="flex text-gray items-center gap-3 text-sm">
         <div v-if="userSpreadInfo">
-          可用余额￥：{{ userSpreadInfo.brokerage_price }}
+          可用余额￥：{{ userBrokeragePrice }}
         </div>
         <div v-if="userStore.userInfo">
           可用积分：{{ userStore.userInfo.score }}
@@ -188,15 +222,15 @@ function handleShowAgreement(type) {
           </div>
         </div>
 
-<!--        <div class="flex items-center justify-between py-3">-->
-<!--          <div class="flex items-center gap-2">-->
-<!--            <image :src="zfb_logoImage" mode="widthFix" class="w-8 h-8"></image>-->
-<!--            <div>支付宝支付</div>-->
-<!--            </div>-->
-<!--            <div>-->
-<!--              <radio />-->
-<!--            </div>-->
-<!--          </div>-->
+        <!--        <div class="flex items-center justify-between py-3">-->
+        <!--          <div class="flex items-center gap-2">-->
+        <!--            <image :src="zfb_logoImage" mode="widthFix" class="w-8 h-8"></image>-->
+        <!--            <div>支付宝支付</div>-->
+        <!--            </div>-->
+        <!--            <div>-->
+        <!--              <radio />-->
+        <!--            </div>-->
+        <!--          </div>-->
       </div>
     </div>
 
@@ -204,7 +238,8 @@ function handleShowAgreement(type) {
       <div class=" flex rounded-full bg-red-300">
         <nut-button type="primary" block
                     :disabled="isDisabled"
-             @tap="handleImmediateWithdrawal"
+                    :class="isDisabled && 'bg-gray-800'"
+                    @tap="handleImmediateWithdrawal"
         >
           立即提现
         </nut-button>
@@ -214,7 +249,7 @@ function handleShowAgreement(type) {
         <div>详细说明</div>
         <div>平台服务费 {{ withdrawalCal.service }}</div>
         <div>本次提取将扣除服务费 ¥{{ withdrawalCal.service_money }}</div>
-        <div>本次提取实际到账额度 ¥{{ withdrawalCal.money}}</div>
+        <div>本次提取实际到账额度 ¥{{ withdrawalCal.money }}</div>
       </div>
 
     </div>
@@ -224,13 +259,19 @@ function handleShowAgreement(type) {
 <style>
 page {
   background: #f8f8f8;
+  --nut-button-disabled-opacity: 0.3;
+  overflow: hidden;
 }
+
 .wx-radio-input {
   height: 16px !important;
   width: 16px !important;
 }
+
 </style>
 <route lang="yaml">
 style:
   navigationBarTitleText: 立即提现
+  enablePullDownRefresh: false
+
 </route>

src/pages/invite-friends/index.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import {
+  getGenerateImage,
   getUserSharePostersClassifyList,
   getUserSharePostersImagesList,
 } from "~/apis/user";
@@ -26,6 +27,8 @@ const state = reactive<any>({
 
   showTip: false,
   list: [],
+
+  currentImg: ''
   // merchantCategory: [],
   // merchantList: [],
   // merchantPageNum: 1,
@@ -36,6 +39,8 @@ const state = reactive<any>({
   // merchantPageInfo: {}
 })
 
+const userStore = useUserStore()
+
 const show = ref(false)
 const currentItem = ref({})
 const { windowHeight } = uni.getSystemInfoSync()
@@ -77,13 +82,17 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
   // if (state.categoryId == 0) {
   //   state.currentCategoryId = 0
   // }
+  if (action === 'reload') {
+    state.currentPage = 1
+  }
   const params = {
     pageNum: state.currentPage,
     pageSize: state.pageSize,
-    type: '1'
   }
   if (state.currentCategoryId > 0) {
     params.classify = state.currentCategoryId
+  } else {
+    params.type = 1
   }
 
   getUserSharePostersImagesList(params).then(res => {
@@ -144,19 +153,44 @@ function loadAll() {
   loadList('reload')
 }
 function handleItemClick(item) {
+  state.currentImg = ''
   currentItem.value = item
-  show.value = true
+  console.log(item)
+  uni.showLoading({
+    title: '数据加载中',
+    icon: 'none'
+  })
+  getGenerateImage({
+    uid: userStore.uid,
+    imgId: item.id
+  }).then(res => {
+    console.log(res)
+    if (res && res.shareImgs) {
+      state.currentImg = res.shareImgs
+    }
+    show.value = true
+
+    uni.hideLoading()
+  }).catch(error => {
+    uni.showToast({
+      title: error,
+      icon: 'none'
+    })
+  })
 }
 
 function shareImage() {
-  wx.downloadFile({
-    url: currentItem.value.image_fake,
-    success: (res) => {
-      wx.showShareImageMenu({
-        path: res.tempFilePath
-      })
-    }
-  })
+  if (state.currentImg) {
+    uni.downloadFile({
+      // url: currentItem.value.image_fake,
+      url: state.currentImg,
+      success: (res) => {
+        uni.showShareImageMenu({
+          path: res.tempFilePath
+        })
+      }
+    })
+  }
 }
 
 function shareTimeline() {
@@ -244,16 +278,16 @@ function handleClose() {
     <div class="flex flex-col justify-center items-center w-full h-full"
     >
       <div class="bg-white">
-        <image :src="currentItem.image_fake" mode="widthFix" class="w-60"></image>
+        <image :src="state.currentImg" mode="widthFix" class="w-60"></image>
         <div class="bg-white p-3 flex justify-around gap-3">
           <div class="flex flex-col text-[12px] justify-center items-center" @tap.stop="shareImage">
             <image :src="wechatImg" mode="widthFix" class="w-8 h-8"></image>
             <div>微信</div>
           </div>
-          <div class="flex flex-col text-[12px] justify-center items-center" @tap.stop="shareImage">
+<!--          <div class="flex flex-col text-[12px] justify-center items-center" @tap.stop="shareImage">
             <image :src="pyqImg" mode="widthFix" class="w-8 h-8"></image>
             <div>朋友圈</div>
-          </div>
+          </div>-->
           <div class="flex flex-col text-[12px] justify-center items-center" @tap.stop="shareImage">
             <image :src="bctpImg" mode="widthFix" class="w-8 h-8"></image>
             <div>保存图片</div>
@@ -268,4 +302,24 @@ function handleClose() {
 <route lang="yaml">
 style:
   navigationBarTitleText: 邀请好友
+  enablePullDownRefresh: false
+
 </route>
+<style>
+
+page {
+  overflow: hidden;
+}
+image {
+
+  image-rendering: -moz-crisp-edges;
+
+  image-rendering: -o-crisp-edges;
+
+  image-rendering: -webkit-optimize-contrast;
+
+  image-rendering: crisp-edges;
+
+  -ms-interpolation-mode: nearest-neighbor;
+}
+</style>

src/pages/invite-partners/index.vue

@@ -6,6 +6,14 @@ import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 import {encodePhone} from "../../utils";
 const userStore = useUserStore()
 const invitePartnerModel: Ref<InvitePartnerModel | undefined> = ref<InvitePartnerModel>() || undefined
+const state = reactive({
+  // 列表高度
+  scrollHeight: 0,
+})
+
+const {windowHeight} = uni.getSystemInfoSync()
+state.scrollHeight = windowHeight - 320
+
 onLoad(() => {
   getUserInviteList({
     uid: userStore.uid ? userStore.uid : '',
@@ -72,17 +80,23 @@ function handleSearch() {
         <div>身份</div>
         <div class="text-right">加入时间</div>
       </div>
-      <div v-if="invitePartnerModel && invitePartnerModel.userInviteVoList">
-        <div class="grid grid-cols-3 text-center text-sm p-2 bg-white text-gray-500" v-for="(item, index) in invitePartnerModel.userInviteVoList.list" :key="index">
-          <div class="flex flex-col">
-            <div class="text-left">{{ item.nickname || '无昵称' }}</div>
-            <div class="text-left text-[11px] text-gray-500">{{ item.phone ? encodePhone(item.phone) : '' }}</div>
-          </div>
+      <scroll-view
+          :scroll-y="true"
+          :style="{ height: `${state.scrollHeight}px` }"
+          v-if="invitePartnerModel && invitePartnerModel.userInviteVoList">
+        <div>
+          <div class="grid grid-cols-3 text-center text-sm p-2 bg-white text-gray-500" v-for="(item, index) in invitePartnerModel.userInviteVoList.list" :key="index">
+            <div class="flex flex-col">
+              <div class="text-left">{{ item.nickname || '无昵称' }}</div>
+              <div class="text-left text-[11px] text-gray-500">{{ item.phone ? encodePhone(item.phone) : '' }}</div>
+            </div>
 
-          <div>{{ item.statusType }}</div>
-          <div class="text-right">{{ item.promoterTime }}</div>
+            <div>{{ item.statusType }}</div>
+            <div class="text-right">{{ item.promoterTime }}</div>
+          </div>
         </div>
-      </div>
+
+      </scroll-view>
       <div v-else>
         <CXBEmpty />
       </div>
@@ -92,11 +106,14 @@ function handleSearch() {
 <style>
 page {
   background: #f8f8f8;
+  overflow: hidden;
 }
 </style>
 <route lang="yaml">
 style:
   navigationBarBackgroundColor: "#FD1642"
   navigationBarTextStyle: "white"
-  navigationBarTitleText: 邀请伙伴
+  navigationBarTitleText: 邀请伙伴a
+  enablePullDownRefresh: false
+
 </route>

src/pages/message/index.vue

@@ -0,0 +1,16 @@
+<script setup lang="ts">
+import {CDN_URL} from "~/config/app";
+import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+
+const icon = CDN_URL + '/static/assets/search_zanwuxiangguan_220617.png'
+</script>
+<template>
+  <div class="h-screen w-screen flex flex-col justify-center items-center">
+    <CXBEmpty type="message"/>
+  </div>
+</template>
+
+<route lang="yaml">
+style:
+  navigationBarTitleText: 消息
+</route>

src/pages/miaosha/index.vue

@@ -1,26 +1,76 @@
 <script setup lang="ts">
-import {getDcSeckill} from "~/apis/dacang";
+import {getDcSeckill, getSeckillIndexTime} from "~/apis/dacang";
 import {DcSeckillModel} from "~/apis/model/dacang.model";
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import CXBYaojinTag from "~/components/CXBYaojinTag/CXBYaojinTag.vue";
 import FPrice from "~/components/FPrice/FPrice.vue";
 import FButton from "~/components/FButton/FButton.vue";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+import {CDN_URL} from "~/config/app";
 const currentSeckillDate = ref()
+const status1Icon = CDN_URL + '/static/assets/mashangqiang.png'
+const status2Icon = CDN_URL + '/static/assets/jijiangkaiqiang.png'
+const status3Icon = CDN_URL + '/static/assets/miaosha_yijieshu_220908.png'
 
 const list = ref<Array<DcSeckillModel>>()
 const currentProductList = ref([])
+
+const state = reactive({
+  // seckillTime
+  timeList: [],
+  // seckillTimeIndex
+  endTime: '',
+  // 倒计时
+  //seckillEndTime
+  active: '',
+
+  scrollLeft: 0,
+  loading: false,
+
+  seckillList: [],
+  page: 1,
+  limit: 10,
+  status: ''
+})
 onLoad((options) => {
+  getSeckillIndexTime().then(res => {
+    console.log(res)
+    state.timeList = res.seckillTime
+    state.active = res.seckillTimeIndex
+    state.endTime = res.seckillEndTime
+
+    let time
+    state.timeList.map((item) => {
+      time = item.start_time > 9 ? item.start_time + ':00' : '0' + item.start_time + ':00';
+      item.time = time;
+    })
+
+    if (state.timeList.length) {
+      state.scrollLeft = (state.active = 1.37) * 100
+      setTimeout(() => {
+        state.loading = true
+      }, 2000)
+
+      state.seckillList = []
+      state.page = 1
+      state.status = state.timeList[state.active].status
+      loadSeckillList()
+
+    }
+  })
+
+})
+
+function loadSeckillList() {
   getDcSeckill().then(res => {
     list.value = res
     if (list.value && list.value?.length > 0) {
       currentSeckillDate.value = list.value[0].seckill_date
       currentProductList.value = list.value[0].product_data
-
     }
-  })
-})
 
+  })
+}
 function handleSeckillDateClick(seckill) {
   currentProductList.value = seckill.product_data
   currentSeckillDate.value = seckill.seckill_date
@@ -80,12 +130,15 @@ function handleItemClick(seckillItem) {
                 <CXBYaojinTag :amount="Number.parseFloat(seckillItem.yanglao)" />
                 <div class="flex items-center justify-between">
                   <FPrice :price="seckillItem.seckill_price"/>
-                  <FButton
-                      size="mini"
-                      :exClass="['rounded', 'text-white', 'bg-gradient-to-r', 'from-[#fe7577]', 'to-[#fe0032]']"
-                  >
-                    马上抢
-                  </FButton>
+                  <image
+                      v-if="seckillItem.status == 1"
+                      :src="status1Icon" mode="widthFix" class="w-16 h-7" ></image>
+                  <image
+                      v-if="seckillItem.status == 2"
+                      :src="status2Icon" mode="widthFix" class="w-16 h-7" ></image>
+                  <image
+                      v-if="seckillItem.status == 3"
+                      :src="status3Icon" mode="widthFix" class="w-16 h-7" ></image>
                 </div>
               </div>
 
@@ -100,7 +153,7 @@ function handleItemClick(seckillItem) {
   </CXBBasePage>
 
 </template>
-<route lang="yaml">
+<route lang="yaml" type="home">
 style:
   navigationBarTitleText: 限时秒杀
 </route>

src/pages/my-integral/index.vue

@@ -10,6 +10,7 @@ const state = reactive({
   isLogin: false,
   signToday: NaN,
   isShowSignIn: false,
+  day: 0
 })
 
 onShow(() => {
@@ -27,10 +28,12 @@ function loadSignInInfo() {
   getNewSignInInfo().then(res => {
     console.log(res)
     const {today, day} = res
-    state.signToday = day
+    state.signToday = today
+    console.log(res)
     if (today == 0) {
       state.isShowSignIn = true
     }
+    state.day = day
     // // if (today === 0) {
     //   2.1 弹出签到窗口
     // }
@@ -63,15 +66,15 @@ if (userStore.userInfo) {
 
 
 function handleSign() {
-  console.log(state.signToday)
-  if (state.signToday == 0)  {
+  // console.log(state.signToday)
+  // if (state.signToday == 0)  {
     state.isShowSignIn = true
-  } else {
-    return uni.showToast({
-      title: '今日已签到过',
-      icon: 'none'
-    })
-  }
+  // } else {
+  //   return uni.showToast({
+  //     title: '今日已签到过',
+  //     icon: 'none'
+  //   })
+  // }
 }
 function handleShowIntegralDetail() {
   uni.navigateTo({
@@ -81,7 +84,9 @@ function handleShowIntegralDetail() {
 
 function handleToZibuyangsheng() {
   uni.navigateTo({
-    url: '/pages/product/zibuyangsheng?id=430'
+    // url: '/pages/product/zibuyangsheng?id=430'
+    // url: '/pages/product/zibuyangsheng?id=430'
+    url: '/pages/product/integral'
   })
 }
 
@@ -114,7 +119,7 @@ function handleShowAgreement() {
     </div>
 
     <div class="bg-white rounded-md text-sm flex justify-between p-3">
-      <div class="">滋补保健 {{ userStore.userInfo.score_beishengtang}}</div>
+      <div class="">积分通兑</div>
       <FButton
           @tap="handleToZibuyangsheng"
           size="mini"
@@ -147,7 +152,7 @@ function handleShowAgreement() {
               size="mini"
               :exClass="['rounded-full','!text-[12px]', 'text-white', `${state.signToday === 0 ? 'bg-primary' : 'bg-gray' }`, 'w-full']"
           >
-            {{ !state.isShowSignIn ? '已签到' : '去签到' }}
+            {{ state.signToday === 0 ? '去签到' : '已签到' }}
           </FButton>
         </div>
         <div class="flex  justify-between items-center">
@@ -174,6 +179,7 @@ function handleShowAgreement() {
   <CXBDialogSIgnIn
       :show="state.isShowSignIn"
       :today="state.signToday"
+      :day="state.day"
       @confirm="state.isShowSignIn = false"
       @close="state.isShowSignIn = false"
   />

src/pages/my-integral/user-invation.vue

@@ -90,33 +90,52 @@ function shareWeixin() {
   uni.showLoading({
     title: '数据加载中'
   })
-  wx.downloadFile({
+   uni.downloadFile({
     url: spreadData.value.wap_poster,
     success: (res) => {
-      uni.hideLoading()
-      wx.showShareImageMenu({
+      uni.showShareImageMenu({
         path: res.tempFilePath
       })
-    }
+
+      uni.hideLoading()
+
+    },
+     fail: (error) => {
+       uni.showToast({
+         title: error,
+         icon: 'none'
+       })
+     }
   })
 }
-function shareImage() {
+async function shareImage() {
   if (!spreadData.value) {
-    uni.showLoading({
+    await uni.showLoading({
       title: '二维码获取中'
     })
-    getSpreadImage().then(res => {
+   let res = await getSpreadImage()
+    // console.log(res)
+    // uni.showToast({
+    //   title: res,
+    //   icon: 'none'
+    // })
+    if (res) {
       spreadData.value = res[0]
       console.log(spreadData.value)
       shareWeixin()
-      uni.hideLoading()
-    }).catch(error => {
-      uni.showToast({
-        title: error,
-        icon: 'none'
-      })
-      uni.hideLoading()
-    })
+    }
+    //    .then(res => {
+    //   spreadData.value = res[0]
+    //   console.log(spreadData.value)
+    //   shareWeixin()
+    //   uni.hideLoading()
+    // }).catch(error => {
+    //   console.error(error)
+    //   uni.showToast({
+    //     title: error,
+    //     icon: 'none'
+    //   })
+    // })
   } else {
     shareWeixin()
   }

src/pages/my-invitation/index.vue

@@ -89,7 +89,7 @@ function handleShowAgreement() {
             当前收益（元）
           </div>
           <div class="font-bold text-[28px]">
-            {{ data.brokerage_price }}
+            {{ data.brokerage_price ? data.brokerage_price : '0.00' }}
           </div>
         </div>
         <div class="flex flex-col justify-center items-center gap-2">
@@ -132,6 +132,7 @@ function handleShowAgreement() {
 <style>
 page {
   background: #f8f8f8;
+  overflow: hidden;
 }
 </style>
 <route lang="yaml">
@@ -139,4 +140,6 @@ style:
   navigationBarBackgroundColor: "#FD1642"
   navigationBarTextStyle: "white"
   navigationBarTitleText: 我的邀请
+  enablePullDownRefresh: false
+
 </route>

src/pages/my-relation-merchant/index.vue

@@ -52,6 +52,13 @@ function handleRemoveMyRelation(item: any, index: number) {
     }
   })
 }
+
+function handleItemClick(item) {
+  console.log(item)
+  uni.navigateTo({
+    url: '/pages/store/home/index?id=' + item.mer_id
+  })
+}
 </script>
 
 <template>
@@ -68,29 +75,42 @@ function handleRemoveMyRelation(item: any, index: number) {
       </nut-searchbar>
       <!--      <FSearch />-->
     </div>
-    <div v-if="list && list.length > 0" class="flex flex-col gap-3">
-      <div class="bg-white flex p-3" v-for="(item, index) in list" :key="index">
-        <div>
-          <image :src="item.mer_avatar" mode="widthFix" class="w-15 h-15 rounded "></image>
-        </div>
-        <div class="flex flex-col text-sm  justify-between w-full">
-          <div class="flex flex-col px-3 gap-2">
+    <div v-if="list && list.length > 0" class="flex flex-col gap-3 ">
+      <div class="bg-white flex p-3 " v-for="(item, index) in list" :key="index"
+           @tap="handleItemClick(item)"
+      >
+        <div class="flex w-full">
+          <div class="flex flex-1 w-full">
             <div>
-              {{ item.mer_name }}
+              <image :src="item.mer_avatar" mode="widthFix" class="w-15 h-15 rounded "></image>
             </div>
-            <div class="text-xs text-gray">
-              {{ item.care_count }} 人关注
+            <div class="flex flex-col text-sm  justify-between w-full">
+              <div class="flex flex-col px-3 gap-2 flex-1">
+                <div>
+                  {{ item.mer_name }}
+                </div>
+                <div class="text-xs text-gray">
+                  {{ item.care_count }} 人关注
+                </div>
+              </div>
+
+              <!--
+              <div class="flex items-center justify-end">
+                <div
+                    @tap="handleRemoveMyRelation(item, index)"
+                    class="border border-solid border-red rounded-full px-2 text-[10px] text-red">
+                  取消收藏
+                </div>
+              </div>
+              -->
             </div>
           </div>
-          <div class="flex items-center justify-end">
-            <div
-                @tap="handleRemoveMyRelation(item, index)"
-                class="border border-solid border-red rounded-full px-2 text-[10px] text-red">
-              取消收藏
-            </div>
+          <div class="list-bg ">
           </div>
         </div>
+
       </div>
+
     </div>
     <div v-else>
       <CXBEmpty />
@@ -98,10 +118,17 @@ function handleRemoveMyRelation(item: any, index: number) {
   </div>
 </template>
 
-<style>
+<style lang="scss">
 page {
   background-color: #f8f8f8;
 }
+.list-bg {
+  width: 124rpx;
+  height: 124rpx;
+  background-image: url('https://cdn.bjtdba.com/vod/image/2023-09-23/20230923192915366.png');
+  background-size: 100% 100%;
+}
+
 </style>
 <route lang="yaml">
 style:

src/pages/order-confirm/index.vue

@@ -10,6 +10,7 @@ import {encodePhone} from "~/utils";
 import {CDN_URL} from "~/config/app";
 import {useAddressStore} from "~/stores/addressStore";
 import {watchThrottled} from "@vueuse/core";
+import FField from "~/components/FField/FField.vue";
 const addressIcon = CDN_URL + '/static/assets/dingwi_220624.png'
 // const addressInfo = ref({})
 const addressStore = useAddressStore()
@@ -29,6 +30,7 @@ const data = reactive({
   is_dacang_vip_product: '',
   totalPrice: '',
   orderStatus: '',
+  mark: ''
   // 商品总价？
   // proPrice: ''
 })
@@ -45,7 +47,7 @@ onLoad(async (options) => {
     data.productId = options.product_id
   }
 
-  console.log(data)
+  // console.log(data)
   // if (options && options.addressId) {
   //   // getUserAddressDetail(options.addressId).then(res => {
   //   //   data.addressInfo = res
@@ -145,10 +147,11 @@ function handleSubmit() {
     // 优惠券
     // coupon:
     // pay_type;//支付方式：0: 余额;1: 微信;2: 小程序;4: 支付宝;5: 特殊商户积分
-    pay_type:  data.type && data.type == '3' ? '5' : 'weixin',
+    // pay_type:  data.type && data.type == '3' ? '5' : 'weixin',
+    pay_type: data.type,
     mer_id: data.type && data.type == '3' ? '148': '',
     // 用户留言
-    mark: '',
+    mark: data.mark,
     // take: [],
     // share_id: '',
     // dacang_id:
@@ -169,7 +172,7 @@ function payment(createOrderData: CreateOrderRequest) {
 
   orderCreate(createOrderData).then(res => {
     if (res) {
-      console.log('order_create')
+      // console.log('order_create')
       console.log(res)
       uni.hideLoading()
       uni.navigateTo({
@@ -254,9 +257,12 @@ function reTotal() {
                 <div class="w-fit flex">
                   <image :src="addressIcon" mode="aspectFit" class="w-4 h-4"></image>
                 </div>
-                <div class="flex-1 flex">
+                <div class="flex-1 flex" v-if="data.addressId">
                   {{ data.addressInfo.province + ' ' + data.addressInfo.city + ' ' + data.addressInfo.district + ' ' + data.addressInfo.detail }}
                 </div>
+                <div v-else class="flex-1 flex">
+                  请选择收货地址
+                </div>
               </div>
 
               <div class="w-4 flex i-tabler-chevron-right text-gray"></div>
@@ -291,7 +297,7 @@ function reTotal() {
                 <image :src="orderProductItem.product.image" mode="aspectFit" class="rounded w-20 h-20"></image>
 
               </div>
-              <div class="flex flex-col ">
+              <div class="flex flex-col w-full">
                 <div class="flex flex-col ">
                   <div class="line-clamp-2 text-xs">
                     {{ orderProductItem.product.store_name }}
@@ -302,7 +308,7 @@ function reTotal() {
                   <CXBYaojinTag :amount="orderProductItem.yanglao" v-if="item.mer_id != '148'"/>
 
                 </div>
-                <div class="flex justify-between">
+                <div class="flex justify-between ">
                   <FPrice :price="orderProductItem.productAttr.price" v-if="item.mer_id != '148'"></FPrice>
                   <FPrice :price="orderProductItem.productAttr.price * 30" v-if="item.mer_id == '148'"></FPrice>
                   <nut-input-number v-model="orderProductItem.cart_num" @change="(num) => handleNumberChange(num, orderProductItem)"/>
@@ -331,11 +337,12 @@ function reTotal() {
                 :value="item.order.postage_price > 0 ? item.order.postage_price : '免运费'"
                 arrow
             ></FCell>
-            <FCell
-                title="留言"
-                value="建议留言前先与商家沟通确认"
-                arrow
-            ></FCell>
+<!--            <FCell-->
+<!--                title="留言"-->
+<!--                value="建议留言前先与商家沟通确认"-->
+<!--                arrow-->
+<!--            ></FCell>-->
+            <FField label="留言" placeholder="建议留言前先与商家沟通确认" v-model="data.mark" :exClass="['text-right']"/>
           </div>
 
         </div>

src/pages/order/comment.vue

@@ -31,7 +31,7 @@ onLoad((options) => {
     // console.log(options.detail)
     detail.value = JSON.parse(decodeBase64(options.detail))
     // detail.value = JSON.parse(decodeBase64(base64Detail))
-  console.log(detail.value)
+  // console.log(detail.value)
   // }
 })
 const defaultFileList = ref([])
@@ -84,11 +84,14 @@ function handleSubmit() {
     product_score: formData.product_score,
     service_score: formData.service_score
   }).then(res => {
-    console.log(res)
+    console.log('评价完成')
+    uni.$emit('orderComment')
+
     uni.showToast({
       title: '评价成功',
       icon: 'none'
     }).then(() => {
+
       setTimeout(() => {
         uni.navigateBack()
       }, 500)

src/pages/order/components/AllItemList.vue

@@ -115,7 +115,7 @@ onUnmounted(() => {
 </script>
 <template>
   <div class="p-3 flex flex-col">
-    <div v-if="state.list.length > 0" class="flex flex-col">
+    <div v-if="state.list.length > 0" class="flex flex-col gap-3">
       <div v-for="(orderItem, index) in state.list" :key="index">
         <OrderItem :order-item="orderItem" v-if="orderItem.source == 7"/>
         <OtherOrderItem :item="orderItem" v-else/>

src/pages/order/components/ObligationOrderList.vue

@@ -93,7 +93,7 @@ onUnmounted(() => {
       <div v-for="(orderItem, index) in state.list" :key="index">
 <!--        <OrderItem :order-item="orderItem" />-->
 <!--        <OtherOrderItem :item="orderItem" v-else/>-->
-        <OrderObligationItem :order-item="orderItem" />
+        <OrderObligationItem :order-item="orderItem" :tab-value="props.tabValue"/>
       </div>
       <div class=" flex justify-center items-center text-[12px] text-gray-500"
            v-if="state.list && state.list.length > 0">

src/pages/order/components/Order2List.vue

@@ -86,7 +86,7 @@ onUnload(() => {
 </script>
 <template>
   <div class="p-3 flex flex-col">
-    <div v-if="state.list.length > 0" class="flex flex-col">
+    <div v-if="state.list.length > 0" class="flex flex-col gap-3">
       <div v-for="(orderItem, index) in state.list" :key="index">
         <OrderItem :order-item="orderItem" />
         <!--        <OtherOrderItem :item="orderItem" v-else/>-->

src/pages/order/components/Order3List.vue

@@ -103,7 +103,7 @@ onUnload(() => {
 </script>
 <template>
   <div class="p-3 flex flex-col">
-    <div v-if="state.list.length > 0" class="flex flex-col">
+    <div v-if="state.list.length > 0" class="flex flex-col gap-3">
       <div v-for="(orderItem, index) in state.list" :key="index">
         <OrderItem :order-item="orderItem" />
         <!--        <OtherOrderItem :item="orderItem" v-else/>-->

src/pages/order/components/Order4List.vue

@@ -82,7 +82,11 @@ function handleScrollToLower() {
 // })
 onMounted(() => {
   loadList('reload')
-
+  uni.$on('orderComment', () => {
+    // loadAllOrderList()
+    // state.tabvalue = 4
+    loadList('reload')
+  })
   uni.$on('onTab4ReachBottom', handleScrollToLower)
   uni.$on('onTab4PullDownRefresh', () => {
     loadList('reload', items => {
@@ -93,11 +97,7 @@ onMounted(() => {
   })
 })
 onUnmounted(() => {
-  uni.$on('orderComment', () => {
-    // loadAllOrderList()
-    // state.tabvalue = 4
-    loadList('reload')
-  })
+
   uni.$off('onTab4ReachBottom');
   uni.$off('onTab4PullDownRefresh');
 })
@@ -108,7 +108,7 @@ onUnload(() => {
 </script>
 <template>
   <div class="p-3 flex flex-col">
-    <div v-if="state.list.length > 0" class="flex flex-col">
+    <div v-if="state.list.length > 0" class="flex flex-col gap-3">
       <div v-for="(orderItem, index) in state.list" :key="index">
         <OrderItem :order-item="orderItem" />
         <!--        <OtherOrderItem :item="orderItem" v-else/>-->

src/pages/order/components/OrderItem.vue

@@ -99,7 +99,7 @@ function handleCancelOrder() {
 function handlePayment() {
   const { orderItem } = props
   uni.navigateTo({
-    url: '/pages/payment/index?' + `pay_price=${orderItem.pay_price}&order_id=${orderItem.group_order_id}`
+    url: '/pages/payment/index?' + `pay_price=${orderItem.pay_price}&order_id=${orderItem.group_order_id}&tabIndex=${props.tabValue}`
     // url: `/pages/payment/index`
   })
 }
@@ -107,7 +107,7 @@ function handlePayment() {
 function handleShowOrderDetail(order) {
   console.log(order)
   uni.navigateTo({
-    url: '/pages/order/detail?detail=' + `${encodeBase64(order)}`
+    url: '/pages/order/detail?detail=' + `${encodeBase64(order)}&type=${order.status}`
   })
 }
 
@@ -190,7 +190,7 @@ function handleShowObligationOrderDetail(orderItem) {
 </script>
 
 <template>
-  <div class="mb-3 bg-white rounded p-3">
+  <div class="bg-white rounded p-3">
     <div
         @stop.stop="handleHeaderClick"
         class="flex items-center justify-between f-hairline-bottom pb-3">
@@ -215,7 +215,10 @@ function handleShowObligationOrderDetail(orderItem) {
           <div v-for="(orderProduct, orderProductIndex) in order.orderProduct" :key="orderProductIndex">
             <div class="flex py-2 gap-3">
               <div class="flex-1 flex gap-2">
-                <image :src="orderProduct.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
+                <div class="flex w-20 h-20">
+                  <image :src="orderProduct.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
+
+                </div>
 
                 <div class="flex flex-col">
                   <div class="line-clamp-2 text-[12px]">
@@ -266,8 +269,10 @@ function handleShowObligationOrderDetail(orderItem) {
         <div v-for="(orderProduct, orderProductIndex) in orderItem.orderProduct" :key="orderProductIndex">
           <div class="flex py-2 gap-3">
             <div class="flex-1 flex gap-2">
-              <image :src="orderProduct.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
+              <div class="flex w-20 h-20">
+                <image :src="orderProduct.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
 
+              </div>
               <div class="flex flex-col">
                 <div class="line-clamp-2 text-[12px]">
                   {{ orderProduct.cart_info.product.store_name }}

src/pages/order/components/OrderObligationItem.vue

@@ -18,6 +18,9 @@ const props = defineProps({
   },
   status: {
     type: Number,
+  },
+  tabValue: {
+    type: Number,
   }
 })
 
@@ -93,7 +96,7 @@ function handleCancelOrder() {
 function handlePayment() {
   const { orderItem } = props
   uni.navigateTo({
-    url: '/pages/payment/index?' + `pay_price=${orderItem.pay_price}&order_id=${orderItem.group_order_id}&OrderList=${JSON.stringify(orderItem)}`
+    url: '/pages/payment/index?' + `pay_price=${orderItem.pay_price}&order_id=${orderItem.group_order_id}&OrderList=${JSON.stringify(orderItem)}&tabIndex=${props.tabValue}`
     // url: `/pages/payment/index`
   })
 }
@@ -178,7 +181,7 @@ function handeRefund(orderItem) {
 
 function handleShowObligationOrderDetail(orderItem) {
   uni.navigateTo({
-    url: '/pages/order/obligation-detail?detail=' + `${encodeBase64(orderItem)}`
+    url: '/pages/order/obligation-detail?detail=' + `${encodeBase64(orderItem)}&type=1`
   })
 }
 </script>
@@ -209,8 +212,10 @@ function handleShowObligationOrderDetail(orderItem) {
           <div v-for="(orderProduct, orderProductIndex) in order.orderProduct" :key="orderProductIndex">
             <div class="flex py-2 gap-3">
               <div class="flex-1 flex gap-2">
-                <image :src="orderProduct.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
+                <div class="flex w-20 h-20">
 
+                <image :src="orderProduct.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
+                </div>
                 <div class="flex flex-col">
                   <div class="line-clamp-2 text-[12px]">
                     {{ orderProduct.cart_info.product.store_name }}

src/pages/order/index.vue

@@ -1,9 +1,15 @@
 <template>
-  <CXBBasePage>
+<!--  <CXBBasePage>-->
+  <FNavBar
+      title="我的订单" :left-arrow="true" fixed placeholder z-index="999"
+      ex-class="bg-white w-screen"
+      @click-left="onClickLeft"
+  />
 
-    <!--    <nut-navbar>-->
+
+  <!--    <nut-navbar>-->
     <!--      <template #content>-->
-    <div class="fixed top-0 bg-white w-full z-2">
+    <div class="fixed top-20 bg-white w-full z-2">
       <nut-tabs v-model="state.tabvalue" class="bg-white">
         <nut-tab-pane title="全部"></nut-tab-pane>
         <nut-tab-pane title="待付款"></nut-tab-pane>
@@ -13,15 +19,15 @@
       </nut-tabs>
     </div>
 
-    <div class="mt-12">
+    <div class="mt-32  pb-safe">
       <AllItemList v-if="state.tabvalue == 0" :tab-value="0"/>
-      <ObligationOrderList v-if="state.tabvalue == 1"/>
+      <ObligationOrderList v-if="state.tabvalue == 1" :tab-value="1"/>
       <Order2List v-if="state.tabvalue == 2" :status="'0'"/>
       <Order3List v-if="state.tabvalue == 3" :status="'1'"/>
       <Order4List v-if="state.tabvalue == 4" :status="'2'"/>
     </div>
 
-  </CXBBasePage>
+<!--  </CXBBasePage>-->
 </template>
 <script lang="ts" setup>
 // import { reactive } from 'vue';
@@ -41,6 +47,9 @@ import ObligationOrderList from "~/pages/order/components/ObligationOrderList.vu
 import Order2List from "~/pages/order/components/Order2List.vue";
 import Order3List from "~/pages/order/components/Order3List.vue";
 import Order4List from "~/pages/order/components/Order4List.vue";
+import FNavBar from "~/components/FNavBar/FNavBar.vue";
+const pageStore = usePageStoreWidthOut()
+
 
 const state = reactive({
   tabvalue: 0,
@@ -52,6 +61,7 @@ const state = reactive({
   obligationOrderList: [],
 
   orderList: [],
+  from: null
 });
 
 const getStatusVal = () => {
@@ -67,9 +77,13 @@ const getStatusVal = () => {
   }
 }
 onLoad(options => {
+  console.log(options)
   if (options && options.tabIndex) {
     state.tabvalue = options.tabIndex
   }
+  if (options && options.from) {
+    state.from = options.from
+  }
   // loadAllOrderList()
 
   // 监听事件
@@ -223,10 +237,35 @@ onPullDownRefresh(() => {
 //   }
 // })
 
+function onClickLeft() {
 
+  if (state.tabvalue == 1 && state.from && state.from == 'payment') {
+    if (pageStore && pageStore.orderBack) {
+      console.log(pageStore.orderBack)
+      if (pageStore.orderBack.type === 'tab') {
+        uni.switchTab({
+          url: pageStore.orderBack.url
+        })
+      } else {
+        uni.reLaunch({
+          url: pageStore.orderBack.url
+        })
+      }
+    } else {
+      uni.navigateBack()
+    }
+  } else {
+    // uni.navigateBack({
+    // })
+    uni.switchTab({
+      url: '/pages/user/index'
+    })
+  }
+}
 </script>
 <route lang="yaml">
 style:
+  navigationStyle: custom
   navigationBarTitleText: 我的订单
   enablePullDownRefresh: true
 </route>

src/pages/order/obligation-detail.vue

@@ -22,7 +22,7 @@ onLoad((options) => {
   // console.log(options.detail)
   if (options.detail) {
     detail.value = JSON.parse(decodeBase64(options.detail))
-    console.log(detail.value)
+    // console.log(detail.value)
   // detail.value = JSON.parse(decodeBase64(base64Json))
   }
 })
@@ -124,29 +124,38 @@ function handleComment() {
 
 const payType = computed(() => {
   // detail.pay_type
-  if ('0' == detail.value.pay_type) {
-    return '余额'
-  }
-  if ('1' == detail.value.pay_type) {
-    return '微信'
-  }
-  if ('2' == detail.value.pay_type) {
-    return '小程序'
-  }
-  if ('3' == detail.value.pay_type) {
-    return 'h5'
-  }
+  // if ('0' == detail.value.pay_type) {
+  //   return '余额'
+  // }
+  // if ('1' == detail.value.pay_type) {
+  //   return '微信'
+  // }
+  // if ('2' == detail.value.pay_type) {
+  //   return '小程序'
+  // }
+  // if ('3' == detail.value.pay_type) {
+  //   return 'h5'
+  // }
   if ('4' == detail.value.pay_type) {
     return '支付宝'
   }
-  if ('5' == detail.value.pay_type) {
+  else if ('5' == detail.value.pay_type) {
     return '积分兑换'
+  } else {
+    return '微信支付'
   }
 })
-
+function handleProductItemClick(
+    item
+) {
+  console.log(item.product_id)
+  // 大仓
+  uni.navigateTo({
+    url: `/pages/store/product/detail?id=${item.product_id}`
+  })
+}
 </script>
 <template>
-  <CXBBasePage>
     <div class="p-3 flex flex-col gap-3 pb-safe text-[12px]" v-if="detail">
       <div
           class="rounded bg-white p-3 flex">
@@ -186,11 +195,13 @@ const payType = computed(() => {
         <div v-for="(order, index) in detail.orderList" :key="index">
           <div v-for="(orderProduct, orderProductIndex) in order.orderProduct" :key="orderProductIndex">
             <div class="flex py-2 gap-3">
-              <div class="flex-1 flex gap-2">
+              <div class="flex-1 flex gap-2"  @tap.stop="handleProductItemClick(orderProduct)">
                 <image :src="orderProduct.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
 
                 <div class="flex flex-col">
-                  <div class="line-clamp-2 text-[12px]">
+                  <div class="line-clamp-2 text-[12px]"
+                       @tap.stop="handleProductItemClick(orderProduct)"
+                  >
                     {{ orderProduct.cart_info.product.store_name }}
                   </div>
                   <div class="text-gray-500 text-[10px]">
@@ -200,7 +211,8 @@ const payType = computed(() => {
               </div>
 
               <div class="flex flex-col justify-center items-center">
-                <FPrice :price="orderProduct.cart_info.productAttr.price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>
+<!--                <FPrice :price="orderProduct.cart_info.productAttr.price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>-->
+                <FPrice :price="detail.total_price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>
                 <div class="text-gray-500 text-[11px]">共{{ orderProduct.product_num }}件</div>
               </div>
 
@@ -230,6 +242,7 @@ const payType = computed(() => {
             <div>实付款</div>
             <div class="text-gray">
               <FPrice :price="detail.pay_price" ex-class="font-bold text-xl"></FPrice>
+
             </div>
           </div>
 <!--          <div class="flex justify-between">-->
@@ -250,6 +263,7 @@ const payType = computed(() => {
 <!--            private String pay_type;//支付方式 0余额 1微信 2小程序 4支付宝 5特殊商户积分-->
 
             <div>支付方式</div>
+
             <div class="text-gray">{{ payType }}</div>
 <!--            <div class="text-gray">{{ detail.pay_type === '1' ? '微信' : '支付宝' }}</div>-->
           </div>
@@ -271,11 +285,14 @@ const payType = computed(() => {
 
       </div>
     </div>
-  </CXBBasePage>
 </template>
 
 <route lang="yaml">
 style:
-  navigationBarTitleText: 订单详情
+  navigationBarTitleText: 待付款
 </route>
-
+<style>
+page {
+  background: #f8f8f8;
+}
+</style>

src/pages/order/test.json

@@ -1,199 +1,148 @@
 {
-  "status": 200,
-  "message": "success",
   "data": {
-    "express": [
+    "thirdPartyWaresList": [
       {
-        "time": "2023-09-20 19:06:01",
-        "status": "【廊坊市】 您的快递已签收，签收人在【廊坊三河燕郊四季花都店】取件。如有疑问请联系业务员：15103369570，代理点电话：18133879513，投诉电话：0316-6840606。感谢使用中通快递，期待再次为您服务！"
+        "thumb": "https://img.alicdn.com/imgextra/i4/2214949670367/O1CN01bb9Lai1Ea89vEl5O9_!!2214949670367.jpg",
+        "price": 29.9,
+        "coupon_share_url": "https://uland.taobao.com/quan/detail?sellerId=10239350485908651&activityId=f88383df63cf460b9955b669da1474c1",
+        "name": "【10瓶礼盒装】轻上椰汁椰泰集团椰子汁椰奶椰乳生椰植物蛋白饮料",
+        "coupon_money": 30,
+        "market_price": 59.9,
+        "commission": "3.74",
+        "commission_rate": 25.01,
+        "id": "egX63bsDtqgabxs84VCzt0-nJAVXpdHxAaDAM9nCB",
+        "type": 5,
+        "commission_type": 3,
+        "sales": 61
       },
       {
-        "time": "2023-09-20 11:59:15",
-        "status": "【廊坊市】 快件已在 快递超市 的【廊坊三河燕郊四季花都店】暂放，【取件地址：四季花都一期底商华联超市里】，请及时取件。如有疑问请联系业务员：15103369570，代理点电话：18133879513，投诉电话：0316-6840606"
+        "thumb": "https://img.alicdn.com/imgextra/i2/4032980305/O1CN01Xy0vAd1E7jYf2qFuJ_!!4032980305.png",
+        "price": 55,
+        "coupon_share_url": "https://uland.taobao.com/quan/detail?sellerId=261209468136787584&activityId=f354d32ff85f4a96ac988683b6ceead8",
+        "name": "舒比奇维E敏感肌拉拉裤XL尿不湿L-3XL大码婴儿纸尿裤超薄透气夏季",
+        "coupon_money": 29,
+        "market_price": 84,
+        "commission": "5.50",
+        "commission_rate": 20,
+        "id": "0orG64I7tz4MgMi0VWS2t6-eQGMq6ACGGmdZXq6Uj",
+        "type": 5,
+        "commission_type": 3,
+        "sales": 96
       },
       {
-        "time": "2023-09-20 08:22:21",
-        "status": "【廊坊市】东燕郊 的业务员【5区承包区王田祥,15103369570】正在第2次派件（95720为中通快递员外呼专属号码，请放心接听，如有问题可联系网点:0316-6840606,投诉电话:0316-6840606）"
+        "thumb": "https://img.alicdn.com/imgextra/i1/2256668114/O1CN01Sj3Ujm29oGSPN2nRE_!!2256668114.jpg",
+        "price": 59.9,
+        "coupon_share_url": "https://uland.taobao.com/quan/detail?sellerId=1986899349&activityId=d34051f5ba4d45e09a042df69e898278",
+        "name": "【顺丰包邮】杜蕾斯避孕安全套男用超薄女螺纹情趣官方旗舰店正品",
+        "coupon_money": 20,
+        "market_price": 79.9,
+        "commission": "5.09",
+        "commission_rate": 17,
+        "id": "gx0Xagh3tYrD0Msowpiatr-9za58Xohq46x8mpfrX",
+        "type": 5,
+        "commission_type": 3,
+        "sales": 345
       },
       {
-        "time": "2023-09-20 03:03:24",
-        "status": "【廊坊市】 快件已到达 东燕郊"
+        "thumb": "https://img.alicdn.com/i3/2215128201652/O1CN01bPbo0I1O4f6QkO66Y_!!2215128201652.png",
+        "price": 9.9,
+        "coupon_share_url": "https://uland.taobao.com/quan/detail?sellerId=4765056360938372755&activityId=44d8968be5ba43798a9c45e4baf7f58e",
+        "name": "幸棉安睡裤臻柔卫生巾安心裤女经期用防漏姨妈裤亲肤夜安裤产后用",
+        "coupon_money": 10,
+        "market_price": 19.9,
+        "commission": "1.49",
+        "commission_rate": 30.01,
+        "id": "GB7kQef8tGzeO9iYxgTQtJ-YJGeOZNHB6Qd5Kxzhb",
+        "type": 5,
+        "commission_type": 3,
+        "sales": 359
       },
       {
-        "time": "2023-09-19 14:46:55",
-        "status": "【保定市】 快件已发往 东燕郊"
+        "thumb": "https://gw.alicdn.com/bao/uploaded/i2/880734502/O1CN01wRV5mu1j7xuGomAM1_!!880734502.png",
+        "price": 14.9,
+        "coupon_share_url": "https://uland.taobao.com/quan/detail?sellerId=4827930842443574424&activityId=f3ad10dfc39246eeb147e82d63b40b28",
+        "name": "【三只松鼠_纯奶手撕面包480g】吐司包早餐蛋糕健康零食代餐整箱",
+        "coupon_money": 2,
+        "market_price": 16.9,
+        "commission": "0.82",
+        "commission_rate": 11.05,
+        "id": "pb0ZAPtxt4J9vmueAjHptm-pBx2XAdIRgJOR5gBuq8",
+        "type": 5,
+        "commission_type": 3,
+        "sales": 38
       },
       {
-        "time": "2023-09-19 14:38:48",
-        "status": "【保定市】 快件已到达 京南转运中心"
+        "thumb": "https://img.alicdn.com/i2/1998320687/O1CN01HcGJAc1Gwgxdowm6y_!!1998320687.png",
+        "price": 19,
+        "coupon_share_url": "https://uland.taobao.com/quan/detail?sellerId=1998320687&activityId=d98c94119e034af792a8500ba4b41757",
+        "name": "泰国正品皇家秘方止痒膏全身体皮肤适用大人婴儿天然草本防叮驱蚊",
+        "coupon_money": 80,
+        "market_price": 99,
+        "commission": "3.80",
+        "commission_rate": 40,
+        "id": "DAJMkXiDtzDwrPfQpAhjtn-6RmxkGoIyJqjMGM6Cz",
+        "type": 5,
+        "commission_type": 3,
+        "sales": 0
       },
       {
-        "time": "2023-09-18 08:13:02",
-        "status": "【广州市】 快件已发往 京南转运中心"
+        "thumb": "https://img.alicdn.com/imgextra/i2/1715621442/O1CN01B8U3Pj1MWTw3u9g0S_!!1715621442.jpg",
+        "price": 9.9,
+        "coupon_share_url": "https://uland.taobao.com/quan/detail?sellerId=4756012865041860746&activityId=ff8c18028ee246e7a6d5c6a78e40ff55",
+        "name": "【超值12片试用】全棉时代奈丝公主日用卫生巾纯棉姨妈巾10+2片",
+        "coupon_money": 10,
+        "market_price": 19.9,
+        "commission": "0.50",
+        "commission_rate": 10,
+        "id": "n5bG3mSMtgVNxKFkQet0tP-mPkBXe3U75bj7z2kcBg",
+        "type": 5,
+        "commission_type": 3,
+        "sales": 56
       },
       {
-        "time": "2023-09-18 08:09:19",
-        "status": "【广州市】 快件已到达 广州中心"
+        "thumb": "https://img.alicdn.com/imgextra/i3/1015383959/O1CN01WzrUEq1f7GrAUkvLr_!!1015383959.png",
+        "price": 29.9,
+        "coupon_share_url": "https://uland.taobao.com/quan/detail?sellerId=225181641373589649&activityId=73683b83fcd0404b916271af8446ed82",
+        "name": "【狂暑购不停】福派电动牙刷成人充电自动声波软毛情侣款套装男女",
+        "coupon_money": 56,
+        "market_price": 85.9,
+        "commission": "2.99",
+        "commission_rate": 20,
+        "id": "jOb5A4t0t698o5CBezfJte-26VpOQjCOndP5zoDs3n",
+        "type": 5,
+        "commission_type": 3,
+        "sales": 155
       },
       {
-        "time": "2023-09-18 04:00:18",
-        "status": "【广州市】 快件已发往 京南转运中心"
+        "thumb": "https://img.alicdn.com/imgextra/i2/2212514663/O1CN019p84kk1kJhgYKBUjJ_!!2212514663.png",
+        "price": 4.9,
+        "coupon_share_url": "https://uland.taobao.com/quan/detail?sellerId=725677994&activityId=b32cce093396421facde31ee495e8861",
+        "name": "喵满分原木浆茶香纯品抽纸3包/提",
+        "coupon_money": 2,
+        "market_price": 6.9,
+        "commission": "0.21",
+        "commission_rate": 8.5,
+        "id": "zRomg2FetpJN5nfv8aUdt4-RgG3Qn8cVK8vp2Q9fYK",
+        "type": 5,
+        "commission_type": 3,
+        "sales": 119
       },
       {
-        "time": "2023-09-17 23:07:14",
-        "status": "【广州市】 广州夏茅（020-22505305）陈美玲（15397525882） 已揽收"
+        "thumb": "https://img.alicdn.com/i3/705235443/O1CN01qX8n971q4wcAlmvBh_!!705235443.jpg",
+        "price": 35.6,
+        "coupon_share_url": "https://uland.taobao.com/quan/detail?sellerId=154248287510213289&activityId=6c4c5a8c6b3f49099370eec50063b894",
+        "name": "老金磨方无糖黑芝麻丸老金磨坊正品官方旗舰店代餐早餐五黑芝麻球",
+        "coupon_money": 120,
+        "market_price": 155.6,
+        "commission": "3.56",
+        "commission_rate": 20,
+        "id": "PDJm7ds3tOwrgZtv9wFPt6-nJAVXpdHQ4KPGNkDCP",
+        "type": 5,
+        "commission_type": 3,
+        "sales": 292
       }
-    ],
-    "order": {
-      "order_id": "4265",
-      "group_order_id": "4659",
-      "order_sn": "wx1695261950701957251",
-      "uid": "10753",
-      "real_name": "测试",
-      "user_phone": "18513112593",
-      "user_address": "北京顺义区光明街道 测试",
-      "user_address_ids": "1,35,493,0",
-      "area_manage_address_ids": "",
-      "cart_id": "11517",
-      "total_num": "1",
-      "total_price": "600.00",
-      "total_postage": "10.00",
-      "pay_price": "610.00",
-      "pay_postage": "10.00",
-      "extension_one": "59.64",
-      "extension_two": "0.00",
-      "commission_rate": "2.0000",
-      "coupon_id": "",
-      "coupon_price": "0.00",
-      "order_type": "0",
-      "paid": "1",
-      "pay_time": "2023-09-21 10:31:32",
-      "pay_type": "5",
-      "create_time": "2023-09-21 10:05:51",
-      "status": "1",
-      "delivery_type": "1",
-      "delivery_name": "中通快递",
-      "delivery_id": "78367406471357",
-      "mark": "",
-      "remark": null,
-      "admin_mark": null,
-      "verify_code": null,
-      "verify_time": null,
-      "verify_service_id": "0",
-      "mer_id": "465",
-      "reconciliation_id": "0",
-      "cost": "300.00",
-      "is_del": "0",
-      "is_system_del": "0",
-      "remind": "0",
-      "remind_time": null,
-      "gzc": "0",
-      "trade_no": "",
-      "channel_trade_no": "",
-      "alipay_no": "",
-      "weixin_no": "",
-      "table_id": "0",
-      "mer_money": "549.00",
-      "last_status": null,
-      "share_id": "0",
-      "pay_mer_id": null,
-      "is_split_to_tomorrow": "0",
-      "service_money": "361.00",
-      "test_order": "0",
-      "dacang_id": "0",
-      "distribution_mode": "0",
-      "da_cang_profit": "0.00",
-      "recommended_merchants": "0.00",
-      "mer_fanyong": "61.00",
-      "is_dacang": "0",
-      "cost_price": null,
-      "douhuomall": null,
-      "douhuomall_status": null,
-      "douhuomall_msg": null,
-      "address_id": "289",
-      "douhuomall_order_no": null,
-      "supply_type": null,
-      "seckill": "0",
-      "orderProduct": [
-        {
-          "order_product_id": "4535",
-          "order_id": "4265",
-          "uid": "10753",
-          "cart_id": "11517",
-          "product_id": "6101",
-          "extension_one": "0.00",
-          "extension_two": "0.00",
-          "product_sku": "4fdae5562b10",
-          "is_refund": "0",
-          "product_num": "1",
-          "refund_num": "1",
-          "is_reply": "0",
-          "product_price": "600.00",
-          "cart_info": {
-            "product": {
-              "product_id": "6101",
-              "image": "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-09-04\/782c3202309041605416214.png",
-              "store_name": "头层牛皮女粗高跟骑士靴2023年秋冬款绑带休闲靴薄绒长筒靴女",
-              "is_show": "1",
-              "status": "1",
-              "is_del": "0",
-              "unit_name": "双",
-              "price": "500.00",
-              "mer_status": "1",
-              "temp_id": "257",
-              "give_coupon_ids": [],
-              "is_gift_bag": "0",
-              "is_used": "1",
-              "product_type": "0",
-              "old_product_id": "0",
-              "temp": {
-                "shipping_template_id": "257",
-                "name": "有运费的模板",
-                "type": "0",
-                "appoint": "0",
-                "undelivery": "0",
-                "mer_id": "465",
-                "is_default": "0",
-                "sort": "10",
-                "create_time": "2023-09-09 09:22:39",
-                "regionAddress": {
-                  "shipping_template_region_id": "609",
-                  "temp_id": "257",
-                  "city_id": "0",
-                  "first": "1.00",
-                  "first_price": "10.00",
-                  "continue": "1.00",
-                  "continue_price": "5.00"
-                },
-                "undelives": null,
-                "freeAddress": null
-              }
-            },
-            "productAttr": {
-              "gong_mer_profit": null,
-              "gong_pension": null,
-              "gong_market_price": null,
-              "cost_price": null,
-              "product_id": "6101",
-              "stock": "7",
-              "price": "600.00",
-              "unique": "4fdae5562b10",
-              "sku": "黄,36",
-              "volume": "0.00",
-              "weight": "0.00",
-              "ot_price": "8000.00",
-              "dacang_price": "0.00",
-              "cost": "300.00",
-              "bc_extension_one": 0,
-              "bc_extension_two": 0,
-              "seckill": 0
-            },
-            "product_type": "0"
-          },
-          "create_time": "2023-09-21 10:05:50",
-          "type": "1"
-        }
-      ]
-    }
-  }
+    ]
+  },
+  "message": "成功",
+  "status": 200
 }

src/pages/order_addcart/index-bak.vue

@@ -0,0 +1,642 @@
+<script lang="ts" setup>
+import {getRecommendList} from "~/apis/merchant";
+import MerchantProductCard from "~/pages/store/home/components/MerchantProductCard.vue";
+import {deleteCartItem, getCartList} from "~/apis/user";
+import type {ShoppingResult} from "~/apis/model/shopping.model";
+import FPrice from "~/components/FPrice/FPrice.vue";
+import FButton from "~/components/FButton/FButton.vue";
+import CXBYaojinTag from "~/components/CXBYaojinTag/CXBYaojinTag.vue";
+import {
+  DyProductModel, IProductDetail,
+  JdProductModel,
+  SuNingProductModel,
+  TaobaoProductThirdPartyWaresModel, VipProductModel
+} from "~/apis/model/product.model";
+import {DcProductModel} from "~/apis/model/dacang.model";
+import {encodeBase64} from "~/utils/http/helper";
+import {CDN_URL} from "~/config/app";
+import {uniq} from "lodash-es";
+import {cartChange} from "~/apis/order.api";
+const gouwucheImage = CDN_URL + '/static/assets/gouwuche.png'
+const like_adorn_220628Image = CDN_URL + '/static/assets/like_adorn_220628.png'
+const state = reactive({
+  recommendList: [],
+  currentPage: 1,
+  pageSize: 10,
+  total: 0,
+  totalPage: 0,
+
+
+  totalCartCount: 0,
+  totalPrice: 0,
+  selectAllIndeterminate: false,
+
+  cart_id: [],
+  isManage: true,
+
+  currentType: '',
+})
+
+const shopping = ref<ShoppingResult>()
+
+onShow(() => {
+  state.cart_id = []
+  loadCartList()
+  if (!state.isManage) {
+    state.isManage = true
+  }
+
+  loadList('reload')
+})
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+  const params = {
+    page: state.currentPage,
+    limit: state.pageSize
+  }
+
+  if (action === 'reload') {
+    params.page = 1
+  }
+
+  getRecommendList({
+    ...params
+  }).then(res => {
+    if (action === 'page') {
+      state.recommendList = state.recommendList.concat(res.list)
+    }
+    if (action === 'reload') {
+      // state.list = state.list.concat(res.list)
+      state.recommendList = 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.totalPage)
+  if (state.currentPage > state.totalPage) {
+    state.status = 'noMore';
+  } else {
+    setTimeout(() => {
+      loadList('page')
+    }, 300)
+  }
+}
+
+onReachBottom(() => {
+  handleScrollToLower()
+
+})
+
+// 加载购物车数据
+function loadCartList() {
+  state.totalCartCount = 0
+  getCartList().then(res => {
+    shopping.value = res
+
+    console.log(res)
+    shopping.value?.list.forEach((shopItem, index) => {
+      // shopItem.allCheck = true
+
+      shopItem.allCheck = false
+      shopItem.indeterminate = false
+      shopItem.list.forEach(goodItem => {
+        goodItem.check = false
+        // state.cart_id.push(goodItem.cart_id)
+        // if (goodItem.cart_num === 1) {}
+        state.totalCartCount += Number.parseInt(goodItem.cart_num)
+      })
+      // console.log(shopItem)
+
+    })
+    // cartAllCheck("all")
+    // if (shopping.value) {
+    //   handleSelectAll()
+    // }
+  })
+}
+const hasShopping = computed(() => {
+  return shopping.value && shopping.value?.list.length > 0
+})
+
+const totalCartInfo = computed(() => {
+  let totalPrice = 0
+  let goodsNum = 0
+  if (shopping.value && shopping.value?.list.length > 0) {
+    for (let i = 0; i < shopping.value?.list.length; i++) {
+      for (let j = 0; j < shopping.value?.list[i].list.length; j++) {
+        let num = Number.parseInt(shopping.value?.list[i].list[j].cart_num);
+        let price = Number.parseFloat(shopping.value?.list[i].list[j].productAttr.price)
+        totalPrice += (num * price)
+        goodsNum += num
+      }
+    }
+  }
+
+  return {
+    totalPrice,
+    goodsNum
+  }
+})
+const totalMoney = ref(0)
+const isAllSelect = ref(false)
+
+function handleGoodsItemCheck(check) {
+  // console.log('good item check....')
+  // console.log(check)
+  // if (isAllSelect.value) {return}
+  // cartAllCheck('single')
+  _singleCheck()
+}
+
+function shopCheck(shopItem) {
+  console.log('shop check...')
+  // console.log(shopItem)
+  if (shopItem.allCheck && !shopItem.indeterminate) {
+    console.log(shopItem)
+    shopItem.list.forEach((good, index) => {
+      good.check = true
+    })
+
+  } else {
+    shopItem.list.forEach((good, index) => {
+      good.check = false
+    })
+  }
+}
+function cartAllCheck(type: 'single' | 'all') {
+  let allArr = []
+  let totalMoney = 0
+  let totalNum = 0
+  state.currentType = type
+
+  console.log(type)
+  shopping.value?.list.forEach((goods, index) => {
+    if (type === 'single') {
+      // 如果单选的情况下, 获取已选中的
+      let tempArr = goods.list.filter(goodItem => {
+        // if (goodItem.check) {
+          return goodItem.check === true
+        // }
+      })
+      console.log(goods.list.length + '购物车长度')
+      if (goods.list.length === tempArr.length) {
+        console.log('这里是全选状态了。。。。')
+        goods.allCheck = true
+        allArr.push(goods)
+        goods.indeterminate = false
+        return
+      }
+
+      console.log(tempArr.length + '---当长长度')
+      if (tempArr.length > 0) {
+        goods.indeterminate = true
+        return
+      }
+      if (tempArr.length <= 0) {
+        goods.allCheck = false
+        state.currentType = 'all'
+        state.indeterminate = false
+        return
+      }
+    } else {
+      console.log('alll type......')
+      goods.list.forEach(goodItem => {
+        goodItem.check = isAllSelect.value
+      })
+      goods.allCheck = isAllSelect.value
+      if (goods.allCheck) {
+        allArr.push(goods)
+      }
+    }
+
+    // 总金额｜总数
+    goods.list.forEach(goodItem => {
+      if (goodItem.check) {
+        totalMoney += (goodItem.productAttr.price * goodItem.cart_num)
+        totalNum += Number.parseFloat(goodItem.cart_num)
+        state.cart_id.push(goodItem.cart_id)
+      }
+    })
+  })
+
+  isAllSelect.value = allArr.length === shopping.value?.list.length
+  // state.totalCartCount = totalNum
+  state.totalPrice = totalMoney
+}
+
+function _singleCheck() {
+  console.log(state.currentType)
+  if (state.currentType === 'all') {
+    return
+    //   _singleCheck()
+  }
+  state.currentType = 'single'
+  let allArr = []
+  let totalMoney = 0
+  let totalNum = 0
+  state.cart_id = []
+  shopping.value?.list.forEach((goods, index) => {
+      // 如果单选的情况下, 获取已选中的
+      let tempArr = goods.list.filter(goodItem => {
+        // if (goodItem.check) {
+        return goodItem.check === true
+        // }
+      })
+      if (goods.list.length === tempArr.length) {
+        goods.allCheck = true
+        allArr.push(goods)
+        goods.indeterminate = false
+      }
+
+      if (tempArr.length > 0) {
+        goods.indeterminate = true
+      }
+      if (tempArr.length <= 0) {
+        console.log('没有选中的了。。。')
+        goods.allCheck = false
+        state.currentType = 'all'
+        goods.indeterminate = false
+      }
+
+    // 总金额｜总数
+    goods.list.forEach(goodItem => {
+      if (goodItem.check) {
+        console.log(goodItem)
+
+        totalMoney += (goodItem.productAttr.price * goodItem.cart_num)
+        console.log(totalMoney)
+        totalNum += Number.parseFloat(goodItem.cart_num)
+        state.cart_id.push(goodItem.cart_id)
+      }
+    })
+  })
+  if (allArr.length === shopping.value?.list.length) {
+    isAllSelect.value = true
+    state.currentType = 'all'
+  } else if (allArr.length > 0){
+    state.selectAllIndeterminate = true
+  } else {
+    isAllSelect.value = false
+
+  }
+  state.totalPrice = totalMoney
+}
+function _selectAll() {
+  // if current == single 说明刚才操作的置为多选是从这里来的？
+  state.currentType = 'all'
+  let allArr = []
+  let totalMoney = 0
+  let totalNum = 0
+  // state.currentType = type
+  //
+  // console.log(type)
+  shopping.value?.list.forEach((goods, index) => {
+
+      goods.list.forEach(goodItem => {
+        goodItem.check = isAllSelect.value
+      })
+      goods.allCheck = isAllSelect.value
+      if (goods.allCheck) {
+        allArr.push(goods)
+      }
+
+    // 总金额｜总数
+    goods.list.forEach(goodItem => {
+      if (goodItem.check) {
+        totalMoney += (goodItem.productAttr.price * goodItem.cart_num)
+        totalNum += Number.parseFloat(goodItem.cart_num)
+        state.cart_id.push(goodItem.cart_id)
+      }
+    })
+  })
+
+  isAllSelect.value = allArr.length === shopping.value?.list.length
+  // state.totalCartCount = totalNum
+  state.totalPrice = totalMoney
+}
+
+// watch(() => isAllSelect.value, (val) => {
+//   if (!val) {
+//     state.cart_id = []
+//   }
+// })
+
+function reTotal() {
+  let allArr = []
+  let totalMoney = 0
+  let totalNum = 0
+
+  shopping.value?.list.forEach((goods, index) => {
+    // 总金额｜总数
+    goods.list.forEach(goodItem => {
+      if (goodItem.check) {
+        totalMoney += (goodItem.productAttr.price * goodItem.cart_num)
+        totalNum += Number.parseFloat(goodItem.cart_num)
+        // state.cart_id.push(goodItem.cart_id)
+      }
+    })
+  })
+
+  // isAllSelect.value = allArr.length === shopping.value?.list.length
+  // state.totalCartCount = totalNum
+  state.totalPrice = totalMoney
+}
+function handleSelectAll(checked: boolean) {
+  // 如何区分是由当前的 checkbox 发起的？要区
+  // console.log(state.currentType + '这里是当前类型。。。。')
+
+  if (state.currentType === 'single') {
+    return
+  //   _singleCheck()
+  }
+  _selectAll()
+  // if (state.currentType == 'single') {
+  //   return
+  // }
+  // console.log(isAllSelect.value)
+  // if (isAllSelect.value) {
+  // cartAllCheck('all')
+
+  // }
+  // console.log('000')
+  // isAllSelect.value = !isAllSelect.value
+  // isAllSelect.value = checked
+  // 这里需要修改 checkbox 的检查
+}
+
+function handleManageCart() {
+  state.isManage = !state.isManage
+}
+
+function handleSubmit() {
+  console.log(state.isManage)
+
+  if (!state.isManage) {
+    handleDelete()
+  } else { // submit
+    state.cart_id = uniq(state.cart_id)
+
+    // console.log(state.cart_id)
+    if (state.cart_id && state.cart_id.length > 0) {
+      uni.navigateTo({
+        url: `/pages/order-confirm/index?cartId=${state.cart_id.join(',')}`
+      })
+    } else {
+      return uni.showToast({
+        title: '请选择商品',
+        icon: 'none'
+      })
+    }
+  }
+
+}
+
+function handleDelete() {
+  // const cart_id = <any>[]
+  shopping.value?.list.forEach(shopItem => {
+    shopItem.list.forEach(goodItem => {
+      if (goodItem.check) {
+        state.cart_id.push(goodItem.cart_id)
+      }
+    })
+  })
+  state.cart_id = uniq(state.cart_id)
+
+  // console.log(cart_id)
+  if (state.cart_id.length === 0) {
+    return uni.showToast({
+      title: '请选择产品',
+      icon: "none"
+    })
+  } else {
+    uni.showModal({
+      title: '温馨提示',
+      content: '确认将宝贝删除?',
+      success: (res) => {
+        if (res.confirm) {
+          deleteCartItem(state.cart_id).then(res => {
+            uni.showToast({
+              title: '删除成功'
+            })
+            state.isManage = true
+            state.cart_id = []
+            state.totalPrice = ''
+            loadCartList()
+          })
+
+        } else if (res.cancel) {
+        }
+      }
+    })
+  }
+}
+
+
+function handleProductItemClick(
+    item:
+        JdProductModel
+        & DcProductModel
+        & DyProductModel
+        & SuNingProductModel
+        & TaobaoProductThirdPartyWaresModel
+        & VipProductModel
+) {
+  // function navigateToDetail(params) {
+  //   let otherDetailUrl = `/pages/store/product/other`
+  //   return uni.navigateTo({
+  //     url: `${otherDetailUrl}?params=${params}`
+  //   })
+  // }
+  // 大仓
+    uni.navigateTo({
+      url: `/pages/store/product/detail?id=${item.product_id}`
+    })
+}
+
+function handleNumberChange(num, goodItem) {
+  console.log(goodItem)
+  uni.showLoading()
+  console.log(num)
+  cartChange(goodItem.cart_id, num).then(res => {
+    reTotal()
+    uni.hideLoading()
+  })
+  // console.log(goodItem)
+  // console.log(num)
+  // const
+  // goodItem.productAttr.price = goodItem.productAttr.price * num
+  // goodItem.productAttr.price = goodItem.productAttr.price * goodItem.cart_num
+}
+</script>
+<template>
+  <div class="">
+    <div
+        v-if="hasShopping"
+        class="bg-white h-10 fixed top-0 w-full z-1 flex justify-end "
+    >
+      <div class="pr-3">
+        <FButton size="small"
+                 @click="handleManageCart"
+        >
+          <div>{{ state.isManage ? '管理' : '完成'}}</div>
+        </FButton>
+      </div>
+    </div>
+    <div
+        v-if="!hasShopping"
+        class="flex flex-col justify-center items-center bg-white rounded-lg gap-3 text-xs py-8">
+      <div>
+        <image :src="gouwucheImage" mode="widthFix" class="w-20 h-20"></image>
+      </div>
+      <div>
+        暂无商品，去添加喜欢的商品
+      </div>
+    </div>
+    <div v-else class="mt-10">
+
+      <div
+          v-if="shopping && shopping.list"
+          class="flex flex-col gap-4 p-3"
+      >
+        <div
+            v-for="(shopItem, index) in shopping.list"
+            :key="index"
+            class="bg-white rounded-lg  "
+        >
+          <div
+              class="f-hairline-bottom flex  items-center font-bold p-3"
+          >
+            <nut-checkbox v-model="shopItem.allCheck"
+                          @change="shopCheck(shopItem)"
+                          :indeterminate="shopItem.indeterminate"
+                          label="全选"
+                          class="!text-primary"
+            >
+              {{ shopItem.mer_name }}
+            </nut-checkbox>
+          </div>
+          <div v-for="(goodItem, goodIndex) in shopItem.list"
+               :key="goodIndex"
+               class="flex f-hairline-bottom p-3 gap-2"
+          >
+            <div class="flex">
+              <nut-checkbox v-model="goodItem.check"
+                            @change="handleGoodsItemCheck"
+                            label="单选"
+                            class="!text-primary"
+              ></nut-checkbox>
+              <image
+                  :src="goodItem.product.image"
+                  mode="aspectFill" class="w-18 h-18 rounded"
+              ></image>
+            </div>
+
+            <div class="flex flex-col gap-1 w-full">
+              <div
+                  @click="handleProductItemClick(goodItem)"
+                  class="text-overflow line-clamp-2 text-xs">{{ goodItem.product.store_name }}</div>
+              <div class="flex flex-col justify-start gap-1">
+                <div
+                    class="text-[10px] text-gray min-w-5  p-1  items-center flex">
+                  {{ goodItem.productAttr.sku }}
+                </div>
+                <div class="flex">
+                  <CXBYaojinTag :amount="goodItem.yanglao"/>
+
+                </div>
+              </div>
+              <div class="flex  justify-between ">
+                <FPrice :price="goodItem.productAttr.price"
+                        ex-class="font-bold text-dark"
+                />
+                <nut-input-number v-model="goodItem.cart_num" @change="(num) => handleNumberChange(num, goodItem)"/>
+              </div>
+            </div>
+          </div>
+        </div>
+
+      </div>
+    </div>
+
+    <div class="pb-12">
+      <div class="flex flex-row justify-center items-center gap-3 font-bold text-sm p-3 ">
+        <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
+        <div>
+          猜你喜欢
+        </div>
+        <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
+      </div>
+
+      <div class="pb-3 px-3" v-if="state.recommendList">
+        <grid-view type="masonry" cross-axis-count="2" cross-axis-gap="10px" main-axis-gap="10px">
+          <div v-for="(item, index) in state.recommendList"
+               :key="index"
+               @click="handleProductItemClick(item)"
+          >
+            <MerchantProductCard :item="item" />
+
+          </div>
+        </grid-view>
+
+        <div class=" flex justify-center items-center text-[12px] text-gray-500"
+        >
+          <div v-if="state.status === 'loading'">
+            加载中...
+          </div>
+          <div v-if="state.status === 'noMore'">
+            没有更多了～
+          </div>
+        </div>
+
+      </div>
+    </div>
+  </div>
+
+  <div v-if="hasShopping"
+      class="fixed bottom-0 w-full z-3">
+    <div class="bg-white h-10 flex justify-between" v-if="shopping && shopping.list">
+      <div class="flex justify-center items-center gap-2 pl-3">
+        <nut-checkbox v-model="isAllSelect"
+                      @change="handleSelectAll"
+                      :indeterminate="state.selectAllIndeterminate"
+                      label="全选"
+                      class="!text-primary"
+        >全选
+        </nut-checkbox>
+        <div class="text-xs text-gray">共 {{ state.totalCartCount }} 件</div>
+      </div>
+
+      <div class="flex justify-center items-center gap-2 pr-3">
+        <div class="flex text-[12px]" v-if="state.isManage">
+          合计：
+          <FPrice :price="state.totalPrice"></FPrice>
+<!--          {{totalCartInfo.totalPrice}}-->
+        </div>
+        <FButton
+            @click="handleSubmit"
+            size="small"
+            :exClass="['rounded-full','!text-[14px]', 'text-white', 'bg-primary', 'w-full']"
+        >
+          {{ state.isManage? '去结算' : '删除'}}
+        </FButton>
+      </div>
+    </div>
+  </div>
+</template>
+<style>
+page {
+  background-color: #f8f8f8;
+}
+</style>
+<route lang="yaml">
+style:
+  navigationBarTitleText: 购物车
+  enablePullDownRefresh: false
+</route>

src/pages/order_addcart/index.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import {getRecommendList} from "~/apis/merchant";
 import MerchantProductCard from "~/pages/store/home/components/MerchantProductCard.vue";
-import {deleteCartItem, getCartList} from "~/apis/user";
+import {deleteCartItem, getCartCount, getCartList} from "~/apis/user";
 import type {ShoppingResult} from "~/apis/model/shopping.model";
 import FPrice from "~/components/FPrice/FPrice.vue";
 import FButton from "~/components/FButton/FButton.vue";
@@ -19,6 +19,9 @@ import {uniq} from "lodash-es";
 import {cartChange} from "~/apis/order.api";
 const gouwucheImage = CDN_URL + '/static/assets/gouwuche.png'
 const like_adorn_220628Image = CDN_URL + '/static/assets/like_adorn_220628.png'
+const pageStore = usePageStoreWidthOut()
+
+
 const state = reactive({
   recommendList: [],
   currentPage: 1,
@@ -39,13 +42,27 @@ const state = reactive({
 
 const shopping = ref<ShoppingResult>()
 
-onShow(() => {
+onLoad((options) => {
+  uni.$on('cart-reload', () => {
+    // console.log('新商品添加...')
+    state.cart_id = []
+    loadCartList()
+  })
+
   state.cart_id = []
   loadCartList()
+})
+onShow(() => {
+  // pageStore.setPageConfig({
+  //   orderBack: {
+  //     type: 'tab',
+  //     url:  '/pages/order_addcart/index'
+  //   }
+  // })
   if (!state.isManage) {
     state.isManage = true
   }
-
+  loadCartCount()
   loadList('reload')
 })
 function loadList(action: 'page' | 'reload', callback?: (items) => void) {
@@ -96,10 +113,11 @@ onReachBottom(() => {
 
 // 加载购物车数据
 function loadCartList() {
+  // state.totalCartCount = 0
   getCartList().then(res => {
     shopping.value = res
 
-    console.log(res)
+    // console.log(res)
     shopping.value?.list.forEach((shopItem, index) => {
       // shopItem.allCheck = true
 
@@ -109,7 +127,7 @@ function loadCartList() {
         goodItem.check = false
         // state.cart_id.push(goodItem.cart_id)
         // if (goodItem.cart_num === 1) {}
-        state.totalCartCount += Number.parseInt(goodItem.cart_num)
+        // state.totalCartCount += Number.parseInt(goodItem.cart_num)
       })
       // console.log(shopItem)
 
@@ -147,26 +165,37 @@ const totalMoney = ref(0)
 const isAllSelect = ref(false)
 
 function handleGoodsItemCheck(check) {
-  // console.log('good item check....')
-  // console.log(check)
-  // if (isAllSelect.value) {return}
-  // cartAllCheck('single')
-  _singleCheck()
+  cartAllCheck('single')
 }
 
 function shopCheck(shopItem) {
-  console.log('shop check...')
-  console.log(shopItem)
-  if (shopItem.allCheck && !shopItem.indeterminate) {
-    console.log(shopItem)
-    shopItem.list.forEach((good, index) => {
-      good.check = true
-    })
+  // console.log('shoo...')
+  // if (type === 'active') {
+  //   console.log('shooo...')
+  //   if (shopItem.allCheck) {
+  //     console.log(shopItem)
+  //     shopItem.list.forEach((good, index) => {
+  //       good.check = true
+  //     })
+  //     // cartAllCheck('single')
+  //
+  //   } else {
+  //     shopItem.list.forEach((good, index) => {
+  //       good.check = false
+  //     })
+  //   }
+  // }
+}
 
+function handleShopTitleClick(shopItem) {
+  if (shopItem.allCheck) {
+        shopItem.list.forEach((good, index) => {
+          good.check = true
+        })
   } else {
-    shopItem.list.forEach((good, index) => {
-      good.check = false
-    })
+        shopItem.list.forEach((good, index) => {
+          good.check = false
+        })
   }
 }
 function cartAllCheck(type: 'single' | 'all') {
@@ -175,125 +204,34 @@ function cartAllCheck(type: 'single' | 'all') {
   let totalNum = 0
   state.currentType = type
 
-  console.log(type)
+  // console.log(type)
   shopping.value?.list.forEach((goods, index) => {
     if (type === 'single') {
       // 如果单选的情况下, 获取已选中的
       let tempArr = goods.list.filter(goodItem => {
         // if (goodItem.check) {
-          return goodItem.check === true
+        return goodItem.check === true
         // }
       })
-      console.log(goods.list.length + '购物车长度')
+      // console.log(tempArr)
       if (goods.list.length === tempArr.length) {
-        console.log('这里是全选状态了。。。。')
         goods.allCheck = true
         allArr.push(goods)
-        goods.indeterminate = false
-        return
-      }
-
-      console.log(tempArr.length + '---当长长度')
-      if (tempArr.length > 0) {
-        goods.indeterminate = true
-        return
+        // goods.indeterminate = false
       }
-      if (tempArr.length <= 0) {
+      if (tempArr.length < goods.list.length) {
         goods.allCheck = false
-        state.currentType = 'all'
-        state.indeterminate = false
-        return
-      }
-    } else {
-      console.log('alll type......')
-      goods.list.forEach(goodItem => {
-        goodItem.check = isAllSelect.value
-      })
-      goods.allCheck = isAllSelect.value
-      if (goods.allCheck) {
-        allArr.push(goods)
-      }
-    }
-
-    // 总金额｜总数
-    goods.list.forEach(goodItem => {
-      if (goodItem.check) {
-        totalMoney += (goodItem.productAttr.price * goodItem.cart_num)
-        totalNum += Number.parseFloat(goodItem.cart_num)
-        state.cart_id.push(goodItem.cart_id)
-      }
-    })
-  })
-
-  isAllSelect.value = allArr.length === shopping.value?.list.length
-  // state.totalCartCount = totalNum
-  state.totalPrice = totalMoney
-}
-
-function _singleCheck() {
-  state.currentType = 'single'
-  let allArr = []
-  let totalMoney = 0
-  let totalNum = 0
-  state.cart_id = []
-  shopping.value?.list.forEach((goods, index) => {
-      // 如果单选的情况下, 获取已选中的
-      let tempArr = goods.list.filter(goodItem => {
-        // if (goodItem.check) {
-        return goodItem.check === true
-        // }
-      })
-      if (goods.list.length === tempArr.length) {
-        goods.allCheck = true
-        allArr.push(goods)
-        goods.indeterminate = false
       }
 
-      if (tempArr.length > 0) {
-        goods.indeterminate = true
-      }
+      // if (tempArr.length > 0) {
+      //   goods.indeterminate = true
+      // }
       if (tempArr.length <= 0) {
-        console.log('没有选中的了。。。')
         goods.allCheck = false
-        state.currentType = 'all'
-        goods.indeterminate = false
+        // state.currentType = 'all'
+        // state.indeterminate = false
       }
-
-    // 总金额｜总数
-    goods.list.forEach(goodItem => {
-      if (goodItem.check) {
-        console.log(goodItem)
-
-        totalMoney += (goodItem.productAttr.price * goodItem.cart_num)
-        console.log(totalMoney)
-        totalNum += Number.parseFloat(goodItem.cart_num)
-        state.cart_id.push(goodItem.cart_id)
-      }
-    })
-  })
-  if (allArr.length === shopping.value?.list.length) {
-    isAllSelect.value = true
-    state.currentType = 'all'
-  } else if (allArr.length > 0){
-    state.selectAllIndeterminate = true
-  } else {
-    isAllSelect.value = false
-
-  }
-  state.totalPrice = totalMoney
-}
-function _selectAll() {
-  // if current == single 说明刚才操作的置为多选是从这里来的？
-  console.log(state.currentType)
-  state.currentType = 'all'
-  let allArr = []
-  let totalMoney = 0
-  let totalNum = 0
-  // state.currentType = type
-  //
-  // console.log(type)
-  shopping.value?.list.forEach((goods, index) => {
-
+    } else {
       goods.list.forEach(goodItem => {
         goodItem.check = isAllSelect.value
       })
@@ -301,6 +239,7 @@ function _selectAll() {
       if (goods.allCheck) {
         allArr.push(goods)
       }
+    }
 
     // 总金额｜总数
     goods.list.forEach(goodItem => {
@@ -317,11 +256,6 @@ function _selectAll() {
   state.totalPrice = totalMoney
 }
 
-// watch(() => isAllSelect.value, (val) => {
-//   if (!val) {
-//     state.cart_id = []
-//   }
-// })
 
 function reTotal() {
   let allArr = []
@@ -333,45 +267,51 @@ function reTotal() {
     goods.list.forEach(goodItem => {
       if (goodItem.check) {
         totalMoney += (goodItem.productAttr.price * goodItem.cart_num)
-        totalNum += Number.parseFloat(goodItem.cart_num)
         // state.cart_id.push(goodItem.cart_id)
       }
+      totalNum += Number.parseFloat(goodItem.cart_num)
+
     })
   })
 
   // isAllSelect.value = allArr.length === shopping.value?.list.length
   // state.totalCartCount = totalNum
+  loadCartCount()
   state.totalPrice = totalMoney
 }
 function handleSelectAll(checked: boolean) {
-  // 如何区分是由当前的 checkbox 发起的？要区
-  // console.log(state.currentType + '这里是当前类型。。。。')
 
-  if (state.currentType === 'single') {
-    return
-  //   _singleCheck()
-  }
-  _selectAll()
-  // if (state.currentType == 'single') {
-  //   return
-  // }
-  // console.log(isAllSelect.value)
-  // if (isAllSelect.value) {
-  // cartAllCheck('all')
+  cartAllCheck('all')
 
-  // }
-  // console.log('000')
-  // isAllSelect.value = !isAllSelect.value
-  // isAllSelect.value = checked
-  // 这里需要修改 checkbox 的检查
 }
+function loadCartCount() {
+  getCartCount().then(res => {
+    // console.log(res)
+    // state.cartCount = res[0].count
+    state.totalCartCount = res[0].count
+
+  }).catch(error => {
+    // console.log(error)
+    if (error === '请登录') {
+      // uni.showToast({
+      //   title: '请登录',
+      //   icon: 'none'
+      // })
+      setTimeout(() => {
+        uni.navigateTo({
+          url: '/pages/user/login/index?key=4'
+        })
+      }, 500)
 
+    }
+  })
+}
 function handleManageCart() {
   state.isManage = !state.isManage
 }
 
 function handleSubmit() {
-  console.log(state.isManage)
+  // console.log(state.isManage)
 
   if (!state.isManage) {
     handleDelete()
@@ -450,15 +390,15 @@ function handleProductItemClick(
   //   })
   // }
   // 大仓
-    uni.navigateTo({
-      url: `/pages/store/product/detail?id=${item.product_id}`
-    })
+  uni.navigateTo({
+    url: `/pages/store/product/detail?id=${item.product_id}`
+  })
 }
 
 function handleNumberChange(num, goodItem) {
-  console.log(goodItem)
+  // console.log(goodItem)
   uni.showLoading()
-  console.log(num)
+  // console.log(num)
   cartChange(goodItem.cart_id, num).then(res => {
     reTotal()
     uni.hideLoading()
@@ -508,14 +448,17 @@ function handleNumberChange(num, goodItem) {
           <div
               class="f-hairline-bottom flex  items-center font-bold p-3"
           >
+            <div @tap.stop="handleShopTitleClick(shopItem)">
+
             <nut-checkbox v-model="shopItem.allCheck"
-                          @change="shopCheck(shopItem)"
-                          :indeterminate="shopItem.indeterminate"
+                          @change="(checked) => shopCheck( shopItem)"
                           label="全选"
                           class="!text-primary"
             >
               {{ shopItem.mer_name }}
             </nut-checkbox>
+            </div>
+
           </div>
           <div v-for="(goodItem, goodIndex) in shopItem.list"
                :key="goodIndex"
@@ -528,6 +471,7 @@ function handleNumberChange(num, goodItem) {
                             class="!text-primary"
               ></nut-checkbox>
               <image
+                  @click="handleProductItemClick(goodItem)"
                   :src="goodItem.product.image"
                   mode="aspectFill" class="w-18 h-18 rounded"
               ></image>
@@ -595,12 +539,10 @@ function handleNumberChange(num, goodItem) {
   </div>
 
   <div v-if="hasShopping"
-      class="fixed bottom-0 w-full z-3">
+       class="fixed bottom-0 w-full z-3">
     <div class="bg-white h-10 flex justify-between" v-if="shopping && shopping.list">
-      <div class="flex justify-center items-center gap-2 pl-3">
+      <div class="flex justify-center items-center gap-2 pl-3" @tap.stop="handleSelectAll">
         <nut-checkbox v-model="isAllSelect"
-                      @change="handleSelectAll"
-                      :indeterminate="state.selectAllIndeterminate"
                       label="全选"
                       class="!text-primary"
         >全选
@@ -612,7 +554,7 @@ function handleNumberChange(num, goodItem) {
         <div class="flex text-[12px]" v-if="state.isManage">
           合计：
           <FPrice :price="state.totalPrice"></FPrice>
-<!--          {{totalCartInfo.totalPrice}}-->
+          <!--          {{totalCartInfo.totalPrice}}-->
         </div>
         <FButton
             @click="handleSubmit"
@@ -633,5 +575,5 @@ page {
 <route lang="yaml">
 style:
   navigationBarTitleText: 购物车
-  enablePullDownRefresh: true
+  enablePullDownRefresh: false
 </route>

src/pages/payment/index.vue

@@ -1,5 +1,10 @@
 <template>
-    <div class="w-full">
+  <FNavBar
+      title="支付方式" :left-arrow="true" fixed placeholder z-index="999"
+      ex-class="bg-white w-screen"
+      @click-left="onClickLeft"
+  />
+    <div class="w-full mt-20">
       <div class=" flex flex-col gap-3 p-3">
         <div class="flex flex-col justify-center items-center bg-white rounded p-4">
           <div class="text-xs text-gray-500">支付金额</div>
@@ -34,6 +39,16 @@ import FPrice from "~/components/FPrice/FPrice.vue";
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import {CDN_URL} from "~/config/app";
 import {checkGroupOrder} from "~/apis/order.api";
+import FNavBar from "~/components/FNavBar/FNavBar.vue";
+
+// usePageStore.setPageConfig({
+//   orderBack: {
+//     type: 'page',
+//     url: '/pages/store/product/detail?id=' + state.id
+//   }
+// })
+
+const pageStore = usePageStoreWidthOut()
 
 const wxLogoImage = CDN_URL + '/static/assets/wx_logo.png'
 const state = reactive({
@@ -42,6 +57,8 @@ const state = reactive({
   orderId: '',
   code: '',
   memberType: 0,
+
+  tabIndex: NaN,
 })
 onLoad((options) => {
   if (options) {
@@ -49,6 +66,11 @@ onLoad((options) => {
     state.payPrice = options.pay_price
     state.orderId = options.order_id
 
+    console.log(options)
+    if (options.tabIndex) {
+      state.tabIndex = options.tabIndex
+    }
+
     // uni.login({
     //   success: (res) => {
     //     state.code = res.code
@@ -95,10 +117,58 @@ function handleConfirm() {
   })
 
 }
+
+function onClickLeft() {
+  uni.showModal({
+    title: '确认要离开收银台?',
+    content: '您的订单在24小时内未支付将被取消，请尽快完成支付。',
+    confirmColor: '#FE0032',
+    confirmText: '继续支付',
+    cancelText: '确认离开',
+    success: (res) =>  {
+      if (res.confirm) {
+        handleConfirm()
+        uni.$emit('cart-reload')
+
+      }
+      if (res.cancel) {
+        // uni.navigateBack()
+        uni.$emit('cart-reload')
+        // let url = '/pages/order/index?tabIndex=1'
+        // if (usePageStore.orderBack) {
+        //   url += `&from=${usePageStore.orderBack}`
+        // }
+        if (state.tabIndex) {
+          pageStore.setPageConfig({
+            orderBack: {
+              url: '/pages/user/index',
+              type: 'tab'
+            }
+          })
+        }
+        setTimeout(() => {
+          if (state.tabIndex) {
+            uni.navigateTo({
+              url: `/pages/order/index?tabIndex=${state.tabIndex}&from=payment`,
+            })
+          } else {
+            uni.navigateTo({
+              url: `/pages/order/index?tabIndex=1&from=payment`,
+            })
+          }
+          // const tabIndex =
+
+        }, 300)
+
+      }
+    },
+  })
+}
 </script>
 
 <route lang="yaml">
 style:
+  navigationStyle: custom
   navigationBarTitleText: 支付方式
 </route>
 

src/pages/pension_record/detail.vue

@@ -20,6 +20,7 @@ const detail = ref({
 onLoad((options) => {
   if (options.detail) {
     detail.value = JSON.parse(decodeBase64(options.detail))
+    console.log(detail.value)
     if (detail.value && detail.value.tradeType) {
       uni.setNavigationBarTitle({
         title: '推广佣金获取详情'
@@ -33,7 +34,7 @@ onLoad((options) => {
   <div>
     <div class="flex flex-col f-hairline-bottom py-4 justify-center items-center text-[12px] gap-3">
       <div>金额</div>
-      <FPrice :price="detail.yanglao" ex-class="text-xl font-bold !text-black"></FPrice>
+      <FPrice :price="detail.number || detail.yanglao" ex-class="text-xl font-bold !text-black"></FPrice>
     </div>
 
     <div class="flex flex-col text-[12px] p-4 gap-3">
@@ -45,13 +46,13 @@ onLoad((options) => {
         <div class="text-gray w-1/5">交易时间</div>
         <div class="w-4/5">{{ detail.create_time}}</div>
       </div>
-      <div class="flex gap-4" v-if="detail.other_status_desc">
+      <div class="flex gap-4" v-if="detail.other_status_desc || detail.status">
         <div class="text-gray w-1/5">交易状态</div>
-        <div class="4/5">{{ detail.other_status_desc }}</div>
+        <div class="4/5">{{ detail.other_status_desc || (detail.status == '0' ? '待确定' : detail.status == '1' ? '有效' : '无效')}}</div>
       </div>
-      <div class="flex gap-4" v-if="detail.goods_name">
+      <div class="flex gap-4" v-if="detail.goods_name || (detail.product && detail.product.product.store_name)">
         <div class="text-gray w-1/5">商品名称</div>
-        <div class="line-clamp-2 w-4/5">{{ detail.goods_name }}</div>
+        <div class="line-clamp-2 w-4/5">{{ detail.goods_name || detail.product.product.store_name }}</div>
       </div>
       <div class="flex gap-4">
         <div class="text-gray w-1/5">流水单号</div>
@@ -59,7 +60,7 @@ onLoad((options) => {
       </div>
       <div class="flex gap-4" v-if="detail.mark">
         <div class="text-gray w-1/5">备注</div>
-        <div class="w-4/5">{{ detail.remark }}</div>
+        <div class="w-4/5">{{ detail.mark || detail.remark }}</div>
       </div>
     </div>
 

src/pages/pension_record/index.vue

@@ -120,5 +120,5 @@ page {
 <route lang="yaml">
 style:
   navigationBarTitleText: 养老金记录
-  enablePullDownRefresh: true
+  enablePullDownRefresh: false
 </route>

src/pages/product/integral.vue

@@ -4,38 +4,100 @@ import ProductCard from "~/components/ProductCard/ProductCard.vue";
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import {login, reLogin} from "~/apis/user";
 const list = ref()
+const state = reactive({
+  status: 'noMore',
+
+  currentPage: 1,
+  pageSize: 10,
+  totalPage: 1,
+  list: []
+})
 onLoad(() => {
-  getEntropyProductList({
+  // getEntropyProductList({
+  //   mer_id: 148,
+  //   cate_id: '',
+  //   page: 1,
+  //   limit: 10
+  // }).then(res => {
+  //   list.value = res
+  // }).catch(error => {
+  //   if (error === '请登录') {
+  //     return login('30')
+  //   }
+  // })
+  loadList('reload')
+})
+
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+  if (action == 'reload') {
+    state.currentPage = 1
+  }
+  const params = {
     mer_id: 148,
-    cate_id: '',
-    page: 1,
-    limit: 10
+    // mer_keyword: '',
+    page: state.currentPage,
+    limit: state.pageSize,
+  }
+
+  getEntropyProductList({
+    ...params
   }).then(res => {
-    list.value = res
-  }).catch(error => {
-    if (error === '请登录') {
-      return login('30')
+    if (action === 'page') {
+      state.list = state.list.concat(res)
+    }
+    if (action === 'reload') {
+      state.list = res
+    }
+    if (callback) {
+      callback(res)
     }
+  }).catch(error => {
+    uni.showToast({
+      title: error,
+      icon: 'none'
+    })
   })
+}
+function handleScrollToLower() {
+  state.status = "loading";
+  state.currentPage += 1;
+  loadList("page", (items) => {
+    if (!items.length > 0) {
+      console.log("没有更多了");
+      state.status = "noMore";
+      state.currentPage -= 1;
+    }
+  });
+}
+
+onReachBottom(() => {
+  console.log('到底了。。。')
+
+  handleScrollToLower()
+
 })
 
+onPullDownRefresh(() => {
+  loadList('reload', items => {
+    setTimeout(() => {
+      uni.stopPullDownRefresh()
+    }, 300)
+  })
+})
 function handleItemClick(item) {
+  console.log(item)
   uni.navigateTo({
     url: `/pages/store/product/detail?id=${item.product_id}&mer_id=148`
   })
 }
 </script>
 <template>
-  <CXBBasePage>
-    <scroll-view>
       <div class="p-3">
-        <div
-            v-for="(item, index) in list" :key="index"
-            @tap="handleItemClick(item)"
-        >
-          <grid-view type="masonry" cross-axis-count="2" 	cross-axis-gap="10px" main-axis-gap="10px">
-            <div v-for="(item, index) in list"
+        <grid-view type="masonry" cross-axis-count="2" 	cross-axis-gap="10px" main-axis-gap="10px">
+            <div v-for="(item, index) in state.list"
                  :key="index"
+                 @tap="handleItemClick(item)"
+
             >
               <div class="bg-white rounded-lg">
                 <image :src="item.image" mode="widthFix" 	:fade-in="true" class="rounded-t-lg  !w-full aspect-square" />
@@ -51,10 +113,7 @@ function handleItemClick(item) {
               </div>
             </div>
           </grid-view>
-        </div>
       </div>
-    </scroll-view>
-  </CXBBasePage>
 </template>
 <route lang="yaml">
 style:

src/pages/product/zibuyangsheng.vue

@@ -22,12 +22,10 @@ function handleItemClick(item) {
   <CXBBasePage>
     <scroll-view>
       <div class="p-3">
-        <div
-            v-for="(item, index) in list" :key="index"
-            @tap="handleItemClick(item)"
-        >
+        <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"
             >
 

src/pages/real-name-authentication/index.vue

@@ -224,7 +224,7 @@ function formatName (str) {
   <AuthenticationSuccess v-if="state.isCertified"/>
 
   <div class="flex flex-col pt-3 gap-3 pb-safe text-sm">
-    <div class="bg-white flex flex-col w-full px-3">
+    <div class="bg-white flex flex-col  px-3">
       <div class="f-hairline-bottom py-3 flex">
         <div>真实姓名：</div>
         <input v-model="formData.user_name"
@@ -255,7 +255,7 @@ function formatName (str) {
 
     </div>
 
-    <div class="bg-white flex flex-col w-full p-3 gap-3">
+    <div class="bg-white flex flex-col  p-3 gap-3">
       <div class="flex flex-col gap-3 ">
         <div>身份证人像面图：</div>
         <div class="flex justify-center items-center">
@@ -302,6 +302,7 @@ function formatName (str) {
 <style>
 page {
   background: #f8f8f8;
+  overflow: hidden;
 }
 
 .wx-radio-input {

src/pages/red-integral/index.vue

@@ -186,8 +186,8 @@ function handleImmediateWithdrawal() {
 </template>
 <route lang="yaml">
 style:
-  navigationBarTitleText: 储蓄保
-  enablePullDownRefresh: true
+  navigationBarTitleText: ""
+  enablePullDownRefresh: false
   navigationBarBackgroundColor: "#fe0032"
   navigationBarTextStyle: "white"
 </route>

src/pages/refund/option.vue

@@ -100,7 +100,7 @@ function handleChooseType(refund_type) {
 
 <route lang="yaml" >
 style:
-  navigationBarTitleText: 售后订单
+  navigationBarTitleText: 选择售后类型
 </route>
 
 <style>

src/pages/revenue-sharing/index.vue

@@ -265,9 +265,12 @@ style:
   navigationBarBackgroundColor: "#FD1642"
   navigationBarTextStyle: "white"
   navigationBarTitleText: 分享收益
+  enablePullDownRefresh: false
+
 </route>
 <style>
 page {
   background: #f8f8f8;
+  overflow: hidden;
 }
 </style>

src/pages/search/index-bak.vue

@@ -0,0 +1,655 @@
+<script setup lang="ts">
+import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
+import {
+  getDyLiveList,
+  getDyProductList,
+  getJdProductList,
+  getPddProductList,
+  getSuProductList,
+  getTaobaoProductList,
+  getVipProductList,
+  searchDyProduct,
+  searchJdProduct,
+  searchPddProduct,
+  searchSuProduct, searchVipProduct
+} from "~/apis/product";
+import type {
+  DyProductModel,
+  IProductDetail,
+  JdProductModel,
+  SuNingProductModel,
+  TaobaoProductThirdPartyWaresModel,
+  VipProductModel
+} from "~/apis/model/product.model";
+import {getDcProductList} from "~/apis/dacang";
+import type {DcProductModel} from "~/apis/model/dacang.model";
+import FPrice from "~/components/FPrice/FPrice.vue";
+import {encodeBase64} from "~/utils/http/helper";
+import CXBDyLiveRecommend from "~/components/CXBDyLive/CXBDyLiveRecommend.vue";
+import {PLATFORM_NAME} from "~/apis/model/common.model";
+import {CDN_URL} from "~/config/app";
+
+const dyLeftImage = CDN_URL + '/static/assets/dy_zuo_230321.png'
+const dyRightImage = CDN_URL + '/static/assets/dy_you_230321.png'
+
+interface TabItem {
+  id: PLATFORM_NAME,
+  text: string,
+  iconPath: string,
+  selectedIconPath: string
+}
+
+const tabList = <Array<TabItem>>[{
+  id: PLATFORM_NAME.JD,
+  text: '京东',
+  iconPath: CDN_URL + '/static/assets/jingdong_x.png',
+  selectedIconPath: CDN_URL + '/static/assets/jingdong_d.png',
+}, {
+  id: PLATFORM_NAME.TB,
+  text: '淘宝',
+  iconPath: CDN_URL + '/static/assets/taobaoyanglao_x.png',
+  selectedIconPath: CDN_URL + '/static/assets/taobaoyanglao_d.png',
+}, {
+  id: PLATFORM_NAME.PDD,
+  text: '拼多多',
+  iconPath: CDN_URL + '/static/assets/pinduoduo_x.png',
+  selectedIconPath: CDN_URL + '/static/assets/pinduoduo_d.png',
+}, {
+  id: PLATFORM_NAME.DC,
+  text: '大仓',
+  iconPath: CDN_URL + '/static/assets/dacang_x_220914.png',
+  selectedIconPath: CDN_URL + '/static/assets/dacang_d_220914.png',
+}, {
+  id: PLATFORM_NAME.DY,
+  text: '抖音',
+  iconPath: CDN_URL + '/static/assets/douyin_x_230313.png',
+  selectedIconPath: CDN_URL + '/static/assets/douyin_d_230313.png',
+}, {
+  id: PLATFORM_NAME.VIP,
+  text: '唯品会',
+  iconPath: CDN_URL + '/static/assets/weipinhui_x.png',
+  selectedIconPath: CDN_URL + '/static/assets/weipinhui_d.png',
+}, {
+  id: PLATFORM_NAME.SU,
+  text: '苏宁',
+  iconPath: CDN_URL + '/static/assets/suningyigou_x.png',
+  selectedIconPath: CDN_URL + '/static/assets/suningyigou_d.png',
+}]
+const state = reactive({
+  currentTab: PLATFORM_NAME.JD,
+  // 列表高度
+  scrollHeight: 0,
+  triggered: false,
+  status: 'none',
+  currentPage: 1,
+  totalPage: 1
+})
+const { windowHeight } = uni.getSystemInfoSync()
+state.scrollHeight = windowHeight - 195
+const searchValue = ref('')
+
+onLoad((options) => {
+  const platform = options.platform
+  if (platform) {
+    state.currentTab = platform
+  }
+  loadProductList('reload')
+
+})
+const list = ref<Array<
+    JdProductModel
+    | DcProductModel
+    | DyProductModel
+    | SuNingProductModel
+    | TaobaoProductThirdPartyWaresModel
+    | VipProductModel
+    | any
+>>()
+
+const dyLiveList = ref<Array<DyProductModel>>()
+
+function searchProduct() {
+  switch (state.currentTab) {
+    case PLATFORM_NAME.JD: {
+      searchJdProduct({keyword: searchValue.value, page: 1, limit: 20}).then(res => {
+        list.value = res
+      })
+      break;
+    }
+    case PLATFORM_NAME.DC: {
+      getDcProductList({
+        page: 1,
+        limit: 10,
+        classify: '',
+        keyword: searchValue.value
+      }).then(res => {
+        list.value = res
+      })
+      break;
+    }
+    case PLATFORM_NAME.DY: {
+      searchDyProduct({keyword: searchValue.value, page: 1, limit: 10}).then(res => {
+        list.value = res
+      })
+      break;
+    }
+    case PLATFORM_NAME.PDD: {
+      searchPddProduct({ keyword: searchValue.value, page: 1, limit: 10}).then(res => {
+        list.value = res
+      })
+      break;
+    }
+    case PLATFORM_NAME.SU: {
+      searchSuProduct({ keyword: searchValue.value, page: 1, limit: 10}).then(res => {
+        list.value = res
+      })
+      break;
+    }
+    case PLATFORM_NAME.TB: {
+      getTaobaoProductList({
+        pageNum: `1`,
+        pageSize: '10',
+        title: searchValue.value
+      }).then(res => {
+        list.value = res.thirdPartyWaresList
+      })
+      break;
+    }
+    case PLATFORM_NAME.VIP: {
+      searchVipProduct({ keyword: searchValue.value, page: 1, limit: 10}).then(res => {
+        list.value = res
+      })
+      break;
+    }
+  }
+}
+function loadProductList(action: 'page' | 'reload', callback?: (items) => void) {
+
+  switch (state.currentTab) {
+    case PLATFORM_NAME.JD: {
+      getJdProductList({
+        page: state.currentPage,
+        limit: 10
+      }).then(res => {
+        state.triggered = false
+
+        // list.value = res
+        if (action === 'page') {
+          list.value = list.value.concat(res)
+        }
+        if (action === 'reload') {
+          list.value = res
+        }
+        // state.totalPage = Math.ceil()
+        // res[0].
+        // console.log(res)
+      }).catch(error => {
+        uni.showToast({
+          title: error,
+          icon: "none"
+        })
+      })
+      break;
+    }
+    case PLATFORM_NAME.DC: {
+      getDcProductList({
+        page: state.currentPage,
+        limit: 10,
+        classify: '',
+        keyword: ''
+      }).then(res => {
+        list.value = res
+        state.triggered = false
+
+      })
+      break;
+    }
+    case PLATFORM_NAME.DY: {
+      getDyLiveList({
+        page: state.currentPage,
+        limit: 4,
+        // keyword: ''
+      }).then(res => {
+        // console.log(res)
+        // console.log(res.authorPic)
+      })
+      getDyLiveList({page: 1,limit: 4})
+          .then(res => {
+            // console.log(res)
+            if (res) {
+              dyLiveList.value = res
+            }
+          })
+      getDyProductList({
+        page: state.currentPage,
+        limit: 10,
+      }).then(res => {
+        list.value = res
+        state.triggered = false
+
+      })
+      break;
+    }
+    case PLATFORM_NAME.PDD: {
+      getPddProductList({
+        page: state.currentPage,
+        limit: 10
+      }).then(res => {
+        list.value = res
+      })
+      break;
+    }
+    case PLATFORM_NAME.SU: {
+      getSuProductList({
+        page: state.currentPage,
+        limit: 10
+      }).then(res => {
+        list.value = res
+        console.log(res)
+        state.triggered = false
+
+
+      })
+      break;
+    }
+    case PLATFORM_NAME.TB: {
+      getTaobaoProductList({
+        pageNum: `${state.currentPage}`,
+        pageSize: '10'
+      }).then(res => {
+        list.value = res.thirdPartyWaresList
+      })
+      break;
+    }
+    case PLATFORM_NAME.VIP: {
+      getVipProductList({
+        page: state.currentPage,
+        limit: 10
+      }).then(res => {
+        list.value = res
+        state.triggered = false
+
+
+      })
+      break;
+    }
+    // default: {
+    //   getJdProductList({
+    //     page: 1,
+    //     limit: 10
+    //   }).then(res => {
+    //     list.value = res
+    //   })
+    // }
+  }
+
+
+}
+
+function handleCategoryItemClick(item: TabItem) {
+  state.currentTab = item.id
+  loadProductList(item.id)
+}
+
+function handleProductItemClick(
+    item:
+        JdProductModel
+        & DcProductModel
+        & DyProductModel
+        & SuNingProductModel
+        & TaobaoProductThirdPartyWaresModel
+        & VipProductModel
+) {
+
+
+  function navigateToDetail(params) {
+    let otherDetailUrl = `/pages/store/product/other`
+    return uni.navigateTo({
+      url: `${otherDetailUrl}?params=${params}`
+    })
+  }
+  // 大仓
+  if (state.currentTab === PLATFORM_NAME.DC && item.type === '5') {
+    uni.navigateTo({
+      url: `/pages/store/product/detail?id=${item.product_id}`
+    })
+  }
+  // 京东
+  if (item.type === 6) {
+    // productParams.id = item.skuId
+    const productParams: Partial<IProductDetail> = {
+      platform: item.type,
+      id: item.skuId,
+      title: item.name,
+      featured: [item.thumb],
+      allowance: item.commission,
+      salePrice: item.lowestCouponPrice,
+      price: item.price,
+      coupon: {
+        amount: item.coupon_money[0].discount,
+        startTime: item.coupon_money[0].getStartTime,
+        endTime: item.coupon_money[0].getEndTime
+      },
+      spreadUrl: item.coupon_link
+    }
+    return navigateToDetail(encodeBase64(productParams))
+  }
+  // 淘宝
+  if (item.type === 5) {
+    const productParams: Partial<IProductDetail> = {
+      platform: item.type,
+      id: item.id,
+      title: item.name,
+      featured: [item.thumb],
+      allowance: item.commission,
+      salePrice: item.price,
+      // 原价
+      price: item.market_price,
+      coupon: {
+        amount: item.coupon_money
+        // amount: item.coupon_money[0].discount,
+        // startTime: item.coupon_money[0].getStartTime,
+        // endTime: item.coupon_money[0].getEndTime
+      },
+      spreadUrl: item.coupon_share_url
+    }
+
+    return navigateToDetail(encodeBase64(productParams))
+    // uni.navigateTo({
+    //   url: `/pages/store/product/other?platform=${item.type}&id=${item.id}`
+    // })
+  }
+
+  // 拼多多
+  if (item.type === 1) {
+    const productParams: Partial<IProductDetail> = {
+      platform: item.type,
+      id: item.id,
+      title: item.name,
+      featured: [item.thumb],
+      allowance: item.commission,
+      salePrice: item.price,
+      // 原价
+      price: item.market_price,
+      coupon: {
+        amount: item.coupon_money
+        // amount: item.coupon_money[0].discount,
+        // startTime: item.coupon_money[0].getStartTime,
+        // endTime: item.coupon_money[0].getEndTime
+      },
+      // spreadUrl: item.coupon_share_url
+    }
+    return navigateToDetail(encodeBase64(productParams))
+    // uni.navigateTo({
+    //   url: `/pages/store/product/other?platform=${item.type}&id=${item.id}&allowance=${item.commission}`
+    // })
+  }
+  // 唯品会
+  if (item.type === 2) {
+    const productParams: Partial<IProductDetail> = {
+      platform: item.type,
+      id: item.id,
+      title: item.name,
+      featured: [item.thumb],
+      allowance: item.commission,
+      salePrice: item.price,
+      // 原价
+      price: item.market_price,
+      // coupon: {
+        // amount: item.coupon_money
+      // },
+    }
+    return navigateToDetail(encodeBase64(productParams))
+  }
+
+  // 苏宁
+  if (item.type === 3) {
+    const productParams: Partial<IProductDetail> = {
+      platform: item.type,
+      id: item.id,
+      title: item.name,
+      featured: [item.thumb],
+      allowance: item.commission,
+      salePrice: item.price,
+      // 原价
+      price: item.market_price,
+      // coupon: {
+      //   amount: item.coupon_money
+      // },
+    }
+    return navigateToDetail(encodeBase64(productParams))
+  //
+  }
+
+  // 抖音 9
+  if (item.type === 9) {
+    console.log(item)
+    const productParams: Partial<IProductDetail> = {
+      platform: item.type,
+      id: item.id,
+      title: item.name,
+      featured: [item.thumb],
+      allowance: item.commission,
+      salePrice: item.price,
+      // 原价
+      price: item.market_price,
+      // coupon: {
+      //   amount: item.coupon_money
+      // },
+    }
+    return navigateToDetail(encodeBase64(productParams))
+  }
+}
+
+function handleLiveRecommendTitleClick() {
+  uni.navigateTo({
+    url: `/pages/store/product/dy-live`
+  })
+}
+
+// 下拉刷新被下拉
+const onRefresherPulling = e => {
+  state.triggered = true;
+};
+// 下拉刷新被复位
+const onRefresherRestore = e => {
+  state.triggered = false;
+};
+// 下拉刷新被中止
+const onRefresherAbort = e => {
+  state.triggered = false;
+}
+
+const onRefresherRefresh = e => {
+  loadProductList('reload')
+};
+
+function handleScrollToLower() {
+  state.status = 'loading';
+  state.currentPage += 1;
+  // if (state.currentPage > state.totalPage) {
+  //   state.status = 'noMore';
+  // } else {
+  //   // queryFavorites('page');
+  //   // loadSelectMerchant('page')
+  //   loadProductList(state.currentTab)
+  //
+  // }
+}
+</script>
+<template>
+
+    <div class="flex flex-col overflow-hidden fixed  h-fit z-1 bg-white">
+      <nut-searchbar
+          v-model="searchValue" @search="searchProduct" @clear="loadProductList('reload')">
+        <template v-slot:rightout>
+          <div @tap="searchProduct">
+            搜索
+          </div>
+        </template>
+      </nut-searchbar>
+      <div class="py-3">
+        <scroll-view
+            class="flex flex-row w-full gap-2 overflow-x whitespace-nowrap w-screen"
+            :scroll-with-animation="true"
+            :scroll-x="true"
+        >
+          <div
+              @tap="handleCategoryItemClick(item)"
+              v-for="(item, index) in tabList"
+              :key="index"
+              class="flex inline-flex pl-4 items-center justify-center relative "
+          >
+            <div class="flex flex-col justify-center items-center text-xs gap-2">
+              <image :src="item.id === state.currentTab ? item.selectedIconPath : item.iconPath" mode="widthFix"
+                     class="w-9 h-9"></image>
+              <div>{{ item.text }}</div>
+            </div>
+
+          </div>
+        </scroll-view>
+      </div>
+    </div>
+    <div class="pt-36 ">
+      <scroll-view
+          :scroll-y="true"
+          :style="{ height: `${state.scrollHeight}px` }"
+          scroll-with-animation
+          :refresher-enabled="true"
+          refresher-background="#f5f5f5"
+          refresher-default-style="black"
+          :refresher-triggered="state.triggered"
+          @scrolltolower="handleScrollToLower"
+          @refresherPulling="onRefresherPulling"
+          @refresherRestore="onRefresherRestore"
+          @refresherAbort="onRefresherAbort"
+          @refresherrefresh="onRefresherRefresh"
+
+      >
+      <div
+          v-if="state.currentTab === PLATFORM_NAME.DY"
+      >
+
+      <div
+          class="pb-4"
+      >
+        <CXBDyLiveRecommend :list="dyLiveList" v-if="dyLiveList" @title-click="handleLiveRecommendTitleClick"/>
+      </div>
+      <div class="flex justify-center items-center w-full pb-3">
+        <div class="flex justify-center items-center gap-2">
+          <image :src="dyLeftImage" mode="widthFix" class="w-12 h-2"></image>
+          <div class="font-bold">抖音好物</div>
+          <image :src="dyRightImage" mode="widthFix" class="w-12 h-2"></image>
+        </div>
+      </div>
+      </div>
+
+      <div class="px-3">
+        <grid-view type="masonry" cross-axis-count="2" cross-axis-gap="10px" main-axis-gap="10px">
+          <div v-for="(item, index) in list"
+               :key="index"
+               @tap="handleProductItemClick(item)"
+          >
+            <div class="bg-white rounded-lg text-dark">
+              <image :src="item.image"
+                     v-if="state.currentTab === PLATFORM_NAME.DC"
+                     mode="widthFix" :fade-in="true"
+                     class="rounded-t-lg  !w-full aspect-square" />
+              <image
+                  v-else
+                  :src="item.thumb"
+                  mode="widthFix" :fade-in="true"
+                  class="rounded-t-lg  !w-full aspect-square" />
+              <div class="text-sm p-2 flex flex-col gap-1">
+                <div class="line-clamp-2">
+                  <div v-if="state.currentTab === PLATFORM_NAME.DC">
+                    {{ item.store_name }}
+                  </div>
+                  <div v-else>
+                    {{ item.name }}
+                  </div>
+                </div>
+                <div
+                    class="border border-solid border-1 border-red rounded flex text-auto items-center text-[#FE0032] w-fit">
+                  <image src="https://cdn.bjtdba.com/vod/image/2023-09-15/20230915160858609.png"
+                         mode="widthFix" class="!w-8.5"></image>
+                  <div class="px-2 flex items-center jusitify-center text-xs">
+                    <div>
+                      养老金 ¥{{ item.commission }}
+                    </div>
+                  </div>
+                </div>
+                <div class="flex flex-col justify-center gap-2">
+                  <div v-if="state.currentTab === PLATFORM_NAME.JD">
+                    <FPrice :price="item.lowestCouponPrice" ex-class="text-[20px]" need-symbol/>
+                    <FPrice :price="item.price" ex-class="text-gray text-xs" need-symbol strike-through/>
+                  </div>
+                  <div v-if="state.currentTab === PLATFORM_NAME.TB">
+                    <FPrice :price="item.price" ex-class="text-[20px]" need-symbol/>
+                    <FPrice :price="item.market_price" ex-class="text-gray text-xs" need-symbol strike-through/>
+                  </div>
+
+                  <div v-if="state.currentTab === PLATFORM_NAME.PDD">
+                    <FPrice :price="item.market_price" ex-class="text-[20px]" need-symbol/>
+                    <FPrice :price="item.price" ex-class="text-gray text-xs" need-symbol strike-through/>
+                  </div>
+
+                  <div v-if="state.currentTab === PLATFORM_NAME.DC">
+
+                    <div class="flex flex-row gap-2">
+                      <FPrice :price="item.price" ex-class="text-[20px]" need-symbol/>
+                      <div  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>
+
+                    <FPrice :price="item.ot_price" ex-class="text-gray text-xs" need-symbol strike-through/>
+
+
+                  </div>
+
+                  <div v-if="state.currentTab === PLATFORM_NAME.DY">
+                    <FPrice :price="item.price" ex-class="text-[20px]" need-symbol/>
+                  </div>
+
+                  <div v-if="state.currentTab === PLATFORM_NAME.VIP">
+                    <FPrice :price="item.price" ex-class="text-[20px]" need-symbol/>
+                    <FPrice :price="item.market_price" ex-class="text-gray text-xs" need-symbol strike-through/>
+                  </div>
+
+                  <div v-if="state.currentTab === PLATFORM_NAME.SU">
+                    <FPrice :price="item.price" ex-class="text-[20px]" need-symbol/>
+                    <FPrice :price="item.market_price" ex-class="text-gray text-xs" need-symbol strike-through/>
+                  </div>
+<!--                  <div 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>
+        </grid-view>
+
+      </div>
+
+      </scroll-view>
+    </div>
+
+</template>
+
+<route lang="yaml">
+style:
+  navigationBarTitleText: 搜索
+  disableScroll: true
+</route>
+
+<style lang="scss">
+page {
+  //overflow: hidden;
+  //position: fixed;
+  background: #f8f8f8;
+}
+</style>

src/pages/search/index.vue

@@ -28,6 +28,7 @@ import {encodeBase64} from "~/utils/http/helper";
 import CXBDyLiveRecommend from "~/components/CXBDyLive/CXBDyLiveRecommend.vue";
 import {PLATFORM_NAME} from "~/apis/model/common.model";
 import {CDN_URL} from "~/config/app";
+import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 
 const dyLeftImage = CDN_URL + '/static/assets/dy_zuo_230321.png'
 const dyRightImage = CDN_URL + '/static/assets/dy_you_230321.png'
@@ -56,7 +57,7 @@ const tabList = <Array<TabItem>>[{
   selectedIconPath: CDN_URL + '/static/assets/pinduoduo_d.png',
 }, {
   id: PLATFORM_NAME.DC,
-  text: '城中大仓',
+  text: '大仓',
   iconPath: CDN_URL + '/static/assets/dacang_x_220914.png',
   selectedIconPath: CDN_URL + '/static/assets/dacang_d_220914.png',
 }, {
@@ -96,6 +97,10 @@ onLoad((options) => {
   loadProductList('reload')
 
 })
+
+// onShow(() => {
+//
+// })
 const list = ref<Array<
     JdProductModel
     | DcProductModel
@@ -134,6 +139,7 @@ function searchProduct() {
       break;
     }
     case PLATFORM_NAME.PDD: {
+
       searchPddProduct({ keyword: searchValue.value, page: 1, limit: 10}).then(res => {
         list.value = res
       })
@@ -164,7 +170,9 @@ function searchProduct() {
   }
 }
 function loadProductList(action: 'page' | 'reload', callback?: (items) => void) {
-
+  if (action == 'reload') {
+    state.currentPage = 1
+  }
   switch (state.currentTab) {
     case PLATFORM_NAME.JD: {
       getJdProductList({
@@ -180,6 +188,11 @@ function loadProductList(action: 'page' | 'reload', callback?: (items) => void)
         if (action === 'reload') {
           list.value = res
         }
+        uni.hideLoading()
+
+        if (callback) {
+          callback(res)
+        }
         // state.totalPage = Math.ceil()
         // res[0].
         // console.log(res)
@@ -198,9 +211,19 @@ function loadProductList(action: 'page' | 'reload', callback?: (items) => void)
         classify: '',
         keyword: ''
       }).then(res => {
-        list.value = res
+        // list.value = res
         state.triggered = false
+        if (action === 'page') {
+          list.value = list.value.concat(res)
+        }
+        if (action === 'reload') {
+          list.value = res
+        }
+        uni.hideLoading()
 
+        if (callback) {
+          callback(res)
+        }
       })
       break;
     }
@@ -218,24 +241,47 @@ function loadProductList(action: 'page' | 'reload', callback?: (items) => void)
             // console.log(res)
             if (res) {
               dyLiveList.value = res
+
             }
           })
       getDyProductList({
         page: state.currentPage,
         limit: 10,
       }).then(res => {
-        list.value = res
+        // list.value = res
         state.triggered = false
+        if (action === 'page') {
+          list.value = list.value.concat(res)
+        }
+        if (action === 'reload') {
+          list.value = res
+        }
+        uni.hideLoading()
 
+        if (callback) {
+          callback(res)
+        }
       })
       break;
     }
     case PLATFORM_NAME.PDD: {
+
       getPddProductList({
         page: state.currentPage,
         limit: 10
       }).then(res => {
-        list.value = res
+        // list.value = res
+        if (action === 'page') {
+          list.value = list.value.concat(res)
+        }
+        if (action === 'reload') {
+          list.value = res
+        }
+        uni.hideLoading()
+
+        if (callback) {
+          callback(res)
+        }
       })
       break;
     }
@@ -244,10 +290,20 @@ function loadProductList(action: 'page' | 'reload', callback?: (items) => void)
         page: state.currentPage,
         limit: 10
       }).then(res => {
-        list.value = res
-        console.log(res)
-        state.triggered = false
+        // list.value = res
+        // console.log(res)
+        // state.triggered = false
+        if (action === 'page') {
+          list.value = list.value.concat(res)
+        }
+        if (action === 'reload') {
+          list.value = res
+        }
+        uni.hideLoading()
 
+        if (callback) {
+          callback(res)
+        }
 
       })
       break;
@@ -257,7 +313,18 @@ function loadProductList(action: 'page' | 'reload', callback?: (items) => void)
         pageNum: `${state.currentPage}`,
         pageSize: '10'
       }).then(res => {
-        list.value = res.thirdPartyWaresList
+        // list.value = res.thirdPartyWaresList
+        if (action === 'page') {
+          list.value = list.value.concat(res.thirdPartyWaresList)
+        }
+        if (action === 'reload') {
+          list.value = res.thirdPartyWaresList
+        }
+        uni.hideLoading()
+
+        if (callback) {
+          callback(res.thirdPartyWaresList)
+        }
       })
       break;
     }
@@ -266,9 +333,19 @@ function loadProductList(action: 'page' | 'reload', callback?: (items) => void)
         page: state.currentPage,
         limit: 10
       }).then(res => {
-        list.value = res
-        state.triggered = false
+        // list.value = res
+        // state.triggered = false
+        if (action === 'page') {
+          list.value = list.value.concat(res)
+        }
+        if (action === 'reload') {
+          list.value = res
+        }
+        uni.hideLoading()
 
+        if (callback) {
+          callback(res)
+        }
 
       })
       break;
@@ -287,8 +364,14 @@ function loadProductList(action: 'page' | 'reload', callback?: (items) => void)
 }
 
 function handleCategoryItemClick(item: TabItem) {
+  list.value = []
   state.currentTab = item.id
-  loadProductList(item.id)
+  // loadProductList(item.id)
+  uni.showLoading({
+    title: '数据加载中',
+    icon: 'none'
+  })
+  loadProductList('reload')
 }
 
 function handleProductItemClick(
@@ -463,24 +546,49 @@ const onRefresherAbort = e => {
 const onRefresherRefresh = e => {
   loadProductList('reload')
 };
-
+onPullDownRefresh(() => {
+  uni.showLoading({
+    title: '数据加载中',
+    icon: 'none'
+  })
+  loadProductList('reload', items => {
+    setTimeout(() => {
+      uni.stopPullDownRefresh()
+      uni.hideLoading()
+    }, 300)
+  })
+})
 function handleScrollToLower() {
+  uni.showLoading({
+    title: '数据加载中',
+    icon: 'none'
+  })
+
   state.status = 'loading';
   state.currentPage += 1;
-  // if (state.currentPage > state.totalPage) {
-  //   state.status = 'noMore';
-  // } else {
-  //   // queryFavorites('page');
-  //   // loadSelectMerchant('page')
-  //   loadProductList(state.currentTab)
-  //
-  // }
+
+  setTimeout(() => {
+    loadProductList('page', (items) => {
+      uni.hideLoading()
+      // uni.hideLoading()
+      if (!items.length > 0) {
+        console.log('没有更多了')
+        state.status = 'noMore'
+        state.currentPage -= 1;
+      }
+    })
+  }, 300)
+
 }
+
+onReachBottom(() => {
+  handleScrollToLower()
+
+})
 </script>
 <template>
-  <CXBBasePage>
 
-    <div class="flex flex-col overflow-hidden fixed  h-fit z-1 bg-white">
+    <div class="flex flex-col  fixed  top-0 left-0  h-fit z-1 bg-white">
       <nut-searchbar
           v-model="searchValue" @search="searchProduct" @clear="loadProductList('reload')">
         <template v-slot:rightout>
@@ -511,22 +619,8 @@ function handleScrollToLower() {
         </scroll-view>
       </div>
     </div>
-    <div class="pt-36 ">
-      <scroll-view
-          :scroll-y="true"
-          :style="{ height: `${state.scrollHeight}px` }"
-          scroll-with-animation
-          :refresher-enabled="true"
-          refresher-background="#f5f5f5"
-          refresher-default-style="black"
-          :refresher-triggered="state.triggered"
-          @scrolltolower="handleScrollToLower"
-          @refresherPulling="onRefresherPulling"
-          @refresherRestore="onRefresherRestore"
-          @refresherAbort="onRefresherAbort"
-          @refresherrefresh="onRefresherRefresh"
+    <div class="pt-36 pb-safe " v-if="list && list.length > 0">
 
-      >
       <div
           v-if="state.currentTab === PLATFORM_NAME.DY"
       >
@@ -545,7 +639,7 @@ function handleScrollToLower() {
       </div>
       </div>
 
-      <div class="px-3">
+      <div class="px-3" >
         <grid-view type="masonry" cross-axis-count="2" cross-axis-gap="10px" main-axis-gap="10px">
           <div v-for="(item, index) in list"
                :key="index"
@@ -633,25 +727,35 @@ function handleScrollToLower() {
             </div>
           </div>
         </grid-view>
-
+        <div class=" flex justify-center items-center text-[12px] text-gray-500"
+             v-if="list && list.length > 0">
+          <div v-if="state.status === 'loading'">
+            加载中...
+          </div>
+          <div v-if="state.status === 'noMore'">
+            没有更多了～
+          </div>
+        </div>
       </div>
 
-      </scroll-view>
     </div>
-  </CXBBasePage>
+  <div class="pt-36 flex flex-col justify-center items-center" v-else>
+    <CXBEmpty ></CXBEmpty>
+
+  </div>
 
 </template>
 
 <route lang="yaml">
 style:
   navigationBarTitleText: 搜索
-  disableScroll: true
+  enablePullDownRefresh: true
 </route>
 
-<style>
+<style lang="scss">
 page {
-  overflow: hidden;
-  position: fixed;
-
+  //overflow: hidden;
+  //position: fixed;
+  background: #f8f8f8;
 }
 </style>

src/pages/share-the-product/index.vue

@@ -32,9 +32,12 @@ const state = reactive({
   // showPicker: false,
   date: [],
   isVisible: false,
-  currentDate: dayjs().format('YYYY-MM-DD')
-})
+  currentDate: dayjs().format('YYYY-MM-DD'),
+  scrollHeight: 0,
 
+})
+const {windowHeight} = uni.getSystemInfoSync()
+state.scrollHeight = windowHeight - 320
 const openSwitch = param => {
   state[`${param}`] = true;
   state.date = [
@@ -98,6 +101,7 @@ function loadList(start_time: string, end_time: string) {
 <template>
   <div class="bg-[#FD1642] h-20 rounded-bottom-full w-full absolute top-0 left-0 z--1"></div>
 
+
   <div class="px-3 py-3 flex flex-col gap-3">
     <div class="bg-white rounded-lg p-2 flex flex-col gap-4 ">
       <div class="flex justify-around py-8">
@@ -153,26 +157,34 @@ function loadList(start_time: string, end_time: string) {
       </nut-date-picker>
     </nut-popup>
     <div class="pb-safe">
-<!--      <div class="flex justify-around bg-white rounded-tl-lg rounded-tr-lg text-center text-[11px] p-3">-->
-<!--        <div class="">日期</div>-->
-<!--        <div>好友分享</div>-->
-<!--        <div class="">朋友圈分享</div>-->
-<!--        <div class="">商品点击</div>-->
-<!--        <div class="">商品购买</div>-->
-<!--      </div>-->
-<!--      <div v-if="invitePartnerModel && invitePartnerModel.userInviteVoList">-->
-<!--        <div class="grid grid-cols-3 text-center text-sm p-2 bg-white text-gray-500" v-for="(item, index) in invitePartnerModel.userInviteVoList.list" :key="index">-->
-<!--          <div class="text-left">{{ item.nickname || '无昵称' }}</div>-->
-<!--          <div>{{ item.statusType }}</div>-->
-<!--          <div class="text-right">{{ item.promoterTime }}</div>-->
-<!--        </div>-->
-<!--      </div>-->
-      <div class="bg-white p-3" v-if="state.data && state.data.length > 0">
-        <nut-table :columns="state.columns"
-                   :data="state.data"
-                   :bordered="true"
-        ></nut-table>
+      <div class=""  v-if="state.data && state.data.length">
+        <div class="grid grid-cols-5 text-center text-[12px] bg-white text-gray-600 py-2">
+          <div class="">日期</div>
+          <div>好友分享</div>
+          <div class="">朋友圈分享</div>
+          <div class="">商品点击</div>
+          <div class="">商品购买</div>
+        </div>
+        <scroll-view
+            :scroll-y="true"
+            :style="{ height: `${state.scrollHeight}px` }"
+        >
+          <div class="grid grid-cols-5 text-center text-[11px] bg-white text-gray-600 py-2" v-for="(item, index) in state.data" :key="index">
+            <div class="text-center">{{ item.ctime }}</div>
+            <div class="text-center">{{ item.friendsSum }}</div>
+            <div class="text-center">{{ item.momentsSum }}</div>
+            <div class="text-center">{{ item.clickNum }}</div>
+            <div class="text-center">{{ item.buyNum }}</div>
+          </div>
+        </scroll-view>
       </div>
+
+<!--      <div class="bg-white p-3" v-if="state.data && state.data.length > 0">-->
+<!--        <nut-table :columns="state.columns"-->
+<!--                   :data="state.data"-->
+<!--                   :bordered="true"-->
+<!--        ></nut-table>-->
+<!--      </div>-->
       <div v-else>
         <CXBEmpty />
       </div>
@@ -184,7 +196,8 @@ function loadList(start_time: string, end_time: string) {
 
 page {
   background: #f8f8f8;
-  --nut-table-cols-padding: 2px
+  --nut-table-cols-padding: 2px;
+  overflow: hidden;
 }
 .nut-table {
   font-size: 12px !important;

src/pages/store/home/index.vue

@@ -9,6 +9,9 @@ import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import {searchProductList} from "~/apis/product";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 import FSearch from "~/components/FSearch/FSearch.vue";
+import {usePageStoreWidthOut} from "~/stores/page";
+const usePageStore = usePageStoreWidthOut()
+
 
 let merchant: Ref<MerchantModel> = ref<MerchantModel>({
   mer_id: NaN,
@@ -68,6 +71,9 @@ onLoad((options: any) => {
   }
 })
 
+// onShow(() => {
+//
+// })
 
 // function searchProduct() {
 //   searchProductList({

src/pages/store/home/search.vue

@@ -23,7 +23,12 @@ const state = reactive({
   currentPage: 1,
   pageSize: 10,
   totalPage: 1,
-
+  params: {},
+  // priceType: NaN,
+  is_best: NaN,
+  // sales: NaN,
+  // is_new: NaN,
+  // type: NaN,
   searchValue: ''
 })
 
@@ -69,22 +74,6 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     // type?: number
     // category_id?: string
   }
-  if (state.type) {
-    params.type = state.type
-  }
-  if (state.sales === 0) {
-    params.sales = state.sales
-  }
-  if (state.is_new === 0) {
-    params.is_new = state.is_new
-  }
-  if (state.priceType) {
-    params.priceType = state.priceType
-  }
-  if (state.category_id) {
-    params.category_id = state.category_id
-  }
-
   if (state.searchValue) {
     params.mer_keyword = state.searchValue
   }
@@ -93,7 +82,8 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
   }
 
   searchProductList({
-    ...params
+    ...params,
+    ...state.params
   }).then(res => {
     state.triggered = false
     if (action === 'page') {
@@ -140,23 +130,56 @@ onPullDownRefresh(() => {
 })
 
 function handleProductTypeChange(typeValue) {
-  if (typeValue === 3) {
-    state.sales = NaN
-    state.is_new = 0
+  if (typeValue == 1) {
+    state.params = {
+      is_best: 0
+    }
   }
-  else if (typeValue === 2) {
-    state.sales = 0
-  } else {
-    state.type = typeValue
+  if (typeValue == 2) {
+    state.params = {
+      sales: 0
+    }
+  }
+  if (typeValue == 3) {
+    state.params = {
+      is_new: 0
+    }
+  }
+  // if (typeValue == 4) {
+  //   state.params = {
+  //     priceType: 1
+  //   }
+  // }
+  if (typeValue == 6) {
+    state.params = {
+      type: 1
+    }
+  }
+  if (typeValue == 7) {
+    state.params = {
+      type: 5
+    }
   }
+  // if (typeValue === 3) {
+  //   state.sales = NaN
+  //   state.is_new = 0
+  // }
+  // else if (typeValue === 2) {
+  //   state.sales = 0
+  // } else {
+  //   state.type = typeValue
+  // }
   loadList('reload')
 }
 function handleOrderChange(priceType) {
   state.priceType = priceType
 
+  state.params = {
+    priceType,
+  }
   // reset
-  state.sales = NaN
-  state.is_new =NaN
+  // state.sales = NaN
+  // state.is_new =NaN
 
   loadList('reload')
 }

src/pages/store/nearby/index-bak.vue

@@ -0,0 +1,321 @@
+<script lang="ts" setup>
+import {getMerchantCategory, getSelectMerchant, getSelectMerchantSort} from "~/apis/merchant";
+import type {StoreResult} from "~/apis/model/storeModel";
+import {StoreParams} from "~/apis/model/storeModel";
+import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+import {USER_LATITUDE, USER_LONGITUDE} from "~/constants";
+const triggered = ref(true)
+const state = reactive({
+  // 列表高度
+  scrollHeight: 0,
+  // 一级分类：指针
+  curIndex: 0,
+  // 内容区垂直滚动条位置
+  scrollTop: 0,
+
+  tabCurrent: 0,
+  status: 'loading',
+  currentPage: 1,
+  totalPage: 1,
+  total: 1,
+  pageSize: 10,
+  triggered: true,
+
+  category_id: 0,
+  merchantCategory: [],
+  merchantList: [],
+  merchantPageNum: 1,
+  merchantPageSize: 10,
+  merchantKeyword: '',
+  lat: '',
+  lng: '',
+
+  currentMerchantCategoryId: 0,
+
+  options: [{
+    text: '智能推荐',
+    value: 1,
+  }, {
+    text: '距离优先',
+    value: 2
+  }],
+  menuDefaultValue: 1
+  // merchantPageInfo: {}
+})
+const searchValue = ref('')
+
+const {windowHeight} = uni.getSystemInfoSync()
+state.scrollHeight = windowHeight - 45
+
+onLoad(() => {
+  // getMerchantCategory()
+  getSelectMerchantSort().then(res => {
+    state.merchantCategory = res.merchantCategory
+  })
+
+  // loadSelectMerchant('reload')
+})
+
+onShow(() => {
+  loadAll()
+})
+
+function loadAll() {
+  state.category_id = 0
+  loadSelectMerchant('reload')
+}
+
+function handleCategoryChange(category) {
+  console.log(category)
+  state.currentMerchantCategoryId = category.merchant_category_id
+  // console.log(category)
+  // loadSelectMerchant()
+  state.category_id = category.merchant_category_id
+  loadSelectMerchant('reload')
+}
+
+function loadSelectMerchant(action: 'page' | 'reload', callback?: (items) => void) {
+  if (state.category_id == 0) {
+    state.currentMerchantCategoryId = state.category_id
+  }
+  let params: StoreParams = {
+    pageNum: state.currentPage,
+    pageSize: state.pageSize,
+    mer_keyword: searchValue.value,
+    // mer_keyword: mer_keyword,
+    // lat: '',
+    // lng: '',
+
+  }
+  if (state.category_id !== 0) {
+    // params.category_id = category_id
+    params = Object.assign({}, params, {
+      category_id: state.category_id
+    })
+  }
+  if (state.menuDefaultValue === 2) {
+    params = Object.assign({}, params, {
+      distanceAsc: 0,
+      lat: uni.getStorageSync(USER_LATITUDE),
+      lng: uni.getStorageSync(USER_LONGITUDE)
+    })
+  }
+
+  getSelectMerchant(params).then((res: StoreResult) => {
+    console.log(state.triggered)
+    state.triggered = false
+
+    state.total = res.total
+    state.totalPage = Math.ceil(state.total / state.pageSize);
+    console.log(state.totalPage)
+    // state.merchantList = res.list
+    if (action === 'page') {
+      state.merchantList = state.merchantList.concat(res.list)
+    }
+    if (action === 'reload') {
+      state.merchantList = res.list
+    }
+    // state.totalPage = Math.ceil(totalItems / state.pageSize);
+
+    state.status = 'more'
+
+    if (callback) {
+      callback(res.list)
+    }
+  })
+}
+
+function handleShowMerchant(merchant) {
+  console.log(merchant)
+  uni.navigateTo({
+    url: '/pages/store/home/index?id=' + merchant.mer_id
+  })
+}
+
+
+function change() {
+}
+
+function onChange() {
+}
+
+// 下拉刷新被下拉
+const onRefresherPulling = e => {
+
+  // state.triggered = true;
+  triggered.value = true
+};
+// 下拉刷新被复位
+const onRefresherRestore = e => {
+  // state.triggered = false;
+  triggered.value = false
+};
+// 下拉刷新被中止
+const onRefresherAbort = e => {
+  // state.triggered = false;
+  triggered.value = false
+}
+// 下拉刷新被触发
+const onRefresherRefresh = e => {
+  // state.triggered = false
+  triggered.value = false
+
+  loadSelectMerchant('reload')
+};
+
+function handleScrollToLower() {
+  state.status = 'loading';
+  state.currentPage += 1;
+  if (state.currentPage > state.totalPage) {
+    state.status = 'noMore';
+  } else {
+    // queryFavorites('page');
+    loadSelectMerchant('page')
+  }
+}
+
+</script>
+<template>
+  <!--  <nut-category :category="state.merchantCategory" @change="change">-->
+  <!--    <nut-category-pane :categoryChild="state.merchantList" @onChange="onChange">-->
+  <!--    </nut-category-pane>-->
+  <!--  </nut-category>-->
+  <div class="flex flex-col  fixed  top-0 left-0  h-fit z-1 bg-white">
+
+    <nut-searchbar
+        v-model="searchValue" @search="loadSelectMerchant('reload')" @clear="loadSelectMerchant( 'reload')">
+      <template v-slot:rightout>
+        <div @tap="loadSelectMerchant('reload')">
+          搜索
+        </div>
+      </template>
+    </nut-searchbar>
+
+
+  </div>
+  <div class="flex pt-10 "
+  >
+    <!-- 左侧 一级分类 -->
+    <div class="w-1/4">
+      <scroll-view
+          :scroll-y="true"
+          :style="{ height: `${state.scrollHeight}px` }"
+          class="w-full h-full bg-[#f8f8f8]"
+      >
+        <div
+            @tap="loadAll()"
+            :class="state.currentMerchantCategoryId == 0 ? 'bg-white font-bold' : ''"
+            class="relative w-25 h-12 block text-sm flex justify-center items-center">
+          <div class="flex items-center gap-1">
+            <div class="h-4 bg-primary w-1" v-if="state.currentMerchantCategoryId == 0"></div>
+            <div>全部</div>
+          </div>
+
+        </div>
+        <div v-for="(item, index) in state.merchantCategory" :key="index"
+             @tap="handleCategoryChange(item)"
+             :class="state.currentMerchantCategoryId == item.merchant_category_id ? 'bg-white font-bold' : ''"
+             class="relative h-12 block text-sm flex justify-center items-center gap-1 w-25"
+        >
+          <div class="h-4 bg-primary w-1" v-if="state.currentMerchantCategoryId == item.merchant_category_id"></div>
+
+          <div>
+            {{ item.category_name }}
+
+          </div>
+
+        </div>
+      </scroll-view>
+
+    </div>
+
+
+    <div class="w-3/4 ">
+      <div class="fixed z-3 flex flex-col justify-center h-10 pl-3 top-10">
+        <nut-menu>
+          <nut-menu-item v-model="state.menuDefaultValue"
+                         :options="state.options"
+                         @change="loadSelectMerchant('reload')"
+          >
+
+          </nut-menu-item>
+        </nut-menu>
+      </div>
+
+      <scroll-view
+          :scroll-y="true"
+          :style="{ height: `${state.scrollHeight - 50}px` }"
+          scroll-with-animation
+          class="flex flex-1  flex-col   p-3 gap-3 mt-10"
+          :refresher-enabled="true"
+          refresher-background="#f5f5f5"
+          refresher-default-style="black"
+          :refresher-triggered="state.triggered"
+          @scrolltolower="handleScrollToLower"
+          @refresherpulling="onRefresherPulling"
+          @refresherrestore="onRefresherRestore"
+          @refresherabort="onRefresherAbort"
+          @refresherrefresh="onRefresherRefresh"
+          v-if="state.merchantList && state.merchantList.length > 0"
+
+      >
+        <div
+            v-for="(item, index) in state.merchantList" :key="index"
+            @click="handleShowMerchant(item)"
+            class="mb-3 ">
+          <div class="flex">
+            <div class="flex ">
+              <image :src="item.mer_avatar"
+                     mode="aspectFill"
+                     class="w-20 h-20 rounded-lg"
+              ></image>
+            </div>
+
+            <div class="flex flex-col justify-between px-2">
+              <div class="flex flex-col gap-2">
+                <div class="truncate w-40 ">
+                  {{ item.mer_name }}
+                </div>
+                <div class="text-xs text-gray">
+                  {{ item.care_count }} 人关注
+                </div>
+              </div>
+
+              <div class="text-xs">{{ (item.distance / 100).toFixed(1) }}km</div>
+            </div>
+
+          </div>
+        </div>
+      </scroll-view>
+      <div class="flex justify-center items-center w-full h-[60%]" v-else>
+        <CXBEmpty/>
+
+      </div>
+    </div>
+
+  </div>
+</template>
+<route lang="yaml">
+style:
+  navigationBarTitleText: 储蓄保
+  enablePullDownRefresh: false
+</route>
+
+<style lang="scss">
+page {
+  overflow: hidden;
+  --nut-menu-item-font-size: 14px;
+  --nut-menu-bar-line-height: 24px;
+  --nut-menu-bar-box-shadow: none;
+  --nut-menu-item-active-text-color: #FE0032;
+
+  .nut-menu {
+    background: none !important;
+  }
+  .nut-menu__bar {
+    box-shadow: none !important;
+    border: 1px solid #FE0032;
+    border-radius: 4px;
+  }
+}
+</style>

src/pages/store/nearby/index.vue

@@ -4,8 +4,10 @@ import type {StoreResult} from "~/apis/model/storeModel";
 import {StoreParams} from "~/apis/model/storeModel";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 import {USER_LATITUDE, USER_LONGITUDE} from "~/constants";
+const usePageStore = usePageStoreWidthOut()
 
-const state = reactive<any>({
+
+const state = reactive({
   // 列表高度
   scrollHeight: 0,
   // 一级分类：指针
@@ -19,7 +21,7 @@ const state = reactive<any>({
   totalPage: 1,
   total: 1,
   pageSize: 10,
-  triggered: false,
+  triggered: true,
 
   category_id: 0,
   merchantCategory: [],
@@ -45,7 +47,7 @@ const state = reactive<any>({
 const searchValue = ref('')
 
 const {windowHeight} = uni.getSystemInfoSync()
-state.scrollHeight = windowHeight - 70
+state.scrollHeight = windowHeight - 45
 
 onLoad(() => {
   // getMerchantCategory()
@@ -57,7 +59,14 @@ onLoad(() => {
 })
 
 onShow(() => {
+  usePageStore.setPageConfig({
+    currentPage: {
+      type: 'tab',
+      url:  '/pages/store/nearby/index'
+    }
+  })
   loadAll()
+
 })
 
 function loadAll() {
@@ -100,7 +109,10 @@ function loadSelectMerchant(action: 'page' | 'reload', callback?: (items) => voi
       lng: uni.getStorageSync(USER_LONGITUDE)
     })
   }
+
   getSelectMerchant(params).then((res: StoreResult) => {
+    console.log(state.triggered)
+
     state.total = res.total
     state.totalPage = Math.ceil(state.total / state.pageSize);
     console.log(state.totalPage)
@@ -112,6 +124,9 @@ function loadSelectMerchant(action: 'page' | 'reload', callback?: (items) => voi
       state.merchantList = res.list
     }
     // state.totalPage = Math.ceil(totalItems / state.pageSize);
+    setTimeout(() => {
+      state.triggered = false
+    }, 300)
 
     state.status = 'more'
 
@@ -149,7 +164,8 @@ const onRefresherAbort = e => {
 }
 // 下拉刷新被触发
 const onRefresherRefresh = e => {
-  loadSelectMerchant(0)
+
+  loadSelectMerchant('reload')
 };
 
 function handleScrollToLower() {
@@ -169,17 +185,21 @@ function handleScrollToLower() {
   <!--    <nut-category-pane :categoryChild="state.merchantList" @onChange="onChange">-->
   <!--    </nut-category-pane>-->
   <!--  </nut-category>-->
-  <nut-searchbar
-      class="absolute top-0"
-      v-model="searchValue" @search="loadSelectMerchant('reload')" @clear="loadSelectMerchant( 'reload')">
-    <template v-slot:rightout>
-      <div @tap="loadSelectMerchant('reload')">
-        搜索
-      </div>
-    </template>
-  </nut-searchbar>
+  <div class="flex flex-col  fixed  top-0 left-0  h-fit z-1 bg-white w-full">
 
-  <div class="flex ">
+    <nut-searchbar
+        v-model="searchValue" @search="loadSelectMerchant('reload')" @clear="loadSelectMerchant( 'reload')">
+      <template v-slot:rightout>
+        <div @tap="loadSelectMerchant('reload')">
+          搜索
+        </div>
+      </template>
+    </nut-searchbar>
+
+
+  </div>
+  <div class="flex pt-10 "
+  >
     <!-- 左侧 一级分类 -->
     <div class="w-1/4">
       <scroll-view
@@ -215,8 +235,8 @@ function handleScrollToLower() {
     </div>
 
 
-    <div class="w-3/4">
-      <div class="fixed z-3 flex flex-col justify-center h-10 pl-3">
+    <div class="w-3/4 ">
+      <div class="fixed z-3 flex flex-col justify-center h-10 pl-3 top-10">
         <nut-menu>
           <nut-menu-item v-model="state.menuDefaultValue"
                          :options="state.options"
@@ -229,15 +249,15 @@ function handleScrollToLower() {
 
       <scroll-view
           :scroll-y="true"
-          :style="{ height: `${state.scrollHeight}px` }"
+          :style="{ height: `${state.scrollHeight -60}px` }"
           scroll-with-animation
-          class="flex flex-1  flex-col h-full w-full  p-3 gap-3 mt-8"
+          class="flex flex-1  flex-col   p-3 gap-3 mt-10"
           :refresher-enabled="true"
           refresher-background="#f5f5f5"
           refresher-default-style="black"
           :refresher-triggered="state.triggered"
           @scrolltolower="handleScrollToLower"
-          @refresherPulling="onRefresherPulling"
+          @refresherpulling="onRefresherPulling"
           @refresherRestore="onRefresherRestore"
           @refresherAbort="onRefresherAbort"
           @refresherrefresh="onRefresherRefresh"
@@ -271,6 +291,16 @@ function handleScrollToLower() {
 
           </div>
         </div>
+
+        <div class=" flex justify-center items-center text-[12px] text-gray-500"
+        >
+          <div v-if="state.status === 'loading'">
+            加载中...
+          </div>
+          <div v-if="state.status === 'noMore'">
+            没有更多了～
+          </div>
+        </div>
       </scroll-view>
       <div class="flex justify-center items-center w-full h-[60%]" v-else>
         <CXBEmpty/>
@@ -283,11 +313,12 @@ function handleScrollToLower() {
 <route lang="yaml">
 style:
   navigationBarTitleText: 储蓄保
-  enablePullDownRefresh: true
+  enablePullDownRefresh: false
 </route>
 
 <style lang="scss">
 page {
+  overflow: hidden;
   --nut-menu-item-font-size: 14px;
   --nut-menu-bar-line-height: 24px;
   --nut-menu-bar-box-shadow: none;

src/pages/store/product/detail.json

@@ -0,0 +1,132 @@
+{
+  "status": 200,
+  "message": "success",
+  "data": {
+    "product_id": "4858",
+    "mer_id": "321",
+    "image": "https:\/\/img.yunzhonghe.com\/image\/1594102082351snWdknfIaZ.jpg",
+    "slider_image": [
+      "https:\/\/img.yunzhonghe.com\/image\/1594102082351snWdknfIaZ.jpg"
+    ],
+    "store_name": "壳子妃子玫瑰红葡萄干235gS011 香槟黄 香槟黄",
+    "store_info": "1",
+    "unit_name": "个",
+    "price": "29.10",
+    "cost": "26.46",
+    "ot_price": "67.00",
+    "stock": "1000",
+    "sales": 100,
+    "video_link": "",
+    "product_type": "0",
+    "type": "5",
+    "dc_price": "29.90",
+    "seckill": "1",
+    "isRelation": false,
+    "sku": {
+      "默认": {
+        "sku": "默认",
+        "price": "29.10",
+        "stock": "100",
+        "image": "https:\/\/img.yunzhonghe.com\/image\/1594102082351snWdknfIaZ.jpg",
+        "bar_code": "",
+        "weight": "0.00",
+        "volume": "0.00",
+        "ot_price": "67.00",
+        "unique": "6b0753bbacf0",
+        "dacang": "29.90"
+      }
+    },
+    "replayData": {
+      "best": 0,
+      "rate": "",
+      "count": 0
+    },
+    "unique": "6b0753bbacf0",
+    "attr": [
+      {
+        "product_id": "4858",
+        "attr_name": "规格",
+        "attr_values": [
+          "默认"
+        ],
+        "type": "0",
+        "attr_id": null,
+        "attr_value": [
+          {
+            "attr": "默认",
+            "check": false
+          }
+        ]
+      }
+    ],
+    "yanglao": "1.49",
+    "product_count": 89,
+    "merchant_type": "3",
+    "seckill_date_end": "2023-08-22 18:00:00",
+    "seckill_s": 0,
+    "content": {
+      "product_id": "4858",
+      "content": "<img src='https:\/\/img.yunzhonghe.com\/image\/1594102142038jrPEvcMTXF.jpg'>",
+      "type": "0"
+    },
+    "topReply": null,
+    "merchant": {
+      "mer_id": "321",
+      "mer_name": "大仓创客",
+      "mer_avatar": "https:\/\/app.bjtdba.com\/uploads\/def\/20220428\/d616961db8aefbe92f72972a1d7db88a.png",
+      "product_score": "3.8",
+      "service_score": "3.6",
+      "postage_score": "3.6",
+      "service_phone": "13260336036",
+      "care_count": "11",
+      "business_id": "0",
+      "sxy_submerchant_id": "895152791",
+      "im": {
+        "im": "0",
+        "im_uuid": null,
+        "account": "12222222222"
+      },
+      "recommend": [
+        {
+          "mer_id": "321",
+          "product_id": "6183",
+          "store_name": "苏泊尔（SUPOR）ZMD安心系列 智能电饭煲电饭锅 5L容量 球釜内胆 多功能智能预约 香槟金色CFXB50FC59-75",
+          "image": "https:\/\/img13.360buyimg.com\/n12\/jfs\/t1\/52232\/37\/17532\/79491\/63282471Ec5d2ca36\/7c12d780f0be4a38.jpg",
+          "price": "240.79",
+          "is_show": "1",
+          "status": "1",
+          "is_gift_bag": "0",
+          "is_good": "0",
+          "ot_price": "279.00",
+          "yanglao": "5.47"
+        },
+        {
+          "mer_id": "321",
+          "product_id": "6193",
+          "store_name": "瑞士宾爵手表钟表高端绿面钢带防水配饰女表B1530L",
+          "image": "https:\/\/oss-hxq-prod.szbaoly.com\/bjsc\/goods\/16396d71ec8e4552a5530b33f517a344.jpg",
+          "price": "251.55",
+          "is_show": "1",
+          "status": "1",
+          "is_gift_bag": "0",
+          "is_good": "0",
+          "ot_price": "1217.00",
+          "yanglao": "5.71"
+        },
+        {
+          "mer_id": "321",
+          "product_id": "6201",
+          "store_name": "瑞士宾爵手表钟表小方表轻奢时尚配饰女表B1020L",
+          "image": "https:\/\/oss-hxq-prod.szbaoly.com\/bjsc\/goods\/1d66a54c8c454ece98e1b042adf093f3.jpg",
+          "price": "247.56",
+          "is_show": "1",
+          "status": "1",
+          "is_gift_bag": "0",
+          "is_good": "0",
+          "ot_price": "2980.00",
+          "yanglao": "5.62"
+        }
+      ]
+    }
+  }
+}

src/pages/store/product/detail.vue

@@ -15,12 +15,17 @@ import {
 } from "~/apis/model/product.model";
 import {DcProductModel} from "~/apis/model/dacang.model";
 import {CDN_URL} from "~/config/app";
+import {debounce} from "lodash-es";
+
+const usePageStore = usePageStoreWidthOut()
 
 const shangpinxiangqing_dianpu = CDN_URL + '/static/assets/shangpinxiangqing_dianpu.png'
 const shangpinxiangqing_kefu = CDN_URL + '/static/assets/shangpinxiangqing_kefu.png'
 const shangpinxiangqing_gouwuche = CDN_URL + '/static/assets/shangpinxiangqing_gouwuche.png'
 const wx_shareImg = CDN_URL + '/static/assets/wx_share_221121.png'
 const pyqImg = CDN_URL + '/static/assets/pyq_221121.png'
+const miaoshaIcon = CDN_URL + '/static/assets/miaoshajia_220805.png'
+const userStore = useUserStore()
 
 const shareShowTips = ref(false)
 const state = reactive({
@@ -32,7 +37,7 @@ const state = reactive({
   autoplay: true,
   interval: 5000,
   duration: 500,
-  currents: "1",
+  currents: "0",
   controls: true,
 
   recommendList: [],
@@ -50,11 +55,17 @@ const state = reactive({
   isNew: '0',
   cartNum: 1,
 
-  cartCount: 10,
+  cartCount: NaN,
 })
 const detail: any = ref(null)
 
 onShow(() => {
+  usePageStore.setPageConfig({
+    orderBack: {
+      type: 'page',
+      url: '/pages/store/product/detail?id=' + state.id
+    }
+  })
   loadCartCount()
 
 })
@@ -64,8 +75,9 @@ uni.showShareMenu({
   menus: ['shareAppMessage', 'shareTimeline']
 })
 onLoad((option: any) => {
-  // const id = '5491'
-  state.id = option.id
+  // const id = '4858'
+  // state.id = option.id
+  state.id = 4858
 
 
   getRecommendList({
@@ -119,15 +131,23 @@ onShareTimeline(() => {
 
 
 function loadCartCount() {
+  state.cartCount = NaN
   getCartCount().then(res => {
     console.log(res)
     state.cartCount = res[0].count
   }).catch(error => {
     console.log(error)
     if (error === '请登录') {
-      uni.navigateTo({
-        url: '/pages/user/login/index?key=4'
+      uni.showToast({
+        title: '请登录',
+        icon: 'none'
       })
+      // setTimeout(() => {
+      //   uni.navigateTo({
+      //     url: '/pages/user/login/index?key=4'
+      //   })
+      // }, 500)
+
     }
   })
 }
@@ -185,8 +205,8 @@ function handleAddCart() {
 }
 
 function handleCreateShopping() {
-  console.log(state.flag)
-  console.log(state.currentSku.unique)
+  // console.log(state.flag)
+  // console.log(state.currentSku.unique)
   createShopping({
     product_id: detail.value.product_id,
     // product_attr_unique: JSON.stringify(state.currentSku),
@@ -194,14 +214,16 @@ function handleCreateShopping() {
     cart_num: state.cartNum,
     is_new: (state.flag === '1' || state.flag === '3') ? '1': '0'
   }).then(res => {
-    console.log(res)
+    // console.log(res)
     if (res.cart_id) {
-      console.log(state.flag)
+      // console.log(state.flag)
       if (state.flag == '1' || state.flag == '3') {
         uni.navigateTo({
           url: `/pages/order-confirm/index?cartId=${res.cart_id}&type=${state.flag}&product_id=${detail.value.product_id}`
         })
       } else {
+        uni.$emit('cart-reload')
+
         uni.showToast({
           title: '添加购物车成功',
           icon: 'none'
@@ -236,6 +258,25 @@ function handleCreateShopping() {
  * @param flag //1表示立即购买;2表示加入购物车,3表示立即兑换
  */
 function handleOrderConfirm(flag: '1' | '2'| '3') {
+  debounce(() => {
+    if (!userStore.uid) {
+      return uni.showToast({
+        title: '请登录',
+        icon: 'none'
+      }).then(() => {
+        setTimeout(() => {
+          return uni.navigateTo({
+            url: '/pages/user/login/index'
+          })
+        }, 500)
+
+      })
+    }
+  }, 150,  {
+    'leading': true,
+    'trailing': false
+  })
+
   state.flag = flag
   state.isShowSku = true
   // if (is148Merchant.value) {
@@ -301,7 +342,7 @@ function handleRelation() {
 }
 
 function handleRemoveRelation() {
-  console.log('on....')
+  // console.log('on....')
   removeMyRelation({type: 1, type_id: state.id}).then(res => {
     // isCare.value = false
     state.isRelation = false
@@ -360,6 +401,17 @@ function handleShowCustomer() {
           </swiper-item>
         </swiper>
       </div>
+      <div class="bg-gradient-to-r from-[#fe7577] to-[#fe0032] h-25 mt-3" v-if="detail.seckill == 1">
+       <div class="flex gap-2 items-center text-white">
+           <div class="text-[24px]">
+             <text class="text-[20px]">￥</text>{{ detail.price }}
+           </div>
+           <image :src="miaoshaIcon" mode="widthFix" class="w-10"></image>
+       </div>
+        <div class="text-white">
+          即将恢复原价
+        </div>
+      </div>
       <div class="bg-black bg-op-30 fixed top-3  rounded-full right-3 h-6 w-6 flex flex-col justify-center items-center z-10"
            @click="toggleRelation"
       >
@@ -373,7 +425,7 @@ function handleShowCustomer() {
           class="flex flex-col p-3 gap-3">
         <div class="flex flex-row  items-center text-[#FE0032] font-bold text-lg gap-2">
           <div v-if="is148Merchant && detail.price" class="flex justify-end items-end gap-2">
-            <div class="!text-[24px]">{{ detail.price }} </div>
+            <div class="!text-[24px]">{{ Number.parseFloat(detail.price).toFixed(2) }} </div>
             <div class="text-sm">积分</div>
           </div>
           <div v-else>

src/pages/store/product/other.vue

@@ -18,13 +18,19 @@ import type {
 import FPrice from "~/components/FPrice/FPrice.vue";
 import FButton from "~/components/FButton/FButton.vue";
 import CXBButton from "~/components/CXBButton/CXBButton.vue";
-import {merge} from "lodash-es";
+import {debounce, merge} from "lodash-es";
+
+import { useDebounceFn } from '@vueuse/core';
+
 import dayjs from "dayjs";
 import {decodeBase64} from "~/utils/http/helper";
 import {CDN_URL} from "~/config/app";
 const discount_coupon_bg_220804Image = CDN_URL + '/static/assets/discount_coupon_bg_220804.png'
 const productId = ref('')
 //
+
+const userStore = useUserStore()
+const isSubmit = ref(false)
 const productType = ref(-1)
 // 优惠券劵信息
 const coupon = ref({
@@ -53,6 +59,10 @@ onLoad((options: any) => {
   loadProductDetail(data)
   // }
 })
+onShow(() => {
+  isSubmit.value = false
+
+})
 
 function mergeProductDetail(data: Partial<IProductDetail> = {}) {
   detail.value = merge(detail.value, data)
@@ -162,9 +172,30 @@ function loadProductDetail(product: Partial<IProductDetail>) {
     })
   }
 }
-
 function handleBuyNow() {
-  console.log(detail.value)
+  if (isSubmit.value) return
+  if(!userStore.uid) {
+    isSubmit.value = true
+
+    uni.navigateTo({
+      url: '/pages/user/login/index'
+    })
+  }
+    // debounce(() => {
+    //   console.log('debounce.....')
+    // }, 300)
+    // _debounce(() => {
+    //   return uni.navigateTo({
+    //     url: '/pages/user/login/index'
+    //   })
+    // }, 300)
+
+    // console.log('没登录')
+    // return _debounce(() => {
+    //     return uni.navigateTo({
+    //       url: '/pages/user/login/index'
+    //     })
+    // }, 300)
   // 京东
   if (detail.value?.platform == 6 && detail.value?.materialUrl) {
     // console.log(detail.value?.spreadUrl)
@@ -193,7 +224,7 @@ function handleBuyNow() {
       })
     }
   }
-  if (detail.value?.platform == 1) {
+  else if (detail.value?.platform == 1) {
     // console.log(detail.value)
     const pddWx = detail.value.pddlink.wx
     if (pddWx) {
@@ -222,9 +253,14 @@ function handleBuyNow() {
     // console.log(detail.value.pddlink)
     // console.log(pddWx)
   }
+  else {
+    return uni.showToast({
+      title: '商品维护中，请稍后再试',
+      icon: 'none'
+    })
+  }
+  /*
   if (detail.value?.platform == 3) {
-    // console.log('sunig')
-    // console.log(detail.value)
   }
 
   if (detail.value?.platform == 9) {
@@ -232,7 +268,7 @@ function handleBuyNow() {
   }
   if (detail.value?.platform == 2) {
     console.log(detail.value)
-  }
+  }*/
 }
 
 /**
@@ -319,7 +355,7 @@ const hasCoupon = computed(() => {
               <FPrice :price="detail.allowance" need-symbol ex-class="text-[20px] font-bold"/>
             </div>
             <div>
-              <nut-button type="primary" @tap="handleBuyNow">
+              <nut-button type="primary" @tap="handleBuyNow" :disabled="isSubmit">
                 立即购买
               </nut-button>
             </div>
@@ -333,6 +369,6 @@ const hasCoupon = computed(() => {
 
 <route lang="yaml">
 style:
-  navigationBarTitleText: 储蓄保
+  navigationBarTitleText: 商品详情
   enablePullDownRefresh: true
 </route>

src/pages/store/product/test.json

@@ -0,0 +1,74 @@
+{
+  "status": 200,
+  "message": "success",
+  "data": [
+    {
+      "seckill_date": "22日17:00已结束",
+      "ctime": "2023-02-15 01:00:00",
+      "product_id": "4508",
+      "status": "1",
+      "product_data": [
+        {
+          "mer_id": "321",
+          "product_id": "4508",
+          "store_name": "韩后熬夜甜睡修护面膜135ml 免洗睡眠面膜补水保湿深层滋养男女可用",
+          "image": "https:\/\/img13.360buyimg.com\/n12\/jfs\/t1\/219531\/21\/20940\/41092\/6311db6bE054cabee\/ed882adff197adfb.jpg",
+          "ot_price": "109.00",
+          "seckill_price": "24.80",
+          "yanglao": "1.24",
+          "status": 3,
+          "img_text": "已结束"
+        },
+        {
+          "mer_id": "321",
+          "product_id": "4858",
+          "store_name": "壳子妃子玫瑰红葡萄干235gS011 香槟黄 香槟黄",
+          "image": "https:\/\/img.yunzhonghe.com\/image\/1594102082351snWdknfIaZ.jpg",
+          "ot_price": "67.00",
+          "seckill_price": "29.90",
+          "yanglao": "1.49",
+          "status": 3,
+          "img_text": "已结束"
+        }
+      ]
+    },
+    {
+      "seckill_date": "22日21:00已结束",
+      "ctime": "2023-02-14 01:00:00",
+      "product_id": "4957",
+      "status": 3,
+      "product_data": [
+        {
+          "mer_id": "321",
+          "product_id": "4957",
+          "store_name": "云南白药清逸堂携爽舒缓棒（简装）  黑  ",
+          "image": "https:\/\/img.yunzhonghe.com\/image\/1649999225845LKCOiTiTOm.jpg",
+          "ot_price": "59.00",
+          "seckill_price": "28.90",
+          "yanglao": "1.44",
+          "status": 3,
+          "img_text": "已结束"
+        }
+      ]
+    },
+    {
+      "seckill_date": "14日14:00已结束",
+      "ctime": "2023-09-14 14:28:33",
+      "product_id": "6103",
+      "status": "1",
+      "product_data": [
+        {
+          "mer_id": "465",
+          "product_id": "6103",
+          "store_name": "测试001商品",
+          "image": "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-09-09\/3e1a8202309091612417658.jpg",
+          "ot_price": "200.00",
+          "seckill_price": "10.00",
+          "yanglao": "0.50",
+          "status": 3,
+          "img_text": "已结束"
+        }
+      ]
+    }
+  ]
+}

src/pages/third_party_binding/index.vue

@@ -1,14 +1,23 @@
 <script lang="ts" setup>
 import {CDN_URL} from "~/config/app";
-import {getBindingState} from "~/apis/user";
-import {findLast} from "lodash-es";
+import {getBindingState, getUserUnionId, wechatCheck} from "~/apis/user";
+import {findLast, union} from "lodash-es";
+import {getUpdateAccount} from "~/apis/auth.api";
 
 const zfbImage = CDN_URL + '/static/assets/zfb_sf_220908.png'
 const wxImage = CDN_URL + '/static/assets/wx_sf_220908.png'
 
 const bindState = ref([])
+import {useUserStore} from "~/stores/userStore";
+
+const userStore = useUserStore()
+
 
 onLoad(() => {
+  loadBindingState()
+})
+
+function loadBindingState() {
   getBindingState().then(res => {
     console.log(res)
     if (res) {
@@ -20,8 +29,7 @@ onLoad(() => {
       icon: 'none'
     })
   })
-})
-
+}
 function getBindState(type) {
   if (bindState.value) {
     return findLast(bindState.value, (value) => {
@@ -35,6 +43,87 @@ function getBindState(type) {
     // })
   }
 }
+
+function updateAccount(type, info: {unionId: string, nickName: string, avatarUrl: string}) {
+  uni.showLoading({
+    title: '绑定中',
+    icon: 'none'
+  })
+  getUpdateAccount({
+    type,
+    openid: info.unionId,
+    nickname: info.nickName,
+    // 这里接收的单词有误
+    avater: info.avatarUrl
+  }).then(res => {
+    // console.log(res)
+    // if (res) {
+      uni.showToast({
+        title: '绑定成功',
+        icon: "none"
+      })
+    loadBindingState()
+
+    uni.hideLoading()
+
+    // }
+  }).catch(error => {
+    uni.showToast({
+      title: error,
+      icon: 'none'
+    })
+  })
+
+}
+function getUserInfo() {
+  if (!getBindState('1')) {
+    uni.login({
+      provider: 'weixin',
+      univerifyStyle: {
+        fullScreen: true
+      },
+      success: (result) => {
+        getUserUnionId({
+          code: result.code,
+          source: 'cxb'
+        }).then(unionRes => {
+          console.log(userStore.userInfo)
+          console.log(unionRes)
+          updateAccount(1, {
+            unionId: unionRes.unionid,
+            nickName: userStore.userInfo.nickname,
+            avatarUrl: userStore.userInfo.avatar
+          })
+              // wechatCheck(unionRes.unionid).then(checkRes => {
+              //   userStore.login(checkRes.token, checkRes.exp)
+              //   userStore.setUID(checkRes.user.uid)
+              //   userStore.setUserInfo(checkRes.user)
+              //   console.log(checkRes)
+              //
+              //   setTimeout(() => {
+              //     uni.showToast({
+              //       title: '登录成功'
+              //     })
+              //   }, 1000);
+              //   uni.hideLoading();
+              // })
+        })
+        // uni.getUserInfo({
+        //   provider: 'weixin',
+        //   success: (infoRes) => {
+        //     updateAccount(1, infoRes.userInfo);
+        //   },
+        //   fail: (err) => {
+        //     console.log(err)
+        //   }
+        // });
+      },
+      fail: (error) => {
+        console.log(error)
+      }
+    });
+  }
+}
 </script>
 <template>
   <div class="flex flex-col">
@@ -47,12 +136,14 @@ function getBindState(type) {
         </div>
       </div>
       <div class="border border-solid rounded-full  text-xs px-2 h-4"
+           @tap="getUserInfo"
            :class="getBindState('1') ? 'text-red' : 'text-gray border-gray'"
       >
-        {{ getBindState('1') ? '已授权' : '未授权' }}
+        {{ getBindState('1') ? '已授权' : '去授权' }}
       </div>
     </div>
   </div>
+  <!--
   <div class="flex flex-row  justify-between bg-white p-4">
     <div class="flex-1 flex text-sm items-center gap-2">
       <image :src="zfbImage" mode="widthFix" class="w-4 h-4"></image>
@@ -67,6 +158,7 @@ function getBindState(type) {
 
     </div>
   </div>
+  -->
 </template>
 
 <style>

src/pages/user/address/index.vue

@@ -20,7 +20,7 @@
               <div>
                 {{ item.real_name }}
               </div>
-              <div>{{ item.phone }}</div>
+              <div>{{ encodePhone(item.phone) }}</div>
             </div>
           </div>
           <div
@@ -34,6 +34,7 @@
         </div>
 
       </div>
+      <CXBEmpty text="您还没有收货地址" type="address" v-else/>
 
       <div class="fixed bottom-0 p-safe w-full bg-white ">
         <div class="px-3">
@@ -49,10 +50,13 @@ import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import {encodeBase64} from "~/utils/http/helper";
 import type {AddressModel} from "~/apis/model/address.model";
 import {useAddressStore} from "~/stores/addressStore";
+import {encodePhone} from "../../../utils";
+import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 
 
 export default {
-  components: {CXBBasePage},
+  methods: {encodePhone},
+  components: {CXBEmpty, CXBBasePage},
   setup() {
     const data = ref([]);
     const addressStore = useAddressStore()

src/pages/user/index.vue

@@ -7,6 +7,7 @@ import Routine from "~/libs/routine";
 import {totalOrderNumber} from "~/apis/order.api";
 import type {OrderQuantityModel} from "~/apis/model/order.model";
 import type {Ref} from "vue";
+const pageStore = usePageStoreWidthOut()
 
 const myOrderList = [{
   id: 'noPay',
@@ -112,6 +113,9 @@ const orderQuantity: Ref<OrderQuantityModel> = ref()
 const agentInfo = ref({})
 // onLoad(() => {})
 onShow(async () => {
+  // pageStore.setPageConfig({
+  //   orderBack: null
+  // })
   uni.showLoading({
     title: '登录中',
   })
@@ -506,5 +510,5 @@ page {
 style:
   navigationStyle: custom
   navigationBarTitleText: 储蓄保
-  enablePullDownRefresh: true
+  enablePullDownRefresh: false
 </route>

src/pages/user/login/index.vue

@@ -4,7 +4,13 @@ import CXBBanner from "~/components/CXBBanner/CXBBanner.vue";
 import CXBPhoneLoginButton from "~/components/CXBPhoneLoginButton/CXBPhoneLoginButton.vue";
 import CXBNotLoginButton from "~/components/CXBNotLoginButton/CXBNotLoginButton.vue";
 import {useUserStore} from "~/stores/userStore";
-
+import FNavBar from "~/components/FNavBar/FNavBar.vue";
+// usePageStore.setPageConfig({
+//   currentPage: {
+//     type: 'tab',
+//     url:  '/pages/order_addcart/index'
+//   }
+// })
 const userStore = useUserStore()
 
 const state = reactive({
@@ -16,6 +22,7 @@ onLoad((option: any) => {
   state.qrcode = option.type
   state.uid = option.uid
   state.key = option.key
+
 })
 
 function getPhoneNumber(e) {
@@ -41,10 +48,12 @@ async function handleWexinLogin() {
       fullScreen: true
     },
     success: result => {
+      console.log(result)
       getUserUnionId({
         code: result.code,
         source: 'cxb'
       }).then(unionRes => {
+        console.log(unionRes)
         wechatCheck(unionRes.unionid).then(checkRes => {
           // console.log(checkRes)
           userStore.login(checkRes.token, checkRes.exp)
@@ -116,9 +125,44 @@ async function handleWexinLogin() {
   })
   // 换取Code
 }
+
+function onClickLeft() {
+  const pageStore = usePageStoreWidthOut()
+
+  if (pageStore && pageStore.currentPage) {
+    if (pageStore.currentPage.type === 'tab') {
+      uni.switchTab({
+        url: pageStore.currentPage.url
+      })
+    } else {
+      uni.navigateTo({
+        url: pageStore.currentPage.url
+      })
+    }
+  } else {
+    uni.navigateBack()
+  }
+  // uni.showModal({
+  //   content: '您确定退出评价吗？',
+  //   confirmColor: '#FE0032',
+  //   success: (res) =>  {
+  //     if (res.confirm) {
+  //       uni.navigateBack()
+  //     }
+  //   },
+  // })
+
+}
 </script>
 <template>
   <div>
+    <FNavBar
+        title="" :left-arrow="true" fixed placeholder z-index="999"
+        ex-class="bg-white w-screen"
+        @click-left="onClickLeft"
+    />
+
+
     <CXBBanner/>
 
     <div class="px-3 flex flex-col gap-3">
@@ -151,7 +195,8 @@ async function handleWexinLogin() {
 
 <route lang="yaml">
 style:
-enablePullDownRefresh: true
+  enablePullDownRefresh: false
+  navigationStyle: custom
 </route>
 <style>
 button {

src/pages/user/login/other-phone.vue

@@ -1,11 +1,10 @@
 <template>
-  <CXBBasePage>
+  <div>
     <CXBBanner/>
 
     <nut-input
         v-model="state.phone"
         placeholder="请输入手机号"
-        clearable
     >
       <template #right>
         <nut-button type='primary' size="small" @click="handleGetCode" :loading="state.isAuthVerify">
@@ -34,7 +33,7 @@
 
     </div>
 
-  </CXBBasePage>
+  </div>
 </template>
 <script setup lang="ts">
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
@@ -139,3 +138,9 @@ function handleLogin() {
 style:
   navigationBarTitleText: 手机登录
 </route>
+
+<style>
+page {
+  background: #f8f8f8;
+}
+</style>

src/pages/withdrawal-record/index.vue

@@ -52,4 +52,6 @@ page {
 <route lang="yaml">
 style:
   navigationBarTitleText: 提现记录
+  enablePullDownRefresh: false
+
 </route>

src/stores/dacangStore.ts

@@ -2,11 +2,15 @@ import {defineStore} from "pinia";
 
 export const useDacangStore = defineStore('dacangStore', {
     state: () => ({
-        currentClassify: ''
+        currentClassify: '-1'
     }),
     actions: {
         setClassify(classify: string) {
+            console.log('class' + classify)
             this.currentClassify = classify
+        },
+        loadList() {
+
         }
     }
 })

src/stores/page.ts

@@ -6,6 +6,14 @@ interface PageConfig {
     showBackAction?: boolean
     showCustomAction?: boolean
     pageTitle?: string
+    currentPage?: {
+        type: string,
+        url: string
+    },
+    orderBack?: {
+        type: string,
+        url: string
+    }
 }
 
 export const usePageStore = defineStore('page', () => {
@@ -13,6 +21,8 @@ export const usePageStore = defineStore('page', () => {
     const showBackAction = ref(false)
     const showCustomAction = ref(false)
     const pageTitle = ref('')
+    const currentPage = ref<any>()
+    const orderBack = ref<any>()
     // const notifyRef = ref<{ showNotify: (options: NotifyOptions) => {} }>()
 
     const setPageConfig = (config: PageConfig = {}) => {
@@ -20,6 +30,8 @@ export const usePageStore = defineStore('page', () => {
         showBackAction.value = config.showBackAction ?? false
         showCustomAction.value = config.showCustomAction ?? false
         pageTitle.value = config.pageTitle ?? ''
+        currentPage.value = config.currentPage ?? null
+        orderBack.value = config.orderBack?? null
     }
 
     // const showNotify = (options: NotifyOptions) =>
@@ -39,6 +51,8 @@ export const usePageStore = defineStore('page', () => {
         pageTitle,
         showBackAction,
         showCustomAction,
+        currentPage,
+        orderBack,
         // notifyRef,
         // showNotify,
         pageReset,

src/utils/product-page.ts

@@ -43,7 +43,7 @@ const tabList = <Array<TabItem>>[{
     selectedIconPath: CDN_URL + '/static/assets/pinduoduo_d.png',
 }, {
     id: PLATFORM_NAME.DC,
-    text: '城中大仓',
+    text: '大仓',
     iconPath: CDN_URL + '/static/assets/dacang_x_220914.png',
     selectedIconPath: CDN_URL + '/static/assets/dacang_d_220914.png',
 }, {

theme.ts

@@ -19,7 +19,7 @@ export const theme: Theme = {
     fGray7: '#646566',
     fGray8: '#323233',
 
-    lightBg: '#F3F4F6',
+    lightBg: '#f8f8f8',
     darkBg: '#373739',
     placeholder: '#DCDCDC',
     grayBg: '#484849',