Merge branch 'dev_wm' into 'master'

进步奖

See merge request !163

H5/src/views/grade.vue

@@ -68,7 +68,6 @@ export default {
       nextLevel: "",
       perenct: 0,
       diffrentMap: {},
-        userId: JSON.parse(localStorage.getItem("user")).userId,
       type: ["amount", "recommend", "team"],
       list: [
         {
@@ -100,7 +99,7 @@ export default {
       ]
     };
   },
-  mounted() {
+   created() {
     this.getstatus();
   },
   methods: {
@@ -115,7 +114,7 @@ export default {
       this.$router.push({ name: urlName });
     },
     getstatus() {
-      const userId = this.userId;
+      const userId = JSON.parse(localStorage.getItem("user")).userId;
       const _this = this;
       getForestStatus(userId)
         .then(res => {

H5/src/views/rewards/fastest-progress.vue

@@ -82,7 +82,13 @@ export default {
       getProgressPrizes().then(res => {
         if (res.code === 0) {
           _this.growthTotal = res.data.growthTotal;
-          _this.prizeVos = res.data.prizeVos;
+            _this.prizeVos = res.data.prizeVos.map(item => {
+                const temp = item;
+                temp.userId =
+                    item.userId.substring(0, 3) + "****" + item.userId.substring(7);
+                return temp;
+            });
+         // _this.prizeVos = res.data.prizeVos;
         } else {
           _this.growthTotal = 0;
           _this.prizeVos = [];