wxd / MShopWeApp

Commit 51f1629ea56ef9d67906243d390718bb7730eece

Authored by WXD-SEASON\season
2 parents 0bf3aea2 3a960fe7

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into test

Inline Side-by-side
Showing 12 changed files with 42 additions and 22 deletions
... ... @@ -1319,6 +1319,17 @@ App({
1319 1319 th.goto(url);
1320 1320  
1321 1321 })
  1322 + },
  1323 +
  1324 + //-- 如果是新会员没有地址的时候，自提的时候可以不用管 --
  1325 + is_no_addr(th,exp_type){
  1326 + exp_type=parseInt(exp_type+'');
  1327 + if ( [0,2].indexOf(exp_type)>-1 && th.data.user_addr == null) {
  1328 + th.setData({ submit: 0});
  1329 + return true;
  1330 + }
  1331 + return false;
  1332 +
1322 1333 }
1323 1334  
1324 1335 });
... ...
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
  View file @51f1629
... ... @@ -2324,7 +2324,8 @@ Page({
2324 2324 //------------立即购买-------------
2325 2325 if (th.data.is_b_now == 1 && th.data.bn_goods.prom_type != 5) {
2326 2326  
2327   - if (th.data.bn_exp_type == 0 && th.data.user_addr == null) {
  2327 + //if (th.data.bn_exp_type == 0 && th.data.user_addr == null) {
  2328 + if(getApp().is_no_addr(th,th.data.bn_exp_type)){
2328 2329 ff = false;
2329 2330 getApp().my_warnning("请选择收货地址", 0, th);
2330 2331 th.data.is_summit_ing = 0;
... ...
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
  View file @51f1629
... ... @@ -1195,7 +1195,8 @@ Page({
1195 1195 // console.log("buy_new");
1196 1196  
1197 1197 //如果不是阶梯团，或者是普通购买，商家选择了物流，以及地址为空的时候
1198   - if (th.data.bn_exp_type == 0 && th.data.user_addr == null && (th.data.kt_type != 3 || th.data.bn_goods.is_normal ==
  1198 + //if (th.data.bn_exp_type == 0 && th.data.user_addr == null
  1199 + if (getApp().is_no_addr(th,th.data.bn_exp_type) && (th.data.kt_type != 3 || th.data.bn_goods.is_normal ==
1199 1200 1)) {
1200 1201 ff = false;
1201 1202 getApp().my_warnning("请选择收货地址", 0, this);
... ...
packageC/pages/payForAnother/payForAnother.js
  View file @51f1629
... ... @@ -2038,7 +2038,8 @@ Page({
2038 2038 //------------立即购买-------------
2039 2039 if (th.data.is_b_now == 1 && th.data.bn_goods.prom_type != 5) {
2040 2040  
2041   - if (th.data.bn_exp_type == 0 && th.data.user_addr == null) {
  2041 + //if (th.data.bn_exp_type == 0 && th.data.user_addr == null) {
  2042 + if(getApp().is_no_addr(th,th.data.bn_exp_type)){
2042 2043 ff = false;
2043 2044 getApp().my_warnning("请选择收货地址", 0, th);
2044 2045 th.data.is_summit_ing = 0;
... ...
packageC/pages/presell/cart/cart.js
  View file @51f1629
... ... @@ -2392,10 +2392,8 @@ Page({
2392 2392 },
2393 2393 //选择支付方式
2394 2394 set_pay_type: function (e) {
2395   -
2396 2395 if(this.data.paying) return false;
2397 2396 this.data.paying=1;
2398   -
2399 2397 var type = e.currentTarget.dataset.type;
2400 2398 this.to_pay_type(type);
2401 2399 },
... ... @@ -2404,12 +2402,11 @@ Page({
2404 2402 to_pay_type: function (ind) {
2405 2403 var th = this;
2406 2404 //--物流支付时要有地址--
2407   - if (th.data.exp_type == 0 && th.data.user_addr == null) {
  2405 + //if (th.data.exp_type == 0 && th.data.user_addr == null) {
  2406 + if(getApp().is_no_addr(th,th.data.exp_type)){
  2407 + this.data.paying=0;
2408 2408 return getApp().my_warnning("请选择收货地址", 0, th);
2409 2409 }
2410   -
2411   -
2412   -
2413 2410 th.data.exp_type=parseInt(th.data.exp_type+'');
2414 2411 //---支付参数--
2415 2412 var dd = {
... ... @@ -2492,7 +2489,7 @@ Page({
2492 2489 getApp().my_warnning("支付成功", 1, th);
2493 2490 var send_time = th.data.pre_arr.delivery_date;
2494 2491 if (th.data.pre_arr.delivery_type == 2) {
2495   - send_time = th.data.pre_arr.delivery_daynum * 3600;
  2492 + send_time = ut.gettimestamp() +th.data.pre_arr.delivery_daynum * 3600*24;
2496 2493 }
2497 2494 th.setData({ isclose: 0, 'order.order_status': 1, 'order.pay_status': 1, 'wait_wk': 0, 'presell.tail_pay_state': 1, 'wait_fh': 1, send_time: send_time });
2498 2495 th.data.paying=0;
... ... @@ -2525,7 +2522,7 @@ Page({
2525 2522 if (t.data.code == 0) {
2526 2523 var send_time = th.data.pre_arr.delivery_date;
2527 2524 if (th.data.pre_arr.delivery_type == 2) {
2528   - send_time = th.data.pre_arr.delivery_daynum * 3600;
  2525 + send_time = ut.gettimestamp() +th.data.pre_arr.delivery_daynum * 3600*24;
2529 2526 }
2530 2527 //---用余额支付---
2531 2528 getApp().my_warnning("支付成功", 1, th);
... ...
packageC/pages/presell/cart/cart.wxml
  View file @51f1629
... ... @@ -328,10 +328,10 @@
328 328 </view>
329 329 </block>
330 330  
331   - <block else>
332   - <view class="item" wx:if="{{order.shipping_status>0}}">
  331 + <block wx:else>
  332 + <view class="item" wx:if="{{order.shipping_price>0}}">
333 333 <view>配送费用</view>
334   - <view class="co-red">￥ {{filters.toFix(order.shipping_status,2)}}元</view>
  334 + <view class="co-red">￥ {{filters.toFix(order.shipping_price,2)}}元</view>
335 335 </view>
336 336  
337 337 <view class="item" wx:if="{{order.coupon_price>0}}">
... ...
packageC/pages/presell/cart/cart2.js
  View file @51f1629
... ... @@ -1116,11 +1116,13 @@ Page({
1116 1116 //------------立即购买-------------
1117 1117 if (th.data.is_b_now == 1 && th.data.bn_goods.prom_type != 5) {
1118 1118  
1119   - if( [0,2].indexOf(th.data.bn_exp_type)>-1 && th.data.user_addr == null) {
  1119 + //if( [0,2].indexOf(th.data.bn_exp_type)>-1 && th.data.user_addr == null) {
  1120 + if(getApp().is_no_addr(th,th.data.bn_exp_type)){
1120 1121 ff = false;
1121 1122 getApp().my_warnning("请选择收货地址", 0, th);
1122 1123 th.data.is_summit_ing = 0;
1123 1124 }
  1125 +
1124 1126 if (!ff) return false;
1125 1127 var addr = th.data.user_addr;
1126 1128 if (th.data.bn_exp_type == 1) addr = null;
... ...
packageC/pages/presell/cart/cart2_pre.js
  View file @51f1629
... ... @@ -719,7 +719,8 @@ Page({
719 719 //------------立即购买-------------
720 720  
721 721 //如果不是阶梯团，或者是普通购买，商家选择了物流，以及地址为空的时候
722   - if (th.data.bn_exp_type == 0 && th.data.user_addr == null && (th.data.kt_type != 3 || th.data.bn_goods.is_normal == 1)) {
  722 + //th.data.bn_exp_type == 0 && th.data.user_addr == null
  723 + if (getApp().is_no_addr(th,th.data.bn_exp_type) && (th.data.kt_type != 3 || th.data.bn_goods.is_normal == 1)) {
723 724 ff = false;
724 725 getApp().my_warnning("请选择收货地址", 0, this);
725 726 this.data.is_summit_ing = 0;
... ...
packageE/pages/cart/cart2/cart2.js
  View file @51f1629
... ... @@ -3815,7 +3815,8 @@ Page({
3815 3815 var ff = true;
3816 3816 //------------立即购买-------------
3817 3817 if (th.data.is_b_now == 1 && th.data.bn_goods.prom_type != 5) {
3818   - if ( [0,2].indexOf(th.data.bn_exp_type)>-1 && th.data.user_addr == null) {
  3818 + //if ( [0,2].indexOf(th.data.bn_exp_type)>-1 && th.data.user_addr == null) {
  3819 + if(getApp().is_no_addr(th,th.data.bn_exp_type)){
3819 3820 ff = false;
3820 3821 getApp().my_warnning("请选择收货地址", 0, th);
3821 3822 th.data.is_summit_ing = 0;
... ... @@ -4105,6 +4106,7 @@ Page({
4105 4106 th.data.is_summit_ing = 0;
4106 4107 ff = false;
4107 4108 getApp().confirmBox("请新建收货地址");
  4109 + th.setData({submit: 0})
4108 4110 }
4109 4111 if (!ff) return false;
4110 4112  
... ...
packageE/pages/cart/cart2_inte/cart2_inte.js
  View file @51f1629
... ... @@ -1001,7 +1001,7 @@ Page({
1001 1001 }
1002 1002 })
1003 1003 if(!is_next){
1004   - th.setData({is_show_sub:1, submit: 0,same_ok:0 })
  1004 + th.setData({is_show_sub:1, submit: 0,same_ok:0,show_submit:1})
1005 1005 return false
1006 1006 }
1007 1007  
... ... @@ -1081,10 +1081,12 @@ Page({
1081 1081 //------------立即购买-------------
1082 1082 if (th.data.is_b_now == 1 && th.data.bn_goods.prom_type != 5) {
1083 1083  
1084   - if ([0,2].indexOf(th.data.bn_exp_type)>-1 && th.data.user_addr == null) {
  1084 + //if ([0,2].indexOf(th.data.bn_exp_type)>-1 && th.data.user_addr == null) {
  1085 + if(getApp().is_no_addr(th,th.data.bn_exp_type)){
1085 1086 ff = false; getApp().my_warnning("请选择收货地址", 0, th);
1086 1087 th.data.is_summit_ing = 0;
1087 1088 }
  1089 +
1088 1090 if (!ff) return false;
1089 1091 var addr = th.data.user_addr;
1090 1092 if (th.data.bn_exp_type == 1) addr = null;
... ...
pages/cart/cart2_pt/cart2_pt.js
  View file @51f1629
... ... @@ -1084,7 +1084,8 @@ Page({
1084 1084 console.log("buy_new");
1085 1085  
1086 1086 //如果不是阶梯团，或者是普通购买，商家选择了物流，以及地址为空的时候
1087   - if (th.data.bn_exp_type == 0 && th.data.user_addr == null && (th.data.kt_type != 3 || th.data.bn_goods.is_normal == 1)) {
  1087 + //th.data.bn_exp_type == 0 && th.data.user_addr == null
  1088 + if (getApp().is_no_addr(th,th.data.bn_exp_type) && (th.data.kt_type != 3 || th.data.bn_goods.is_normal == 1)) {
1088 1089 ff = false;
1089 1090 getApp().my_warnning("请选择收货地址", 0, this);
1090 1091 this.data.is_summit_ing = 0;
... ...
pages/cart/cart_wk/cart_wk.js
  View file @51f1629
... ... @@ -570,11 +570,12 @@ Page({
570 570 to_pay_type: function (ind) {
571 571 var th = this;
572 572 //--物流支付时要有地址--
573   - if (th.data.exp_type == 0 && th.data.user_addr == null) {
  573 + //if (th.data.exp_type == 0 && th.data.user_addr == null) {
  574 + if (getApp().is_no_addr(th,th.data.exp_type)) {
  575 + this.data.paying=0;
574 576 return getApp().my_warnning("请选择收货地址", 0, th);
575 577 }
576 578  
577   -
578 579 th.data.exp_type=parseInt(th.data.exp_type+'');
579 580 //---支付参数--
580 581 var dd = {
... ...