UU币和优惠卷不能同时选中

components/order-confirm-popup/order-confirm-popup.vue

@@ -199,6 +199,14 @@ export default {
 			default: 1
 		}
 	}, 
+	watch: {
+    // // 监听props变化，更新内部数据
+    // couponData(val) {
+	// 	console.log('couponData',val);
+		    
+    // },
+     
+  },
 	data() {
 		//pageData.goods.type
 		return {
@@ -270,6 +278,8 @@ export default {
 		 * @param {String} method 支付方式
 		 */
 		changePayMethod(method) {
+			console.log('aaa');
+			
 			if (this.is_deduction == 0) {
 				// 如果是支付模式，检查可用的支付方式数量
 				let availablePayMethods = 0;
@@ -285,19 +295,7 @@ export default {
 			this.$emit('change-pay', method);
 		},
 
-		/**
+		
-		 * 检查按钮是否显示
-		 */
-		getBtnXianShi() {
-			if (this.pageData == null || this.pageData["xuangou"] == null) {
-				return true;
-			}
-			let xuangou = this.pageData["xuangou"];
-			if (xuangou.quanju_xiangou == 0) {
-				return true;
-			}
-			return false;
-		}
 	}
 }
 </script>

pages/shouye/detail_wuxian.vue

@@ -169,7 +169,8 @@
 				<view class="log-list">
 					<view class="log-item br10" v-for="(a, b) in logList" :key="b">
 						<view class="avatar">
-							<image :src="a.user_info && a.user_info.headimg" style="width:80rpx; height: 80rpx;"></image>
+							<image :src="a.user_info && a.user_info.headimg" style="width:80rpx; height: 80rpx;">
+							</image>
 						</view>
 
 						<view class="info">
@@ -747,6 +748,9 @@ export default {
 			if (type === 'useMoney') {
 				this.useMoney = !this.useMoney;
 			} else if (type === 'useIntegral') {
+				if (this.couponData!=null&&this.couponData.id!='') {
+					this.couponData = null;
+				}
 				this.useIntegral = !this.useIntegral;
 			} else if (type === 'useMoney2') {
 				this.useMoney2 = !this.useMoney2;
@@ -781,8 +785,15 @@ export default {
 				}
 			}
 
-			this.buyNum = num
+			this.buyNum = num;
 			 
+			let coupon_id = (this.couponData && this.couponData.id) || ''
+			if (coupon_id != '' && this.useIntegral) {
+				this.useIntegral = false;
+			} else if (this.useIntegral && coupon_id != '') {
+				this.couponData = null;
+				coupon_id = '';
+			}
 			this.req({
 				url,
 				data: {
@@ -791,7 +802,7 @@ export default {
 					use_money_is: this.useMoney ? 1 : 2,
 					use_integral_is: this.useIntegral ? 1 : 2,
 					use_money2_is: this.useMoney2 ? 1 : 2,
-					coupon_id: (this.couponData && this.couponData.id) || '',
+					coupon_id: coupon_id,
 
 					// ad_id: uni.getStorageSync('_ad_id')
 				},