1 participants
-
Status changed to merged
-
mentioned in commit 61acafe96c8077539aceb3496ab8b0ccdc3feeac
-
Dev See merge request !827
Showing
2 changed files
packageC/pages/presell/goodsInfo/goodsInfo.js
| @@ -294,7 +294,7 @@ Page({ | @@ -294,7 +294,7 @@ Page({ | ||
| 294 | if (gid == undefined || gid == null || gid == "") { | 294 | if (gid == undefined || gid == null || gid == "") { |
| 295 | var gid_str = decodeURIComponent(t.scene); | 295 | var gid_str = decodeURIComponent(t.scene); |
| 296 | gid_str = gid_str.split("_"); | 296 | gid_str = gid_str.split("_"); |
| 297 | - pre_id = gid_str[0]; | 297 | + gid = gid_str[0]; |
| 298 | if (gid_str.length > 1) { | 298 | if (gid_str.length > 1) { |
| 299 | pre_id = gid_str[1]; | 299 | pre_id = gid_str[1]; |
| 300 | first_leader = gid_str[2]; | 300 | first_leader = gid_str[2]; |
| @@ -2696,7 +2696,7 @@ Page({ | @@ -2696,7 +2696,7 @@ Page({ | ||
| 2696 | var unit = that.data.screenWidth / 750 * 1.35; //基础单位， | 2696 | var unit = that.data.screenWidth / 750 * 1.35; //基础单位， |
| 2697 | var path2 = that.data.data.original_img; | 2697 | var path2 = that.data.data.original_img; |
| 2698 | 2698 | ||
| 2699 | - var scene = th.data.gid + "_"+th.data.pre_arr.id; | 2699 | + var scene = th.data.gid + "_"+th.data.presellList.id; |
| 2700 | var user_id = getApp().globalData.user_id ? getApp().globalData.user_id : 0; | 2700 | var user_id = getApp().globalData.user_id ? getApp().globalData.user_id : 0; |
| 2701 | if (user_id > 0) { | 2701 | if (user_id > 0) { |
| 2702 | scene += "_" + user_id; | 2702 | scene += "_" + user_id; |
| @@ -2710,8 +2710,8 @@ Page({ | @@ -2710,8 +2710,8 @@ Page({ | ||
| 2710 | 2710 | ||
| 2711 | ///二微码 | 2711 | ///二微码 |
| 2712 | var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + | 2712 | var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + |
| 2713 | - //os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/presell/goodsInfo/goodsInfo"; | ||
| 2714 | - os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo"; | 2713 | + os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/presell/goodsInfo/goodsInfo"; |
| 2714 | + | ||
| 2715 | 2715 | ||
| 2716 | console.log(path3); | 2716 | console.log(path3); |
| 2717 | 2717 |
packageC/pages/presell/goodsInfo/goodsInfo.wxss
| @@ -2301,13 +2301,13 @@ right:87rpx; | @@ -2301,13 +2301,13 @@ right:87rpx; | ||
| 2301 | background: #e5e5e5; | 2301 | background: #e5e5e5; |
| 2302 | } | 2302 | } |
| 2303 | .xc-qt-price{ | 2303 | .xc-qt-price{ |
| 2304 | - font-style: italic; | 2304 | + /* font-style: italic; */ |
| 2305 | top:-23rpx; | 2305 | top:-23rpx; |
| 2306 | left:40rpx; | 2306 | left:40rpx; |
| 2307 | color: #fff; | 2307 | color: #fff; |
| 2308 | } | 2308 | } |
| 2309 | .presell_price{ | 2309 | .presell_price{ |
| 2310 | - font-style: italic; | 2310 | + /* font-style: italic; */ |
| 2311 | 2311 | ||
| 2312 | top: 23rpx; | 2312 | top: 23rpx; |
| 2313 | left:40rpx; | 2313 | left:40rpx; |