Commit 305bba84dafffc401578415e93f637a688937a5c
1 parent
af59241b
获取门店机子的兼容性~~
Showing
2 changed files
with
136 additions
and
135 deletions
packageA/pages/profile/profile.js
pages/user/userinfo/userinfo.js
| ... | ... | @@ -287,7 +287,7 @@ Page({ |
| 287 | 287 | var dd = { |
| 288 | 288 | store_id: r.stoid, |
| 289 | 289 | isstop: 0, |
| 290 | - pageSize: 300 | |
| 290 | + pageSize: 2000 | |
| 291 | 291 | } |
| 292 | 292 | th.setData({ |
| 293 | 293 | sort_store: 0 |
| ... | ... | @@ -299,140 +299,141 @@ Page({ |
| 299 | 299 | dd.lon = th.data.lon; |
| 300 | 300 | } |
| 301 | 301 | //----------获取门店---------------- |
| 302 | - getApp().request.promiseGet("/api/weshop/pickup/list", { | |
| 302 | + getApp().request.get("/api/weshop/pickup/list", { | |
| 303 | 303 | data: dd, |
| 304 | - }).then(res => { | |
| 305 | - var e = res; | |
| 306 | - if (e.data.code == 0) { | |
| 307 | - //-- 如果有默认选择门店的时候，要把默认门店放在第一位 -- | |
| 308 | - if (th.data.def_pick_store) { | |
| 309 | - for (var k = 0; k < e.data.data.pageData.length; k++) { | |
| 310 | - if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) { | |
| 311 | - e.data.data.pageData.splice(k, 1); //删除 | |
| 312 | - break; | |
| 313 | - } | |
| 314 | - } | |
| 315 | - e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加 | |
| 316 | - } | |
| 317 | - | |
| 318 | - //单总量超出5个的时候 | |
| 319 | - if (e.data.data.total > 5) { | |
| 320 | - i.get("/api/weshop/storagecategory/page", { | |
| 321 | - data: { | |
| 322 | - store_id: r.stoid, | |
| 323 | - is_show: 1, | |
| 324 | - pageSize: 300 | |
| 325 | - }, | |
| 326 | - success: function(ee) { | |
| 327 | - if (ee.data.code == 0) { | |
| 328 | - if (ee.data.data.pageData.length > 0) { | |
| 329 | - var def_arr = new Array(); | |
| 330 | - var ishas = 0; | |
| 331 | - //-- 开始就看5个门店 -- | |
| 332 | - for (var k = 0; k < 5; k++) { | |
| 333 | - if (k == e.data.data.pageData.length) break; | |
| 334 | - def_arr.push(e.data.data.pageData[k]); | |
| 335 | - } | |
| 336 | - | |
| 337 | - th.setData({ | |
| 338 | - def_pickpu_list: def_arr, | |
| 339 | - pickpu_list: ee.data.data.pageData | |
| 340 | - }); | |
| 341 | - var sto_cate = ee.data.data.pageData; | |
| 342 | - var sto_arr = e.data.data.pageData; | |
| 343 | - var newarr = new Array(); | |
| 344 | - var qita = new Array(); | |
| 345 | - | |
| 346 | - //----要进行门店分组-------- | |
| 347 | - for (var i = 0; i < sto_arr.length; i++) { | |
| 348 | - //找一下这个门店有没有在分类数组内 | |
| 349 | - var find2 = 0, | |
| 350 | - find2name = ""; | |
| 351 | - for (var m = 0; m < sto_cate.length; m++) { | |
| 352 | - if (sto_arr[i].category_id == sto_cate[m].cat_id) { | |
| 353 | - find2 = sto_cate[m].cat_id; | |
| 354 | - find2name = sto_cate[m].cat_name; | |
| 355 | - break; | |
| 356 | - } | |
| 357 | - } | |
| 358 | - | |
| 359 | - if (newarr.length > 0) { | |
| 360 | - var find = 0; | |
| 361 | - //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 | |
| 362 | - if (find2 != 0) { | |
| 363 | - for (var ii = 0; ii < newarr.length; ii++) { | |
| 364 | - if (sto_arr[i].category_id == newarr[ii].cat_id) { | |
| 365 | - newarr[ii].s_arr.push(sto_arr[i]); | |
| 366 | - find = 1; | |
| 367 | - break; | |
| 368 | - } | |
| 369 | - } | |
| 370 | - if (find == 0) { | |
| 371 | - var arr0 = new Array(); | |
| 372 | - arr0.push(sto_arr[i]); | |
| 373 | - var item = { | |
| 374 | - cat_id: find2, | |
| 375 | - name: find2name, | |
| 376 | - s_arr: arr0 | |
| 377 | - }; | |
| 378 | - newarr.push(item); | |
| 379 | - } | |
| 380 | - } else { | |
| 381 | - qita.push(sto_arr[i]); | |
| 382 | - } | |
| 383 | - } else { | |
| 384 | - //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 | |
| 385 | - if (find2 != 0) { | |
| 386 | - var arr0 = new Array(); | |
| 387 | - arr0.push(sto_arr[i]); | |
| 388 | - var item = { | |
| 389 | - cat_id: find2, | |
| 390 | - name: find2name, | |
| 391 | - s_arr: arr0 | |
| 392 | - }; | |
| 393 | - newarr.push(item); | |
| 394 | - } else { | |
| 395 | - qita.push(sto_arr[i]); | |
| 396 | - } | |
| 397 | - } | |
| 398 | - } | |
| 399 | - | |
| 400 | - //----安排其他的分类----- | |
| 401 | - if (qita.length > 0) { | |
| 402 | - var item = { | |
| 403 | - cat_id: -1, | |
| 404 | - name: "其他", | |
| 405 | - s_arr: qita | |
| 406 | - }; | |
| 407 | - newarr.push(item); | |
| 408 | - } | |
| 409 | - th.setData({ | |
| 410 | - is_show_sto_cat: 1, | |
| 411 | - all_sto: newarr | |
| 412 | - }); | |
| 413 | - | |
| 414 | - } else { | |
| 415 | - th.setData({ | |
| 416 | - is_show_sto_cat: -1, | |
| 417 | - only_pk: e.data.data.pageData | |
| 418 | - }); | |
| 419 | - } | |
| 420 | - } else { | |
| 421 | - th.setData({ | |
| 422 | - is_show_sto_cat: -1, | |
| 423 | - only_pk: e.data.data.pageData | |
| 424 | - }); | |
| 425 | - } | |
| 426 | - } | |
| 427 | - }); | |
| 428 | - } else { | |
| 429 | - th.setData({ | |
| 430 | - is_show_sto_cat: 0, | |
| 431 | - only_pk: e.data.data.pageData | |
| 432 | - }); | |
| 433 | - } | |
| 434 | - } | |
| 435 | - }, 200) | |
| 304 | + success:function(res){ | |
| 305 | + var e = res; | |
| 306 | + if (e.data.code == 0) { | |
| 307 | + //-- 如果有默认选择门店的时候，要把默认门店放在第一位 -- | |
| 308 | + if (th.data.def_pick_store) { | |
| 309 | + for (var k = 0; k < e.data.data.pageData.length; k++) { | |
| 310 | + if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) { | |
| 311 | + e.data.data.pageData.splice(k, 1); //删除 | |
| 312 | + break; | |
| 313 | + } | |
| 314 | + } | |
| 315 | + e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加 | |
| 316 | + } | |
| 317 | + | |
| 318 | + //单总量超出5个的时候 | |
| 319 | + if (e.data.data.total > 5) { | |
| 320 | + i.get("/api/weshop/storagecategory/page", { | |
| 321 | + data: { | |
| 322 | + store_id: r.stoid, | |
| 323 | + is_show: 1, | |
| 324 | + pageSize: 300 | |
| 325 | + }, | |
| 326 | + success: function(ee) { | |
| 327 | + if (ee.data.code == 0) { | |
| 328 | + if (ee.data.data.pageData.length > 0) { | |
| 329 | + var def_arr = new Array(); | |
| 330 | + var ishas = 0; | |
| 331 | + //-- 开始就看5个门店 -- | |
| 332 | + for (var k = 0; k < 5; k++) { | |
| 333 | + if (k == e.data.data.pageData.length) break; | |
| 334 | + def_arr.push(e.data.data.pageData[k]); | |
| 335 | + } | |
| 336 | + | |
| 337 | + th.setData({ | |
| 338 | + def_pickpu_list: def_arr, | |
| 339 | + pickpu_list: ee.data.data.pageData | |
| 340 | + }); | |
| 341 | + var sto_cate = ee.data.data.pageData; | |
| 342 | + var sto_arr = e.data.data.pageData; | |
| 343 | + var newarr = new Array(); | |
| 344 | + var qita = new Array(); | |
| 345 | + | |
| 346 | + //----要进行门店分组-------- | |
| 347 | + for (var i = 0; i < sto_arr.length; i++) { | |
| 348 | + //找一下这个门店有没有在分类数组内 | |
| 349 | + var find2 = 0, | |
| 350 | + find2name = ""; | |
| 351 | + for (var m = 0; m < sto_cate.length; m++) { | |
| 352 | + if (sto_arr[i].category_id == sto_cate[m].cat_id) { | |
| 353 | + find2 = sto_cate[m].cat_id; | |
| 354 | + find2name = sto_cate[m].cat_name; | |
| 355 | + break; | |
| 356 | + } | |
| 357 | + } | |
| 358 | + | |
| 359 | + if (newarr.length > 0) { | |
| 360 | + var find = 0; | |
| 361 | + //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 | |
| 362 | + if (find2 != 0) { | |
| 363 | + for (var ii = 0; ii < newarr.length; ii++) { | |
| 364 | + if (sto_arr[i].category_id == newarr[ii].cat_id) { | |
| 365 | + newarr[ii].s_arr.push(sto_arr[i]); | |
| 366 | + find = 1; | |
| 367 | + break; | |
| 368 | + } | |
| 369 | + } | |
| 370 | + if (find == 0) { | |
| 371 | + var arr0 = new Array(); | |
| 372 | + arr0.push(sto_arr[i]); | |
| 373 | + var item = { | |
| 374 | + cat_id: find2, | |
| 375 | + name: find2name, | |
| 376 | + s_arr: arr0 | |
| 377 | + }; | |
| 378 | + newarr.push(item); | |
| 379 | + } | |
| 380 | + } else { | |
| 381 | + qita.push(sto_arr[i]); | |
| 382 | + } | |
| 383 | + } else { | |
| 384 | + //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 | |
| 385 | + if (find2 != 0) { | |
| 386 | + var arr0 = new Array(); | |
| 387 | + arr0.push(sto_arr[i]); | |
| 388 | + var item = { | |
| 389 | + cat_id: find2, | |
| 390 | + name: find2name, | |
| 391 | + s_arr: arr0 | |
| 392 | + }; | |
| 393 | + newarr.push(item); | |
| 394 | + } else { | |
| 395 | + qita.push(sto_arr[i]); | |
| 396 | + } | |
| 397 | + } | |
| 398 | + } | |
| 399 | + | |
| 400 | + //----安排其他的分类----- | |
| 401 | + if (qita.length > 0) { | |
| 402 | + var item = { | |
| 403 | + cat_id: -1, | |
| 404 | + name: "其他", | |
| 405 | + s_arr: qita | |
| 406 | + }; | |
| 407 | + newarr.push(item); | |
| 408 | + } | |
| 409 | + th.setData({ | |
| 410 | + is_show_sto_cat: 1, | |
| 411 | + all_sto: newarr | |
| 412 | + }); | |
| 413 | + | |
| 414 | + } else { | |
| 415 | + th.setData({ | |
| 416 | + is_show_sto_cat: -1, | |
| 417 | + only_pk: e.data.data.pageData | |
| 418 | + }); | |
| 419 | + } | |
| 420 | + } else { | |
| 421 | + th.setData({ | |
| 422 | + is_show_sto_cat: -1, | |
| 423 | + only_pk: e.data.data.pageData | |
| 424 | + }); | |
| 425 | + } | |
| 426 | + } | |
| 427 | + }); | |
| 428 | + } else { | |
| 429 | + th.setData({ | |
| 430 | + is_show_sto_cat: 0, | |
| 431 | + only_pk: e.data.data.pageData | |
| 432 | + }); | |
| 433 | + } | |
| 434 | + } | |
| 435 | + } | |
| 436 | + }) | |
| 436 | 437 | |
| 437 | 438 | },2) |
| 438 | 439 | ... | ... |