diff --git a/App.vue b/App.vue index 96ca9a1..1a03a41 100644 --- a/App.vue +++ b/App.vue @@ -11,6 +11,7 @@ // #endif export default { onLaunch: function(e) { + uni.hideTabBar(); //取出缓存数据 store.commit("setCacheData"); // #ifdef MP-WEIXIN diff --git a/components/module/navigation.vue b/components/module/navigation.vue index 76b4101..847d638 100644 --- a/components/module/navigation.vue +++ b/components/module/navigation.vue @@ -8,7 +8,7 @@ - {{ item.text }} + {{ $t(item.text) }} @@ -27,30 +27,41 @@ export default { return { path: '', navigationList: [{ - "pagePath": "pages/index/index", - "iconPath": "static/images/home.png", - "selectedIconPath": "static/images/home1.png", - "text": "Home Page" - }, - { - "pagePath": "pages/questionnaire/index", - "iconPath": "static/images/Question.png", - "selectedIconPath": "static/images/Question1.png", - "text": "Questionnaire" - }, - { - "pagePath": "pages/promotion/index", - "iconPath": "static/images/Promotion.png", - "selectedIconPath": "static/images/Promotion1.png", - "text": "Promotion" - }, - { - "pagePath": "pages/mine/index", - "iconPath": "static/images/Mine.png", - "selectedIconPath": "static/images/Mine1.png", - "text": "Mine" - } - ], + "pagePath": "pages/index/index", + "iconPath": "static/images/home.png", + "selectedIconPath": "static/images/home1.png", + "text": "nav.home", + "iconSize": 48 + }, + { + "pagePath": "pages/questionnaire/index", + "iconPath": "static/images/Question.png", + "selectedIconPath": "static/images/Question1.png", + "text": "nav.questionnaire", + "iconSize": 48 + }, + { + "pagePath": "pages/promotion/index", + "iconPath": "static/images/Promotion.png", + "selectedIconPath": "static/images/Promotion1.png", + "text": "nav.promotion", + "iconSize": 48 + }, + { + "pagePath": "pages/im/index", + "iconPath": "static/images/im.png", + "selectedIconPath": "static/images/im1.png", + "text": "nav.mt", + "iconSize": 48 + }, + { + "pagePath": "pages/mine/index", + "iconPath": "static/images/Mine.png", + "selectedIconPath": "static/images/Mine1.png", + "text": "nav.mine", + "iconSize": 48 + } + ], popupShow: false, }; }, @@ -60,6 +71,7 @@ export default { let currentPages = getCurrentPages(); let page = currentPages[currentPages.length - 1]; this.path = page.route; + console.log(this.path); }, //方法 methods: { diff --git a/locales/en.json b/locales/en.json index 475388a..d93dd89 100644 --- a/locales/en.json +++ b/locales/en.json @@ -63,7 +63,8 @@ "text5": "Gain more accelerated benefit", "text6": "Available balance", "text7": "Upgrade now", - "text8": "Insufficient user balance" + "text8": "Insufficient user balance", + "tect9": "Cannot purchase VIP" }, "Questionnaire":{ "title": "Questionnaire", @@ -230,7 +231,7 @@ "text4": "Receiving Address", "text5": "Warm tips", "text6": "Minimum recharge 1 USDT;", - "text7": "Recharge confirmation: 10 times of network confirmation;", + "text7": "The actual amount received must be consistent with the order amount, please pay attention to the transaction fee;", "text8": "Please do not recharge assets other than USDT to the above address, otherwise it may lead to the loss of assets.", "text9": "Please ensure the security of your mobile device to prevent information from being tampered with or leaked.", "text10": "Please enter the recharge amount", @@ -328,7 +329,7 @@ "index":{ "text1": "Search the questionnaire", "text2": "Total assets", - "text3": "Today's earnings", + "text3": "Remaining power", "text4": "Cash out", "text5": " User gets {par} USDT", "text6": "Surprise reward", @@ -348,10 +349,14 @@ "text20": "Operational guidelines for compliance", "text21": "Identity portrait consistency", "text22": "Behavior pattern simulation", - "text23": "Equipment environment quarantine" + "text23": "Equipment environment quarantine", + "text24": "Core advantage" }, "nav":{ - "home": "Home" - - } + "home": "Home", + "questionnaire": "Questionnaire", + "promotion": "Promotion", + "mt": "MT", + "mine": "Mine" + } } \ No newline at end of file diff --git a/locales/zh.json b/locales/zh.json index d73ccbf..8893b35 100644 --- a/locales/zh.json +++ b/locales/zh.json @@ -63,7 +63,8 @@ "text5": "获得更多加速效益", "text6": "可用余额", "text7": "立即升级", - "text8": "用户余额不足" + "text8": "用户余额不足", + "tect9": "不能购买VIP" }, "Questionnaire":{ "title": "问卷", @@ -230,7 +231,7 @@ "text4": "接收地址", "text5": "温馨提示", "text6": "最小充值1 USDT;", - "text7": "充值确认:10次网络确认;", + "text7": "实际到账金额与订单金额必须一致,请注意交易手续费;", "text8": "请不要将USDT以外的资产充值到上述地址,否则可能导致资产丢失。", "text9": "请确保您的移动设备的安全,防止信息被篡改或泄露。", "text10": "请输入充值金额", @@ -328,7 +329,7 @@ "index":{ "text1": "搜索问卷", "text2": "总资产", - "text3": "今天的收入", + "text3": "剩余算力", "text4": "提现", "text5": " 用户获得 {par} USDT", "text6": "惊喜奖励", @@ -348,10 +349,14 @@ "text20": "合规性操作指南", "text21": "身份画像一致性", "text22": "行为模式模拟", - "text23": "设备环境隔离" + "text23": "设备环境隔离", + "text24": "核心优势" }, "nav":{ - "home": "首页" - - } + "home": "首页", + "questionnaire": "问卷", + "promotion": "推广", + "mt": "社区", + "mine": "我的" + } } \ No newline at end of file diff --git a/manifest.json b/manifest.json index 0688d5f..74a92a5 100644 --- a/manifest.json +++ b/manifest.json @@ -64,6 +64,9 @@ "offline" : false } } + }, + "splashscreen" : { + "androidStyle" : "default" } }, "compilerVersion" : 3, diff --git a/pages.json b/pages.json index d607248..855a311 100644 --- a/pages.json +++ b/pages.json @@ -539,6 +539,12 @@ { "navigationBarTitleText": "select" } + },{ + "path" : "pages/about/helpdetail", + "style" : + { + "navigationBarTitleText": "detail" + } } ], "globalStyle": { @@ -552,6 +558,7 @@ "color": "#444444", "selectedColor": "#1D61FF", "borderStyle": "black", + "custom": true, "backgroundColor": "#ffffff", "list": [{ "pagePath": "pages/index/index", diff --git a/pages/Setting/index.vue b/pages/Setting/index.vue index 1b6eb5e..c470bd7 100644 --- a/pages/Setting/index.vue +++ b/pages/Setting/index.vue @@ -1,6 +1,7 @@