From c0b9dc0c68e62d36a11471b8fe27b40d9ce1c596 Mon Sep 17 00:00:00 2001
From: wpf <2187978347@qq.com>
Date: Sun, 5 Nov 2023 11:09:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                         | 4 ++--
 pages/nongKe/cloud_entrepot/index.vue | 4 ++--
 pages/order_addcart/order_addcart.vue | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/manifest.json b/manifest.json
index e88dc21..3fdc175 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "1.5.3",
-    "versionCode" : 153,
+    "versionName" : "1.5.4",
+    "versionCode" : 154,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
index 91a7775..60998d3 100644
--- a/pages/nongKe/cloud_entrepot/index.vue
+++ b/pages/nongKe/cloud_entrepot/index.vue
@@ -184,7 +184,7 @@
             </view>
             <!-- 购物车 -->
             <view class="card" :style="`bottom:${appInfo.bottom}px`"
-              @click="navgo('/pages/order_addcart/order_addcart')">
+              @click="navgo('/pages/order_addcart/order_addcart?product_type=98')">
               <view class="left">
                 <view class="cart" :class="{ act_cart: act_cart }" style="position: relative; z-index: 9999999">
                   <u--image :showLoading="true" src="/static/images/LHYC/GWC.png" width="63.09rpx"
@@ -683,7 +683,7 @@
           })
           this.totalMoney = this.totalMoney.toFixed(2)
         })
-        getCartCounts().then(res => {
+        getCartCounts({product_type: 98}).then(res => {
           this.goodsNum = res.data[0].count
         })
       },
diff --git a/pages/order_addcart/order_addcart.vue b/pages/order_addcart/order_addcart.vue
index 6614ffc..a71e449 100644
--- a/pages/order_addcart/order_addcart.vue
+++ b/pages/order_addcart/order_addcart.vue
@@ -219,6 +219,7 @@
 				loading: false, //是否加载中
 				loadend: false, //是否加载完毕
 				loadTitle: '加载更多', //提示语
+				product_type: 0,
 				isFooter: false,
 				cartCount: 0,
 				goodsHidden: true,
@@ -272,7 +273,7 @@
 		onReady() {},
 		mounted: function() {},
 		onLoad: function(options) {
-
+			this.product_type = options.product_type || 0;
 		},
 		onShow: function() {
 			this.appInfo = this.$appInfo.safeAreaInsets
@@ -679,7 +680,7 @@
 			// 购物车列表
 			getCartList: function(isChange) {
 				let that = this;
-				getCartList().then(res => {
+				getCartList({product_type: this.product_type}).then(res => {
 					res.data.list.forEach((item, index) => {
 						item.allCheck = true
 						item.list.forEach((goods, j) => {