feat: shareId 跳转

changelog.md

@@ -1,3 +1,4 @@
-- 产品详情页产品图片调整为1:1
-- 一键登录增加 Loding
-- 
+- FEAT 产品详情页产品图片调整为1:1
+- FEAT 一键登录增加 Loading
+- FIX 每日签到提醒，改变每日提醒一次
+- FIX SKU 默认选择问题

src/App.vue

@@ -2,9 +2,11 @@
 import { onLaunch, onShow, onHide, onReady } from "@dcloudio/uni-app";
 import {useAddressStore} from "~/stores/addressStore";
 import {useGlobalData} from "@uni-helper/uni-use";
+import {useUserStore} from "~/stores/userStore";
 const addressStore = useAddressStore()
 const that = this
 const privacyData = uni.getStorageSync('PRIVACY')
+const userStore = useUserStore()
 onLaunch(() => {
   console.log("App Launch");
   // that.globalData = {
@@ -13,7 +15,7 @@ onLaunch(() => {
   // }
   wx.getPrivacySetting({
     success(res) {
-      console.log('是否需要授权：', res.needAuthorization, '隐私协议的名称为：', res.privacyContractName);
+      // console.log('是否需要授权：', res.needAuthorization, '隐私协议的名称为：', res.privacyContractName);
       if (res.needAuthorization) {
         uni.setStorageSync('PRIVACY', { privacyContractName: res.privacyContractName, showPrivacy: true})
         // that.globalData.privacyContractName = res.privacyContractName
@@ -28,6 +30,22 @@ onLaunch(() => {
       }
     }
   });
+
+
+// #ifdef MP-WEIXIN
+  wx.onAppRoute((res) => {
+    // console.log('路由监听',res)
+    if (res.openType === 'switchTab') {
+      if (res.path === "pages/order_addcart/index") {
+
+      }
+      // console.log(res)
+      // #ifdef MP-WEIXIN
+      // wx.hideTabBar()
+      // #endif
+    }
+  })
+  // #endif
 });
 // useGlobalData()
 onShow(() => {

src/components/CXBPhoneLoginButton/CXBPhoneLoginButton.vue

@@ -35,6 +35,12 @@ function getPhoneNumber(e) {
           if (shareId) {
             params.share_id = shareId
           }
+
+          let redirectPageObj: {page: string, type: 'page' | 'tab'}
+          if (Cache.get('SHARE_REDIRECT_PAGE')) {
+            redirectPageObj = JSON.parse(Cache.get('SHARE_REDIRECT_PAGE'))
+          }
+
           // 手机号授权
           authAppletPhone({
             ...params
@@ -55,37 +61,50 @@ function getPhoneNumber(e) {
               // console.log('已绑定手机')
               // console.log(bindRes)
               Cache.clear('SHARE_ID')
-              // 跳转
-              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'
+              if (redirectPageObj) {
+                if (redirectPageObj.type === 'page') {
+                  return uni.redirectTo({
+                    url: redirectPageObj.page
                   })
-                  break;
-                default:
-                  uni.switchTab({
-                    url: '/pages/home/index'
+                }
+                if (redirectPageObj.type === 'tab') {
+                  return uni.switchTab({
+                    url: redirectPageObj.page
                   })
+                }
+              } else {
+                // 跳转
+                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'
+                    })
+                }
               }
             })
 

src/components/CXBSkuPopup/CXBSkuPopup.vue

@@ -8,6 +8,7 @@ import {PopupProps} from "~/components/FPopup";
 import {CLOSE_EVENT, OPEN_EVENT, UPDATE_SHOW_EVENT} from "~/components/constants";
 import CXBButton from "~/components/CXBButton/CXBButton.vue";
 import FButton from "~/components/FButton/FButton.vue";
+import {findLast} from "lodash-es";
 const emit = defineEmits()
 const props = defineProps({
   show: {
@@ -59,15 +60,19 @@ const skuList = computed(() => {
   if (props.detail && props.detail.sku) {
     for (let key in props.detail.sku) {
       const skuItem: SkuModel = props.detail.sku[key]
-      // if (skuItem.sku !== '') {
       skuData.push(skuItem)
-      // }
-      currentSku.value = skuData[0]
+      if (skuItem.unique === props.detail.unique) {
+        currentSku.value = skuItem
+      }
     }
   }
   return skuData
 })
 
+// currentSku.value = findLast(skuList, (item) => {
+//   return item.unique === props.detail.unique
+// })
+
 onMounted(() => {
   emit('selected:item', currentSku)
 

src/pages/annuity/index.vue

@@ -94,7 +94,7 @@ function handleToCitic() {
     path: 'pages/con_home/con_home?appId:280c3cc3ed1548a78435b1bd1c2cd559',
     success(res) {
       // 打开成功
-      console.log(res);
+      // console.log(res);
     },
     fail: (error) => {
       console.log(error);

src/pages/bangfuzhongxin/index.vue

@@ -124,7 +124,7 @@ function handleShowMyInvitation() {
               @tap="handleShowMyInvitation"
               class="w-1/3  flex flex-col justify-center items-center">
 <!--            <div>{{ userStore.userInfo.member_brokerage_price || '0.00' }}</div>-->
-            <div>{{ agentInfo.brokerage_price }}</div>
+            <div>{{ agentInfo.brokerage_price ? agentInfo.brokerage_price : '0'}}</div>
             <div class="text-sm">我的佣金</div>
           </div>
           <div class="w-1/3  flex flex-col justify-center items-center">

src/pages/guest_member_new/index.vue

@@ -51,7 +51,7 @@ function handleToShopApplet() {
     path: 'pages/index/index',
     success(res) {
       // 打开成功
-      console.log(res);
+      // console.log(res);
     },
     fail: (error) => {
       console.log(error);

src/pages/home/index.vue

@@ -221,7 +221,7 @@ function getIsShow(){
     },
     fail: function(res) {
       //没有执行过的话 先存一下当前的执行时间
-      console.log(res);
+      // console.log(res);
       state.isEject = 1
       // getApp().globalData.isEject = 0; //自定义要更改的变量 或者方法
       let today = new Date().toLocaleDateString();

src/pages/miaosha/index.vue

@@ -60,17 +60,18 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
         if (status3FilterList.length >= 3) {
           status3FilterList = orderBy(status3FilterList,  ['ctime'], ['desc'])
           console.log(status3FilterList)
-          state.list.push(status3FilterList[0])
+          state.list.push(...status3FilterList[0])
           console.log(state.list)
         } else {
-          state.list.push(status3FilterList)
+          state.list.push(...status3FilterList)
         }
         if (status2FilterList.length > 0) {
-          state.list.push(status2FilterList)
+          state.list.push(...status2FilterList)
         }
         if (status1FilterList.length > 0) {
-          state.list.push(status1FilterList)
+          state.list.push(...status1FilterList)
         }
+
         if (state.list.length > 0) {
           // list.value = orderBy(list.value, )
           currentSeckillDate.value = state.list[0].seckill_date
@@ -100,7 +101,7 @@ function handleItemClick(seckillItem) {
 <template>
   <CXBBasePage>
     <div
-        v-if="state.list.length > 0"
+        v-if="state.list && state.list.length > 0"
 
     >
       <scroll-view

src/pages/my-rules/index.vue

@@ -192,7 +192,7 @@ function handleToVipPage() {
             <div
                 @tap="handleShowMyInvitation"
                 class="w-1/3  flex flex-col justify-center items-center">
-              <div>{{ agentInfo.brokerage_price }}</div>
+              <div>{{ agentInfo.brokerage_price ? agentInfo.brokerage_price : '0' }}</div>
               <div class="text-xs">我的佣金</div>
             </div>
             <div

src/pages/order_addcart/index.vue

@@ -20,7 +20,7 @@ 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 userStore = useUserStore()
 
 const state = reactive({
   recommendList: [],
@@ -42,6 +42,13 @@ const state = reactive({
 
 const shopping = ref<ShoppingResult>()
 
+onBeforeMount(() => {
+  if (!userStore.uid) {
+    return uni.navigateTo({
+      url: '/user/login/index'
+    })
+  }
+})
 onLoad((options) => {
   uni.$on('cart-reload', () => {
     // console.log('新商品添加...')
@@ -53,12 +60,12 @@ onLoad((options) => {
   loadCartList()
 })
 onShow(() => {
-  pageStore.setPageConfig({
-    orderBack: {
-      type: 'tab',
-      url:  '/pages/order_addcart/index'
-    }
-  })
+  // pageStore.setPageConfig({
+  //   orderBack: {
+  //     type: 'tab',
+  //     url:  '/pages/order_addcart/index'
+  //   }
+  // })
   if (!state.isManage) {
     state.isManage = true
   }
@@ -113,8 +120,13 @@ onReachBottom(() => {
 
 // 加载购物车数据
 function loadCartList() {
+  uni.showLoading({
+    title: '加载中',
+    icon: 'none'
+  })
   // state.totalCartCount = 0
   getCartList().then(res => {
+    uni.hideLoading()
     shopping.value = res
 
     // console.log(res)
@@ -286,6 +298,13 @@ function handleSelectAll(checked: boolean) {
 
 }
 function loadCartCount() {
+  // pageStore.setPageConfig({
+  //   orderBack: {
+  //     type: 'tab',
+  //     url:  '/pages/order_addcart/index'
+  //   }
+  // })
+
   getCartCount().then(res => {
     // console.log(res)
     // state.cartCount = res[0].count
@@ -294,16 +313,11 @@ function loadCartCount() {
   }).catch(error => {
     // console.log(error)
     if (error === '请登录') {
-      // uni.showToast({
-      //   title: '请登录',
-      //   icon: 'none'
-      // })
       setTimeout(() => {
         uni.navigateTo({
-          url: '/pages/user/login/index?key=4'
+          url: '/pages/user/login/index'
         })
       }, 500)
-
     }
   })
 }

src/pages/red-integral/index.vue

@@ -51,37 +51,38 @@ onLoad((options) => {
 // })
 const userType = computed(() => {
   const userRichType = userStore.userInfo?.user_rich_type
+  const bangfu = userStore.userInfo.is_bangfu ? '帮扶中心 ' : ''
 
   // 创始人
   if (userRichType == 3) {
-    return '创始人'
+    return bangfu + '创始人'
   }
   // 普通用户
   if (userRichType == 0) {
-    return '用户'
+    return bangfu + '用户'
   }
   // 会员
   if (userRichType == 1) {
-    return '会员'
+    return bangfu + '会员'
   }
   if (userRichType == 3) {
-    return '创始人'
+    return bangfu + '创始人'
   }
   // 合伙人
   if (userRichType == 4) {
-    return 'VIP'
+    return bangfu + 'VIP'
   }
   if (userRichType == 5) {
-    return '初始级合伙人'
+    return bangfu + '初始级合伙人'
   }
   if (userRichType == 6) {
-    return '中级合伙人'
+    return bangfu + '中级合伙人'
   }
   if (userRichType == 7) {
-    return '高级合伙人'
+    return bangfu + '高级合伙人'
   }
   if (!userRichType) {
-    return '用户'
+    return bangfu + '用户'
   }
 })
 

src/pages/store/home/index.vue

@@ -300,7 +300,7 @@ function handleScrollToLower() {
 }
 
 onReachBottom(() => {
-  console.log('到底了。。。')
+  // console.log('到底了。。。')
 
   handleScrollToLower()
 

src/pages/store/nearby/index.vue

@@ -71,7 +71,6 @@ onLoad((option) => {
   })
   userStore.setRedirectPage(`/pages/store/nearby/index`, 'tab')
 
-
   // loadSelectMerchant('reload')
 })
 onShareAppMessage(() => {
@@ -103,6 +102,8 @@ onShow(() => {
       url:  '/pages/store/nearby/index'
     }
   })
+  // console.log('onshow...')
+  loadSelectMerchant('reload')
 
 })
 
@@ -112,7 +113,7 @@ function loadAll() {
 }
 
 function handleCategoryChange(category) {
-  console.log(category)
+  // console.log(category)
   state.currentMerchantCategoryId = category.merchant_category_id
   // console.log(category)
   // loadSelectMerchant()
@@ -148,11 +149,11 @@ function loadSelectMerchant(action: 'page' | 'reload', callback?: (items) => voi
   }
 
   getSelectMerchant(params).then((res: StoreResult) => {
-    console.log(state.triggered)
+    // console.log(state.triggered)
 
     state.total = res.total
     state.totalPage = Math.ceil(state.total / state.pageSize);
-    console.log(state.totalPage)
+    // console.log(state.totalPage)
     // state.merchantList = res.list
     if (action === 'page') {
       state.merchantList = state.merchantList.concat(res.list)
@@ -174,7 +175,7 @@ function loadSelectMerchant(action: 'page' | 'reload', callback?: (items) => voi
 }
 
 function handleShowMerchant(merchant) {
-  console.log(merchant)
+  // console.log(merchant)
   uni.navigateTo({
     url: '/pages/store/home/index?id=' + merchant.mer_id
   })

src/pages/store/product/detail.vue

@@ -94,7 +94,11 @@ onLoad((option: any) => {
   // if (state.shareId) {
   if (fromShareId) {
     userStore.setShareId(fromShareId)
+
+    userStore.setRedirectPage(`/pages/store/product/detail?id=${state.id}&from=share&shareID=${fromShareId}`, 'page')
+
   }
+
   // }
   getRecommendList({
     page: 1,
@@ -105,7 +109,8 @@ onLoad((option: any) => {
 
   getShareId({ pid: state.id, type: 1}).then(res => {
     state.shareId = res.share_id
-    userStore.setRedirectPage(`/pages/store/product/detail?id=${state.id}&from=share&shareID=${state.shareId}`)
+    userStore.setRedirectPage(`/pages/store/product/detail?id=${state.id}&from=share&shareID=${state.shareId}`, 'page')
+
   })
 
 })
@@ -153,7 +158,7 @@ onShareAppMessage(async () => {
     title: '分享中',
     icon: 'none'
   })
-  return 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()
@@ -547,8 +552,12 @@ function handleShowCustomer() {
         </div>
 
         <div class="flex flex-col gap-2">
-          <div class="flex font-bold" v-if="detail && detail.store_name">
-            {{ detail.store_name }}
+          <div class="flex font-bold flex items-center gap-1" v-if="detail && detail.store_name">
+           <div class="flex bg-primary text-white rounded text-[10px] text-center">
+             <div class=" h-4 w-4 ">仓</div></div>
+            <div class=" justify-center items-center">
+              {{ detail.store_name }}
+            </div>
           </div>
           <div
               v-if="detail.store_info"

src/pages/store/product/other.vue

@@ -223,7 +223,7 @@ function handleBuyNow() {
           envVersion: 'release',
           success(res) {
             // 打开成功
-            console.log(res);
+            // console.log(res);
           },
           fail: (error) => {
             console.log(error);
@@ -248,7 +248,7 @@ function handleBuyNow() {
           envVersion: 'release',
           success(res) {
             // 打开成功
-            console.log(res);
+            // console.log(res);
           },
           fail: (error) => {
             console.log(error);
@@ -264,8 +264,7 @@ function handleBuyNow() {
       // console.log(detail.value.pddlink)
       // console.log(pddWx)
     } else {
-      console.log(detail.value?.platform)
-      let platformName = ''
+/*      let platformName = ''
       let clipboardData = ''
       if (detail.value?.platform == 5) {
         platformName = '淘宝'
@@ -283,8 +282,6 @@ function handleBuyNow() {
         platformName = '苏宁易购'
         clipboardData = detail.value?.productUrlWap
       }
-      // if (detail.value?.platform === 5) {
-      console.log(detail.value)
       return uni.setClipboardData({
         data: clipboardData,
         success(res) {
@@ -299,13 +296,13 @@ function handleBuyNow() {
             icon: 'none'
           })
         }
-      })
+      })*/
 
       // }
-      // return uni.showToast({
-      //   title: '商品维护中，请稍后再试',
-      //   icon: 'none'
-      // })
+      return uni.showToast({
+        title: '商品维护中，请稍后再试',
+        icon: 'none'
+      })
     }
   }
   /*

src/pages/user/index.vue

@@ -179,7 +179,7 @@ function handleService(item: {
       path: 'pages/index/index',
       success(res) {
         // 打开成功
-        console.log(res);
+        // console.log(res);
       },
       fail: (error) => {
         console.log(error);
@@ -234,38 +234,39 @@ function handleShowMyAllOrder(tab?: number) {
 
 const userType = computed(() => {
   const userRichType = userStore.userInfo?.user_rich_type
-
+  console.log(userStore.userInfo)
+  const bangfu = userStore.userInfo.is_bangfu ? '帮扶中心 ' : ''
   // 创始人
   if (userRichType == 3) {
-    return '创始人'
+    return bangfu + '创始人'
   }
   // 普通用户
   if (userRichType == 0) {
-    return '用户'
+    return bangfu + '用户'
   }
   // 会员
   if (userRichType == 1) {
-    return '会员'
+    return bangfu + '会员'
   }
   if (userRichType == 3) {
-    return '创始人'
+    return bangfu + '创始人'
   }
   // 合伙人
   if (userRichType == 4) {
     // return '高级会员'
-    return 'VIP'
+    return bangfu + 'VIP'
   }
   if (userRichType == 5) {
-    return '初始级合伙人'
+    return bangfu + '初始级合伙人'
   }
   if (userRichType == 6) {
-    return '中级合伙人'
+    return bangfu + '中级合伙人'
   }
   if (userRichType == 7) {
-    return '高级合伙人'
+    return bangfu + '高级合伙人'
   }
   if (!userRichType) {
-    return '用户'
+    return bangfu + '用户'
   }
 })
 

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

@@ -127,12 +127,28 @@ function handleLogin() {
     })
     Cache.clear('SHARE_ID')
     state.isAuthVerify = false
-
+    let redirectPageObj: {page: string, type: 'page' | 'tab'}
+    if (Cache.get('SHARE_REDIRECT_PAGE')) {
+      redirectPageObj = JSON.parse(Cache.get('SHARE_REDIRECT_PAGE'))
+    }
     setTimeout(() => {
-      uni.switchTab({
-        url: '/pages/home/index'
-      })
-    }, 500)
+      if (redirectPageObj) {
+        if (redirectPageObj.type === 'page') {
+          return uni.redirectTo({
+            url: redirectPageObj.page
+          })
+        }
+        if (redirectPageObj.type === 'tab') {
+          return uni.switchTab({
+            url: redirectPageObj.page
+          })
+        }
+      } else {
+        uni.switchTab({
+          url: '/pages/home/index'
+        })
+      }
+    }, 200)
 
 
   }).catch((errorMsg) => {