Skip to content

dev / pingan-life-index-pro

Go to a project
Toggle navigation
Toggle navigation pinning
12c9ed1b by simon
Options

用户体系样式/文案

1 parent 035a0a77
Inline Side-by-side
Showing 8 changed files with 192 additions and 124 deletions
...@@ -191,10 +191,10 @@ module.exports = { ...@@ -191,10 +191,10 @@ module.exports = {
191 }, 191 },
192 login: { 192 login: {
193 title: "PingAn Account Member Service", 193 title: "PingAn Account Member Service",
194 loginType1: "Login with user name and password", 194 loginType1: "Dynamic password login",
195 loginType2: "Dynamic password login", 195 loginType2: "Dynamic password login",
196 account: "Account", 196 account: "Account",
197 accountPlaceholder: "Please enter Mobile no.", 197 accountPlaceholder: "Please enter user name",
198 password: "Password", 198 password: "Password",
199 passwordPlaceholder: "Please enter password", 199 passwordPlaceholder: "Please enter password",
200 verifyPlaceholder: "Please enter password", 200 verifyPlaceholder: "Please enter password",
...@@ -206,8 +206,9 @@ module.exports = { ...@@ -206,8 +206,9 @@ module.exports = {
206 mobile: "Mobile no.", 206 mobile: "Mobile no.",
207 mobilePlaceholder: "Please enter Mobile no", 207 mobilePlaceholder: "Please enter Mobile no",
208 verifyCode: "SMS verification code", 208 verifyCode: "SMS verification code",
209 verifyCodePlaceholder: "SMS verification code", 209 verifyCodePlaceholder: "Please enter verification code",
210 verifyCodeGet: "Get SMS verification code", 210 verifyCodeGet: "Get verification codee",
211 SMSVerificationCode:"SMS verification code",
211 tips: { 212 tips: {
212 e1: "Please enter account", 213 e1: "Please enter account",
213 e2: "Please enter the password", 214 e2: "Please enter the password",
...@@ -221,7 +222,8 @@ module.exports = { ...@@ -221,7 +222,8 @@ module.exports = {
221 oe2: "Please enter the picture verification code", 222 oe2: "Please enter the picture verification code",
222 oe3: "Please enter the picture verification code", 223 oe3: "Please enter the picture verification code",
223 oe4: "Your verify code is not correct. Please try again", 224 oe4: "Your verify code is not correct. Please try again",
224 } 225 },
226 accountPlaceholder:"Please setup user name ",
225 }, 227 },
226 session: { 228 session: {
227 sidExpire: "It has not been operated for a long time. For the sake of your account security, please restart", 229 sidExpire: "It has not been operated for a long time. For the sake of your account security, please restart",
......
...@@ -193,23 +193,24 @@ module.exports = { ...@@ -193,23 +193,24 @@ module.exports = {
193 }, 193 },
194 login: { 194 login: {
195 title: "平安賬戶", 195 title: "平安賬戶",
196 loginType1: "賬密登入", 196 loginType1: "動態密碼登錄",
197 loginType2: "動態密碼登入", 197 loginType2: "動態密碼登入",
198 account: "賬號", 198 account: "賬號",
199 accountPlaceholder: "請輸入手機號", 199 accountPlaceholder: "請輸入用戶名稱",
200 password: "密碼", 200 password: "密碼",
201 passwordPlaceholder: "輸入登入密碼", 201 passwordPlaceholder: "輸入登入密碼",
202 verifyPlaceholder: "請輸入驗證碼", 202 verifyPlaceholder: "請輸入驗證碼",
203 agree: "同意", 203 agree: "同意",
204 protocol: "《平安香港會員網上帳戶服務協定》", 204 protocol: "《平安香港會員網上帳戶服務協定》",
205 login: "登入", 205 login: "登錄",
206 register: "註冊", 206 register: "註冊",
207 forget: "忘記密碼", 207 forget: "忘記密碼",
208 mobile: "手機號", 208 mobile: "手機號",
209 mobilePlaceholder: "手機號", 209 mobilePlaceholder: "手機號",
210 verifyCode: "驗證碼", 210 verifyCode: "驗證碼",
211 verifyCodePlaceholder: "驗證碼", 211 verifyCodePlaceholder: "請輸入驗證碼",
212 verifyCodeGet: "獲取驗證碼", 212 verifyCodeGet: "獲取驗證碼",
213 SMSVerificationCode:"手機短信驗證碼",
213 tips: { 214 tips: {
214 e1: "請輸入賬號信息", 215 e1: "請輸入賬號信息",
215 e2: "請輸入密碼", 216 e2: "請輸入密碼",
...@@ -266,7 +267,8 @@ module.exports = { ...@@ -266,7 +267,8 @@ module.exports = {
266 e10: "驗證碼過期，請重新申請驗證碼", 267 e10: "驗證碼過期，請重新申請驗證碼",
267 e11: "註冊失敗，請聯繫工作人員", 268 e11: "註冊失敗，請聯繫工作人員",
268 e12: "註冊成功" 269 e12: "註冊成功"
269 } 270 },
271 accountPlaceholder:"請設置用戶名稱",
270 }, 272 },
271 session: { 273 session: {
272 sidExpire: "長時間未操作，為了您賬戶的安全，請登入後再操作" 274 sidExpire: "長時間未操作，為了您賬戶的安全，請登入後再操作"
......
...@@ -193,10 +193,10 @@ module.exports = { ...@@ -193,10 +193,10 @@ module.exports = {
193 }, 193 },
194 login: { 194 login: {
195 title: "平安账户", 195 title: "平安账户",
196 loginType1: "账密登入", 196 loginType1: "动态密码登录",
197 loginType2: "动态密码登入", 197 loginType2: "动态密码登入",
198 account: "账号", 198 account: "账号",
199 accountPlaceholder: "请输入手机号", 199 accountPlaceholder: "请输入用户名称",
200 password: "密码", 200 password: "密码",
201 passwordPlaceholder: "输入登入密码", 201 passwordPlaceholder: "输入登入密码",
202 verifyPlaceholder: "请输入验证码", 202 verifyPlaceholder: "请输入验证码",
...@@ -208,8 +208,9 @@ module.exports = { ...@@ -208,8 +208,9 @@ module.exports = {
208 mobile: "手机号", 208 mobile: "手机号",
209 mobilePlaceholder: "手机号", 209 mobilePlaceholder: "手机号",
210 verifyCode: "验证码", 210 verifyCode: "验证码",
211 verifyCodePlaceholder: "验证码", 211 verifyCodePlaceholder: "请输入验证码",
212 verifyCodeGet: "获取验证码", 212 verifyCodeGet: "获取验证码",
213 SMSVerificationCode:"手机短信验证码",
213 tips: { 214 tips: {
214 e1: "请输入账号信息", 215 e1: "请输入账号信息",
215 e2: "请输入密码", 216 e2: "请输入密码",
...@@ -269,7 +270,8 @@ module.exports = { ...@@ -269,7 +270,8 @@ module.exports = {
269 e10: "验证码过期，请重新申请验证码", 270 e10: "验证码过期，请重新申请验证码",
270 e11: "注册失败，请联系工作人员", 271 e11: "注册失败，请联系工作人员",
271 e12: "註冊成功" 272 e12: "註冊成功"
272 } 273 },
274 accountPlaceholder:"请设置用户名称",
273 }, 275 },
274 passwordCheck: { 276 passwordCheck: {
275 error1: "密码长度不少于8位", 277 error1: "密码长度不少于8位",
......
...@@ -91,7 +91,9 @@ ...@@ -91,7 +91,9 @@
91 91
92 &-tit { 92 &-tit {
93 flex: 1; 93 flex: 1;
94 font-size: $fontSizeTitle; 94 // font-size: $fontSizeTitle;
95 // font-size: $fontSizeTitle-M2;
96 font-size: $fontSize-M2;
95 font-weight: bold; 97 font-weight: bold;
96 } 98 }
97 99
...@@ -104,12 +106,13 @@ ...@@ -104,12 +106,13 @@
104 &-protocol { 106 &-protocol {
105 margin: 36px auto 0; 107 margin: 36px auto 0;
106 display: flex; 108 display: flex;
107 align-items: center; 109 // align-items: center;
108 // padding-left: 12px; 110 // padding-left: 12px;
109 111
110 .check { 112 .check {
111 height: 12px; 113 height: 12px;
112 margin-right: 6px; 114 margin-right: 7.2px;
115 margin-top: 4px;
113 } 116 }
114 117
115 .protocol { 118 .protocol {
......
...@@ -74,7 +74,9 @@ ...@@ -74,7 +74,9 @@
74 </div> 74 </div>
75 </template> 75 </template>
76 <template v-else> 76 <template v-else>
77 <!-- 不接入一账通 --> 77
78
79 <!-- 不接入一账通 -OTP登陆 -->
78 <div class="login-nav"> 80 <div class="login-nav">
79 <div class="login-nav-tit text-c pointer active">{{$t('login.loginType1')}}</div> 81 <div class="login-nav-tit text-c pointer active">{{$t('login.loginType1')}}</div>
80 </div> 82 </div>
...@@ -90,7 +92,7 @@ ...@@ -90,7 +92,7 @@
90 <img src="@/assets/images/common/icon-notice.png" alt="">{{errorTips.e1}} 92 <img src="@/assets/images/common/icon-notice.png" alt="">{{errorTips.e1}}
91 </div> 93 </div>
92 </div> 94 </div>
93 <div class="pure-u-1 form-item"> 95 <!-- <div class="pure-u-1 form-item">
94 <div class="label"> 96 <div class="label">
95 <img src="@/assets/images/login/icon-login-password.png"> {{$t('login.password')}} 97 <img src="@/assets/images/login/icon-login-password.png"> {{$t('login.password')}}
96 </div> 98 </div>
...@@ -100,10 +102,10 @@ ...@@ -100,10 +102,10 @@
100 <div class="validator" v-if="errorTips.e2.length > 0 "> 102 <div class="validator" v-if="errorTips.e2.length > 0 ">
101 <img src="@/assets/images/common/icon-notice.png" alt="">{{errorTips.e2}} 103 <img src="@/assets/images/common/icon-notice.png" alt="">{{errorTips.e2}}
102 </div> 104 </div>
103 </div> 105 </div> -->
104 <div class="pure-u-1 form-item"> 106 <div class="pure-u-1 form-item">
105 <div class="label"> 107 <div class="label">
106 <img src="@/assets/images/login/icon-login-message.png"> {{$t('login.verifyCode')}} 108 <img src="@/assets/images/login/icon-login-phone.png"> {{$t('login.SMSVerificationCode')}}
107 </div> 109 </div>
108 <div class="ipt-wrap"> 110 <div class="ipt-wrap">
109 <div class="ipt ipt2" :class="{ err : errorTips.oe2.length > 0 }"> 111 <div class="ipt ipt2" :class="{ err : errorTips.oe2.length > 0 }">
......
...@@ -2,32 +2,28 @@ ...@@ -2,32 +2,28 @@
2 * 页面描述:用户注册 2 * 页面描述:用户注册
3 */ 3 */
4 4
5
6 import { mapState } from "vuex"; 5 import { mapState } from "vuex";
7 6
8 import api from '@/api/api' 7 import api from "@/api/api";
9 import { 8 import { httpGet, httpPost } from "@/api/fetch-api.js";
10 httpGet,
11 httpPost
12 } from '@/api/fetch-api.js'
13 9
14 import { contactMethodCheck, checkVerifyCode } from '@utils/utils.js'; 10 import { contactMethodCheck, checkVerifyCode } from "@utils/utils.js";
15 11
16 import modalComp from '@/components/modal-comp/modal-comp.vue'; 12 import modalComp from "@/components/modal-comp/modal-comp.vue";
17 import modalSimpleComp from '@/components/modal-simple-comp/modal-simple-comp.vue'; 13 import modalSimpleComp from "@/components/modal-simple-comp/modal-simple-comp.vue";
18 import modalProtocolComp from '@/components/modal-protocol-comp/modal-protocol-comp.vue'; 14 import modalProtocolComp from "@/components/modal-protocol-comp/modal-protocol-comp.vue";
19 import { passwordEncrypt } from '@/utils/encrypt.js'; 15 import { passwordEncrypt } from "@/utils/encrypt.js";
20 import Vue from 'vue'; 16 import Vue from "vue";
21 import { Loading } from 'vant'; 17 import { Loading } from "vant";
22 Vue.use(Loading); 18 Vue.use(Loading);
23 19
24 export default { 20 export default {
25 data() { 21 data() {
26 return { 22 return {
27 loading: false, 23 loading: false,
28 key: 'value', 24 key: "value",
29 type: 1, // 1:手机验证 2:输入密码 25 type: 1, // 1:手机验证 2:输入密码
30 mobileNoType: "hk",// 选择的手机好类型 26 mobileNoType: "hk", // 选择的手机好类型
31 mobileTip: {}, 27 mobileTip: {},
32 mobileOptions: [], 28 mobileOptions: [],
33 29
...@@ -47,7 +43,8 @@ export default { ...@@ -47,7 +43,8 @@ export default {
47 registerForm: { 43 registerForm: {
48 imageValue: "", 44 imageValue: "",
49 mobileNo: "", 45 mobileNo: "",
50 otp: "" 46 otp: "",
47 userId: ""
51 }, 48 },
52 times: { 49 times: {
53 interval: 0, // 索引 50 interval: 0, // 索引
...@@ -56,11 +53,24 @@ export default { ...@@ -56,11 +53,24 @@ export default {
56 }, 53 },
57 54
58 errorTips: { 55 errorTips: {
59 p1: "",// 手機號 56 p1: "", // 手機號
60 p2: "",// 短信驗證碼 57 p2: "", // 短信驗證碼
61 p3: "",// 圖像驗證碼 58 p3: "", // 圖像驗證碼
62 p4: "",// 密碼 59 p4: "", // 密碼
63 p5: "",// 確認密碼 60 p5: "", // 確認密碼
61
62 // 账密登录页
63 e1: "", // 账号
64 e2: "", // 密码
65 e3: "", // 图像验证码
66 e4: "", // 勾选同意
67 // 短信验证码
68 oe1: "", // 账号
69 oe2: "", // 短信验证码
70 oe3: "", // 图像验证码
71 // 注册
72 p4: "",
73 p5: ""
64 }, 74 },
65 modalSimpleVisiable: false, 75 modalSimpleVisiable: false,
66 modalVisiable: false, 76 modalVisiable: false,
...@@ -68,7 +78,7 @@ export default { ...@@ -68,7 +78,7 @@ export default {
68 targetPath: "", 78 targetPath: "",
69 modalIcon: "succ", 79 modalIcon: "succ",
70 modalContent: "" 80 modalContent: ""
71 } 81 };
72 }, 82 },
73 components: { 83 components: {
74 modalComp, 84 modalComp,
...@@ -80,10 +90,12 @@ export default { ...@@ -80,10 +90,12 @@ export default {
80 userInfo: state => state.userInfo 90 userInfo: state => state.userInfo
81 }), 91 }),
82 locale() { 92 locale() {
83 return this.$i18n.locale || 'tc'; 93 return this.$i18n.locale || "tc";
84 }, 94 },
85 i18n() { 95 i18n() {
86 return this.$i18n.messages && this.$i18n.locale ? this.$i18n.messages[this.$i18n.locale] : {}; 96 return this.$i18n.messages && this.$i18n.locale
97 ? this.$i18n.messages[this.$i18n.locale]
98 : {};
87 }, 99 },
88 registerDisabled() { 100 registerDisabled() {
89 let b1 = !this.registerCheck.agreeProtocol; 101 let b1 = !this.registerCheck.agreeProtocol;
...@@ -93,16 +105,23 @@ export default { ...@@ -93,16 +105,23 @@ export default {
93 return b1 || b2 || b3 || b4; 105 return b1 || b2 || b3 || b4;
94 }, 106 },
95 registerDisabledV2() { 107 registerDisabledV2() {
96 let b1 = !this.values.password || this.checkPassword(this.values.password) ? true : false; 108 let b1 =
97 let b2 = this.values.passwordRepeat != this.values.password ? true : false; 109 !this.values.password || this.checkPassword(this.values.password)
110 ? true
111 : false;
112 let b2 =
113 this.values.passwordRepeat != this.values.password ? true : false;
98 let b3 = !this.registerCheck.agreeProtocol; 114 let b3 = !this.registerCheck.agreeProtocol;
99 let b4 = !this.registerForm.mobileNo ? true : false; 115 let b4 = !this.registerForm.mobileNo ? true : false;
100 return b1 || b2 || b3 || b4; 116 return b1 || b2 || b3 || b4;
101
102 }, 117 },
103 submitDisabled() { 118 submitDisabled() {
104 let b1 = !this.values.password || this.checkPassword(this.values.password) ? true : false; 119 let b1 =
105 let b2 = this.values.passwordRepeat != this.values.password ? true : false; 120 !this.values.password || this.checkPassword(this.values.password)
121 ? true
122 : false;
123 let b2 =
124 this.values.passwordRepeat != this.values.password ? true : false;
106 return b1 || b2; 125 return b1 || b2;
107 }, 126 },
108 oneAccountCenterOff() { 127 oneAccountCenterOff() {
...@@ -152,13 +171,13 @@ export default { ...@@ -152,13 +171,13 @@ export default {
152 return new Promise((resolve, reject) => { 171 return new Promise((resolve, reject) => {
153 let mobile = this.registerForm.mobileNo; 172 let mobile = this.registerForm.mobileNo;
154 if (this.mobileNoType == "hk") { 173 if (this.mobileNoType == "hk") {
155 if (!contactMethodCheck('hkmobile', mobile)) { 174 if (!contactMethodCheck("hkmobile", mobile)) {
156 this._showMobileNoIllegalTip() 175 this._showMobileNoIllegalTip();
157 return; 176 return;
158 } 177 }
159 } else { 178 } else {
160 if (!contactMethodCheck('mobile', mobile)) { 179 if (!contactMethodCheck("mobile", mobile)) {
161 this._showMobileNoIllegalTip() 180 this._showMobileNoIllegalTip();
162 return; 181 return;
163 } 182 }
164 } 183 }
...@@ -167,7 +186,6 @@ export default { ...@@ -167,7 +186,6 @@ export default {
167 }, 186 },
168 _handlerIsShowImageVcode() { 187 _handlerIsShowImageVcode() {
169 return new Promise((resolve, reject) => { 188 return new Promise((resolve, reject) => {
170
171 // 如果这个值不为空，标识出现了图片验证码，不需要重新询问是否需要图像验证码了 189 // 如果这个值不为空，标识出现了图片验证码，不需要重新询问是否需要图像验证码了
172 if (this.values.vcodeuuid) { 190 if (this.values.vcodeuuid) {
173 resolve(); 191 resolve();
...@@ -201,7 +219,7 @@ export default { ...@@ -201,7 +219,7 @@ export default {
201 } 219 }
202 } 220 }
203 return false; 221 return false;
204 }) 222 });
205 }); 223 });
206 }, 224 },
207 _showMobileNoIllegalTip() { 225 _showMobileNoIllegalTip() {
...@@ -215,8 +233,8 @@ export default { ...@@ -215,8 +233,8 @@ export default {
215 mobileNo: this.registerForm.mobileNo, 233 mobileNo: this.registerForm.mobileNo,
216 token: this.values.token, 234 token: this.values.token,
217 signFactor: new Date().getTime(), 235 signFactor: new Date().getTime(),
218 scene: "register", 236 scene: "register"
219 } 237 };
220 if (this.values.vcodeuuid) { 238 if (this.values.vcodeuuid) {
221 data["vcodeuuid"] = this.values.vcodeuuid; 239 data["vcodeuuid"] = this.values.vcodeuuid;
222 data["imageValue"] = this.registerForm.imageValue; 240 data["imageValue"] = this.registerForm.imageValue;
...@@ -230,7 +248,7 @@ export default { ...@@ -230,7 +248,7 @@ export default {
230 default: 248 default:
231 this.errorTips.p2 = response.returnMsg; 249 this.errorTips.p2 = response.returnMsg;
232 break; 250 break;
233 }; 251 }
234 }); 252 });
235 }, 253 },
236 _startTimeClick() { 254 _startTimeClick() {
...@@ -239,7 +257,7 @@ export default { ...@@ -239,7 +257,7 @@ export default {
239 let i18n = this.$i18n.messages[this.$i18n.locale] || {}; 257 let i18n = this.$i18n.messages[this.$i18n.locale] || {};
240 let msg = i18n.register.coutTips; 258 let msg = i18n.register.coutTips;
241 _this.times.tip = msg.replace("{second}", _this.times.remain); 259 _this.times.tip = msg.replace("{second}", _this.times.remain);
242 this.times.interval = setInterval(function () { 260 this.times.interval = setInterval(function() {
243 if (_this.times.remain <= 0) { 261 if (_this.times.remain <= 0) {
244 clearInterval(_this.times.interval); 262 clearInterval(_this.times.interval);
245 _this.times.interval = 0; 263 _this.times.interval = 0;
...@@ -248,7 +266,7 @@ export default { ...@@ -248,7 +266,7 @@ export default {
248 } 266 }
249 _this.times.remain--; 267 _this.times.remain--;
250 _this.times.tip = msg.replace("{second}", _this.times.remain); 268 _this.times.tip = msg.replace("{second}", _this.times.remain);
251 _this.$set(_this, 'times', _this.times); 269 _this.$set(_this, "times", _this.times);
252 }, 1000); 270 }, 1000);
253 }, 271 },
254 onSubmitHandler() { 272 onSubmitHandler() {
...@@ -258,15 +276,19 @@ export default { ...@@ -258,15 +276,19 @@ export default {
258 } 276 }
259 this._checkParams().then(() => { 277 this._checkParams().then(() => {
260 this.loading = true; 278 this.loading = true;
261 this._regCheck().then(() => { 279 this._regCheck()
280 .then(() => {
262 // 验证短信验证码 281 // 验证短信验证码
263 this._validateOTPandRepeat().then(() => { 282 this._validateOTPandRepeat()
283 .then(() => {
264 this.loading = false; 284 this.loading = false;
265 this.type = 2; 285 this.type = 2;
266 }).catch(e => { 286 })
287 .catch(e => {
267 this.loading = false; 288 this.loading = false;
268 }); 289 });
269 }).catch(e => { 290 })
291 .catch(e => {
270 this.loading = false; 292 this.loading = false;
271 }); 293 });
272 }); 294 });
...@@ -289,16 +311,18 @@ export default { ...@@ -289,16 +311,18 @@ export default {
289 let data = { 311 let data = {
290 account: this.registerForm.mobileNo, 312 account: this.registerForm.mobileNo,
291 password: this.values.password 313 password: this.values.password
292 } 314 };
293 this.loading = true; 315 this.loading = true;
294 httpPost({ 316 httpPost({
295 url: api.doRegisterV2, 317 url: api.doRegisterV2,
296 data: data 318 data: data
297 }).then(res => { 319 })
320 .then(res => {
298 this.loading = false; 321 this.loading = false;
299 this.$store.commit("SET_USER_INFO", res); 322 this.$store.commit("SET_USER_INFO", res);
300 this._showSuccessMessage(); 323 this._showSuccessMessage();
301 }).catch(e => { 324 })
325 .catch(e => {
302 this.loading = false; 326 this.loading = false;
303 switch (e.code) { 327 switch (e.code) {
304 case 1103: 328 case 1103:
...@@ -306,7 +330,7 @@ export default { ...@@ -306,7 +330,7 @@ export default {
306 this.errorTips.p1 = message; 330 this.errorTips.p1 = message;
307 break; 331 break;
308 } 332 }
309 }) 333 });
310 }); 334 });
311 }, 335 },
312 _validateOTPandRepeat() { 336 _validateOTPandRepeat() {
...@@ -320,7 +344,8 @@ export default { ...@@ -320,7 +344,8 @@ export default {
320 httpPost({ 344 httpPost({
321 url: api.stdValidateOTPandRepeat, 345 url: api.stdValidateOTPandRepeat,
322 data: data 346 data: data
323 }).then(response => { 347 })
348 .then(response => {
324 if (response.returnCode != "0") { 349 if (response.returnCode != "0") {
325 switch (response.returnCode) { 350 switch (response.returnCode) {
326 case "SMS_ERROR_006": 351 case "SMS_ERROR_006":
...@@ -335,21 +360,23 @@ export default { ...@@ -335,21 +360,23 @@ export default {
335 // this.type = 2; 360 // this.type = 2;
336 resolve(); 361 resolve();
337 } 362 }
338 }).catch(err => {
339 reject();
340 }) 363 })
364 .catch(err => {
365 reject();
366 });
341 }); 367 });
342 }, 368 },
343 _regCheck() { 369 _regCheck() {
344 // 检测手机号注册情况 370 // 检测手机号注册情况
345 return new Promise((resolve, reject) => { 371 return new Promise((resolve, reject) => {
346 let data = { 372 let data = {
347 mobileNo: this.registerForm.mobileNo, 373 mobileNo: this.registerForm.mobileNo
348 }; 374 };
349 httpPost({ 375 httpPost({
350 url: api.gsRegCheck, 376 url: api.gsRegCheck,
351 data: data 377 data: data
352 }).then(response => { 378 })
379 .then(response => {
353 if (response.returnCode == "0") { 380 if (response.returnCode == "0") {
354 if (response.data.mobileStatus == "N") { 381 if (response.data.mobileStatus == "N") {
355 resolve(); 382 resolve();
...@@ -363,9 +390,10 @@ export default { ...@@ -363,9 +390,10 @@ export default {
363 this._showCheckOTPErrTip(response.returnMsg); 390 this._showCheckOTPErrTip(response.returnMsg);
364 reject(); 391 reject();
365 } 392 }
366 }).catch(err => {
367 reject();
368 }) 393 })
394 .catch(err => {
395 reject();
396 });
369 }); 397 });
370 }, 398 },
371 _checkParams() { 399 _checkParams() {
...@@ -388,7 +416,7 @@ export default { ...@@ -388,7 +416,7 @@ export default {
388 return; 416 return;
389 } 417 }
390 resolve(); 418 resolve();
391 }) 419 });
392 }); 420 });
393 }, 421 },
394 422
...@@ -446,7 +474,8 @@ export default { ...@@ -446,7 +474,8 @@ export default {
446 httpPost({ 474 httpPost({
447 url: api.stdRegister, 475 url: api.stdRegister,
448 data: data 476 data: data
449 }).then(response => { 477 })
478 .then(response => {
450 this.loading = false; 479 this.loading = false;
451 if (response.returnCode != 0) { 480 if (response.returnCode != 0) {
452 this._showRegisterFailure(response); 481 this._showRegisterFailure(response);
...@@ -455,9 +484,10 @@ export default { ...@@ -455,9 +484,10 @@ export default {
455 this.$store.commit("SET_USER_INFO", response.data); 484 this.$store.commit("SET_USER_INFO", response.data);
456 this._showSuccessMessage(); 485 this._showSuccessMessage();
457 } 486 }
458 }).catch(e => {
459 this.loading = false;
460 }) 487 })
488 .catch(e => {
489 this.loading = false;
490 });
461 } 491 }
462 }, 492 },
463 checkPassword(password) { 493 checkPassword(password) {
...@@ -534,13 +564,13 @@ export default { ...@@ -534,13 +564,13 @@ export default {
534 if (this.values.vcodeuuid) { 564 if (this.values.vcodeuuid) {
535 let data = { 565 let data = {
536 vcodeuuid: this.values.vcodeuuid 566 vcodeuuid: this.values.vcodeuuid
537 } 567 };
538 httpPost({ 568 httpPost({
539 url: api.stdRefreshVcode, 569 url: api.stdRefreshVcode,
540 data: data 570 data: data
541 }).then(response => { 571 }).then(response => {
542 this.$set(this.values, 'imageBase64', response.data.image); 572 this.$set(this.values, "imageBase64", response.data.image);
543 }) 573 });
544 } 574 }
545 }, 575 },
546 _showSuccessMessage() { 576 _showSuccessMessage() {
...@@ -552,12 +582,8 @@ export default { ...@@ -552,12 +582,8 @@ export default {
552 // }); 582 // });
553 // alert("注册成功") 583 // alert("注册成功")
554 }, 584 },
555 onForgetHandler() { 585 onForgetHandler() {},
556 586 onLoginTypeHandler(val) {},
557 },
558 onLoginTypeHandler(val) {
559
560 },
561 initData() { 587 initData() {
562 if (this.userInfo && (this.userInfo.sid || this.userInfo.name)) { 588 if (this.userInfo && (this.userInfo.sid || this.userInfo.name)) {
563 this.$router.push({ 589 this.$router.push({
...@@ -566,7 +592,9 @@ export default { ...@@ -566,7 +592,9 @@ export default {
566 return; 592 return;
567 } 593 }
568 let i18n = this.$i18n.messages[this.$i18n.locale] || {}; 594 let i18n = this.$i18n.messages[this.$i18n.locale] || {};
569 let mobileOptions = JSON.parse(JSON.stringify(i18n.register.mobileOptions)); 595 let mobileOptions = JSON.parse(
596 JSON.stringify(i18n.register.mobileOptions)
597 );
570 this.mobileOptions = mobileOptions; 598 this.mobileOptions = mobileOptions;
571 this.mobileTip = this.mobileOptions[0]; 599 this.mobileTip = this.mobileOptions[0];
572 }, 600 },
...@@ -574,7 +602,7 @@ export default { ...@@ -574,7 +602,7 @@ export default {
574 this.modalVisiable = false; 602 this.modalVisiable = false;
575 if (this.targetPath) { 603 if (this.targetPath) {
576 this.$router.push({ 604 this.$router.push({
577 "path": this.targetPath 605 path: this.targetPath
578 }); 606 });
579 } 607 }
580 } 608 }
...@@ -587,47 +615,44 @@ export default { ...@@ -587,47 +615,44 @@ export default {
587 this.mobileOptions.forEach(element => { 615 this.mobileOptions.forEach(element => {
588 // this.errorTips.p1 = ""; 616 // this.errorTips.p1 = "";
589 if (element.type == this.mobileNoType) { 617 if (element.type == this.mobileNoType) {
590 this.$set(this, 'mobileTip', element); 618 this.$set(this, "mobileTip", element);
591 this.checkMobileActivity(); 619 this.checkMobileActivity();
592 } 620 }
593 }) 621 });
594 }, 622 },
595 'registerForm.mobileNo': function () { 623 "registerForm.mobileNo": function() {
596 this.errorTips.p1 = ""; 624 this.errorTips.p1 = "";
597 }, 625 },
598 'registerForm.opt': function () { 626 "registerForm.opt": function() {
599 this.errorTips.p2 = ""; 627 this.errorTips.p2 = "";
600 }, 628 },
601 'registerForm.imageValue': function () { 629 "registerForm.imageValue": function() {
602 this.errorTips.p3 = ""; 630 this.errorTips.p3 = "";
603 }, 631 },
604 'values.password': function () { 632 "values.password": function() {
605 this.$set(this.errorTips, 'p4', this.checkPassword(this.values.password)); 633 this.$set(this.errorTips, "p4", this.checkPassword(this.values.password));
606 }, 634 },
607 'values.passwordRepeat': function () { 635 "values.passwordRepeat": function() {
608 if (this.values.password != this.values.passwordRepeat) { 636 if (this.values.password != this.values.passwordRepeat) {
609 this._showPasswordNotTheSameTips(); 637 this._showPasswordNotTheSameTips();
610 } else { 638 } else {
611 this.errorTips.p5 = ""; 639 this.errorTips.p5 = "";
612 } 640 }
641 }
613 }, 642 },
614 }, 643 beforeDestroy() {},
615 beforeDestroy() {
616 },
617 created() { 644 created() {
618 this.initData(); 645 this.initData();
619 try { 646 try {
620 this.$root.eventBus.$off("/register"); 647 this.$root.eventBus.$off("/register");
621 } catch (e) { 648 } catch (e) {}
622
623 }
624 this.$root.eventBus.$on("/register", () => { 649 this.$root.eventBus.$on("/register", () => {
625 this.type = 1; 650 this.type = 1;
626 }); 651 });
627 this.$root.eventBus.$on("langChange", () => { 652 this.$root.eventBus.$on("langChange", () => {
628 try { 653 try {
629 this.initData(); 654 this.initData();
630 } catch (e) { } 655 } catch (e) {}
631 }); 656 });
632 } 657 }
633 } 658 };
......
1 @import '@/styles/_support.scss'; 1 @import "@/styles/_support.scss";
2 2
3 .content { 3 .content {
4 position: relative; 4 position: relative;
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 } 21 }
22 22
23 .ebg { 23 .ebg {
24 background: url('~@/assets/images/common/login-bg.png') center no-repeat; 24 background: url("~@/assets/images/common/login-bg.png") center no-repeat;
25 width: 100%; 25 width: 100%;
26 height: 325px; 26 height: 325px;
27 position: absolute; 27 position: absolute;
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
39 } 39 }
40 40
41 .login { 41 .login {
42
43 @extend .bb; 42 @extend .bb;
44 padding: 32px 75px 54px; 43 padding: 32px 75px 54px;
45 border-bottom: solid 10.8px $cGreen; 44 border-bottom: solid 10.8px $cGreen;
...@@ -51,8 +50,6 @@ ...@@ -51,8 +50,6 @@
51 @extend .box-shadow; 50 @extend .box-shadow;
52 background-color: #ffffff; 51 background-color: #ffffff;
53 52
54
55
56 &-tit { 53 &-tit {
57 color: $cOrange; 54 color: $cOrange;
58 display: flex; 55 display: flex;
...@@ -70,7 +67,9 @@ ...@@ -70,7 +67,9 @@
70 &-tit2 { 67 &-tit2 {
71 color: $cOrange; 68 color: $cOrange;
72 text-align: center; 69 text-align: center;
73 font-size: $fontSizeTitle; 70 // font-size: $fontSizeTitle;
71 // font-size: $fontSizeTitle-M2;
72 font-size: $fontSize-M2;
74 font-weight: bold; 73 font-weight: bold;
75 text-shadow: 3px 5.2px 9px rgba(236, 100, 41, 0.27); 74 text-shadow: 3px 5.2px 9px rgba(236, 100, 41, 0.27);
76 margin-top: 24px; 75 margin-top: 24px;
...@@ -80,7 +79,6 @@ ...@@ -80,7 +79,6 @@
80 letter-spacing: 2.4px; 79 letter-spacing: 2.4px;
81 } 80 }
82 81
83
84 &-nav { 82 &-nav {
85 margin: 32px auto 12px; 83 margin: 32px auto 12px;
86 display: flex; 84 display: flex;
...@@ -96,7 +94,9 @@ ...@@ -96,7 +94,9 @@
96 94
97 &-tit { 95 &-tit {
98 flex: 1; 96 flex: 1;
99 font-size: $fontSizeTitle; 97 // font-size: $fontSizeTitle;
98 // font-size: $fontSizeTitle-M2;
99 font-size: $fontSize-M2;
100 font-weight: bold; 100 font-weight: bold;
101 } 101 }
102 102
...@@ -109,12 +109,13 @@ ...@@ -109,12 +109,13 @@
109 &-protocol { 109 &-protocol {
110 margin: 36px auto 0; 110 margin: 36px auto 0;
111 display: flex; 111 display: flex;
112 align-items: center; 112 // align-items: center;
113 // padding-left: 12px; 113 // padding-left: 12px;
114 114
115 .check { 115 .check {
116 height: 12px; 116 height: 12px;
117 margin-right: 7.2px; 117 margin-right: 7.2px;
118 margin-top: 4px;
118 } 119 }
119 120
120 .protocol { 121 .protocol {
...@@ -126,11 +127,9 @@ ...@@ -126,11 +127,9 @@
126 padding-left: 12px; 127 padding-left: 12px;
127 } 128 }
128 129
129
130 &-submit { 130 &-submit {
131 @include btc2(207px, 63px, 16px); 131 @include btc2(207px, 63px, 16px);
132 margin: 50px auto 0; 132 margin: 50px auto 0;
133
134 } 133 }
135 134
136 &-submit:lang(zh) { 135 &-submit:lang(zh) {
...@@ -165,7 +164,8 @@ ...@@ -165,7 +164,8 @@
165 } 164 }
166 } 165 }
167 166
168 input {} 167 input {
168 }
169 169
170 input:lang(zh) { 170 input:lang(zh) {
171 letter-spacing: 1.2px; 171 letter-spacing: 1.2px;
...@@ -221,7 +221,6 @@ ...@@ -221,7 +221,6 @@
221 max-width: 30%; 221 max-width: 30%;
222 } 222 }
223 223
224
225 .verify-btn { 224 .verify-btn {
226 @extend .fcc; 225 @extend .fcc;
227 // font-family: Arial; 226 // font-family: Arial;
...@@ -234,7 +233,6 @@ ...@@ -234,7 +233,6 @@
234 color: $cFontGray; 233 color: $cFontGray;
235 } 234 }
236 235
237
238 // 框内按钮 236 // 框内按钮
239 .ipt2 { 237 .ipt2 {
240 display: flex; 238 display: flex;
...@@ -275,7 +273,6 @@ ...@@ -275,7 +273,6 @@
275 margin-right: 4.8px; 273 margin-right: 4.8px;
276 } 274 }
277 } 275 }
278
279 } 276 }
280 } 277 }
281 278
...@@ -310,7 +307,6 @@ ...@@ -310,7 +307,6 @@
310 &-item { 307 &-item {
311 margin-top: 24px; 308 margin-top: 24px;
312 } 309 }
313
314 } 310 }
315 311
316 &-protocol { 312 &-protocol {
......
...@@ -125,6 +125,7 @@ ...@@ -125,6 +125,7 @@
125 </div> 125 </div>
126 </div> 126 </div>
127 127
128 <!-- OPT -->
128 <div class="content" v-else> 129 <div class="content" v-else>
129 <div class="top-space"></div> 130 <div class="top-space"></div>
130 <div class="box"> 131 <div class="box">
...@@ -133,6 +134,22 @@ ...@@ -133,6 +134,22 @@
133 134
134 <div class="login-tit2">{{$t('register.title')}}</div> 135 <div class="login-tit2">{{$t('register.title')}}</div>
135 <div class="gird-g form"> 136 <div class="gird-g form">
137
138 <!-- 账号 -->
139 <div class="pure-u-1 form-item">
140 <div class="label">
141 <img src="@/assets/images/login/icon-login-user.png"> {{$t('login.account')}}
142 </div>
143 <div class="ipt-wrap">
144 <!-- <input v-model="registerForm.userId" :placeholder="$t('register.accountPlaceholder')" class="ipt" :class="{ err : errorTips.e1.length > 0 }" type="text" @blur="userIdLegalCheck"> -->
145 <input v-model="registerForm.userId" :placeholder="$t('register.accountPlaceholder')" class="ipt" :class="{ err : errorTips.e1.length > 0 }" type="text" >
146 </div>
147 <div class="validator" v-if="errorTips.p1.length > 0 ">
148 <img src="@/assets/images/common/icon-notice.png" alt="">{{errorTips.p1}}
149 </div>
150 </div>
151
152 <!-- 手机号 -->
136 <div class="pure-u-1 form-item"> 153 <div class="pure-u-1 form-item">
137 154
138 <div class="label"> 155 <div class="label">
...@@ -155,6 +172,25 @@ ...@@ -155,6 +172,25 @@
155 </div> 172 </div>
156 </div> 173 </div>
157 174
175 <!-- 短信验证 -->
176 <div class="pure-u-1 form-item">
177 <div class="label">
178 <img src="@/assets/images/register/icon-register-phone.png"> {{$t('login.SMSVerificationCode')}}
179 </div>
180 <div class="ipt-wrap">
181 <div class="ipt ipt2" :class="{ err : errorTips.oe2.length > 0 }">
182 <input :placeholder="$t('login.verifyCodePlaceholder')" class="ipt-code" type="text" v-model="registerForm.otp">
183 <!-- <div v-if="times.remain == 0" class="veri-btn pointer" @click="sendOTPWhenOneAccountCenterOff">{{$t('register.verifyCodeGet')}}</div> -->
184 <div v-if="times.remain == 0" class="veri-btn pointer" >{{$t('register.verifyCodeGet')}}</div>
185 <div v-else class="veri-btn-default">{{times.tip}}</div>
186 </div>
187 </div>
188 <div class="validator" v-if="errorTips.oe2.length > 0 ">
189 <img src="@/assets/images/common/icon-notice.png" alt="">{{errorTips.oe2}}
190 </div>
191 </div>
192
193 <!--
158 <div class="pure-u-1 form-item"> 194 <div class="pure-u-1 form-item">
159 <div class="label"> 195 <div class="label">
160 <img src="@/assets/images/register/icon-register-lock.png"> {{$t('register.newPassword')}} 196 <img src="@/assets/images/register/icon-register-lock.png"> {{$t('register.newPassword')}}
...@@ -176,7 +212,7 @@ ...@@ -176,7 +212,7 @@
176 <div class="validator" v-if="errorTips.p5.length > 0 "> 212 <div class="validator" v-if="errorTips.p5.length > 0 ">
177 <img src="@/assets/images/common/icon-notice.png" alt="">{{errorTips.p5}} 213 <img src="@/assets/images/common/icon-notice.png" alt="">{{errorTips.p5}}
178 </div> 214 </div>
179 </div> 215 </div> -->
180 216
181 </div> 217 </div>
182 218
......