Merge branch 'dev_oa_luo17' into dev

WXD-SEASON\season
2 parents 98d02260 52443989
Showing 6 changed files with 46 additions and 6 deletions
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
packageC/pages/presell/goodsInfo/goodsInfo.js
packageC/pages/presell/goodsInfo/goodsInfo.wxml
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
 var t = require("../../../../utils/util.js"),
   ut = t,
   e = require("../../../../utils/common.js"),
+  common =e,
   a = require("../../../../utils/wxParse/wxParse.js"),
   s = getApp(),
   i = s.request,
@@ -287,7 +288,7 @@ Page({
     is_get_guide:0,
     keyword:'', //门店搜索
     sec_i:-1,//选中分类门店 下标
-
+    goodInfo_ad:"",//商品详情广告
     adding:0  //避免重复点击
   },
@@ -466,7 +467,10 @@ Page({
       ee.init(gid);
       //------几人评价-------
       //n.init(th, "", "comments");
-
+     //商品详情广告----
+     a.wxParse("goodInfo_ad", "html", ut.format_content(e.goods_bottomconent), ee, 6);
+     common.wxParseAddFullImageUrl(ee, "goodInfo_ad");
+     //-------
       th.requestCardNum(), wx.pageScrollTo && th.setData({
         supportPageScroll: !0
       });
@@ -678,6 +678,10 @@
           <view class="wxParse">
             <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
           </view>
+          <!-- 详情广告 -->
+          <view class="wxParse">
+            <template is="wxParse" data="{{wxParseData:goodInfo_ad.nodes}}"></template>
+          </view>
         </view>
         <!-- 推荐商品 -->
         <view class="flex-center rel xc-linellae-frame">
@@ -760,6 +764,10 @@
         <view class="wxParse">
           <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
         </view>
+                  <!-- 详情广告 -->
+                  <view class="wxParse">
+            <template is="wxParse" data="{{wxParseData:goodInfo_ad.nodes}}"></template>
+          </view>
       </view>
       <!-- -------------评价页面------------ -->
       <view class="goods-comment" hidden="{{activeCategoryId==2?false:true}}">
 var ut = require("../../../../utils/util.js"),
   e = require("../../../../utils/common.js"),
+  common = e,
   a = require("../../../../utils/wxParse/wxParse.js"),
   s = getApp(), app = s,
   i = s.request,
@@ -259,6 +260,7 @@ Page({
     is_retail_price: 0,
     keyword:'', //门店搜索
     sec_i:-1,//选中分类门店 下标
+    goodInfo_ad:'',//商品详情广告
   },
   //------初始化加载----------
@@ -400,6 +402,10 @@ Page({
         appoint_pick_keyid: json_d.appoint_pick_keyid
       });
+      //商品详情广告----
+      a.wxParse("goodInfo_ad", "html", ut.format_content(e.goods_bottomconent), ee, 6);
+      common.wxParseAddFullImageUrl(ee, "goodInfo_ad");
+      //-------
       // ee.init(gid);
       //------几人评价-------
       //n.init(th, "", "comments");
@@ -340,6 +340,10 @@
         <view class="wxParse">
           <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
         </view>
+        <!-- 详情广告 -->
+        <view class="wxParse">
+          <template is="wxParse" data="{{wxParseData:goodInfo_ad.nodes}}"></template>
+        </view>
       </view>
       <!-- 推荐商品 -->
       <view class="flex-center rel xc-linellae-frame">
@@ -429,6 +433,10 @@
       <view class="wxParse">
         <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
       </view>
+              <!-- 详情广告 -->
+      <view class="wxParse">
+          <template is="wxParse" data="{{wxParseData:goodInfo_ad.nodes}}"></template>
+        </view>
     </view>
     <!-- -------------评价页面------------ -->
     <view class="goods-comment" hidden="{{activeCategoryId==2?false:true}}">
 var t = require("../../../utils/util.js"),
   ut = t,
   e = require("../../../utils/common.js"),
+  common =e,
   a = require("../../../utils/wxParse/wxParse.js"),
   s = getApp(),
   i = s.request,
@@ -274,8 +275,8 @@ Page({
         showFold:true,
         new_share_imgurl:'', //普通商品分享图片
-        adding:0  //加入购物车的避免重复
-
+        adding:0 , //加入购物车的避免重复
+        goodInfo_ad:"",//商品详情广告
       },
       //------初始化加载----------
@@ -484,10 +485,15 @@ Page({
             is_closecoupon: json_d.is_closecoupon,
             is_newsales_rules: json_d.is_newsales_rules,
             is_retail_price: json_d.is_retail_price || 0,
-            appoint_pick_keyid: json_d.appoint_pick_keyid
-
+            appoint_pick_keyid: json_d.appoint_pick_keyid,
+            // goods_bottomconent:e.goods_bottomconent
           });
+          //商品详情广告----
+          a.wxParse("goodInfo_ad", "html", ut.format_content(e.goods_bottomconent), ee, 6);
+          common.wxParseAddFullImageUrl(ee, "goodInfo_ad");
+          //-------
+
           //------几人评价-------
           //n.init(th, "", "comments");
@@ -870,6 +870,10 @@
           <view class="wxParse">
             <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
           </view>
+         <!-- 详情广告 -->
+         <view class="wxParse">
+            <template is="wxParse" data="{{wxParseData:goodInfo_ad.nodes}}"></template>
+          </view>
         </view>
         <!-- 推荐商品 -->
         <view class="flex-center rel xc-linellae-frame">
@@ -952,6 +956,10 @@
         <view class="wxParse">
           <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
         </view>
+         <!-- 详情广告 -->
+         <view class="wxParse">
+            <template is="wxParse" data="{{wxParseData:goodInfo_ad.nodes}}"></template>
+          </view>
       </view>
       <!-- -------------评价页面------------ -->
       <view class="goods-comment" hidden="{{activeCategoryId==2?false:true}}">