3.3.2

src/config/app.ts

@@ -5,8 +5,8 @@ let VUE_APP_WS_URL = `ws://${location.hostname}?type=user`
 // 网络接口修改此字符 小程序域名要求https
 
 // let httpApi = 'https://mer1.crmeb.net'
-let httpApi = 'https://test.bjtdba.com'
-// let httpApi = 'https://app.bjtdba.com'
+// let httpApi = 'https://test.bjtdba.com'
+let httpApi = 'https://app.bjtdba.com'
 // let httpApi = 'https://test.bjtdba.com'
 
 // let httpApi = 'http://192.168.1.77:8324'

src/pages/payment/index.vue

@@ -102,8 +102,8 @@ function handleConfirm() {
       OrderLists: state.orderList,
       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({

src/pages/search/index.vue

@@ -383,10 +383,10 @@ function handleProductItemClick(
         & TaobaoProductThirdPartyWaresModel
         & VipProductModel
 ) {
-// console.log(5);
-// console.log("5");
+console.log(5);
+console.log("5");
 
-// console.log(item);
+console.log(item.type);
 
   function navigateToDetail(params) {
     let otherDetailUrl = `/pages/store/product/other`
@@ -420,8 +420,8 @@ function handleProductItemClick(
     }
     return navigateToDetail(encodeBase64(productParams))
   }
-  // 淘宝
-  if (item.type === 5) {
+  // 淘宝PLATFORM_NAME.TB
+  if ( state.currentTab === PLATFORM_NAME.TB && item.type === 5) {
     const productParams: Partial<IProductDetail> = {
       platform: item.type,
       id: item.id,
@@ -646,7 +646,7 @@ onReachBottom(() => {
         <grid-view type="masonry" cross-axis-count="2" cross-axis-gap="10px" main-axis-gap="10px">
           <div v-for="(item, index) in list"
                :key="index"
-               @tap="handleProductItemClick(item)"
+               @click="handleProductItemClick(item)"
           >
             <div class="bg-white rounded-lg text-dark">
               <image :src="item.image"

src/pages/store/product/detail.vue

@@ -146,15 +146,16 @@ onLoad((option: any) => {
     userStore.setShareId(fromShareId)
 
     userStore.setRedirectPage(`/pages/store/product/detail?id=${state.id}&from=share&shareID=${fromShareId}`, 'page')
+    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}`, 'page')
+
+    })
 
   }
 
 
-  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}`, 'page')
 
-  })
 
 
 

src/pages/store/product/other.vue

@@ -28,7 +28,7 @@ import { debounce, merge } from "lodash-es";
 
 import { useDebounceFn } from '@vueuse/core';
 import dayjs from "dayjs";
-import { decodeBase64 } from "~/utils/http/helper";
+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";
@@ -74,8 +74,8 @@ const detailclone = ref<IProductDetail>()
 onLoad((options: any) => {
 
   const data: Partial<IProductDetail> = JSON.parse(decodeBase64(options.params))
-  // console.log('我是options数据', 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) {
   uni.showLoading({
     title: '数据加载中',
@@ -104,12 +104,25 @@ function YouLike() {
 
 //商品不存在详情
 function soldOut() {
-  isShow.value = true
-  uni.setNavigationBarTitle({
-    title: '商品下架不存在'
-  })
-  loadList('reload')
-  uni.hideLoading()
+  if (userStore.uid) {
+    isShow.value = true
+    uni.setNavigationBarTitle({
+      title: '商品下架不存在'
+    })
+    loadList('reload')
+    uni.hideLoading()
+  } else {
+    uni.showToast({
+      title: '请登录',
+      icon: 'none'
+    })
+    setTimeout(() => {
+      uni.redirectTo({
+        url: '/pages/user/login/index?key=4'
+      })
+    }, 500)
+  }
+
 }
 
 function mergeProductDetail(data: Partial<IProductDetail> = {}) {

src/utils/http/index.ts

@@ -10,7 +10,7 @@ function createRequest(options?: any) {
     return new VRequest(deepMerge(
         {
             url: '',
-            timeout: 5 * 1000,
+            timeout: 20 * 1000,
             authenticationScheme: 'Bearer',
             authenticationHeader: 'X-Token',
             // authenticationHeader: 'Authorization',