Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss_wx_app

package-basic-data/pages/draw-bill/add/add.js

@@ -250,7 +250,7 @@ Page({
         })
  
         let prevPage3 = pages[pages.length - 3];
-        prevPage.setData({
+        prevPage3.setData({
             refreshByAdd: true,
         })
 

package-basic-data/pages/historical-purchase-history/detail/detail.js

@@ -79,7 +79,7 @@ Page({
                 },
                 {
                     code: 'receiptAmt',
-                    type: 'str',
+                    type: 'number',
                     readonly: true,
                     title: mixins.$t('totalInvoiceAmount')
                 }

package-basic-data/pages/historical-purchase-history/historical-purchase-history.json

@@ -1,4 +1,4 @@
 {
     "usingComponents": {},
-    "navigationBarTitleText": "历史购买记录"
+    "navigationBarTitleText": "购买记录"
 }

package-basic-data/pages/sign-share-detail/coupon-detail.wxml

@@ -43,18 +43,18 @@
     <view class="item-card">
       <view class="list-item" wx:for="{{itemList}}" wx:for-index="index" wx:for-item="item">
         <view>
-          <view class="item-type">{{'助力'}}</view>
+          <view class="item-type">{{item.tradeType? item.tradeType: '助力'}}</view>
           <view class="item-info">{{item.receiveDate}}/{{item.useStaff}}</view>
         </view>
         <view class="integral-value">
           {{item.couponName}}
-          <view class="date" wx:if="{{ saleStatus === Constants.couponStatus.use}}">
+          <view class="date" wx:if="{{ saleStatus === '使用'}}">
             使用时间{{item.useDate}}
           </view>
-          <view class="date" wx:if="{{ saleStatus === Constants.couponStatus.unused}}">
+          <view class="date" wx:if="{{ saleStatus === '未使用'}}">
             有效期至{{item.receiveDate + item.useValidDays}}
           </view>
-          <view class="date" wx:if="{{ saleStatus === Constants.couponStatus.expired}}">
+          <view class="date" wx:if="{{ saleStatus === '失效'}}">
             失效时间{{item.receiveDate + item.useValidDays}}
           </view>
         </view>

package-basic-data/pages/sign-share-history/coupon-receive-history.js

@@ -17,7 +17,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    needHelpUserNumber: 5,
+    needHelpUserNumber: 2,
     // 路由
     routeObjName: 'couponSend',
     itemList:[],

package-basic-data/pages/sign-share-history/coupon-receive-history.wxml

@@ -17,7 +17,7 @@
       <view class="user-info">
         <view class="time-view">{{item.sendDate}}/{{item.sendStaff?item.sendStaff:''}}</view>
         <view class="state-view">
-          {{item.couponReceiveCount == item.userNum?'助力成功':(item.endDate>item.nowDate? '助力中': '助力失败')}}
+          {{!(item.couponReceiveCount < item.userNum)?'助力成功':(item.endDate>item.nowDate? '助力中': '助力失败')}}
         </view>
       </view>
     </view>

pages/mine/mine.wxml

@@ -169,7 +169,7 @@
     
      <!--历史购买记录-->
      <view class="todo-view" style="display: flex;justify-content:space-between;align-items: center;margin-bottom: 4rpx;" catch:tap="toInvoicing">
-      <view class="todo-view-title">历史购买记录</view>
+      <view class="todo-view-title">购买记录</view>
       <view style="display: flex;justify-content:center;align-items: center;">
         <view style="font-size: 11px;">开具发票</view> 
       </view>