feat: 登录跳转路径调整

src/components/CXBPhoneLoginButton/CXBPhoneLoginButton.vue

@@ -13,9 +13,10 @@ const props = defineProps({
   }
 })
 function getPhoneNumber(e) {
-  // console.log(e.detail)
-  // console.log(e)
+  console.log('get phone....')
+  console.log(e)
   if (e.detail.errMsg === 'getPhoneNumber:ok') {
+    
     uni.login({
       provider: 'weixin',
       success: result => {
@@ -45,10 +46,12 @@ function getPhoneNumber(e) {
           authAppletPhone({
             ...params
           }).then(authRes => {
+            console.log(authRes)
             userStore.login(authRes.token, authRes.exp)
             userStore.setUID(authRes.user.uid)
             userStore.setUserInfo(authRes.user)
 
+            console.log(authRes)
             // 绑定手机号
             bindPhone({
               phone: authRes.user.account,

src/pages/article/detail.vue

@@ -7,7 +7,7 @@ const article: Ref<ArticleModel | undefined> = ref<ArticleModel>()
 onLoad((option: any) => {
   if (option.article_id) {
     getArticleDetail(option.article_id).then(res => {
-      console.log(res)
+      // console.log(res)
       uni.setNavigationBarTitle({
         title: res.title
       })

src/pages/bangfuzhongxin/index.vue

@@ -67,7 +67,7 @@ function encodePhone(phone: string) {
 
 function handleApplyBangFu() {
   applyBangFu().then(res => {
-    console.log(res)
+    // console.log(res)
   }).catch(error => {
     uni.showToast({
       title: error,

src/pages/feedback/index.vue

@@ -88,7 +88,7 @@ const currentTypeId = ref('')
 const feedbackTypes = ref([])
 onLoad(() => {
   getFeedbackType().then(res => {
-    console.log(res)
+    // console.log(res)
     feedbackTypes.value = res
     formData.type = res[0].feedback_category_id
     currentTypeId.value = res[0].feedback_category_id

src/pages/home/index.vue

@@ -97,6 +97,7 @@ function checkSignIn() {
   // }
 }
 onLoad((option) => {
+  console.log(option)
   if (option && option.shareId) {
     userStore.setShareId(option.shareId)
   }
@@ -118,6 +119,7 @@ onLoad((option) => {
   loadProductList()
 
   getProductShare().then(res => {
+    // console.log(res)
     if (res) {
       userStore.setShareId(res.share_id)
     }

src/pages/invite-friends/index.vue

@@ -164,7 +164,7 @@ function handleItemClick(item) {
     uid: userStore.uid,
     imgId: item.id
   }).then(res => {
-    console.log(res)
+    // console.log(res)
     if (res && res.shareImgs) {
       state.currentImg = res.shareImgs
     }

src/pages/invite-partners/index.vue

@@ -23,7 +23,7 @@ onLoad(() => {
   }).then(res => {
     if (res) {
       invitePartnerModel.value = res
-      console.log(res)
+      // console.log(res)
     }
   })
 })
@@ -38,7 +38,7 @@ function handleSearch() {
   }).then(res => {
     if (res) {
       invitePartnerModel.value = res
-      console.log(res)
+      // console.log(res)
     }
   })
 }

src/pages/miaosha/index.vue

@@ -43,7 +43,7 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
   }).then( res => {
     if (action === 'reload') {
       if (res && res.length > 0) {
-        console.log(res)
+        // console.log(res)
         const resList = res
         // const status3List = orderBy(list.value, (val) => {
         //   return val.status == 3

src/pages/my-integral/index.vue

@@ -26,10 +26,10 @@ onShow(() => {
 function loadSignInInfo() {
   // 2 检查用户签到信息
   getNewSignInInfo().then(res => {
-    console.log(res)
+    // console.log(res)
     const {today, day} = res
     state.signToday = today
-    console.log(res)
+    // console.log(res)
     if (today == 0) {
       state.isShowSignIn = true
     }

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

@@ -28,7 +28,7 @@ onLoad(() => {
   }).then(res => {
     if (res) {
       invitePartnerModel.value = res
-      console.log(res)
+      // console.log(res)
     }
   })
 

src/pages/my-invitation/index.vue

@@ -44,14 +44,14 @@ const userInviteProfit = reactive({
 onLoad(() => {
   console.log('load...')
   getSelectUserInviteProfit({ uid: userStore.uid }).then(res => {
-    console.log(res)
+    // console.log(res)
     const inviteData = res.data
     userInviteProfit.numberSun = res.numberSun
     userInviteProfit.UserUnsettledInviteProfit = res.UserUnsettledInviteProfit
     userInviteProfit.UserYesterdayInviteProfit = res.UserYesterdayInviteProfit
   })
   getAgentInfo().then(res => {
-    console.log(res)
+    // console.log(res)
     if (res) {
       data.value = res
     }

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

@@ -16,7 +16,7 @@ function loadMyRelationMerchantList(keywords = '') {
     keywords,
   }).then(res => {
     if (res) {
-      console.log(res)
+      // console.log(res)
       list.value = res.list
     }
   })

src/pages/order-confirm/index.vue

@@ -73,7 +73,7 @@ onLoad(async (options) => {
   // console.log(addressStore.address)
   /// 查看用户VIP信息
   getUserVipInfo().then(res => {
-    console.log(res)
+    // console.log(res)
     data.vipType = res.da_type
   })
   /// 检查商品
@@ -89,7 +89,7 @@ onLoad(async (options) => {
     cart_id: data.cartId.split(','),
     address_id: data.addressId
   }).then(res => {
-    console.log(res)
+    // console.log(res)
     data.is_dacang_vip_product = res.is_dacang_vip_product
     data.cartOrder = res.order
     data.totalPrice = res.order_price
@@ -173,7 +173,7 @@ function payment(createOrderData: CreateOrderRequest) {
     orderCreate(createOrderData).then(res => {
       if (res) {
         uni.hideLoading()
-        console.log(res)
+        // console.log(res)
         // uni.navigateTo({
         //   url: '/pages/payment/success'
         // })
@@ -202,9 +202,9 @@ function payment(createOrderData: CreateOrderRequest) {
   } else {
     orderCreate(createOrderData).then(res => {
       if (res) {
-        console.log(res)
+        // console.log(res)
         // console.log('order_create')
-        console.log(res)
+        // console.log(res)
         uni.hideLoading()
         uni.navigateTo({
           //   // url: '/pages/payment/index?' + `cardId=${data.cartId}&type=1&product_id=${data.productId}`

src/pages/order/components/AllItemList.vue

@@ -35,7 +35,7 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     page: state.currentPage,
     limit: state.pageSize
   }).then(res => {
-    console.log(res)
+    // console.log(res)
     if (action === 'page') {
       state.list = state.list.concat(res.list)
     }

src/pages/order/components/Order2List.vue

@@ -33,7 +33,7 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     limit: state.pageSize,
     status: props.status,
   }).then(res => {
-    console.log(res)
+    // console.log(res)
     if (action === 'page') {
       state.list = state.list.concat(res.list)
     }

src/pages/order/components/Order3List.vue

@@ -33,7 +33,7 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     limit: state.pageSize,
     status: props.status,
   }).then(res => {
-    console.log(res)
+    // console.log(res)
     if (action === 'page') {
       state.list = state.list.concat(res.list)
     }

src/pages/order/components/Order4List.vue

@@ -33,7 +33,7 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     limit: state.pageSize,
     status: props.status,
   }).then(res => {
-    console.log(res)
+    // console.log(res)
     if (action === 'page') {
       state.list = state.list.concat(res.list)
     }

src/pages/order/index.vue

@@ -49,7 +49,9 @@ 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";
+import {useUserStore} from "~/stores/userStore";
 const pageStore = usePageStoreWidthOut()
+const userStore = useUserStore()
 
 
 const state = reactive({
@@ -78,12 +80,22 @@ const getStatusVal = () => {
   }
 }
 onLoad(options => {
-  console.log(options)
-  if (options && options.tabIndex) {
-    state.tabvalue = options.tabIndex
-  }
-  if (options && options.from) {
-    state.from = options.from
+  // console.log(options)
+  if (uni.getStorageSync('UID')) {
+    if (options && options.tabIndex) {
+      state.tabvalue = options.tabIndex
+    }
+    if (options && options.from) {
+      state.from = options.from
+    }
+  } else {
+    // uni.navigateTo({})
+    userStore.setRedirectPage(`/pages/order/index`, "page");
+    setTimeout(() => {
+      uni.navigateTo({
+        url: '/pages/user/login/index'
+      })
+    })
   }
   // loadAllOrderList()
 

src/pages/order/logistics.vue

@@ -32,7 +32,7 @@ onLoad((options) => {
   if (options && options.id) {
   getLogistics(options.id).then(res => {
   // getLogistics(4127).then(res => {
-    console.log(res)
+  //   console.log(res)
     if (res && res.order) {
       state.orderDetail = res.order
     }

src/pages/order_addcart/index-bak.vue

@@ -100,7 +100,7 @@ function loadCartList() {
   getCartList().then(res => {
     shopping.value = res
 
-    console.log(res)
+    // console.log(res)
     shopping.value?.list.forEach((shopItem, index) => {
       // shopItem.allCheck = true
 

src/pages/order_addcart/index-new.vue

@@ -97,7 +97,7 @@ function loadCartList() {
   getCartList().then(res => {
     shopping.value = res
 
-    console.log(res)
+    // console.log(res)
     shopping.value?.list.forEach((shopItem, index) => {
       // shopItem.allCheck = true
       shopItem.indeterminate = false

src/pages/order_addcart/index.vue

@@ -44,6 +44,8 @@ const shopping = ref<ShoppingResult>()
 
 onBeforeMount(() => {
   if (!userStore.uid) {
+    userStore.setRedirectPage(`/pages/user/index`, "tab");
+
     return uni.navigateTo({
       url: '/user/login/index'
     })

src/pages/pension_record/list.vue

@@ -39,7 +39,7 @@ function _load01List(action: 'reload' | 'page', params: {
     source: params.source
   }).then(res => {
     // list.value = res.list
-    console.log(res)
+    // console.log(res)
     if (res && res.list) {
       if (action === 'page') {
         // state.list = res.list

src/pages/red-integral/index.vue

@@ -11,7 +11,7 @@ const data = ref([])
 onLoad((options) => {
   userStore.getUserInfo()
   getRedIntegralList({page: 1, limit: 20}).then(res => {
-    console.log(res)
+    // console.log(res)
     if (res && res.length > 0) {
       for (let item of res) {
         // data.value = res

src/pages/revenue-sharing/index.vue

@@ -42,14 +42,14 @@ const state = reactive({
 onLoad((option: any) => {
   // 未结算收益
   getSelectUserInviteProfit({uid: userStore.uid}).then(res => {
-    console.log(res)
+    // console.log(res)
     state.numberSun = res.numberSun
     state.UserUnsettledInviteProfit = res.UserUnsettledInviteProfit ? res.UserUnsettledInviteProfit : '0.00'
     state.UserYesterdayInviteProfit = res.UserUnsettledInviteProfit ? res.UserUnsettledInviteProfit : '0.00'
   })
 
   getAgentInfo().then(res => {
-    console.log(res)
+    // console.log(res)
     state.nickname = res.nickname
     state.avatar = res.avatar
     state.brokerage_price = res.brokerage_price

src/pages/store/product/detail.vue

@@ -18,6 +18,7 @@ import {CDN_URL} from "~/config/app";
 import dayjs from "dayjs";
 import {getShareId} from "~/apis/product";
 import {debounce} from "lodash-es";
+import {getUrlParams} from "~/utils";
 
 const usePageStore = usePageStoreWidthOut()
 
@@ -35,6 +36,7 @@ const state = reactive({
   id: '',
   // 推荐人绑定id
   shareId: '',
+  shareCover: '',
   // 是否收藏
   isRelation: false,
   indicatorDots: true,
@@ -88,8 +90,14 @@ uni.showShareMenu({
 onLoad((option: any) => {
   // const id = '4858'
   state.id = option.id
+  let fromShareId = option.shareID
+
+  if (option && option.scene) {
+    const sceneValue = getUrlParams(decodeURIComponent(option.scene))
+    state.id = sceneValue.id
+    fromShareId = sceneValue.shareID
+  }
   // state.id = 4858
-  const fromShareId = option.shareID
   // console.log(fromShareId + '---share_id...')
   // if (state.shareId) {
   if (fromShareId) {
@@ -108,7 +116,9 @@ onLoad((option: any) => {
   })
 
   getShareId({ pid: state.id, type: 1}).then(res => {
+    console.log(res)
     state.shareId = res.share_id
+    state.shareCover = res.url
     userStore.setRedirectPage(`/pages/store/product/detail?id=${state.id}&from=share&shareID=${state.shareId}`, 'page')
 
   })
@@ -164,6 +174,7 @@ onShareAppMessage(async () => {
       uni.hideLoading()
       return {
         title: `${detail.value.store_name}`,
+        imageUrl: `${res.url}`,
         path: `pages/store/product/detail?id=${state.id}&from=share&shareID=${state.shareId}`
       }
     }
@@ -210,7 +221,7 @@ onShareTimeline(() => {
 function loadCartCount() {
   state.cartCount = NaN
   getCartCount().then(res => {
-    console.log(res)
+    // console.log(res)
     state.cartCount = res[0].count
   }).catch(error => {
     console.log(error)
@@ -258,7 +269,7 @@ function previewImage(index: number) {
 
 function handleShowMerchant(merId: string) {
 
-  console.log(merId)
+  // console.log(merId)
   uni.navigateTo({
     url: `/pages/store/home/index?id=${merId}`
   })
@@ -335,6 +346,13 @@ function handleCreateShopping() {
  * @param flag //1表示立即购买;2表示加入购物车,3表示立即兑换
  */
 function handleOrderConfirm(flag: '1' | '2'| '3') {
+  console.log(detail.value.seckill)
+  if (detail.value.seckill == 1 && detail.value.seckill_s !== 1) {
+    return uni.showToast({
+      title: '秒杀未开始',
+      icon: 'none'
+    })
+  }
   debounce(() => {
     if (!userStore.uid) {
       return uni.showToast({
@@ -449,10 +467,10 @@ function handleShowCustomer() {
     },
     corpId: 'wwaeb55681929a37ae',
     success: (res => {
-      console.log(res)
+      // console.log(res)
     }),
     fail: (res => {
-      console.log(res)
+      // console.log(res)
     })
   })
 }
@@ -483,7 +501,7 @@ function handleShowCustomer() {
         <div class="flex flex-col">
           <div class="flex gap-2 items-center text-white">
             <div class="text-[30px] font-bold">
-              <text class="text-[20px]">￥</text>{{ detail.price }}
+              <text class="text-[20px]">￥</text>{{ detail.dc_price }}
             </div>
             <image :src="miaoshaIcon" mode="widthFix" class="w-10"></image>
           </div>
@@ -522,7 +540,9 @@ function handleShowCustomer() {
       <div
           class="flex flex-col p-3 gap-3"
       >
-        <div class="flex flex-row  items-center text-[#FE0032] font-bold text-lg gap-2">
+        <div class="flex flex-row  items-center text-[#FE0032] font-bold text-lg gap-2"
+             v-if="detail.seckill == 0"
+        >
           <div v-if="is148Merchant && detail.price" class="flex justify-end items-end gap-2">
             <div class="!text-[24px]">{{ Number.parseFloat(detail.price).toFixed(2) }} </div>
             <div class="text-sm">积分</div>
@@ -544,7 +564,7 @@ function handleShowCustomer() {
             class="border border-solid border-1 border-red rounded flex text-xs items-center text-[#FE0032] w-fit">
           <image src="https://cdn.bjtdba.com/vod/image/2023-09-15/20230915160858609.png"
                  mode="widthFix" class="!w-8 h-4"></image>
-          <div class="px-2 flex items-center jusitify-center" v-if="detail.yanglao">
+          <div class="px-2 flex items-center jusitify-center" v-if="detail">
             <div>
               养老金 ¥{{ detail.yanglao }}
             </div>
@@ -732,7 +752,16 @@ function handleShowCustomer() {
           <div class="text-[11px]">购物车</div>
         </div>
       </div>
-      <div class="flex flex-row text-sm text-white gap-2 pr-3">
+      <div class="flex flex-1 flex-row text-sm text-white px-4" v-if="detail.seckill == 1">
+        <div
+            class="bg-[#F94032] rounded-full w-full  flex justify-center items-center h-9"
+        >
+          <div
+              @click="handleOrderConfirm('1')"
+          >立即抢购</div>
+        </div>
+      </div>
+      <div class="flex flex-row text-sm text-white gap-2 pr-3" v-else>
         <div
             @tap="handleAddCart"
             v-if="!is148Merchant"

src/pages/store/product/other.vue

@@ -189,7 +189,7 @@ function loadProductDetail(product: Partial<IProductDetail>) {
   // 抖音
   if (product.platform == 9) {
     getDyProductDetail(product.id).then(res => {
-      console.log(res)
+      // console.log(res)
       mergeProductDetail({
         mallName: res.shopName,
         images: res.imgs,

src/pages/user/address/create.vue

@@ -475,7 +475,7 @@ export default {
           addressNewCreate({
             ...formValue
           }).then(res => {
-            console.log(res)
+            // console.log(res)
             if (res) {
               uni.showToast({
                 title: '保存成功'

src/pages/user/index.vue

@@ -137,6 +137,8 @@ onShow(async () => {
     // })
 
   } else {
+    userStore.setRedirectPage(`/pages/user/index`, "tab");
+
     uni.navigateTo({
       url: '/pages/user/login/index?key=3'
     })
@@ -318,7 +320,7 @@ function handleToContact(item) {
       },
       corpId: 'wwaeb55681929a37ae',
       success: (res => {
-        console.log(res)
+        // console.log(res)
       }),
       fail: (res => {
         console.log(res)

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

@@ -114,6 +114,7 @@ function handleLogin() {
   if (shareId && shareId !== '') {
     params.share_id = shareId
   }
+  console.log(params)
   authSmsLogin({
     ...params
   }).then(authRes => {

src/pages/version-update/index.vue

@@ -11,7 +11,7 @@ const state = reactive({
 
 onLoad(() => {
   getAboutConfig().then(res => {
-    console.log(res)
+    // console.log(res)
   })
 })
 

src/pages/vip/index.vue

@@ -164,7 +164,7 @@ onLoad((option) => {
   userStore.setRedirectPage(`/pages/vip/index`, 'page')
 
   getHomeBanner().then(res => {
-    console.log(res)
+    // console.log(res)
     state.banners = res
   })
   loadList('reload')

src/pages/withdrawal-record/index.vue

@@ -8,8 +8,8 @@ onLoad((option) => {
   getWithdrawal({
     type: 1
   }).then(res => {
-    console.log('提现记录')
-    console.log(res)
+    // console.log('提现记录')
+    // console.log(res)
     list.value = res
   })
 })

src/utils/index.ts

@@ -34,4 +34,26 @@ export function deepMerge<T = any>(src: any = {}, target: any = {}): T {
 export function encodePhone(phone: string) {
     // let tel = '13600136000';
     return phone.replace(/(\d{3})\d{4}(\d{4})/, "$1****$2")
+}
+
+export function getUrlParams (param, k, p) {
+    if (typeof param != 'string') return {};
+    k = k ? k : '&'; //整体参数分隔符
+    p = p ? p : '='; //单个参数分隔符
+    var value = {};
+    if (param.indexOf(k) !== -1) {
+        param = param.split(k);
+        for (var val in param) {
+            if (param[val].indexOf(p) !== -1) {
+                var item = param[val].split(p);
+                value[item[0]] = item[1];
+            }
+        }
+    } else if (param.indexOf(p) !== -1) {
+        var item = param.split(p);
+        value[item[0]] = item[1];
+    } else {
+        return param;
+    }
+    return value;
 }

src/utils/product-page.ts

@@ -148,7 +148,7 @@ export function loadProductList(platform: PLATFORM_NAME) {
                 limit: 10
             }).then(res => {
                 list.value = res
-                console.log(res)
+                // console.log(res)
 
             })
             break;