wxd / MShopWeApp

Commit ceee11d96f6c99032a1e9e14e1be806e17986623

Authored by WXD-SEASON\season
2 parents 98d02260 52443989

Merge branch 'dev_oa_luo17' into dev

Inline Side-by-side
Showing 6 changed files with 46 additions and 6 deletions
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
  View file @ceee11d
1 1 var t = require("../../../../utils/util.js"),
2 2 ut = t,
3 3 e = require("../../../../utils/common.js"),
  4 + common =e,
4 5 a = require("../../../../utils/wxParse/wxParse.js"),
5 6 s = getApp(),
6 7 i = s.request,
... ... @@ -287,7 +288,7 @@ Page({
287 288 is_get_guide:0,
288 289 keyword:'', //门店搜索
289 290 sec_i:-1,//选中分类门店 下标
290   -
  291 + goodInfo_ad:"",//商品详情广告
291 292 adding:0 //避免重复点击
292 293 },
293 294  
... ... @@ -466,7 +467,10 @@ Page({
466 467 ee.init(gid);
467 468 //------几人评价-------
468 469 //n.init(th, "", "comments");
469   -
  470 + //商品详情广告----
  471 + a.wxParse("goodInfo_ad", "html", ut.format_content(e.goods_bottomconent), ee, 6);
  472 + common.wxParseAddFullImageUrl(ee, "goodInfo_ad");
  473 + //-------
470 474 th.requestCardNum(), wx.pageScrollTo && th.setData({
471 475 supportPageScroll: !0
472 476 });
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
  View file @ceee11d
... ... @@ -678,6 +678,10 @@
678 678 <view class="wxParse">
679 679 <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
680 680 </view>
  681 + <!-- 详情广告 -->
  682 + <view class="wxParse">
  683 + <template is="wxParse" data="{{wxParseData:goodInfo_ad.nodes}}"></template>
  684 + </view>
681 685 </view>
682 686 <!-- 推荐商品 -->
683 687 <view class="flex-center rel xc-linellae-frame">
... ... @@ -760,6 +764,10 @@
760 764 <view class="wxParse">
761 765 <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
762 766 </view>
  767 + <!-- 详情广告 -->
  768 + <view class="wxParse">
  769 + <template is="wxParse" data="{{wxParseData:goodInfo_ad.nodes}}"></template>
  770 + </view>
763 771 </view>
764 772 <!-- -------------评价页面------------ -->
765 773 <view class="goods-comment" hidden="{{activeCategoryId==2?false:true}}">
... ...
packageC/pages/presell/goodsInfo/goodsInfo.js
  View file @ceee11d
1 1 var ut = require("../../../../utils/util.js"),
2 2 e = require("../../../../utils/common.js"),
  3 + common = e,
3 4 a = require("../../../../utils/wxParse/wxParse.js"),
4 5 s = getApp(), app = s,
5 6 i = s.request,
... ... @@ -259,6 +260,7 @@ Page({
259 260 is_retail_price: 0,
260 261 keyword:'', //门店搜索
261 262 sec_i:-1,//选中分类门店 下标
  263 + goodInfo_ad:'',//商品详情广告
262 264 },
263 265  
264 266 //------初始化加载----------
... ... @@ -400,6 +402,10 @@ Page({
400 402 appoint_pick_keyid: json_d.appoint_pick_keyid
401 403  
402 404 });
  405 + //商品详情广告----
  406 + a.wxParse("goodInfo_ad", "html", ut.format_content(e.goods_bottomconent), ee, 6);
  407 + common.wxParseAddFullImageUrl(ee, "goodInfo_ad");
  408 + //-------
403 409 // ee.init(gid);
404 410 //------几人评价-------
405 411 //n.init(th, "", "comments");
... ...
packageC/pages/presell/goodsInfo/goodsInfo.wxml
  View file @ceee11d
... ... @@ -340,6 +340,10 @@
340 340 <view class="wxParse">
341 341 <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
342 342 </view>
  343 + <!-- 详情广告 -->
  344 + <view class="wxParse">
  345 + <template is="wxParse" data="{{wxParseData:goodInfo_ad.nodes}}"></template>
  346 + </view>
343 347 </view>
344 348 <!-- 推荐商品 -->
345 349 <view class="flex-center rel xc-linellae-frame">
... ... @@ -429,6 +433,10 @@
429 433 <view class="wxParse">
430 434 <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
431 435 </view>
  436 + <!-- 详情广告 -->
  437 + <view class="wxParse">
  438 + <template is="wxParse" data="{{wxParseData:goodInfo_ad.nodes}}"></template>
  439 + </view>
432 440 </view>
433 441 <!-- -------------评价页面------------ -->
434 442 <view class="goods-comment" hidden="{{activeCategoryId==2?false:true}}">
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @ceee11d
1 1 var t = require("../../../utils/util.js"),
2 2 ut = t,
3 3 e = require("../../../utils/common.js"),
  4 + common =e,
4 5 a = require("../../../utils/wxParse/wxParse.js"),
5 6 s = getApp(),
6 7 i = s.request,
... ... @@ -274,8 +275,8 @@ Page({
274 275 showFold:true,
275 276 new_share_imgurl:'', //普通商品分享图片
276 277  
277   - adding:0 //加入购物车的避免重复
278   -
  278 + adding:0 , //加入购物车的避免重复
  279 + goodInfo_ad:"",//商品详情广告
279 280 },
280 281  
281 282 //------初始化加载----------
... ... @@ -484,10 +485,15 @@ Page({
484 485 is_closecoupon: json_d.is_closecoupon,
485 486 is_newsales_rules: json_d.is_newsales_rules,
486 487 is_retail_price: json_d.is_retail_price || 0,
487   - appoint_pick_keyid: json_d.appoint_pick_keyid
488   -
  488 + appoint_pick_keyid: json_d.appoint_pick_keyid,
  489 + // goods_bottomconent:e.goods_bottomconent
489 490 });
490 491  
  492 + //商品详情广告----
  493 + a.wxParse("goodInfo_ad", "html", ut.format_content(e.goods_bottomconent), ee, 6);
  494 + common.wxParseAddFullImageUrl(ee, "goodInfo_ad");
  495 + //-------
  496 +
491 497 //------几人评价-------
492 498 //n.init(th, "", "comments");
493 499  
... ...
pages/goods/goodsInfo/goodsInfo.wxml
  View file @ceee11d
... ... @@ -870,6 +870,10 @@
870 870 <view class="wxParse">
871 871 <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
872 872 </view>
  873 + <!-- 详情广告 -->
  874 + <view class="wxParse">
  875 + <template is="wxParse" data="{{wxParseData:goodInfo_ad.nodes}}"></template>
  876 + </view>
873 877 </view>
874 878 <!-- 推荐商品 -->
875 879 <view class="flex-center rel xc-linellae-frame">
... ... @@ -952,6 +956,10 @@
952 956 <view class="wxParse">
953 957 <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
954 958 </view>
  959 + <!-- 详情广告 -->
  960 + <view class="wxParse">
  961 + <template is="wxParse" data="{{wxParseData:goodInfo_ad.nodes}}"></template>
  962 + </view>
955 963 </view>
956 964 <!-- -------------评价页面------------ -->
957 965 <view class="goods-comment" hidden="{{activeCategoryId==2?false:true}}">
... ...