1 participants
-
Status changed to merged
-
mentioned in commit 88d8046fa5810c30566075e86568edc1768c355f
Showing
10 changed files
packageA/pages/goodsInfo/goodsInfo.js
| @@ -989,6 +989,7 @@ Page({ | @@ -989,6 +989,7 @@ Page({ | ||
| 989 | for (var i = 0; i < sto_arr.length; i++) { | 989 | for (var i = 0; i < sto_arr.length; i++) { |
| 990 | //找一下这个门店有没有在分类数组内 | 990 | //找一下这个门店有没有在分类数组内 |
| 991 | var find2 = 0, find2name = "",sort=0; | 991 | var find2 = 0, find2name = "",sort=0; |
| 992 | + is_del_pk=0; | ||
| 992 | for (var m = 0; m < sto_cate.length; m++) { | 993 | for (var m = 0; m < sto_cate.length; m++) { |
| 993 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { | 994 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { |
| 994 | if (sto_cate[m].is_show != 1) { | 995 | if (sto_cate[m].is_show != 1) { |
packageA/pages/profile/profile.js
| @@ -284,43 +284,53 @@ Page({ | @@ -284,43 +284,53 @@ Page({ | ||
| 284 | if (e.data.data.total > 10 && ishas_cate) { | 284 | if (e.data.data.total > 10 && ishas_cate) { |
| 285 | i.get("/api/weshop/storagecategory/page", { | 285 | i.get("/api/weshop/storagecategory/page", { |
| 286 | data: { | 286 | data: { |
| 287 | - store_id: r.stoid, | ||
| 288 | - is_show: 1, | ||
| 289 | - pageSize: 300 | 287 | + store_id: r.stoid, |
| 288 | + pageSize: 1000, | ||
| 289 | + orderField:"sort", | ||
| 290 | + orderType:'asc', | ||
| 290 | }, | 291 | }, |
| 291 | success: function(ee) { | 292 | success: function(ee) { |
| 292 | if (ee.data.code == 0) { | 293 | if (ee.data.code == 0) { |
| 293 | - if (ee.data.data.pageData.length > 0) { | ||
| 294 | - var def_arr = new Array(); | ||
| 295 | - var ishas = 0; | ||
| 296 | - //-- 开始就看5个门店 -- | ||
| 297 | - for (var k = 0; k < 5; k++) { | ||
| 298 | - if (k == e.data.data.pageData.length) break; | ||
| 299 | - def_arr.push(e.data.data.pageData[k]); | ||
| 300 | - } | ||
| 301 | - | ||
| 302 | - th.setData({ | ||
| 303 | - def_pickpu_list: def_arr, | ||
| 304 | - pickpu_list: ee.data.data.pageData | ||
| 305 | - }); | 294 | + |
| 295 | + var check_all_cate=0; | ||
| 296 | + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){ | ||
| 297 | + for(let i in ee.data.data.pageData){ | ||
| 298 | + let item=ee.data.data.pageData[i]; | ||
| 299 | + if(item.is_show==1){ | ||
| 300 | + check_all_cate=1;break | ||
| 301 | + } | ||
| 302 | + } | ||
| 303 | + } | ||
| 304 | + | ||
| 305 | + if (check_all_cate) { | ||
| 306 | + | ||
| 306 | var sto_cate = ee.data.data.pageData; | 307 | var sto_cate = ee.data.data.pageData; |
| 307 | var sto_arr = e.data.data.pageData; | 308 | var sto_arr = e.data.data.pageData; |
| 308 | var newarr = new Array(); | 309 | var newarr = new Array(); |
| 309 | var qita = new Array(); | 310 | var qita = new Array(); |
| 310 | - | 311 | + |
| 312 | + var is_del_pk=0; | ||
| 311 | //----要进行门店分组-------- | 313 | //----要进行门店分组-------- |
| 312 | for (var i = 0; i < sto_arr.length; i++) { | 314 | for (var i = 0; i < sto_arr.length; i++) { |
| 313 | //找一下这个门店有没有在分类数组内 | 315 | //找一下这个门店有没有在分类数组内 |
| 314 | - var find2 = 0, | ||
| 315 | - find2name = ""; | 316 | + var find2 = 0,find2name = "",sort=0; |
| 317 | + is_del_pk=0; | ||
| 316 | for (var m = 0; m < sto_cate.length; m++) { | 318 | for (var m = 0; m < sto_cate.length; m++) { |
| 317 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { | 319 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { |
| 318 | - find2 = sto_cate[m].cat_id; | ||
| 319 | - find2name = sto_cate[m].cat_name; | 320 | + if(sto_cate[m].is_show!=1){ |
| 321 | + is_del_pk=1; sto_arr.splice(i,1); | ||
| 322 | + i--; | ||
| 323 | + }else { | ||
| 324 | + find2 = sto_cate[m].cat_id; | ||
| 325 | + find2name = sto_cate[m].cat_name; | ||
| 326 | + sort = sto_cate[m].sort; | ||
| 327 | + is_del_pk=0; | ||
| 328 | + } | ||
| 320 | break; | 329 | break; |
| 321 | } | 330 | } |
| 322 | } | 331 | } |
| 323 | - | 332 | + if(is_del_pk) continue; |
| 333 | + | ||
| 324 | if (newarr.length > 0) { | 334 | if (newarr.length > 0) { |
| 325 | var find = 0; | 335 | var find = 0; |
| 326 | //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 | 336 | //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 |
| @@ -338,6 +348,7 @@ Page({ | @@ -338,6 +348,7 @@ Page({ | ||
| 338 | var item = { | 348 | var item = { |
| 339 | cat_id: find2, | 349 | cat_id: find2, |
| 340 | name: find2name, | 350 | name: find2name, |
| 351 | + sort:sort, | ||
| 341 | s_arr: arr0 | 352 | s_arr: arr0 |
| 342 | }; | 353 | }; |
| 343 | newarr.push(item); | 354 | newarr.push(item); |
| @@ -353,6 +364,7 @@ Page({ | @@ -353,6 +364,7 @@ Page({ | ||
| 353 | var item = { | 364 | var item = { |
| 354 | cat_id: find2, | 365 | cat_id: find2, |
| 355 | name: find2name, | 366 | name: find2name, |
| 367 | + sort:sort, | ||
| 356 | s_arr: arr0 | 368 | s_arr: arr0 |
| 357 | }; | 369 | }; |
| 358 | newarr.push(item); | 370 | newarr.push(item); |
| @@ -361,6 +373,30 @@ Page({ | @@ -361,6 +373,30 @@ Page({ | ||
| 361 | } | 373 | } |
| 362 | } | 374 | } |
| 363 | } | 375 | } |
| 376 | + | ||
| 377 | + var def_arr = new Array(); | ||
| 378 | + //-- 开始就看10个门店 -- | ||
| 379 | + for (var k = 0; k < 10; k++) { | ||
| 380 | + if (k == e.data.data.pageData.length) break; | ||
| 381 | + def_arr.push(e.data.data.pageData[k]); | ||
| 382 | + } | ||
| 383 | + | ||
| 384 | + th.setData({ | ||
| 385 | + def_pickpu_list: def_arr, | ||
| 386 | + pickpu_list: ee.data.data.pageData | ||
| 387 | + }); | ||
| 388 | + | ||
| 389 | + //门店分类要排序下 | ||
| 390 | + function compare(property){ | ||
| 391 | + return function(a,b){ | ||
| 392 | + var value1 = a[property]; | ||
| 393 | + var value2 = b[property]; | ||
| 394 | + return value1 - value2; | ||
| 395 | + } | ||
| 396 | + } | ||
| 397 | + if(newarr.length>0) | ||
| 398 | + newarr.sort(compare("sort")); | ||
| 399 | + | ||
| 364 | 400 | ||
| 365 | //----安排其他的分类----- | 401 | //----安排其他的分类----- |
| 366 | if (qita.length > 0) { | 402 | if (qita.length > 0) { |
packageA/pages/profile/profile.wxml
| @@ -211,8 +211,8 @@ | @@ -211,8 +211,8 @@ | ||
| 211 | <view> | 211 | <view> |
| 212 | <icon bindtap="onclickstore" class="modal-closes" color="black" size="22" type="cancel"></icon> | 212 | <icon bindtap="onclickstore" class="modal-closes" color="black" size="22" type="cancel"></icon> |
| 213 | </view> | 213 | </view> |
| 214 | - <view class="felx choose_more" bindtap="more_store"> | ||
| 215 | - <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text> | 214 | + <view class="felx choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat>0}}" > |
| 215 | + <text class="fs26 red-co" >{{choice_sort_store==0?'更多门店':'返回'}}</text> | ||
| 216 | <view class="bg_rights"></view> | 216 | <view class="bg_rights"></view> |
| 217 | </view> | 217 | </view> |
| 218 | </view> | 218 | </view> |
packageA/pages/prom_list/prom_list.js
| @@ -855,6 +855,7 @@ Page({ | @@ -855,6 +855,7 @@ Page({ | ||
| 855 | for (var i = 0; i < sto_arr.length; i++) { | 855 | for (var i = 0; i < sto_arr.length; i++) { |
| 856 | //找一下这个门店有没有在分类数组内 | 856 | //找一下这个门店有没有在分类数组内 |
| 857 | var find2 = 0, find2name = "",sort=0; | 857 | var find2 = 0, find2name = "",sort=0; |
| 858 | + is_del_pk=0; | ||
| 858 | for (var m = 0; m < sto_cate.length; m++) { | 859 | for (var m = 0; m < sto_cate.length; m++) { |
| 859 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { | 860 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { |
| 860 | if(sto_cate[m].is_show!=1){ | 861 | if(sto_cate[m].is_show!=1){ |
packageB/pages/zuhegou/index/index.js
| @@ -1318,6 +1318,7 @@ Page({ | @@ -1318,6 +1318,7 @@ Page({ | ||
| 1318 | for (var i = 0; i < sto_arr.length; i++) { | 1318 | for (var i = 0; i < sto_arr.length; i++) { |
| 1319 | //找一下这个门店有没有在分类数组内 | 1319 | //找一下这个门店有没有在分类数组内 |
| 1320 | var find2 = 0, find2name = "", sort = 0; | 1320 | var find2 = 0, find2name = "", sort = 0; |
| 1321 | + is_del_pk=0; | ||
| 1321 | for (var m = 0; m < sto_cate.length; m++) { | 1322 | for (var m = 0; m < sto_cate.length; m++) { |
| 1322 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { | 1323 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { |
| 1323 | if (sto_cate[m].is_show != 1) { | 1324 | if (sto_cate[m].is_show != 1) { |
packageC/pages/presell/goodsInfo/goodsInfo.js
| @@ -1906,6 +1906,7 @@ Page({ | @@ -1906,6 +1906,7 @@ Page({ | ||
| 1906 | for (var i = 0; i < sto_arr.length; i++) { | 1906 | for (var i = 0; i < sto_arr.length; i++) { |
| 1907 | //找一下这个门店有没有在分类数组内 | 1907 | //找一下这个门店有没有在分类数组内 |
| 1908 | var find2 = 0, find2name = "", sort = 0; | 1908 | var find2 = 0, find2name = "", sort = 0; |
| 1909 | + is_del_pk=0; | ||
| 1909 | for (var m = 0; m < sto_cate.length; m++) { | 1910 | for (var m = 0; m < sto_cate.length; m++) { |
| 1910 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { | 1911 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { |
| 1911 | if (sto_cate[m].is_show != 1) { | 1912 | if (sto_cate[m].is_show != 1) { |
pages/goods/goodsInfo/goodsInfo.js
| @@ -2621,7 +2621,7 @@ Page({ | @@ -2621,7 +2621,7 @@ Page({ | ||
| 2621 | for (var i = 0; i < sto_arr.length; i++) { | 2621 | for (var i = 0; i < sto_arr.length; i++) { |
| 2622 | //找一下这个门店有没有在分类数组内 | 2622 | //找一下这个门店有没有在分类数组内 |
| 2623 | var find2 = 0, find2name = "", sort = 0; | 2623 | var find2 = 0, find2name = "", sort = 0; |
| 2624 | - | 2624 | + is_del_pk=0; |
| 2625 | for (var m = 0; m < sto_cate.length; m++) { | 2625 | for (var m = 0; m < sto_cate.length; m++) { |
| 2626 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { | 2626 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { |
| 2627 | if(sto_cate[m].is_show!=1){ | 2627 | if(sto_cate[m].is_show!=1){ |
pages/team/team_show/team_show.js
| @@ -1209,6 +1209,7 @@ Page({ | @@ -1209,6 +1209,7 @@ Page({ | ||
| 1209 | for (var i = 0; i < sto_arr.length; i++) { | 1209 | for (var i = 0; i < sto_arr.length; i++) { |
| 1210 | //找一下这个门店有没有在分类数组内 | 1210 | //找一下这个门店有没有在分类数组内 |
| 1211 | var find2 = 0,find2name = "",sort=0; | 1211 | var find2 = 0,find2name = "",sort=0; |
| 1212 | + is_del_pk=0; | ||
| 1212 | for (var m = 0; m < sto_cate.length; m++) { | 1213 | for (var m = 0; m < sto_cate.length; m++) { |
| 1213 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { | 1214 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { |
| 1214 | if(sto_cate[m].is_show!=1){ | 1215 | if(sto_cate[m].is_show!=1){ |
| @@ -1279,7 +1280,8 @@ Page({ | @@ -1279,7 +1280,8 @@ Page({ | ||
| 1279 | def_pickpu_list: def_arr, | 1280 | def_pickpu_list: def_arr, |
| 1280 | pickpu_list: ee.data.data.pageData | 1281 | pickpu_list: ee.data.data.pageData |
| 1281 | }); | 1282 | }); |
| 1282 | - //门店分类要排序下 | 1283 | + |
| 1284 | + //门店分类要排序下 | ||
| 1283 | function compare(property){ | 1285 | function compare(property){ |
| 1284 | return function(a,b){ | 1286 | return function(a,b){ |
| 1285 | var value1 = a[property]; | 1287 | var value1 = a[property]; |
pages/user/userinfo/userinfo.js
| @@ -317,46 +317,57 @@ Page({ | @@ -317,46 +317,57 @@ Page({ | ||
| 317 | } | 317 | } |
| 318 | 318 | ||
| 319 | //单总量超出5个的时候 | 319 | //单总量超出5个的时候 |
| 320 | - if (e.data.data.total > 5) { | 320 | + if (e.data.data.total > 10) { |
| 321 | i.get("/api/weshop/storagecategory/page", { | 321 | i.get("/api/weshop/storagecategory/page", { |
| 322 | data: { | 322 | data: { |
| 323 | - store_id: r.stoid, | ||
| 324 | - is_show: 1, | ||
| 325 | - pageSize: 300 | 323 | + store_id: r.stoid, |
| 324 | + pageSize: 1000, | ||
| 325 | + orderField:"sort", | ||
| 326 | + orderType:'asc', | ||
| 326 | }, | 327 | }, |
| 327 | success: function(ee) { | 328 | success: function(ee) { |
| 328 | if (ee.data.code == 0) { | 329 | if (ee.data.code == 0) { |
| 329 | - if (ee.data.data.pageData.length > 0) { | ||
| 330 | - var def_arr = new Array(); | ||
| 331 | - var ishas = 0; | ||
| 332 | - //-- 开始就看5个门店 -- | ||
| 333 | - for (var k = 0; k < 5; k++) { | ||
| 334 | - if (k == e.data.data.pageData.length) break; | ||
| 335 | - def_arr.push(e.data.data.pageData[k]); | ||
| 336 | - } | ||
| 337 | - | ||
| 338 | - th.setData({ | ||
| 339 | - def_pickpu_list: def_arr, | ||
| 340 | - pickpu_list: ee.data.data.pageData | ||
| 341 | - }); | 330 | + |
| 331 | + var check_all_cate=0; | ||
| 332 | + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){ | ||
| 333 | + for(let i in ee.data.data.pageData){ | ||
| 334 | + let item=ee.data.data.pageData[i]; | ||
| 335 | + if(item.is_show==1){ | ||
| 336 | + check_all_cate=1;break | ||
| 337 | + } | ||
| 338 | + } | ||
| 339 | + } | ||
| 340 | + | ||
| 341 | + | ||
| 342 | + if (check_all_cate) { | ||
| 343 | + | ||
| 342 | var sto_cate = ee.data.data.pageData; | 344 | var sto_cate = ee.data.data.pageData; |
| 343 | var sto_arr = e.data.data.pageData; | 345 | var sto_arr = e.data.data.pageData; |
| 344 | var newarr = new Array(); | 346 | var newarr = new Array(); |
| 345 | var qita = new Array(); | 347 | var qita = new Array(); |
| 346 | - | 348 | + |
| 349 | + var is_del_pk=0; | ||
| 347 | //----要进行门店分组-------- | 350 | //----要进行门店分组-------- |
| 348 | for (var i = 0; i < sto_arr.length; i++) { | 351 | for (var i = 0; i < sto_arr.length; i++) { |
| 349 | //找一下这个门店有没有在分类数组内 | 352 | //找一下这个门店有没有在分类数组内 |
| 350 | - var find2 = 0, | ||
| 351 | - find2name = ""; | 353 | + var find2 = 0, find2name = "",sort=0; |
| 354 | + is_del_pk=0; | ||
| 352 | for (var m = 0; m < sto_cate.length; m++) { | 355 | for (var m = 0; m < sto_cate.length; m++) { |
| 353 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { | 356 | if (sto_arr[i].category_id == sto_cate[m].cat_id) { |
| 354 | - find2 = sto_cate[m].cat_id; | ||
| 355 | - find2name = sto_cate[m].cat_name; | 357 | + if(sto_cate[m].is_show!=1){ |
| 358 | + is_del_pk=1; sto_arr.splice(i,1); | ||
| 359 | + i--; | ||
| 360 | + }else { | ||
| 361 | + find2 = sto_cate[m].cat_id; | ||
| 362 | + find2name = sto_cate[m].cat_name; | ||
| 363 | + sort = sto_cate[m].sort; | ||
| 364 | + is_del_pk=0; | ||
| 365 | + } | ||
| 356 | break; | 366 | break; |
| 357 | } | 367 | } |
| 358 | } | 368 | } |
| 359 | - | 369 | + |
| 370 | + if(is_del_pk) continue; | ||
| 360 | if (newarr.length > 0) { | 371 | if (newarr.length > 0) { |
| 361 | var find = 0; | 372 | var find = 0; |
| 362 | //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 | 373 | //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 |
| @@ -374,6 +385,7 @@ Page({ | @@ -374,6 +385,7 @@ Page({ | ||
| 374 | var item = { | 385 | var item = { |
| 375 | cat_id: find2, | 386 | cat_id: find2, |
| 376 | name: find2name, | 387 | name: find2name, |
| 388 | + sort:sort, | ||
| 377 | s_arr: arr0 | 389 | s_arr: arr0 |
| 378 | }; | 390 | }; |
| 379 | newarr.push(item); | 391 | newarr.push(item); |
| @@ -389,6 +401,7 @@ Page({ | @@ -389,6 +401,7 @@ Page({ | ||
| 389 | var item = { | 401 | var item = { |
| 390 | cat_id: find2, | 402 | cat_id: find2, |
| 391 | name: find2name, | 403 | name: find2name, |
| 404 | + sort:sort, | ||
| 392 | s_arr: arr0 | 405 | s_arr: arr0 |
| 393 | }; | 406 | }; |
| 394 | newarr.push(item); | 407 | newarr.push(item); |
| @@ -397,6 +410,29 @@ Page({ | @@ -397,6 +410,29 @@ Page({ | ||
| 397 | } | 410 | } |
| 398 | } | 411 | } |
| 399 | } | 412 | } |
| 413 | + | ||
| 414 | + var def_arr = new Array(); | ||
| 415 | + //-- 开始就看10个门店 -- | ||
| 416 | + for (var k = 0; k < 10; k++) { | ||
| 417 | + if (k == e.data.data.pageData.length) break; | ||
| 418 | + def_arr.push(e.data.data.pageData[k]); | ||
| 419 | + } | ||
| 420 | + | ||
| 421 | + th.setData({ | ||
| 422 | + def_pickpu_list: def_arr, | ||
| 423 | + pickpu_list: ee.data.data.pageData | ||
| 424 | + }); | ||
| 425 | + | ||
| 426 | + //门店分类要排序下 | ||
| 427 | + function compare(property){ | ||
| 428 | + return function(a,b){ | ||
| 429 | + var value1 = a[property]; | ||
| 430 | + var value2 = b[property]; | ||
| 431 | + return value1 - value2; | ||
| 432 | + } | ||
| 433 | + } | ||
| 434 | + if(newarr.length>0) | ||
| 435 | + newarr.sort(compare("sort")); | ||
| 400 | 436 | ||
| 401 | //----安排其他的分类----- | 437 | //----安排其他的分类----- |
| 402 | if (qita.length > 0) { | 438 | if (qita.length > 0) { |
pages/user/userinfo/userinfo.wxml
| @@ -287,8 +287,8 @@ | @@ -287,8 +287,8 @@ | ||
| 287 | <view> | 287 | <view> |
| 288 | <icon bindtap="onclickstore" class="modal-closes" color="black" size="22" type="cancel"></icon> | 288 | <icon bindtap="onclickstore" class="modal-closes" color="black" size="22" type="cancel"></icon> |
| 289 | </view> | 289 | </view> |
| 290 | - <view class="felx choose_more" bindtap="more_store"> | ||
| 291 | - <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text> | 290 | + <view class="felx choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat>0}}"> |
| 291 | + <text class="fs26 red-co">{{choice_sort_store==0?'更多门店':'返回'}}</text> | ||
| 292 | <view class="bg_rights"></view> | 292 | <view class="bg_rights"></view> |
| 293 | </view> | 293 | </view> |
| 294 | </view> | 294 | </view> |