多活动的优化

yvan.ni
1 parent 72e43ad6
Showing 3 changed files with 27 additions and 39 deletions
components/cart_collect_temp/cart_collect_temp.js
pages/goods/goodsList/goodsList.js
pages/goods/search/search.js
@@ -71,46 +71,14 @@ Component({
                     return false;
                 }
             }
-            //判断物流是否一致
-            if(ob.selected){
-              let distr_t=this.properties.distr_t
-              let distr_type=itr.distr_type
-              let all_collocation_list=this.properties.all_collocation_list              
-              let disoff=0
-              if(distr_t==0){
-                all_collocation_list.map(item=>{                  
-                  if (distr_type!=0 && item.selected && item.distr_type !=0 && item.distr_type !=distr_type) {
-                    disoff=1
-                  }
-                })
-              }else{
-                all_collocation_list.map(item=>{
-                  if (distr_type!=0 && item.selected && item.distr_type !=0 && item.distr_type !=distr_type) {
-                    disoff=1
-                  }
-                })
-                if(!disoff){
-                  if (distr_type !=distr_t) {
-                    disoff=1
-                  }
-                }
-              }
-              if(disoff){
-                wx.showToast({
-                  title: "商品的配送方式不一致",
-                  icon: 'none',
-                  duration: 2000
-                })
-                return false;
-              }
-            }
-            
  
+            this.triggerEvent('childFun', ob);
  
-            var txt = "all_collocation_list[" + index + "].selected"
+            if(!ob.selected) {
+                var txt = "all_collocation_list[" + index + "].selected"
+                this.setData({[txt]: ob.selected})
  
-            this.setData({[txt]: ob.selected})
-            this.triggerEvent('childFun', ob);
+            }
         },
  
         //图片失败，默认图片
@@ -185,6 +153,20 @@ Component({
             func(isok);
         },
  
+        set_sele(index){
+            var txt = "all_collocation_list[" + index + "].selected"
+            this.setData({[txt]: 1})
+        },
+
+        //-- 清理所有的选择 --
+        clear_sele(){
+            var all_collocation_list=this.data.all_collocation_list;
+            for (let i = 0; i <all_collocation_list.length ; i++) {
+                all_collocation_list[i].selected=0;
+            }
+            this.setData({all_collocation_list})
+        }
+
  
     }
 })
 \ No newline at end of file
@@ -297,7 +297,6 @@ Page({
 		}
  
         t +="&page=" + e.data.currentPage;
-
         wx.showLoading({});
  
 		getApp().request.promiseGet(t, {data:{is_mainshow: 1, isonsale: 1, store_id: oo.stoid}}).then(async res=>{
@@ -371,6 +370,9 @@ Page({
                           if(res && res.data) prom=res.data.data;
                           if (prom != null && prom.is_end==0 && prom.end_time>now && (prom.start_time<now || (prom_type!=2 &&  prom.show_time && prom.show_time<now)) ) {
                               item.prom_price = res.data.data.price;
+                              if(prom_type==4){
+                                  item.prom_price= res.data.data.addmoney;
+                              }
                               if(res.data.data.user_price) item.prom_price=res.data.data.user_price;
                               // var vNum=res.data.data.virtual_num?res.data.data.virtual_num:0;
                               // var vNum1=res.data.data.virtualNum?res.data.data.virtualNum:0;
@@ -261,7 +261,7 @@ Page({
                             }).then(res => {
                                 if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
                                     var arr = res.data.data[0];
-                                    item.prom_price = arr.luck_goods_price;
+                                    item.prom_price = arr.presell_price;
                                     item.sales_sum = arr.buy_goodnum + (arr.virtual_qty ? arr.virtual_qty : 0);
                                 }
                             })
@@ -277,6 +277,10 @@ Page({
  
                                 if (prom != null && prom.is_end == 0 && prom.end_time > now && (prom.start_time < now || (prom_type!=2 && prom.show_time && prom.show_time < now))) {
                                     item.prom_price = res.data.data.price;
+                                    if(prom_type==4){
+                                        item.prom_price= res.data.data.addmoney;
+                                    }
+
                                     if (res.data.data.user_price) item.prom_price = res.data.data.user_price;
                                     var vNum = prom.virtual_num ? prom.virtual_num : 0;
                                     var vNum1 = prom.virtualNum ? prom.virtualNum : 0;