From 99518a47e3912be8fd9216702b4dc1c858b3e3f1 Mon Sep 17 00:00:00 2001
From: LGX <365820713@qq.com>
Date: Thu, 26 Sep 2024 12:03:56 +0800
Subject: [PATCH] =?UTF-8?q?2024/09/26=E5=A4=9A=E9=97=A8=E5=BA=97=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/annex/vip_paid/index.vue | 19 +++++++++++++++----
 pages/index/index.vue          |  8 ++++----
 utils/request.js               |  3 ++-
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/pages/annex/vip_paid/index.vue b/pages/annex/vip_paid/index.vue
index b64a723..abbc1a9 100644
--- a/pages/annex/vip_paid/index.vue
+++ b/pages/annex/vip_paid/index.vue
@@ -171,9 +171,9 @@
 					<view class="popupboxtitle">
 						{{guzkneirong.title}}
 					</view>
-					<view class="neir" v-html="guzkneirong.content">
+					<scroll-view class="neir" scroll-y="true" style="" v-html="guzkneirong.content">
 						<!-- {{guzkneirong.content}} -->
-					</view>
+					</scroll-view>
 				</view>
 			</uni-popup>
 		</view>
@@ -317,7 +317,8 @@
 						discountId:this.newcomer_products[this.libaoindex].id,
 						member_type: this.memberType[this.tykindex].id
 					};
-					postCartAdd(data).then(res => {
+					postCartAdd(data)
+					.then(res => {
 						console.log(987, res);
 						uni.navigateTo({
 							url: '/pages/goods/order_confirm/index?huiyuanka=1&product_id=""&discountInfos' +
@@ -328,7 +329,11 @@
 									.tykindex].price +
 								'&vipprice=' + this.memberType[this.tykindex].pre_price+'&member_type=' + this.memberType[this.tykindex].id
 						})
-					})
+					}).catch(res => {
+						this.$util.Tips({
+							title: res 
+						});
+					});
 
 				} else {
 					this.$util.Tips({
@@ -618,6 +623,12 @@
 			height: 400px;
 			overflow-y: auto;
 		}
+		.neir ::-webkit-scrollbar {
+		  display: none;
+		  width: 0;
+		  height: 0;
+		  color: transparent;
+		}
 	}
 
 	.fotbut {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a2cc3ba..78ea2c4 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -448,10 +448,10 @@
 		onShow() {
 			this.getLocation()
 			if (this.cartNum > 0) {
-				// uni.setTabBarBadge({
-				// 	index: 3,
-				// 	text: this.cartNum > 99 ? '99+' : this.cartNum + ''
-				// })
+				uni.setTabBarBadge({
+					index: 2,
+					text: this.cartNum > 99 ? '99+' : this.cartNum + ''
+				})
 				uni.hideTabBarRedDot({
 					index: 3
 				})
diff --git a/utils/request.js b/utils/request.js
index 6cab415..cc54916 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -67,7 +67,7 @@ function baseRequest(url, method, data, {
 			header: header,
 			data: data || {},
 			success: (res) => {
-				
+				console.log(res);
 				if (res.data.data && res.data.gzde === 1) {
 					try{
 						res.data.data = JSON.parse(decompress(res.data.data));
@@ -107,6 +107,7 @@ function baseRequest(url, method, data, {
 				} else if(res.data.status == 403){
 					reject(res.data);
 				} else
+				console.log(res.data.msg)
 					reject(res.data.msg || '系统错误');
 			},
 			fail: (msg) => {