Commit ce08f22dd50fabf37efdfa173ba9c7d58179ebf2
1 parent
4f8aacf9
OA单的优化
Showing
1 changed file
with
12 additions
and
2 deletions
pages/goods/goodsInfo/goodsInfo.js
| ... | ... | @@ -3474,7 +3474,7 @@ Page({ |
| 3474 | 3474 | var req_d = { |
| 3475 | 3475 | "store_id": os.stoid, |
| 3476 | 3476 | "goods_id": that.data.gid, |
| 3477 | - "user_id": user_id, | |
| 3477 | + "user_id": getApp().globalData.user_id | |
| 3478 | 3478 | } |
| 3479 | 3479 | getApp().request.get(url, { |
| 3480 | 3480 | data: req_d, |
| ... | ... | @@ -7510,12 +7510,22 @@ Page({ |
| 7510 | 7510 | |
| 7511 | 7511 | if (!item) return false; |
| 7512 | 7512 | |
| 7513 | + if (item.is_no_dis_nor) { | |
| 7514 | + wx.showToast({ | |
| 7515 | + title: "该门店不可售,请选择其他门店", | |
| 7516 | + icon: 'none', | |
| 7517 | + duration: 2000 | |
| 7518 | + }); | |
| 7519 | + return false; | |
| 7520 | + } | |
| 7521 | + | |
| 7522 | + | |
| 7513 | 7523 | if (!th.data.sele_g) return false; |
| 7514 | 7524 | //判断门店的配送方式是不是匹配 |
| 7515 | 7525 | var g_distr_type = th.data.sele_g.distr_type; |
| 7516 | 7526 | if (item.distr_type != 0 && g_distr_type != 0 && item.distr_type != g_distr_type) { |
| 7517 | 7527 | wx.showToast({ |
| 7518 | - title: "门店配送方式不匹配", | |
| 7528 | + title: "门店配送方式不匹配,请选择其他门店", | |
| 7519 | 7529 | icon: 'none', |
| 7520 | 7530 | duration: 2000 |
| 7521 | 7531 | }); | ... | ... |