wxd / MShopWeApp

Commit cc298cef07381647b5d1d2ddf575fe749bcc79b0

Authored by 后端研发-苏明海
2 parents 8feb1f2e 65a46f04

Merge branch 'dev' into 'test' 

Dev

See merge request !827
Inline Side-by-side
Showing 2 changed files with 6 additions and 6 deletions
packageC/pages/presell/goodsInfo/goodsInfo.js
  View file @cc298ce
... ... @@ -294,7 +294,7 @@ Page({
294 294 if (gid == undefined || gid == null || gid == "") {
295 295 var gid_str = decodeURIComponent(t.scene);
296 296 gid_str = gid_str.split("_");
297   - pre_id = gid_str[0];
  297 + gid = gid_str[0];
298 298 if (gid_str.length > 1) {
299 299 pre_id = gid_str[1];
300 300 first_leader = gid_str[2];
... ... @@ -2696,7 +2696,7 @@ Page({
2696 2696 var unit = that.data.screenWidth / 750 * 1.35; //基础单位，
2697 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 2700 var user_id = getApp().globalData.user_id ? getApp().globalData.user_id : 0;
2701 2701 if (user_id > 0) {
2702 2702 scene += "_" + user_id;
... ... @@ -2710,8 +2710,8 @@ Page({
2710 2710  
2711 2711 ///二微码
2712 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 2716 console.log(path3);
2717 2717  
... ...
packageC/pages/presell/goodsInfo/goodsInfo.wxss
  View file @cc298ce
... ... @@ -2301,13 +2301,13 @@ right:87rpx;
2301 2301 background: #e5e5e5;
2302 2302 }
2303 2303 .xc-qt-price{
2304   - font-style: italic;
  2304 + /* font-style: italic; */
2305 2305 top:-23rpx;
2306 2306 left:40rpx;
2307 2307 color: #fff;
2308 2308 }
2309 2309 .presell_price{
2310   - font-style: italic;
  2310 + /* font-style: italic; */
2311 2311  
2312 2312 top: 23rpx;
2313 2313 left:40rpx;
... ...