From f2f30919daac6f577c5236785009c510ebb2ccb7 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期二, 07 十二月 2021 12:18:08 +0800
Subject: [PATCH] update#132068: 嚴選配對篩選後,進行預約,想要詢問的問題等沒有自動帶入

---
 PAMapp/pages/questionnaire/_agentNo.vue |   45 ++++++++++++++++++++++++++++++---------------
 1 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/PAMapp/pages/questionnaire/_agentNo.vue b/PAMapp/pages/questionnaire/_agentNo.vue
index 483d395..547af0a 100644
--- a/PAMapp/pages/questionnaire/_agentNo.vue
+++ b/PAMapp/pages/questionnaire/_agentNo.vue
@@ -128,13 +128,13 @@
 </template>
 
 <script lang="ts">
-  import { Vue, Component, namespace } from 'nuxt-property-decorator';
+  import { Vue, Component } from 'nuxt-property-decorator';
   import { addFavoriteConsultant, appointmentDemand, AppointmentParams, AppointmentRequests ,RegisterInfo } from '~/assets/ts/api/consultant';
-  import { getRequestsFromStorage, setRequestsToStorage } from '~/assets/ts/storageRequests';
+  import { getRequestsFromStorage, setRequestsToStorage, getRequestQuestionFromStorage, removeRequestQuestionFromStorage  } from '~/assets/ts/storageRequests';
   import { Gender } from '~/assets/ts/models/enum/Gender';
   import { ContactType } from '~/assets/ts/models/enum/ContactType';
   import _ from 'lodash';
-import { isLogin } from '~/assets/ts/auth';
+  import { isLogin } from '~/assets/ts/auth';
 
   @Component
   export default class Questionnaire extends Vue {
@@ -171,8 +171,8 @@
         label:'靽�瑼�/閬��',
       },
       {
-        title:'��������',
-        label:'��������',
+        title:'����',
+        label:'����',
       },
     ];
 
@@ -239,15 +239,15 @@
     ];
 
     myRequest: AppointmentRequests = {
-      phone: this.userInfo?.phone ? this.userInfo.phone :'',
-      email: this.userInfo?.email ? this.userInfo.email :'',
-      contactType: _.isEqual(this.userInfo?.contactType,ContactType.SMS) ? ContactType.PHONE : ContactType.EMAIL  ,
-      gender: '',
-      age: '',
-      job: '',
-      requirement: [],
+      phone          : this.userInfo?.phone ? this.userInfo.phone                               : '',
+      email          : this.userInfo?.email ? this.userInfo.email                               : '',
+      contactType    : _.isEqual(this.userInfo?.contactType,ContactType.SMS) ? ContactType.PHONE: ContactType.EMAIL,
+      gender         : '',
+      age            : '',
+      job            : '',
+      requirement    : [],
       hopeContactTime: [{
-        selectWeekOptions: [],
+        selectWeekOptions : [],
         selectTimesOptions: [],
       }],
       agentNo: '',
@@ -256,7 +256,7 @@
     showDrawer= false;
     sendReserve = false;
 
-    beforeRouteEnter (to, from, next) {
+    beforeRouteEnter(to: any, from: any, next: any) {
       next(vm => {
         if (from.name === 'login' && !isLogin()) {
           vm.$router.go(-1);
@@ -268,8 +268,15 @@
         }
       })
     }
-    mounted() {
+
+    mounted(): void {
+      this.setMyRequest();
+    }
+
+    private setMyRequest(): void {
       const storageMyRequest = getRequestsFromStorage();
+      const storageMyQuestion = getRequestQuestionFromStorage();
+
       if (storageMyRequest) {
         this.myRequest = {
           ...storageMyRequest,
@@ -281,6 +288,14 @@
                               }],
         };
       }
+
+      if (storageMyQuestion) {
+        this.myRequest = {
+          ...this.myRequest,
+          requirement: storageMyQuestion
+        }
+        removeRequestQuestionFromStorage();
+      }
     }
 
     get phoneValid(): boolean {

--
Gitblit v1.8.0