44a5bc5d by simon

Merge branch 'master' of 120.27.44.69:dev/pingan-life-index-pro

2 parents 0eca5a3e ffcdb484
Showing 98 changed files with 2 additions and 2 deletions
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
...@@ -259,7 +259,7 @@ module.exports = { ...@@ -259,7 +259,7 @@ module.exports = {
259 areaCode: "+86" 259 areaCode: "+86"
260 }], 260 }],
261 coutTips: "{second}Seconds", 261 coutTips: "{second}Seconds",
262 title: "Welcome", 262 title: "Welcome for registration",
263 title2: "Please set up new password", 263 title2: "Please set up new password",
264 mobilePlaceholder: "Please enter 8-digit mobile number", 264 mobilePlaceholder: "Please enter 8-digit mobile number",
265 verifyCodePlaceholder: "Please enter SMS verification code", 265 verifyCodePlaceholder: "Please enter SMS verification code",
...@@ -289,7 +289,7 @@ module.exports = { ...@@ -289,7 +289,7 @@ module.exports = {
289 e14: "Please setup user name", 289 e14: "Please setup user name",
290 e15: "The user name has been registered." 290 e15: "The user name has been registered."
291 }, 291 },
292 account:"Account", 292 account:"Login Account",
293 accountPlaceholder:"Please setup user name", 293 accountPlaceholder:"Please setup user name",
294 }, 294 },
295 passwordCheck: { 295 passwordCheck: {
......