Merge branch 'dev_lqs' into 'master'

修改

See merge request !69

H5/src/components/BaseNavBar.vue

@@ -33,7 +33,8 @@ export default {
         "AirDrop",
         "Invite",
         "AboutUs",
-        "customerService"
+        "customerService",
+        "Wallet"
       ];
       if (whiteList.indexOf(currentPage) > -1) {
         try {

H5/src/views/aboutUs.vue

@@ -22,7 +22,7 @@
 
 <script>
 export default {
-  name: "instructions"
+  name: "AboutUs"
 };
 </script>
 

H5/src/views/airDropPool.vue

@@ -5,7 +5,7 @@
         name="arrow-left"
         size="20"
         class="nav-left"
-        @click="$router.go(-1)"
+        @click="handlerBack"
       />
       <span class="nav-title">空投池</span>
     </div>
@@ -40,7 +40,7 @@
 <script>
 import { queryAerialDelivery } from "@/api/airDropPool";
 export default {
-  name: "leagueNums",
+  name: "AirDrop",
   data() {
     return {
       total: 0,
@@ -52,6 +52,14 @@ export default {
     this.queryData();
   },
   methods: {
+    handlerBack() {
+      try {
+        this.$bridgeToAppFun.navigateBack();
+      } catch {
+        console.log("不能和App交互");
+        this.$router.go(-1);
+      }
+    },
     queryData() {
       const _this = this;
       queryAerialDelivery().then(res => {

H5/src/views/canCashOut.vue

@@ -38,7 +38,7 @@
 import { getWithdrawalAmount } from "@/api/wallet";
 
 export default {
-  name: "leagueNums",
+  name: "CanCashOut",
   data() {
     return {
       preNum: "125",

H5/src/views/customer-service.vue

@@ -28,7 +28,7 @@
 import { getCustomer } from "@/api/customer";
 
 export default {
-  name: "customerService",
+  name: "CustomerService",
   data() {
     return {
       imageUrl: ""

H5/src/views/grade.vue

@@ -5,7 +5,7 @@
         name="arrow-left"
         size="20"
         class="nav-left"
-        @click="$router.go(-1)"
+        @click="handlerBack"
       />
       <span class="nav-title">森林状态</span>
     </div>
@@ -33,7 +33,7 @@
         <van-progress :percentage="perenct * 100" />
         <div class="level-num">Lv.{{ nextLevel }}</div>
       </div>
-      <div class="relegation">保级还需增加￥{{ relegationNum }} 业绩</div>
+      <!-- <div class="relegation">保级还需增加￥{{ relegationNum }} 业绩</div> -->
     </div>
     <div class="forest-list">
       <div class="forest-item" v-for="(item, index) in list" :key="index">
@@ -57,7 +57,7 @@
 import { getForestStatus } from "@/api/grade";
 import { getLevelDes, getNextLevel, diffrentOflevel } from "@/config/grade";
 export default {
-  name: "grade",
+  name: "Grade",
   data() {
     return {
       userLevel: "",
@@ -103,6 +103,14 @@ export default {
     this.getstatus();
   },
   methods: {
+    handlerBack() {
+      try {
+        this.$bridgeToAppFun.navigateBack();
+      } catch {
+        console.log("不能和App交互");
+        this.$router.go(-1);
+      }
+    },
     handleUrl(urlName) {
       this.$router.push({ name: urlName });
     },

H5/src/views/instructions.vue

@@ -23,7 +23,7 @@
 
 <script>
 export default {
-  name: "instructions"
+  name: "Instructions"
 };
 </script>
 

H5/src/views/invite.vue

@@ -6,6 +6,7 @@
 <script>
 import { inviteCode } from "@/api/invite";
 export default {
+  name: "Invite",
   data() {
     return {
       imgSrc: ""

H5/src/views/leagueNums.vue

@@ -23,7 +23,7 @@
 <script>
 import { getMyTeam } from "@/api/grade";
 export default {
-  name: "leagueNums",
+  name: "LeagueNums",
   data() {
     return {
       list: [

H5/src/views/my/components/invitee.vue

@@ -30,8 +30,7 @@ export default {
       type: Object,
       default: () => {}
     }
-  },
-  data() {}
+  }
 };
 </script>
 

H5/src/views/my/myStatus.vue

@@ -168,7 +168,6 @@ export default {
           for (const key in res.data.myRecommed) {
             this.Tabs.forEach(el => {
               if (el.keyName === key) {
-                console.log(key);
                 el.num = res.data.myRecommed[key];
               }
             });

H5/src/views/register.vue

@@ -74,7 +74,7 @@
 import { smsCode } from "@/api/base";
 import { register } from "@/api/user";
 export default {
-  name: "register",
+  name: "Register",
   data() {
     return {
       form: {

H5/src/views/rewards/month-award.vue

@@ -5,7 +5,7 @@
         name="arrow-left"
         size="20"
         class="nav-left"
-        @click="$router.go(-1)"
+        @click="handlerBack"
       />
       <span class="nav-title">月度奖励</span>
     </div>
@@ -100,6 +100,14 @@ export default {
     this.getData();
   },
   methods: {
+    handlerBack() {
+      try {
+        this.$bridgeToAppFun.navigateBack();
+      } catch {
+        console.log("不能和App交互");
+        this.$router.go(-1);
+      }
+    },
     getData() {
       const params = {
         userId: this.$userId