3.3.6

pages.config.ts

@@ -9,7 +9,7 @@ export default defineUniPages({
     // Gray3
     color: '#828282',
     // Gray1
-    selectedColor: '#333333',
+    selectedColor: '#FE0032',
     backgroundColor: '#FFFFFF',
     list: [{
       pagePath: 'pages/home/index',

src/apis/product.ts

@@ -301,7 +301,7 @@ export function getPddProductDetail(goodsId: string): Promise<PDDProductDetailMo
  * @param params
  */
 export function searchPddProduct(params: ProductParams): Promise<Array<PDDProductModel>> {
-    return defHttp.get({
+    return detailHttp.get({
         url: API.PDD_SEARCH,
         data: {
             ...params

src/pages/home/components/navs.vue

@@ -101,9 +101,24 @@ function handleItemClick(item: any) {
     }
     // 会员专区
     case 'user': {
-      uni.navigateTo({
-        url: `/pages/vip/index?type=`+item.key
-      })
+      // uni.navigateTo({
+      //   url: `/pages/vip/index?type=`+item.key
+      // })
+	  
+	  uni.navigateToMiniProgram({
+	      appId: 'wx82986c4471ce7efc',
+	      path: 'pages/home/index',
+	  	  envVersion: 'trial', // develop（开发版），trial（体验版），release（正式版）
+	      success(res) {
+	        // 打开成功
+	        console.log(res);
+	      },
+	      fail: (error) => {
+	        console.log(error);
+	      }
+	    })
+	  
+	  
       break;
     }
     // 秒杀

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, getLocal, getNoticeList, getProductShare } from "~/apis/common";
+import { getHomeBanner, getHomeQuickLink, getNoticeList, getProductShare } from "~/apis/common";
 import { useUserStore } from "~/stores/userStore";
 import CXBDialogSIgnIn from "~/components/CXBDialogSignIn/CXBDialogSIgnIn.vue";
 import CXBDialogSIgnInSucceed from "~/components/CXBDialogSignInSucceed/CXBDialogSIgnInSucceed.vue";
@@ -132,7 +132,6 @@ onLoad((option) => {
     userStore.setShareId(option.shareId)
   }
   getIsShow()
-  getLocal()
   getHomeBanner().then(res => {
     // console.log(res)
     state.banners = res

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/real-name-authentication/index.vue

@@ -190,7 +190,7 @@ function handleSubmit () {
     const certificationRequest: CertificationRequest = {
       user_name: formData.user_name,
       user_card: formData.user_card,
-      // mobile: formData.mobile,
+      mobile: userStore.userInfo.phone,
       card_positive: formData.card_positive,
       card_reverse: formData.card_reverse
     }
@@ -203,6 +203,11 @@ function handleSubmit () {
         formData.user_name = res.user_name
       }
       state.isLoading = false
+	  state.isCertified = true
+	  
+	  userStore.getUserInfo()
+	  
+	  
     }).catch(error => {
       uni.showToast({
         title: error,

src/pages/search/index.vue

@@ -140,8 +140,34 @@ function searchProduct() {
     }
     case PLATFORM_NAME.PDD: {
       searchPddProduct({ keyword: searchValue.value, page: 1, limit: 10}).then(res => {
-        if(res.we_app_info){
-          const pddWx = res.we_app_info
+		  
+		  
+		  console.log('11111111111')
+		  console.log(res)
+		  
+		  let pddData
+		  
+		  if (res.message.length > 20) {
+			  pddData = JSON.parse(res.message)
+		  }
+		  console.log('11111111112')
+		  
+		  console.log(pddData)
+		  
+		  if(pddData) {
+			  console.log('122222222')
+			modalVisible.value = true
+			pddPath.value = pddData.we_app_info.page_path
+			return
+		  }else {
+			  
+			  console.log('1222223333')
+			  console.log(res.data)
+			list.value = res.data
+		  }
+		  
+        if(res.data.we_app_info){
+          const pddWx = res.data.we_app_info
           console.log(pddWx)
           if (pddWx) {
             uni.navigateToMiniProgram({
@@ -162,7 +188,7 @@ function searchProduct() {
             })
           }
         }else{
-          list.value = res
+          list.value = res.data
         }
 
       })
@@ -251,14 +277,14 @@ function loadProductList(action: 'page' | 'reload', callback?: (items) => void)
       break;
     }
     case PLATFORM_NAME.DY: {
-      getDyLiveList({
-        page: state.currentPage,
-        limit: 4,
-        // keyword: ''
-      }).then(res => {
-        // console.log(res)
-        // console.log(res.authorPic)
-      })
+      // getDyLiveList({
+      //   page: state.currentPage,
+      //   limit: 4,
+      //   // keyword: ''
+      // }).then(res => {
+      //   // console.log(res)
+      //   // console.log(res.authorPic)
+      // })
       getDyLiveList({page: 1,limit: 4})
           .then(res => {
             // console.log(res)
@@ -609,8 +635,31 @@ function handleScrollToLower() {
 
 onReachBottom(() => {
   handleScrollToLower()
-
 })
+
+const modalVisible = ref(false)
+const pddPath = ref('')
+
+function onCancel() {
+  modalVisible.value = false
+}
+
+function onOk() {
+	uni.navigateToMiniProgram({
+	  appId: 'wxa918198f16869201',
+	  path: pddPath.value,
+	  envVersion: 'release',
+	  success(res) {
+	    // 打开成功
+	    // console.log(res);
+	  },
+	  fail: (error) => {
+	    console.log(error);
+	  }
+	})
+}
+
+
 </script>
 <template>
 
@@ -764,11 +813,21 @@ onReachBottom(() => {
         </div>
       </div>
 
+		
+		
     </div>
-  <div class="pt-36 flex flex-col justify-center items-center" v-else>
-    <CXBEmpty ></CXBEmpty>
-
-  </div>
+	
+	<div class="pt-36 flex flex-col justify-center items-center" v-else>
+		<CXBEmpty ></CXBEmpty>
+	</div>
+  
+	<nut-dialog
+		title="需要去拼多多授权"
+		v-model:visible="modalVisible"
+		@cancel="onCancel"
+		@ok="onOk"
+	/>
+  
 
 </template>
 

src/pages/store/nearby/index.vue

@@ -4,7 +4,7 @@ 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 } from "~/apis/common";
+import { getProductShare, getLocal } from "~/apis/common";
 import { useUserStore } from "~/stores/userStore";
 import Cache from "~/utils/cache";
 const usePageStore = usePageStoreWidthOut()
@@ -57,6 +57,9 @@ const { windowHeight } = uni.getSystemInfoSync()
 state.scrollHeight = windowHeight - 45
 
 onLoad((option) => {
+	
+	getLocal()
+	
   if (option && option.shareId) {
     userStore.setShareId(option.shareId)
   }
@@ -143,13 +146,21 @@ function loadSelectMerchant(action: 'page' | 'reload', callback?: (items) => voi
       category_id: state.category_id
     })
   }
-  if (state.menuDefaultValue === 2) {
-    params = Object.assign({}, params, {
-      distanceAsc: 0,
-      lat: uni.getStorageSync(USER_LATITUDE),
-      lng: uni.getStorageSync(USER_LONGITUDE)
-    })
+  
+  if (uni.getStorageSync(USER_LATITUDE)) {
+	  params = Object.assign({}, params, {
+	    distanceAsc: 0,
+	    lat: uni.getStorageSync(USER_LATITUDE),
+	    lng: uni.getStorageSync(USER_LONGITUDE)
+	  })
   }
+  // if (state.menuDefaultValue === 2) {
+  //   params = Object.assign({}, params, {
+  //     distanceAsc: 0,
+  //     lat: uni.getStorageSync(USER_LATITUDE),
+  //     lng: uni.getStorageSync(USER_LONGITUDE)
+  //   })
+  // }
 
   getSelectMerchant(params).then((res: StoreResult) => {
     // console.log(state.triggered)
@@ -324,7 +335,7 @@ watch(() => state.scrollTop, () => {
                 </div>
               </div>
 
-              <div class="text-xs">{{ (item.distance / 100).toFixed(1) }}km</div>
+              <div class="text-xs">{{ (item.distance).toFixed(1) }}km</div>
             </div>
 
           </div>

src/pagesC/goods_details/index.vue

@@ -1,36 +0,0 @@
-<script setup lang="ts">
-onLoad((option) => {
-  if (option && option.id) {
-    uni.redirectTo({
-      url: `/pages/store/product/detail?id=${option.id}&shareID=${option.shareID}`
-    })
-  } else {
-    uni.switchTab({
-      url: '/page/home/index'
-    })
-  }
-})
-</script>
-
-<style>
-page {
-  background-color: #f8f8f8;
-}
-button {
-  margin: 0;
-  padding: 0;
-  outline: none;
-  border-radius: 0;
-  background-color: transparent;
-  line-height: inherit;
-}
-
-button::after {
-  border: none;
-}
-
-</style>
-<route lang="yaml">
-style:
-  navigationBarTitleText: 商品详情
-</route>

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)
 

vite.config.ts

@@ -37,7 +37,6 @@ export default defineConfig({
         UniPages({
             routeBlockLang: 'yaml',
             minify: true,
-            subPackages: ['src/pagesC']
         }),
         UnoCSS(),
         // https://github.com/antfu/unplugin-auto-import