手机号违规整改

src/apis/product.ts

@@ -24,6 +24,8 @@ enum API {
     PRODUCT_SHARE = '/api/product_share',
     // 京东商品详情
     JD_DETAIL = '/api/jd/detail',
+	// 未登录京东商品详情
+	JTT_DETAIL = '/api/jtt/detail',
     // 京东商品列表
     JD_LIST = '/api/jd/list',
     // 京东商品列表搜索
@@ -145,6 +147,20 @@ export  function getJdProductDetail(skuId: string): Promise<JdgProductDetailMode
 }
 
 /**
+ * 未登录获取京东商品详情
+ * @param skuId
+ */
+export  function getJTTProductDetail(skuId: string, type: string): Promise<JdgProductDetailModel> {
+    return detailHttp.get({
+        url: API.JTT_DETAIL,
+        data: {
+            skuId,
+			type
+        }
+    })
+}
+
+/**
  * 京东商品列表
  * @param params
  */

src/pages/home/components/header.vue

@@ -56,7 +56,6 @@ function handleClick() {
     })
   }
 }
-
 // function handleShowSearchPage() {
 //
 // }

src/pages/home/components/navs.vue

@@ -14,7 +14,7 @@ const navList = ref([{
   key: 'miaosha'
 },{
   image: CDM_URL + '/image/2023-11-30/20231130092625318.png',
-  title: '会员专区',
+  title: '一壶茶',
   key: 'user',
 },{
   image: '',
@@ -108,7 +108,7 @@ function handleItemClick(item: any) {
 	  uni.navigateToMiniProgram({
 	      appId: 'wx82986c4471ce7efc',
 	      path: 'pages/home/index',
-	  	  envVersion: 'trial', // develop（开发版），trial（体验版），release（正式版）
+	  	  envVersion: 'release', // develop（开发版），trial（体验版），release（正式版）
 	      success(res) {
 	        // 打开成功
 	        console.log(res);

src/pages/miaosha/index.vue

@@ -47,13 +47,13 @@ const state = reactive({
 
 onLoad((options) => {
   if (options.type_show == 1) {
-    if (!userStore.uid) {
-      userStore.setRedirectPage(`/pages/miaosha/index`, 'page')
-      return uni.redirectTo({
-        url: '/pages/user/login/index?key=4'
-      })
+    // if (!userStore.uid) {
+    //   userStore.setRedirectPage(`/pages/miaosha/index`, 'page')
+    //   return uni.redirectTo({
+    //     url: '/pages/user/login/index?key=4'
+    //   })
 
-    }
+    // }
     loadList('reload')
   } else {
     loadList('reload')

src/pages/search/index.vue

@@ -436,6 +436,7 @@ console.log(5);
 console.log("5");
 
 console.log(item.type);
+console.log(state.currentTab);
 
   function navigateToDetail(params) {
     let otherDetailUrl = `/pages/store/product/other`
@@ -443,12 +444,24 @@ console.log(item.type);
       url: `${otherDetailUrl}?params=${params}`
     })
   }
+  
+  let itemType = 0
+  if (typeof item.type === 'string') {
+	  itemType = parseInt(item.type)
+  } else {
+	  itemType = item.type
+  }
+  
   // 大仓
-  if (state.currentTab === PLATFORM_NAME.DC && item.type === 5) {
+  if (state.currentTab === PLATFORM_NAME.DC && itemType === 5) {
+	  
+	  console.log('进来了', state.currentTab);
+	  
     uni.navigateTo({
       url: `/pages/store/product/detail?id=${item.product_id}`
     })
   }
+  
   // 京东
   if (item.type === 6) {
     // productParams.id = item.skuId

src/pages/store/product/detail.vue

@@ -228,35 +228,40 @@ onShareAppMessage(async () => {
       }
     }
   }).catch(error => {
-    uni.showToast({
-      title: '请登录后分享',
-      icon: 'none'
-    }).then(() => {
-      setTimeout(() => {
-        uni.navigateTo({
-          url: '/pages/user/login/index'
-        })
-      }, 500)
-    })
+    // uni.showToast({
+    //   title: '请登录后分享',
+    //   icon: 'none'
+    // }).then(() => {
+    //   setTimeout(() => {
+    //     uni.navigateTo({
+    //       url: '/pages/user/login/index'
+    //     })
+    //   }, 500)
+    // })
     uni.hideLoading()
+	return {
+		title: `${detail.value.store_name}`,
+		imageUrl: detail.value.image,
+		path: `pages/store/product/detail?id=${state.id}&from=share&shareID=${state.shareId}`
+	}
   })
 
 })
 
 onShareTimeline(() => {
 
-  if (!userStore.uid) {
-    return uni.showToast({
-      title: '请登录后分享',
-      icon: 'none'
-    }).then(() => {
-      setTimeout(() => {
-        uni.navigateTo({
-          url: '/pages/user/login/index'
-        })
-      }, 500)
-    })
-  }
+  // if (!userStore.uid) {
+  //   return uni.showToast({
+  //     title: '请登录后分享',
+  //     icon: 'none'
+  //   }).then(() => {
+  //     setTimeout(() => {
+  //       uni.navigateTo({
+  //         url: '/pages/user/login/index'
+  //       })
+  //     }, 500)
+  //   })
+  // }
 
   return {
     title: `${detail.value.store_name}`,

src/pages/store/product/other.vue

@@ -3,7 +3,9 @@
 import {
   getDyProductDetail,
   getJdProductDetail,
-  getPddProductDetail, getShareId,
+  getJTTProductDetail,
+  getPddProductDetail, 
+  getShareId,
   getSuProductDetail,
   getTaobaoProductDetail,
   getVipProductDetail
@@ -14,6 +16,7 @@ import type {
   DyProductModel,
   IProductDetail,
   JdProductDetailModel,
+  
   JdProductModel,
   SuNingProductModel,
   TaobaoProductThirdPartyWaresModel,
@@ -66,14 +69,17 @@ const props = defineProps({
 
 const state = reactive({
   data: {},
-  shareId: ''
+  shareId: '',
+  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}`
   userStore.setRedirectPage(`/pages/store/product/other?params=${encodeBase64(data)}`, 'page')
   // if (options.platform && options.id) {
@@ -88,6 +94,13 @@ onLoad((options: any) => {
 
 onShow(() => {
   isSubmit.value = false
+  
+	console.log('onshow----')
+	if (isNeedAuth.value) {
+		console.log('从授权进来的。。。。')
+		loadProductDetail(state.pddData)
+		isNeedAuth.value = false
+	}
 })
 
 //精品推荐
@@ -104,14 +117,18 @@ function YouLike() {
 
 //商品不存在详情
 function soldOut() {
+	console.log('1')
+	console.log(userStore.uid)
   if (userStore.uid) {
     isShow.value = true
+	console.log('2')
     uni.setNavigationBarTitle({
       title: '商品下架不存在'
     })
     loadList('reload')
     uni.hideLoading()
   } else {
+	  console.log('3')
     uni.showToast({
       title: '请登录',
       icon: 'none'
@@ -140,25 +157,50 @@ function loadProductDetail(product: Partial<IProductDetail>) {
 
   // 京东
   if (product.platform == 6) {
-    getJdProductDetail(product.id).then(res => {
-      console.log(res);
-      let { data, status } = res
-      if (status === 200) {
-        const jdProduct = data[0]
-        // console.log(jdProduct)
-        mergeProductDetailclone({
-          images: jdProduct.detail,
-          coupon: {
-            amount: jdProduct.couMoney
-          },
-          ...jdProduct
-        })
-
-        uni.hideLoading()
-      } else {
-        soldOut()
-      }
-    })
+	  
+	  if (userStore.uid) { // 已登录的
+		  getJdProductDetail(product.id).then(res => {
+		    console.log('京东商品详情',res);
+		    let { data, status } = res
+		    
+		    const jdProduct = data[0]
+		    // console.log(jdProduct)
+		    mergeProductDetailclone({
+		      images: jdProduct.detail,
+		      coupon: {
+		        amount: jdProduct.couMoney
+		      },
+		      ...jdProduct
+		    })
+		    
+		    uni.hideLoading()
+		})
+	  } else { // 未登录的
+		  getJTTProductDetail(product.id, 1).then(res => {
+		    console.log('京东商品详情',res);
+		    let { data, status } = res
+		    
+		    const jdProduct = data[0]
+		    // console.log(jdProduct)
+		    mergeProductDetailclone({
+		      images: jdProduct.detail,
+		      coupon: {
+		        amount: jdProduct.couMoney
+		      },
+		      ...jdProduct
+		    })
+		    
+		    uni.hideLoading()
+		})
+	  }
+    
+	  
+      // if (status === 200) {
+        
+      // } else {
+      //   soldOut()
+      // }
+    
   }
   // 淘宝 *
   if (product.platform === 5) {
@@ -187,7 +229,9 @@ function loadProductDetail(product: Partial<IProductDetail>) {
   // 拼多多 *
   if (product.platform == 1) {
     getPddProductDetail(product.id).then(res => {
-      // console.log(res);
+		console.log('res')
+      console.log(res)
+	  console.log()
       let { status, data } = res
       // detail.value = res
       if (status !== 200) {
@@ -337,14 +381,22 @@ function handleBuyNow() {
         })
       }
     } else if (detail.value?.platform == 1) {
-      // console.log(detail.value)
+      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({
           appId: pddWx.app_id,
           path: pddWx.page_path,
           // extraData: {
-          //  foo: 'bar'
+          //  foo: 'bar'mobile_url: "https://p.pinduoduo.com/VHKD9VbP"  mobile.yangkeduo
           // },
           envVersion: 'release',
           success(res) {
@@ -400,10 +452,14 @@ function handleBuyNow() {
             })*/
 
       // }
-      return uni.showToast({
-        title: '商品维护中，请稍后再试',
-        icon: 'none'
-      })
+	  if (detail.value?.platform == 6) {
+		  
+	  } else {
+		  return uni.showToast({
+		    title: '商品维护中，请稍后再试',
+		    icon: 'none'
+		  })
+	  }
     }
   }
   /*

src/pages/user/login/index.vue

@@ -223,6 +223,10 @@ function onClickLeft() {
         <div>其他手机号登录</div>
       </navigator>
     </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"/>
 
   </div>

src/utils/http/detailhttp.ts

@@ -80,7 +80,7 @@ export class vRequest {
                 method: configTemp.method?.toUpperCase() as UniApp.RequestOptions['method'],
                 header: configTemp.header || {},
                 success: (res) => {
-                    console.log('我是商品res啊', res);
+                    console.log('我是商品res啊----', res);
 
                     resolve(res.data as any)