注释掉选择项目页面的代码

src/views/SelectIdentity.vue

@@ -7,43 +7,31 @@
                 <p>可查看专项订单服务，使用职场小工具</p>
             </div>
     </a>-->
-<<<<<<< HEAD
-    <!-- <a v-if="company_num>0" class="si-child" id="dispatch-employee" @click="toIndex_click">
-=======
-    <a
+    <!-- <a
       v-if="!no_data"
       class="si-child"
       id="dispatch-employee"
       @click="toIndex_click"
     >
->>>>>>> 22148dfb71906f3bc049514c232d0815c1f37348
       <img src="../assets/images/agent/dispatch-employee.png" alt />
       <div class="si-child-desc">
         <h4>我是派遣员工</h4>
         <p>可查看编辑自己的劳务派遣员工档案信息</p>
       </div>
-<<<<<<< HEAD
-    </a>-->
-    <!-- <a class="si-child" id="flex-employee" @click="toFlex">
-=======
-    </a>
-    <a
+    </a> -->
+    <!-- <a
       class="si-child"
       id="flex-employee"
       v-if="!no_data"
       @click="toFlex_click"
     >
->>>>>>> 22148dfb71906f3bc049514c232d0815c1f37348
       <img src="../assets/images/agent/flex-employee.png" alt />
       <div class="si-child-desc">
         <h4>我是灵活用工人员</h4>
         <p>可查看灵活用工人员任务信息</p>
       </div>
-<<<<<<< HEAD
-    </a>-->
-=======
-    </a>
-    <a
+    </a> -->
+    <!-- <a
       class="si-child"
       id="flex-employee"
       v-if="no_data"
@@ -59,8 +47,7 @@
           去认证
         </p>
       </div>
-    </a>
->>>>>>> 22148dfb71906f3bc049514c232d0815c1f37348
+    </a> -->
   </div>
 </template>
 
@@ -89,13 +76,6 @@ export default class SelectIdentity extends Vue {
     return this.dispatch_list.length;
   }
 
-<<<<<<< HEAD
-  private toFlex(): void {
-    this.$router.push({
-      name: "FlexEmployee",
-      query: { id_no: this.id_no_encrytion },
-    });
-=======
   //跳转到灵活用工
   private toFlex_click(): void {
     if (this.id_no_encrytion) {
@@ -111,7 +91,6 @@ export default class SelectIdentity extends Vue {
         // on close
       });
     }
->>>>>>> 22148dfb71906f3bc049514c232d0815c1f37348
   }
   //劳务派遣的首页
   private toIndex(sp_id: string): void {
@@ -145,12 +124,6 @@ export default class SelectIdentity extends Vue {
       .then((res) => {
         if (res.data && res.data.uthStatus && res.data.uthStatus > 0) {
           this.id_no = res.data.personalIdCardNo;
-<<<<<<< HEAD
-          this.$router.push({
-            name: "FlexEmployee",
-            query: { id_no: encodeURI(window.btoa(this.id_no))},
-          });
-=======
           localStorage.setItem("id_no", res.data.personalIdCardNo);
           localStorage.setItem("name", res.data.personalName);
           localStorage.setItem("sex", res.data.sex);
@@ -160,19 +133,13 @@ export default class SelectIdentity extends Vue {
             const VConsole = require("vconsole");
             const my_console = new VConsole();
           }
->>>>>>> 22148dfb71906f3bc049514c232d0815c1f37348
         } else {
           //TODO: 跳转到实名认证
           this.no_data = true;
         }
       })
-<<<<<<< HEAD
-      .catch((err) => {
-        console.log("err=", err);
-=======
       .catch(err => {
         console.log("err=");
->>>>>>> 22148dfb71906f3bc049514c232d0815c1f37348
       });
   }