wxd / MShopWeApp

Merged
Merge Request #857 · created by 后端研发-苏明海

Dev

From dev into test

Merged by 后端研发-苏明海

1 participants
Inline Side-by-side
Showing 13 changed files
components/goods_list/goods_list.js
  Edit  View file @3e785e7
@@ -26,6 +26,12 @@ Component({ @@ -26,6 +26,12 @@ Component({
26 //要处理一下，游客登录后的界面的变化,主要还该是改变会员 26 //要处理一下，游客登录后的界面的变化,主要还该是改变会员
27 show: function () { 27 show: function () {
28 this.init(); 28 this.init();
  29 + if(getApp().globalData.login_back==1){
  30 + getApp().globalData.login_back==0;
  31 + this.data.curPage=1;
  32 + this.setData({ recommend: [] });
  33 + this.get_list();
  34 + }
29 } 35 }
30 }, 36 },
31 37
packageA/pages/goodsInfo/goodsInfo.js
  Edit  View file @3e785e7
@@ -958,44 +958,53 @@ Page({ @@ -958,44 +958,53 @@ Page({
958 getApp().request.get("/api/weshop/storagecategory/page", { 958 getApp().request.get("/api/weshop/storagecategory/page", {
959 data: { 959 data: {
960 store_id: o.stoid, 960 store_id: o.stoid,
961 - is_show: 1,  
962 pageSize: 1000, 961 pageSize: 1000,
963 orderField:"sort", 962 orderField:"sort",
964 orderType:'asc', 963 orderType:'asc',
965 }, 964 },
966 success: function(ee) { 965 success: function(ee) {
967 if (ee.data.code == 0) { 966 if (ee.data.code == 0) {
968 -  
969 - if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) {  
970 - var def_arr = new Array();  
971 - var ishas = 0;  
972 - //-- 开始就看5个门店 --  
973 - for (var k = 0; k < 5; k++) {  
974 - if (k == e.data.data.pageData.length) break;  
975 - def_arr.push(e.data.data.pageData[k]); 967 +
  968 + var check_all_cate=0;
  969 + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){
  970 + for(let i in ee.data.data.pageData){
  971 + let item=ee.data.data.pageData[i];
  972 + if(item.is_show==1){
  973 + check_all_cate=1;break
  974 + }
  975 + }
976 } 976 }
  977 +
  978 + if (check_all_cate) {
  979 +
977 980
978 - th.setData({  
979 - def_pickpu_list: def_arr,  
980 - pickpu_list: ee.data.data.pageData  
981 - });  
982 var sto_cate = ee.data.data.pageData; 981 var sto_cate = ee.data.data.pageData;
983 var sto_arr = e.data.data.pageData; 982 var sto_arr = e.data.data.pageData;
984 var newarr = new Array(); 983 var newarr = new Array();
985 var qita = new Array(); 984 var qita = new Array();
986 985
  986 + var is_del_pk=0;
  987 +
987 //----要进行门店分组-------- 988 //----要进行门店分组--------
988 for (var i = 0; i < sto_arr.length; i++) { 989 for (var i = 0; i < sto_arr.length; i++) {
989 //找一下这个门店有没有在分类数组内 990 //找一下这个门店有没有在分类数组内
990 var find2 = 0, find2name = "",sort=0; 991 var find2 = 0, find2name = "",sort=0;
991 for (var m = 0; m < sto_cate.length; m++) { 992 for (var m = 0; m < sto_cate.length; m++) {
992 - if (sto_arr[i].category_id == sto_cate[m].cat_id) {  
993 - find2 = sto_cate[m].cat_id;  
994 - find2name = sto_cate[m].cat_name;  
995 - sort = sto_cate[m].sort;  
996 - break;  
997 - } 993 + if (sto_arr[i].category_id == sto_cate[m].cat_id) {
  994 + if (sto_cate[m].is_show != 1) {
  995 + is_del_pk = 1;
  996 + sto_arr.splice(i, 1);
  997 + i--;
  998 + } else {
  999 + find2 = sto_cate[m].cat_id;
  1000 + find2name = sto_cate[m].cat_name;
  1001 + sort = sto_cate[m].sort;
  1002 + is_del_pk = 0;
  1003 + }
  1004 + break;
  1005 + }
998 } 1006 }
  1007 + if(is_del_pk) continue;
999 1008
1000 if (newarr.length > 0) { 1009 if (newarr.length > 0) {
1001 var find = 0; 1010 var find = 0;
@@ -1039,6 +1048,18 @@ Page({ @@ -1039,6 +1048,18 @@ Page({
1039 } 1048 }
1040 } 1049 }
1041 } 1050 }
  1051 +
  1052 + var def_arr = new Array();
  1053 + //-- 开始就看10个门店 --
  1054 + for (var k = 0; k < 10; k++) {
  1055 + if (k == sto_arr.length) break;
  1056 + def_arr.push(sto_arr[k]);
  1057 + }
  1058 +
  1059 + th.setData({
  1060 + def_pickpu_list: def_arr,
  1061 + pickpu_list: ee.data.data.pageData
  1062 + });
1042 1063
1043 //门店分类要排序下 1064 //门店分类要排序下
1044 function compare(property){ 1065 function compare(property){
@@ -1060,11 +1081,16 @@ Page({ @@ -1060,11 +1081,16 @@ Page({
1060 }; 1081 };
1061 newarr.push(item); 1082 newarr.push(item);
1062 } 1083 }
1063 -  
1064 - th.setData({  
1065 - is_show_sto_cat: 1,  
1066 - all_sto: newarr  
1067 - }); 1084 +
  1085 + var sd={
  1086 + all_sto: newarr,
  1087 + is_show_sto_cat:1
  1088 + }
  1089 + if(!sto_arr || sto_arr.length<=10){
  1090 + sd.is_show_sto_cat=-1;
  1091 + sd.only_pk=sto_arr;
  1092 + }
  1093 + th.setData(sd);
1068 1094
1069 } else { 1095 } else {
1070 th.setData({ 1096 th.setData({
packageA/pages/goodsInfo/goodsInfo.wxml
  Edit  View file @3e785e7
@@ -340,9 +340,9 @@ @@ -340,9 +340,9 @@
340 <view> 340 <view>
341 <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> 341 <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon>
342 </view> 342 </view>
343 - <view class="felx choose_more" bindtap="more_store">  
344 - <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text>  
345 - <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view> 343 + <view class="felx choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat>0}}" >
  344 + <text class="fs26 red-co">{{choice_sort_store==0?'更多门店':'返回'}}</text>
  345 + <view class="bg_rights"></view>
346 </view> 346 </view>
347 </view> 347 </view>
348 </view> 348 </view>
packageA/pages/prom_list/prom_list.js
  Edit  View file @3e785e7
@@ -650,8 +650,11 @@ Page({ @@ -650,8 +650,11 @@ Page({
650 th.data.def_pick_store.is_no_dis=1; 650 th.data.def_pick_store.is_no_dis=1;
651 th.setData({def_pick_store:th.data.def_pick_store}); 651 th.setData({def_pick_store:th.data.def_pick_store});
652 }else{ 652 }else{
653 - th.data.def_pick_store.is_no_dis=0;  
654 - th.setData({def_pick_store:th.data.def_pick_store}); 653 + if(th.data.def_pick_store){
  654 + th.data.def_pick_store.is_no_dis=0;
  655 + th.setData({def_pick_store:th.data.def_pick_store});
  656 + }
  657 +
655 } 658 }
656 } 659 }
657 } 660 }
@@ -823,43 +826,50 @@ Page({ @@ -823,43 +826,50 @@ Page({
823 getApp().request.get("/api/weshop/storagecategory/page", { 826 getApp().request.get("/api/weshop/storagecategory/page", {
824 data: { 827 data: {
825 store_id: o.stoid, 828 store_id: o.stoid,
826 - is_show: 1,  
827 pageSize: 1000, 829 pageSize: 1000,
828 orderField:"sort", 830 orderField:"sort",
829 orderType:'asc', 831 orderType:'asc',
830 }, 832 },
831 success: function(ee) { 833 success: function(ee) {
832 if (ee.data.code == 0) { 834 if (ee.data.code == 0) {
833 - if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) {  
834 - var def_arr = new Array();  
835 - var ishas = 0;  
836 - //-- 开始就看5个门店 --  
837 - for (var k = 0; k < 5; k++) {  
838 - if (k == e.data.data.pageData.length) break;  
839 - def_arr.push(e.data.data.pageData[k]);  
840 - }  
841 -  
842 - th.setData({  
843 - def_pickpu_list: def_arr,  
844 - pickpu_list: ee.data.data.pageData  
845 - }); 835 +
  836 + var check_all_cate=0;
  837 + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){
  838 + for(let i in ee.data.data.pageData){
  839 + let item=ee.data.data.pageData[i];
  840 + if(item.is_show==1){
  841 + check_all_cate=1;break
  842 + }
  843 + }
  844 + }
  845 +
  846 + if (check_all_cate) {
  847 +
846 var sto_cate = ee.data.data.pageData; 848 var sto_cate = ee.data.data.pageData;
847 var sto_arr = e.data.data.pageData; 849 var sto_arr = e.data.data.pageData;
848 var newarr = new Array(); 850 var newarr = new Array();
849 var qita = new Array(); 851 var qita = new Array();
850 - 852 +
  853 + var is_del_pk=0;
851 //----要进行门店分组-------- 854 //----要进行门店分组--------
852 for (var i = 0; i < sto_arr.length; i++) { 855 for (var i = 0; i < sto_arr.length; i++) {
853 //找一下这个门店有没有在分类数组内 856 //找一下这个门店有没有在分类数组内
854 var find2 = 0, find2name = "",sort=0; 857 var find2 = 0, find2name = "",sort=0;
855 for (var m = 0; m < sto_cate.length; m++) { 858 for (var m = 0; m < sto_cate.length; m++) {
856 - if (sto_arr[i].category_id == sto_cate[m].cat_id) {  
857 - find2 = sto_cate[m].cat_id;  
858 - find2name = sto_cate[m].cat_name;  
859 - sort=sto_cate[m].sort;  
860 - break;  
861 - } 859 + if (sto_arr[i].category_id == sto_cate[m].cat_id) {
  860 + if(sto_cate[m].is_show!=1){
  861 + is_del_pk=1; sto_arr.splice(i,1);
  862 + i--;
  863 + }else {
  864 + find2 = sto_cate[m].cat_id;
  865 + find2name = sto_cate[m].cat_name;
  866 + sort = sto_cate[m].sort;
  867 + is_del_pk=0;
  868 + }
  869 + break;
  870 + }
862 } 871 }
  872 + if(is_del_pk) continue;
863 873
864 if (newarr.length > 0) { 874 if (newarr.length > 0) {
865 var find = 0; 875 var find = 0;
@@ -903,8 +913,19 @@ Page({ @@ -903,8 +913,19 @@ Page({
903 } 913 }
904 } 914 }
905 } 915 }
906 -  
907 - //门店分类要排序下 916 +
  917 + var def_arr = new Array();
  918 + //-- 开始就看10个门店 --
  919 + for (var k = 0; k < 10; k++) {
  920 + if (k == sto_arr.length) break;
  921 + def_arr.push(sto_arr[k]);
  922 + }
  923 + th.setData({
  924 + def_pickpu_list: def_arr,
  925 + pickpu_list: ee.data.data.pageData
  926 + });
  927 +
  928 + //门店分类要排序下
908 function compare(property){ 929 function compare(property){
909 return function(a,b){ 930 return function(a,b){
910 var value1 = a[property]; 931 var value1 = a[property];
@@ -925,10 +946,17 @@ Page({ @@ -925,10 +946,17 @@ Page({
925 }; 946 };
926 newarr.push(item); 947 newarr.push(item);
927 } 948 }
928 - th.setData({  
929 - is_show_sto_cat: 1,  
930 - all_sto: newarr  
931 - }); 949 +
  950 +
  951 + var sd={
  952 + all_sto: newarr,
  953 + is_show_sto_cat:1
  954 + }
  955 + if(!sto_arr || sto_arr.length<=10){
  956 + sd.is_show_sto_cat=-1;
  957 + sd.only_pk=sto_arr;
  958 + }
  959 + th.setData(sd);
932 960
933 } else { 961 } else {
934 th.setData({ 962 th.setData({
packageA/pages/prom_list/prom_list.wxss
  Edit  View file @3e785e7
@@ -175,7 +175,7 @@ @@ -175,7 +175,7 @@
175 margin-right: 10rpx; 175 margin-right: 10rpx;
176 } 176 }
177 .address{ 177 .address{
178 - width: 90%; 178 + width: 99%;
179 margin-top: 25rpx; 179 margin-top: 25rpx;
180 margin-bottom: 5rpx; 180 margin-bottom: 5rpx;
181 } 181 }
packageB/pages/zuhegou/index/index.js
  Edit  View file @3e785e7
@@ -1289,42 +1289,51 @@ Page({ @@ -1289,42 +1289,51 @@ Page({
1289 getApp().request.get("/api/weshop/storagecategory/page", { 1289 getApp().request.get("/api/weshop/storagecategory/page", {
1290 data: { 1290 data: {
1291 store_id: os.stoid, 1291 store_id: os.stoid,
1292 - is_show: 1,  
1293 pageSize: 1000, 1292 pageSize: 1000,
1294 orderField: "sort", 1293 orderField: "sort",
1295 orderType: 'asc', 1294 orderType: 'asc',
1296 }, 1295 },
1297 success: function (ee) { 1296 success: function (ee) {
1298 if (ee.data.code == 0) { 1297 if (ee.data.code == 0) {
1299 - if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) {  
1300 - var def_arr = new Array();  
1301 - //-- 开始就看5个门店 --  
1302 - for (var k = 0; k < 5; k++) {  
1303 - if (k == e.data.data.pageData.length) break;  
1304 - def_arr.push(e.data.data.pageData[k]); 1298 +
  1299 + var check_all_cate=0;
  1300 + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){
  1301 + for(let i in ee.data.data.pageData){
  1302 + let item=ee.data.data.pageData[i];
  1303 + if(item.is_show==1){
  1304 + check_all_cate=1;break
  1305 + }
1305 } 1306 }
  1307 + }
  1308 +
  1309 + if (check_all_cate) {
1306 1310
1307 - th.setData({  
1308 - def_pickpu_list: def_arr,  
1309 - pickpu_list: ee.data.data.pageData  
1310 - });  
1311 var sto_cate = ee.data.data.pageData; 1311 var sto_cate = ee.data.data.pageData;
1312 var sto_arr = e.data.data.pageData; 1312 var sto_arr = e.data.data.pageData;
1313 var newarr = new Array(); 1313 var newarr = new Array();
1314 var qita = new Array(); 1314 var qita = new Array();
1315 1315
  1316 + var is_del_pk=0;
1316 //----要进行门店分组-------- 1317 //----要进行门店分组--------
1317 for (var i = 0; i < sto_arr.length; i++) { 1318 for (var i = 0; i < sto_arr.length; i++) {
1318 //找一下这个门店有没有在分类数组内 1319 //找一下这个门店有没有在分类数组内
1319 var find2 = 0, find2name = "", sort = 0; 1320 var find2 = 0, find2name = "", sort = 0;
1320 for (var m = 0; m < sto_cate.length; m++) { 1321 for (var m = 0; m < sto_cate.length; m++) {
1321 if (sto_arr[i].category_id == sto_cate[m].cat_id) { 1322 if (sto_arr[i].category_id == sto_cate[m].cat_id) {
1322 - find2 = sto_cate[m].cat_id;  
1323 - find2name = sto_cate[m].cat_name;  
1324 - sort = sto_cate[m].sort; 1323 + if (sto_cate[m].is_show != 1) {
  1324 + is_del_pk = 1;
  1325 + sto_arr.splice(i, 1);
  1326 + i--;
  1327 + } else {
  1328 + find2 = sto_cate[m].cat_id;
  1329 + find2name = sto_cate[m].cat_name;
  1330 + sort = sto_cate[m].sort;
  1331 + is_del_pk = 0;
  1332 + }
1325 break; 1333 break;
1326 } 1334 }
1327 } 1335 }
  1336 + if(is_del_pk) continue;
1328 1337
1329 if (newarr.length > 0) { 1338 if (newarr.length > 0) {
1330 var find = 0; 1339 var find = 0;
@@ -1369,6 +1378,18 @@ Page({ @@ -1369,6 +1378,18 @@ Page({
1369 } 1378 }
1370 } 1379 }
1371 1380
  1381 + var def_arr = new Array();
  1382 + //-- 开始就看10个门店 --
  1383 + for (var k = 0; k < 10; k++) {
  1384 + if (k == sto_arr.length) break;
  1385 + def_arr.push(sto_arr[k]);
  1386 + }
  1387 +
  1388 + th.setData({
  1389 + def_pickpu_list: def_arr,
  1390 + pickpu_list: ee.data.data.pageData
  1391 + });
  1392 +
1372 //门店分类要排序下 1393 //门店分类要排序下
1373 function compare(property) { 1394 function compare(property) {
1374 return function (a, b) { 1395 return function (a, b) {
@@ -1389,10 +1410,17 @@ Page({ @@ -1389,10 +1410,17 @@ Page({
1389 }; 1410 };
1390 newarr.push(item); 1411 newarr.push(item);
1391 } 1412 }
1392 - th.setData({  
1393 - is_show_sto_cat: 1,  
1394 - all_sto: newarr  
1395 - }); 1413 +
  1414 +
  1415 + var sd={
  1416 + all_sto: newarr,
  1417 + is_show_sto_cat:1
  1418 + }
  1419 + if(!sto_arr || sto_arr.length<=10){
  1420 + sd.is_show_sto_cat=-1;
  1421 + sd.only_pk=sto_arr;
  1422 + }
  1423 + th.setData(sd);
1396 1424
1397 } else { 1425 } else {
1398 th.setData({ 1426 th.setData({
packageB/pages/zuhegou/index/index.wxml
  Edit  View file @3e785e7
@@ -167,9 +167,9 @@ @@ -167,9 +167,9 @@
167 <view> 167 <view>
168 <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> 168 <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon>
169 </view> 169 </view>
170 - <view class="flex choose_more" bindtap="more_store">  
171 - <text class="fs26 red-co" style="line-height: 30rpx;height: 30rpx" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text>  
172 - <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view> 170 + <view class="flex choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat>0}}">
  171 + <text class="fs26 red-co" style="line-height: 30rpx;height: 30rpx" >{{choice_sort_store==0?'更多门店':'返回'}}</text>
  172 + <view class="bg_rights" ></view>
173 </view> 173 </view>
174 </view> 174 </view>
175 </view> 175 </view>
packageC/pages/presell/goodsInfo/goodsInfo.js
  Edit  View file @3e785e7
@@ -1877,7 +1877,6 @@ Page({ @@ -1877,7 +1877,6 @@ Page({
1877 getApp().request.get("/api/weshop/storagecategory/page", { 1877 getApp().request.get("/api/weshop/storagecategory/page", {
1878 data: { 1878 data: {
1879 store_id: o.stoid, 1879 store_id: o.stoid,
1880 - is_show: 1,  
1881 pageSize: 1000, 1880 pageSize: 1000,
1882 orderField: "sort", 1881 orderField: "sort",
1883 orderType: 'asc', 1882 orderType: 'asc',
@@ -1885,37 +1884,46 @@ Page({ @@ -1885,37 +1884,46 @@ Page({
1885 success: function (ee) { 1884 success: function (ee) {
1886 if (ee.data.code == 0) { 1885 if (ee.data.code == 0) {
1887 1886
1888 - if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) {  
1889 - var def_arr = new Array();  
1890 - var ishas = 0;  
1891 - //-- 开始就看5个门店 --  
1892 - for (var k = 0; k < 5; k++) {  
1893 - if (k == e.data.data.pageData.length) break;  
1894 - def_arr.push(e.data.data.pageData[k]); 1887 + var check_all_cate=0;
  1888 + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){
  1889 + for(let i in ee.data.data.pageData){
  1890 + let item=ee.data.data.pageData[i];
  1891 + if(item.is_show==1){
  1892 + check_all_cate=1;break
  1893 + }
  1894 + }
1895 } 1895 }
1896 1896
1897 - th.setData({  
1898 - def_pickpu_list: def_arr,  
1899 - pickpu_list: ee.data.data.pageData  
1900 - }); 1897 + if (check_all_cate) {
  1898 +
1901 var sto_cate = ee.data.data.pageData; 1899 var sto_cate = ee.data.data.pageData;
1902 var sto_arr = e.data.data.pageData; 1900 var sto_arr = e.data.data.pageData;
1903 var newarr = new Array(); 1901 var newarr = new Array();
1904 var qita = new Array(); 1902 var qita = new Array();
1905 1903
  1904 + var is_del_pk=0;
1906 //----要进行门店分组-------- 1905 //----要进行门店分组--------
1907 for (var i = 0; i < sto_arr.length; i++) { 1906 for (var i = 0; i < sto_arr.length; i++) {
1908 //找一下这个门店有没有在分类数组内 1907 //找一下这个门店有没有在分类数组内
1909 var find2 = 0, find2name = "", sort = 0; 1908 var find2 = 0, find2name = "", sort = 0;
1910 for (var m = 0; m < sto_cate.length; m++) { 1909 for (var m = 0; m < sto_cate.length; m++) {
1911 - if (sto_arr[i].category_id == sto_cate[m].cat_id) {  
1912 - find2 = sto_cate[m].cat_id;  
1913 - find2name = sto_cate[m].cat_name;  
1914 - sort = sto_cate[m].sort;  
1915 - break;  
1916 - } 1910 + if (sto_arr[i].category_id == sto_cate[m].cat_id) {
  1911 + if (sto_cate[m].is_show != 1) {
  1912 + is_del_pk = 1;
  1913 + sto_arr.splice(i, 1);
  1914 + i--;
  1915 + } else {
  1916 + find2 = sto_cate[m].cat_id;
  1917 + find2name = sto_cate[m].cat_name;
  1918 + sort = sto_cate[m].sort;
  1919 + is_del_pk = 0;
  1920 + }
  1921 + break;
  1922 + }
1917 } 1923 }
1918 1924
  1925 + if(is_del_pk) continue;
  1926 +
1919 if (newarr.length > 0) { 1927 if (newarr.length > 0) {
1920 var find = 0; 1928 var find = 0;
1921 //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 1929 //如果有找到，那门店就在这个分组内，否则，分类就要排在其他
@@ -1959,6 +1967,18 @@ Page({ @@ -1959,6 +1967,18 @@ Page({
1959 } 1967 }
1960 } 1968 }
1961 1969
  1970 +
  1971 + var def_arr = new Array();
  1972 + //-- 开始就看10个门店 --
  1973 + for (var k = 0; k < 10; k++) {
  1974 + if (k == sto_arr.length) break;
  1975 + def_arr.push(sto_arr[k]);
  1976 + }
  1977 +
  1978 + th.setData({
  1979 + def_pickpu_list: def_arr,
  1980 + pickpu_list: ee.data.data.pageData
  1981 + });
1962 //门店分类要排序下 1982 //门店分类要排序下
1963 function compare(property) { 1983 function compare(property) {
1964 return function (a, b) { 1984 return function (a, b) {
@@ -1981,10 +2001,16 @@ Page({ @@ -1981,10 +2001,16 @@ Page({
1981 newarr.push(item); 2001 newarr.push(item);
1982 } 2002 }
1983 2003
1984 - th.setData({  
1985 - is_show_sto_cat: 1,  
1986 - all_sto: newarr  
1987 - }); 2004 +
  2005 + var sd={
  2006 + all_sto: newarr,
  2007 + is_show_sto_cat:1
  2008 + }
  2009 + if(!sto_arr || sto_arr.length<=10){
  2010 + sd.is_show_sto_cat=-1;
  2011 + sd.only_pk=sto_arr;
  2012 + }
  2013 + th.setData(sd);
1988 2014
1989 } else { 2015 } else {
1990 th.setData({ 2016 th.setData({
packageC/pages/presell/goodsInfo/goodsInfo.wxml
  Edit  View file @3e785e7
@@ -788,9 +788,9 @@ @@ -788,9 +788,9 @@
788 <view> 788 <view>
789 <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> 789 <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon>
790 </view> 790 </view>
791 - <view class="felx choose_more" bindtap="more_store">  
792 - <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text>  
793 - <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view> 791 + <view class="felx choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat>0}}" >
  792 + <text class="fs26 red-co" >{{choice_sort_store==0?'更多门店':'返回'}}</text>
  793 + <view class="bg_rights"></view>
794 </view> 794 </view>
795 </view> 795 </view>
796 </view> 796 </view>
pages/goods/goodsInfo/goodsInfo.js
  Edit  View file @3e785e7
@@ -2600,9 +2600,16 @@ Page({ @@ -2600,9 +2600,16 @@ Page({
2600 }, 2600 },
2601 success: function (ee) { 2601 success: function (ee) {
2602 if (ee.data.code == 0) { 2602 if (ee.data.code == 0) {
2603 -  
2604 - if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) {  
2605 - 2603 + var check_all_cate=0;
  2604 + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){
  2605 + for(let i in ee.data.data.pageData){
  2606 + let item=ee.data.data.pageData[i];
  2607 + if(item.is_show==1){
  2608 + check_all_cate=1;break
  2609 + }
  2610 + }
  2611 + }
  2612 + if (check_all_cate) {
2606 var sto_cate = ee.data.data.pageData; 2613 var sto_cate = ee.data.data.pageData;
2607 var sto_arr = e.data.data.pageData; 2614 var sto_arr = e.data.data.pageData;
2608 var newarr = new Array(); 2615 var newarr = new Array();
@@ -2674,10 +2681,8 @@ Page({ @@ -2674,10 +2681,8 @@ Page({
2674 } 2681 }
2675 } 2682 }
2676 2683
2677 -  
2678 var def_arr = new Array(); 2684 var def_arr = new Array();
2679 - var ishas = 0;  
2680 - //-- 开始就看5个门店 -- 2685 + //-- 开始就看10个门店 --
2681 for (var k = 0; k < 10; k++) { 2686 for (var k = 0; k < 10; k++) {
2682 if (k == sto_arr.length) break; 2687 if (k == sto_arr.length) break;
2683 def_arr.push(sto_arr[k]); 2688 def_arr.push(sto_arr[k]);
@@ -2711,10 +2716,15 @@ Page({ @@ -2711,10 +2716,15 @@ Page({
2711 newarr.push(item); 2716 newarr.push(item);
2712 } 2717 }
2713 2718
2714 - th.setData({  
2715 - is_show_sto_cat: 1,  
2716 - all_sto: newarr  
2717 - }); 2719 + var sd={
  2720 + all_sto: newarr,
  2721 + is_show_sto_cat:1
  2722 + }
  2723 + if(!sto_arr || sto_arr.length<=10){
  2724 + sd.is_show_sto_cat=-1;
  2725 + sd.only_pk=sto_arr;
  2726 + }
  2727 + th.setData(sd);
2718 2728
2719 } else { 2729 } else {
2720 th.setData({ 2730 th.setData({
pages/goods/goodsInfo/goodsInfo.wxml
  Edit  View file @3e785e7
@@ -188,26 +188,11 @@ @@ -188,26 +188,11 @@
188 <view class="rel"> 188 <view class="rel">
189 <view class='ghaicha ellipsis-2'> 189 <view class='ghaicha ellipsis-2'>
190 <text class='gred' wx:if="{{prom_act.max_ct_num >0}}"> 190 <text class='gred' wx:if="{{prom_act.max_ct_num >0}}">
191 - <text class="flex" wx:if="{{prom_act.max_ct_num - item.open_num>0}}">  
192 - 还差  
193 - <text class="word-color">{{prom_act.max_ct_num - item.open_num}}</text>  
194 - 人享最低优惠  
195 - </text> 191 + <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>
196 <text wx:else>您已经享最低优惠</text> 192 <text wx:else>您已经享最低优惠</text>
197 </text> 193 </text>
198 - <text class='gred' wx:else>  
199 - 还差  
200 - <text style='color:#ff2753'>{{prom_act.ct_num - item.open_num}}</text>  
201 - 人成团  
202 - </text>  
203 - <view class="t_show">  
204 - 剩余  
205 - <text wx:if="{{timer[t_ind].day}}">{{timer[t_ind].day}}天:</text>  
206 - <text>{{timer[t_ind].hou}}</text>  
207 - :  
208 - <text>{{timer[t_ind].min}}</text>  
209 - :  
210 - <text>{{timer[t_ind].sec}}</text> 194 + <text class='gred' wx:else>还差<text style='color:#ff2753'>{{prom_act.ct_num - item.open_num}}</text>人成团</text>
  195 + <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>
211 </view> 196 </view>
212 </view> 197 </view>
213 </view> 198 </view>
pages/team/team_show/team_show.js
  Edit  View file @3e785e7
@@ -1178,43 +1178,52 @@ Page({ @@ -1178,43 +1178,52 @@ Page({
1178 getApp().request.get("/api/weshop/storagecategory/page", { 1178 getApp().request.get("/api/weshop/storagecategory/page", {
1179 data: { 1179 data: {
1180 store_id: o.stoid, 1180 store_id: o.stoid,
1181 - is_show: 1,  
1182 pageSize: 1000, 1181 pageSize: 1000,
1183 orderField:"sort", 1182 orderField:"sort",
1184 orderType:'asc', 1183 orderType:'asc',
1185 }, 1184 },
1186 success: function(ee) { 1185 success: function(ee) {
1187 if (ee.data.code == 0) { 1186 if (ee.data.code == 0) {
1188 - if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) {  
1189 - var def_arr = new Array();  
1190 - var ishas = 0;  
1191 - //-- 开始就看5个门店 --  
1192 - for (var k = 0; k < 5; k++) {  
1193 - if (k == e.data.data.pageData.length) break;  
1194 - def_arr.push(e.data.data.pageData[k]);  
1195 - }  
1196 -  
1197 - th.setData({  
1198 - def_pickpu_list: def_arr,  
1199 - pickpu_list: ee.data.data.pageData  
1200 - }); 1187 +
  1188 + var check_all_cate=0;
  1189 + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){
  1190 + for(let i in ee.data.data.pageData){
  1191 + let item=ee.data.data.pageData[i];
  1192 + if(item.is_show==1){
  1193 + check_all_cate=1;break
  1194 + }
  1195 + }
  1196 + }
  1197 +
  1198 +
  1199 +
  1200 + if (check_all_cate) {
  1201 +
1201 var sto_cate = ee.data.data.pageData; 1202 var sto_cate = ee.data.data.pageData;
1202 var sto_arr = e.data.data.pageData; 1203 var sto_arr = e.data.data.pageData;
1203 var newarr = new Array(); 1204 var newarr = new Array();
1204 var qita = new Array(); 1205 var qita = new Array();
1205 - 1206 +
  1207 + var is_del_pk=0;
1206 //----要进行门店分组-------- 1208 //----要进行门店分组--------
1207 for (var i = 0; i < sto_arr.length; i++) { 1209 for (var i = 0; i < sto_arr.length; i++) {
1208 //找一下这个门店有没有在分类数组内 1210 //找一下这个门店有没有在分类数组内
1209 var find2 = 0,find2name = "",sort=0; 1211 var find2 = 0,find2name = "",sort=0;
1210 for (var m = 0; m < sto_cate.length; m++) { 1212 for (var m = 0; m < sto_cate.length; m++) {
1211 if (sto_arr[i].category_id == sto_cate[m].cat_id) { 1213 if (sto_arr[i].category_id == sto_cate[m].cat_id) {
1212 - find2 = sto_cate[m].cat_id;  
1213 - find2name = sto_cate[m].cat_name;  
1214 - sort=sto_cate[m].sort;  
1215 - break; 1214 + if(sto_cate[m].is_show!=1){
  1215 + is_del_pk=1; sto_arr.splice(i,1);
  1216 + i--;
  1217 + }else {
  1218 + find2 = sto_cate[m].cat_id;
  1219 + find2name = sto_cate[m].cat_name;
  1220 + sort = sto_cate[m].sort;
  1221 + is_del_pk=0;
  1222 + }
  1223 + break;
1216 } 1224 }
1217 } 1225 }
  1226 + if(is_del_pk) continue;
1218 1227
1219 if (newarr.length > 0) { 1228 if (newarr.length > 0) {
1220 var find = 0; 1229 var find = 0;
@@ -1258,8 +1267,19 @@ Page({ @@ -1258,8 +1267,19 @@ Page({
1258 } 1267 }
1259 } 1268 }
1260 } 1269 }
1261 -  
1262 - //门店分类要排序下 1270 +
  1271 + var def_arr = new Array();
  1272 + //-- 开始就看10个门店 --
  1273 + for (var k = 0; k < 10; k++) {
  1274 + if (k == sto_arr.length) break;
  1275 + def_arr.push(sto_arr[k]);
  1276 + }
  1277 +
  1278 + th.setData({
  1279 + def_pickpu_list: def_arr,
  1280 + pickpu_list: ee.data.data.pageData
  1281 + });
  1282 + //门店分类要排序下
1263 function compare(property){ 1283 function compare(property){
1264 return function(a,b){ 1284 return function(a,b){
1265 var value1 = a[property]; 1285 var value1 = a[property];
@@ -1280,10 +1300,16 @@ Page({ @@ -1280,10 +1300,16 @@ Page({
1280 }; 1300 };
1281 newarr.push(item); 1301 newarr.push(item);
1282 } 1302 }
1283 - th.setData({  
1284 - is_show_sto_cat: 1,  
1285 - all_sto: newarr  
1286 - }); 1303 +
  1304 + var sd={
  1305 + all_sto: newarr,
  1306 + is_show_sto_cat:1
  1307 + }
  1308 + if(!sto_arr || sto_arr.length<=10){
  1309 + sd.is_show_sto_cat=-1;
  1310 + sd.only_pk=sto_arr;
  1311 + }
  1312 + th.setData(sd);
1287 1313
1288 } else { 1314 } else {
1289 th.setData({ 1315 th.setData({
pages/togoin/togoin.js
  View file @3e785e7
@@ -105,7 +105,8 @@ Page({ @@ -105,7 +105,8 @@ Page({
105 wx.setStorageSync("userinfo",e.data.data); 105 wx.setStorageSync("userinfo",e.data.data);
106 106
107 setTimeout(function () { 107 setTimeout(function () {
108 - wx.navigateBack({ delta: 1}) //返回上一页 108 + getApp().globalData.login_back=1;
  109 + wx.navigateBack({ delta: 1}) //返回上一页
109 },1000) 110 },1000)
110 }else{ 111 }else{
111 getApp().globalData.sessionKey=e.data.data.sessionKey; 112 getApp().globalData.sessionKey=e.data.data.sessionKey;
@@ -200,7 +201,9 @@ Page({ @@ -200,7 +201,9 @@ Page({
200 201
201 var need_go=0; 202 var need_go=0;
202 var t_user=e.data.data; 203 var t_user=e.data.data;
203 - 204 +
  205 +
  206 + getApp().globalData.login_back=1;
204 wx.setStorageSync("userinfo",e.data.data); 207 wx.setStorageSync("userinfo",e.data.data);
205 wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(a.globalData.userInfo.head_pic); 208 wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(a.globalData.userInfo.head_pic);
206 209
@@ -272,7 +275,8 @@ Page({ @@ -272,7 +275,8 @@ Page({
272 wx.setStorageSync("userinfo",e.data.data); 275 wx.setStorageSync("userinfo",e.data.data);
273 276
274 setTimeout(function () { 277 setTimeout(function () {
275 - wx.navigateBack({ delta: 1}) //返回上一页 278 + getApp().globalData.login_back=1;
  279 + wx.navigateBack({ delta: 1}) //返回上一页
276 },1000) 280 },1000)
277 }else{ 281 }else{
278 getApp().globalData.sessionKey=e.data.data.sessionKey; 282 getApp().globalData.sessionKey=e.data.data.sessionKey;