#76 #71 #74 #75 #78+登录注册loading

simon
Showing 8 changed files with 38 additions and 15 deletions
src/common/lang/en.js
src/common/lang/tc.js
src/common/lang/zh.js
src/pages/custom-service/components/policy-change-contact.js
src/pages/index/index.js
src/pages/login/login.js
src/pages/vhis-detail/vhis-detail.scss
src/pages/vhis-detail/vhis-detail.vue
--- a/src/common/lang/en.js
View file @65d8f8b
+++ b/src/common/lang/en.js
View file @65d8f8b
@@ -2,14 +2,17 @@ module.exports = {
    common: {
        Confirm: "Confirm",
        Cancel: "Cancel",
-        Male: "Mr.",
+        Male: "Male",
-        Female: "Mrs.",
+        Female: "Female",
+        MaleTitle: "Mr.",
+        FemaleTitle: "Mrs.",
        Sex: "Sex",
        Age: "Age",
        Birthday: "Birthday",
        SubmitSuccess: "Successfully submitted",
        Email: "Email",
        Birth:"Date of birth",
    },
    message: {
        login: 'Login',
@@ -751,7 +754,7 @@ module.exports = {
        address: "Correspondence Address",
        email: "E-Mail",
        checkTips: "I do not agree to receive promotional information",
-        submit: "Confirm",
+        submit: "Submit",
        errorTips: {
            e1: "Please enter the collect mobile no",
            e2: "Please enter the collect address",
@@ -1166,7 +1169,7 @@ module.exports = {
            t2: "Download Standard Premium Table",
            t3: "Download Policy Provision",
        },
-        submitBtn: "立即投保",
+        submitBtn: "Apply now",
        productList: [{
            title: "Certified VHIS-compliant Plan",
            desc: "The plan is a certified plan under the Voluntary Health Insurance Scheme (VHIS) that aims to support your access to private healthcare services for essential needs, at the same time you could enjoy tax deduction benefit. The plan is approved by the Food and Health Bureau for your peace of mind. For more details on VHIS, please visit www.vhis.gov.hk. ",
--- a/src/common/lang/tc.js
View file @65d8f8b
+++ b/src/common/lang/tc.js
View file @65d8f8b
@@ -2,8 +2,10 @@ module.exports = {
    common: {
        Confirm: "確認",
        Cancel: "取消",
-        Male: "先生",
+        Male: "男性",
-        Female: "女士",
+        Female: "女性",
+        MaleTitle: "先生",
+        FemaleTitle: "女士",
        Sex: "性別",
        Age: "年齡",
        Birthday: "生日",
@@ -761,7 +763,7 @@ module.exports = {
        address: "聯絡地址",
        email: "電郵地址",
        checkTips: "本人不同意接收宣傳信息",
-        submit: "確認修改",
+        submit: "提交申請",
        errorTips: {
            e1: "請填寫正確的聯絡電話",
            e2: "請填寫聯絡地址",
--- a/src/common/lang/zh.js
View file @65d8f8b
+++ b/src/common/lang/zh.js
View file @65d8f8b
@@ -4,12 +4,15 @@ module.exports = {
        Cancel: "取消",
        Sex: "性别",
        Age: "年龄",
-        Male: "先生",
+        Male: "男性",
-        Female: "女士",
+        Female: "女性",
+        MaleTitle: "先生",
+        FemaleTitle: "女士",
        Birthday: "生日",
        SubmitSuccess: "递交申请成功",
        Email: "电邮",
        Birth:"出生日期",
    },
    message: {
        login: "登入",
@@ -762,7 +765,7 @@ module.exports = {
        address: "联络地址",
        email: "电邮地址",
        checkTips: "本人不同意接收宣传信息",
-        submit: "确认修改",
+        submit: "提交申请",
        errorTips: {
            e1: "请填写正确的联络电话",
            e2: "请填写联络地址",
--- a/src/pages/custom-service/components/policy-change-contact.js
View file @65d8f8b
+++ b/src/pages/custom-service/components/policy-change-contact.js
View file @65d8f8b
@@ -362,6 +362,7 @@ export default {
 			// 获取省份
 			this.provinceList = getCnProvinceList(this.$i18n.locale);
 			// if (this.dataInit) {
 			// 	return;
 			// }
@@ -372,7 +373,7 @@ export default {
 				return;
 			}
 			// this.data = null;
-			this.loading = true;
 			let param = {
 				policyId: this.selectedPolicies[0].id,
 				policyCode: this.selectedPolicies[0].code
@@ -382,6 +383,7 @@ export default {
 				return;
 			}
 			this.lastPolicyCode = param.policyCode;
+			this.loading = true;
 			httpPost({
 				url: api.policyContactDetailApi,
@@ -405,6 +407,7 @@ export default {
 					}, 0);
 				})
 				.catch(res => {
+					console.log('2222');
 					this.loading = false;
 					if (res.code == "404") {
 						this.$refs.auth.noAuth();
--- a/src/pages/index/index.js
View file @65d8f8b
+++ b/src/pages/index/index.js
View file @65d8f8b
@@ -157,11 +157,11 @@ export default {
 		},
 		titleList() {
 			let result = [{
-				n: this.i18n.common.Male,
+				n: this.i18n.common.MaleTitle,
 				v: "M"
 			},
 			{
-				n: this.i18n.common.Female,
+				n: this.i18n.common.FemaleTitle,
 				v: "F"
 			}
 			]
--- a/src/pages/login/login.js
View file @65d8f8b
+++ b/src/pages/login/login.js
View file @65d8f8b
@@ -323,13 +323,14 @@ export default {
 			// 	this._showMobileNoIllegalTip();
 			// 	return;
 			// }
 			if (this.times.remain > 0) {
 				return;
 			}
 			if (this.loading) {
 				return;
 			}
-			this.loading = true;
+			// this.loading = true;
 			let data = {
 				mobile: this.loginForm.userId,
 				lan: this.locale
--- a/src/pages/vhis-detail/vhis-detail.scss
View file @65d8f8b
+++ b/src/pages/vhis-detail/vhis-detail.scss
View file @65d8f8b
@@ -654,6 +654,13 @@ $borderSize: 6px;
 }
+.download-tips{
+  text-align: center;
+  color: $cOrange2;
+  font-size: $fontSizeSmall-M2;
+}
 // 立即投保
 .btn-wrap {
  margin: 50px auto 100px;
--- a/src/pages/vhis-detail/vhis-detail.vue
View file @65d8f8b
+++ b/src/pages/vhis-detail/vhis-detail.vue
View file @65d8f8b
@@ -283,7 +283,7 @@
                  <div class="nn n1">(k)</div>
                  <div class="nn n2">
                    <span v-html="$t('vhisDetail.guarantee2.kk')">{{$t('vhisDetail.guarantee2.kk')}}</span>
                  </div>
                </div>
              </div>
@@ -360,20 +360,24 @@
            <div class="icon-wrap"><img class="icon" src="@/assets/images/vhis/vhis-download.png"></div>
            <div class="desc">{{$t('vhisDetail.download.t1')}}</div>
          </div>
+          <!-- <div class="tips">*中文版本只提供繁体版</div> -->
        </div>
        <div class="border2 download-item">
          <div :class="{enCont : locale == 'en'}" class="cont" @click="downloadFile('file2')">
            <div class="icon-wrap"><img class="icon" src="@/assets/images/vhis/vhis-download.png"></div>
            <div class="desc">{{$t('vhisDetail.download.t2')}}</div>
          </div>
+          <!-- <div class="tips">*中文版本只提供繁体版</div> -->
        </div>
        <div class="border2 download-item">
          <div :class="{enCont : locale == 'en'}" class="cont" @click="downloadFile('file3')">
            <div class="icon-wrap"><img class="icon" src="@/assets/images/vhis/vhis-download.png"></div>
            <div class="desc">{{$t('vhisDetail.download.t3')}}</div>
          </div>
        </div>
      </div>
+      <div v-if="locale == 'zh'" class="download-tips">*中文版本只提供繁体版</div>
      <!-- 立即投保 -->
      <div class="btn-wrap">