diff --git a/androidPrivacy.json b/androidPrivacy.json index d705b25..f96771d 100644 --- a/androidPrivacy.json +++ b/androidPrivacy.json @@ -1,38 +1,38 @@ { - "version": "1", - "prompt": "template", - "title": "服务协议和隐私政策", - "message": "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
　　你可阅读《服务协议》和《隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。", - "buttonAccept": "同意并接受", - "buttonRefuse": "暂不同意", - "hrefLoader": "system", - "backToExit": "false", - "second": { - "title": "确认提示", - "message": "　　进入应用前，你需先同意《服务协议》和《隐私政策》，否则将退出应用。", - "buttonAccept": "同意并继续", - "buttonRefuse": "退出应用" - }, - "disagreeMode": { - "support": false, - "loadNativePlugins": false, - "visitorEntry": false, - "showAlways": false - }, - "styles": { - "backgroundColor": "#fff", - "borderRadius": "5px", - "title": { - "color": "#000000" + "version" : "1", + "prompt" : "template", + "title" : "服务协议和隐私政策", + "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
　　你可阅读《服务协议》和《隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。", + "buttonAccept" : "同意并接受", + "buttonRefuse" : "暂不同意", + "hrefLoader" : "system", + "backToExit" : "false", + "second" : { + "title" : "确认提示", + "message" : "　　进入应用前，你需先同意《服务协议》和《隐私政策》，否则将退出应用。", + "buttonAccept" : "同意并继续", + "buttonRefuse" : "退出应用" }, - "buttonAccept": { - "color": "#009458" + "disagreeMode" : { + "support" : false, + "loadNativePlugins" : false, + "visitorEntry" : false, + "showAlways" : false }, - "buttonRefuse": { - "color": "#999999" - }, - "buttonVisitor": { - "color": "#999999" + "styles" : { + "backgroundColor" : "#fff", + "borderRadius" : "5px", + "title" : { + "color" : "#000000" + }, + "buttonAccept" : { + "color" : "#009458" + }, + "buttonRefuse" : { + "color" : "#999999" + }, + "buttonVisitor" : { + "color" : "#999999" + } } - } -} \ No newline at end of file +} diff --git a/common/config.js b/common/config.js index 3358ea3..218a181 100644 --- a/common/config.js +++ b/common/config.js @@ -2,10 +2,10 @@ const config = { // 产品名称 - productName: 'Hoenery', + productName: 'Zetatech', // 公司名称 - companyName: 'Hoenery', + companyName: 'Zetatech', // 产品版本号 productVersion: 'V1.0.0', @@ -22,6 +22,5 @@ const config = { } // 设置后台接口服务的基础地址 -config.baseUrl = "https://ecloud.hoenergypower.cn/api" - +config.baseUrl = "https://zzkj-cloud.com/api" export default config \ No newline at end of file diff --git a/manifest.json b/manifest.json index be723a7..a0f0c9f 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { - "name" : "弘正储能", - "appid" : "__UNI__6826034", - "description" : "Hoenergy", + "name" : "StoraSmart", + "appid" : "__UNI__86592F3", + "description" : "Zetatech", "versionName" : "2.0.0", "versionCode" : 200, "transformPx" : false, @@ -50,33 +50,33 @@ }, "icons" : { "android" : { - "hdpi" : "unpackage/res/icons/72x72.png", - "xhdpi" : "unpackage/res/icons/96x96.png", - "xxhdpi" : "unpackage/res/icons/144x144.png", - "xxxhdpi" : "unpackage/res/icons/192x192.png" + "hdpi" : "C:/Users/46254/Desktop/mipmap-hdpi/组 7 拷贝 4.png", + "xhdpi" : "C:/Users/46254/Desktop/mipmap-xhdpi/组 7 拷贝 4.png", + "xxhdpi" : "C:/Users/46254/Desktop/mipmap-xxhdpi/组 7 拷贝 4.png", + "xxxhdpi" : "C:/Users/46254/Desktop/mipmap-xxxhdpi/组 7 拷贝 4.png" }, "ios" : { - "appstore" : "unpackage/res/icons/1024x1024.png", + "appstore" : "C:/Users/46254/Desktop/mipmap-xhdpi/组 7 拷贝.png", "ipad" : { - "app" : "unpackage/res/icons/76x76.png", - "app@2x" : "unpackage/res/icons/152x152.png", - "notification" : "unpackage/res/icons/20x20.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "proapp@2x" : "unpackage/res/icons/167x167.png", - "settings" : "unpackage/res/icons/29x29.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "spotlight" : "unpackage/res/icons/40x40.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png" + "app" : "C:/Users/46254/Desktop/mipmap-hdpi/组 7 拷贝 4.png", + "app@2x" : "C:/Users/46254/Desktop/mipmap-xhdpi/组 7 拷贝 3.png", + "notification" : "C:/Users/46254/Desktop/mipmap-mdpi/组 7 拷贝 11.png", + "notification@2x" : "C:/Users/46254/Desktop/mipmap-mdpi/组 7 拷贝 9.png", + "proapp@2x" : "C:/Users/46254/Desktop/mipmap-xxxhdpi/组 7 拷贝 9.png", + "settings" : "C:/Users/46254/Desktop/mipmap-mdpi/组 7 拷贝 10.png", + "settings@2x" : "C:/Users/46254/Desktop/mipmap-xhdpi/组 7 拷贝 10.png", + "spotlight" : "C:/Users/46254/Desktop/mipmap-mdpi/组 7 拷贝 9.png", + "spotlight@2x" : "C:/Users/46254/Desktop/mipmap-xxxhdpi/组 7 拷贝 11.png" }, "iphone" : { - "app@2x" : "unpackage/res/icons/120x120.png", - "app@3x" : "unpackage/res/icons/180x180.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "notification@3x" : "unpackage/res/icons/60x60.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "settings@3x" : "unpackage/res/icons/87x87.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png", - "spotlight@3x" : "unpackage/res/icons/120x120.png" + "app@2x" : "C:/Users/46254/Desktop/mipmap-xhdpi/组 7 拷贝 8.png", + "app@3x" : "C:/Users/46254/Desktop/mipmap-xxhdpi/组 7 拷贝 8.png", + "notification@2x" : "C:/Users/46254/Desktop/mipmap-xhdpi/组 7 拷贝 11.png", + "notification@3x" : "C:/Users/46254/Desktop/mipmap-xxhdpi/组 7 拷贝 11.png", + "settings@2x" : "C:/Users/46254/Desktop/mipmap-xhdpi/组 7 拷贝 10.png", + "settings@3x" : "C:/Users/46254/Desktop/mipmap-xxhdpi/组 7 拷贝 10.png", + "spotlight@2x" : "C:/Users/46254/Desktop/mipmap-xxxhdpi/组 7 拷贝 11.png", + "spotlight@3x" : "C:/Users/46254/Desktop/mipmap-xhdpi/组 7 拷贝 8.png" } } }, @@ -84,9 +84,9 @@ "androidStyle" : "default", "androidTranslucent" : true, "android" : { - "hdpi" : "C:/Users/Administrator/Desktop/res2/res2/drawable-hdpi/d00fdfa1ad04f98a7f655c8808770b5.9.png", - "xhdpi" : "C:/Users/Administrator/Desktop/res2/res2/drawable-xhdpi/d00fdfa1ad04f98a7f655c8808770b5.9.png", - "xxhdpi" : "C:/Users/Administrator/Desktop/res2/res2/drawable-xxhdpi/d00fdfa1ad04f98a7f655c8808770b5.9.png" + "hdpi" : "", + "xhdpi" : "", + "xxhdpi" : "" }, "iosStyle" : "common", "ios" : { diff --git a/package-lock.json b/package-lock.json index 73a6241..fe7f7fb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1132,9 +1132,9 @@ } }, "crypto-js": { - "version": "4.1.1", - "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", - "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + "version": "4.2.0", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz", + "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==" }, "cyclist": { "version": "1.0.2", @@ -2016,9 +2016,9 @@ "dev": true }, "jsencrypt": { - "version": "3.3.1", - "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz", - "integrity": "sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw==" + "version": "3.3.2", + "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.2.tgz", + "integrity": "sha512-arQR1R1ESGdAxY7ZheWr12wCaF2yF47v5qpB76TtV64H1pyGudk9Hvw8Y9tb/FiTIaaTRUyaSnm5T/Y53Ghm/A==" }, "json-parse-better-errors": { "version": "1.0.2", diff --git a/package.json b/package.json index 8803ec6..7433fbf 100644 --- a/package.json +++ b/package.json @@ -16,9 +16,9 @@ "homepage": "", "dependencies": { "@dcloudio/uni-helper-json": "^1.0.13", - "crypto-js": "^4.1.1", + "crypto-js": "^4.2.0", "image-tools": "^1.4.0", - "jsencrypt": "^3.3.1" + "jsencrypt": "^3.3.2" }, "devDependencies": { "compression-webpack-plugin": "^6.1.1", diff --git a/pages.json b/pages.json index 845a8ba..c003615 100644 --- a/pages.json +++ b/pages.json @@ -85,7 +85,7 @@ "style": { "navigationBarTitleText": "系统设置", "navigationBarBackgroundColor": "#0ea17e", - "navigationBarTextStyle": "white", + "navigationBarTextStyle": "black", "enablePullDownRefresh": false, "disableScroll": true } @@ -95,7 +95,7 @@ "style": { "navigationBarTitleText": "账号安全", "navigationBarBackgroundColor": "#0ea17e", - "navigationBarTextStyle": "white", + "navigationBarTextStyle": "black", "enablePullDownRefresh": false, "disableScroll": true } @@ -105,7 +105,7 @@ "style": { "navigationBarTitleText": "关于我们", "navigationBarBackgroundColor": "#0ea17e", - "navigationBarTextStyle": "white", + "navigationBarTextStyle": "black", "enablePullDownRefresh": false, "disableScroll": true } @@ -115,7 +115,7 @@ "style": { "navigationBarTitleText": "通用", "navigationBarBackgroundColor": "#0ea17e", - "navigationBarTextStyle": "white", + "navigationBarTextStyle": "black", "enablePullDownRefresh": false, "disableScroll": true } @@ -125,7 +125,7 @@ "style": { "navigationBarTitleText": "消息通知", "navigationBarBackgroundColor": "#0ea17e", - "navigationBarTextStyle": "white", + "navigationBarTextStyle": "black", "enablePullDownRefresh": false, "disableScroll": true } diff --git a/pages/login/index.scss b/pages/login/index.scss index c6b943d..28fc011 100644 --- a/pages/login/index.scss +++ b/pages/login/index.scss @@ -1,10 +1,19 @@ + .wrap { width: 100%; height: 100vh; display: flex; flex-direction: column; align-items: center; - + .logo { + .EnglishFont{ + font-size: 50rpx; + font-weight: 600; + margin-top: 230rpx; + color: #fff; + text-align: center; + } + } .EnglishFont { font-size: 36rpx; font-weight: 600; diff --git a/pages/login/index.vue b/pages/login/index.vue index 05097e9..ef432b3 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -3,14 +3,16 @@ - Welcome to Hoenergy！ + Welcome to Zetatech！ @@ -187,11 +189,13 @@ export default { // this.$u.vuex("vuex_stationValue", val); if (val === '海外站' || val === 'Overseas Station') { this.$u.http.setConfig({ - baseUrl: 'http://47.84.35.144:8000/api' + // baseUrl: 'https://ecloud.hoenergypower.cn/api' + baseUrl: 'https://zzkj-cloud.com/api' }); } else if (val === '中国站' || val === 'China Station') { this.$u.http.setConfig({ - baseUrl: 'https://ecloud.hoenergypower.cn/api' + // baseUrl: 'https://ecloud.hoenergypower.cn/api' + baseUrl: 'https://zzkj-cloud.com/api' }); } const res = await this.$u.api.GetLanguageConfig('zh') @@ -215,7 +219,7 @@ export default { encryptData.key ) const params = { - username: 'hzdemo', + username: 'zzdemo', password: encryptData.password, type: "app", aesKey: publicData.keyData, diff --git a/pages/sys/user/currency.vue b/pages/sys/user/currency.vue index 9fb97f7..3ef7c75 100644 --- a/pages/sys/user/currency.vue +++ b/pages/sys/user/currency.vue @@ -31,6 +31,12 @@ export default { upgrade: true }; }, + onLoad() { + this.updateTitle() + }, + onShow() { + this.updateTitle() + }, computed: { language(){ return this.vuex_language @@ -49,6 +55,12 @@ export default { }, methods: { + + updateTitle() { + uni.setNavigationBarTitle({ + title: this.$t('homePage.mine.general') + }); + }, openSettings() { // #ifdef APP-PLUS uni.getSystemInfo({ diff --git a/pages/sys/user/message.vue b/pages/sys/user/message.vue index 78b7da6..d62c1ef 100644 --- a/pages/sys/user/message.vue +++ b/pages/sys/user/message.vue @@ -39,6 +39,9 @@ timer: null } }, + onLoad() { + this.updateTitle() + }, computed: { language(){ return this.vuex_language @@ -79,6 +82,7 @@ }, }, onShow() { + this.updateTitle(); this.timer = setInterval(() => { this.getMessage() }, 3000) @@ -89,6 +93,11 @@ } }, methods: { + updateTitle() { + uni.setNavigationBarTitle({ + title: this.$t('homePage.mine.messageAlerts') + }); + }, confirm() { if (this.formModel.readStatus === 0) { this.$u.api.UpdateMessageStatus({ diff --git a/pages/sys/user/pwd.vue b/pages/sys/user/pwd.vue index 94147d5..0d5c0cb 100644 --- a/pages/sys/user/pwd.vue +++ b/pages/sys/user/pwd.vue @@ -84,6 +84,12 @@ export default { }, }; }, + onLoad() { + this.updateTitle() + }, + onShow() { + this.updateTitle() + }, computed: { language(){ return this.vuex_language @@ -104,6 +110,11 @@ export default { this.$refs.uForm.setRules(this.rules); }, methods: { + updateTitle() { + uni.setNavigationBarTitle({ + title: this.$t('homePage.mine.accountSec') + }); + }, submit() { const self = this this.$refs.uForm.validate((valid) => { diff --git a/pages/sys/user/setting.vue b/pages/sys/user/setting.vue index 5de7b75..3a28645 100644 --- a/pages/sys/user/setting.vue +++ b/pages/sys/user/setting.vue @@ -30,6 +30,12 @@ export default { versionCode: null, }; }, + onLoad() { + this.updateTitle() + }, + onShow() { + this.updateTitle() + }, computed:{ language(){ return this.vuex_language @@ -58,10 +64,15 @@ export default { }); } - uni.navigateTo({ + uni.navigateTo({ url: url, }); }, + updateTitle() { + uni.setNavigationBarTitle({ + title: this.$t('homePage.mine.sysSetting') + }); + }, openSettings() { // #ifdef APP-PLUS uni.getSystemInfo({ diff --git a/store/index.js b/store/index.js index 5ac520c..9894245 100644 --- a/store/index.js +++ b/store/index.js @@ -85,7 +85,7 @@ const store = new Vuex.Store({ 'name': 'My' }, ], - vuex_language:"zh_CN", + vuex_language:"en_US", // 如果vuex_version无需保存到本地永久存储，无需lifeData.vuex_version方式 vuex_config: config, vuex_currentComponent:'Data'