From e2a3382adf6c7d5268d722681130c8c86f0aae83 Mon Sep 17 00:00:00 2001
From: jack <jack.su@pollex.com.tw>
Date: 星期三, 27 七月 2022 16:28:13 +0800
Subject: [PATCH] Merge branch 'Phase3' of ssh://dev.pollex.com.tw:29418/pcalife/PAM into Phase3

---
 PAMapp/pages/login/index.vue |   19 +++++----
 PAMapp/plugins/gtm.js        |    3 +
 PAMapp/package.json          |    1 
 PAMapp/nuxt.config.js        |   40 ++++++++++++++++++-
 PAMapp/static/favicon.ico    |    0 
 5 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/PAMapp/nuxt.config.js b/PAMapp/nuxt.config.js
index 64cc92d..3297a96 100644
--- a/PAMapp/nuxt.config.js
+++ b/PAMapp/nuxt.config.js
@@ -55,12 +55,46 @@
     '@nuxtjs/axios',
     '@nuxtjs/style-resources',
     ['@nuxtjs/dotenv', { filename: '.env.' + process.env.ENV }],
-
+    '@nuxtjs/gtm',
   ],
 
   // Modules: https://go.nuxtjs.dev/config-modules
-  modules: [
-  ],
+  // modules: [
+  //   '@nuxtjs/gtm',
+  // ],
+  
+  // plugins: [
+  //   '~/plugins/gtm'
+  //  ],
+  gtm: {
+    enabled: true, /* see below */
+    debug: false,
+
+    id: 'GTM-W2XMVJZ',
+    layer: 'dataLayer',
+    variables: {},
+
+    pageTracking: true,
+    pageViewEventName: 'nuxtRoute',
+
+    autoInit: true,
+    respectDoNotTrack: true,
+
+    scriptId: 'gtm-script',
+    scriptDefer: false,
+    scriptURL: 'https://www.googletagmanager.com/gtm.js',
+    crossOrigin: false,
+
+    noscript: true,
+    noscriptId: 'gtm-noscript',
+    noscriptURL: 'https://www.googletagmanager.com/ns.html'
+  },
+
+  publicRuntimeConfig: {
+    gtm: {
+      id: process.env.GOOGLE_TAG_MANAGER_ID
+    }
+  },
 
   // Build Configuration: https://go.nuxtjs.dev/config-build
   build: {
diff --git a/PAMapp/package.json b/PAMapp/package.json
index 8f5814d..db09f1f 100644
--- a/PAMapp/package.json
+++ b/PAMapp/package.json
@@ -15,6 +15,7 @@
   },
   "dependencies": {
     "@nuxtjs/axios": "^5.13.6",
+    "@nuxtjs/gtm": "^2.4.0",
     "@nuxtjs/style-resources": "^1.2.1",
     "@types/swiper": "^5.4.3",
     "core-js": "^3.18.3",
diff --git a/PAMapp/pages/login/index.vue b/PAMapp/pages/login/index.vue
index 7b14692..0297782 100644
--- a/PAMapp/pages/login/index.vue
+++ b/PAMapp/pages/login/index.vue
@@ -58,9 +58,9 @@
             </div>
           </div>
 
-          <div class="pam-paragraph">
+          <div class="pam-paragraph" v-if="(!showPhoneOtpCodeField && !showEmailVerifyField)">
             <div class="pam-consultant-login__title">
-              <div>撽�Ⅳ <span class="text--dark-blue fs-16">(����之撠神)</span></div>
+              <div>�����Ⅳ <span class="text--dark-blue fs-16">(����之撠神)</span></div>
               <div class="text--primary fs-16 cursor--pointer fix-chrome-click--issue"
                 style="margin-left: 16px"
                 @click="regenerateImgOfVerification">������</div>
@@ -113,17 +113,18 @@
                     v-if="otpResendCounter !== 0"
                   >({{ otpResendCounter }})</span>
                 </el-button>
+
               </el-row>
             </div>
 
             <el-row>
               <el-button
                   v-if="onPhoneVerifyStep === 'APPLY_OTP'"
-                  :disabled="!phoneNumber || !phoneValid || !verificationCode || verificationCode.length !== 4"
+                  :disabled="!phoneNumber || !phoneValid || verificationCode.length !== 4"
                   @click="applyOtpVerification('MOBILE')"
                   icon="icon-arrow"
                 >
-                  ����Ⅳ
+                  ��� OTP 撽�Ⅳ
                 </el-button>
             </el-row>
 
@@ -165,13 +166,14 @@
               </el-button>
             </el-row>
 
-            <el-row v-show="!showEmailVerifyField">
+            <el-row>
               <el-button
-                  :disabled="!email || !emailValid || !verificationCode || verificationCode.length !== 4"
+                  v-if="onEmailVerifyResendStatus === 'APPLY_OTP'"
+                  :disabled="!email || !emailValid || verificationCode.length !== 4"
                   @click="applyOtpVerification('EMAIL')"
                   icon="icon-arrow"
                 >
-                  ����Ⅳ
+                  ��� OTP 撽�Ⅳ
                 </el-button>
             </el-row>
           </template>
@@ -595,7 +597,6 @@
 
   resentOtp(type: string) {
     this.resetOtpSetting(type);
-    this.applyOtpVerification(type);
   }
 
   deleteOtpInfo(type: string) {
@@ -617,10 +618,12 @@
       clearInterval(this.otpInterval);
       this.otpResendCounter = 30;
       this.otpCounterSec = 300;
+      this.onPhoneVerifyStep = 'APPLY_OTP';
     } else {
       clearInterval(this.emailResendInterval);
       this.emailResendCounter = 30;
       this.emailCounterSec = 300;
+      this.onEmailVerifyResendStatus = 'APPLY_OTP';
     }
   }
 
diff --git a/PAMapp/plugins/gtm.js b/PAMapp/plugins/gtm.js
new file mode 100644
index 0000000..d93597d
--- /dev/null
+++ b/PAMapp/plugins/gtm.js
@@ -0,0 +1,3 @@
+export default function({ $gtm, route }) {
+    $gtm.init('GTM-W2XMVJZ')
+  }
\ No newline at end of file
diff --git a/PAMapp/static/favicon.ico b/PAMapp/static/favicon.ico
index d751f60..6ec941e 100644
--- a/PAMapp/static/favicon.ico
+++ b/PAMapp/static/favicon.ico
Binary files differ

--
Gitblit v1.8.0