Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

yvan.ni
2 parents 7bc2ef43 5e6e5e82
Showing 4 changed files with 20 additions and 7 deletions
pages/giftpack/newvipgift/newvipgift.js
pages/giftpack/newvipgift/newvipgift.wxml
pages/giftpack/newvipgift/newvipgift.wxss
pages/index/index/index.js
@@ -28,10 +28,14 @@ Page({
     integralTitle: "",
     growUpTitle: "",
     is_sub: 0, //是否重复领取
+    }]
   },
   GetList: function() {
     var th = this;
     var url = "/api/weshop/marketing/giftbag/bound/get";
+    wx.showLoading({
+      title: '加载中',
+    })
     getApp().request.promiseGet(url, {
       data: {
         "actId": th.data.getActId, //活动id
@@ -41,6 +45,7 @@ Page({
         "userId": d.user_id //用户ID
       }
     }).then(res => {
+      wx.hideLoading();
       if (res.data.code == 0) {
         if (res.data.data.lbCoupons != null && res.data.data.lbCoupons.length>0) {
           //礼包内容--礼券
@@ -100,7 +105,8 @@ Page({
         if (res.data.data.actIntro != '') {
           th.setData({
             textShow: true,
-            textTitle: res.data.data.actIntro.replace(/\<img/gi, '<img style="max-width:100%;height:auto"')
+            textTitle: res.data.data.actIntro.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"').replace(/<section/g, '<div')
+              .replace(/\/section>/g, '\div>')
           })
         }
       } else {
@@ -119,7 +125,7 @@ Page({
     th.GetList();
   },
   onShow: function() {
-
+  
   },
   GetReceive: function() {
     var th = this;
@@ -147,7 +147,7 @@
         <text>活动规则:</text>
       </view>
       <view class="foot_box_text">
-        <rich-text nodes="{{textTitle}}"></rich-text>
+        <rich-text nodes="{{textTitle}}" name="div"></rich-text>
       </view>
     </view>
   </block>
@@ -346,6 +346,7 @@
   bottom: 0;
   left: 0;
   width: 100%;
+  z-index: 10;
 }
 .foot_button_buy {
@@ -379,15 +380,20 @@ button::after {
 .foot_box_text ._img {
   width: 100%;
 }
+.foot_box_text .p{
+  width: 100%;
+}
 .foot_box_text .img {
   line-height: 0;
 }
-
 .image {
   width: 400rpx;
   height: 200rpx;
 }
+.div_class{
+  width: 600rpx;
+}
 .num {
   color: #fb6451;
@@ -407,4 +413,4 @@ button::after {
   width: 20rpx;
   height: 90rpx;
   z-index: 5;
 -}
+}
 \ No newline at end of file
@@ -21,7 +21,7 @@ Page({
     swiperimage: [{
       image: "/miniapp/images/title.png",
       nav_url: 0
-    }], 
+    }],
     resourceUrl: o.resourceUrl,
     logo: o.appLogo,
     homeData: null,
@@ -70,6 +70,7 @@ Page({
     is_disgraceful: 0, //是否显示新人广告
     new_image: "", //新人有礼弹窗图片
     new_nav: "", //新人页面跳转地址
+
   },
   onLoad: function() {
@@ -89,7 +90,7 @@ Page({
         });
       }
     })
-   // th.is_festival();
+    // th.is_festival();
   },
   //关闭新用户领取广告