From edd752e4994a7ed24546465f12f7e49acaa18522 Mon Sep 17 00:00:00 2001
From: syt <854400391@qq.com>
Date: Sat, 30 Mar 2024 20:05:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/goods-sku-popup/index.vue |  3 ++-
 pages/goods/components/SkuPopup.vue  | 29 +++++++++++++++-------------
 pages/goods/detail.vue               | 15 ++++++++------
 pages/user/index.vue                 |  3 ++-
 4 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/components/goods-sku-popup/index.vue b/components/goods-sku-popup/index.vue
index 5e2b50a..a802bab 100644
--- a/components/goods-sku-popup/index.vue
+++ b/components/goods-sku-popup/index.vue
@@ -574,7 +574,8 @@
             }
           }
           // 更新缓存
-          goodsCache[that.goodsId] = goodsInfo;
+          goodsCache[that.goodsId] = goodsInfo;
+		  console.log("goodsCache",goodsCache[that.goodsId])
           if (goodsInfo && typeof goodsInfo == 'object' && JSON.stringify(goodsInfo) != '{}') {
             findGoodsInfoRun = false;
             that.updateGoodsInfo(goodsInfo);
diff --git a/pages/goods/components/SkuPopup.vue b/pages/goods/components/SkuPopup.vue
index 3c6e2b5..c0badc2 100644
--- a/pages/goods/components/SkuPopup.vue
+++ b/pages/goods/components/SkuPopup.vue
@@ -1,5 +1,5 @@
 <template>
-  <goods-sku-popup :modelValue="modelValue" @input="onChangeValue" border-radius="20" :localdata="goodsInfo" :mode="skuMode" :maskCloseAble="true"
+ <goods-sku-popup :modelValue="modelValue" @input="onChangeValue" border-radius="20" :localdata="goodsInfo" :mode="skuMode" :maskCloseAble="true"
     :priceColor="appTheme.mainBg" :buyNowBackgroundColor="appTheme.mainBg" :addCartColor="appTheme.viceText"
     :addCartBackgroundColor="appTheme.viceBg"
     :activedStyle="{ color: appTheme.mainBg, borderColor: appTheme.mainBg, backgroundColor: activedBtnBackgroundColor }"
@@ -49,9 +49,8 @@
       }
     },
     mounted() {
-      const app = this
-      const { goods } = app
-      setTimeout(()=>{
+      const app = this
+	  const { goods } = app
 		  app.goodsInfo = {
 		    _id: goods.goods_id,
 		    name: goods.goods_name,
@@ -59,9 +58,9 @@
 		    sku_list: app.getSkuList(),
 		    spec_list: app.getSpecList()
 		  }
-		  console.log(111,app.goodsInfo)
-		  app.maxBuyNum = app.getMaxBuyNum()
-	  },500)
+		  console.log(111,app.goods)
+		  console.log(111222,goods)
+		  app.maxBuyNum = app.getMaxBuyNum()
     },
 
     methods: {
@@ -97,13 +96,17 @@
       // 获取sku记录的规格值列表
       getSkuNameArr(specValueIds) {
         const app = this
-        const defaultData = ['默认']
+        const defaultData = ['默认']
+		const { goods: { specList } } = app
         const skuNameArr = []
-        if (specValueIds) {
-          specValueIds.forEach((valueId, groupIndex) => {
-            const specValueName = app.getSpecValueName(valueId, groupIndex)
-            skuNameArr.push(specValueName)
-          })
+        if (specValueIds) {
+			if(specList && specList.length > 0){
+				specValueIds.forEach((valueId, groupIndex) => {
+				  const specValueName = app.getSpecValueName(valueId, groupIndex)
+				  skuNameArr.push(specValueName)
+				})
+			}
+          
         }
         return skuNameArr.length ? skuNameArr : defaultData
       },
diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index a739f7f..c705ccb 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -70,11 +70,11 @@
 					{{goods.goods_name}}
 				</view>
 				<view class="goodsOpera">
-					<view class="goodsNum" @click="copyNum(goods.skuList[0].goods_sku_id)"
+					<!-- <view class="goodsNum" @click="copyNum(goods.skuList[0].goods_sku_no)"
 						v-if="goods.specList && goods.specList.length>0">
-						<text>{{goods.skuList[0].goods_sku_id}}</text>
+						<text>{{goods.skuList[0].goods_sku_no}}</text>
 						<image :src="$picUrl+'/static/detail/copy.png'"></image>
-					</view>
+					</view> -->
 					<view v-if="goods.goods_no" class="goodsNum" @click="copyNum(goods.goods_no)">
 						<text>{{goods.goods_no}}</text>
 						<image :src="$picUrl+'/static/detail/copy.png'"></image>
@@ -401,7 +401,7 @@
 		data() {
 			return {
 				goods_sku_no: "",
-				isTodo: true,
+				isTodo: false,
 				result: {},
 				max_price: "",
 				cost_price:'',
@@ -728,7 +728,6 @@
 				this.getCartTotal()
 			},
 			choseSku(skuMode) {
-				console.log(this.goods)
 				if (!uni.getStorageSync("AccessToken")) {
 					uni.navigateTo({
 						url: "/pages/login/index"
@@ -737,6 +736,7 @@
 				}
 				this.skuMode = skuMode
 				this.showSkuPopup = true
+				console.log("choseSku",this.goods)
 			},
 			copyNum(msg) {
 				uni.setClipboardData({
@@ -775,6 +775,8 @@
 								this.$set(this.goods, item, info[item])
 								// that.goods[item] = info[item]
 							})
+							
+							that.isTodo = true;
 							that.goods_sku_no =""
 							if(info.skuList && info.skuList.length > 0){
 								that.goods_sku_no = info.skuList[0].goods_sku_no
@@ -786,6 +788,8 @@
 								that.markup_rate = ""
 								that.shareCancel();
 							}
+							
+							console.log(result, 'getGoodsDetail')
 						})
 						.catch()
 				})
@@ -795,7 +799,6 @@
 				const that = this
 				GoodsApi.recommended()
 					.then(result => {
-						console.log(result, '获取推荐商品列表')
 						let arr = result.data.goodsList
 						if (arr && arr.length > 0) {
 							arr.map(a => {
diff --git a/pages/user/index.vue b/pages/user/index.vue
index d0d7f36..579a143 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -599,7 +599,8 @@
 			}
 		},
 		onShow(options) {
-			if(uni.getStorageSync("userInfo").user_id){
+			if(uni.getStorageSync("userInfo").user_id){
+				this.isLogin = true
 				this.onRefreshPage()
 			}else{
 				this.userInfo = {}