隐藏购物车

pages/goods_details/index.vue

@@ -166,12 +166,13 @@
 					<view class="p_center">{{ $t(`收藏`) }}</view>
 				</view>
 				<view class="animated item skeleton-rect" :class="animated == true ? 'bounceIn' : ''" @click="goCart">
-					<view class="iconfont icon-gouwuche1">
+					<u-icon name="rmb-circle" size="21"></u-icon>
+					<!-- <view class="iconfont icon-gouwuche1">
 						<text class="num bg-color" v-if="parseFloat(CartCount) > 0">{{
 								CartCount || 0
 						}}</text>
-					</view>
-					<view class="p_center skeleton-rect">{{ $t(`购物车`) }}</view>
+					</view> -->
+					<view class="p_center skeleton-rect">{{ $t(`红包`) }}</view>
 				</view>
 				<view v-if="a" class="presale">
 					<view class="acea-row">
@@ -181,9 +182,9 @@
 					</view>
 				</view>
 				<view v-else>
-					<view v-if="!storeInfo.presale">
+					<view v-if="storeInfo.isSale">
 						<view class="bnt acea-row" :class="!storeInfo.cart_button ? 'virbnt' : ''"
-							v-if="attr.productSelect.stock <= 0">
+							v-if="storeInfo.totalStock <= 0">
 							<form v-if="storeInfo.cart_button" @submit="joinCart" class="joinCart bnts"
 								:class="!storeInfo.cart_button ? 'virbnt' : ''">
 								<button class="joinCart bnts" form-type="submit">
@@ -197,15 +198,17 @@
 								</button>
 							</form>
 						</view>
-						<view class="bnt acea-row skeleton-rect" v-else>
-							<form @submit="joinCart" class="joinCart bnts">
+						<view class="bnt acea-row" :class="!storeInfo.cart_button ? 'virbnt' : ''"
+							v-else>
+							<form v-if="storeInfo.cart_button" @submit="joinCart" class="joinCart bnts"
+								:class="!storeInfo.cart_button ? 'virbnt' : ''">
 								<button class="joinCart bnts" form-type="submit">
 									{{ $t(`加入购物车`) }}
 								</button>
 							</form>
-							<form @submit="goBuy" class="buy bnts" :class="storeInfo.cart_button ? 'virbnt' : ''">
-								<button class="buy bnts" :class="storeInfo.cart_button ? 'virbnt' : ''"
-									form-type="submit">
+							<form class="buy bnts bg-color-hui" @submit="goBuy"> 
+								<button class="buy bnts " form-type="submit"
+									:class="!storeInfo.cart_button ? 'virbnt' : ''">
 									{{ $t(`立即购买`) }}
 								</button>
 							</form>
@@ -214,7 +217,7 @@
 					<view class="presale" v-else>
 						<view class="acea-row" v-if="presale_pay_status === 1 || presale_pay_status === 3">
 							<form class="bnts bg-color-hui"><button class="bnts bg-color-hui" form-type="submit">{{
-									presale_pay_status === 1 ? $t(`未开始`) : $t(`已结束`)
+									presale_pay_status === 1 ? $t(`未开始售卖`) : $t(`已结束`)
 							}}</button>
 							</form>
 						</view>
@@ -1144,12 +1147,12 @@ export default {
 					});
 				}
 			})
-			.catch((err) => {
-				that.isOpen = false;
-				return that.$util.Tips({
-					title: err,
+				.catch((err) => {
+					that.isOpen = false;
+					return that.$util.Tips({
+						title: err,
+					});
 				});
-			});
 		},
 		/**
 		 * 获取购物车数量

pages/order_addcart/order_addcart.vue

@@ -784,12 +784,12 @@ export default {
 		getCartNum: function () {
 			let that = this;
 			// getCartCounts().then(res => {
-			that.cartCount = 3;
-			this.$store.commit('indexData/setCartNum', 3 > 99 ? '..' : 3)
-			if (3 > 0) {
+			that.cartCount = 0;
+			this.$store.commit('indexData/setCartNum', that.cartCount > 99 ? '..' : that.cartCount)
+			if (that.cartCount > 0) {
 				wx.setTabBarBadge({
 					index: 2,
-					text: 3 + ''
+					text: that.cartCount + ''
 				})
 			} else {
 				wx.hideTabBarRedDot({
@@ -837,7 +837,7 @@ export default {
 				status: 1
 			}
 			let countResData = {
-				"count": 3,
+				"count": 0,
 				"ids": [
 					9671,
 					9670,
@@ -848,7 +848,6 @@ export default {
 			// getCartCounts().then(async c => {
 			that.cartCount = countResData.count;
 			let n = Math.ceil(countResData.ids.length / that.limit)
-			console.log(n);
 			for (let i = 0; i < n; i++) {
 				// let cartList = await this.getCartData(data)
 				let cartListData = {