Commit a5b646fd3ad7ba0d427c94ed734001eba2ddc628
1 parent
d4640e59
选择门店的优化
Showing
4 changed files
with
48 additions
and
25 deletions
packageA/pages/prom_list/prom_list.wxml
| @@ -214,9 +214,9 @@ | @@ -214,9 +214,9 @@ | ||
| 214 | <view> | 214 | <view> |
| 215 | <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> | 215 | <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> |
| 216 | </view> | 216 | </view> |
| 217 | - <view class="felx choose_more" bindtap="more_store"> | ||
| 218 | - <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text> | ||
| 219 | - <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view> | 217 | + <view class="felx choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat>0}}"> |
| 218 | + <text class="fs26 red-co" >{{choice_sort_store==0?'更多门店':'返回'}}</text> | ||
| 219 | + <view class="bg_rights"></view> | ||
| 220 | </view> | 220 | </view> |
| 221 | </view> | 221 | </view> |
| 222 | </view> | 222 | </view> |
pages/goods/goodsInfo/goodsInfo.js
| @@ -2594,7 +2594,6 @@ Page({ | @@ -2594,7 +2594,6 @@ Page({ | ||
| 2594 | getApp().request.get("/api/weshop/storagecategory/page", { | 2594 | getApp().request.get("/api/weshop/storagecategory/page", { |
| 2595 | data: { | 2595 | data: { |
| 2596 | store_id: o.stoid, | 2596 | store_id: o.stoid, |
| 2597 | - is_show: 1, | ||
| 2598 | pageSize: 1000, | 2597 | pageSize: 1000, |
| 2599 | orderField: "sort", | 2598 | orderField: "sort", |
| 2600 | orderType: 'asc', | 2599 | orderType: 'asc', |
| @@ -2603,35 +2602,34 @@ Page({ | @@ -2603,35 +2602,34 @@ Page({ | ||
| 2603 | if (ee.data.code == 0) { | 2602 | if (ee.data.code == 0) { |
| 2604 | 2603 | ||
| 2605 | if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) { | 2604 | if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) { |
| 2606 | - var def_arr = new Array(); | ||
| 2607 | - var ishas = 0; | ||
| 2608 | - //-- 开始就看5个门店 -- | ||
| 2609 | - for (var k = 0; k < 10; k++) { | ||
| 2610 | - if (k == e.data.data.pageData.length) break; | ||
| 2611 | - def_arr.push(e.data.data.pageData[k]); | ||
| 2612 | - } | ||
| 2613 | 2605 | ||
| 2614 | - th.setData({ | ||
| 2615 | - def_pickpu_list: def_arr, | ||
| 2616 | - pickpu_list: ee.data.data.pageData | ||
| 2617 | - }); | ||
| 2618 | var sto_cate = ee.data.data.pageData; | 2606 | var sto_cate = ee.data.data.pageData; |
| 2619 | var sto_arr = e.data.data.pageData; | 2607 | var sto_arr = e.data.data.pageData; |
| 2620 | var newarr = new Array(); | 2608 | var newarr = new Array(); |
| 2621 | var qita = new Array(); | 2609 | var qita = new Array(); |
| 2622 | 2610 | ||
| 2611 | + | ||
| 2612 | + var is_del_pk=0; | ||
| 2623 | //----要进行门店分组-------- | 2613 | //----要进行门店分组-------- |
| 2624 | for (var i = 0; i < sto_arr.length; i++) { | 2614 | for (var i = 0; i < sto_arr.length; i++) { |
| 2625 | //找一下这个门店有没有在分类数组内 | 2615 | //找一下这个门店有没有在分类数组内 |
| 2626 | var find2 = 0, find2name = "", sort = 0; | 2616 | var find2 = 0, find2name = "", sort = 0; |
| 2617 | + | ||
| 2627 | for (var m = 0; m < sto_cate.length; m++) { | 2618 | for (var m = 0; m < sto_cate.length; m++) { |
| 2628 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { | 2619 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { |
| 2629 | - find2 = sto_cate[m].cat_id; | ||
| 2630 | - find2name = sto_cate[m].cat_name; | ||
| 2631 | - sort = sto_cate[m].sort; | 2620 | + if(sto_cate[m].is_show!=1){ |
| 2621 | + is_del_pk=1; sto_arr.splice(i,1); | ||
| 2622 | + i--; | ||
| 2623 | + }else { | ||
| 2624 | + find2 = sto_cate[m].cat_id; | ||
| 2625 | + find2name = sto_cate[m].cat_name; | ||
| 2626 | + sort = sto_cate[m].sort; | ||
| 2627 | + is_del_pk=0; | ||
| 2628 | + } | ||
| 2632 | break; | 2629 | break; |
| 2633 | } | 2630 | } |
| 2634 | } | 2631 | } |
| 2632 | + if(is_del_pk) continue; | ||
| 2635 | 2633 | ||
| 2636 | if (newarr.length > 0) { | 2634 | if (newarr.length > 0) { |
| 2637 | var find = 0; | 2635 | var find = 0; |
| @@ -2676,6 +2674,21 @@ Page({ | @@ -2676,6 +2674,21 @@ Page({ | ||
| 2676 | } | 2674 | } |
| 2677 | } | 2675 | } |
| 2678 | 2676 | ||
| 2677 | + | ||
| 2678 | + var def_arr = new Array(); | ||
| 2679 | + var ishas = 0; | ||
| 2680 | + //-- 开始就看5个门店 -- | ||
| 2681 | + for (var k = 0; k < 10; k++) { | ||
| 2682 | + if (k == sto_arr.length) break; | ||
| 2683 | + def_arr.push(sto_arr[k]); | ||
| 2684 | + } | ||
| 2685 | + | ||
| 2686 | + th.setData({ | ||
| 2687 | + def_pickpu_list: def_arr, | ||
| 2688 | + pickpu_list: ee.data.data.pageData | ||
| 2689 | + }); | ||
| 2690 | + | ||
| 2691 | + | ||
| 2679 | //门店分类要排序下 | 2692 | //门店分类要排序下 |
| 2680 | function compare(property) { | 2693 | function compare(property) { |
| 2681 | return function (a, b) { | 2694 | return function (a, b) { |
| @@ -2710,7 +2723,12 @@ Page({ | @@ -2710,7 +2723,12 @@ Page({ | ||
| 2710 | }); | 2723 | }); |
| 2711 | //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------ | 2724 | //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------ |
| 2712 | if (!th.data.def_pick_store) { | 2725 | if (!th.data.def_pick_store) { |
| 2713 | - th.setData({ def_pick_store: e.data.data.pageData[0] }) | 2726 | + th.setData({ |
| 2727 | + def_pick_store: e.data.data.pageData[0], | ||
| 2728 | + sto_sele_name: e.data.data.pageData[0].pickup_name, | ||
| 2729 | + sto_sele_id: e.data.data.pageData[0].pickup_id, | ||
| 2730 | + sto_sele_distr: e.data.data.pageData[0].distr_type | ||
| 2731 | + }) | ||
| 2714 | } | 2732 | } |
| 2715 | } | 2733 | } |
| 2716 | } else { | 2734 | } else { |
| @@ -2720,7 +2738,12 @@ Page({ | @@ -2720,7 +2738,12 @@ Page({ | ||
| 2720 | }); | 2738 | }); |
| 2721 | //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------ | 2739 | //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------ |
| 2722 | if (!th.data.def_pick_store) { | 2740 | if (!th.data.def_pick_store) { |
| 2723 | - th.setData({ def_pick_store: e.data.data.pageData[0] }) | 2741 | + th.setData({ |
| 2742 | + def_pick_store: e.data.data.pageData[0], | ||
| 2743 | + sto_sele_name: e.data.data.pageData[0].pickup_name, | ||
| 2744 | + sto_sele_id: e.data.data.pageData[0].pickup_id, | ||
| 2745 | + sto_sele_distr: e.data.data.pageData[0].distr_type | ||
| 2746 | + }) | ||
| 2724 | } | 2747 | } |
| 2725 | 2748 | ||
| 2726 | } | 2749 | } |
pages/goods/goodsInfo/goodsInfo.wxml
| @@ -1457,8 +1457,8 @@ | @@ -1457,8 +1457,8 @@ | ||
| 1457 | <view> | 1457 | <view> |
| 1458 | <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> | 1458 | <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> |
| 1459 | </view> | 1459 | </view> |
| 1460 | - <view class="felx choose_more" bindtap="more_store"> | ||
| 1461 | - <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text> <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view> | 1460 | + <view class="felx choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat>0}}"> |
| 1461 | + <text class="fs26 red-co" >{{choice_sort_store==0?'更多门店':'返回'}}</text> <view class="bg_rights" ></view> | ||
| 1462 | </view> | 1462 | </view> |
| 1463 | </view> | 1463 | </view> |
| 1464 | </view> | 1464 | </view> |
pages/team/team_show/team_show.wxml
| @@ -291,9 +291,9 @@ | @@ -291,9 +291,9 @@ | ||
| 291 | <view> | 291 | <view> |
| 292 | <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> | 292 | <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> |
| 293 | </view> | 293 | </view> |
| 294 | - <view class="felx choose_more" bindtap="more_store"> | ||
| 295 | - <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text> | ||
| 296 | - <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view> | 294 | + <view class="felx choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat>0}}"> |
| 295 | + <text class="fs26 red-co">{{choice_sort_store==0?'更多门店':'返回'}}</text> | ||
| 296 | + <view class="bg_rights"></view> | ||
| 297 | </view> | 297 | </view> |
| 298 | </view> | 298 | </view> |
| 299 | </view> | 299 | </view> |