diff --git a/components/KeyValueRow/KeyValueRow.vue b/components/KeyValueRow/KeyValueRow.vue index 592e824..fde355d 100644 --- a/components/KeyValueRow/KeyValueRow.vue +++ b/components/KeyValueRow/KeyValueRow.vue @@ -1,9 +1,11 @@ @@ -38,26 +40,19 @@ export default { size: { type: String | Number, default() { - return '28rpx' + return '' } }, - - /** - * date 日期格式化 , name姓名脱敏 张*三, price 显示金额 - */ - mode: { - type: String, + leftSize: { + type: String | Number, default() { - return '' + return '28rpx' } }, - /** - * 超出隐藏 - */ - lines: { + rightSize: { type: String | Number, default() { - return '1' + return '28rpx' } }, }, diff --git a/components/language-popups/language-popups.vue b/components/language-popups/language-popups.vue new file mode 100644 index 0000000..681d208 --- /dev/null +++ b/components/language-popups/language-popups.vue @@ -0,0 +1,94 @@ + + + + + diff --git a/main.js b/main.js index cb66f03..18b371b 100644 --- a/main.js +++ b/main.js @@ -7,8 +7,9 @@ import axios from './utils/axios.js' import store from './store' // 多国语言 -import EN from './utils/language/en.js' -import ZH from './utils/language/zh.js' +import EN from './utils/language/en_US.js' +import ZH from './utils/language/zh_TW.js' +import VI from './utils/language/vi_VN.js' // 自定义底部导航栏 @@ -21,11 +22,12 @@ uni.$u.config.unit = 'rpx' Vue.use(VueI18n); const i18n = new VueI18n({ - // locale: store.state.language, // 默认选择的语言 - locale: 'en', // 默认选择的语言 + locale: store.state.language, // 默认选择的语言 + // locale: 'en_US', // 默认选择的语言 messages: { - 'en': EN, - 'zh': ZH, + 'en_US': EN, + 'zh_TW': ZH, + 'vi_VN': VI, } }) diff --git a/pages.json b/pages.json index 1a30061..580f03a 100644 --- a/pages.json +++ b/pages.json @@ -80,6 +80,72 @@ "style": { "navigationStyle": "custom" } + }, + { + "path": "pages/me/inviteFriends", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/me/accountInfo", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/me/changeLoginPassword", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/me/changeWithdrawalPassword", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/me/myTeam", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/me/walletHistory", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/me/notification", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/me/notificationDetails", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/me/donateRecord", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/me/language", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/me/transfer", + "style": { + "navigationStyle": "custom" + } } ], diff --git a/pages/index/index.vue b/pages/index/index.vue index 378ee42..9976147 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -2,9 +2,18 @@ - {{ i18n.HOME }} - {{ i18n.customerService }} + {{ i18n.customerService }} + + {{ langTrue }} + + + + + + + + @@ -62,14 +71,20 @@ + + diff --git a/pages/me/changeLoginPassword.vue b/pages/me/changeLoginPassword.vue new file mode 100644 index 0000000..109c208 --- /dev/null +++ b/pages/me/changeLoginPassword.vue @@ -0,0 +1,78 @@ + + + + + diff --git a/pages/me/changeWithdrawalPassword.vue b/pages/me/changeWithdrawalPassword.vue new file mode 100644 index 0000000..ca5ed8d --- /dev/null +++ b/pages/me/changeWithdrawalPassword.vue @@ -0,0 +1,78 @@ + + + + + diff --git a/pages/me/donateRecord.vue b/pages/me/donateRecord.vue new file mode 100644 index 0000000..7de9ece --- /dev/null +++ b/pages/me/donateRecord.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/pages/me/index.vue b/pages/me/index.vue index f9ae1fb..23a80de 100644 --- a/pages/me/index.vue +++ b/pages/me/index.vue @@ -1,32 +1,79 @@