From 40caa96cc672ce89d8c30727990f4192ef766b2c Mon Sep 17 00:00:00 2001 From: xx Date: Tue, 10 Jun 2025 17:10:40 +0800 Subject: [PATCH] 1 --- components/module/navigation.vue | 1 - config/html5Utils.js | 2 +- config/requestConfig.js | 7 ++++- locales/en.json | 6 +++++ locales/zh.json | 8 +++++- main.js | 6 +++-- manifest.json | 30 +++++++++++---------- pages.json | 13 +++++----- pages/Setting/index.vue | 9 +------ pages/Setting/languages.vue | 10 ++----- pages/Setting/setPasswork.vue | 2 +- pages/Setting/setPin.vue | 9 +------ pages/about/details.vue | 2 +- pages/about/help.vue | 9 +------ pages/about/helpdetail.vue | 2 +- pages/about/index.vue | 9 +------ pages/address/add.vue | 22 +++++++++------- pages/address/index.vue | 9 +------ pages/im/chat.vue | 2 +- pages/im/index.vue | 1 + pages/im/member.vue | 1 + pages/index/index.vue | 43 ++++++++++++++++++++++--------- pages/mine/forgotpassword.vue | 3 ++- pages/mine/index.vue | 38 +++++++++++++++++++++++---- pages/mine/info.vue | 2 +- pages/mine/login.vue | 4 +-- pages/mine/notice.vue | 2 +- pages/mine/noticedetails.vue | 2 +- pages/mine/signup.vue | 4 +-- pages/mine/upgrade.vue | 33 +++++++++++++++--------- pages/power/index.vue | 9 +------ pages/promotion/index.vue | 38 ++++++++++++++++++++------- pages/promotion/invite.vue | 3 ++- pages/promotion/list.vue | 10 ++----- pages/questionnaire/answer.vue | 10 ++----- pages/questionnaire/details.vue | 8 +++++- pages/questionnaire/index.vue | 20 +++++++++++--- pages/questionnaire/select.vue | 20 +++++++++++--- pages/wallet/ExtractResults.vue | 2 +- pages/wallet/fundrecords.vue | 2 +- pages/wallet/index.vue | 30 ++++++++++++++++----- pages/wallet/putforward.vue | 35 ++++++++++++++++++++++--- pages/wallet/recharge.vue | 20 +++++++++++--- pages/wallet/switchnetwork.vue | 20 +++++++++++--- pages/wallet/transfer.vue | 33 +++++++++++++++++++----- static/images/index1-1.png | Bin 0 -> 25425 bytes static/images/index3-1.png | Bin 0 -> 66007 bytes 47 files changed, 360 insertions(+), 191 deletions(-) create mode 100644 static/images/index1-1.png create mode 100644 static/images/index3-1.png diff --git a/components/module/navigation.vue b/components/module/navigation.vue index 847d638..d4d93a9 100644 --- a/components/module/navigation.vue +++ b/components/module/navigation.vue @@ -71,7 +71,6 @@ export default { let currentPages = getCurrentPages(); let page = currentPages[currentPages.length - 1]; this.path = page.route; - console.log(this.path); }, //方法 methods: { diff --git a/config/html5Utils.js b/config/html5Utils.js index a47d056..f478bfa 100644 --- a/config/html5Utils.js +++ b/config/html5Utils.js @@ -225,7 +225,7 @@ export const h5Login = function(type = "judge", callback) { },500); } else { uni.showModal({ - title: "Prompt", + title: '', content: "At this moment, we need you to log in~", confirmText: "Go login", cancelText: "Cancel", diff --git a/config/requestConfig.js b/config/requestConfig.js index 81b1499..f0cc14d 100644 --- a/config/requestConfig.js +++ b/config/requestConfig.js @@ -175,7 +175,12 @@ $http.dataFactory = async function(res) { statusCode: 0, errMsg: "【request】" + (httpData.info || httpData.msg) }); - } else { //其他错误提示 + } else { + store.commit("emptyUserInfo"); + uni.navigateTo({ + url:'/pages/mine/index' + }) + //其他错误提示 if (res.isPrompt) { uni.showToast({ title: httpData.info || httpData.msg, diff --git a/locales/en.json b/locales/en.json index cd13471..ade55e8 100644 --- a/locales/en.json +++ b/locales/en.json @@ -378,5 +378,11 @@ "promotion": "Promotion", "mt": "MT", "mine": "Mine" + }, + "gotoLogin":{ + "title": "Prompt", + "content": "At this moment, we need you to log in~", + "login": "Go login", + "cancel": "Cancel" } } \ No newline at end of file diff --git a/locales/zh.json b/locales/zh.json index 7312bfe..150b7c9 100644 --- a/locales/zh.json +++ b/locales/zh.json @@ -73,7 +73,7 @@ "text1": "数据市场", "text2": "进行中", "text3": "已完成", - "text4": "回答", + "text4": "已答题", "text5": "周期", "text6": "奖励", "text7": "去答题", @@ -378,5 +378,11 @@ "promotion": "推广", "mt": "社区", "mine": "我的" + }, + "gotoLogin":{ + "title": "登录提醒", + "content": "您还未登录，立即登录~", + "login": "去登陆", + "cancel": "取消" } } \ No newline at end of file diff --git a/main.js b/main.js index 0395694..dda87b0 100644 --- a/main.js +++ b/main.js @@ -1,5 +1,6 @@ import Vue from 'vue' import App from './App' + //数据管理中心 import store from '@/config/store' Vue.prototype.$store = store; @@ -23,9 +24,9 @@ import VueI18n from 'vue-i18n'; import en from './locales/en.json'; // 引入英文语言包 import zh from './locales/zh.json'; // 引入中文语言包 Vue.use(VueI18n); // 使用vue-i18n插件 - +const savedLocale = localStorage.getItem('locale') || 'en'; const i18n = new VueI18n({ - locale: 'en', // 设置默认语言 + locale: savedLocale, // 设置默认语言 messages: { // 设置语言环境信息 en: en, zh: zh, @@ -40,6 +41,7 @@ import MescrollBody from "@/components/common/mescroll-uni/mescroll-body.vue"; Vue.component("mescroll-body", MescrollBody); import VueClipboard from 'vue-clipboard2'; Vue.use(VueClipboard); + App.mpType = 'app' const app = new Vue({ i18n, // 将vue-i18n实例挂载到Vue实例上 diff --git a/manifest.json b/manifest.json index 4e7a45b..006349b 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { - "name" : "问卷星", - "appid" : "__UNI__F09DBA1", - "description" : "问卷星", + "name" : "MT", + "appid" : "__UNI__E2BE304", + "description" : "MT", "transformPx" : false, "icons" : [ { @@ -12,15 +12,13 @@ "versionName" : "1.0.7", "versionCode" : 107, "app-plus" : { - "softinputMode": "adjustResize", - "statusBarAppearance": "dark", + "softinputMode" : "adjustResize", + "statusBarAppearance" : "dark", "modules" : { - "Payment" : {}, - "OAuth" : {}, - "Messaging" : {}, - "Share" : {}, - "VideoPlayer" : {}, - "Push" : {} + "Push" : {}, + "Barcode" : {}, + "Camera" : {}, + "Share" : {} }, "distribute" : { "android" : { @@ -65,14 +63,15 @@ "version" : "2", "offline" : false } - } + }, + "share" : {} }, "splashscreen" : { "androidStyle" : "default", "android" : { - "hdpi" : "static/images/index2-1.png", + "hdpi" : "static/images/index1-1.png", "xhdpi" : "static/images/index2-1.png", - "xxhdpi" : "static/images/index2-1.png" + "xxhdpi" : "static/images/index3-1.png" } }, "icons" : { @@ -82,6 +81,9 @@ "xxhdpi" : "static/images/logo2.png", "xxxhdpi" : "static/images/logo2.png" } + }, + "ios" : { + "dSYMs" : false } }, "compilerVersion" : 3, diff --git a/pages.json b/pages.json index 0a2303b..202aee1 100644 --- a/pages.json +++ b/pages.json @@ -1,18 +1,17 @@ { "pages": [ - { - "path" : "pages/index/guide", - "style" : - { - "navigationBarTitleText" : "" - } - }, { "path" : "pages/index/index", "style" : { "navigationBarTitleText": "home" } + },{ + "path" : "pages/index/guide", + "style" : + { + "navigationBarTitleText" : "" + } },{ "path": "pages/template/addTemplate", "style": { diff --git a/pages/Setting/index.vue b/pages/Setting/index.vue index c470bd7..d1c879f 100644 --- a/pages/Setting/index.vue +++ b/pages/Setting/index.vue @@ -1,7 +1,7 @@