Merge branch 'dev' into 'test'

选择门店的优化 See merge request !855

Merge branch 'dev' into 'test'
选择门店的优化 See merge request !855
后端研发-苏明海
2 parents 3f0afd98 a5b646fd
Showing 4 changed files with 48 additions and 25 deletions
packageA/pages/prom_list/prom_list.wxml
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/team/team_show/team_show.wxml
@@ -214,9 +214,9 @@
                     <view>
                         <icon bindtap="close_popup" class="modal-closes" color="black" size="22"       type="cancel"></icon>
                     </view>
-                    <view class="felx choose_more" bindtap="more_store">
-                        <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>
+                    <view class="felx choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat>0}}">
+                        <text class="fs26 red-co" >{{choice_sort_store==0?'更多门店':'返回'}}</text>
+                        <view class="bg_rights"></view>
                     </view>
                 </view>
             </view>
@@ -2594,7 +2594,6 @@ Page({
       getApp().request.get("/api/weshop/storagecategory/page", {
         data: {
           store_id: o.stoid,
-          is_show: 1,
           pageSize: 1000,
           orderField: "sort",
           orderType: 'asc',
@@ -2603,35 +2602,34 @@ Page({
           if (ee.data.code == 0) {
             if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) {
-              var def_arr = new Array();
-              var ishas = 0;
-              //-- 开始就看5个门店 --
-              for (var k = 0; k < 10; k++) {
-                if (k == e.data.data.pageData.length) break;
-                def_arr.push(e.data.data.pageData[k]);
-              }
-              th.setData({
-                def_pickpu_list: def_arr,
-                pickpu_list: ee.data.data.pageData
-              });
               var sto_cate = ee.data.data.pageData;
               var sto_arr = e.data.data.pageData;
               var newarr = new Array();
               var qita = new Array();
+
+              var is_del_pk=0;
               //----要进行门店分组--------
               for (var i = 0; i < sto_arr.length; i++) {
                 //找一下这个门店有没有在分类数组内
                 var find2 = 0, find2name = "", sort = 0;
+
                 for (var m = 0; m < sto_cate.length; m++) {
                   if (sto_arr[i].category_id == sto_cate[m].cat_id) {
-                    find2 = sto_cate[m].cat_id;
-                    find2name = sto_cate[m].cat_name;
-                    sort = sto_cate[m].sort;
+                    if(sto_cate[m].is_show!=1){
+                        is_del_pk=1; sto_arr.splice(i,1);
+                        i--;
+                    }else {
+                        find2 = sto_cate[m].cat_id;
+                        find2name = sto_cate[m].cat_name;
+                        sort = sto_cate[m].sort;
+                        is_del_pk=0;
+                    }
                     break;
                   }
                 }
+                if(is_del_pk) continue;
                 if (newarr.length > 0) {
                   var find = 0;
@@ -2676,6 +2674,21 @@ Page({
                 }
               }
+
+                var def_arr = new Array();
+                var ishas = 0;
+                //-- 开始就看5个门店 --
+                for (var k = 0; k < 10; k++) {
+                    if (k == sto_arr.length) break;
+                    def_arr.push(sto_arr[k]);
+                }
+
+                th.setData({
+                    def_pickpu_list: def_arr,
+                    pickpu_list: ee.data.data.pageData
+                });
+
+
               //门店分类要排序下
               function compare(property) {
                 return function (a, b) {
@@ -2710,7 +2723,12 @@ Page({
               });
               //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------
               if (!th.data.def_pick_store) {
-                th.setData({ def_pick_store: e.data.data.pageData[0] })
+                th.setData({
+                    def_pick_store: e.data.data.pageData[0],
+                    sto_sele_name: e.data.data.pageData[0].pickup_name,
+                    sto_sele_id: e.data.data.pageData[0].pickup_id,
+                    sto_sele_distr: e.data.data.pageData[0].distr_type
+                })
               }
             }
           } else {
@@ -2720,7 +2738,12 @@ Page({
             });
             //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------
             if (!th.data.def_pick_store) {
-              th.setData({ def_pick_store: e.data.data.pageData[0] })
+              th.setData({
+                  def_pick_store: e.data.data.pageData[0],
+                  sto_sele_name: e.data.data.pageData[0].pickup_name,
+                  sto_sele_id: e.data.data.pageData[0].pickup_id,
+                  sto_sele_distr: e.data.data.pageData[0].distr_type
+              })
             }
           }
@@ -1457,8 +1457,8 @@
           <view>
             <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon>
           </view>
-          <view class="felx choose_more" bindtap="more_store">
-            <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>
+          <view class="felx choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat>0}}">
+            <text class="fs26 red-co" >{{choice_sort_store==0?'更多门店':'返回'}}</text> <view class="bg_rights" ></view>
           </view>
         </view>
       </view>
@@ -291,9 +291,9 @@
            <view>
               <icon bindtap="close_popup" class="modal-closes" color="black" size="22"       type="cancel"></icon>
            </view>
-           <view class="felx choose_more" bindtap="more_store">
-              <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>
+           <view class="felx choose_more" bindtap="more_store"  wx:if="{{is_show_sto_cat>0}}">
+              <text class="fs26 red-co">{{choice_sort_store==0?'更多门店':'返回'}}</text>
+              <view class="bg_rights"></view>
            </view>
           </view>
        </view>