diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index e42fc2a..0fcc18b 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -989,6 +989,7 @@ Page({
for (var i = 0; i < sto_arr.length; i++) {
//找一下这个门店有没有在分类数组内
var find2 = 0, find2name = "",sort=0;
+ is_del_pk=0;
for (var m = 0; m < sto_cate.length; m++) {
if (sto_arr[i].category_id == sto_cate[m].cat_id) {
if (sto_cate[m].is_show != 1) {
diff --git a/packageA/pages/profile/profile.js b/packageA/pages/profile/profile.js
index 2524de5..19609b7 100644
--- a/packageA/pages/profile/profile.js
+++ b/packageA/pages/profile/profile.js
@@ -284,43 +284,53 @@ Page({
if (e.data.data.total > 10 && ishas_cate) {
i.get("/api/weshop/storagecategory/page", {
data: {
- store_id: r.stoid,
- is_show: 1,
- pageSize: 300
+ store_id: r.stoid,
+ pageSize: 1000,
+ orderField:"sort",
+ orderType:'asc',
},
success: function(ee) {
if (ee.data.code == 0) {
- if (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 = "";
+ var find2 = 0,find2name = "",sort=0;
+ is_del_pk=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;
+ 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;
//如果有找到，那门店就在这个分组内，否则，分类就要排在其他
@@ -338,6 +348,7 @@ Page({
var item = {
cat_id: find2,
name: find2name,
+ sort:sort,
s_arr: arr0
};
newarr.push(item);
@@ -353,6 +364,7 @@ Page({
var item = {
cat_id: find2,
name: find2name,
+ sort:sort,
s_arr: arr0
};
newarr.push(item);
@@ -361,6 +373,30 @@ Page({
}
}
}
+
+ var def_arr = new Array();
+ //-- 开始就看10个门店 --
+ 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
+ });
+
+ //门店分类要排序下
+ function compare(property){
+ return function(a,b){
+ var value1 = a[property];
+ var value2 = b[property];
+ return value1 - value2;
+ }
+ }
+ if(newarr.length>0)
+ newarr.sort(compare("sort"));
+
//----安排其他的分类-----
if (qita.length > 0) {
diff --git a/packageA/pages/profile/profile.wxml b/packageA/pages/profile/profile.wxml
index 359f88d..45b7d0a 100644
--- a/packageA/pages/profile/profile.wxml
+++ b/packageA/pages/profile/profile.wxml
@@ -211,8 +211,8 @@
-
- {{choice_sort_store==0?'更多门店':'返回'}}
+
+ {{choice_sort_store==0?'更多门店':'返回'}}
diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js
index d4ed972..e3638ab 100644
--- a/packageA/pages/prom_list/prom_list.js
+++ b/packageA/pages/prom_list/prom_list.js
@@ -855,6 +855,7 @@ Page({
for (var i = 0; i < sto_arr.length; i++) {
//找一下这个门店有没有在分类数组内
var find2 = 0, find2name = "",sort=0;
+ is_del_pk=0;
for (var m = 0; m < sto_cate.length; m++) {
if (sto_arr[i].category_id == sto_cate[m].cat_id) {
if(sto_cate[m].is_show!=1){
diff --git a/packageB/pages/zuhegou/index/index.js b/packageB/pages/zuhegou/index/index.js
index 8b58230..3f6253e 100644
--- a/packageB/pages/zuhegou/index/index.js
+++ b/packageB/pages/zuhegou/index/index.js
@@ -1318,6 +1318,7 @@ Page({
for (var i = 0; i < sto_arr.length; i++) {
//找一下这个门店有没有在分类数组内
var find2 = 0, find2name = "", sort = 0;
+ is_del_pk=0;
for (var m = 0; m < sto_cate.length; m++) {
if (sto_arr[i].category_id == sto_cate[m].cat_id) {
if (sto_cate[m].is_show != 1) {
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js
index a1701e8..a6981e8 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.js
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -1906,6 +1906,7 @@ Page({
for (var i = 0; i < sto_arr.length; i++) {
//找一下这个门店有没有在分类数组内
var find2 = 0, find2name = "", sort = 0;
+ is_del_pk=0;
for (var m = 0; m < sto_cate.length; m++) {
if (sto_arr[i].category_id == sto_cate[m].cat_id) {
if (sto_cate[m].is_show != 1) {
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index d3e8537..94c7353 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -2621,7 +2621,7 @@ Page({
for (var i = 0; i < sto_arr.length; i++) {
//找一下这个门店有没有在分类数组内
var find2 = 0, find2name = "", sort = 0;
-
+ is_del_pk=0;
for (var m = 0; m < sto_cate.length; m++) {
if (sto_arr[i].category_id == sto_cate[m].cat_id) {
if(sto_cate[m].is_show!=1){
diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js
index 03d961a..9da6870 100644
--- a/pages/team/team_show/team_show.js
+++ b/pages/team/team_show/team_show.js
@@ -1209,6 +1209,7 @@ Page({
for (var i = 0; i < sto_arr.length; i++) {
//找一下这个门店有没有在分类数组内
var find2 = 0,find2name = "",sort=0;
+ is_del_pk=0;
for (var m = 0; m < sto_cate.length; m++) {
if (sto_arr[i].category_id == sto_cate[m].cat_id) {
if(sto_cate[m].is_show!=1){
@@ -1279,7 +1280,8 @@ Page({
def_pickpu_list: def_arr,
pickpu_list: ee.data.data.pageData
});
- //门店分类要排序下
+
+ //门店分类要排序下
function compare(property){
return function(a,b){
var value1 = a[property];
diff --git a/pages/user/userinfo/userinfo.js b/pages/user/userinfo/userinfo.js
index b322b97..54d8d8a 100644
--- a/pages/user/userinfo/userinfo.js
+++ b/pages/user/userinfo/userinfo.js
@@ -317,46 +317,57 @@ Page({
}
//单总量超出5个的时候
- if (e.data.data.total > 5) {
+ if (e.data.data.total > 10) {
i.get("/api/weshop/storagecategory/page", {
data: {
- store_id: r.stoid,
- is_show: 1,
- pageSize: 300
+ store_id: r.stoid,
+ pageSize: 1000,
+ orderField:"sort",
+ orderType:'asc',
},
success: function(ee) {
if (ee.data.code == 0) {
- if (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 = "";
+ var find2 = 0, find2name = "",sort=0;
+ is_del_pk=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;
+ 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;
//如果有找到，那门店就在这个分组内，否则，分类就要排在其他
@@ -374,6 +385,7 @@ Page({
var item = {
cat_id: find2,
name: find2name,
+ sort:sort,
s_arr: arr0
};
newarr.push(item);
@@ -389,6 +401,7 @@ Page({
var item = {
cat_id: find2,
name: find2name,
+ sort:sort,
s_arr: arr0
};
newarr.push(item);
@@ -397,6 +410,29 @@ Page({
}
}
}
+
+ var def_arr = new Array();
+ //-- 开始就看10个门店 --
+ 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
+ });
+
+ //门店分类要排序下
+ function compare(property){
+ return function(a,b){
+ var value1 = a[property];
+ var value2 = b[property];
+ return value1 - value2;
+ }
+ }
+ if(newarr.length>0)
+ newarr.sort(compare("sort"));
//----安排其他的分类-----
if (qita.length > 0) {
diff --git a/pages/user/userinfo/userinfo.wxml b/pages/user/userinfo/userinfo.wxml
index 456c8dd..b26b2f6 100644
--- a/pages/user/userinfo/userinfo.wxml
+++ b/pages/user/userinfo/userinfo.wxml
@@ -287,8 +287,8 @@
-
- {{choice_sort_store==0?'更多门店':'返回'}}
+
+ {{choice_sort_store==0?'更多门店':'返回'}}