Merge branch 'develop' of Software/android-cloud-H5 into release/v5.4.0

pages/activity/invite-user/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <v-container class="invite-user pa-0" fluid :class="`bg-${type}`">
+  <v-container class="invite-user" fluid :class="`bg-${type}`">
     <div class="box box1">
       <div class="box-header">参与步骤</div>
       <div class="box-main">
@@ -109,6 +109,7 @@
               </tbody>
             </table>
             <div
+              v-if="myActivationCode.length"
               v-intersect.quiet="codeLoadMoreIntersect"
               class="flex item-center justify-center"
             >
@@ -179,7 +180,10 @@ export default {
   name: 'InviteUser',
   filters: {
     activationCodeMask(value) {
-      return value.replace(/(?<=^.{4})(.*)(?=.{4}$)/, '***');
+      // 微信环境不支持此正则
+      // return value.replace(/(?<=^.{4})(.*)(?=.{4}$)/, '***');
+
+      return value.replace(/(.{4})(.*)(.{4}$)/, '$1***$3');
     },
   },
   // async asyncData({ $axios }) {
@@ -452,7 +456,10 @@ export default {
   background-size: 100% auto;
   // background-position-y: -44px;
   overflow: hidden;
-  padding-bottom: 30px;
+  padding: 0;
+  // padding-bottom: 30px;
+  padding-bottom: env(safe-area-inset-bottom, 30px);
+  background-color: #9525e3;
 
   &.bg-1 {
     background-image: url('~/assets/image/activity/invite-user/bg@2x.png');