diff --git a/src/pages.json b/src/pages.json index 3d0411a..f6c8169 100644 --- a/src/pages.json +++ b/src/pages.json @@ -26,7 +26,22 @@ { "path": "pages/more/index", "style": { - "navigationBarTitleText": "我的" + "navigationBarTitleText": "" + } + },{ + "path": "pages/more/bank", + "style": { + "navigationBarTitleText": "" + } + },{ + "path": "pages/more/addbankCard", + "style": { + "navigationBarTitleText": "" + } + },{ + "path": "pages/more/bankCardDetail", + "style": { + "navigationBarTitleText": "" } } ], diff --git a/src/pages/more/addbankCard.vue b/src/pages/more/addbankCard.vue new file mode 100644 index 0000000..d7112d4 --- /dev/null +++ b/src/pages/more/addbankCard.vue @@ -0,0 +1,519 @@ + + + + + \ No newline at end of file diff --git a/src/pages/more/bank.vue b/src/pages/more/bank.vue new file mode 100644 index 0000000..39b030f --- /dev/null +++ b/src/pages/more/bank.vue @@ -0,0 +1,284 @@ + + + + + \ No newline at end of file diff --git a/src/pages/more/bankCardDetail.vue b/src/pages/more/bankCardDetail.vue new file mode 100644 index 0000000..fd557d8 --- /dev/null +++ b/src/pages/more/bankCardDetail.vue @@ -0,0 +1,292 @@ + + + + + \ No newline at end of file diff --git a/src/pages/more/index.vue b/src/pages/more/index.vue index eafdd31..19203e7 100644 --- a/src/pages/more/index.vue +++ b/src/pages/more/index.vue @@ -21,8 +21,8 @@ - - + + {{ $t('more.bankcard') }} @@ -41,7 +41,7 @@ - {{authStatusText[userInfo.authStatus] || $t('more.not_authenticated')}} + {{ $t(`auth.status_${userInfo.authStatus}`) || $t('auth.not_authenticated') }} @@ -128,16 +128,10 @@ export default { nickname: '张三', phone: '13800138000', bankCardCount: 2, - authStatus: 1, // 0-未认证 1-已认证 2-认证中 3-认证失败 + authStatus: 1, language: 'zh', isLogin: true }, - authStatusText: { - 0: this.$t('more.not_authenticated'), - 1: this.$t('more.authenticated'), - 2: this.$t('more.authenticating'), - 3: this.$t('more.auth_failed') - }, languageOptions: { 'zh': 'Chinese', 'en': 'English', diff --git a/src/static/lang/enUS.json b/src/static/lang/enUS.json index b73856b..00f5dbf 100644 --- a/src/static/lang/enUS.json +++ b/src/static/lang/enUS.json @@ -1,4 +1,5 @@ { + "nullData": "No data available", // Login "index.Loading": "Loading...", "index.errMsg": "Failed to load", @@ -10,7 +11,7 @@ "login.appTitle": "European Stock Software", "login.rememberPassword": "Remember password", "login.forgotPassword": "Forgot password", - "login.agreeTermsPrefix": "I have read and agree to the", + "login.agreeTermsPrefix": "I have read and agree to", "login.agreeTermsSuffix": "User Agreement", "login.userAgreement": "User Agreement", "login.and": "and", @@ -19,10 +20,10 @@ "login.noAccount": "No account?", "login.languagechangeclose": "Done", "login.chooseLanguage": "Select Language", - "login.changelanguage": "Change Language", - "login.errors.agreeTermsFirst": "Please agree to the User Agreement and Privacy Policy first", + "login.changelanguage": "Switch Language", + "login.errors.agreeTermsFirst": "Please agree to User Agreement and Privacy Policy first", "login.errors.emptyUsername": "Please enter username", - "login.errors.invalidIdCard": "Please enter the last 6 digits of your ID card correctly", + "login.errors.invalidIdCard": "Please enter correct last 6 digits of ID card", "login.errors.emptyPassword": "Please enter password", // Registration @@ -31,13 +32,13 @@ "register.appTitle": "European Stock Software", "register.registerDesc": "Create an account to continue", "register.idCardLabel": "Last 6 digits of ID card", - "register.idCardPlaceholder": "Please enter the last 6 digits of ID card", + "register.idCardPlaceholder": "Please enter last 6 digits of ID card", "register.errors.emptyIdCard": "Please enter ID card number", "register.passwordLabel": "Password", "register.passwordTip": "Password must be at least 6 characters", "register.passwordPlaceholder": "Please enter password", "register.confirmPasswordLabel": "Confirm Password", - "register.confirmPasswordPlaceholder": "Please enter password again", + "register.confirmPasswordPlaceholder": "Please confirm password again", "register.inviteCodeLabel": "Invitation Code", "register.inviteCodePlaceholder": "Please enter invitation code", "register.emailLabel": "Email", @@ -47,12 +48,12 @@ "register.errors.invalidPassword": "Password must be at least 8 characters with both letters and numbers", "register.errors.emptyPassword": "Password cannot be empty", "register.errors.confirmPasswordRequired": "Please enter password again", - "register.errors.invalidEmail": "Please enter a valid email", - "register.errors.passwordMismatch": "Passwords do not match", - "register.errors.invalidIdCard": "Please enter correct ID card number", - "register.errors.agreeTermsFirst": "Please read and agree to the User Agreement and Privacy Policy first", + "register.errors.invalidEmail": "Please enter valid email", + "register.errors.passwordMismatch": "Passwords don't match", + "register.errors.invalidIdCard": "Please enter valid ID card number", + "register.errors.agreeTermsFirst": "Please read and agree to User Agreement and Privacy Policy first", "register.registerProcessing": "Registering...", - "register.agreeTermsPrefix": "I have read and agree to the", + "register.agreeTermsPrefix": "I have read and agree to", "register.userAgreement": "User Agreement", "register.and": "and", "register.privacyPolicy": "Privacy Policy", @@ -69,30 +70,54 @@ "more.setting.title": "Settings", "more.nologin": "Not logged in", "more.clicklogin": "Click to login", - "more.bankcard": "Bank Cards", + "more.bankcard": "Bank Card", "more.authentication": "Real-name Authentication", - "more.not_authenticated": "Not authenticated", - "more.authenticated": "Authenticated", - "more.authenticating": "Authenticating", - "more.auth_failed": "Authentication failed", + "auth.status_0": "Not authenticated", + "auth.status_1": "Authenticated", + "auth.status_2": "Authenticating", + "auth.status_3": "Authentication failed", "more.changePassword": "Change Password", - "more.customerService": "Customer Service", + "more.customerService": "Online Support", "more.languagesettings": "Language Settings", "more.logout": "Logout", "more.selectlanguage": "Select Language", "more.languageChanged": "Language changed to", "more.close": "Close", - "more.confirmLogout": "Are you sure you want to logout?", + "more.confirmLogout": "Are you sure to logout?", - // Common - "common.tip": "Tip", + "common.tip": "Notice", "common.loggingOut": "Logging out...", "common.logoutSuccess": "Logout successful", - // TabBar + // Bottom tab bar "tabBar.index": "Home", "tabBar.market": "Funds", "tabBar.trade": "Stocks", "tabBar.assets": "Assets", - "tabBar.more": "More" + "tabBar.more": "More", + + // Bank card + "bank.myBank": "My Bank Cards", + "bank.bind": "Bound", + "bank.bankcard": "Bank Card", + "bank.addcard": "Add Bank Card", + "bank.longpressTip": "Tap to view details, long press to unbind", + "bank.cardDetail": "Bank Card Details", + "bank.cardperson": "Cardholder", + "bank.cardphone": "Reserved Phone", + "bank.bindtime": "Binding Time", + "bank.unbindcard": "Unbind Bank Card", + "bank.bindCard": "Bind Bank Card", + "bank.bankcardnum": "Bank Card Number", + "bank.bankname": "Bank Name", + "bank.cardpersonname": "Cardholder Name", + "bank.idCard": "ID Card Number", + "bank.bankvericode": "Verification Code", + "bank.readagreement": "I have read and agree to", + "bank.useragresment": "User Agreement", + "bank.and": "and", + "bank.bindcardagreement": "Bank Card Binding Agreement", + "bank.submit": "Submit", + "bank.ICBC": "Industrial and Commercial Bank of China", + "bank.CMB": "China Merchants Bank" } \ No newline at end of file diff --git a/src/static/lang/zh_CN.json b/src/static/lang/zh_CN.json index da58f6f..39f9c9e 100644 --- a/src/static/lang/zh_CN.json +++ b/src/static/lang/zh_CN.json @@ -78,10 +78,10 @@ "more.clicklogin":"点击登录", "more.bankcard":"银行卡", "more.authentication":"实名认证", - "more.not_authenticated":"未认证", - "more.authenticated":"已认证", - "more.authenticating":"认证中", - "more.auth_failed":"认证失败", + "auth.status_0":"未认证", + "auth.status_1":"已认证", + "auth.status_2":"认证中", + "auth.status_3":"认证失败", "more.changePassword":"修改密码", "more.customerService":"在线客服", "more.languagesettings":"语言设置", @@ -95,12 +95,37 @@ "common.loggingOut":"正在退出登录...", "common.logoutSuccess":"退出登录成功", + //首页底部导航栏 "tabBar.index":"首页", "tabBar.market":"基金", "tabBar.trade":"股票", "tabBar.assets":"资产" , - "tabBar.more":"更多" + "tabBar.more":"更多", + //银行卡 + "bank.myBank":"我的银行卡", + "bank.bind":"已绑定", + "bank.bankcard":"银行卡", + "bank.addcard":"添加银行卡", + "bank.longpressTip":"点击卡片查看详情,长按可解绑", + "bank.cardDetail":"银行卡详情", + "bank.cardperson":"持卡人", + "bank.cardphone":"预留手机号", + "bank.bindtime":"绑定时间", + "bank.unbindcard":"解绑银行卡", + "bank.bindCard":"绑定银行卡", + "bank.bankcardnum":"银行卡号", + "bank.bankname":"银行名称", + "bank.cardpersonname":"持卡人姓名", + "bank.idCard":"身份证号", + "bank.bankvericode":"验证码", + "bank.readagreement":"我已阅读并同意", + "bank.useragresment":"用户协议", + "bank.and":"和", + "bank.bindcardagreement":"《银行卡绑定协议》", + "bank.submit":"提交", + "bank.ICBC":"中国工商银行", + "bank.CMB":"招商银行"