Merge branch 'dev_wm' into 'master'

森林状态

See merge request !160

H5/src/config/grade.js

@@ -30,8 +30,8 @@ export let diffrentOflevel = {
   ],
   1: [
     {
-      label: getDesOfield["differenceAmount"],
-      field: "differenceAmount",
+      label: getDesOfield["recommendDifferenceSeedling"],
+      field: "recommendDifferenceSeedling",
       type: "amount",
       index: 1
     }

H5/src/views/grade.vue

@@ -31,7 +31,7 @@
       <div class="level-progress">
         <div class="level-num">Lv.{{ userLevel }}</div>
         <van-progress :percentage="perenct * 100" />
-        <div class="level-num">Lv.{{ nextLevel + 1 }}</div>
+        <div class="level-num">Lv.{{ userLevel + 1 }}</div>
       </div>
       <!-- <div class="relegation">保级还需增加￥{{ relegationNum }} 业绩</div> -->
     </div>
@@ -114,7 +114,7 @@ export default {
       this.$router.push({ name: urlName });
     },
     getstatus() {
-      const userId = JSON.parse(localStorage.getItem("user")).userId;
+      const userId = 13933770003;
       const _this = this;
       getForestStatus(userId)
         .then(res => {
@@ -146,7 +146,11 @@ export default {
         let desObj = {};
         if (diffrentMap) {
           diffrentMap.forEach(v => {
-            v.value = data.differenceMap[v.field];
+              if(v.label == "差额"){
+                  v.value = data.differenceMap.differenceAmount;
+              }else {
+                  v.value = data.differenceMap.recommendDifferenceSeedling;
+              }
             if (desObj[v.type]) {
               desObj[v.type].push(v);
             } else {