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

后端开发-许程
2 parents 3a63cfb4 28750010
Showing 5 changed files with 33 additions and 39 deletions
pages/giftpack/birthdaygift/birthdaygift.wxml
pages/giftpack/evaluategift/evaluategift.js
pages/giftpack/evaluategift/evaluategift.wxml
pages/giftpack/festival/festival.js
pages/giftpack/festival/festival.wxml
@@ -173,7 +173,7 @@
     </block>
     <block wx:else>
     <view class="foot_button_buy'}}" bindtap="GetReceive">
-        <text>一键领取</text>
+        <text>一键全部领取</text>
       </view>
     </block>
   </view>
@@ -110,7 +110,7 @@ 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"')
           })
         }
       } else {
@@ -136,11 +136,7 @@ Page({
     th.GetList();
   },
   onShow: function() {
-    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;
@@ -152,7 +152,7 @@
         <text>活动规则:</text>
       </view>
       <view class="foot_box_text">
-        <rich-text nodes="{{textTitle}}"></rich-text>
+        <rich-text nodes="{{textTitle}}" style="word-break:break-all;word-wrap:break-word"></rich-text>
       </view>
     </view>
   </block>
@@ -173,7 +173,7 @@
     </block>
     <block wx:else>
       <view class="foot_button_buy'}}" bindtap="GetReceive">
-        <text>一键领取</text>
+        <text>一键全部领取</text>
       </view>
     </block>
   </view>
@@ -19,7 +19,7 @@ Page({
     getActId: '',
     getActType: '',
     giftID: '',
-    receiveState: '一键全部领取',
+    receiveState: 0,
     textTitle: '',
     getUrl: '',
     noShow: false,
@@ -39,6 +39,7 @@ Page({
     })
     var url = "/api/weshop/marketing/giftbag/bound/get";
     getApp().request.promiseGet(url, {
+      isShowLoading: true,
       data: {
         "actId": th.data.getActId, //活动id
         "actType": 3, //活动类型 1新人礼 2评价有礼 3节日营销 4生日营销
@@ -47,7 +48,6 @@ 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) {
           //礼包内容--礼券
@@ -96,18 +96,18 @@ Page({
         })
         if (res.data.data.receiveState == 0) {
           th.setData({
-            receiveState: '一键全部领取'
+            receiveState: 0
           })
         } else {
           th.setData({
-            receiveState: '已领取'
+            receiveState: 1
           })
         }
         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"')
           })
         }
       } else {
@@ -127,18 +127,11 @@ Page({
     th.GetList();
   },
   onShow: function() {
-    var th = this;
-    var textTitle = th.data.textTitle.replace(/<img/gi, '<img style="max-width:100%;height:auto;float:left;display:block" ');
-    th.setData({
-      textTitle: textTitle
-    })
+
   },
   GetReceive: function() {
     var th = this;
-    wx.showLoading({
-      title: '加载中',
-    })
-    if (th.data.receiveState == '已领取') {
+    if (th.data.receiveState) {
       return false;
     }
     var is_sub = th.data.is_sub; //判断是否重复提交
@@ -155,28 +148,26 @@ Page({
       }
       var data = JSON.stringify(json);
       var url = th.data.url + "/api/weshop/marketing/free/receive/gift/record/insert";
-      wx.request({
-        url: url,
-        data: data,
-        method: 'post',
-        header: {
-          'content-type': 'application/json'
-        }, // 设置请求的 header
-        success: function(res) {
-          wx.hideLoading();
+      getApp().request.json_post(url, json,
+        function (res) {
           th.setData({
             is_sub: 0
           })
           if (res.data.code == 0) {
             th.setData({
-              receiveState: '已领取'
+              receiveState: 1
             })
             getApp().my_warnning("领取成功", 1, th);
           } else {
-            getApp().my_warnning("系统繁忙,请稍后再试", 0, th);
+            getApp().my_warnning(res.data.msg, 0, th);
           }
+        },
+        function (res) {
+
         }
-      })
+
+      )
+
     }
   },
   //获取节日有礼信息
@@ -147,7 +147,7 @@
         <text>活动规则:</text>
       </view>
       <view class="foot_box_text">
-        <rich-text nodes="{{textTitle}}"></rich-text>
+        <rich-text nodes="{{textTitle}}" style="word-break:break-all;word-wrap:break-word"></rich-text>
       </view>
     </view>
   </block>
@@ -161,9 +161,16 @@
   </view>
   <view class="foot_empty "></view>
   <view class="foot_button">
-    <view class="{{receiveState=='已领取'?'foot_button_notbuy':'foot_button_buy'}}" bindtap="GetReceive" style="background-color:{{actFontColor!='' && actFontColor!=undefined?actFontColor:''}}">
-      <text>{{receiveState}}</text>
-    </view>
+    <block wx:if="{{receiveState}}">
+      <view class="foot_button_notbuy">
+        <text>已领取</text>
+      </view>
+    </block>
+    <block wx:else>
+      <view class="foot_button_buy'}}" bindtap="GetReceive">
+        <text>一键全部领取</text>
+      </view>
+    </block>
   </view>
 </view>
 <!-- 引入提示组件 -->