后端研发-苏明海 · 后端研发-苏明海 · 后端研发-苏明海 · 后端研发-苏明海 · yvan.ni · yvan.ni
Showing 13 changed files
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
packageC/pages/presell/cart/cart.js
packageC/pages/presell/cart/cart2.js
packageC/pages/presell/cart/cart2_pre.js
pages/cart/cart2/cart2.js
pages/cart/cart2_inte/cart2_inte.js
pages/cart/cart2_pt/cart2_pt.js
pages/cart/cart_wk/cart_wk.js
pages/giftpack/giftpacklist/giftpacklist.js
pages/giftpack/giftpacklist/giftpacklist.wxml
pages/giftpack/mygiftpack/mygiftpack.wxml
pages/team/team_success/team_success.wxml
utils/util.js
@@ -537,11 +537,12 @@ Page({
                     var cut_good_weight = 0;
                     for (let i in gd_arr_list) {
                         let item = gd_arr_list[i];
-                        if (back_data && back_data['is_by_all'] && !back_data.no_free_goods) {
-                            continue;
-                        }
-                        if (back_data && back_data['is_by_all'] && back_data.no_free_goods.indexOf(item.goods_id) == -1) {
-                            if (item['exp_sum_type'] == 2) {
+                        
+                        if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
+                            
+							
+							if (item['exp_sum_type'] == 2) {
+								goods_weight += item['weight'] * item['buynum'];
                                 cut_good_weight += item['weight'] * item['buynum'];
                             }
                             if (back_data.weight_free > 0) {
@@ -1821,12 +1821,11 @@ Page({
                         var cut_good_weight = 0;
                         for (let i in gd_arr_list) {
                             let item = gd_arr_list[i];
-                            if (back_data && back_data['is_by_all'] && !back_data.no_free_goods) {
-                                continue;
-                            }
-                            if (back_data && back_data['is_by_all'] && back_data.no_free_goods.indexOf(item.goods_id) == -1) {
+                           
+                            if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
                                 if (item['exp_sum_type'] == 2) {
-                                    cut_good_weight += item['weight'] * item['buynum'];
+                                    goods_weight += item['weight'] * item['buynum'];
+								 	cut_good_weight += item['weight'] * item['buynum'];
                                 }
                                 if (back_data.weight_free > 0) {
                                     out_of_weight = (back_data.weight_free * 1000) - cut_good_weight;
@@ -697,10 +697,8 @@ Page({
                         var cut_good_weight = 0;
                         for (let i in gd_arr_list) {
                             let item = gd_arr_list[i];
-                            if (back_data && back_data['is_by_all'] && !back_data.no_free_goods) {
-                                continue;
-                            }
-                            if (back_data && back_data['is_by_all'] && back_data.no_free_goods.indexOf(item.goods_id) == -1) {
+                            
+                            if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
                                 if (item['exp_sum_type'] == 2) {
                                     cut_good_weight += item['weight'] * item['buynum'];
                                 }
@@ -366,17 +366,17 @@ Page({
                     var cut_good_weight = 0;
                     for (let i in gd_arr_list) {
                         let item = data[i];
-                        if (back_data && back_data['is_by_all'] && !back_data.no_free_goods) {
-                            continue;
-                        }
-                        if (back_data && back_data['is_by_all'] && back_data.no_free_goods.indexOf(item.goods_id) == -1) {
+                      
+                        if (back_data && back_data['is_by_all'] &&  (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
                             if (item['exp_sum_type'] == 2) {
-                                cut_good_weight += item['weight'] * item['buynum'];
-                            }
-                            if (back_data.weight_free > 0) {
-                                out_of_weight = (back_data.weight_free * 1000) - cut_good_weight;
+								goods_weight += item['weight'] * item['buynum'];
+                                cut_good_weight += item['weight'] * item['buynum'];								
                             }
-                            continue;
+							if (back_data.weight_free > 0) {
+							    out_of_weight = (back_data.weight_free * 1000) - cut_good_weight;
+							}	
+							continue;
+                            
                         }
                         switch (item['exp_sum_type']) {
@@ -1737,17 +1737,18 @@ Page({
                             if (th.data.using_quan[pickid] && th.data.using_quan[pickid].isby == 1 && th.data.is_quan_by[pickid]) {
                                 continue;
                             }
-                            if (back_data && back_data['is_by_all'] && !back_data.no_free_goods) {
-                                continue;
-                            }
-                            if (back_data && back_data['is_by_all'] && back_data.no_free_goods.indexOf(item[j].goods_id) == -1) {
-                                if (item[j]['exp_sum_type'] == 2) {
+                            	
+                            if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item[j].goods_id) == -1)) {       
+								
+								if (item[j]['exp_sum_type'] == 2) {
                                     cut_good_weight += item[j]['weight'] * item[j]['goods_num'];
+									goods_weight += item[j]['weight'] * item[j]['goods_num'];
                                 }
-                                if (back_data.weight_free > 0) {
-                                    out_of_weight = (back_data.weight_free * 1000) - cut_good_weight;
-                                }
-                                continue;
+								if (back_data.weight_free > 0) {
+								    out_of_weight = (back_data.weight_free * 1000) - cut_good_weight;
+								}
+								continue;
+                            
                             }
                             switch (item[j]['exp_sum_type']) {
@@ -2128,17 +2129,17 @@ Page({
                             var cut_good_weight = 0;
                             for (let i in gd_arr_list) {
                                 let item = gd_arr_list[i];
-                                if (back_data && back_data['is_by_all']) {
-                                    if(!back_data.no_free_goods || !back_data.no_free_goods.length) continue;
-                                }
-                                if (back_data && back_data['is_by_all'] && back_data.no_free_goods.indexOf(item.goods_id) == -1) {
+                         
+                                if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
                                     if (item['exp_sum_type'] == 2) {
-                                        cut_good_weight += item['weight'] * item['buynum'];
-                                    }
-                                    if (back_data.weight_free > 0) {
-                                        out_of_weight = (back_data.weight_free * 1000) - cut_good_weight;
+                                        goods_weight += item['weight'] * item['buynum'];
+										cut_good_weight += item['weight'] * item['buynum'];										
                                     }
-                                    continue;
+									if (back_data.weight_free > 0) {
+									    out_of_weight = (back_data.weight_free * 1000) - cut_good_weight;
+									}
+									continue;
+                                   
                                 }
                                 switch (item['exp_sum_type']) {
@@ -451,12 +451,10 @@ Page({
             var cut_good_weight = 0;
             for (let i in gd_arr_list) {
                 let item = gd_arr_list[i];
-                if (back_data && back_data['is_by_all']) {
-                   if(!back_data.no_free_goods || !back_data.no_free_goods.length) continue;
-                }
-
-                if (back_data && back_data['is_by_all'] && back_data.no_free_goods.indexOf(item.goods_id) == -1) {
+              
+                if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1) ) {
                     if (item['exp_sum_type'] == 2) {
+						goods_weight += item['weight'] * item['buynum'];
                         cut_good_weight += item['weight'] * item['buynum'];
                     }
                     if (back_data.weight_free > 0) {
@@ -428,10 +428,8 @@ Page({
             var cut_good_weight = 0;
             for (let i in gd_arr_list) {
                 let item = gd_arr_list[i];
-                if (back_data && back_data['is_by_all'] && !back_data.no_free_goods) {
-                    continue;
-                }
-                if (back_data && back_data['is_by_all'] && back_data.no_free_goods.indexOf(item.goods_id) == -1) {
+               
+                if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
                     if (item['exp_sum_type'] == 2) {
                         cut_good_weight += item['weight'] * item['buynum'];
                     }
@@ -491,12 +491,11 @@ Page({
             var cut_good_weight = 0;
             for (let i in gd_arr_list) {
                 let item = gd_arr_list[i];
-                if (back_data && back_data['is_by_all']) {
-                    if(!back_data.no_free_goods || !back_data.no_free_goods.length) continue;
-                }
-                if (back_data && back_data['is_by_all'] && back_data.no_free_goods.indexOf(item.goods_id) == -1) {
+                
+                if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
                     if (item['exp_sum_type'] == 2) {
-                        cut_good_weight += item['weight'] * item['buynum'];
+                        goods_weight += item['weight'] * item['buynum'];
+						cut_good_weight += item['weight'] * item['buynum'];
                     }
                     if (back_data.weight_free > 0) {
                         out_of_weight = (back_data.weight_free * 1000) - cut_good_weight;
@@ -228,6 +228,11 @@ Page({
             giftTitle: res.data.data.giftTitle,
             default_color: res.data.data.bgcolor
           })
+
+          if(res.data.data.iswarelbtype==1)  {
+              th.setData({iswarelbtype:1})
+          }
+
           if (!res.data.data.giftRemark || res.data.data.giftRemark == '') {
             th.setData({
               giftRemark: '暂无详情......'
@@ -18,13 +18,13 @@
 		     </text>
 		  </block>
 		  <block wx:else>
-		    <text class="data-v-3a5b7e36" wx:if="{{isBuy==0}}">{{"兑换结束时间："+giftDate}}</text>
+		    <text class="data-v-3a5b7e36" wx:if="{{isBuy==0 && iswarelbtype}}">{{"兑换结束时间："+giftDate}}</text>
 		    <text class="data-v-3a5b7e36" wx:else>
 		        {{"活动结束时间："+giftDate}}
 		    </text>
 		  </block>
 		</view>
-    <view class="top_time data-v-3a5b7e36" wx:if="{{flag == 1}}">
+    <view class="top_time data-v-3a5b7e36" wx:if="{{flag == 1 && iswarelbtype}}">
 			<text class="data-v-3a5b7e36" wx:if="{{exchangeType == 1}}">
 			   {{"兑换时间：领取后"+exchangeDay+"天内兑换"}}
 			</text>
@@ -81,7 +81,8 @@
           <view class="content_ware_price">
             <text>{{"零售价:￥"+item.giftPosPrice}}</text>
           </view>
-          <view class="content_ware_time">
+
+          <view class="content_ware_time" wx:if="{{item.iswarelbtype==1}}">
             <block wx:if="{{getDate>item.endTime}}">
             <text>{{"兑换截至日期:"+item.endTime}}</text>
             </block>
@@ -89,6 +90,7 @@
               <text>{{"距兑换开始时间: "+item.starTime}}</text>
             </block>
           </view>
+
         </view>
       </view>
       <view class="content_box_button" bindtap="navigateTo" data-url="/pages/giftpack/giftpacklist/giftpacklist?isBuy=0&lbId={{item.lbId}}&orderSn={{item.orderSn}}">
@@ -96,7 +96,8 @@
           <span wx:if="{{item.is_pt_tz==1}}">团长</span>
         </view>
         <view class='d' wx:for="{{sf_arr}}">
-          <image  src='{{iurl}}/miniapp/images/anonymous/anonymous{{item}}.png'></image>
+           <image wx:if="{{teamgroup.is_xuni_ct}}"  src='{{iurl}}/miniapp/images/anonymous/anonymous{{item}}.png'></image>
+           <image wx:else src='{{iurl}}/miniapp/images/shafa.png'></image>
         </view>
         <view class='xc-ellipsis-img flex-vertical' wx:if="{{ordertx.length>5}}">
@@ -514,6 +514,83 @@ function wx_back() {
     }
 }
+
+//-------------------计算物流---------------
+function calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight,
+                          goods_piece, user_addr, back_data,rs) {
+    var price = 0;
+    price += parseFloat(o_shipping_price);
+    if (user_addr == null) {
+        return 0;
+    }
+    //如果是包邮
+    if (back_data && back_data.is_by_all && !back_data.no_free_goods && out_of_weight >= 0) {
+        return 0;
+    }
+    //计算物流的config  item;
+    var item = null;
+
+    //------------循环获取config-----------
+    function get_wuliu_config(region_id, code, rs) {
+        var item = null, rslist = rs.pageData;
+        for (var i = 0; i < rslist.length; i++) {
+            if (rslist[i].code == code && rslist[i].region_id == region_id) {
+                item = rslist[i];
+            }
+        }
+        return item;
+    }
+    //-------循环获取config,code default-------
+    function get_wuliu_default(code, rs) {
+        var item = null, rslist = rs.pageData;
+        for (var i = 0; i < rslist.length; i++) {
+            if (rslist[i].shipping_code == code && rslist[i].is_default == 1) {
+                item = rslist[i];
+            }
+        }
+        return item;
+    }
+
+    //先根据 镇 县 区找计算的config
+    item = get_wuliu_config(user_addr.district, code, rs);
+    if (item == null) item = get_wuliu_config(user_addr.city, code, rs);
+    if (item == null) item = get_wuliu_config(user_addr.province, code, rs);
+    if (item == null) item = get_wuliu_default(code, rs);
+    if (item == null) return o_shipping_price;
+    var fw_price = 0, fp_price = 0;
+    item = item.config;
+    if (item == null) return o_shipping_price;
+
+    //------超出重量----------
+    if (back_data && back_data.is_by_all &&  out_of_weight<0){
+        goods_weight+=out_of_weight;
+        if(goods_weight<=0) goods_weight=-1;
+    }
+
+    //------按重量----------
+    if (goods_weight >= 0 && item['money']) {
+        fw_price = parseFloat(item['money']);
+        if (goods_weight > item['first_weight']) {
+            var fw = goods_weight - item['first_weight'];
+            var n = Math.ceil(fw / item['second_weight'])
+            fw_price = fw_price + n * parseFloat(item['add_money']);
+        }
+    }
+
+    //------按件数----------
+    if (goods_piece > 0 && item['piecemoney']) {
+        fp_price = parseFloat(item['piecemoney']);
+        if (goods_piece > item['first_piece']) {
+            var fp = goods_piece - item['first_piece'];
+            var m = Math.ceil(fp / item['second_piece'])
+            fp_price = fp_price + m * parseFloat(item['add_piecemoney']);
+        }
+    }
+
+    var rspice = parseFloat(price + fw_price + fp_price);
+    return rspice;
+}
+
 module.exports = {
     formatTime: function(e, r) {
         var t = e ? new Date(1e3 * e) : new Date(), n = t.getFullYear(), o = t.getMonth() + 1, a = t.getDate(), u = t.getHours(), i = t.getMinutes(), f = t.getSeconds(), s = function(e) {
@@ -627,4 +704,5 @@ module.exports = {
 	ajax_ok2:ajax_ok2, //将JS数组对象按其某个键值重组成Map对象
     wx_back:wx_back,
     _debounce,
+    calculatewuliu:calculatewuliu, //计算物流的函数进行抽象
 };