From 6ecec6289eca451b3288e3e73df81ea54d6dac3f Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Wed, 3 Jul 2024 10:36:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=B4=AD=E7=89=A9=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/buyPup.vue                    |  4 ++--
 components/z-navigation/z-navigation.vue | 24 ++++++++++++------------
 pages.json                               | 12 ++++++------
 pages/goods/index/index.vue              |  4 ++--
 pages/peanut/shopping.vue                |  7 +++++--
 5 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/components/buyPup.vue b/components/buyPup.vue
index 1204329..43aa968 100644
--- a/components/buyPup.vue
+++ b/components/buyPup.vue
@@ -16,10 +16,10 @@
 						<u-icon name="bag" color="#fff" size="28"></u-icon>
 						<text>立即购买</text>
 					</view>
-					<view class="saveBtnss gouwuche flexbox" @click="oprate('gouwuche')">
+					<!-- <view class="saveBtnss gouwuche flexbox" @click="oprate('gouwuche')">
 						<uni-icons type="cart" size="28" style="color: #666;"></uni-icons>
 						<text>加入购物车</text>
-					</view>
+					</view> -->
 				</view>
 			</view>
 		</u-popup>
diff --git a/components/z-navigation/z-navigation.vue b/components/z-navigation/z-navigation.vue
index 4e7744b..9eac74a 100644
--- a/components/z-navigation/z-navigation.vue
+++ b/components/z-navigation/z-navigation.vue
@@ -80,12 +80,12 @@ export default {
           selectedIconPath: "static/tab/icon1_y.png",
           text: "首页",
         },
-        {
-          pagePath: "pages/peanut/shopping",
-          iconPath: "static/tab/tab_nor_02.png",
-          selectedIconPath: "static/tab/tab_cur_02.png",
-          text: "购物车",
-        },
+        // {
+        //   pagePath: "pages/peanut/shopping",
+        //   iconPath: "static/tab/tab_nor_02.png",
+        //   selectedIconPath: "static/tab/tab_cur_02.png",
+        //   text: "购物车",
+        // },
 		{
 		  pagePath: "pages/bookShop/orderList",
 		  iconPath: "static/tab/order.png",
@@ -112,12 +112,12 @@ export default {
           selectedIconPath: "static/tab/icon1_y.png",
           text: "首页",
         },
-        {
-          pagePath: "pages/peanut/shopping",
-          iconPath: "static/tab/tab_nor_02.png",
-          selectedIconPath: "static/tab/tab_cur_02.png",
-          text: "购物车",
-        },
+        // {
+        //   pagePath: "pages/peanut/shopping",
+        //   iconPath: "static/tab/tab_nor_02.png",
+        //   selectedIconPath: "static/tab/tab_cur_02.png",
+        //   text: "购物车",
+        // },
 
         {
           pagePath: "pages/taihu/index",
diff --git a/pages.json b/pages.json
index 25b8781..ccba855 100644
--- a/pages.json
+++ b/pages.json
@@ -561,12 +561,12 @@
 				"selectedIconPath": "static/tab/icon1_y.png",
 				"text": "首页"
 			},
-			{
-				"pagePath": "pages/peanut/shopping",
-				"iconPath": "static/tab/tab_nor_02.png",
-				"selectedIconPath": "static/tab/tab_cur_02.png",
-				"text": "购物车"
-			},
+			// {
+			// 	"pagePath": "pages/peanut/shopping",
+			// 	"iconPath": "static/tab/tab_nor_02.png",
+			// 	"selectedIconPath": "static/tab/tab_cur_02.png",
+			// 	"text": "购物车"
+			// },
 			{
 				"pagePath": "pages/bookShop/orderList",
 				"iconPath": "static/tab/order.png",
diff --git a/pages/goods/index/index.vue b/pages/goods/index/index.vue
index f9e3bda..3542f2a 100644
--- a/pages/goods/index/index.vue
+++ b/pages/goods/index/index.vue
@@ -780,7 +780,7 @@ export default {
   },
   onLoad(options) {
     this.options = options;
-
+	console.log('options',options)
     // this.handleClickGetGoodsList();
     // this.getUserInfo()
     // this.getCateList()
@@ -1027,7 +1027,7 @@ export default {
             that.curriculumData.productImageList == null ||
             that.curriculumData.productImageList == ""
           ) {
-            this.swiperList.push(that.curriculumData.explainsImg);
+            this.swiperList.push(that.curriculumData.productImages);
           } else {
             that.swiperList = that.curriculumData.productImageList.split(",");
             // for (var i = 0; i < imgList.length; i++) {
diff --git a/pages/peanut/shopping.vue b/pages/peanut/shopping.vue
index cd4da1f..0adc7f4 100644
--- a/pages/peanut/shopping.vue
+++ b/pages/peanut/shopping.vue
@@ -254,7 +254,7 @@
 						icon: 'error',
 						duration: 1000,
 					})
-				}else{
+				}else{					
 				uni.navigateTo({
 					url: '../bookShop/settlement?type=1&list='+JSON.stringify(shangList)
 				});
@@ -265,8 +265,11 @@
 			// 商品内容跳转
 			goDetail(id) {
 				uni.navigateTo({
-					url: '../bookShop/commodityDetail?id=' + id
+					url: '/pages/goods/index/index?id=' + id
 				});
+				// uni.navigateTo({
+				// 	url: '../bookShop/commodityDetail?id=' + id
+				// });
 			},
 		},