wxd / MShopWeApp

Commit a94019eedeed8350a8a8f1626aabe899d03e3571

Authored by yvan.ni
1 parent fb055097

1、同城配送 

2、会员作废
3、小店排序
Inline Side-by-side
Showing 10 changed files with 139 additions and 29 deletions
packageA/pages/distribution/shop/shop.js
  View file @a94019e
... ... @@ -458,7 +458,7 @@ Page({
458 458 clickSort(e) {
459 459 let data = this.data.currentQuery;
460 460 // data.orderField = 'shop_price';
461   - data.orderField = 'prom_price';
  461 + data.orderField = 'final_price';
462 462 if (data.page) {
463 463 delete data.page;
464 464 };
... ... @@ -526,9 +526,10 @@ Page({
526 526 delete data.page;
527 527 };
528 528 if (currentIndex == 0) {
529   - if (data.orderField) {// 清除orderField
530   - delete data.orderField;
531   - };
  529 + // if (data.orderField) {// 清除orderField
  530 + // delete data.orderField;
  531 + // };
  532 + data.orderField = 'shop_price';
532 533 };
533 534 if (currentIndex == 1) {
534 535 data.orderField = 'sales_sum';
... ... @@ -539,11 +540,14 @@ Page({
539 540  
540 541 if (currentIndex == 3) {
541 542 // console.log('点击价格');
542   - if (data.orderType) {// 清除orderType
543   - delete data.orderType;
544   - };
  543 + // if (data.orderType) {// 清除orderType
  544 + // delete data.orderType;
  545 + // };
  546 + data.orderType = 'desc';
545 547 return;
546 548 };
  549 +
  550 +
547 551 data.orderType = 'desc';
548 552 this.data.currentQuery = data;
549 553 delete data.brand_id;
... ...
packageA/pages/distribution/shop/shop.wxml
  View file @a94019e
... ... @@ -51,12 +51,13 @@
51 51 <view class="pdl20 c-a" bindtap="search">搜索</view>
52 52 </view>
53 53 </view>
54   - <view class="flex t-c fs26 bg-white bdb sticky c-a" catchtap="clickTab">
  54 +
  55 + <view class="flex t-c fs26 bg-white bdb sticky c-a" bindtap="clickTab">
55 56 <block wx:for="{{tabArr}}">
56 57 <view class="f1 pd20 {{currentTabIndex == index ? 'active':''}}" data-index="{{index}}" wx:if="{{index != 3}}">
57 58 {{item}}
58 59 </view>
59   - <view class="f1 pd20 {{currentTabIndex == index ? 'active':''}}" data-index="{{index}}" wx:else bindtap="clickSort">
  60 + <view class="f1 pd20 {{currentTabIndex == index ? 'active':''}}" data-index="{{index}}" wx:else catchtap="clickSort">
60 61 {{item}}
61 62 <text class="iconfont icon-sort2 c-db" wx:if="{{!isSort}}"></text>
62 63 <text class="t-icon t-icon-sort-up {{isDescending ? 'reverse':''}}" wx:else></text>
... ...
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
  View file @a94019e
... ... @@ -934,6 +934,11 @@ Page({
934 934 }
935 935 })
936 936 if (!is_next) return false
  937 +
  938 + th.data.lon=lon;
  939 + th.data.lat=lat;
  940 + th.data.bn_gd_w=gd_w;
  941 + th.data.bn_samecity_order_amount=req_data.order_amount;
937 942 }
938 943  
939 944 //-- 如果是订单优惠的时候,allpice要拿来减掉一些 --
... ... @@ -1226,6 +1231,13 @@ Page({
1226 1231 'order_goods': new Array(),
1227 1232 };
1228 1233  
  1234 + if(item.exp_type==2){
  1235 + item.lon=th.data.lon?th.data.lon:0;
  1236 + item.lat=th.data.lat?th.data.lat:0;
  1237 + item.goods_weight=t_item.gd_w;
  1238 + item.samecity_order_amount=t_item.samecity_order_amount;
  1239 + }
  1240 +
1229 1241 //--判断有没有优惠活动--
1230 1242 if (th.data.formData.order_prom_amount > 0) {
1231 1243 var order_prom_list = {};
... ...
packageC/pages/presell/cart/cart.js
  View file @a94019e
... ... @@ -2200,6 +2200,10 @@ Page({
2200 2200 return false
2201 2201 }
2202 2202 exp_price = parseFloat(shipping_price).toFixed(2);
  2203 + th.data.lon=lon;
  2204 + th.data.lat=lat;
  2205 + th.data.bn_gd_w=gd_w;
  2206 + th.data.bn_samecity_order_amount=req_data.order_amount;
2203 2207 }
2204 2208  
2205 2209 ord_price = parseFloat(ord_price) - parseFloat(th.data.presell.presell_deposit);
... ... @@ -2283,6 +2287,10 @@ Page({
2283 2287 return false
2284 2288 }
2285 2289 exp_price = parseFloat(shipping_price).toFixed(2);
  2290 + th.data.lon=lon;
  2291 + th.data.lat=lat;
  2292 + th.data.bn_gd_w=gd_w;
  2293 + th.data.bn_samecity_order_amount=req_data.order_amount;
2286 2294 }
2287 2295  
2288 2296  
... ... @@ -2411,7 +2419,7 @@ Page({
2411 2419 tail_pay_type: ind,//0微信支付 1余额支付
2412 2420 };
2413 2421  
2414   - if (th.data.exp_type == 0) {
  2422 + if (th.data.exp_type == 0 || th.data.exp_type==2 ) {
2415 2423 var index = th.data.index;
2416 2424 dd.shipping_code = th.data.wu_arr[index].code;
2417 2425 dd.shipping_name = th.data.wu_arr[index].name;
... ... @@ -2419,6 +2427,14 @@ Page({
2419 2427 dd.addressid = th.data.user_addr.address_id;
2420 2428 }
2421 2429  
  2430 +
  2431 + if(dd.exp_type==2){
  2432 + dd.lon=th.data.lon?th.data.lon:0;
  2433 + dd.lat=th.data.lat?th.data.lat:0;
  2434 + dd.goods_weight=th.data.bn_gd_w;
  2435 + dd.samecity_order_amount=th.data.bn_samecity_order_amount;
  2436 + }
  2437 +
2422 2438 if (th.data.order_prom_amount > 0) {
2423 2439 var e = {
2424 2440 order_prom_id: th.data.order_prom_id,
... ... @@ -2461,6 +2477,13 @@ Page({
2461 2477  
2462 2478 //---用微信支付---
2463 2479 if (dd.tail_pay_type == 0) {
  2480 +
  2481 + if(t.data.code!=0){
  2482 + getApp().my_warnning(t.data.msg, 1, th);
  2483 + th.data.paying=0;
  2484 + return false;
  2485 + }
  2486 +
2464 2487 util_pay.pay_data(t,function (){
2465 2488 //---用余额支付---
2466 2489 getApp().my_warnning("支付成功", 1, th);
... ...
packageC/pages/presell/cart/cart2.js
  View file @a94019e
... ... @@ -1007,6 +1007,12 @@ Page({
1007 1007 th.setData({show_submit:1, submit: 0,same_ok:0 })
1008 1008 return false
1009 1009 }
  1010 +
  1011 + th.data.lon=lon;
  1012 + th.data.lat=lat;
  1013 + th.data.bn_gd_w=gd_w;
  1014 + th.data.bn_samecity_order_amount=req_data.order_amount;
  1015 +
1010 1016 }
1011 1017  
1012 1018 total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price);
... ... @@ -1154,6 +1160,13 @@ Page({
1154 1160 item.use_commission=th.data.bn_goods.use_commission;
1155 1161 }
1156 1162  
  1163 + if(item.exp_type==2){
  1164 + item.lon=th.data.lon?th.data.lon:0;
  1165 + item.lat=th.data.lat?th.data.lat:0;
  1166 + item.goods_weight=th.data.bn_gd_w;
  1167 + item.samecity_order_amount=th.data.bn_samecity_order_amount;
  1168 + }
  1169 +
1157 1170 //获取立即购买的商品的信息
1158 1171 var gg = to.get_b_now();
1159 1172 //--商品的房间号--
... ...
packageE/pages/cart/cart2/cart2.js
  View file @a94019e
... ... @@ -2737,6 +2737,11 @@ Page({
2737 2737 th.setData({show_submit:1, submit: 0,same_ok:0 })
2738 2738 return false
2739 2739 }
  2740 +
  2741 + //重量要带出去
  2742 + cart_item.gd_w=gd_w;
  2743 + cart_item.samecity_order_amount=req_data.order_amount;
  2744 +
2740 2745 }
2741 2746  
2742 2747 //预存金额使用参与计算
... ... @@ -3527,7 +3532,8 @@ Page({
3527 3532 }
3528 3533 th.data.lon=lon;
3529 3534 th.data.lat=lat;
3530   -
  3535 + th.data.bn_gd_w=gd_w;
  3536 + th.data.bn_samecity_order_amount=req_data.order_amount;
3531 3537 }
3532 3538  
3533 3539  
... ... @@ -3850,12 +3856,13 @@ Page({
3850 3856 item.use_commission = th.data.bn_goods.use_commission;
3851 3857 }
3852 3858  
3853   - if(th.data.lon && item.exp_type==2){
3854   - item.lon=th.data.lon;
3855   - item.lat=th.data.lat;
  3859 + if(item.exp_type==2){
  3860 + item.lon=th.data.lon?th.data.lon:0;
  3861 + item.lat=th.data.lat?th.data.lat:0;
  3862 + item.goods_weight=th.data.bn_gd_w;
  3863 + item.samecity_order_amount=th.data.bn_samecity_order_amount;
3856 3864 }
3857 3865  
3858   -
3859 3866 //获取立即购买的商品的信息
3860 3867 var gg = to.get_b_now();
3861 3868 //--商品的房间号--
... ... @@ -4156,9 +4163,11 @@ Page({
4156 4163 item.use_commission = t_item.can_usecommise;
4157 4164 }
4158 4165  
4159   - if(th.data.lon && item.exp_type==2){
4160   - item.lon=th.data.lon;
4161   - item.lat=th.data.lat;
  4166 + if(item.exp_type==2){
  4167 + item.lon=th.data.lon?th.data.lon:0;
  4168 + item.lat=th.data.lat?th.data.lat:0;
  4169 + item.goods_weight=t_item.gd_w;
  4170 + item.samecity_order_amount=t_item.samecity_order_amount;
4162 4171 }
4163 4172  
4164 4173 var order_prom_list = {};
... ...
pages/cart/cart2_inte/cart2_inte.js
  View file @a94019e
... ... @@ -999,6 +999,12 @@ Page({
999 999 th.setData({show_submit:1, submit: 0,same_ok:0 })
1000 1000 return false
1001 1001 }
  1002 +
  1003 + th.data.lon=lon;
  1004 + th.data.lat=lat;
  1005 + th.data.bn_gd_w=gd_w;
  1006 + th.data.bn_samecity_order_amount=req_data.order_amount;
  1007 +
1002 1008 }
1003 1009  
1004 1010  
... ... @@ -1105,7 +1111,6 @@ Page({
1105 1111 return false;
1106 1112 }
1107 1113  
1108   -
1109 1114 var item = {
1110 1115 'user_id': to.globalData.user_id,
1111 1116 'consignee': addr == null ? "" : addr.consignee,
... ... @@ -1148,6 +1153,13 @@ Page({
1148 1153 }
1149 1154 item.order_prom_list = order_prom_list;
1150 1155  
  1156 + if(item.exp_type==2){
  1157 + item.lon=th.data.lon?th.data.lon:0;
  1158 + item.lat=th.data.lat?th.data.lat:0;
  1159 + item.goods_weight=th.data.bn_gd_w;
  1160 + item.samecity_order_amount=th.data.bn_samecity_order_amount;
  1161 + }
  1162 +
1151 1163  
1152 1164 //获取立即购买的商品的信息
1153 1165 var gg = to.get_b_now();
... ...
pages/cart/cart2_pt/cart2_pt.js
  View file @a94019e
... ... @@ -865,6 +865,13 @@ Page({
865 865 th.setData({show_submit:1, submit: 0,same_ok:0 })
866 866 return false
867 867 }
  868 +
  869 + th.data.lon=lon;
  870 + th.data.lat=lat;
  871 + th.data.bn_gd_w=gd_w;
  872 + th.data.bn_samecity_order_amount=req_data.order_amount;
  873 +
  874 +
868 875 }
869 876  
870 877 //-- 如果是订单优惠的时候,allpice要拿来减掉一些 --
... ... @@ -1125,8 +1132,15 @@ Page({
1125 1132 'order_goods': new Array(),
1126 1133 };
1127 1134  
  1135 + //-- 同城配送检验的参数 --
  1136 + if(item.exp_type==2){
  1137 + item.lon=th.data.lon?th.data.lon:0;
  1138 + item.lat=th.data.lat?th.data.lat:0;
  1139 + item.goods_weight=th.data.bn_gd_w;
  1140 + item.samecity_order_amount=th.data.bn_samecity_order_amount;
  1141 + }
1128 1142  
1129   - //--判断有没有优惠活动--
  1143 + //--判断有没有优惠活动--
1130 1144 if (th.data.formData.order_prom_amount > 0) {
1131 1145 var order_prom_list = {};
1132 1146 order_prom_list.order_prom_id = th.data.formData.order_prom_id;
... ... @@ -1417,7 +1431,7 @@ Page({
1417 1431 setexptype_w: function (t) {
1418 1432 var th = this;
1419 1433 var ty = t.currentTarget.dataset.t, txt = t.currentTarget.dataset.txt;
1420   - th.setData({ [txt]: ty });
  1434 + th.setData({ [txt]: ty,same_ok:1 });
1421 1435 var iszt = 1;
1422 1436 if (ty == 0) {
1423 1437 th.setData({ is_all_zt: 0 });
... ... @@ -1439,7 +1453,7 @@ Page({
1439 1453 setexptype: function (t) {
1440 1454 var th = this;
1441 1455 var ty = t.currentTarget.dataset.t;
1442   - th.setData({ bn_exp_type: ty, same_ok:0 });
  1456 + th.setData({ bn_exp_type: ty, same_ok:1 });
1443 1457 //当物流为空的时候。
1444 1458 if (ty == 0 && th.data.wu_arr == null) {
1445 1459 return th.get_wuliu(th.calculatePrice2());
... ...
pages/cart/cart_wk/cart_wk.js
  View file @a94019e
... ... @@ -586,7 +586,7 @@ Page({
586 586 tail_pay_type: ind,//0微信支付 1余额支付
587 587 };
588 588  
589   - if (th.data.exp_type == 0) {
  589 + if (th.data.exp_type == 0 && th.data.exp_type == 2) {
590 590 var index = th.data.index;
591 591 dd.shipping_code = th.data.wu_arr[index].code;
592 592 dd.shipping_name = th.data.wu_arr[index].name;
... ... @@ -595,10 +595,18 @@ Page({
595 595 }
596 596  
597 597 //如果是同城配送的时候
598   - if(th.data.exp_type==2){
599   - dd.shipping_price = parseFloat(th.data.exp_price);
  598 + // if(th.data.exp_type==2){
  599 + // dd.shipping_price = parseFloat(th.data.exp_price);
  600 + // }
  601 +
  602 + if(dd.exp_type==2){
  603 + dd.lon=th.data.lon?th.data.lon:0;
  604 + dd.lat=th.data.lat?th.data.lat:0;
  605 + dd.goods_weight=th.data.bn_gd_w;
  606 + dd.samecity_order_amount=th.data.bn_samecity_order_amount;
600 607 }
601 608  
  609 +
602 610 if(getApp().globalData.scene){
603 611 dd.scene=getApp().globalData.scene;
604 612 }
... ... @@ -634,6 +642,12 @@ Page({
634 642 //---用微信支付---
635 643 if (dd.tail_pay_type == 0) {
636 644  
  645 + if (t.data.code != 0) {
  646 + getApp().my_warnning(t.data.msg, 1, th);
  647 + th.data.paying=0;
  648 + return false;
  649 + }
  650 +
637 651 util_pay.pay_data(t,function (){
638 652 var allmoney = th.data.allpice;
639 653 th.jumpPaymentPage(th.data.order.order_sn, allmoney);
... ... @@ -1011,6 +1025,11 @@ Page({
1011 1025 return false
1012 1026 }
1013 1027  
  1028 + th.data.lon=lon;
  1029 + th.data.lat=lat;
  1030 + th.data.bn_gd_w=gd_w;
  1031 + th.data.bn_samecity_order_amount=req_data.order_amount;
  1032 +
1014 1033 var exp_price = parseFloat(shipping_price).toFixed(2);
1015 1034 allpice = parseFloat(exp_price) + parseFloat(allpice);
1016 1035 if(th.data.bn_use_commission){
... ...
pages/user/plus/plus.js
  View file @a94019e
... ... @@ -465,8 +465,9 @@ Page({
465 465 // })
466 466 } else {
467 467 t_pay.set_pay_url('/api/weshop/plus/create/plus/order');
468   - t_pay.pay(req, th.success, function () {
469   - getApp().my_warnning("支付失败", 0, th);
  468 + t_pay.pay(req, th.success, function (msg) {
  469 + if(!msg) msg='支付失败';
  470 + getApp().my_warnning(msg, 0, th);
470 471 th.setData({
471 472 is_select:0,
472 473 focus:true,
... ... @@ -499,8 +500,10 @@ Page({
499 500 })
500 501 }else{
501 502 t_pay.set_pay_url('/api/weshop/plus/create/plus/order');
502   - t_pay.pay(req, th.success, function () {
503   - getApp().my_warnning("支付失败", 0, th);
  503 + t_pay.pay(req, th.success, function (msg) {
  504 + if(!msg) msg="支付失败";
  505 +
  506 + getApp().my_warnning(msg, 0, th);
504 507 th.setData({
505 508 is_select:0,
506 509 focus:true,
... ...