From 3e785e784f5b00947cf5e5d51885ad46d22d489e Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Sat, 6 Nov 2021 17:22:03 +0800
Subject: [PATCH] 小程序qa 门店选择

---
 packageA/pages/goodsInfo/goodsInfo.js           | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++------------------------
 packageA/pages/goodsInfo/goodsInfo.wxml         |  6 +++---
 packageA/pages/prom_list/prom_list.js           | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------
 packageA/pages/prom_list/prom_list.wxss         |  2 +-
 packageB/pages/zuhegou/index/index.js           | 64 ++++++++++++++++++++++++++++++++++++++++++++++------------------
 packageB/pages/zuhegou/index/index.wxml         |  6 +++---
 packageC/pages/presell/goodsInfo/goodsInfo.js   | 70 ++++++++++++++++++++++++++++++++++++++++++++++++----------------------
 packageC/pages/presell/goodsInfo/goodsInfo.wxml |  6 +++---
 pages/goods/goodsInfo/goodsInfo.js              | 30 ++++++++++++++++++++----------
 pages/goods/goodsInfo/goodsInfo.wxml            | 21 +++------------------
 pages/team/team_show/team_show.js               | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------
 pages/togoin/togoin.js                          | 10 +++++++---
 12 files changed, 292 insertions(+), 159 deletions(-)

diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index 57eb50d..e42fc2a 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -958,44 +958,53 @@ Page({
       getApp().request.get("/api/weshop/storagecategory/page", {
         data: {
           store_id: o.stoid,
-          is_show: 1,
           pageSize: 1000,
 		  orderField:"sort",
 		  orderType:'asc',
         },
         success: function(ee) {
           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 < 5; k++) {
-                 if (k == e.data.data.pageData.length) break;
-                  def_arr.push(e.data.data.pageData[k]);
+
+              var check_all_cate=0;
+              if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){
+                  for(let i in ee.data.data.pageData){
+                      let item=ee.data.data.pageData[i];
+                      if(item.is_show==1){
+                          check_all_cate=1;break
+                      }
+                  }
               }
+			
+            if (check_all_cate) {
+
 
-              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;
-                    break;
-                  }
+                    if (sto_arr[i].category_id == sto_cate[m].cat_id) {
+                        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;
@@ -1039,6 +1048,18 @@ Page({
                   }
                 }
               }
+
+                var def_arr = new Array();
+                //-- 开始就看10个门店 --
+                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){
@@ -1060,11 +1081,16 @@ Page({
                 };
                 newarr.push(item);
               }
-			  			  
-              th.setData({
-                is_show_sto_cat: 1,
-                all_sto: newarr
-              });
+
+                var sd={
+                    all_sto: newarr,
+                    is_show_sto_cat:1
+                }
+                if(!sto_arr || sto_arr.length<=10){
+                    sd.is_show_sto_cat=-1;
+                    sd.only_pk=sto_arr;
+                }
+                th.setData(sd);
 
             } else {
               th.setData({
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index cf27336..9b55593 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -340,9 +340,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>
diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js
index f97efbd..d4ed972 100644
--- a/packageA/pages/prom_list/prom_list.js
+++ b/packageA/pages/prom_list/prom_list.js
@@ -650,8 +650,11 @@ Page({
 				   th.data.def_pick_store.is_no_dis=1;
 				   th.setData({def_pick_store:th.data.def_pick_store});
 			   }else{
-				   th.data.def_pick_store.is_no_dis=0;
-				   th.setData({def_pick_store:th.data.def_pick_store});
+			   	 if(th.data.def_pick_store){
+                     th.data.def_pick_store.is_no_dis=0;
+                     th.setData({def_pick_store:th.data.def_pick_store});
+				 }
+
 			   }
 		  }
 	  }
@@ -823,43 +826,50 @@ Page({
 	     getApp().request.get("/api/weshop/storagecategory/page", {
 	      data: {
 	        store_id: o.stoid,
-	        is_show: 1,
 	        pageSize: 1000,
 			orderField:"sort",
 			orderType:'asc',
 	      },
 	      success: function(ee) {
 	        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 < 5; 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 check_all_cate=0;
+		 	  if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){
+				for(let i in ee.data.data.pageData){
+					let item=ee.data.data.pageData[i];
+					if(item.is_show==1){
+						check_all_cate=1;break
+					}
+				}
+			  }
+
+	          if (check_all_cate) {
+
 	            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;
-	                  break;
-	                }
+                      if (sto_arr[i].category_id == sto_cate[m].cat_id) {
+                          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;
@@ -903,8 +913,19 @@ Page({
 	                }
 	              }
 	            }
-				
-				//门店分类要排序下
+
+                  var def_arr = new Array();
+                  //-- 开始就看10个门店 --
+                  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){
 				        var value1 = a[property];
@@ -925,10 +946,17 @@ Page({
 	              };
 	              newarr.push(item);
 	            }
-	            th.setData({
-	              is_show_sto_cat: 1,
-	              all_sto: newarr
-	            });
+
+
+                  var sd={
+                      all_sto: newarr,
+                      is_show_sto_cat:1
+                  }
+                  if(!sto_arr || sto_arr.length<=10){
+                      sd.is_show_sto_cat=-1;
+                      sd.only_pk=sto_arr;
+                  }
+                  th.setData(sd);
 	  
 	          } else {
 	               th.setData({
diff --git a/packageA/pages/prom_list/prom_list.wxss b/packageA/pages/prom_list/prom_list.wxss
index 7bdbf97..4d5aad5 100644
--- a/packageA/pages/prom_list/prom_list.wxss
+++ b/packageA/pages/prom_list/prom_list.wxss
@@ -175,7 +175,7 @@
     margin-right: 10rpx;
 }
 .address{
-    width: 90%;
+    width: 99%;
     margin-top: 25rpx;
     margin-bottom: 5rpx;
 }
diff --git a/packageB/pages/zuhegou/index/index.js b/packageB/pages/zuhegou/index/index.js
index d71d923..8b58230 100644
--- a/packageB/pages/zuhegou/index/index.js
+++ b/packageB/pages/zuhegou/index/index.js
@@ -1289,42 +1289,51 @@ Page({
             getApp().request.get("/api/weshop/storagecategory/page", {
                 data: {
                     store_id: os.stoid,
-                    is_show: 1,
                     pageSize: 1000,
                     orderField: "sort",
                     orderType: 'asc',
                 },
                 success: function (ee) {
                     if (ee.data.code == 0) {
-                        if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) {
-                            var def_arr = new Array();
-                            //-- 开始就看5个门店 --
-                            for (var k = 0; k < 5; k++) {
-                                if (k == e.data.data.pageData.length) break;
-                                def_arr.push(e.data.data.pageData[k]);
+
+                        var check_all_cate=0;
+                        if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){
+                            for(let i in ee.data.data.pageData){
+                                let item=ee.data.data.pageData[i];
+                                if(item.is_show==1){
+                                    check_all_cate=1;break
+                                }
                             }
+                        }
+
+                        if (check_all_cate) {
 
-                            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;
@@ -1369,6 +1378,18 @@ Page({
                                 }
                             }
 
+                            var def_arr = new Array();
+                            //-- 开始就看10个门店 --
+                            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) {
@@ -1389,10 +1410,17 @@ Page({
                                 };
                                 newarr.push(item);
                             }
-                            th.setData({
-                                is_show_sto_cat: 1,
-                                all_sto: newarr
-                            });
+
+
+                            var sd={
+                                all_sto: newarr,
+                                is_show_sto_cat:1
+                            }
+                            if(!sto_arr || sto_arr.length<=10){
+                                sd.is_show_sto_cat=-1;
+                                sd.only_pk=sto_arr;
+                            }
+                            th.setData(sd);
 
                         } else {
                             th.setData({
diff --git a/packageB/pages/zuhegou/index/index.wxml b/packageB/pages/zuhegou/index/index.wxml
index 3528c56..dc70551 100644
--- a/packageB/pages/zuhegou/index/index.wxml
+++ b/packageB/pages/zuhegou/index/index.wxml
@@ -167,9 +167,9 @@
                     <view>
                         <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon>
                     </view>
-                    <view class="flex choose_more" bindtap="more_store">
-                        <text class="fs26 red-co" style="line-height: 30rpx;height: 30rpx" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text>
-                        <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view>
+                    <view class="flex choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat>0}}">
+                        <text class="fs26 red-co" style="line-height: 30rpx;height: 30rpx" >{{choice_sort_store==0?'更多门店':'返回'}}</text>
+                        <view class="bg_rights" ></view>
                     </view>
                 </view>
             </view>
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js
index 8fdfb8f..a1701e8 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.js
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -1877,7 +1877,6 @@ Page({
       getApp().request.get("/api/weshop/storagecategory/page", {
         data: {
           store_id: o.stoid,
-          is_show: 1,
           pageSize: 1000,
           orderField: "sort",
           orderType: 'asc',
@@ -1885,37 +1884,46 @@ Page({
         success: function (ee) {
           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 < 5; k++) {
-                if (k == e.data.data.pageData.length) break;
-                def_arr.push(e.data.data.pageData[k]);
+              var check_all_cate=0;
+              if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){
+                  for(let i in ee.data.data.pageData){
+                      let item=ee.data.data.pageData[i];
+                      if(item.is_show==1){
+                          check_all_cate=1;break
+                      }
+                  }
               }
 
-              th.setData({
-                def_pickpu_list: def_arr,
-                pickpu_list: ee.data.data.pageData
-              });
+            if (check_all_cate) {
+
               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;
-                    break;
-                  }
+                    if (sto_arr[i].category_id == sto_cate[m].cat_id) {
+                        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;
                   //如果有找到，那门店就在这个分组内，否则，分类就要排在其他
@@ -1959,6 +1967,18 @@ Page({
                 }
               }
 
+
+                var def_arr = new Array();
+                //-- 开始就看10个门店 --
+                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) {
@@ -1981,10 +2001,16 @@ Page({
                 newarr.push(item);
               }
 
-              th.setData({
-                is_show_sto_cat: 1,
-                all_sto: newarr
-              });
+
+                var sd={
+                    all_sto: newarr,
+                    is_show_sto_cat:1
+                }
+                if(!sto_arr || sto_arr.length<=10){
+                    sd.is_show_sto_cat=-1;
+                    sd.only_pk=sto_arr;
+                }
+                th.setData(sd);
 
             } else {
               th.setData({
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.wxml b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
index 9bb3a48..7b80a41 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.wxml
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
@@ -788,9 +788,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>
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 57b902e..d3e8537 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -2600,9 +2600,16 @@ Page({
         },
         success: function (ee) {
           if (ee.data.code == 0) {
-
-            if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) {
-
+            var check_all_cate=0;
+            if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){
+               for(let i in ee.data.data.pageData){
+                  let item=ee.data.data.pageData[i];
+                  if(item.is_show==1){
+                      check_all_cate=1;break
+                  }
+               }
+            }
+            if (check_all_cate) {
               var sto_cate = ee.data.data.pageData;
               var sto_arr = e.data.data.pageData;
               var newarr = new Array();
@@ -2674,10 +2681,8 @@ Page({
                 }
               }
 
-
                 var def_arr = new Array();
-                var ishas = 0;
-                //-- 开始就看5个门店 --
+                //-- 开始就看10个门店 --
                 for (var k = 0; k < 10; k++) {
                     if (k == sto_arr.length) break;
                     def_arr.push(sto_arr[k]);
@@ -2711,10 +2716,15 @@ Page({
                 newarr.push(item);
               }
 
-              th.setData({
-                is_show_sto_cat: 1,
-                all_sto: newarr
-              });
+                var sd={
+                    all_sto: newarr,
+                    is_show_sto_cat:1
+                }
+                if(!sto_arr || sto_arr.length<=10){
+                    sd.is_show_sto_cat=-1;
+                    sd.only_pk=sto_arr;
+                }
+                th.setData(sd);
 
             } else {
               th.setData({
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index ea1ba2b..4fbfc7f 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -188,26 +188,11 @@
                 <view class="rel">
                   <view class='ghaicha ellipsis-2'>
                     <text class='gred' wx:if="{{prom_act.max_ct_num >0}}">
-                      <text class="flex" wx:if="{{prom_act.max_ct_num - item.open_num>0}}">
-                        还差
-                        <text class="word-color">{{prom_act.max_ct_num - item.open_num}}</text>
-                        人享最低优惠
-                      </text>
+                      <text class="flex" wx:if="{{prom_act.max_ct_num - item.open_num>0}}">还差<text class="word-color">{{prom_act.max_ct_num - item.open_num}}</text>人享最低优惠</text>
                       <text wx:else>您已经享最低优惠</text>
                     </text>
-                    <text class='gred' wx:else>
-                      还差
-                      <text style='color:#ff2753'>{{prom_act.ct_num - item.open_num}}</text>
-                      人成团
-                    </text>
-                    <view class="t_show">
-                      剩余
-                      <text wx:if="{{timer[t_ind].day}}">{{timer[t_ind].day}}天:</text>
-                      <text>{{timer[t_ind].hou}}</text>
-                      :
-                      <text>{{timer[t_ind].min}}</text>
-                      :
-                      <text>{{timer[t_ind].sec}}</text>
+                    <text class='gred' wx:else>还差<text style='color:#ff2753'>{{prom_act.ct_num - item.open_num}}</text>人成团</text>
+                    <view class="t_show">剩余<text wx:if="{{timer[t_ind].day}}">{{timer[t_ind].day}}天:</text><text>{{timer[t_ind].hou}}</text>:<text>{{timer[t_ind].min}}</text>:<text>{{timer[t_ind].sec}}</text>
                     </view>
                   </view>
                 </view>
diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js
index 1dc7344..03d961a 100644
--- a/pages/team/team_show/team_show.js
+++ b/pages/team/team_show/team_show.js
@@ -1178,43 +1178,52 @@ Page({
 	    getApp().request.get("/api/weshop/storagecategory/page", {
 	      data: {
 	        store_id: o.stoid,
-	        is_show: 1,
 	        pageSize: 1000,
 			orderField:"sort",
 			orderType:'asc',
 	      },
 	      success: function(ee) {
 	        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 < 5; 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 check_all_cate=0;
+               if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){
+                    for(let i in ee.data.data.pageData){
+                        let item=ee.data.data.pageData[i];
+                        if(item.is_show==1){
+                            check_all_cate=1;break
+                        }
+                    }
+               }
+
+
+
+	          if (check_all_cate) {
+
 	            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;
-	                  break;
+                        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;
@@ -1258,8 +1267,19 @@ Page({
 	                }
 	              }
 	            }
-				
-				//门店分类要排序下
+
+                  var def_arr = new Array();
+                  //-- 开始就看10个门店 --
+                  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){
 				        var value1 = a[property];
@@ -1280,10 +1300,16 @@ Page({
 	              };
 	              newarr.push(item);
 	            }
-	            th.setData({
-	              is_show_sto_cat: 1,
-	              all_sto: newarr
-	            });
+
+                  var sd={
+                      all_sto: newarr,
+                      is_show_sto_cat:1
+                  }
+                  if(!sto_arr || sto_arr.length<=10){
+                      sd.is_show_sto_cat=-1;
+                      sd.only_pk=sto_arr;
+                  }
+                  th.setData(sd);
 	
 	          } else {
 	            th.setData({
diff --git a/pages/togoin/togoin.js b/pages/togoin/togoin.js
index 56c47b6..77c8f4c 100644
--- a/pages/togoin/togoin.js
+++ b/pages/togoin/togoin.js
@@ -105,7 +105,8 @@ Page({
 						 wx.setStorageSync("userinfo",e.data.data);
 										 			 
 		                 setTimeout(function () {
-		                   wx.navigateBack({ delta: 1})  //返回上一页
+                             getApp().globalData.login_back=1;
+		                     wx.navigateBack({ delta: 1})  //返回上一页
 		                 },1000)
 		             }else{
 		                getApp().globalData.sessionKey=e.data.data.sessionKey;
@@ -200,7 +201,9 @@ Page({
 		
 		var need_go=0; 
 		var t_user=e.data.data;
-        
+
+
+        getApp().globalData.login_back=1;
 		wx.setStorageSync("userinfo",e.data.data);
         wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(a.globalData.userInfo.head_pic);
 		
@@ -272,7 +275,8 @@ Page({
 	  				 wx.setStorageSync("userinfo",e.data.data);
 	  								 			 
 	                   setTimeout(function () {
-	                     wx.navigateBack({ delta: 1})  //返回上一页
+                           getApp().globalData.login_back=1;
+	                       wx.navigateBack({ delta: 1})  //返回上一页
 	                   },1000)
 	               }else{
 	                  getApp().globalData.sessionKey=e.data.data.sessionKey;
--
libgit2 0.21.4