Merge branch 'dev' into 'test'

Dev See merge request !1033

Merge branch 'dev' into 'test'
Dev See merge request !1033
后端研发-苏明海
2 parents 97ea2de7 6b18c7bd
Showing 11 changed files with 46 additions and 31 deletions
app.js
components/diy_advertising/diy_advertising.js
packageA/pages/goodsInfo/goodsInfo.wxml
packageC/pages/presell/cart/cart2.js
pages/cart/cart2_pt/cart2_pt.js
pages/giftpack/public/buy_com.wxml
pages/goods/goodsInfo/buy_integral_normal.wxml
pages/goods/goodsInfo/buy_pt.wxml
pages/goods/goodsInfo/goodsInfo.js
pages/team/team_ping/team_ping.wxml
pages/team/team_success/team_success.js
@@ -530,21 +530,40 @@ App({
             }
             if (!th.globalData.pk_store) {
                 var pick_id = 0;
-                //先找一个会员是否有设置默认的地址
-                if (th.globalData.userInfo.def_pickup_id) {
-                    pick_id = th.globalData.userInfo.def_pickup_id
-                }
-                //查找会员的注册的地址
-                else if (th.globalData.userInfo.pickup_id) {
+
+                var is_pricing_open_store=0;
+                var is_regstores=0;
+                if (conf.switch_list) {
+                    var t_swi = JSON.parse(conf.switch_list);
                     //--购买门店是否默认登记门店--
-                    if (conf.switch_list) {
-                        var t_swi = JSON.parse(conf.switch_list);
-                        if (t_swi.is_regstores) {
-                            pick_id = th.globalData.userInfo.pickup_id
-                        }
+                    is_regstores=t_swi.is_regstores;
+                    is_pricing_open_store=t_swi.is_pricing_open_store;
+                }
+
+                //-- 如果是区域价格提现，现在注册门店是默认 --
+                if(is_pricing_open_store){
+
+                    //查找会员的注册的地址
+                    if (th.globalData.userInfo.pickup_id) {
+                        pick_id = th.globalData.userInfo.pickup_id
+                    }
+                    //先找一个会员是否有设置默认的地址
+                    else if (th.globalData.userInfo.def_pickup_id) {
+                        pick_id = th.globalData.userInfo.def_pickup_id
                     }
+                }else{
+                    //先找一个会员是否有设置默认的地址
+                    if (th.globalData.userInfo.def_pickup_id) {
+                        pick_id = th.globalData.userInfo.def_pickup_id
+                    }
+                    //查找会员的注册的地址
+                    else if (th.globalData.userInfo.pickup_id && is_regstores) {
+                        pick_id = th.globalData.userInfo.pickup_id
+                    }
                 }
+
+
                 //---如果会员没有设置默认门店，同时也没有再注册的时候选择门店--
                 if (pick_id == 0) return func(null);
@@ -50,7 +50,7 @@ Component({
       //宽高比
       var ratio = imgwidth / imgheight;
       //计算的高度值
-      var viewHeight = 715 / ratio;
+      var viewHeight = 750 / ratio;
       var hei=this.data.max_sw_height;
       if (hei< viewHeight) {
@@ -303,7 +303,8 @@
 					<block wx:if="{{listServiceItem && listServiceItem.length > 0}}">
 						<view class="card fs28" wx:for="{{listServiceItem}}">
 							<view class="flex ai_c jc_sb" style="height: 88rpx;">
-								<view class="ellipsis-2 f1">{{item.projectName}}（{{item.frequency}}次）</view>
+								<view class="ellipsis-2 f1" wx:if="{{item.displayqty==1}}" >{{item.projectName}}（无限次）</view>
+                <view class="ellipsis-2 f1" wx:else>{{item.projectName}}（{{item.frequency}}次）</view>
 								<view class="pdl30 t-r">
 										<view class="rmb fs36 bold c-red">{{item.vipprice}}</view>
 										<view class="fs22 c-9 del" wx:if="{{item.showPrice}}">零售价：￥{{item.showPrice}}</view>
@@ -700,7 +700,8 @@ Page({
                             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'];
+                                     cut_good_weight += item['weight'] * item['buynum'];
+									 goods_weight += item['weight'] * item['buynum'];
                                 }
                                 if (back_data.weight_free > 0) {
                                     out_of_weight = (back_data.weight_free * 1000) - cut_good_weight;
@@ -431,7 +431,8 @@ Page({
                 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'];
+                         cut_good_weight += item['weight'] * item['buynum'];
+						 goods_weight += item['weight'] * item['buynum'];
                     }
                     if (back_data.weight_free > 0) {
                         out_of_weight = (back_data.weight_free * 1000) - cut_good_weight;
@@ -186,7 +186,7 @@
             <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
             <view class="fs30" style="color:black;">选择门店</view>
           </view>
-          <view class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>
+          <view  hidden="{{has_def && sys_switch.is_pricing_open_store}}"   class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>
         </view>
         <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
         <block wx:else>
@@ -39,7 +39,7 @@
 		                           <!-- 没有门店的时候 -->
 		                           <view  class="flex" bindtap="choice_store" wx:else>
 		                                 <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
-		                                 <view class="fs30" style="color:black;">选择门店</view>						  
+		                                 <view class="fs30" style="color:black;">选择门店</view>
 		                            </view>
 		                            <view hidden="{{has_def && sys_switch.is_pricing_open_store}}" class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view>
@@ -49,7 +49,7 @@
 		      				         <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
 		      						 <block wx:else>
 										  <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
-		      					     	  <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view>
+		      					     	  <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2}}">(库存不足)</view>
 		      						 </block>				       
 		      				   </block>		      				   	   
 		                       <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>
@@ -118,7 +118,7 @@
 				  						 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>
 				  					 </block>					 
 				  					 <block wx:else>	 						 						  																	
-				  							 <block wx:if="{{data.store_count<=0}}">
+				  							 <block wx:if="{{def_pick_store && !def_pick_store.CanOutQty}}">
 				  								  <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>	
 				  							 </block>
 				  							 <block wx:else>	
@@ -66,7 +66,7 @@
           <view hidden="{{has_def && sys_switch.is_pricing_open_store}}" class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view>
         </view>
 		<view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
-		<view class="no_store" wx:elif="{{is_normal && def_pick_store && def_pick_store.CanOutQty<=0}}">(库存不足)</view>
+		<view class="no_store" wx:elif="{{is_normal && def_pick_store && (!def_pick_store.CanOutQty || def_pick_store.CanOutQty<=0)}}">(库存不足)</view>
         <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.pickup_name}}">地址:{{def_pick_store.fulladdress}}</view>
       </view>
       <!----商品的属性项目---->
@@ -3385,10 +3385,10 @@ Page({
                     //---把数组组装进去---
                     th.deal_pickup(em);
                 } else {
-                    th.setData({def_pick_store: null, all_sto: null, only_pk: null, def_pickpu_list: null})
+                    th.setData({all_sto: null, only_pk: null, def_pickpu_list: null})
                 }
             } else {
-                th.setData({def_pick_store: null, all_sto: null, only_pk: null, def_pickpu_list: null})
+                th.setData({all_sto: null, only_pk: null, def_pickpu_list: null})
             }
         })
     },
@@ -63,16 +63,9 @@
             <view class="t-c flex {{item.pt_status==3?'jietitun':''}}">
               <view>共{{item.order_goods[0].goods_num}}件,</view>
               <block wx:if="{{item.is_zsorder==4}}">
-                <block wx:if="{{item.pt_status==3 || item.pt_status==4 || item.pt_status==5 || item.pt_status==6}}">
+
                   <view>金额：<text class="xc-wc">￥</text></view>
                   <view class='foot-l-wz fs35'>{{filters.toFix(item.user_money+item.order_amount+item.pt_tail_money,2)}}</view>
-                </block>
-                <block wx:else>
-                  <view class='foot-l-wz fs35' wx:if="item.is_zsorder==4">
-                    定金：￥{{filters.toFix(item.order_amount+item.user_money,2)}}</view>
-                  <view class='foot-l-wz fs35' wx:else>金额：￥{{filters.toFix(item.order_amount+item.user_money,2)}}</view>
-                  <view class='foot-l-wz2 fs35' wx:if="{{item.pt_tail_money>0}}">尾款：￥{{item.pt_tail_money}}</view>
-                </block>
               </block>
               <block wx:else>
@@ -237,7 +237,7 @@ Page({
       //只装5个
       var ordertx2=[],sf_num=0,ct_nun=teamlist.ct_num;
-      if(max_num){
+      if(max_num && !team_g.is_xuni_ct){
          ct_nun=parseInt(max_num);
          if (ct_nun < ordertx.length) ct_nun = ordertx.length;
       }