diff --git a/app.js b/app.js index 405e923..4eb2d7e 100644 --- a/app.js +++ b/app.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); diff --git a/components/diy_advertising/diy_advertising.js b/components/diy_advertising/diy_advertising.js index 2fabf60..17bda28 100644 --- a/components/diy_advertising/diy_advertising.js +++ b/components/diy_advertising/diy_advertising.js @@ -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) { diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml index d0d01ac..abf7f1b 100644 --- a/packageA/pages/goodsInfo/goodsInfo.wxml +++ b/packageA/pages/goodsInfo/goodsInfo.wxml @@ -303,7 +303,8 @@ - {{item.projectName}}({{item.frequency}}次) + {{item.projectName}}(无限次) + {{item.projectName}}({{item.frequency}}次) {{item.vipprice}} 零售价:¥{{item.showPrice}} diff --git a/packageC/pages/presell/cart/cart2.js b/packageC/pages/presell/cart/cart2.js index a3b371f..82f4374 100644 --- a/packageC/pages/presell/cart/cart2.js +++ b/packageC/pages/presell/cart/cart2.js @@ -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; diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js index a31009f..99b57cb 100644 --- a/pages/cart/cart2_pt/cart2_pt.js +++ b/pages/cart/cart2_pt/cart2_pt.js @@ -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; diff --git a/pages/giftpack/public/buy_com.wxml b/pages/giftpack/public/buy_com.wxml index 1e03985..de45b20 100644 --- a/pages/giftpack/public/buy_com.wxml +++ b/pages/giftpack/public/buy_com.wxml @@ -186,7 +186,7 @@ 选择门店 - 更多门店 + (库存不足) diff --git a/pages/goods/goodsInfo/buy_integral_normal.wxml b/pages/goods/goodsInfo/buy_integral_normal.wxml index cfad7b3..4333939 100644 --- a/pages/goods/goodsInfo/buy_integral_normal.wxml +++ b/pages/goods/goodsInfo/buy_integral_normal.wxml @@ -39,7 +39,7 @@ - 选择门店 + 选择门店 @@ -49,7 +49,7 @@ (库存不足) (配送不匹配) - (库存不足) + (库存不足) 地址:{{def_pick_store.fulladdress}} @@ -118,7 +118,7 @@ 请先选择门店 - + 库存不足 diff --git a/pages/goods/goodsInfo/buy_pt.wxml b/pages/goods/goodsInfo/buy_pt.wxml index 123dfb1..8964637 100644 --- a/pages/goods/goodsInfo/buy_pt.wxml +++ b/pages/goods/goodsInfo/buy_pt.wxml @@ -66,7 +66,7 @@ (配送不匹配) - (库存不足) + (库存不足) 地址:{{def_pick_store.fulladdress}} diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 3ca5ffb..16a22c0 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -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}) } }) }, diff --git a/pages/team/team_ping/team_ping.wxml b/pages/team/team_ping/team_ping.wxml index 4b4b68e..8700061 100644 --- a/pages/team/team_ping/team_ping.wxml +++ b/pages/team/team_ping/team_ping.wxml @@ -63,16 +63,9 @@ 共{{item.order_goods[0].goods_num}}件, - + 金额: {{filters.toFix(item.user_money+item.order_amount+item.pt_tail_money,2)}} - - - - 定金:¥{{filters.toFix(item.order_amount+item.user_money,2)}} - 金额:¥{{filters.toFix(item.order_amount+item.user_money,2)}} - 尾款:¥{{item.pt_tail_money}} - diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js index 9428a9b..38d7dc9 100644 --- a/pages/team/team_success/team_success.js +++ b/pages/team/team_success/team_success.js @@ -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; }