Commit 4d3d32022932e96169d97502e65a31542947957f
1 parent
58e9d4a8
合并
Showing
1 changed file
with
0 additions
and
4 deletions
pages/goods/goodsInfo/goodsInfo.js
| @@ -3474,11 +3474,7 @@ Page({ | @@ -3474,11 +3474,7 @@ Page({ | ||
| 3474 | var req_d = { | 3474 | var req_d = { |
| 3475 | "store_id": os.stoid, | 3475 | "store_id": os.stoid, |
| 3476 | "goods_id": that.data.gid, | 3476 | "goods_id": that.data.gid, |
| 3477 | -<<<<<<< HEAD | ||
| 3478 | "user_id": getApp().globalData.user_id, | 3477 | "user_id": getApp().globalData.user_id, |
| 3479 | -======= | ||
| 3480 | - "user_id": getApp().globalData.user_id | ||
| 3481 | ->>>>>>> dev_oa_fu27 | ||
| 3482 | } | 3478 | } |
| 3483 | getApp().request.get(url, { | 3479 | getApp().request.get(url, { |
| 3484 | data: req_d, | 3480 | data: req_d, |