Merge branch 'master' of http://gitlab.corp.qinqinxiaobao.com:9880/frontend_vue/qqxb-self-service

src/views/Index.vue

@@ -73,7 +73,7 @@
         />
         />
       </router-link>
       </router-link>
 
 
-      <router-link   class="entrance"  :to="`/PaySlips?sp_id=${sp_id}&id_no=371327198511175134`"  >
+      <router-link   class="entrance"  :to="`/PaySlips?sp_id=${sp_id}&id_no=${id_no}`"  >
         <img
         <img
           src="../assets/images/slips_icon.png"
           src="../assets/images/slips_icon.png"
           alt="我的工资条"
           alt="我的工资条"
@@ -115,6 +115,7 @@ export default class Index extends Vue {
   private ed_id: string = "";
   private ed_id: string = "";
   private showPopup: boolean = true;
   private showPopup: boolean = true;
   private expand: boolean = true;
   private expand: boolean = true;
+  private id_no_decode:string="";
 
 
   get popupStyle() {
   get popupStyle() {
     if (this.expand) {
     if (this.expand) {
@@ -130,6 +131,7 @@ export default class Index extends Vue {
 
 
   created() {
   created() {
     const id_no = this.$route.query.id_no as string;
     const id_no = this.$route.query.id_no as string;
+    this.id_no_decode=id_no;
     this.id_no = window.atob(encodeURI(id_no));
     this.id_no = window.atob(encodeURI(id_no));
     this.sp_id = this.$route.query.sp_id as string;
     this.sp_id = this.$route.query.sp_id as string;
 
 

src/views/SelectIdentity.vue

@@ -44,6 +44,7 @@ export default class SelectIdentity extends Vue {
   private id_no: string = "";
   private id_no: string = "";
   private dispatch_list: any[] = [];
   private dispatch_list: any[] = [];
   private no_data: boolean = false;
   private no_data: boolean = false;
+  private loading:any;
 
 
   get id_no_encrytion(): string {
   get id_no_encrytion(): string {
     return encodeURI(window.btoa(this.id_no));
     return encodeURI(window.btoa(this.id_no));
@@ -122,6 +123,7 @@ export default class SelectIdentity extends Vue {
       .then(res => {
       .then(res => {
         console.log("getDispatchList res=", res);
         console.log("getDispatchList res=", res);
         this.dispatch_list = res;
         this.dispatch_list = res;
+        this.loading.clear();
       })
       })
       .catch(err => {
       .catch(err => {
         console.log("err=", err);
         console.log("err=", err);
@@ -129,6 +131,10 @@ export default class SelectIdentity extends Vue {
   }
   }
 
 
   async created() {
   async created() {
+    this.loading=Toast.loading({
+      message: "加载中...",
+      forbidClick: true
+    });
     await this.getUserInfo();
     await this.getUserInfo();
     if (this.id_no) {
     if (this.id_no) {
       await this.getDispatchList();
       await this.getDispatchList();