Commit bc1e6f945afe83dd9a96eb57e5865bb3c7821da8
1 parent
287535c6
门店是否允许销售
Showing
7 changed files
with
22 additions
and
8 deletions
components/diy_store_select/diy_store_select.js
| @@ -68,7 +68,8 @@ Component({ | @@ -68,7 +68,8 @@ Component({ | ||
| 68 | var th=this; | 68 | var th=this; |
| 69 | var dd = { | 69 | var dd = { |
| 70 | store_id: o.stoid, | 70 | store_id: o.stoid, |
| 71 | - isstop: 0, | 71 | + isstop: 0, |
| 72 | + is_pos: 1, | ||
| 72 | pageSize: 1, | 73 | pageSize: 1, |
| 73 | page:1, | 74 | page:1, |
| 74 | }; | 75 | }; |
| @@ -182,6 +183,7 @@ Component({ | @@ -182,6 +183,7 @@ Component({ | ||
| 182 | var dd = { | 183 | var dd = { |
| 183 | store_id: o.stoid, | 184 | store_id: o.stoid, |
| 184 | isstop: 0, | 185 | isstop: 0, |
| 186 | + is_pos: 1, | ||
| 185 | pageSize: 2000 | 187 | pageSize: 2000 |
| 186 | } | 188 | } |
| 187 | 189 |
packageA/pages/goodsInfo/goodsInfo.js
| @@ -334,7 +334,7 @@ Page({ | @@ -334,7 +334,7 @@ Page({ | ||
| 334 | }else{ | 334 | }else{ |
| 335 | //要用接口是获取距离，js的计算不准 | 335 | //要用接口是获取距离，js的计算不准 |
| 336 | getApp().request.promiseGet("/api/weshop/pickup/list",{ | 336 | getApp().request.promiseGet("/api/weshop/pickup/list",{ |
| 337 | - data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon}, | 337 | + data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon, is_pos: 1}, |
| 338 | }).then(res=>{ | 338 | }).then(res=>{ |
| 339 | if(res.data.code==0){ | 339 | if(res.data.code==0){ |
| 340 | e=res.data.data.pageData[0]; | 340 | e=res.data.data.pageData[0]; |
| @@ -870,6 +870,7 @@ Page({ | @@ -870,6 +870,7 @@ Page({ | ||
| 870 | var dd= { | 870 | var dd= { |
| 871 | store_id: o.stoid, | 871 | store_id: o.stoid, |
| 872 | isstop: 0, | 872 | isstop: 0, |
| 873 | + is_pos: 1, | ||
| 873 | pageSize: 2000 | 874 | pageSize: 2000 |
| 874 | } | 875 | } |
| 875 | //如果有距离的话 | 876 | //如果有距离的话 |
packageA/pages/prom_list/prom_list.js
| @@ -118,7 +118,7 @@ Page({ | @@ -118,7 +118,7 @@ Page({ | ||
| 118 | }else{ | 118 | }else{ |
| 119 | //要用接口是获取距离，js的计算不准 | 119 | //要用接口是获取距离，js的计算不准 |
| 120 | getApp().request.promiseGet("/api/weshop/pickup/list",{ | 120 | getApp().request.promiseGet("/api/weshop/pickup/list",{ |
| 121 | - data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon}, | 121 | + data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon,is_pos: 1}, |
| 122 | }).then(res=>{ | 122 | }).then(res=>{ |
| 123 | if(res.data.code==0 && res.data.data && res.data.data.pageData){ | 123 | if(res.data.code==0 && res.data.data && res.data.data.pageData){ |
| 124 | e=res.data.data.pageData[0]; | 124 | e=res.data.data.pageData[0]; |
| @@ -747,7 +747,8 @@ Page({ | @@ -747,7 +747,8 @@ Page({ | ||
| 747 | dd = { | 747 | dd = { |
| 748 | store_id: o.stoid, | 748 | store_id: o.stoid, |
| 749 | distr_type: g_distr_type, | 749 | distr_type: g_distr_type, |
| 750 | - isstop: 0, | 750 | + isstop: 0, |
| 751 | + is_pos: 1, | ||
| 751 | pageSize: 2000 | 752 | pageSize: 2000 |
| 752 | } | 753 | } |
| 753 | } else { | 754 | } else { |
packageB/pages/zuhegou/index/index.js
| @@ -274,6 +274,7 @@ Page({ | @@ -274,6 +274,7 @@ Page({ | ||
| 274 | data: { | 274 | data: { |
| 275 | store_id: os.stoid, | 275 | store_id: os.stoid, |
| 276 | pickup_id: e.pickup_id, | 276 | pickup_id: e.pickup_id, |
| 277 | + is_pos: 1, | ||
| 277 | lat: th.data.lat, | 278 | lat: th.data.lat, |
| 278 | lon: th.data.lon | 279 | lon: th.data.lon |
| 279 | }, | 280 | }, |
| @@ -1212,12 +1213,14 @@ Page({ | @@ -1212,12 +1213,14 @@ Page({ | ||
| 1212 | store_id: os.stoid, | 1213 | store_id: os.stoid, |
| 1213 | distr_type: g_distr_type, | 1214 | distr_type: g_distr_type, |
| 1214 | isstop: 0, | 1215 | isstop: 0, |
| 1216 | + is_pos: 1, | ||
| 1215 | pageSize: 2000 | 1217 | pageSize: 2000 |
| 1216 | } | 1218 | } |
| 1217 | } else { | 1219 | } else { |
| 1218 | dd = { | 1220 | dd = { |
| 1219 | store_id: os.stoid, | 1221 | store_id: os.stoid, |
| 1220 | isstop: 0, | 1222 | isstop: 0, |
| 1223 | + is_pos: 1, | ||
| 1221 | pageSize: 2000 | 1224 | pageSize: 2000 |
| 1222 | } | 1225 | } |
| 1223 | } | 1226 | } |
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
| @@ -505,7 +505,7 @@ Page({ | @@ -505,7 +505,7 @@ Page({ | ||
| 505 | } else { | 505 | } else { |
| 506 | //要用接口是获取距离，js的计算不准 | 506 | //要用接口是获取距离，js的计算不准 |
| 507 | getApp().request.promiseGet("/api/weshop/pickup/list", { | 507 | getApp().request.promiseGet("/api/weshop/pickup/list", { |
| 508 | - data: { store_id: os.stoid, pickup_id: e.pickup_id, lat: th.data.lat, lon: th.data.lon }, | 508 | + data: { store_id: os.stoid, pickup_id: e.pickup_id, lat: th.data.lat, lon: th.data.lon,is_pos:1 }, |
| 509 | }).then(res => { | 509 | }).then(res => { |
| 510 | if (res.data.code == 0) { | 510 | if (res.data.code == 0) { |
| 511 | e = res.data.data.pageData[0]; | 511 | e = res.data.data.pageData[0]; |
| @@ -2632,12 +2632,14 @@ Page({ | @@ -2632,12 +2632,14 @@ Page({ | ||
| 2632 | store_id: o.stoid, | 2632 | store_id: o.stoid, |
| 2633 | distr_type: g_distr_type, | 2633 | distr_type: g_distr_type, |
| 2634 | isstop: 0, | 2634 | isstop: 0, |
| 2635 | + is_pos: 1, | ||
| 2635 | pageSize: 2000 | 2636 | pageSize: 2000 |
| 2636 | } | 2637 | } |
| 2637 | } else { | 2638 | } else { |
| 2638 | dd = { | 2639 | dd = { |
| 2639 | store_id: o.stoid, | 2640 | store_id: o.stoid, |
| 2640 | isstop: 0, | 2641 | isstop: 0, |
| 2642 | + is_pos: 1, | ||
| 2641 | pageSize: 2000 | 2643 | pageSize: 2000 |
| 2642 | } | 2644 | } |
| 2643 | } | 2645 | } |
packageC/pages/presell/goodsInfo/goodsInfo.js
| @@ -696,6 +696,7 @@ Page({ | @@ -696,6 +696,7 @@ Page({ | ||
| 696 | data: { | 696 | data: { |
| 697 | store_id: os.stoid, | 697 | store_id: os.stoid, |
| 698 | pickup_id: e.pickup_id, | 698 | pickup_id: e.pickup_id, |
| 699 | + is_pos: 1, | ||
| 699 | lat: th.data.lat, | 700 | lat: th.data.lat, |
| 700 | lon: th.data.lon | 701 | lon: th.data.lon |
| 701 | }, | 702 | }, |
| @@ -1784,12 +1785,14 @@ Page({ | @@ -1784,12 +1785,14 @@ Page({ | ||
| 1784 | store_id: o.stoid, | 1785 | store_id: o.stoid, |
| 1785 | distr_type: g_distr_type, | 1786 | distr_type: g_distr_type, |
| 1786 | isstop: 0, | 1787 | isstop: 0, |
| 1788 | + is_pos: 1, | ||
| 1787 | pageSize: 2000 | 1789 | pageSize: 2000 |
| 1788 | } | 1790 | } |
| 1789 | } else { | 1791 | } else { |
| 1790 | dd = { | 1792 | dd = { |
| 1791 | store_id: o.stoid, | 1793 | store_id: o.stoid, |
| 1792 | isstop: 0, | 1794 | isstop: 0, |
| 1795 | + is_pos: 1, | ||
| 1793 | pageSize: 2000 | 1796 | pageSize: 2000 |
| 1794 | } | 1797 | } |
| 1795 | } | 1798 | } |
pages/team/team_show/team_show.js
| @@ -605,7 +605,7 @@ Page({ | @@ -605,7 +605,7 @@ Page({ | ||
| 605 | }else{ | 605 | }else{ |
| 606 | //要用接口是获取距离，js的计算不准 | 606 | //要用接口是获取距离，js的计算不准 |
| 607 | getApp().request.promiseGet("/api/weshop/pickup/list",{ | 607 | getApp().request.promiseGet("/api/weshop/pickup/list",{ |
| 608 | - data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon}, | 608 | + data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon,is_pos: 1}, |
| 609 | }).then(res=>{ | 609 | }).then(res=>{ |
| 610 | if(res.data.code==0){ | 610 | if(res.data.code==0){ |
| 611 | e=res.data.data.pageData[0]; | 611 | e=res.data.data.pageData[0]; |
| @@ -1095,13 +1095,15 @@ Page({ | @@ -1095,13 +1095,15 @@ Page({ | ||
| 1095 | dd = { | 1095 | dd = { |
| 1096 | store_id: o.stoid, | 1096 | store_id: o.stoid, |
| 1097 | distr_type: g_distr_type, | 1097 | distr_type: g_distr_type, |
| 1098 | - isstop: 0, | 1098 | + isstop: 0, |
| 1099 | + is_pos: 1, | ||
| 1099 | pageSize: 2000 | 1100 | pageSize: 2000 |
| 1100 | } | 1101 | } |
| 1101 | } else { | 1102 | } else { |
| 1102 | dd = { | 1103 | dd = { |
| 1103 | store_id: o.stoid, | 1104 | store_id: o.stoid, |
| 1104 | - isstop: 0, | 1105 | + isstop: 0, |
| 1106 | + is_pos: 1, | ||
| 1105 | pageSize: 2000 | 1107 | pageSize: 2000 |
| 1106 | } | 1108 | } |
| 1107 | } | 1109 | } |