diff --git a/pages/giftpack/birthdaygift/birthdaygift.js b/pages/giftpack/birthdaygift/birthdaygift.js
index 3a695eb..c789f95 100644
--- a/pages/giftpack/birthdaygift/birthdaygift.js
+++ b/pages/giftpack/birthdaygift/birthdaygift.js
@@ -32,24 +32,28 @@ Page({
   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
-        "actType":4, //活动类型 1新人礼 2评价有礼 3节日营销 4生日营销
+        "actType": 4, //活动类型 1新人礼 2评价有礼 3节日营销 4生日营销
         "giftBagId": th.data.giftID, //礼包ID
         "storeId": a.stoid, //商家ID
         "userId": d.user_id //用户ID
       }
     }).then(res => {
+      wx.hideLoading();
       if (res.data.code == 0) {
-        if (res.data.data.lbCoupons.length > 0 && res.data.data.lbCoupons!=null) {
+        if (res.data.data.lbCoupons.length > 0 && res.data.data.lbCoupons != null) {
           //礼包内容--礼券
           th.setData({
             cardShow: true,
             cards: res.data.data.lbCoupons
           })
         }
-        if (res.data.data.lbSM.length > 0 && res.data.data.lbSM!=nll) {
+        if (res.data.data.lbSM.length > 0 && res.data.data.lbSM != nll) {
           //礼包内容--服务项目
           th.setData({
             itemShow: true,
@@ -100,7 +104,8 @@ Page({
         if (res.data.data.actIntro != '') {
           th.setData({
             textShow: true,
-            textTitle: res.data.data.actIntro
+            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,11 +124,7 @@ Page({
     th.GetList();
   },
   onShow: function onShow() {
-    var th = this;
-    var textTitle = th.data.textTitle.replace(/<p><img/gi, "<p class='img'><img");
-    th.setData({
-      textTitle: textTitle
-    })
+
   },
   GetReceive: function () {
     var th = this;
@@ -135,7 +136,9 @@ Page({
       th.setData({
         is_sub: 1
       })
-
+      wx.showLoading({
+        title: '加载中',
+      })
       var json = {
         "actId": th.data.getActId, //活动Id
         "actType": 4, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
@@ -153,6 +156,7 @@ Page({
           'content-type': 'application/json'
         }, // 设置请求的 header
         success: function (res) {
+          wx.hideLoading();
           th.setData({
             is_sub: 0
           })
diff --git a/pages/giftpack/birthdaygift/birthdaygift.wxml b/pages/giftpack/birthdaygift/birthdaygift.wxml
index f925b54..d7a564b 100644
--- a/pages/giftpack/birthdaygift/birthdaygift.wxml
+++ b/pages/giftpack/birthdaygift/birthdaygift.wxml
@@ -1,168 +1,175 @@
 <view>
-    <view class="image_box">
-        <image src="{{iurl+'/miniapp/images/giftbag/birth00.png'}}" lazy-load="true"></image>
-    </view>
-    <block wx:if="{{itemShow}}">
-        <view class="top">
-            <view class="top_box">
-                <view class="top_box_text">
-                    <text>______</text>
-                </view>
-                <view class="top_box_text">
-                    <text>新人专享\n你的美丽我来缔造</text>
-                </view>
-                <view class="top_box_text">
-                    <text >______</text>
-                </view>
-            </view>
-            <block wx:for="{{itemWare}}" wx:for-item="item" wx:for-index="index" wx:key="index">
-                <view class="top_item ">
-                    <block wx:if="{{item.lbType==3}}">
-                        <view class="top_item_img">
-                            <image src="{{item.fromImage=='' || item.fromImage==null?iurl+'/miniapp/images/giftbag/gift02.png':iurl+item.fromImage}}" lazy-load="true" data-errorimg="itemWare[{{index}}].fromImage" binderror="bind_bnerr1" data-img="{{item.fromImage}}"></image>
-                        </view>
-                    </block>
-                    <block wx:if="{{item.lbType==1}}">
-                        <view class="top_item_img ">
-                            <image src="{{item.fromImage==''?iurl+'/miniapp/images/giftbag/empty.jpg':iurl+item.fromImage}}" lazy-load="true"></image>
-                        </view>
-                    </block>
-                    <view class="top_item_center ">
-                        <view class="top_item_center_title">
-                            <block wx:if="{{item.lbType==1}}">
-                                <text>免费领取</text>
-                            </block>
-                            <block wx:if="{{item.lbType==3}}">
-                                <text>{{item.fromName}}</text>
-                            </block>
-                        </view>
-                        <view class="top_item_center_ramke ">
-                            <block wx:if="{{item.lbType==1}}">
-                                <text>{{item.fromName}}</text>
-                            </block>
-                            <block wx:if="{{item.lbType==3}}">
-                                <text >{{"新人可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}</text>
-                            </block>
-                        </view>
-                    </view>
-                </view>
-            </block>
+  <view class="image_box">
+    <image src="{{iurl+'/miniapp/images/giftbag/birth00.png'}}" lazy-load="true"></image>
+  </view>
+  <block wx:if="{{itemShow}}">
+    <view class="top rel">
+      <view class="top_box">
+        <view class="top_box_text">
+          <text>______</text>
         </view>
-    </block>
-    <block wx:if="{{itemShow}}">
-        <view >
-            <image style="width:10px;height:47px;float:left;top:-38px;left:55px;" src="{{iurl+'/miniapp/images/giftbag/vip05.png'}}" lazy-load="true"></image>
-            <image style="width:10px;height:47px;float:right;top:-38px;right:55px;" src="{{iurl+'/miniapp/images/giftbag/vip05.png'}}" lazy-load="true"></image>
+        <view class="top_box_text">
+          <text>新人专享\n你的美丽我来缔造</text>
         </view>
-    </block>
-    <block wx:if="{{cardShow}}">
-        <view >
-            <view class="top ">
-                <view class="top_box ">
-                    <view class="top_box_text ">
-                        <text >———</text>
-                    </view>
-                    <view class="top_box_text ">
-                        <text >新人专享优惠券</text>
-                    </view>
-                    <view class="top_box_text ">
-                        <text >———</text>
-                    </view>
-                </view>
-                <block wx:for="{{cards}}" wx:for-item="item" wx:for-index="index" wx:key="index">
-                    <view class="top_card ">
-                        <view class="{{item.useObjectType==1?'top_card_box img1':item.useObjectType==2?'top_card_box img2':'top_card_box img3'}}">
-                        <!-- class="{{['',item.useObjectType==1?'top_card_box img1':item.useObjectType==2?'top_card_box img2':'top_card_box img3']}}" -->
-                            <view class="top_card_tite_box ">
-                                <block wx:if="{{item.useObjectType==0}}">
-                                    <view class="top_card_tite_a">全场通用</view>
-                                </block>
-                                <block wx:if="{{item.useObjectType==1}}">
-                                    <view class="top_card_tite_b">品牌限定</view>
-                                </block>
-                                <block wx:if="{{item.useObjectType==2}}">
-                                    <view class="top_card_tite_c">品类限定</view>
-                                </block>
-                                <block wx:if="{{item.useObjectType==11}}">
-                                    <view class="top_card_tite_a">用途限定</view>
-                                </block>
-                                <block wx:if="{{item.useObjectType==12}}">
-                                    <view class="top_card_tite_a">分类限定</view>
-                                </block>
-                            </view>
-                            <view class="top_card_counte ">{{item.sum+"元券"}}</view>
-                            <view class="top_card_remak ">{{"满"+item.buySum+"元可以用"}}</view>
-                        </view>
-                    </view>
-                </block>
-            </view>
+        <view class="top_box_text">
+          <text>______</text>
         </view>
-    </block>
-    <block wx:if="{{cardShow}}">
-        <view>
-            <view>
-                <image style="width:10px;height:47px;float:left;top:-38px;left:55px;" src="{{iurl+'/miniapp/images/giftbag/vip05.png'}}" lazy-load="true"></image>
-                <image style="width:10px;height:47px;float:right;top:-38px;right:55px;" src="{{iurl+'/miniapp/images/giftbag/vip05.png'}}" lazy-load="true"></image>
+      </view>
+      <block wx:for="{{itemWare}}" wx:for-item="item" wx:for-index="index" wx:key="index">
+        <view class="top_item ">
+          <block wx:if="{{item.lbType==3}}">
+            <view class="top_item_img">
+              <image src="{{item.fromImage=='' || item.fromImage==null?iurl+'/miniapp/images/giftbag/gift02.png':iurl+item.fromImage}}" lazy-load="true" data-errorimg="itemWare[{{index}}].fromImage" binderror="bind_bnerr1" data-img="{{item.fromImage}}"></image>
             </view>
-        </view>
-    </block>
-    <block wx:if="{{packShow}}">
-        <view >
-            <view class="top ">
-                <view class="top_box ">
-                    <view class="top_box_text ">
-                        <text >———</text>
-                    </view>
-                    <view class="top_box_text ">
-                        <text >新人专享福利</text>
-                    </view>
-                    <view class="top_box_text ">
-                        <text >———</text>
-                    </view>
-                </view>
-                <block wx:if="{{integralShow}}">
-                    <view>
-                        <view class="top_box_image ">
-                            <image src="{{iurl+'/miniapp/images/giftbag/vip06.jpg'}}" lazy-load="true"></image>
-                            <button>{{integralTitle}}</button>
-                        </view>
-                    </view>
-                </block>
-                <block wx:if="{{growUpShow}}">
-                    <view >
-                        <view class="top_box_image fs36">
-                            <image src="{{iurl+'/miniapp/images/giftbag/vip07.jpg'}}" lazy-load="true"></image>
-                            <button>{{growUpTitle}}</button>
-                        </view>
-                    </view>
-                </block>
+          </block>
+          <block wx:if="{{item.lbType==1}}">
+            <view class="top_item_img ">
+              <image src="{{item.fromImage==''?iurl+'/miniapp/images/giftbag/empty.jpg':iurl+item.fromImage}}" lazy-load="true"></image>
             </view>
-        </view>
-    </block>
-    <block wx:if="{{textShow}}">
-        <view class="foot_box">
-            <view class="foot_box_title fs36">
-                <text>活动规则:</text>
+          </block>
+          <view class="top_item_center ">
+            <view class="top_item_center_title">
+              <block wx:if="{{item.lbType==1}}">
+                <text>免费领取</text>
+              </block>
+              <block wx:if="{{item.lbType==3}}">
+                <text>{{item.fromName}}</text>
+              </block>
             </view>
-            <view class="foot_box_text">
-                <rich-text nodes="{{textTitle}}"></rich-text>
+            <view class="top_item_center_ramke ">
+              <block wx:if="{{item.lbType==1}}">
+                <text>{{item.fromName}}</text>
+              </block>
+              <block wx:if="{{item.lbType==3}}">
+                <text>{{"新人可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}</text>
+              </block>
+              <view class="num flex-level-right fs26">
+                <view>数量：</view>
+                <view>{{item.num}}</view>
+              </view>
             </view>
+          </view>
         </view>
-    </block>
-    <view class="button_box">
-        <view >
-            <button class="button" bindtap="goto" data-url="/pages/index/index/index">进入商城购物</button>
+      </block>
+      <block wx:if="{{itemShow}}">
+        <view class="vips">
+          <image class="lvip abs" src="{{iurl+'/miniapp/images/giftbag/vip05.png'}}" lazy-load="true"></image>
+          <image class="rvip abs" src="{{iurl+'/miniapp/images/giftbag/vip05.png'}}" lazy-load="true"></image>
         </view>
-        <view class="button_text ">
-            <text >本活动最终解释权归公司所有，如果有问题请联系客服</text>
+      </block>
+    </view>
+  </block>
+  <block wx:if="{{cardShow}}">
+    <view>
+      <view class="top rel">
+        <view class="top_box ">
+          <view class="top_box_text ">
+            <text>———</text>
+          </view>
+          <view class="top_box_text ">
+            <text>新人专享优惠券</text>
+          </view>
+          <view class="top_box_text ">
+            <text>———</text>
+          </view>
         </view>
+        <block wx:for="{{cards}}" wx:for-item="item" wx:for-index="index" wx:key="index">
+          <view class="top_card ">
+            <view class="{{item.useObjectType==1?'top_card_box img1':item.useObjectType==2?'top_card_box img2':'top_card_box img3'}}">
+              <!-- class="{{['',item.useObjectType==1?'top_card_box img1':item.useObjectType==2?'top_card_box img2':'top_card_box img3']}}" -->
+              <view class="top_card_tite_box ">
+                <block wx:if="{{item.useObjectType==0}}">
+                  <view class="top_card_tite_a">全场通用</view>
+                </block>
+                <block wx:if="{{item.useObjectType==1}}">
+                  <view class="top_card_tite_b">品牌限定</view>
+                </block>
+                <block wx:if="{{item.useObjectType==2}}">
+                  <view class="top_card_tite_c">品类限定</view>
+                </block>
+                <block wx:if="{{item.useObjectType==11}}">
+                  <view class="top_card_tite_a">用途限定</view>
+                </block>
+                <block wx:if="{{item.useObjectType==12}}">
+                  <view class="top_card_tite_a">分类限定</view>
+                </block>
+              </view>
+              <block wx:if="{{item.isPack!=null}}">
+                <view class="top_card_counte">包邮券</view>
+              </block>
+              <block wx:else>
+                <view class="top_card_counte ">{{item.sum+"元券"}}</view>
+                <view class="top_card_remak ">{{"满"+item.buySum+"元可以用"}}</view>
+              </block>
+            </view>
+          </view>
+        </block>
+        <block wx:if="{{packShow}}">
+          <view class="vips">
+            <image class="lvip abs" src="{{iurl+'/miniapp/images/giftbag/vip05.png'}}" lazy-load="true"></image>
+            <image class="rvip abs" src="{{iurl+'/miniapp/images/giftbag/vip05.png'}}" lazy-load="true"></image>
+          </view>
+        </block>
+      </view>
     </view>
-    <view class="foot_empty "></view>
-    <view class="foot_button">
-        <view class="{{receiveState=='已领取'?'foot_button_notbuy':'foot_button_buy'}}" bindtap="GetReceive">
-            <text>{{receiveState}}</text>
+  </block>
+  <block wx:if="{{packShow}}">
+    <view>
+      <view class="top ">
+        <view class="top_box ">
+          <view class="top_box_text ">
+            <text>———</text>
+          </view>
+          <view class="top_box_text ">
+            <text>新人专享福利</text>
+          </view>
+          <view class="top_box_text ">
+            <text>———</text>
+          </view>
         </view>
+        <block wx:if="{{integralShow}}">
+          <view>
+            <view class="top_box_image ">
+              <image src="{{iurl+'/miniapp/images/giftbag/vip06.jpg'}}" lazy-load="true"></image>
+              <button>{{integralTitle}}</button>
+            </view>
+          </view>
+        </block>
+        <block wx:if="{{growUpShow}}">
+          <view>
+            <view class="top_box_image fs36">
+              <image src="{{iurl+'/miniapp/images/giftbag/vip07.jpg'}}" lazy-load="true"></image>
+              <button>{{growUpTitle}}</button>
+            </view>
+          </view>
+        </block>
+      </view>
+    </view>
+  </block>
+  <block wx:if="{{textShow}}">
+    <view class="foot_box">
+      <view class="foot_box_title fs36">
+        <text>活动规则:</text>
+      </view>
+      <view class="foot_box_text">
+        <rich-text nodes="{{textTitle}}" style="word-break:break-all;word-wrap:break-word"></rich-text>
+      </view>
+    </view>
+  </block>
+  <view class="button_box">
+    <view>
+      <button class="button" bindtap="goto" data-url="/pages/index/index/index">进入商城购物</button>
+    </view>
+    <view class="button_text ">
+      <text>本活动最终解释权归公司所有，如果有问题请联系客服</text>
+    </view>
+  </view>
+  <view class="foot_empty "></view>
+  <view class="foot_button">
+    <view class="{{receiveState=='已领取'?'foot_button_notbuy':'foot_button_buy'}}" bindtap="GetReceive">
+      <text>{{receiveState}}</text>
     </view>
+  </view>
 </view>
 <!-- 引入提示组件 -->
 <warn id="warn"></warn>