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

后端开发-许程
2 parents df10aa0b e3335a05
Showing 9 changed files with 83 additions and 160 deletions
pages/giftpack/buygiftpack/giftpackbuy.js
pages/giftpack/giftpacklist/giftpacklist.js
pages/giftpack/giftpacklist/giftpacklist.wxml
pages/giftpack/mygiftpack/mygiftpack.js
pages/giftpack/newvipgift/newvipgift.js
pages/user/assistance/giftpacklist.js
pages/user/assistance/giftpacklist.json
pages/user/assistance/giftpacklist.wxml
pages/user/assistance/giftpacklist.wxss
@@ -47,7 +47,6 @@ Page({
     var my_confirm = th.selectComponent("#my_confirm"); //组件的id
     var order_sn = e.currentTarget.dataset.order_sn; //订单号
     var money = e.currentTarget.dataset.money; //支付金额
-
     my_confirm.open(
       "是否确定购买该礼包",
       "取消",
@@ -57,9 +56,6 @@ Page({
       },
       function() {
         my_confirm.open_cancel(0);
-        wx.showLoading({
-          title: '加载中',
-        })
         var json = {
           "actId": '', //活动Id
           "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
@@ -99,37 +95,7 @@ Page({
           }
         )
-        wx.request({
-          url: url,
-          data: data,
-          method: 'post',
-          header: {
-            'content-type': 'application/json'
-          }, // 设置请求的 header
-          success: function(res) {
-            wx.hideLoading();
-            if (res.data.code == 0) {
-              var order_sn = res.data.data.orderSn;
-              res = res.data.data.result;
-              var url = "/pages/giftpack/payment/payment?money=" + money + "&order_sn=" + order_sn;
-              wx.requestPayment({
-                timeStamp: String(res.timeStamp),
-                nonceStr: res.nonceStr,
-                package: res.packageValue,
-                signType: res.signType,
-                paySign: res.paySign,
-                success: function(res) {
-                  getApp().goto(url);
-                },
-                fail: function(res) {
-                  getApp().my_confirm("取消支付", 0, th);
-                }
-              });
-            } else {
-              getApp().my_warnning(res.data.msg, 0, th);
-            }
-          }
-        })
+
       }
@@ -151,9 +117,6 @@ Page({
       },
       function() {
         my_confirm.open_cancel(0);
-        wx.showLoading({
-          title: '加载中',
-        })
         var json = {
           "actId": '', //活动Id
           "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
@@ -191,8 +154,7 @@ Page({
         page: th.data.pages,
         pageSize: th.data.pageSize
       },
-      success: function success(res) {
-        wx.hideLoading();
+      success: function(res) {
         if (res.data.code == 0) {
           th.data.curpage++;
           var arr1 = th.data.wareCard;
@@ -236,9 +198,7 @@ Page({
     var th = this;
     if (th.data.total <= th.data.pageSize) return;
     if (th.data.ismore) return;
-    wx.showLoading({
-      title: '加载中...',
-    })
+
     th.getList();
   },
   //图片失败，默认图片
@@ -61,7 +61,7 @@ Page({
       },
       function() {
         my_confirm.open_cancel(0);
-        
+
         var json = {
           "actId": '', //活动Id
           "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
@@ -74,36 +74,36 @@ Page({
         var data = JSON.stringify(json);
         var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
-        getApp().request.json_post(url,json,
-        function(res){
-          if (res.data.code == 0) {
-            var res = res.data.data;
-            var order_sn = res.orderSn;
-            var url = "/pages/giftpack/payment/payment?money=" + money + "&order_sn=" + order_sn;
-            wx.requestPayment({
-              timeStamp: String(res.result.timeStamp),
-              nonceStr: res.result.nonceStr,
-              package: res.result.packageValue,
-              signType: res.result.signType,
-              paySign: res.result.paySign,
-              success: function (n) {
-                getApp().goto(url);
-              },
-              fail: function (n) {
-                getApp().my_confirm("取消支付", 0, th);
-              }
-            });
-          } else {
-            getApp().my_warnning(res.data.msg, 0, th);
+        getApp().request.json_post(url, json,
+          function(res) {
+            if (res.data.code == 0) {
+              var res = res.data.data;
+              var order_sn = res.orderSn;
+              var url = "/pages/giftpack/payment/payment?money=" + money + "&order_sn=" + order_sn;
+              wx.requestPayment({
+                timeStamp: String(res.result.timeStamp),
+                nonceStr: res.result.nonceStr,
+                package: res.result.packageValue,
+                signType: res.result.signType,
+                paySign: res.result.paySign,
+                success: function(n) {
+                  getApp().goto(url);
+                },
+                fail: function(n) {
+                  getApp().my_confirm("取消支付", 0, th);
+                }
+              });
+            } else {
+              getApp().my_warnning(res.data.msg, 0, th);
+            }
+          },
+          function(res) {
+
           }
-        },
-        function(res){
-        }
+        )
-        ) 
-        
       }
@@ -136,18 +136,18 @@ Page({
         var data = JSON.stringify(json);
         var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
         getApp().request.json_post(url, json,
-          function (res) {
-              if (res.data.code == 0) {
-                getApp().my_warnning("兑换成功！", 1, th);
-              } else {
-                getApp().my_warnning(res.data.msg, 0, th);
-              }            
+          function(res) {
+            if (res.data.code == 0) {
+              getApp().my_warnning("兑换成功！", 1, th);
+            } else {
+              getApp().my_warnning(res.data.msg, 0, th);
+            }
           },
-          function (res) {
+          function(res) {
           }
-        ) 
+        )
       })
@@ -156,13 +156,13 @@ Page({
     var _this = this;
     var th = this;
     getApp().request.get('/api/weshop/marketing/my/giftbag/detail/get', {
+      isShowLoading: true,
       data: {
         "storeId": a.stoid, //商家ID
         "userId": d.user_id, //用户ID
         "orderSn": th.data.orderSn
       },
-      success: function success(res) {
-        wx.hideLoading();
+      success: function(res) {
         if (res.data.code == 0) {
           th.setData({
             giftImage: th.data.iurl + res.data.data.lbUrl,
@@ -224,6 +224,7 @@ Page({
     var _this2 = this;
     var th = this.data;
     getApp().request.get('/api/weshop/marketing/giftbag/detail/get', {
+      isShowLoading: true,
       data: {
         "storeId": a.stoid, //商家ID
         "userId": d.user_id, //用户ID
@@ -278,9 +279,6 @@ Page({
   //获取核销码
   getcode: function() {
     var th = this;
-    wx.showLoading({
-      title: '加载中',
-    })
     var orderSn = th.data.orderSn; //订单号
     var json = {
       "storeId": a.stoid,
@@ -288,15 +286,8 @@ Page({
     };
     var data = JSON.stringify(json);
     var url = th.data.url + "/api/weshop/marketing/gift/goods/verify/code/get"; //预约接口地址
-    wx.request({
-      url: url,
-      data: data,
-      method: 'put',
-      header: {
-        'content-type': 'application/json'
-      }, // 设置请求的 header
-      success: function(res) {
-        wx.hideLoading();
+    getApp().request.json_post(url, json,
+      function(res) {
         if (res.data.code == 0) {
           th.setData({
             code: res.data.data
@@ -305,8 +296,14 @@ Page({
         } else {
           getApp().my_warnning(res.data.msg, 0, th);
         }
-      }
-    })
+      },
+      function(res) {
+
+      },
+      "put"
+
+    )
+
   },
   //界面跳转
   goto: function(e) {
@@ -37,7 +37,7 @@
       <text class="data-v-3a5b7e36">礼包内容</text>
     </view>
     <block wx:for="{{wareCard}}" wx:for-item="item" wx:for-index="index" wx:key="index">
-      <view class="box_ware_box data-v-3a5b7e36">
+      <view wx:if="{{item.couponName!=undefined}}" class="box_ware_box data-v-3a5b7e36">
         <view class="box_ware_img data-v-3a5b7e36">
           <block wx:if="{{item.lbType==1}}">
             <image src="{{item.wareImage==''?iurl+'/miniapp/images/giftbag/gift01.png':iurl+item.wareImage}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].wareImage"></image>
@@ -52,7 +52,6 @@ Page({
         pageSize: th.data.pageSize
       },
       success: function success(res) {
-        wx.hideLoading();
         if (res.data.code == 0) {
           th.data.curpage++;
           var arr1 = th.data.wareCard;
@@ -97,9 +96,6 @@ Page({
     var th = this;
     if (th.data.total <= th.data.pageSize) return;
     if (th.data.ismore) return;
-    wx.showLoading({
-      title: '加载中...',
-    })
     th.getList();
   },
   //图片失败，默认图片
@@ -33,10 +33,8 @@ Page({
   GetList: function() {
     var th = this;
     var url = "/api/weshop/marketing/giftbag/bound/get";
-    wx.showLoading({
-      title: '加载中',
-    })
     getApp().request.promiseGet(url, {
+      isShowLoading: true,
       data: {
         "actId": th.data.getActId, //活动id
         "actType": 1, //活动类型 1新人礼 2评价有礼 3节日营销 4生日营销
@@ -45,7 +43,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) {
           //礼包内容--礼券
@@ -137,9 +134,6 @@ Page({
       th.setData({
         is_sub: 1
       })
-      wx.showLoading({
-        title: '加载中',
-      })
       var json = {
         "actId": th.data.getActId, //活动Id
         "actType": 1, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
@@ -149,15 +143,8 @@ 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
           })
@@ -169,8 +156,13 @@ Page({
           } else {
             getApp().my_warnning(res.data.msg, 0, th);
           }
-        }
-      })
+        },
+        function(res) {
+
+        }, "post"
+
+      )
+     
     }
   },
   //界面跳转
@@ -32,11 +32,7 @@ Page({
   onLoad: function (options) {
     var th = this;
     th.setData({
-      isBuy: options.isBuy,
-      getStorageID: a.stoid,
-      getUserID: d.user_id,
       getGiftID: options.lbId,
-      orderSn: options.orderSn
     })
     if (options.isBuy == 0) {
       th.GetMyGiftList();
@@ -6,4 +6,4 @@
     "qr_code": "/components/qr_code/qr_code",
     "nav_b": "/components/nav_b/nav_b"
   }
-}
 \ No newline at end of file
+} 
 \ No newline at end of file
@@ -99,48 +99,30 @@
     </view>
   </view>
   <view class="foot_empty data-v-3a5b7e36"></view>
-  <block wx:if="{{isBuy==1}}">
-    <view class="foot_button data-v-3a5b7e36">
-      <block wx:if="{{giftPrice>0&&giftIntegral>0}}">
-        <view class="foot_button_left data-v-3a5b7e36" data-id="{{lbId}}" bindtap="GetBuyPrice">
-          <text class="data-v-3a5b7e36">立即购买</text>
-        </view>
-      </block>
-      <block wx:if="{{giftPrice>0 && giftIntegral>0}}">
-        <view class="foot_button_right data-v-3a5b7e36" bindtap="GetBuyIntegral" data-id="{{lbId}}">
-          <text class="data-v-3a5b7e36">立即兑换</text>
-        </view>
-      </block>
-      <block wx:if="{{giftPrice>0 && giftIntegral<=0}}">
-        <view class="foot_button_buy data-v-3a5b7e36" bindtap="GetBuyPrice" data-id="{{lbId}}">
-          <text class="data-v-3a5b7e36">立即购买</text>
-        </view>
-      </block>
-      <block wx:if="{{giftPrice<=0 && giftIntegral>0}}">
-        <view class="foot_button_intalge data-v-3a5b7e36" bindtap="GetBuyIntegral" data-id="{{lbId}}">
-          <text class="data-v-3a5b7e36">立即兑换</text>
-        </view>
-      </block>
-    </view>
-  </block>
   <block wx:if="{{isBuy==0}}">
     <view class="foot_button data-v-3a5b7e36">
-      <block wx:if="{{is_lb!=1}}">
-        <view class="foot_button_buy data-v-3a5b7e36 overdue">
-          <text class="data-v-3a5b7e36">无核销商品</text>
+      <block wx:if="{{true}}">
+        <view wx:if="{{c_state==0}}" class="foot_button_buy data-v-3a5b7e36" bindtap="getcode">
+          <text class="data-v-3a5b7e36">一键领取</text>
         </view>
       </block>
       <block wx:else>
-        <view wx:if="{{c_state==0}}" class="foot_button_buy data-v-3a5b7e36" bindtap="getcode">
-          <text class="data-v-3a5b7e36">立即使用</text>
-        </view>
-        <view wx:if="{{c_state==1}}" class="foot_button_buy data-v-3a5b7e36 overdue">
-          <text class="data-v-3a5b7e36">商品已核销</text>
-        </view>
-        <view wx:if="{{c_state==2}}" class="foot_button_buy data-v-3a5b7e36 overdue">
-          <text class="data-v-3a5b7e36">商品兑换时间已过</text>
-        </view>
-
+        <block wx:if="{{is_lb!=1}}">
+          <view class="foot_button_buy data-v-3a5b7e36 overdue">
+            <text class="data-v-3a5b7e36">无核销商品</text>
+          </view>
+        </block>
+        <block wx:else>
+          <view wx:if="{{c_state==0}}" class="foot_button_buy data-v-3a5b7e36" bindtap="getcode">
+            <text class="data-v-3a5b7e36">立即使用</text>
+          </view>
+          <view wx:if="{{c_state==1}}" class="foot_button_buy data-v-3a5b7e36 overdue">
+            <text class="data-v-3a5b7e36">商品已核销</text>
+          </view>
+          <view wx:if="{{c_state==2}}" class="foot_button_buy data-v-3a5b7e36 overdue">
+            <text class="data-v-3a5b7e36">商品兑换时间已过</text>
+          </view>
+        </block>
       </block>
     </view>
   </block>
-@charset "UTF-8";
+ @charset "UTF-8";
 /* Author XGQ
  * 2019-12-12