宇宙无敌M1处理器的MacBook Pro 4 роки тому
батько
коміт
f2cae3241d

+ 5 - 4
components/page-component/app-attr/app-attr.vue

xqd
@@ -275,13 +275,14 @@
 		watch: {
 			show() {
 				if (this.display === 'block') {
-					this.selectAttr = null;
+					this.selectAttr = null;
+					this.close();
+				} else if (this.display === 'none') {
 					this.serviceId = null
 					this.screenDescription = ""
 					this.service_label = null
-					this.card_id = null
-					this.close();
-				} else if (this.display === 'none') {
+					this.card_id = null
+					this.service_screen = null
 					this.alert();
 				}
 			},

+ 3 - 2
components/page-component/goods/u-attr.vue

xqd xqd
@@ -361,7 +361,8 @@
 				});
 				this.identifier(newGroup, attrNum_0, select);
 				this.getservice(newGroup, attrNum_0, select)
-				if (select.length !== newGroup.length) {
+				if (select.length !== newGroup.length) {
+					console.log("进来")
 					this.$emit('check', null, 1);
 				}
 			},
@@ -447,7 +448,7 @@
 			},
 			rightSubmit: function() {
 
-				console.log(this.checked)
+				console.log(this.checked,"===========----------+9")
 				let _this = this
 				if (!this.checked) {
 					uni.showToast({

+ 9 - 0
pages/order-submit/app-submit-goods.vue

xqd
@@ -97,6 +97,15 @@
                                     </view>
                                 </view>
                             </view>
+							<view class="screen" v-if="goodsItem.service_list&&JSON.stringify(goodsItem.service_list)!='[]'&&JSON.stringify(goodsItem.service_list)!='{}'" style="display:flex;justify-content: space-between;margin-top:4px;" :data="goodsItem.service_list.id">
+								<view class="screen_left" style="font-size: 24rpx;color: #999999;">×1
+									<text class="goods-price-unit" style="padding-left:10px;">{{goodsItem.service_list.name}}{{goodsItem.service_list.price}}元</text>  
+								</view>
+								<view class="screen_right">
+									<text class="goods-price-unit">¥</text> 
+									{{goodsItem.service_list.price}}  
+								</view>
+							</view>
                         </view>
                     </view>
                     <view v-for="(discount,discountIndex) in goodsItem.discounts"

+ 7 - 8
plugins/composition/detail/detail.vue

xqd xqd xqd xqd xqd xqd
@@ -85,7 +85,6 @@
                 });
             },
 			isCanbuy(goods){
-				console.log(goods)
 				if (this.$user.isLogin() && this.$store.state.user.info) {
 				    let  member_level =this.$store.state.user.info.identity.member_level;
 					if(member_level<goods.member_level){
@@ -105,7 +104,6 @@
 								  console.log('用户点击取消');
 								  return true;
 								}
-				
 							}
 						})
 						return true;
@@ -139,9 +137,9 @@
 					}
 				}
 				
-				// if(!isCanbuy){
-				// 	return;
-				// }
+				if(!isCanbuy){
+					return;
+				}
 				
 				
                 if(that.noAttrList.length > 0) {
@@ -208,8 +206,7 @@
                                     id: that.list[i].host_list[0].goods_id,
                                     num: 1,
                                     goods_attr_id: that.list[i].host_list[0].choose_attr.goods_attr_id,
-                                    attr: attr,
-									
+                                    attr: attr
                                 })
                             }
                             let noChoose = true;
@@ -226,7 +223,8 @@
                                         id: that.list[i].goods_list[y].goods_id,
                                         num: 1,
                                         goods_attr_id: that.list[i].goods_list[y].choose_attr.goods_attr_id,
-                                        attr: attr
+                                        attr: attr,
+										service_label:that.list[i].goods_list[y].choose_attr.service_label
                                     })
                                 }
                             }
@@ -284,6 +282,7 @@
                 this.noAttrList = e;
             },
             getTotal(e,max_discount) {
+				console.log(e)
                 this.total = e;
                 if(max_discount) {
                     this.max_discount = max_discount.toFixed(2)

+ 9 - 2
plugins/pt/goods/goods.vue

xqd xqd
@@ -491,13 +491,13 @@
                 this.$set(this.detail.goods_coupon_center[index], 'is_receive', 1);
             },
             attrTap(data, number) {
+				this.number = number;
+				this.selectAttr = data;
                 for (let i = 0; i < this.aloneAttr.length; i++) {
                     if (this.aloneAttr[i].sign_id === data.sign_id) {
                         this.price = this.aloneAttr[i].price;
                     }
                 }
-                this.number = number;
-                this.selectAttr = data;
             },
             shop(data) {
 				if (this.$user.isLogin() && this.$store.state.user.info) {
@@ -594,6 +594,13 @@
                         this.again = Math.random();
                     });
                 } else {
+					if(this.selectAttr === null){
+						uni.showToast({
+							title:"请选择规格",
+							icon:"none"
+						})
+						return false
+					}
                     let attrs = [];
                     this.selectAttr.attr_list.forEach(item => {
                         attrs.push({

+ 4 - 4
siteinfo.js

xqd
@@ -1,9 +1,9 @@
 var siteinfo = {
     'acid': -1,
     'version': '4.3.57',
-	// 'siteroot': 'https://t12.9026.com/app/index.php',
-	// 'apiroot': 'https://t12.9026.com/web/index.php?_mall_id=21989',
-    'siteroot': 'https://quanyouhui.9026.com/app/index.php',
-    'apiroot': 'https://quanyouhui.9026.com/web/index.php?_mall_id=21989',
+	'siteroot': 'https://t12.9026.com/app/index.php',
+	'apiroot': 'https://t12.9026.com/web/index.php?_mall_id=21989',
+    // 'siteroot': 'https://quanyouhui.9026.com/app/index.php',
+    // 'apiroot': 'https://quanyouhui.9026.com/web/index.php?_mall_id=21989',
 };
 module.exports = siteinfo;