wcni 5 éve
szülő
commit
f176bf3f85
3 módosított fájl, 16 hozzáadás és 6 törlés
  1. 2 1
      pages/index/cart.vue
  2. 7 4
      pages/index/shop.vue
  3. 7 1
      pages/myCenter/orderdetail.vue

+ 2 - 1
pages/index/cart.vue

@@ -20,7 +20,7 @@
 			  				    <van-checkbox  checked-color="#D9332E" :name="index"></van-checkbox>
 			  				  </van-checkbox-group> 
 			  			  </view>
-			  			  <view style="flex: 15;">
+			  			  <view style="flex: 15;"  @click.stop="checkboxChange()">
 			  			  <van-card
 			  			    title-class="changewidth"
 			  				price-class ="priceClass"
@@ -249,6 +249,7 @@
 			},
 			// 单选
 			checkboxChange(e) {
+			  console.log("kkkk")
 			  this.checkboxList = []
 			  e.detail.forEach((item, idx) => {
 				  this.$set(this.checkboxList, idx, item)

+ 7 - 4
pages/index/shop.vue

@@ -429,7 +429,7 @@
 						this.$msg("商品已下架");
 						return;
 					}
-					if(this.specSelected.length == 0&&this.datalist.spec_list.length != 0) {
+					if(this.specSelected.length == 0&&this.datalist.spec_list.length != 0 ) {
 						this.$msg("请选择规格数量");
 						this.specClass = 'show';
 						return;
@@ -478,7 +478,11 @@
 						this.specSelected = this.datalist.goods_list;
 						return;
 					}
-						if(this.specSelected.length == 0&&this.datalist.spec_list.length != 0) {
+					if(this.chosename.length == 0) {
+						this.specClass = 'show';
+						return;
+					}
+						if(this.specSelected.length == 0&&this.datalist.spec_list.length != 0 ) {
 							this.specClass = 'show';
 							this.$msg("请选择规格数量");
 							return;
@@ -513,7 +517,6 @@
 					this.$msg("商品没库存啦");
 					return;
 				}
-				
 				let obj = {};
 				obj.spec_id = first.spec_id;
 				obj.value_name = chose.value_name;
@@ -558,7 +561,7 @@
 					this.firstprice = items.goods_price;
 					this.totalprice = items.goods_price*this.shopnumber;
 				}
-				console.log(this.specSelected);
+			
 				// if(this.arrayId.length == this.datalist.spec_list.length) {
 					
 				// }

+ 7 - 1
pages/myCenter/orderdetail.vue

@@ -38,7 +38,13 @@
 					url:`/pages/myOrder/paymoment?order_id=${order_id}&prices=${prices}`
 				})
 				  <view class="deleChange" v-if="item.order_state == 40 && item.evaluation_state == 0">去评价</view> -->
-				  <view class="deleChange" @click="gopay(item)">{{item.operate}}</view> 
+				 
+				 <view class="deleChange"  @click="gopay(item)" v-if="item.order_state == 10">去付款</view>
+				 <view class="deleChange"  @click="gopay(item)" v-if="item.order_state == 20&&item.shipping_type==0">催单</view>
+				 <view class="deleChange"  @click="gopay(item)" v-if="item.order_state == 20&&item.shipping_type!=0">联系酒店</view>
+				 <view class="deleChange"  @click="gopay(item)" v-if="item.order_state == 30">确认收货</view> 
+				 <view class="deleChange"  @click="gopay(item)" v-if="item.order_state == 40 && item.evaluation_state == 0">去评价</view>
+				 <!-- <view class="deleChange" @click="gopay(item)">{{item.operate}}</view> -->
 			   </view>
 		  </view>