Merge remote-tracking branch 'origin/dev-yc' into dev

pages/frontend/skill_cert/profile.vue

@@ -28,7 +28,7 @@
     </div>
     <div class="field-selector">
       <span class="selector-title">选择领域:</span>
-      <div :class="['fields',item.disabled?'tag--disabled':'']" v-for="(item) in fields" :key="item.occupation_id"
+      <div v-for="(item) in fields" :class="['fields',item.disabled?'tag--disabled':'']" :key="item.occupation_id"
            @click="onFieldSelected(item.occupation_id)">
         <div class="tag" v-if="item.selected">
           <span class="text">{{item.occupation_name}}</span>
@@ -324,12 +324,27 @@
       async getDetail() {
         let res = await this.$axios.$post(`/uapi/cert/info`);
         this.form = res.data;
-        this.flowList = this.flowList.map((ele, index) => {
-          if (index < parseInt(this.form.step)) {
-            ele.selected = true;
+        if (this.form.step !== 1) {
+          switch (this.form.step) {
+            case 2:
+              await this.$router.push(`/frontend/skill_cert/resume_improve`);
+              break;
+            case 3:
+              await this.$router.push(`/frontend/skill_cert/ready_interview`);
+              break;
+            case 4:
+              await this.$router.push(`/frontend/skill_cert/start_interview`);
+              break;
           }
-          return ele;
-        })
+          return true;
+        }
+
+        // this.flowList = this.flowList.map((ele, index) => {
+        //   if (index < this.form.step) {
+        //     ele.selected = true;
+        //   }
+        //   return ele;
+        // })
         if (this.form.occupation_id) {
           this.fields = this.fields.map((ele) => {
             ele.selected = this.form.occupation_id === ele.occupation_id;
@@ -348,11 +363,12 @@
               name: imageUrl,
               url: this.form.img,
               response: {
-                filename: imageUrl
+                filename: ele
               }
             }
           })
         }
+        return false;
       },
       bindCallback() {
         if (this.mobile) {
@@ -362,7 +378,10 @@
     },
     async mounted() {
       await this.getOccupation();
-      await this.getDetail();
+      const intercept = await this.getDetail();
+      if (intercept) {
+        return
+      }
       await this.getLevels();
       await this.getSkills();
       this.bindCallback();