commit

src/apis/common.ts

@@ -111,7 +111,7 @@ export function getLocal() {
     uni.getLocation({
         type: 'wgs84',
         success(res) {
-            // console.log(res)
+            console.log('location', res)
             uni.setStorageSync(USER_LATITUDE, res.latitude)
             uni.setStorageSync(USER_LONGITUDE, res.longitude)
             // getRegeo(res.latitude, res.longitude);

src/apis/product.ts

@@ -312,6 +312,7 @@ export function getPddProductDetail(goodsId: string): Promise<PDDProductDetailMo
         }
     })
 }
+
 /**
  * 拼多多商品搜索
  * @param params
@@ -384,4 +385,17 @@ export function getDyProductDetail(goodsId: string): Promise<DyProductDetailsMod
             goodsId
         }
     })
+}
+
+/**
+ * 抖音商品详情 - 未登录
+ * @param goodsId
+ */
+export function getDyProductDetailUnlogin(goodsId: string): Promise<DyProductDetailsModel> {
+    return detailHttp.get({
+        url: API.DY_DETAIL,
+        data: {
+            goodsId
+        }
+    })
 }

src/pages/home/components/banner.vue

@@ -4,13 +4,14 @@ const userStore = useUserStore()
 
 function handleGuestMemberNew() {
   // 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'
+      url: '/pages/guest_member_new/index'
     })
   }
 }

src/pages/home/index.vue

@@ -7,7 +7,7 @@ import Announcement from "~/pages/home/components/announcement.vue";
 import Banner from "~/pages/home/components/banner.vue";
 import Header from "~/pages/home/components/header.vue";
 import ProductList from "~/pages/home/components/product-list.vue";
-import { getHomeBanner, getHomeQuickLink, getNoticeList, getProductShare } from "~/apis/common";
+import { getHomeBanner, getHomeQuickLink, getNoticeList, getProductShare, getLocal} from "~/apis/common";
 import { useUserStore } from "~/stores/userStore";
 import CXBDialogSIgnIn from "~/components/CXBDialogSignIn/CXBDialogSIgnIn.vue";
 import CXBDialogSIgnInSucceed from "~/components/CXBDialogSignInSucceed/CXBDialogSIgnInSucceed.vue";
@@ -131,6 +131,7 @@ onLoad((option) => {
   if (option && option.shareId) {
     userStore.setShareId(option.shareId)
   }
+  // getLocal()
   getIsShow()
   getHomeBanner().then(res => {
     // console.log(res)

src/pages/order/components/ObligationOrderList.vue

@@ -1,14 +1,13 @@
 <script setup lang="ts">
-import { getAllOrder, getGroupOrderList } from "~/apis/order.api";
-import OrderItem from "~/pages/order/components/OrderItem.vue";
-import OtherOrderItem from "~/pages/order/components/OtherOrderItem.vue";
-import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
-import OrderObligationItem from "~/pages/order/components/OrderObligationItem.vue";
+import { getGroupOrderList } from '~/apis/order.api'
+import CXBEmpty from '~/components/CXBEmpty/CXBEmpty.vue'
+import OrderObligationItem from '~/pages/order/components/OrderObligationItem.vue'
+
 const props = defineProps({
   tabValue: {
     type: Number,
-    default: 0
-  }
+    default: 0,
+  },
 })
 const state = reactive({
   currentPage: 1,
@@ -16,63 +15,65 @@ const state = reactive({
   totalPage: 1,
   status: '',
 
-  list: []
+  list: [],
 })
 function loadList(action: 'page' | 'reload', callback?: (items) => void) {
   // console.log(state.keyword)
-  if (action === 'reload') {
+  if (action === 'reload')
     state.currentPage = 1
-  }
+
   const params = {
     page: state.currentPage,
-    limit: state.pageSize
+    limit: state.pageSize,
   }
-  if (state.keyword) {
+  if (state.keyword)
     params.keyword = state.keyword
-  }
 
   getGroupOrderList({
     page: state.currentPage,
-    limit: state.pageSize
-  }).then(res => {
-    console.log('>>>>>>111', res);
+    limit: state.pageSize,
+  }).then((res) => {
+    console.log('>>>>>>111', res)
     if (res.list.length <= 0) {
       uni.$emit('changeShowLike')
-      console.log('没有数据');
+      console.log('没有数据')
+	  state.list = res.list
+	  if (callback)
+	    callback(res.list)
+
       return
     }
-    if(res.count< state.pageSize){
+    if (res.count < state.pageSize)
       uni.$emit('changeShowLike')
-    }
-    if (action === 'page') {
+
+    if (action === 'page')
       state.list = state.list.concat(res.list)
-    }
-    if (action == 'reload') {
+
+    if (action == 'reload')
       state.list = res.list
-    }
-    state.totalPage = Math.ceil(res.total / state.pageSize);
+
+    state.totalPage = Math.ceil(res.total / state.pageSize)
 
     state.status = 'more'
-    if (callback) {
+    if (callback)
       callback(res.list)
-    }
   })
 }
 watch(() => state.status, (newStatus, oldStatus) => {
-  console.log('状态变化。新状态：', newStatus, '旧状态：', oldStatus);
+  console.log('状态变化。新状态：', newStatus, '旧状态：', oldStatus)
 
-  if (newStatus === 'noMore') {
-    uni.$emit('changeShowLike');
-  }
-});
+  if (newStatus === 'noMore')
+    uni.$emit('changeShowLike')
+})
 
 function handleScrollToLower() {
-  state.status = 'loading';
-  state.currentPage += 1;
+  state.status = 'loading'
+  state.currentPage += 1
 
   if (state.currentPage > state.totalPage) {
-    state.status = 'noMore';
-  } else {
+    state.status = 'noMore'
+  }
+  else {
     setTimeout(() => {
       loadList('page')
     }, 300)
@@ -90,34 +91,35 @@ onMounted(() => {
 
   uni.$on('onTab1ReachBottom', handleScrollToLower)
   uni.$on('onTab1PullDownRefresh', () => {
-    loadList('reload', items => {
+    loadList('reload', (items) => {
       setTimeout(() => {
         uni.stopPullDownRefresh()
       }, 300)
     })
   })
   uni.$on('dfkreloadList', () => {
-    console.log('收到事件 reloadList');
+    console.log('收到事件 reloadList')
     // 在这里可以执行你的逻辑，比如调用 loadList 函数
     // 请注意，这里的 this 指向当前页面实例
-    loadList('reload');
-  });
+    loadList('reload')
+  })
 })
 
 onUnmounted(() => {
-  uni.$off('onTab1ReachBottom');
-  uni.$off('onTab1PullDownRefresh');
+  uni.$off('onTab1ReachBottom')
+  uni.$off('onTab1PullDownRefresh')
 })
 </script>
+
 <template>
   <div class="p-3 flex flex-col">
     <div v-if="state.list.length > 0" class="flex flex-col">
       <div v-for="(orderItem, index) in state.list" :key="index">
-        <!--        <OrderItem :order-item="orderItem" />-->
-        <!--        <OtherOrderItem :item="orderItem" v-else/>-->
+        <!--        <OrderItem :order-item="orderItem" /> -->
+        <!--        <OtherOrderItem :item="orderItem" v-else/> -->
         <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">
+      <div v-if="state.list && state.list.length > 0" class=" flex justify-center items-center text-[12px] text-gray-500">
         <div v-if="state.status === 'loading'">
           加载中...
         </div>
@@ -128,7 +130,6 @@ onUnmounted(() => {
     </div>
     <div v-else class="flex flex-col  justify-center items-center w-full">
       <CXBEmpty />
-
     </div>
   </div>
-</template>
+</template>

src/pages/order/components/Order4List.vue

@@ -1,75 +1,77 @@
 <script setup lang="ts">
-import { getOrderListFromStatus } from "~/apis/order.api";
-import OrderItem from "~/pages/order/components/OrderItem.vue";
-import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+import { getOrderListFromStatus } from '~/apis/order.api'
+import OrderItem from '~/pages/order/components/OrderItem.vue'
+import CXBEmpty from '~/components/CXBEmpty/CXBEmpty.vue'
 
 const props = defineProps({
   status: {
     type: String,
-  }
+  },
 })
 const state = reactive({
   currentPage: 1,
   pageSize: 10,
   totalPage: 1,
-  status: "",
-  list: []
+  status: '',
+  list: [],
 })
 function loadList(action: 'page' | 'reload', callback?: (items) => void) {
   // console.log(state.keyword)
-  if (action === 'reload') {
+  if (action === 'reload')
     state.currentPage = 1
-  }
+
   const params = {
     page: state.currentPage,
-    limit: state.pageSize
+    limit: state.pageSize,
   }
-  if (state.keyword) {
+  if (state.keyword)
     params.keyword = state.keyword
-  }
 
   getOrderListFromStatus({
     page: state.currentPage,
     limit: state.pageSize,
     status: props.status,
-  }).then(res => {
+  }).then((res) => {
     console.log(res)
     if (res.list.length <= 0) {
       uni.$emit('changeShowLike')
-      console.log('没有数据');
+      console.log('没有数据')
+	  state.list = res.list
+	  if (callback)
+	    callback(res.list)
+
       return
     }
-    if(res.count< state.pageSize){
+    if (res.count < state.pageSize)
       uni.$emit('changeShowLike')
-    }
-    if (action === 'page') {
+
+    if (action === 'page')
       state.list = state.list.concat(res.list)
-    }
-    if (action == 'reload') {
+
+    if (action == 'reload')
       state.list = res.list
-    }
-    state.totalPage = Math.ceil(res.count / state.pageSize);
+
+    state.totalPage = Math.ceil(res.count / state.pageSize)
 
     state.status = 'more'
-    if (callback) {
+    if (callback)
       callback(res.list)
-    }
   })
 }
 watch(() => state.status, (newStatus, oldStatus) => {
-  console.log('状态变化。新状态：', newStatus, '旧状态：', oldStatus);
+  console.log('状态变化。新状态：', newStatus, '旧状态：', oldStatus)
 
-  if (newStatus === 'noMore') {
-    uni.$emit('changeShowLike');
-  }
-});
+  if (newStatus === 'noMore')
+    uni.$emit('changeShowLike')
+})
 function handleScrollToLower() {
-  state.status = 'loading';
-  state.currentPage += 1;
+  state.status = 'loading'
+  state.currentPage += 1
 
   if (state.currentPage > state.totalPage) {
-    state.status = 'noMore';
-  } else {
+    state.status = 'noMore'
+  }
+  else {
     setTimeout(() => {
       loadList('page')
     }, 300)
@@ -103,7 +105,7 @@ onMounted(() => {
   })
   uni.$on('onTab4ReachBottom', handleScrollToLower)
   uni.$on('onTab4PullDownRefresh', () => {
-    loadList('reload', items => {
+    loadList('reload', (items) => {
       setTimeout(() => {
         uni.stopPullDownRefresh()
       }, 300)
@@ -111,23 +113,23 @@ onMounted(() => {
   })
 })
 onUnmounted(() => {
-
-  uni.$off('onTab4ReachBottom');
-  uni.$off('onTab4PullDownRefresh');
+  uni.$off('onTab4ReachBottom')
+  uni.$off('onTab4PullDownRefresh')
 })
 onUnload(() => {
-  uni.$off('onTab4ReachBottom');
-  uni.$off('onTab4PullDownRefresh');
+  uni.$off('onTab4ReachBottom')
+  uni.$off('onTab4PullDownRefresh')
 })
 </script>
+
 <template>
   <div class="p-3 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/>-->
+        <!--        <OtherOrderItem :item="orderItem" v-else/> -->
       </div>
-      <div class=" flex justify-center items-center text-[12px] text-gray-500" v-if="state.list && state.list.length > 0">
+      <div v-if="state.list && state.list.length > 0" class=" flex justify-center items-center text-[12px] text-gray-500">
         <div v-if="state.status === 'loading'">
           加载中...
         </div>
@@ -138,7 +140,6 @@ onUnload(() => {
     </div>
     <div v-else class="flex flex-col  justify-center items-center w-full">
       <CXBEmpty />
-
     </div>
   </div>
-</template>
+</template>

src/pages/order_addcart/index.vue

@@ -169,10 +169,13 @@ onShow(() => {
       url: '/pages/user/login/index'
     })
   }
+  
+  // 是否是管理 不是则 设置成是
   if (!state.isManage) {
     state.isManage = true
   }
 
+	// 是否是同一个人的id 不是就重新请求数据
   if (u_id.value != userStore.uid) {
     u_id.value = userStore.uid
     loadCartList()

src/pages/payment/index.vue

@@ -1,45 +1,8 @@
-<template>
-  <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>
-        <FPrice :price="state.payPrice" ex-class="!text-xl font-bold"></FPrice>
-      </div>
-      <div class="bg-white rounded-lg text-sm p-3 flex flex-col">
-        <div class="flex f-hairline-bottom text-sm pb-2">
-          支付方式
-        </div>
-        <div>
-          <div class="flex items-center justify-between py-3">
-            <div class="flex items-center gap-2">
-              <image :src="wxLogoImage" mode="widthFix" class="w-8 h-8"></image>
-              <div>微信支付</div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-
-    <div class="fixed bottom-0 pb-safe  w-full">
-      <div class="p-4">
-        <nut-button block type="primary" @click="handleConfirm">立即支付</nut-button>
-      </div>
-
-    </div>
-  </div>
-</template>
 <script setup lang="ts">
-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";
+import FPrice from '~/components/FPrice/FPrice.vue'
+import { CDN_URL } from '~/config/app'
+import { checkGroupOrder } from '~/apis/order.api'
+import FNavBar from '~/components/FNavBar/FNavBar.vue'
 
 // usePageStore.setPageConfig({
 //   orderBack: {
@@ -50,7 +13,7 @@ import FNavBar from "~/components/FNavBar/FNavBar.vue";
 
 const pageStore = usePageStoreWidthOut()
 
-const wxLogoImage = CDN_URL + '/static/assets/wx_logo.png'
+const wxLogoImage = `${CDN_URL}/static/assets/wx_logo.png`
 const state = reactive({
   orderList: [],
   payPrice: '',
@@ -58,27 +21,27 @@ const state = reactive({
   code: '',
   memberType: 0,
 
-  tabIndex: NaN,
+  tabIndex: Number.NaN,
 })
 onLoad((options) => {
-	// console.log('我是options',options)
+  // console.log('我是options',options)
   if (options) {
     state.orderList = options.OrderList
     state.payPrice = options.pay_price
     state.orderId = options.order_id
 
+    console.log('options')
     console.log(options)
-    if (options.tabIndex) {
+    if (options.tabIndex)
       state.tabIndex = options.tabIndex
-    }
 
     uni.login({
       success: (res) => {
         state.code = res.code
-      }
+      },
     })
 
-    checkGroupOrder(state.orderId).then(res => {
+    checkGroupOrder(state.orderId).then((res) => {
       state.memberType = res.message
     })
   }
@@ -88,7 +51,7 @@ function handleConfirm() {
   uni.showToast({
     title: '支付中',
     icon: 'loading',
-    duration: 3000
+    duration: 3000,
   })
   uni.navigateToMiniProgram({
     // appid  写你要跳转的小程序的 appid
@@ -100,24 +63,23 @@ function handleConfirm() {
     extraData: {
       oid: state.orderId,
       OrderLists: state.orderList,
-      type: 'tdbaspzf'
+      type: 'tdbaspzf',
     },
-    // envVersion: 'trial', // develop（开发版），trial（体验版），release（正式版）
-    envVersion: 'release', // develop（开发版），trial（体验版），release（正式版）
+    envVersion: 'trial', // develop（开发版），trial（体验版），release（正式版）
+    // envVersion: 'release', // develop（开发版），trial（体验版），release（正式版）
     success(res) {
       // 打开成功
       uni.showToast({
-        title: '跳转成功'
+        title: '跳转成功',
       })
     },
     fail(err) {
       // 打开失败/取消
       uni.showToast({
-        title: '跳转不成功'
+        title: '跳转不成功',
       })
-    }
+    },
   })
-
 }
 
 function onClickLeft() {
@@ -131,7 +93,6 @@ function onClickLeft() {
       if (res.confirm) {
         handleConfirm()
         uni.$emit('cart-reload')
-
       }
       if (res.cancel) {
         // uni.navigateBack()
@@ -140,42 +101,87 @@ function onClickLeft() {
         // if (usePageStore.orderBack) {
         //   url += `&from=${usePageStore.orderBack}`
         // }
-        console.log(state.tabIndex);
-        
+        console.log(state.tabIndex)
+
         if (state.tabIndex) {
           pageStore.setPageConfig({
             orderBack: {
               url: '/pages/user/index',
-              type: 'tab'
-            }
+              type: 'tab',
+            },
           })
         }
         // setTimeout(() => {
         if (state.tabIndex == 0) {
           uni.navigateTo({
-            url: '/pages/order/index'
+            url: '/pages/order/index',
           })
         }
         if (state.tabIndex > 0) {
-
-          uni.navigateTo({
-            url: `/pages/order/index?tabIndex=${state.tabIndex}&from=payment`,
-          })
-        } else {
+          if (state.tabIndex == 1) {
+            uni.navigateBack({
+              delta: 1,
+            })
+          }
+          else {
+            uni.navigateTo({
+				  url: `/pages/order/index?tabIndex=${state.tabIndex}&from=payment`,
+            })
+          }
+        }
+        else {
           uni.navigateTo({
-            url: `/pages/order/index?tabIndex=1&from=payment`,
+            url: '/pages/order/index?tabIndex=1&from=payment',
           })
         }
         // const tabIndex =
 
         // }, 300)
-
       }
     },
   })
 }
 </script>
 
+<template>
+  <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>
+        <FPrice :price="state.payPrice" ex-class="!text-xl font-bold" />
+      </div>
+      <div class="bg-white rounded-lg text-sm p-3 flex flex-col">
+        <div class="flex f-hairline-bottom text-sm pb-2">
+          支付方式
+        </div>
+        <div>
+          <div class="flex items-center justify-between py-3">
+            <div class="flex items-center gap-2">
+              <image :src="wxLogoImage" mode="widthFix" class="w-8 h-8" />
+              <div>微信支付</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="fixed bottom-0 pb-safe  w-full">
+      <div class="p-4">
+        <nut-button block type="primary" @click="handleConfirm">
+          立即支付
+        </nut-button>
+      </div>
+    </div>
+  </div>
+</template>
+
 <route lang="yaml">
 style:
   navigationStyle: custom
@@ -186,4 +192,4 @@ style:
 page {
   background: #f8f8f8;
 }
-</style>
+</style>

src/pages/product/integral.vue

@@ -56,11 +56,11 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
       title: error,
       icon: 'none'
     })
-    if (error == '请登录') {
-      uni.navigateTo({
-        url: '/pages/user/login/index'
-      })
-    }
+    // if (error == '请登录') {
+    //   uni.navigateTo({
+    //     url: '/pages/user/login/index'
+    //   })
+    // }
   })
 }
 function handleScrollToLower() {

src/pages/store/nearby/index.vue

@@ -1,16 +1,15 @@
 <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";
-import { getProductShare, getLocal } from "~/apis/common";
-import { useUserStore } from "~/stores/userStore";
-import Cache from "~/utils/cache";
+import { getSelectMerchant, getSelectMerchantSort } from '~/apis/merchant'
+import type { StoreParams, StoreResult } from '~/apis/model/storeModel'
+import CXBEmpty from '~/components/CXBEmpty/CXBEmpty.vue'
+import { USER_LATITUDE, USER_LONGITUDE } from '~/constants'
+import { getLocal, getProductShare } from '~/apis/common'
+import { useUserStore } from '~/stores/userStore'
+import Cache from '~/utils/cache'
+
 const usePageStore = usePageStoreWidthOut()
 const userStore = useUserStore()
 
-
 const state = reactive({
   // 列表高度
   scrollHeight: 0,
@@ -43,39 +42,40 @@ const state = reactive({
     value: 1,
   }, {
     text: '距离优先',
-    value: 2
+    value: 2,
   }],
-  menuDefaultValue: 1
-  // merchantPageInfo: {}
+  menuDefaultValue: 1,
+  loadType: 'page',
 })
-//返回顶部标识
-let flag = ref(false)
+// 返回顶部标识
+const flag = ref(false)
 
 const searchValue = ref('')
 
 const { windowHeight } = uni.getSystemInfoSync()
 state.scrollHeight = windowHeight - 45
 
-onLoad((option) => {
-	
-	getLocal()
-	
-  if (option && option.shareId) {
+onLoad(async (option) => {
+  console.log('11', uni.getSystemInfoSync())
+  console.log('12', state.scrollHeight)
+
+  await getLocal()
+  if (option && option.shareId)
     userStore.setShareId(option.shareId)
-  }
+
   // getMerchantCategory()
-  getSelectMerchantSort().then(res => {
+  getSelectMerchantSort().then((res) => {
     state.merchantCategory = res.merchantCategory
+    // state.merchantCategory = state.merchantCategory.concat(res.merchantCategory)
   })
   loadAll()
-  getProductShare().then(res => {
-    if (res) {
+  getProductShare().then((res) => {
+    if (res)
       userStore.setShareId(res.share_id)
-    }
-  }).catch(message => {
+  }).catch((message) => {
     // console.log(message)
   })
-  userStore.setRedirectPage(`/pages/store/nearby/index`, 'tab')
+  userStore.setRedirectPage('/pages/store/nearby/index', 'tab')
 
   // loadSelectMerchant('reload')
 })
@@ -84,9 +84,9 @@ onShareAppMessage(() => {
 
   // const shareId = userStore.shareId
   return {
-    title: `消费储蓄 保障未来`,
+    title: '消费储蓄 保障未来',
     path: `/pages/store/nearby/index?shareId=${shareId}`,
-    imageUrl: 'https://cdn.bjtdba.com/vod/image/2023-10-09/20231009202402136.png'
+    imageUrl: 'https://cdn.bjtdba.com/vod/image/2023-10-09/20231009202402136.png',
   }
 })
 
@@ -94,9 +94,9 @@ onShareTimeline(() => {
   const shareId = Cache.get('SHARE_ID')
 
   return {
-    title: `消费储蓄 保障未来`,
+    title: '消费储蓄 保障未来',
     imageUrl: 'https://cdn.bjtdba.com/vod/image/2023-10-11/20231011062523504.png',
-    query: `from=share&shareId=${shareId}`
+    query: `from=share&shareId=${shareId}`,
 
     // imageUrl: 'https://cdn.bjtdba.com/vod/image/2023-10-09/20231009202402136.png'
   }
@@ -105,12 +105,15 @@ onShow(() => {
   usePageStore.setPageConfig({
     currentPage: {
       type: 'tab',
-      url: '/pages/store/nearby/index'
-    }
+      url: '/pages/store/nearby/index',
+    },
   })
   // console.log('onshow...')
-  loadSelectMerchant('reload')
 
+  if (state.loadType) {
+	  loadSelectMerchant(state.loadType)
+  }
+	
 })
 
 function loadAll() {
@@ -121,16 +124,18 @@ function loadAll() {
 function handleCategoryChange(category) {
   // console.log(category)
   state.currentMerchantCategoryId = category.merchant_category_id
-  // console.log(category)
-  // loadSelectMerchant()
+
   state.category_id = category.merchant_category_id
+  state.currentPage = 1
   loadSelectMerchant('reload')
 }
 
 function loadSelectMerchant(action: 'page' | 'reload', callback?: (items) => void) {
-  if (state.category_id == 0) {
+  state.loadType = action
+
+  if (state.category_id == 0)
     state.currentMerchantCategoryId = state.category_id
-  }
+
   let params: StoreParams = {
     pageNum: state.currentPage,
     pageSize: state.pageSize,
@@ -140,20 +145,44 @@ function loadSelectMerchant(action: 'page' | 'reload', callback?: (items) => voi
     // lng: '',
 
   }
+
+  if (userStore.userInfo) {
+	  params = Object.assign({}, params, {
+	    uid: userStore.userInfo.uid,
+	  })
+  }
+
   if (state.category_id !== 0) {
     // params.category_id = category_id
     params = Object.assign({}, params, {
-      category_id: state.category_id
+      category_id: state.category_id,
     })
   }
-  
+
   if (uni.getStorageSync(USER_LATITUDE)) {
+	  if (state.menuDefaultValue === 2) {
+	    params = Object.assign({}, params, {
+	      distanceAsc: 0,
+	      lat: uni.getStorageSync(USER_LATITUDE),
+	      lng: uni.getStorageSync(USER_LONGITUDE),
+	    })
+	  }
+    else {
+		  params = Object.assign({}, params, {
+		    // distanceAsc: null,
+		    lat: uni.getStorageSync(USER_LATITUDE),
+		    lng: uni.getStorageSync(USER_LONGITUDE),
+		  })
+	  }
+  }
+  else {
 	  params = Object.assign({}, params, {
-	    distanceAsc: 0,
-	    lat: uni.getStorageSync(USER_LATITUDE),
-	    lng: uni.getStorageSync(USER_LONGITUDE)
+	    // distanceAsc: 0,
+	    // lat: null,
+	    // lng: null
 	  })
   }
+
   // if (state.menuDefaultValue === 2) {
   //   params = Object.assign({}, params, {
   //     distanceAsc: 0,
@@ -161,20 +190,20 @@ function loadSelectMerchant(action: 'page' | 'reload', callback?: (items) => voi
   //     lng: uni.getStorageSync(USER_LONGITUDE)
   //   })
   // }
-
+  console.log('********')
   getSelectMerchant(params).then((res: StoreResult) => {
     // console.log(state.triggered)
 
     state.total = res.total
-    state.totalPage = Math.ceil(state.total / state.pageSize);
+    state.totalPage = Math.ceil(state.total / state.pageSize)
     // console.log(state.totalPage)
     // state.merchantList = res.list
-    if (action === 'page') {
+    if (action === 'page')
       state.merchantList = state.merchantList.concat(res.list)
-    }
-    if (action === 'reload') {
+
+    if (action === 'reload')
       state.merchantList = res.list
-    }
+
     // state.totalPage = Math.ceil(totalItems / state.pageSize);
     setTimeout(() => {
       state.triggered = false
@@ -182,20 +211,20 @@ function loadSelectMerchant(action: 'page' | 'reload', callback?: (items) => voi
 
     state.status = 'more'
 
-    if (callback) {
+    if (callback)
       callback(res.list)
-    }
+
+    console.log('数量', state.merchantList.length)
   })
 }
 
 function handleShowMerchant(merchant) {
   // console.log(merchant)
   uni.navigateTo({
-    url: '/pages/store/home/index?id=' + merchant.mer_id
+    url: `/pages/store/home/index?id=${merchant.mer_id}`,
   })
 }
 
-
 function change() {
 }
 
@@ -203,126 +232,126 @@ function onChange() {
 }
 
 // 下拉刷新被下拉
-const onRefresherPulling = e => {
-  state.triggered = true;
-};
+function onRefresherPulling(e) {
+  state.triggered = true
+}
 // 下拉刷新被复位
-const onRefresherRestore = e => {
-  state.triggered = false;
-};
+function onRefresherRestore(e) {
+  state.triggered = false
+}
 // 下拉刷新被中止
-const onRefresherAbort = e => {
-  state.triggered = false;
+function onRefresherAbort(e) {
+  state.triggered = false
 }
 // 下拉刷新被触发
-const onRefresherRefresh = e => {
-
+function onRefresherRefresh(e) {
+  state.currentPage = 1
   loadSelectMerchant('reload')
-};
+}
 
-//小火箭滚动事件
-const onscroll = e => {
+// 小火箭滚动事件
+function onscroll(e) {
   state.scrollTop = e.detail.scrollTop
 }
 
 function handleScrollToLower() {
-  state.status = 'loading';
-  state.currentPage += 1;
+  state.status = 'loading'
+  state.currentPage += 1
   if (state.currentPage > state.totalPage) {
-    state.status = 'noMore';
-  } else {
+    state.status = 'noMore'
+  }
+  else {
     // queryFavorites('page');
     loadSelectMerchant('page')
   }
 }
 
-//返回顶部事件
+// 返回顶部事件
 const scrollToTop = function () {
-  console.log('返回顶部');
+  console.log('返回顶部')
   state.scrollTop = 0
-
 }
-//监视
+// 监视
 watch(() => state.scrollTop, () => {
-  if (state.scrollTop as number > 400) {
+  if (state.scrollTop as number > 400)
     flag.value = true
-  }
-  if (state.scrollTop as number < 400) {
+
+  if (state.scrollTop as number < 400)
     flag.value = false
-  }
 })
 
-
-
+function searchAction() {
+  state.currentPage = 1
+  loadSelectMerchant('reload')
+}
 </script>
+
 <template>
-  <!--  <nut-category :category="state.merchantCategory" @change="change">-->
-  <!--    <nut-category-pane :categoryChild="state.merchantList" @onChange="onChange">-->
-  <!--    </nut-category-pane>-->
-  <!--  </nut-category>-->
+  <!--  <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 w-full">
-
-    <nut-searchbar v-model="searchValue" @search="loadSelectMerchant('reload')" @clear="loadSelectMerchant('reload')">
-      <template v-slot:rightout>
-        <div @tap="loadSelectMerchant('reload')">
+    <nut-searchbar v-model="searchValue" @search="searchAction()" @clear="searchAction()">
+      <template #rightout>
+        <div @tap="searchAction()">
           搜索
         </div>
       </template>
     </nut-searchbar>
-
-
   </div>
   <div class="flex pt-10 ">
     <!-- 左侧 一级分类 -->
     <div class="w-1/4">
-      <scroll-view ref="ToTop" :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">
+      <scroll-view
+        ref="ToTop" :scroll-y="true" :style="{ height: `${state.scrollHeight}px` }"
+        class="w-full h-full bg-[#f8f8f8]"
+      >
+        <div
+          :class="state.currentMerchantCategoryId == 0 ? 'bg-white font-bold' : ''" class="relative w-25 h-12 block text-sm flex justify-center items-center"
+          @tap="loadAll()"
+        >
           <div class="flex items-center gap-1">
-            <div class="h-4 bg-primary w-1" v-if="state.currentMerchantCategoryId == 0"></div>
+            <div v-if="state.currentMerchantCategoryId == 0" class="h-4 bg-primary w-1" />
             <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
+          v-for="(item, index) in state.merchantCategory" :key="index" :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"
+          @tap="handleCategoryChange(item)"
+        >
+          <div v-if="state.currentMerchantCategoryId == item.merchant_category_id" class="h-4 bg-primary w-1" />
 
           <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-item v-model="state.menuDefaultValue" :options="state.options" @change="loadSelectMerchant('reload')" />
         </nut-menu>
       </div>
       <!-- 返回顶部 -->
       <div v-show="flag" class="back-top">
-        <img @click="scrollToTop" class="back-TopImg" src="../../static/icon/返回顶部@2x.png" alt="">
+        <img class="back-TopImg" src="../../static/icon/返回顶部@2x.png" alt="" @click="scrollToTop">
       </div>
-      <scroll-view :scroll-y="true" :style="{ height: `${state.scrollHeight - 60}px` }" :scroll-top="state.scrollTop"
-        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"
-        @scroll="onscroll">
-        <div v-for="(item, index) in state.merchantList" :key="index" @click="handleShowMerchant(item)" class="mb-3 ">
+      <scroll-view
+        v-if="state.merchantList && state.merchantList.length > 0" :scroll-y="true" :style="{ height: `${state.scrollHeight - 60}px` }"
+        :scroll-top="state.scrollTop" 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"
+        :scroll-anchoring="true" @scrolltolower="handleScrollToLower" @refresherpulling="onRefresherPulling"
+        @refresherRestore="onRefresherRestore" @refresherAbort="onRefresherAbort"
+        @refresherrefresh="onRefresherRefresh" @scroll="onscroll"
+      >
+        <div v-for="(item, index) in state.merchantList" :key="index" class="mb-3 " @click="handleShowMerchant(item)">
           <div class="flex">
             <div class="flex ">
-              <image :src="item.mer_avatar" mode="aspectFill" class="w-20 h-20 rounded-lg"></image>
+              <image :src="item.mer_avatar" mode="aspectFill" class="w-20 h-20 rounded-lg" />
             </div>
 
             <div class="flex flex-col justify-between px-2">
@@ -335,9 +364,13 @@ watch(() => state.scrollTop, () => {
                 </div>
               </div>
 
-              <div class="text-xs">{{ (item.distance).toFixed(1) }}km</div>
+              <div v-if="item.distance" class="text-xs">
+                {{ (item.distance).toFixed(1) }}km
+              </div>
+              <div v-else class="text-xs">
+                0km
+              </div>
             </div>
-
           </div>
         </div>
         <div class=" flex justify-center items-center text-[12px] text-gray-500">
@@ -349,14 +382,13 @@ watch(() => state.scrollTop, () => {
           </div>
         </div>
       </scroll-view>
-      <div class="flex justify-center items-center w-full h-[60%]" v-else>
+      <div v-else class="flex justify-center items-center w-full h-[60%]">
         <CXBEmpty />
-
       </div>
     </div>
-
   </div>
 </template>
+
 <route lang="yaml">
 style:
   navigationBarTitleText: 储蓄保
@@ -398,4 +430,4 @@ page {
     border-radius: 4px;
   }
 }
-</style>
+</style>

src/pages/store/product/detail.vue

@@ -426,12 +426,13 @@ function handleCreateShopping() {
         isTo.value = 1
         uni.$emit('cart-reload')
         loadProductDetail()
-        uni.showToast({
-          title: '添加购物车成功',
-          icon: 'none'
-        })
+        
         loadCartCount()
         state.isShowSku = false
+		uni.showToast({
+		  title: '添加购物车成功',
+		  icon: 'none'
+		})
       }
     }
   }).catch(error => {

src/pages/store/product/other.vue

@@ -1,50 +1,53 @@
 <script setup lang="ts">
 // import mpHtml from 'mp-html/dist/uni-app/components/mp-html/mp-html'
+import { merge } from 'lodash-es'
+import dayjs from 'dayjs'
 import {
   getDyProductDetail,
-  getJdProductDetail,
   getJTTProductDetail,
-  getPddProductDetail, 
+  getJdProductDetail,
+  getPddProductDetail,
   getShareId,
   getSuProductDetail,
   getTaobaoProductDetail,
-  getVipProductDetail
-} from "~/apis/product";
-import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
-import MerchantProductCard from "~/pages/store/home/components/MerchantProductCard.vue";
+  getVipProductDetail,
+} from '~/apis/product'
+import CXBBasePage from '~/components/CXBBasePage/CXBBasePage.vue'
+import MerchantProductCard from '~/pages/store/home/components/MerchantProductCard.vue'
 import type {
   DyProductModel,
   IProductDetail,
   JdProductDetailModel,
-  
+
   JdProductModel,
   SuNingProductModel,
   TaobaoProductThirdPartyWaresModel,
   TaobaoWaresDetail,
-  VipProductModel
-} from "~/apis/model/product.model";
-import FPrice from "~/components/FPrice/FPrice.vue";
-import FButton from "~/components/FButton/FButton.vue";
-import CXBButton from "~/components/CXBButton/CXBButton.vue";
-import CXBBackTop from "~/components/CXBBackTop/CXBBackTop.vue";
-import { debounce, merge } from "lodash-es";
-
-import { useDebounceFn } from '@vueuse/core';
-import dayjs from "dayjs";
-import { decodeBase64, encodeBase64 } from "~/utils/http/helper";
-import { CDN_URL, CDM_URL } from "~/config/app";
-import { getRecommendList } from "~/apis/merchant";
-import type { DcProductModel } from "~/apis/model/dacang.model";
-
-const discount_coupon_bg_220804Image = CDN_URL + '/static/assets/discount_coupon_bg_220804.png'
+  VipProductModel,
+} from '~/apis/model/product.model'
+import FPrice from '~/components/FPrice/FPrice.vue'
+import CXBBackTop from '~/components/CXBBackTop/CXBBackTop.vue'
+
+import { decodeBase64, encodeBase64 } from '~/utils/http/helper'
+import { CDM_URL, CDN_URL } from '~/config/app'
+import { getRecommendList } from '~/apis/merchant'
+import type { DcProductModel } from '~/apis/model/dacang.model'
+
+const props = defineProps({
+  type: {
+    type: Number,
+    default: 0,
+  },
+})
+const discount_coupon_bg_220804Image = `${CDN_URL}/static/assets/discount_coupon_bg_220804.png`
 const productId = ref('')
-//推荐商品列表
-let skuInfo = reactive({
+// 推荐商品列表
+const skuInfo = reactive({
   recommendList: [],
   totalPage: 0,
   pageSize: 10,
   status: '',
-  currentPage: 1
+  currentPage: 1,
 })
 
 const userStore = useUserStore()
@@ -56,28 +59,20 @@ const coupon = ref({
   money: '',
   // 优惠券有效期
   startTime: '',
-  endTime: ''
+  endTime: '',
 })
 const productDetail = ref<JdProductDetailModel | TaobaoWaresDetail>()
 
-const props = defineProps({
-  type: {
-    type: Number,
-    default: 0
-  }
-})
-
 const state = reactive({
   data: {},
   shareId: '',
-  pddData: {}
+  pddData: {},
 })
 const isShow = ref(false)
 const detail = ref<IProductDetail>()
 const detailclone = ref<IProductDetail>()
 const isNeedAuth = ref(false)
 onLoad((options: any) => {
-
   const data: Partial<IProductDetail> = JSON.parse(decodeBase64(options.params))
   state.pddData = data
   // console.log('我是options数据', data)  url: `/pages/store/product/other?platform=${item.type}&id=${item.id}`
@@ -85,7 +80,7 @@ onLoad((options: any) => {
   // if (options.platform && options.id) {
   uni.showLoading({
     title: '数据加载中',
-    icon: 'none'
+    icon: 'none',
   })
   mergeProductDetail(data)
   loadProductDetail(data)
@@ -94,62 +89,59 @@ onLoad((options: any) => {
 
 onShow(() => {
   isSubmit.value = false
-  
-	console.log('onshow----')
-	if (isNeedAuth.value) {
-		console.log('从授权进来的。。。。')
-		loadProductDetail(state.pddData)
-		isNeedAuth.value = false
-	}
+
+  console.log('onshow----')
+  if (isNeedAuth.value) {
+    console.log('从授权进来的。。。。')
+    loadProductDetail(state.pddData)
+    isNeedAuth.value = false
+  }
 })
 
-//精品推荐
+// 精品推荐
 function YouLike() {
   getRecommendList({
     page: 1,
-    limit: 10
-  }).then(res => {
+    limit: 10,
+  }).then((res) => {
     skuInfo.recommendList = res.list
     // console.log(skuInfo.recommendList);
-
   })
 }
 
-//商品不存在详情
+// 商品不存在详情
 function soldOut() {
-	console.log('1')
-	console.log(userStore.uid)
+  console.log('1')
+  console.log(userStore.uid)
   if (userStore.uid) {
     isShow.value = true
-	console.log('2')
+    console.log('2')
     uni.setNavigationBarTitle({
-      title: '商品下架不存在'
+      title: '商品下架不存在',
     })
     loadList('reload')
     uni.hideLoading()
-  } else {
+  }
+  else {
 	  console.log('3')
     uni.showToast({
       title: '请登录',
-      icon: 'none'
+      icon: 'none',
     })
     setTimeout(() => {
       uni.redirectTo({
-        url: '/pages/user/login/index?key=4'
+        url: '/pages/user/login/index?key=4',
       })
     }, 500)
   }
-
 }
 
 function mergeProductDetail(data: Partial<IProductDetail> = {}) {
   detailclone.value = merge(detailclone.value, data)
-
 }
 function mergeProductDetailclone(data: Partial<IProductDetail> = {}) {
   detail.value = merge(detailclone.value, data)
   // console.log(detail.value);
-
 }
 
 function loadProductDetail(product: Partial<IProductDetail>) {
@@ -157,92 +149,90 @@ function loadProductDetail(product: Partial<IProductDetail>) {
 
   // 京东
   if (product.platform == 6) {
-	  
 	  if (userStore.uid) { // 已登录的
-		  getJdProductDetail(product.id).then(res => {
-		    console.log('京东商品详情',res);
-		    let { data, status } = res
-		    
+		  getJdProductDetail(product.id).then((res) => {
+		    console.log('京东商品详情', res)
+		    const { data, status } = res
+
 		    const jdProduct = data[0]
 		    // console.log(jdProduct)
 		    mergeProductDetailclone({
 		      images: jdProduct.detail,
 		      coupon: {
-		        amount: jdProduct.couMoney
+		        amount: jdProduct.couMoney,
 		      },
-		      ...jdProduct
+		      ...jdProduct,
 		    })
-		    
+
 		    uni.hideLoading()
-		})
-	  } else { // 未登录的
-		  getJTTProductDetail(product.id, 1).then(res => {
-		    console.log('京东商品详情',res);
-		    let { data, status } = res
-		    
+      })
+	  }
+    else { // 未登录的
+		  getJTTProductDetail(product.id, 1).then((res) => {
+		    console.log('京东商品详情', res)
+		    const { data, status } = res
+
 		    const jdProduct = data[0]
 		    // console.log(jdProduct)
 		    mergeProductDetailclone({
 		      images: jdProduct.detail,
 		      coupon: {
-		        amount: jdProduct.couMoney
+		        amount: jdProduct.couMoney,
 		      },
-		      ...jdProduct
+		      ...jdProduct,
 		    })
-		    
+
 		    uni.hideLoading()
-		})
+      })
 	  }
-    
-	  
-      // if (status === 200) {
-        
-      // } else {
-      //   soldOut()
-      // }
-    
+
+    // if (status === 200) {
+
+    // } else {
+    //   soldOut()
+    // }
   }
   // 淘宝 *
   if (product.platform === 5) {
-    getTaobaoProductDetail(product.id).then(res => {
+    getTaobaoProductDetail(product.id).then((res) => {
       // console.log('taobao>>>',res);
-      let { status, data } = res
+      const { status, data } = res
       if (status === 200) {
         const product = data.waresDetail
         mergeProductDetailclone({
           images: product.small_images,
           coupon: {
             startTime: product.couponStartTime,
-            endTime: product.couponEndTime
+            endTime: product.couponEndTime,
           },
-          ...product
+          ...product,
         })
         uni.hideLoading()
-      } else {
+      }
+      else {
         soldOut()
       }
-
-
     })
   }
 
   // 拼多多 *
   if (product.platform == 1) {
-    getPddProductDetail(product.id).then(res => {
-		console.log('res')
+    getPddProductDetail(product.id).then((res) => {
+      console.log('res')
       console.log(res)
 	  console.log()
-      let { status, data } = res
+      const { status, data } = res
       // detail.value = res
       if (status !== 200) {
         soldOut()
-      } else {
+      }
+      else {
         mergeProductDetailclone({
           spreadUrl: data.pddlink.url,
           images: data.goods_gallery_urls,
           featured: data.goods_gallery_urls,
           mallName: data.mall_name,
-          ...data
+          ...data,
           // allowance:
         })
 
@@ -251,27 +241,26 @@ function loadProductDetail(product: Partial<IProductDetail>) {
             coupon: {
               // amount: (res.extra_coupon_amount / 100).toString(),
               startTime: dayjs.unix(data.coupon_start_time).format('YYYY-MM-DD'),
-              endTime: dayjs.unix(data.coupon_end_time).format('YYYY-MM-DD')
+              endTime: dayjs.unix(data.coupon_end_time).format('YYYY-MM-DD'),
             },
           })
-        } else {
+        }
+        else {
           mergeProductDetailclone({
-            coupon: null
+            coupon: null,
           })
         }
 
         uni.hideLoading()
       }
-
-
     })
   }
 
   // 唯品会 *
   if (product.platform == 2) {
-    getVipProductDetail(product.id).then(res => {
+    getVipProductDetail(product.id).then((res) => {
       // console.log(res.result[0])
-      let { data, status } = res
+      const { data, status } = res
       if (status === 200) {
         const product = data.result[0]
         // detail.value = product
@@ -280,77 +269,74 @@ function loadProductDetail(product: Partial<IProductDetail>) {
           images: product.goodsDetailPictures,
           mallName: '唯品自营',
           ...product,
-          ...res
+          ...res,
         })
         if (product.couponInfo) {
           mergeProductDetailclone({
             coupon: {
               amount: product.couponInfo.activedAmount,
               startTime: product.couponInfo.useBeginTime,
-              endTime: product.couponInfo.useEndTime
-            }
+              endTime: product.couponInfo.useEndTime,
+            },
           })
         }
 
         uni.hideLoading()
-      } else {
+      }
+      else {
         soldOut()
       }
-
-
     })
   }
   // 苏宁 *
   if (product.platform == 3) {
-    getSuProductDetail(product.id).then(res => {
+    getSuProductDetail(product.id).then((res) => {
       // const product = res
-      let { status, data } = res
+      const { status, data } = res
       if (status === 200) {
         mergeProductDetailclone({
           images: data.detail,
-          ...data
+          ...data,
         })
 
         uni.hideLoading()
-
-      } else {
+      }
+      else {
         soldOut()
       }
-
     })
   }
   // 抖音 *
   if (product.platform == 9) {
-    getDyProductDetail(product.id).then(res => {
+    getDyProductDetail(product.id).then((res) => {
       console.log(res)
-      let { status, data } = res
+      const { status, data } = res
       if (status === 200) {
         mergeProductDetailclone({
           mallName: data.shopName,
           images: data.imgs,
-          ...data
+          ...data,
         })
 
         uni.hideLoading()
-      } else {
+      }
+      else {
         soldOut()
       }
-
-
     })
-
-
   }
 }
 
 function handleBuyNow() {
-  if (isSubmit.value) return
+  if (isSubmit.value)
+    return
   if (!userStore.uid) {
     isSubmit.value = true
 
     uni.navigateTo({
-      url: '/pages/user/login/index'
+      url: '/pages/user/login/index',
     })
+	return
   }
   if (detail.value?.platform) {
     // 京东
@@ -361,9 +347,9 @@ function handleBuyNow() {
         uni.navigateToMiniProgram({
           appId: 'wx91d27dbf599dff74',
           // path: 'pages/union/proxy/proxy?spreadUrl=' + encodeURIComponent(detail.value?.spreadUrl),
-          path: 'pages/union/proxy/proxy?spreadUrl=' + detail.value.materialUrl,
+          path: `pages/union/proxy/proxy?spreadUrl=${detail.value.materialUrl}`,
           extraData: {
-            foo: 'bar'
+            foo: 'bar',
           },
           envVersion: 'release',
           success(res) {
@@ -371,25 +357,26 @@ function handleBuyNow() {
             // console.log(res);
           },
           fail: (error) => {
-            console.log(error);
-          }
+            console.log(error)
+          },
         })
-      } else {
+      }
+      else {
         return uni.showToast({
           title: '跳转失败请重试',
-          icon: 'none'
+          icon: 'none',
         })
       }
-    } else if (detail.value?.platform == 1) {
+    }
+    else if (detail.value?.platform == 1) {
       console.log(detail.value)
-	  
+
 	  if (detail.value.pddlink.mobile_url.includes('mobile.yangkeduo')) {
 		  isNeedAuth.value = true
-		  
+
 		  console.log('需要授权')
 	  }
-	  
-	  
+
       const pddWx = detail.value.pddlink.wx
       if (pddWx) {
         uni.navigateToMiniProgram({
@@ -404,19 +391,20 @@ function handleBuyNow() {
             // console.log(res);
           },
           fail: (error) => {
-            console.log(error);
-          }
+            console.log(error)
+          },
         })
-
-      } else {
+      }
+      else {
         uni.showToast({
           title: '跳转失败请重试',
-          icon: 'none'
+          icon: 'none',
         })
       }
       // console.log(detail.value.pddlink)
       // console.log(pddWx)
-    } else {
+    }
+    else {
       /*      let platformName = ''
             let clipboardData = ''
             if (detail.value?.platform == 5) {
@@ -449,15 +437,16 @@ function handleBuyNow() {
                   icon: 'none'
                 })
               }
-            })*/
+            }) */
 
       // }
 	  if (detail.value?.platform == 6) {
-		  
-	  } else {
+
+	  }
+      else {
 		  return uni.showToast({
 		    title: '商品维护中，请稍后再试',
-		    icon: 'none'
+		    icon: 'none',
 		  })
 	  }
     }
@@ -471,48 +460,46 @@ function handleBuyNow() {
   }
   if (detail.value?.platform == 2) {
     console.log(detail.value)
-  }*/
+  } */
 
   onShareAppMessage(async () => {
     await uni.showLoading({
       title: '分享中',
-      icon: 'none'
+      icon: 'none',
     })
-    return await getShareId({ pid: state.id, type: 1 }).then(res => {
+    return await getShareId({ pid: state.id, type: 1 }).then((res) => {
       if (res) {
         state.shareId = res.share_id
         uni.hideLoading()
         return {
           title: `${detail.value.title}`,
-          path: `pages/store/product/detail?id=${detail.value.id}&from=share&shareID=${state.shareId}`
+          path: `pages/store/product/detail?id=${detail.value.id}&from=share&shareID=${state.shareId}`,
         }
       }
-    }).catch(error => {
+    }).catch((error) => {
       uni.showToast({
         title: '请登录后分享',
-        icon: 'none'
+        icon: 'none',
       }).then(() => {
         setTimeout(() => {
           uni.navigateTo({
-            url: '/pages/user/login/index'
+            url: '/pages/user/login/index',
           })
         }, 500)
       })
       uni.hideLoading()
     })
-
   })
 
   onShareTimeline(() => {
-
     if (!userStore.uid) {
       return uni.showToast({
         title: '请登录后分享',
-        icon: 'none'
+        icon: 'none',
       }).then(() => {
         setTimeout(() => {
           uni.navigateTo({
-            url: '/pages/user/login/index'
+            url: '/pages/user/login/index',
           })
         }, 500)
       })
@@ -521,11 +508,9 @@ function handleBuyNow() {
     return {
       title: `${detail.value.store_name}`,
       imageUrl: state.shareImage,
-      query: `id=${state.id}&from=share&shareID=${state.shareId}`
+      query: `id=${state.id}&from=share&shareID=${state.shareId}`,
     }
-
   })
-
 }
 
 /**
@@ -535,15 +520,15 @@ const hasCoupon = computed(() => {
   return detail.value?.coupon && detail.value?.coupon.startTime
 })
 
-//跳转大仓商品详情
+// 跳转大仓商品详情
 function handleProductItemClick(
   item:
-    JdProductModel
-    & DcProductModel
-    & DyProductModel
-    & SuNingProductModel
-    & TaobaoProductThirdPartyWaresModel
-    & VipProductModel
+  JdProductModel
+  & DcProductModel
+  & DyProductModel
+  & SuNingProductModel
+  & TaobaoProductThirdPartyWaresModel
+  & VipProductModel,
 ) {
   // function navigateToDetail(params) {
   //   let otherDetailUrl = `/pages/store/product/other`
@@ -553,19 +538,17 @@ function handleProductItemClick(
   // }
   // 大仓
   uni.navigateTo({
-    url: `/pages/store/product/detail?id=${item.product_id}`
+    url: `/pages/store/product/detail?id=${item.product_id}`,
   })
 }
 
 const outImg = computed(() => {
-  if (isShow) {
-    return CDM_URL + '/image/2023-11-24/20231124182002679.png'
-  }
-
+  if (isShow)
+    return `${CDM_URL}/image/2023-11-24/20231124182002679.png`
 })
 
 // 距离顶部距离
-let Scroll_X = ref(0)
+const Scroll_X = ref(0)
 
 const headerClass = ref('')
 onPageScroll((page) => {
@@ -573,50 +556,47 @@ onPageScroll((page) => {
 
   // console.log(page.scrollTop.toFixed(),'距离顶部的距离')
   Scroll_X.value = Number(page.scrollTop.toFixed())
-  if (page.scrollTop >= 76) {
+  if (page.scrollTop >= 76)
     headerClass.value = 'bg-white !text-gray-900'
-  } else {
+  else
     headerClass.value = ''
-  }
 })
 
-
-//列表加载
+// 列表加载
 function loadList(action: 'page' | 'reload', callback?: (items) => void) {
   const params = {
     page: skuInfo.currentPage,
-    limit: skuInfo.pageSize
+    limit: skuInfo.pageSize,
   }
 
-  if (action === 'reload') {
+  if (action === 'reload')
     params.page = 1
-  }
 
   getRecommendList({
-    ...params
-  }).then(res => {
-    if (action === 'page') {
+    ...params,
+  }).then((res) => {
+    if (action === 'page')
       skuInfo.recommendList = skuInfo.recommendList.concat(res.list)
-    }
+
     if (action === 'reload') {
       // state.list = state.list.concat(res.list)
       skuInfo.recommendList = res.list
     }
-    skuInfo.totalPage = Math.ceil(res.count / skuInfo.pageSize);
+    skuInfo.totalPage = Math.ceil(res.count / skuInfo.pageSize)
     skuInfo.status = 'more'
-    if (callback) {
+    if (callback)
       callback(res.list)
-    }
   })
 }
 
 function handleScrollToLower() {
-  skuInfo.status = 'loading';
-  skuInfo.currentPage += 1;
+  skuInfo.status = 'loading'
+  skuInfo.currentPage += 1
   // console.log(state.totalPage)
   if (skuInfo.currentPage > skuInfo.totalPage) {
-    skuInfo.status = 'noMore';
-  } else {
+    skuInfo.status = 'noMore'
+  }
+  else {
     setTimeout(() => {
       loadList('page')
     }, 300)
@@ -625,16 +605,16 @@ function handleScrollToLower() {
 
 onReachBottom(() => {
   handleScrollToLower()
-
 })
-
-
 </script>
+
 <template>
   <CXBBasePage>
-    <div class="relative w-screen " v-if="detail">
-      <swiper v-if="detail.featured" :indicator-dots="false" :circular="true" :autoplay="true" :interval="5000"
-        :duration="500" class="h-95">
+    <div v-if="detail" class="relative w-screen ">
+      <swiper
+        v-if="detail.featured" :indicator-dots="false" :circular="true" :autoplay="true" :interval="5000"
+        :duration="500" class="h-95"
+      >
         <swiper-item v-for="(item, index) in detail.featured" :key="index">
           <image :key="index" :src="item" mode="aspectFill" class="h-full w-full" />
         </swiper-item>
@@ -642,47 +622,60 @@ onReachBottom(() => {
       <div>
         <div class="relative p-3 bg-white">
           <div class="flex gap-2 items-end">
-            <FPrice v-if="detail && detail.salePrice" :price="detail.salePrice" need-symbol :size="'large'"
-              ex-class="!text-[24px]" />
-            <FPrice v-if="detail && detail.price" :price="detail.price" :ex-class="'!text-gray'" need-symbol
-              strike-through />
+            <FPrice
+              v-if="detail && detail.salePrice" :price="detail.salePrice" need-symbol size="large"
+              ex-class="!text-[24px]"
+            />
+            <FPrice
+              v-if="detail && detail.price" :price="detail.price" ex-class="!text-gray" need-symbol
+              strike-through
+            />
           </div>
 
-          <div class="font-bold py-2">{{ detail.title }}</div>
+          <div class="font-bold py-2">
+            {{ detail.title }}
+          </div>
         </div>
 
-        <div class="relative" v-if="hasCoupon">
+        <div v-if="hasCoupon" class="relative">
           <div class="px-3 relative" @tap="handleBuyNow">
-            <image lazy-load :src="discount_coupon_bg_220804Image" mode="widthFix" class="w-full"></image>
+            <image lazy-load :src="discount_coupon_bg_220804Image" mode="widthFix" class="w-full" />
             <div class="absolute top-2 left-15 h-full w-fit text-white">
               <div class=" inline-flex justify-center items-end w-full py-2">
-                <div class="text-[28px]">{{ detail.coupon.amount }}</div>
+                <div class="text-[28px]">
+                  {{ detail.coupon.amount }}
+                </div>
                 元代金劵
               </div>
-              <div class="text-[10px]">使用期限：{{ detail.coupon.startTime }} -{{ detail.coupon.endTime }}</div>
+              <div class="text-[10px]">
+                使用期限：{{ detail.coupon.startTime }} -{{ detail.coupon.endTime }}
+              </div>
             </div>
           </div>
-
         </div>
 
         <div class="relative pb-safe mt-3 bg-white">
           <div v-if="detail.mallName" class="p-3 font-bold">
             {{ detail.mallName }}
           </div>
-          <!--          <mpHtml :content=""></mpHtml>-->
-          <image v-for="(imgItem, index) in detail.images" :key="index" mode="widthFix" :src="imgItem"
-            class="w-full h-full"></image>
+          <!--          <mpHtml :content=""></mpHtml> -->
+          <image
+            v-for="(imgItem, index) in detail.images" :key="index" mode="widthFix" :src="imgItem"
+            class="w-full h-full"
+          />
         </div>
       </div>
       <div class="fixed bottom-0  w-full h-15 shadow">
         <div class="w-full bg-white pb-safe">
           <div class="flex justify-between items-center p-3">
             <div class="inline-flex items-center">
-              <div class="text-sm">预估养老金</div>
+              <div class="text-sm">
+                预估养老金
+              </div>
               <FPrice :price="detail.yanglao || detail.commission" need-symbol ex-class="text-[20px] font-bold" />
             </div>
             <div>
-              <nut-button type="primary" @tap="handleBuyNow" :disabled="isSubmit">
+              <nut-button type="primary" :disabled="isSubmit" @tap="handleBuyNow">
                 立即购买
               </nut-button>
             </div>
@@ -691,32 +684,32 @@ onReachBottom(() => {
       </div>
     </div>
     <!-- 商品下架展示 -->
-    <div class="relative w-screen " v-if="isShow">
-      <CXBBackTop :Scroll_X="Scroll_X" :isCss="1" />
+    <div v-if="isShow" class="relative w-screen ">
+      <CXBBackTop :Scroll_X="Scroll_X" :is-css="1" />
       <div class="box-out">
         <div class="flex-box pb-3 px-3 ">
           <div class="img-div">
-            <image lazy-load :src="outImg" mode="widthFix" class=" top-0 right-0 sold-out ">
-            </image>
+            <image lazy-load :src="outImg" mode="widthFix" class=" top-0 right-0 sold-out " />
+          </div>
+          <div class="out-conter">
+            该商品下架不存在
           </div>
-          <div class="out-conter">该商品下架不存在</div>
         </div>
-
       </div>
       <div class="flex flex-col pb-safe gap-3">
         <div class="p-3 bg-white">
           <div
-            class="before:content-[''] before:block before:absolute before:w-1 before:h-full before:bg-gradient-to-b from-red-500 to-red-600 before:rounded relative inline-block">
+            class="before:content-[''] before:block before:absolute before:w-1 before:h-full before:bg-gradient-to-b from-red-500 to-red-600 before:rounded relative inline-block"
+          >
             <div class="pl-2">
               精品推荐
             </div>
           </div>
         </div>
-        <div class="pb-3 px-3" v-if="skuInfo.recommendList.length != 0">
+        <div v-if="skuInfo.recommendList.length != 0" class="pb-3 px-3">
           <grid-view type="masonry" cross-axis-count="2" cross-axis-gap="10px" main-axis-gap="10px">
             <div v-for="(item, index) in skuInfo.recommendList" :key="index" @click="handleProductItemClick(item)">
               <MerchantProductCard :item="item" />
-
             </div>
           </grid-view>
           <div class=" flex justify-center items-center text-[12px] text-gray-500">
@@ -728,12 +721,11 @@ onReachBottom(() => {
             </div>
           </div>
         </div>
-
       </div>
     </div>
-
   </CXBBasePage>
 </template>
+
 <style scoped>
 .box-out {
   background: #f8f8f8;
@@ -765,8 +757,9 @@ onReachBottom(() => {
   text-align: center;
 }
 </style>
+
 <route lang="yaml">
 style:
   navigationBarTitleText: 商品详情
   enablePullDownRefresh: true
-</route>
+</route>

src/pages/user/index.vue

@@ -91,7 +91,7 @@ const myServiceList = [{
   url: '/pages/invite-friends/index'
 }, {
   icon: CDN_URL + '/static/assets/dianpuruzhu_220620.png',
-  text: userStore.userInfo?.is_merchant=="-1"?'商铺入驻':'我的商铺',
+  text: userStore.userInfo?.is_merchant=="-1"?'商铺入驻':'我的店铺',
   url: ''
 }, {
   icon: CDN_URL + '/static/assets/mine_setting_220620.png',
@@ -124,38 +124,36 @@ onShow(async () => {
   // pageStore.setPageConfig({
   //   orderBack: null
   // })
-  uni.showLoading({
-    title: '登录中',
-  })
+  // uni.showLoading({
+  //   title: '登录中',
+  // })
   // if (userStore.token ? )
+  
   if (uni.getStorageSync('UID')) {
     state.isLogin = true
-    // getUserInfo().then(userInfoResult => {
-    //   userStore.setUserInfo(userInfoResult)
-    // })
     uni.hideLoading()
     await userStore.getUserInfo()
     await userStore.getUserYanglaoJin()
     agentInfo.value = await getAgentInfo()
-    // console.log(agentInfo)
-    // await   loadProductDetail()
-    //
-    // getAgentInfo().then(res => {
-    //   console.log(res)
-    // })
-
-  } else {
-    uni.navigateTo({
-      url: '/pages/user/login/index?key=3'
-    })
-    userStore.setUserInfo(null)
   }
-
   totalOrderNumber().then(res => {
-    // console.log(res)
     orderQuantity.value = res
-    // orderQuantity
   })
+  
+  
+  // if (uni.getStorageSync('UID')) {
+  //   state.isLogin = true
+  //   uni.hideLoading()
+  //   await userStore.getUserInfo()
+  //   await userStore.getUserYanglaoJin()
+  //   agentInfo.value = await getAgentInfo()
+  // } else {
+  //   uni.navigateTo({
+  //     url: '/pages/user/login/index?key=3'
+  //   })
+  //   userStore.setUserInfo(null)
+  // }
+  
 })
 
 function checkAuth() {
@@ -181,23 +179,57 @@ function handleService(item: {
   text: string
   url: string
 }) {
-  if (item.text === '商铺入驻'||item.text === '我的店铺') {
-    return uni.navigateToMiniProgram({
-      appId: 'wx9a3e4ab07f8a9ba2',
-      path: 'pages/index/index',
-      success(res) {
-        // 打开成功
-        // console.log(res);
-      },
-      fail: (error) => {
-        console.log(error);
-      }
-    })
-  }
-  // if (item.text === '我的地址') {
-  uni.navigateTo({
-    url: item.url
-  })
+	
+	if (uni.getStorageSync('UID')) {
+		console.log('进来了1');
+		console.log(item.text);
+			
+		if (item.text === '商铺入驻'||item.text === '我的店铺') {
+			  
+			console.log('进来了2');
+			  
+			return uni.navigateToMiniProgram({
+				appId: 'wx9a3e4ab07f8a9ba2',
+				path: 'pages/index/index',
+				success(res) {
+				// 打开成功
+				console.log(res);
+				},
+				fail: (error) => {
+				console.log('error = ', error);
+				}
+			})
+		}
+		
+		uni.navigateTo({
+		  url: item.url
+		})
+	} else {
+		
+		if (item.text === '商铺入驻'||item.text === '我的店铺') {
+			return uni.navigateToMiniProgram({
+			  	appId: 'wx9a3e4ab07f8a9ba2',
+			  	path: 'pages/index/index',
+			  	success(res) {
+			  	// 打开成功
+			  	console.log(res);
+			  	},
+			  	fail: (error) => {
+			  	console.log('error = ', error);
+			  	}
+			})
+		
+		} else if (item.text === '设置') {
+			uni.navigateTo({
+			  url: item.url
+			})
+		} else {
+			uni.navigateTo({
+				url: '/pages/user/login/index?key=3'
+			})
+			userStore.setUserInfo(null)
+		}
+	}
 }
 
 
@@ -226,6 +258,7 @@ function handleShowMyIntegral() {
 }
 
 function handleShowMyAllOrder(tab?: number) {
+	
   if (tab <= 4) {
     uni.navigateTo({
       url: '/pages/order/index?tabIndex=' + tab
@@ -352,24 +385,36 @@ function handleToRedIntegral() {
 }
 
 function handleToContact(item) {
+	
+	
+	
   if (item.type === 'link') {
     return uni.navigateTo({
       url: item.url
     })
   }
+  
   if (item.type === 'customer') {
-    return uni.openCustomerServiceChat({
-      extInfo: {
-        url: 'https://work.weixin.qq.com/kfid/kfc8bd3f11a28aa81db'
-      },
-      corpId: 'wwaeb55681929a37ae',
-      success: (res => {
-        console.log(res)
-      }),
-      fail: (res => {
-        console.log(res)
-      })
-    })
+	  
+	  if (uni.getStorageSync('UID')) {
+		  return uni.openCustomerServiceChat({
+		    extInfo: {
+		      url: 'https://work.weixin.qq.com/kfid/kfc8bd3f11a28aa81db'
+		    },
+		    corpId: 'wwaeb55681929a37ae',
+		    success: (res => {
+		      console.log(res)
+		    }),
+		    fail: (res => {
+		      console.log(res)
+		    })
+		  })
+	  } else {
+		  uni.navigateTo({
+		  	url: '/pages/user/login/index?key=3'
+		  })
+		  userStore.setUserInfo(null)
+	  }
   }
 }
 
@@ -386,7 +431,7 @@ function handleShowMyRulePage() {
 }
 </script>
 <template>
-  <div v-if="state.isLogin" class="pb-safe">
+  <div  class="pb-safe">
     <div class="bg-[#FD1642] h-40 w-full absolute top-0 left-0"></div>
     <div class="flex flex-col gap-4 relative px-3 pb-safe">
       <div class="pt-15 ">
@@ -457,7 +502,7 @@ function handleShowMyRulePage() {
           </FPopup>
 
         </div>
-        <div style="border-radius: 16rpx;" class="bg-white flex flex-col gap-6 py-4 text-xl">
+        <div v-if="state.isLogin" style="border-radius: 16rpx;" class="bg-white flex flex-col gap-6 py-4 text-xl">
           <div v-if="userStore.userInfo" class="flex ">
             <div @tap="handleShowAnnuityDetail" class="w-1/2 flex flex-col justify-center" style="padding-left: 48rpx;">
               <div class="text-xs">养老金</div>

src/pages/user/login/index.vue

@@ -17,7 +17,8 @@ const userStore = useUserStore()
 const state = reactive({
   qrcode: '',
   uid: '',
-  key: ''
+  key: '',
+  isShow: false
 })
 onLoad((option: any) => {
   state.qrcode = option.type
@@ -28,6 +29,14 @@ onLoad((option: any) => {
 
 function getPhoneNumber(e) {
   // console.log(e)
+  console.log('2')
+  if (!state.isShow) {
+  	return 	uni.showToast({
+  				title: '请阅读并勾选隐私协议',
+  				icon: 'none'
+  			})
+  }
+  
   if (e.detail.errMsg === 'getPhoneNumber:ok') {
 
   }
@@ -40,6 +49,14 @@ function handleViewXieyi(type: number) {
 }
 
 async function handleWexinLogin() {
+	
+	if (!state.isShow) {
+		return 	uni.showToast({
+					title: '请阅读并勾选隐私协议',
+					icon: 'none'
+				})
+	}
+	
   await uni.showLoading({
     title: '登录中'
   });
@@ -188,6 +205,34 @@ function onClickLeft() {
   // })
 
 }
+
+function gou() {
+	state.isShow = !state.isShow
+}
+
+function otherPhoneLogin() {
+	
+	if (!state.isShow) {
+		return 	uni.showToast({
+					title: '请阅读并勾选隐私协议',
+					icon: 'none'
+				})
+	}
+	
+	uni.navigateTo({
+		url: '/pages/user/login/other-phone'
+	})
+}
+
+function phoneQuicklyLogin() {
+	if (!state.isShow) {
+		return 	uni.showToast({
+					title: '请阅读并勾选隐私协议',
+					icon: 'none'
+				})
+	}
+}
+
 </script>
 <template>
   <div>
@@ -211,24 +256,41 @@ function onClickLeft() {
         <div>一键登录</div>
       </div>
 
-      <CXBPhoneLoginButton :text="'手机号快捷登录'"/>
-<!--      <div class="text-xs text-gray flex flex-col justify-center items-center">-->
-<!--        <div>-->
-<!--          登录代表您同意<span class="text-red text-xs" @click="handleViewXieyi(2)">《注册协议》</span>和<span-->
-<!--            class="text-red text-xs" @click="handleViewXieyi(1)">《隐私协议》</span>-->
-<!--        </div>-->
-<!--      </div>-->
-      <navigator url="/pages/user/login/other-phone"
-          class="bg-white rounded-md py-3 gap-2 flex justify-center items-center text-sm">
-        <div>其他手机号登录</div>
-      </navigator>
+      
+	  <div v-if="state.isShow">
+		<CXBPhoneLoginButton :text="'手机号快捷登录'"/>
+	  </div>
+	  <div v-else>
+	  	<div
+	  	  class="bg-white border border-solid border-1 border-gray-300 rounded-md py-3 gap-2 flex justify-center items-center" @click="phoneQuicklyLogin">
+	  	  <image src="https://test.bjtdba.com/applet/static/home/4879edf0b6e2b0ad29fa7d4053d676b.png" mode="widthFix"
+	  	    class="w-4 h-4"></image>
+	  	  <button>手机号快捷登录</button>
+	  	</div>
+	  </div> 
+    
+	<div class="bg-white rounded-md py-3 gap-2 flex justify-center items-center text-sm" @click="otherPhoneLogin" >其他手机号登录</div>
+      
     </div>
 	
 	<div class="bg-white rounded-md py-3 gap-2 flex justify-center items-center text-sm" @click="onClickLeft">
 	  <div>暂不登录</div>
 	</div>
-    <CXBNotLoginButton :key="state.key"/>
-
+	<CXBNotLoginButton :key="state.key"/>
+	<view class="bottom-index flex flex-row justify-center items-center">
+		<view class="bottom-index-in mr-2">
+			<image src="https://cdn.bjtdba.com/vod/image/2024-02-29/20240229180900986.png"  style="width: 28rpx; height: 28rpx;" v-if="state.isShow"
+					@click="gou" mode="widthFix"></image>
+			<image src="https://cdn.bjtdba.com/vod/image/2024-02-29/20240229180930865.png"  style="width: 28rpx; height: 28rpx;" v-else
+				@click="gou" mode="widthFix"></image>
+		</view>
+		<view class="bottom-index-ri text-xs">
+			<span class="text-xs">我已经阅读并同意</span>
+				<span class="text-red text-xs" @click="handleViewXieyi(2)">《注册协议》</span>和<span
+	     class="text-red text-xs" @click="handleViewXieyi(1)">《隐私协议》</span>
+		</view>
+	
+	</view>
   </div>
 
 </template>
@@ -248,6 +310,10 @@ button {
   line-height: inherit;
 }
 
+.bottom-index-in {
+	margin-top: 2rpx;
+}
+
 button::after {
   border: none;
 }