wxd / MShopWeApp

Commit d92b58609d484d983f14af940926182b6ad6aa0f

Authored by 后端研发-苏明海
2 parents df554a7c 31bdb593

Merge branch 'dev' into 'test' 

Dev

See merge request !358
Inline Side-by-side
Showing 6 changed files with 224 additions and 64 deletions
pages/cart/cart/cart.js
  View file @d92b586
... ... @@ -484,6 +484,9 @@ Page({
484 484 [txt]: cbuy > 0 ? cbuy : 0,
485 485 });
486 486 e.doCheckAll();
  487 +
  488 + t.goods_num=cbuy > 0 ? cbuy : 0,
  489 + e.update_cart(t, pitem, item);
487 490 return false;
488 491 }
489 492  
... ... @@ -505,6 +508,10 @@ Page({
505 508 [txt]: store_count
506 509 });
507 510 e.doCheckAll();
  511 +
  512 + t.goods_num=store_count;
  513 + e.update_cart(t, pitem, item);
  514 +
508 515 return false;
509 516 }
510 517  
... ... @@ -520,6 +527,10 @@ Page({
520 527 [txt]: false_data.goods_num - false_data.buy_num
521 528 });
522 529 e.doCheckAll();
  530 +
  531 + t.goods_num=false_data.goods_num - false_data.buy_num;
  532 + e.update_cart(t, pitem, item);
  533 +
523 534 return false;
524 535 }
525 536  
... ... @@ -534,6 +545,11 @@ Page({
534 545 [txt]: false_data.redisnum
535 546 });
536 547 e.doCheckAll();
  548 +
  549 + t.goods_num=false_data.redisnum;
  550 + e.update_cart(t, pitem, item);
  551 +
  552 +
537 553 return false;
538 554 }
539 555  
... ... @@ -548,6 +564,10 @@ Page({
548 564 [txt]: false_data.false_data.buy_limit
549 565 });
550 566 e.doCheckAll();
  567 +
  568 + t.goods_num=false_data.false_data.buy_limit;
  569 + e.update_cart(t, pitem, item);
  570 +
551 571 return false;
552 572 }
553 573 }else{
... ... @@ -588,7 +608,7 @@ Page({
588 608 [txt]: store_count
589 609 });
590 610 e.doCheckAll();
591   - return false;
  611 + t.goods_num=store_count;
592 612 }
593 613 e.update_cart(t, pitem, item);
594 614 }
... ... @@ -614,7 +634,7 @@ Page({
614 634 [txt]: ob.CanOutQty
615 635 });
616 636 th.doCheckAll();
617   - return false;
  637 + t.goods_num=ob.CanOutQty;
618 638 }
619 639 this.update_cart(t, pitem, item);
620 640 },
... ... @@ -628,7 +648,8 @@ Page({
628 648 data:{store_id:os.stoid,wareId:t.goods_id,storageId:goodsinfo.pick_id}
629 649 }).then(res=>{
630 650 if(res.data.code==0 && res.data.data.total>0){
631   - lock=res.data.data.pageData[0].outQty;
  651 + for(var i in res.data.data.pageData)
  652 + lock+=res.data.data.pageData[i].outQty;
632 653 }
633 654 })
634 655 //先获取门店的编号
... ...
pages/cart/cart2/cart2.js
  View file @d92b586
... ... @@ -1014,7 +1014,8 @@ Page({
1014 1014 data:{store_id:os.stoid,wareId:goods_id,storageId:pick}
1015 1015 }).then(res=>{
1016 1016 if(res.data.code==0 && res.data.data.total>0){
1017   - lock=res.data.data.pageData[0].outQty;
  1017 + for(var i in res.data.data.pageData)
  1018 + lock+=res.data.data.pageData[i].outQty;
1018 1019 }
1019 1020 })
1020 1021 //先获取门店的编号
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @d92b586
... ... @@ -914,7 +914,12 @@ Page({
914 914 data:{store_id:os.stoid,wareId:th.data.sele_g.goods_id,storageId:pick.pickup_id},
915 915 success:function(res_data){
916 916 if(res_data.data.code==0 && res_data.data.data.total>0){
917   - var lock= res_data.data.data.pageData[0].outQty;
  917 +
  918 + var lock=0;
  919 + for(var i in res_data.data.data.pageData){
  920 + lock+=res_data.data.data.pageData[i].outQty;
  921 + }
  922 +
918 923 if(CanOutQty<=lock){
919 924 return s.my_warnning("库存不足！", 0, th);
920 925 }
... ... @@ -976,19 +981,25 @@ Page({
976 981 pick_id: e.data.sto_sele_id,
977 982 },
978 983 success: function(re) {
979   - //判断数量，要看下购物车中有没有该商品
980   - if(CanOutQty){
981   - if(th.data.cartGoodsNum + th.data.goodsInputNum>CanOutQty){
982   - return s.my_warnning("库存不足！", 0, th);
983   - }
984   - }else{
985   - if(th.data.cartGoodsNum + th.data.goodsInputNum>o.store_count){
986   - return s.my_warnning("库存不足！", 0, th);
987   - }
988   - }
  984 +
989 985 //-------如果购物车中有相关的数据---------
990 986 if (re.data.data.total > 0) {
991   - var item = re.data.data.pageData[0];
  987 +
  988 + var item = re.data.data.pageData[0];
  989 +
  990 + //判断数量，要看下购物车中有没有该商品
  991 + if(CanOutQty){
  992 + if(item.goods_num+ th.data.goodsInputNum>CanOutQty){
  993 + return s.my_warnning("库存不足！", 0, th);
  994 + }
  995 + }else{
  996 + if(item.goods_num+ th.data.goodsInputNum>o.store_count){
  997 + return s.my_warnning("库存不足！", 0, th);
  998 + }
  999 + }
  1000 +
  1001 +
  1002 +
992 1003 var updata = {
993 1004 id: item.id,
994 1005 goods_num: e.data.goodsInputNum + item.goods_num,
... ... @@ -1082,10 +1093,17 @@ Page({
1082 1093  
1083 1094 //--判断商品是否超出限购--
1084 1095 if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) {
1085   - if (t + th.data.g_buy_num.get(th.data.sele_g.goods_id) > th.data.sele_g.viplimited) {
  1096 +
  1097 + var gd_buy_num=th.data.g_buy_num.get(th.data.sele_g.goods_id);
  1098 +
  1099 + if (t + gd_buy_num > th.data.sele_g.viplimited) {
1086 1100 wx.showModal({
1087 1101 title: '超出商品限购',
1088 1102 });
  1103 +
  1104 + var num= th.data.sele_g.viplimited-gd_buy_num;
  1105 + if(num<0) num=0;
  1106 + th.setData({goodsInputNum:num})
1089 1107 return false;
1090 1108 }
1091 1109 }
... ... @@ -1096,6 +1114,10 @@ Page({
1096 1114 wx.showModal({
1097 1115 title: '超出商品活动限购',
1098 1116 });
  1117 +
  1118 + var num=th.data.prom_buy_limit- th.data.prom_buy_num ;
  1119 + if(num<0) num=0;
  1120 + th.setData({goodsInputNum:num})
1099 1121 return false;
1100 1122 }
1101 1123 }
... ... @@ -1113,17 +1135,31 @@ Page({
1113 1135 if (t > redis_num) {
1114 1136 wx.showModal({
1115 1137 title: '超出商品活动库存',
1116   - });
  1138 + });
  1139 + th.setData({goodsInputNum:redis_num})
1117 1140 return false;
1118 1141 }
1119 1142  
1120 1143 }
1121 1144  
1122   - var e = th.data.sele_g.store_count;
1123   - t > e || 0 == e ? t = e : t < 1 && (t = 1),
1124   - th.setData({
1125   - goodsInputNum: t
1126   - });
  1145 + var e = th.data.sele_g.store_count;
  1146 + if(th.data.sales_rules==2){
  1147 + if(!th.data.def_pick_store){
  1148 + wx.showModal({ title: '请选择门店', });
  1149 + return false;
  1150 + }else{
  1151 + e=th.data.def_pick_store.CanOutQty;
  1152 + }
  1153 + }
  1154 +
  1155 + //库存不足，不增加
  1156 + if(e<t){ wx.showModal({ title: '库存不足', });
  1157 + if(e<0) e=0;
  1158 + th.setData({ goodsInputNum: e }); return false;
  1159 + }
  1160 + t > e || 0 == e ? t = e : t < 1 && (t = 1);
  1161 + th.setData({ goodsInputNum: t });
  1162 +
1127 1163 })
1128 1164 },
1129 1165  
... ... @@ -1427,6 +1463,8 @@ Page({
1427 1463 sele_g: item,
1428 1464 gid: gid
1429 1465 });
  1466 + this.get_sto();
  1467 +
1430 1468 this.sele_spec_chech_activity();
1431 1469 },
1432 1470  
... ... @@ -1706,7 +1744,7 @@ Page({
1706 1744 var lock=[];
1707 1745 //先读取门店的lock
1708 1746 await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
1709   - data:{store_id:os.stoid,wareId:th.data.data.goods_id}
  1747 + data:{store_id:os.stoid,wareId:th.data.sele_g.goods_id}
1710 1748 }).then(res=>{
1711 1749 if(res.data.code==0 && res.data.data.total>0){
1712 1750 lock=res.data.data.pageData
... ... @@ -1715,7 +1753,7 @@ Page({
1715 1753  
1716 1754 //---通过接口获取门店的线下库存信息--
1717 1755 await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
1718   - data:{storageNos:pkno_str,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid}
  1756 + data:{storageNos:pkno_str,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid}
1719 1757 }).then(res=>{
1720 1758 if(res.data.code==0){
1721 1759 if(res.data.data.pageData){
... ... @@ -1732,11 +1770,11 @@ Page({
1732 1770 var lock_num=th.find_lock_num(o_plist[kk].pickup_id,lock);
1733 1771 //可出库数大于预出库库存的数量，可以判断为有库存
1734 1772 if(n_item.CanOutQty>lock_num){
1735   - o_plist[kk].CanOutQty=n_item.CanOutQty-lock_num
  1773 + o_plist[kk].CanOutQty=n_item.CanOutQty-lock_num;
1736 1774 new_list.push(o_plist[kk]);
1737 1775 //如果找到默认门店
1738   - if(def_pick_store && n_item.StorageNo==def_pick_store.pickup_no){
1739   - def_pick_store.CanOutQty=n_item.CanOutQty;
  1776 + if(def_pick_store && n_item.StorageNo==def_pick_store.pickup_no){
  1777 + def_pick_store.CanOutQty=n_item.CanOutQty-lock_num;
1740 1778 th.setData({def_pick_store:def_pick_store})
1741 1779 is_find_def_store=1;
1742 1780 }
... ... @@ -1773,7 +1811,7 @@ Page({
1773 1811 if(lock.length<0) return 0;
1774 1812 for(var i in lock){
1775 1813 if(pick_id==lock[i].pickupId){
1776   - lock_num=lock[i].outQty;
  1814 + lock_num+=lock[i].outQty;
1777 1815 }
1778 1816 }
1779 1817 return lock_num;
... ... @@ -2496,6 +2534,10 @@ Page({
2496 2534 title: '提示',
2497 2535 content: '超出商品限购'
2498 2536 });
  2537 +
  2538 + var num=th.data.prom_buy_limit-th.data.prom_buy_num;
  2539 + if(num<0) num=0;
  2540 + th.setData({goodsInputNum:num})
2499 2541 return false;
2500 2542 }
2501 2543 }
... ... @@ -2506,6 +2548,10 @@ Page({
2506 2548 title: '提示',
2507 2549 content: '超出商品活动限购'
2508 2550 });
  2551 +
  2552 + var num=th.data.prom_buy_limit-th.data.prom_buy_num;
  2553 + if(num<0) num=0;
  2554 + th.setData({goodsInputNum:num})
2509 2555 return false;
2510 2556 }
2511 2557 }
... ... @@ -2525,12 +2571,19 @@ Page({
2525 2571 title: '提示',
2526 2572 content: '超出商品活动库存'
2527 2573 });
  2574 +
  2575 + th.setData({goodsInputNum:redis_num})
  2576 +
2528 2577 return false;
2529 2578 }
2530 2579 }
2531 2580  
2532 2581 if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th);
2533   - if (th.data.goodsInputNum > o.store_count) return s.my_warnning("超出商品库存", 0, th);
  2582 + if (th.data.goodsInputNum > o.store_count) {
  2583 + th.setData({goodsInputNum:o.store_count})
  2584 + return s.my_warnning("超出商品库存", 0, th);
  2585 + }
  2586 +
2534 2587 if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined)
2535 2588 this.setData({
2536 2589 sto_sele_name: ""
... ... @@ -3348,7 +3401,22 @@ Page({
3348 3401 var th = this;
3349 3402 //var ind=ee.currentTarget.dataset.ind;
3350 3403 var bconfig = th.data.bconfig;
3351   -
  3404 +
  3405 + if(!th.data.only_pk && !th.data.def_pickpu_list){
  3406 + getApp().confirmBox("门店库存不足", null, 25000, !1);
  3407 + return false;
  3408 + }
  3409 +
  3410 + if(th.data.only_pk && !th.data.only_pk.length){
  3411 + getApp().confirmBox("门店库存不足", null, 25000, !1);
  3412 + return false;
  3413 + }
  3414 + if(th.data.def_pickpu_list && !th.data.def_pickpu_list.length){
  3415 + getApp().confirmBox("门店库存不足", null, 25000, !1);
  3416 + return false;
  3417 + }
  3418 +
  3419 +
3352 3420 if (bconfig.is_sort_storage) {
3353 3421 wx.getLocation({
3354 3422 type: 'wgs84',
... ... @@ -3386,7 +3454,10 @@ Page({
3386 3454 th.data.is_get_local_ok = 1;
3387 3455 th.get_sto();
3388 3456 }
3389   -
  3457 +
  3458 +
  3459 +
  3460 +
3390 3461 this.setData({
3391 3462 //open_ind_store: ind,
3392 3463 store: 1,
... ... @@ -3449,7 +3520,7 @@ Page({
3449 3520 var goodsinfo=th.data.sele_g;
3450 3521 var erpwareid=goodsinfo.erpwareid;
3451 3522 var plist=null;
3452   - var lock=0;
  3523 + var lock=0;
3453 3524  
3454 3525 //---如果是活动的时候---
3455 3526 if(th.data.prom_type==1 || th.data.prom_type==6){
... ... @@ -3472,10 +3543,11 @@ Page({
3472 3543  
3473 3544 //先读取门店的lock
3474 3545 await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
3475   - data:{store_id:os.stoid,wareId:t.goods_id,storageId:goodsinfo.pick_id}
  3546 + data:{store_id:os.stoid,wareId:goodsinfo.goods_id,storageId:item.pickup_id}
3476 3547 }).then(res=>{
3477 3548 if(res.data.code==0 && res.data.data.total>0){
3478   - lock=res.data.data.pageData[0].outQty;
  3549 + for(var i in res.data.data.pageData )
  3550 + lock+=res.data.data.pageData[i].outQty;
3479 3551 }
3480 3552 })
3481 3553  
... ... @@ -3489,7 +3561,7 @@ Page({
3489 3561 })
3490 3562  
3491 3563 if(plist && plist.CanOutQty-lock>0){
3492   - func()
  3564 + func();
3493 3565 return false;
3494 3566 }
3495 3567 getApp().my_warnning(item.pickup_name+"库存不足！", 0, th);
... ...
pages/goods/goodsInfo/goodsInfo.wxml
  View file @d92b586
... ... @@ -757,18 +757,17 @@
757 757 </view>
758 758 <view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:if="{{data.goods.is_virtual}}">立即购买</view>
759 759  
760   - <!---- 普通商品购买 ----->
  760 + <!-- 普通商品购买 -->
761 761 <block wx:if="{{prom_type==0 || prom_type==2 || prom_type==3 || prom_type==4}}">
762 762  
763   - <block wx:if="{{sele_g.store_count>0}}">
  763 + <!-- 线上销售的时候，要判断库存量， 线下库存的时候不用判断 -->
  764 + <block wx:if="{{(sele_g.store_count>0 && sales_rules==1) || sales_rules==2 }}">
764 765 <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view>
765 766 <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即购买</view>
766 767 </block>
767   - <block wx:else>
768   - <view class="is_stock cart-btn is_stock xc-ash-b " style="width:55.5%">
769   - 库存不足
770   - </view>
771   - </block>
  768 + <block wx:else>
  769 + <view class="is_stock cart-btn is_stock xc-ash-b " style="width:55.5%">库存不足</view>
  770 + </block>
772 771  
773 772 </block>
774 773  
... ... @@ -868,8 +867,13 @@
868 867 <block wx:if="{{prom_type==0}}">
869 868 <view class="flex">
870 869 <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
871   - <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">可售：{{def_pick_store.CanOutQty}}</view>
872   - <view class="spec-goods-stock" wx:else>可售：{{sele_g.store_count}}</view>
  870 + <block wx:if="{{sales_rules==2}}">
  871 + <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">可售：{{def_pick_store.CanOutQty}}</view>
  872 + <view class="spec-goods-stock" wx:else>可售:0</view>
  873 + </block>
  874 + <block wx:else>
  875 + <view class="spec-goods-stock">可售：{{sele_g.store_count}}</view>
  876 + </block>
873 877  
874 878 </view>
875 879 </block>
... ... @@ -879,7 +883,7 @@
879 883 <view class="spec-goods-stock" wx:else >已售：{{prom_act.buy_num}}</view>
880 884 <view class="spec-goods-stock">可售：{{prom_act.goods_num-prom_act.buy_num}}</view>
881 885  
882   -
  886 +
883 887 </view>
884 888 </block>
885 889 </view>
... ... @@ -896,17 +900,25 @@
896 900 </view>
897 901  
898 902 <!-- 没有门店的时候 -->
899   - <view class="flex" bindtap="choice_store"wx:else>
900   - <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
901   - <view class="fs28 xc-ash-9f">选择门店</view>
  903 + <view class="flex" bindtap="choice_store" wx:else>
  904 + <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
  905 + <view class="fs28 xc-ash-9f">选择门店</view>
902 906 </view>
903 907  
904 908 <view class="red-co fs28" bindtap="choice_store" >
905 909 更多门店
906 910 <text class="right-arrow"></text>
907 911 </view>
908   - </view>
909   - <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store}}">地址:{{def_pick_store.fulladdress}}</view>
  912 + </view>
  913 + <view wx:if="{{only_pk && !only_pk.length}}">门店库存不足</view>
  914 + <block wx:else>
  915 + <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">门店库存不足</view>
  916 + <block wx:else>
  917 + <view wx:if="{{def_pick_store && def_pick_store.CanOutQty<=0 && sales_rules==2 && prom_type==0}}">门店库存不足</view>
  918 + </block>
  919 + </block>
  920 +
  921 + <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store}}">地址:{{def_pick_store.fulladdress}}</view>
910 922 </view>
911 923  
912 924 <!----商品的属性项目---->
... ... @@ -929,12 +941,58 @@
929 941 </view>
930 942 </view>
931 943 </view>
932   - <view class="spec-cart-btns">
933   -
934   -
935   - <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view>
936   - <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy" data-action="buy">立即购买</view>
937   -
  944 + <view class="spec-cart-btns">
  945 + <!-- 根本就找不到门店 -->
  946 + <block wx:if="{{!only_pk && !def_pickpu_list}}">
  947 + <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>
  948 + </block>
  949 + <block wx:else>
  950 +
  951 +
  952 + <block wx:if="{{only_pk.length && !only_pk.length}}">
  953 + <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>
  954 + </block>
  955 + <block wx:else>
  956 + <block wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">
  957 + <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
  958 + </block>
  959 + <block wx:else>
  960 + <block wx:if="{{!def_pick_store}}">
  961 + <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>
  962 + </block>
  963 + <block wx:else>
  964 +
  965 + <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 -->
  966 + <block wx:if="{{sales_rules==2 && prom_type==0}}">
  967 + <block wx:if="{{def_pick_store.CanOutQty<=0}}">
  968 + <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
  969 + </block>
  970 + <block wx:else>
  971 + <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}"
  972 + class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view>
  973 + <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}"
  974 + class="spec-cart-btn spec-buy" data-action="buy">立即购买</view>
  975 + </block>
  976 + </block>
  977 + <!-- 线上销售 -->
  978 + <block wx:else>
  979 + <block wx:if="{{sele_g.store_count<=0}}">
  980 + <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
  981 + </block>
  982 + <block wx:else>
  983 + <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}"
  984 + class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view>
  985 + <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}"
  986 + class="spec-cart-btn spec-buy" data-action="buy">立即购买</view>
  987 + </block>
  988 + </block>
  989 + </block>
  990 + </block>
  991 + </block>
  992 +
  993 +
  994 + </block>
  995 +
938 996 </view>
939 997  
940 998 <view class="clear"></view>
... ... @@ -1069,7 +1127,7 @@
1069 1127 <view>购买数量</view>
1070 1128 <view class="count">
1071 1129 <view bindtap="subCartNum" class="sub">-</view>
1072   - <input bindblur="inputCartNum xc-val-fream" type="number" value="{{goodsInputNum}}"></input>
  1130 + <input bindblur="inputCartNum" class="xc-val-fream" type="number" value="{{goodsInputNum}}"></input>
1073 1131 <view bindtap="addCartNum" class="add">+</view>
1074 1132 </view>
1075 1133 </view>
... ... @@ -1288,7 +1346,8 @@
1288 1346 <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view>
1289 1347 </view>
1290 1348 <view>
1291   - <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}"> 距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}</view>
  1349 + <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">
  1350 + 距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}</view>
1292 1351 </view>
1293 1352 </view>
1294 1353 <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
... ...
pages/goods/goodsList/goodsList.js
  View file @d92b586
... ... @@ -97,10 +97,15 @@ Page({
97 97 },
98 98 requestGoodsList: function(t) {
99 99 var e = this;
100   - this.data.requestUrl = t,
101   - t += "&orderField=" + e.data.tabname;
102   - t += "&orderType=" + e.data.adname;
103   - t +="&page=" + e.data.currentPage,
  100 + this.data.requestUrl = t;
  101 +
  102 + //不是商品分组的，不是默认排序的
  103 + if(t.indexOf("group_id")==-1 || e.data.tabname!="goods_id" ){
  104 + t += "&orderField=" + e.data.tabname;
  105 + t += "&orderType=" + e.data.adname;
  106 + }
  107 +
  108 + t +="&page=" + e.data.currentPage;
104 109 a.request(t,
105 110 function(t) {
106 111 e.setData({is_go:1});
... ...
pages/user/order_list/order_list.wxml
  View file @d92b586
... ... @@ -32,10 +32,12 @@
32 32 <view wx:if="{{item.pt_status==6}}"><text style="font-size: 26rpx;">支付尾款失败</text></view>
33 33 </block>
34 34 <block wx:else>退款中</block>
  35 + <!--
35 36 <view class="flex" wx:if="{{(item.order_status==0&&item.pay_status==0)}}">
36 37 <view class="lin"></view>
37 38 <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData" data-index="{{index}}" data-order_id="{{item.order_id}}"></image>
38   - </view>
  39 + </view>-->
  40 +
39 41 </view>
40 42 </view>
41 43  
... ...