From 7a07aadf5eceb86abfbbefa916c6371c3dc902fd Mon Sep 17 00:00:00 2001
From: whyneedname <542399163@qq.com>
Date: Fri, 21 Oct 2022 14:20:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=9C=8D=E3=80=81=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E4=B8=93=E5=AE=B6=E6=8C=89=E9=92=AE=E9=93=BE=E6=8E=A5=E4=BC=81?=
 =?UTF-8?q?=E5=BE=AE=E5=AE=A2=E6=9C=8D;=E4=BC=98=E6=83=A0=E5=88=B8?=
 =?UTF-8?q?=E9=A2=86=E5=8F=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/expert/index.vue                | 12 ++++++++++--
 pages/shop/ShoppingCart/index.vue     |  6 +++---
 pages/user/User/index.vue             | 16 ++++++++++++----
 pages/user/coupon/GetCoupon/index.vue |  5 +++--
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/pages/expert/index.vue b/pages/expert/index.vue
index 02d7893..4c45e27 100644
--- a/pages/expert/index.vue
+++ b/pages/expert/index.vue
@@ -26,7 +26,7 @@
 					<view class="line"></view>
 					<view class="unit">{{item.expertUnit}}</view>
 					<view class="info">{{item.expertInfo}}</view>
-					<view class="btn" :style="index%2?'':'margin-left: 192rpx;'">向ta留言咨询</view>
+					<view class="btn" :style="index%2?'':'margin-left: 192rpx;'" @click="contact">向ta留言咨询</view>
 				</view>
 			</view>
 		</view>
@@ -53,7 +53,15 @@
 					this.dataList = res.data;
 					uni.hideLoading();
 				})
-			}
+			},
+			// 客服
+			contact() {
+				wx.openCustomerServiceChat({
+				  extInfo: {url: 'https://work.weixin.qq.com/kfid/kfc3952c32f3d9b68c3'},
+				  corpId: 'ww8bcef4602d97a76a',
+				  success(res) {}
+				})
+			},
 		}
 	}
 </script>
diff --git a/pages/shop/ShoppingCart/index.vue b/pages/shop/ShoppingCart/index.vue
index fc3b319..8952fb9 100644
--- a/pages/shop/ShoppingCart/index.vue
+++ b/pages/shop/ShoppingCart/index.vue
@@ -107,7 +107,7 @@
 								<view class="item">
 									<image class="add-img" src="../../../static/images/add-btn.png" mode=""></image>
 									<image class="img" src="" mode=""></image>
-									<view class="goodsName more-t">LA PRAIRIE莱珀妮鱼子眼部紧颜液眼精华 20ml参天眼药水Beauteye
+									<view class="goodsName more-t">LA PRAIRIE莱珀妮鱼子眼部紧颜液眼精华 20ml参天眼药水Beauteye
 玫瑰滴眼液 12ml</view>
 									<view class="price">¥104.00</view>
 								</view>
@@ -118,7 +118,7 @@
 				
       </view>
       <!--购物车暂无商品-->
-      <view class="noCart" v-if="cartList.length === 0">
+      <view class="noCart" v-if="cartList.length === 0 && invalidProductList.length === 0">
       <!-- <view class="noCart" v-if="cartList.valid.length === 0 && cartList.invalid.length === 0"> -->
 				<view class="">购物车竟然是空的</view>
 				<view class="tip">去挑选满意的商品吧</view>
@@ -440,7 +440,7 @@
       delInvalidGoods: function () {
         let that = this,
           id = [],
-          list = that.cartList.invalid;
+          list = that.invalidProductList;
         list.forEach(function (val) {
           id.push(val.id);
         });
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index 8ca7aac..aa52a2d 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -193,7 +193,8 @@
 									<view class="cell">{{ item.name }}</view>
 									<view class="enName">{{ item.enName }}</view>
 								</view>
-								<button class="contact" v-if="item.name == '联系客服'" open-type="contact" hover-class="none" bindcontact="handleContact"></button>
+								<button class="contact" v-if="item.name == '联系客服'" hover-class="none" @click="contact"></button>
+								<!-- <button class="contact" v-if="item.name == '联系客服'" open-type="contact" hover-class="none" bindcontact="handleContact"></button> -->
 				      </view>
 				    </template>
 				  </view>
@@ -677,10 +678,17 @@ export default {
       })
     },
 		// 客服
-		handleContact (e) {
-			// console.log(e.detail.path)
-			// console.log(e.detail.query)
+		contact() {
+			wx.openCustomerServiceChat({
+			  extInfo: {url: 'https://work.weixin.qq.com/kfid/kfc3952c32f3d9b68c3'},
+			  corpId: 'ww8bcef4602d97a76a',
+			  success(res) {}
+			})
 		},
+		// handleContact (e) {
+		// 	// console.log(e.detail.path)
+		// 	// console.log(e.detail.query)
+		// },
   },
   onHide() {
     console.log('离开用户中心')
diff --git a/pages/user/coupon/GetCoupon/index.vue b/pages/user/coupon/GetCoupon/index.vue
index 9fd5775..2171cbd 100644
--- a/pages/user/coupon/GetCoupon/index.vue
+++ b/pages/user/coupon/GetCoupon/index.vue
@@ -56,8 +56,9 @@
 					<view class="type">{{'满减券' || '折扣券'}}</view>
 					<view class="tip">满{{ item.useMinPrice }}可用</view>
 					<!-- <view v-if="item._msg == '已过期'" class="btn btn-fail">不可用</view> -->
-					<view v-if="item.isUse === true" class="btn btn-white">去使用</view>
-					<view v-else class="btn">立刻领取</view>
+					<view v-if="item.isUse === true" class="btn btn-white">已领取</view>
+					<view v-else-if="item.isUse === 2" class="btn btn-fail">已领完</view>
+					<view v-else class="btn" @click="getCoupon(item.id, index)">立刻领取</view>
 				</view>
 		  </view>
 		</view>