Merge branch 'dev5.9.3' into v5.9.3sdk

pages/activity/invite-user/components/BuyRecordList.vue

@@ -11,7 +11,7 @@
         <div class="body-text record-account">{{ item.newPhone | phone }}</div>
         <div class="body-text record-pay">¥{{ item.totalAmount }}</div>
         <div class="body-text record-time">{{ item.finishTime }}</div>
-        <div class="body-text record-back">¥{{ item.rakeBackAmount }}</div>
+        <div class="body-text record-back">¥{{ item.rakeBackAmount | keepTwo}}</div>
       </div>
     </div>
   </div>
@@ -30,6 +30,11 @@ export default {
     phone(val) {
       if (!val) return ''
       return val.slice(0, 3) + '****' + val.slice(7)
+    },
+    // 保留小数2位
+    keepTwo(val) {
+      if (!val) return ''
+      return Number(val).toFixed(2)
     }
   }
 }

pages/activity/invite-user/components/WithdrawalRecord.vue

@@ -7,7 +7,7 @@
     <div class="record-list">
       <div class="record-item" v-for="(item, index) in data" :key="index">
         <div class="record-title">{{ item.withdrawalTime }}</div>
-        <div class="record-time">¥{{ item.withdrawalMoney }}</div>
+        <div class="record-time">¥{{ item.withdrawalMoney | keepTwo}}</div>
       </div>
     </div>
   </div>
@@ -21,6 +21,13 @@ export default {
       type: Array,
       default: () => []
     }
+  },
+  filters: {
+    // 保留小数2位
+    keepTwo(val) {
+      if (!val) return ''
+      return Number(val).toFixed(2)
+    }
   }
 }
 </script>

pages/activity/invite-user/components/layout.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="layout" :class="{'layout-white': !false}">
-    <div style="height: 12.2666666667vw">
+    <div style="height: 12.2666666667vw" v-if="isShowNav">
       <van-nav-bar :title="title" left-arrow fixed @click-left="goBackFun">
         <template #right>
           <slot name="right"></slot>
@@ -17,7 +17,12 @@
 export default {
   name: 'layout',
   props: {
-    // 是否显示头部
+    // 是否显示头部nav
+    isShowNav: {
+      type: Boolean,
+      default: true
+    },
+    // navbar标题
     title: {
       type: String,
       default: '',

pages/activity/invite-user/invite-new-user.vue

@@ -1,14 +1,14 @@
 <template>
-  <layout title="邀请好友得现金" :isGoBack="true" padding="0">
+  <layout title="邀请好友得现金" :isGoBack="true" padding="0" :isShowNav="!$userAgent.isWx">
     <template #right>
       <!-- nav right -->
-      <img @click="onRightHandle" src="~assets/image/activity/invite-user/invite-new-user/nav-right.png" alt="">
+      <span @click="onRightHandle">活动规则</span>
     </template>
     <!-- 微信环境提示浏览器打开 -->
     <WxPopTpis v-if="isWeChatBrowser" />
 
     <!-- container -->
-    <div v-else class="invite-container">
+    <div class="invite-container">
       <!-- 分享按钮 -->
       <van-button @click="shareHandle" class="share-btn mb-8" round />
 
@@ -27,12 +27,12 @@
         </div>
         <div class="userinfo-detail">
           <div class="userinfo-detail-item pt-4 pr-3 pb-3 pl-3">
-            <div class="userinfo-detail-item-content">{{ inviteBuyAmount }}</div>
+            <div class="userinfo-detail-item-content">¥{{ inviteBuyAmount }}</div>
             <div class="userinfo-detail-item-title">累计邀请购买</div>
           </div>
           <div style="flex: 0 0 11px"></div>
           <div class="userinfo-detail-item pt-4 pr-3 pb-3 pl-3">
-            <div class="userinfo-detail-item-content">{{ accumulatedWithdrawal }}</div>
+            <div class="userinfo-detail-item-content">¥{{ accumulatedWithdrawal }}</div>
             <div class="userinfo-detail-item-title">累计提现</div>
           </div>
         </div>