zhashaonan 6 年之前
父節點
當前提交
4a089b221b

+ 14 - 3
pages/confirmOrder/confirmOrder.js

@@ -137,10 +137,9 @@ Page({
 
     let ifcart = cart_id ? 1 : 0
     let cartids = cart_id ? cart_id : (goods_id + '|' + goods_num)
-    getReq({
+    let params = {
       act: 'member_buy',
       op: 'step_second',
-      // payment: 'jspay',
       payment: 'minipay',
       usebonus: 1,
       ifcart,
@@ -150,7 +149,19 @@ Page({
       vat_hash,
       offpay_hash,
       offpay_hash_batch
-    }, function (res) {
+    }
+    let options = {
+      room_id: 0
+    }
+    if (this.data.datas['rooms']&&this.data.datas['rooms'].length) {
+      options = {
+        room_id: this.data.datas['rooms'][0]['room_id']
+      }
+    }
+    params = Object.assign({}, options, params);
+
+
+    getReq(params, function (res) {
       wx.hideLoading()
       if (res.code == 200) {
         let param = res.datas.param.data

+ 2 - 2
pages/confirmOrder/confirmOrder.wxml

@@ -105,11 +105,11 @@
       <view class="">- ¥ {{opgoods_discount}}</view>
     </view>
 
-    <view class="expenses_info" wx:for="{{datas.payinfo['bonus_rates']}}" wx:for-index="idx" wx:key="idx">
+    <view class="expenses_info" wx:if="{{datas['payinfo']['user_bonus'] > 0}}">
       <view>
         <text class="col666">红包抵扣</text>
       </view>
-      <view class="">- ¥ {{item.total}}</view>
+      <view class="">- ¥ {{datas['payinfo']['user_bonus']}}</view>
     </view>
 
     <view class="expenses_info" wx:if="{{room_bonus}}">

+ 1 - 1
pages/orderPaySn/orderPaySn.wxml

@@ -44,7 +44,7 @@
       <view class="">- ¥ {{opgoods_discount}}</view>
     </view>
 
-    <view class="expenses_info" wx:if="{{user_bonus}}">
+    <view class="expenses_info" wx:if="{{user_bonus > 0}}">
       <view class="col666">红包抵扣</view>
       <view class="">- ¥ {{user_bonus}}</view>
     </view>

+ 4 - 1
pages/person/person.js

@@ -69,6 +69,9 @@ Page({
     if(!app.globalData.userInfo) {
       return;
     }
+    this.setData({
+      userInfo: app.globalData.userInfo
+    })
     let fromSource = this.data.fromSource
     if(this.data.firstLoad) {
       fromSource = recordSource(app, `act=member_order&op=orderCountState&client_type=mini`)
@@ -90,7 +93,7 @@ Page({
       if (res.code == 200) {
         self.setData({
           userInfo: { nickName, avatarUrl },
-          bonus_rate: res.datas.bonus_rate,
+          bonus_rate: res.datas&&res.datas.bonus_rate || 0,
           firstLoad: false
         })
       }