From a6f8910ce1b4963c1ecf0f768e8f7adf78d99737 Mon Sep 17 00:00:00 2001 From: George Date: Fri, 27 Feb 2026 21:35:20 +0800 Subject: [PATCH] =?UTF-8?q?2026022:=E5=B0=9D=E8=AF=95=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=B8=BB=E5=8C=85=E5=A4=A7=E5=B0=8F=EF=BC=88=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yack-app/common/mqttTool.js | 2 +- yack-app/env.config.js | 8 +- yack-app/manifest.json | 2 +- yack-app/package.json | 4 +- yack-app/pages.json | 48 +- yack-app/pages/login/index.vue | 6 +- yack-app/pages/tabBar/alert/index.vue | 2 +- yack-app/pages/tabBar/user/user.vue | 4 +- yack-app/pagesA/alert/edit.vue | 214 ++++ yack-app/pagesA/common/webview/index.vue | 38 + yack-app/pagesA/home/device/log/alertLog.vue | 2 +- .../pagesA/home/device/statistic/history.vue | 6 +- yack-app/pagesB/components/cropping/index.vue | 1053 +++++++++++++++++ yack-app/pagesB/login/bindLogin.vue | 10 +- yack-app/pagesB/login/bindRegister.vue | 8 +- yack-app/pagesB/login/firstOpen.vue | 8 +- yack-app/pagesB/login/register.vue | 8 +- yack-app/pagesB/login/smsLogin.vue | 6 +- yack-app/pagesB/login/waitLogin.vue | 8 +- yack-app/pagesB/user/avatar.vue | 2 +- yack-app/pagesB/user/scada/indeScada.vue | 2 +- yack-app/static/home/fastbee.png | Bin 9375 -> 0 bytes yack-app/static/logo-1.png | Bin 5931 -> 0 bytes yack-app/static/logo.9.png | Bin 22375 -> 0 bytes yack-app/static/logo_title.png | Bin 6641 -> 0 bytes yack-app/static/yack.png | Bin 524176 -> 3107 bytes yack-app/unpackage/res/icons/1024x1024.png | Bin 87868 -> 463822 bytes yack-app/unpackage/res/icons/120x120.png | Bin 10441 -> 0 bytes yack-app/unpackage/res/icons/144x144.png | Bin 12114 -> 0 bytes yack-app/unpackage/res/icons/152x152.png | Bin 12635 -> 0 bytes yack-app/unpackage/res/icons/167x167.png | Bin 13682 -> 0 bytes yack-app/unpackage/res/icons/180x180.png | Bin 14558 -> 31982 bytes yack-app/unpackage/res/icons/192x192.png | Bin 15466 -> 35176 bytes yack-app/unpackage/res/icons/20x20.png | Bin 3775 -> 0 bytes yack-app/unpackage/res/icons/29x29.png | Bin 4274 -> 0 bytes yack-app/unpackage/res/icons/40x40.png | Bin 4967 -> 0 bytes yack-app/unpackage/res/icons/58x58.png | Bin 6099 -> 0 bytes yack-app/unpackage/res/icons/60x60.png | Bin 6196 -> 0 bytes yack-app/unpackage/res/icons/72x72.png | Bin 7040 -> 0 bytes yack-app/unpackage/res/icons/76x76.png | Bin 7295 -> 0 bytes yack-app/unpackage/res/icons/80x80.png | Bin 7620 -> 0 bytes yack-app/unpackage/res/icons/87x87.png | Bin 8117 -> 0 bytes yack-app/unpackage/res/icons/96x96.png | Bin 8774 -> 0 bytes 43 files changed, 1378 insertions(+), 63 deletions(-) create mode 100644 yack-app/pagesA/alert/edit.vue create mode 100644 yack-app/pagesA/common/webview/index.vue create mode 100644 yack-app/pagesB/components/cropping/index.vue delete mode 100644 yack-app/static/home/fastbee.png delete mode 100644 yack-app/static/logo-1.png delete mode 100644 yack-app/static/logo.9.png delete mode 100644 yack-app/static/logo_title.png delete mode 100644 yack-app/unpackage/res/icons/120x120.png delete mode 100644 yack-app/unpackage/res/icons/144x144.png delete mode 100644 yack-app/unpackage/res/icons/152x152.png delete mode 100644 yack-app/unpackage/res/icons/167x167.png delete mode 100644 yack-app/unpackage/res/icons/20x20.png delete mode 100644 yack-app/unpackage/res/icons/29x29.png delete mode 100644 yack-app/unpackage/res/icons/40x40.png delete mode 100644 yack-app/unpackage/res/icons/58x58.png delete mode 100644 yack-app/unpackage/res/icons/60x60.png delete mode 100644 yack-app/unpackage/res/icons/72x72.png delete mode 100644 yack-app/unpackage/res/icons/76x76.png delete mode 100644 yack-app/unpackage/res/icons/80x80.png delete mode 100644 yack-app/unpackage/res/icons/87x87.png delete mode 100644 yack-app/unpackage/res/icons/96x96.png diff --git a/yack-app/common/mqttTool.js b/yack-app/common/mqttTool.js index 1b80c2e1..27443e67 100644 --- a/yack-app/common/mqttTool.js +++ b/yack-app/common/mqttTool.js @@ -1,6 +1,5 @@ import projectConfig from '@/env.config.js'; -var mqtt = require('mqtt') var url = projectConfig.mqttServer; let mqttTool = { @@ -8,6 +7,7 @@ let mqttTool = { } mqttTool.connect = function (token) { + var mqtt = require('mqtt'); let options = { clientId: 'phone-' + Math.random().toString(16).substr(2), username: 'fastbee', diff --git a/yack-app/env.config.js b/yack-app/env.config.js index c6f8a021..1ce3ce1f 100644 --- a/yack-app/env.config.js +++ b/yack-app/env.config.js @@ -17,10 +17,10 @@ let xinzhiKey = 'SBh45_yy21FU5ErV_'; const CONFIG = { // 开发环境配置 development: { - officialWebUrl: 'http://localhost:8080/', - baseUrl: 'http://localhost:8080/', - mqttServer: protocalDev + 'localhost/mqtt', - decoderUrl: 'http://localhost:8080/', + officialWebUrl: 'https://ycdat.cn/', + baseUrl: 'https://ycdat.cn/prod-api/', + mqttServer: protocalProd + 'ycdat.cn/mqtt', + decoderUrl: 'https://ycdat.cn/', qqmapKey, xinzhiKey, }, diff --git a/yack-app/manifest.json b/yack-app/manifest.json index 768f4050..7b3cd94e 100644 --- a/yack-app/manifest.json +++ b/yack-app/manifest.json @@ -124,7 +124,7 @@ }, "quickapp" : {}, "mp-weixin" : { - "appid" : "wx5bfbadf52adc17f3", + "appid" : "wx8bcff4708d1f6d2b", "setting" : { "urlCheck" : false, "minified" : true diff --git a/yack-app/package.json b/yack-app/package.json index a898373c..664cccdd 100644 --- a/yack-app/package.json +++ b/yack-app/package.json @@ -5,8 +5,8 @@ "homepage": "https://fastbee.cn", "main": "main.js", "dependencies": { - "jsencrypt": "^3.3.2", - "moment": "^2.30.1", + "dayjs": "^1.11.19", + "jsencrypt": "^3.5.4", "mqtt": "^3.0.0", "vue-i18n": "^9.13.1" }, diff --git a/yack-app/pages.json b/yack-app/pages.json index 9cdedb1f..aa21e1e3 100644 --- a/yack-app/pages.json +++ b/yack-app/pages.json @@ -59,16 +59,6 @@ "enablePullDownRefresh": true } }, - { - "path": "pages/tabBar/alert/edit", - "meta": { - "title": "%navBar.alarmHandling%" - }, - "style": { - "navigationBarTitleText": "%navBar.alarmHandling%", - "enablePullDownRefresh": false - } - }, { "path": "pages/tabBar/trend/trend", "style": { @@ -78,20 +68,30 @@ "bounce": "none" // 将回弹属性关掉 } } - }, - { - "path": "pages/common/webview/index", - "style": { - "navigationBarTitleText": "%navBar.browse%" - }, - "meta": { - "requireAuth": true - } } ], "subPackages": [{ "root": "pagesA", "pages": [{ + "path": "alert/edit", + "meta": { + "title": "%navBar.alarmHandling%" + }, + "style": { + "navigationBarTitleText": "%navBar.alarmHandling%", + "enablePullDownRefresh": false + } + }, + { + "path": "common/webview/index", + "style": { + "navigationBarTitleText": "%navBar.browse%" + }, + "meta": { + "requireAuth": true + } + }, + { "path": "scene/detail", "meta": { "title": "%navBar.sceneDetail%", @@ -624,6 +624,16 @@ } ] }], + "preloadRule": { + "pages/tabBar/home/index": { + "network": "all", + "packages": ["pagesA"] + }, + "pages/tabBar/user/user": { + "network": "all", + "packages": ["pagesB"] + } + }, "globalStyle": { "pageOrientation": "portrait", "navigationBarTitleText": "%common.fastbee%", diff --git a/yack-app/pages/login/index.vue b/yack-app/pages/login/index.vue index 0b5065b6..c567117f 100644 --- a/yack-app/pages/login/index.vue +++ b/yack-app/pages/login/index.vue @@ -453,7 +453,7 @@ let title = this.$tt('login.serviceAgreement'); let url = projectConfig.officialWebUrl + 'service-agreement.html'; uni.navigateTo({ - url: `/pages/common/webview/index?title=${title}&url=${url}` + url: `/pagesA/common/webview/index?title=${title}&url=${url}` }); }, // 隐私政策 @@ -461,7 +461,7 @@ let title = this.$tt('login.privacyPolicy'); let url = projectConfig.officialWebUrl + 'privacy-policy.html'; uni.navigateTo({ - url: `/pages/common/webview/index?title=${title}&url=${url}` + url: `/pagesA/common/webview/index?title=${title}&url=${url}` }); }, //记住密码 @@ -474,7 +474,7 @@ }, openhpLink() { uni.navigateTo({ - url: '/pages/common/webview/index?url=https://ycdat.cn/' + url: '/pagesA/common/webview/index?url=https://ycdat.cn/' }); } } diff --git a/yack-app/pages/tabBar/alert/index.vue b/yack-app/pages/tabBar/alert/index.vue index 10b431af..9090a88b 100644 --- a/yack-app/pages/tabBar/alert/index.vue +++ b/yack-app/pages/tabBar/alert/index.vue @@ -251,7 +251,7 @@ }); // #endif uni.navigateTo({ - url: `/pages/tabBar/alert/edit?alertLogId=${item.alertLogId}&source=2` + url: `/pagesA/alert/edit?alertLogId=${item.alertLogId}&source=2` }); }, // 获取模板id diff --git a/yack-app/pages/tabBar/user/user.vue b/yack-app/pages/tabBar/user/user.vue index e7c98f2a..4c8c6d7a 100644 --- a/yack-app/pages/tabBar/user/user.vue +++ b/yack-app/pages/tabBar/user/user.vue @@ -367,7 +367,7 @@ }, openYanAnLink() { uni.navigateTo({ - url: '/pages/common/webview/index?url=https://ycdat.cn/' + url: '/pagesA/common/webview/index?url=https://ycdat.cn/' }); }, gotoAbout() { @@ -450,7 +450,7 @@ }, openappLink() { uni.navigateTo({ - url: '/pages/common/webview/index?url=https://gitee.com/beecue/fastbee-app/tree/master/app' + url: '/pagesA/common/webview/index?url=https://gitee.com/beecue/fastbee-app/tree/master/app' }); }, // 解绑微信 diff --git a/yack-app/pagesA/alert/edit.vue b/yack-app/pagesA/alert/edit.vue new file mode 100644 index 00000000..dabe6ebc --- /dev/null +++ b/yack-app/pagesA/alert/edit.vue @@ -0,0 +1,214 @@ + + + + + + \ No newline at end of file diff --git a/yack-app/pagesA/common/webview/index.vue b/yack-app/pagesA/common/webview/index.vue new file mode 100644 index 00000000..c139ef15 --- /dev/null +++ b/yack-app/pagesA/common/webview/index.vue @@ -0,0 +1,38 @@ + + + \ No newline at end of file diff --git a/yack-app/pagesA/home/device/log/alertLog.vue b/yack-app/pagesA/home/device/log/alertLog.vue index dc961519..1fc49606 100644 --- a/yack-app/pagesA/home/device/log/alertLog.vue +++ b/yack-app/pagesA/home/device/log/alertLog.vue @@ -153,7 +153,7 @@ }); // #endif uni.navigateTo({ - url: `/pages/tabBar/alert/edit?alertLogId=${item.alertLogId}&source=1` + url: `/pagesA/alert/edit?alertLogId=${item.alertLogId}&source=1` }); }, // 获取模板id diff --git a/yack-app/pagesA/home/device/statistic/history.vue b/yack-app/pagesA/home/device/statistic/history.vue index 4ae8924b..fa3f4657 100644 --- a/yack-app/pagesA/home/device/statistic/history.vue +++ b/yack-app/pagesA/home/device/statistic/history.vue @@ -76,7 +76,7 @@ + + \ No newline at end of file diff --git a/yack-app/pagesB/login/bindLogin.vue b/yack-app/pagesB/login/bindLogin.vue index 7790419c..02807bc1 100644 --- a/yack-app/pagesB/login/bindLogin.vue +++ b/yack-app/pagesB/login/bindLogin.vue @@ -207,7 +207,7 @@ let title = this.$tt('login.privacyPolicy'); let url = projectConfig.officialWebUrl + 'privacy-policy.html'; uni.navigateTo({ - url: `/pages/common/webview/index?title=${title}&url=${url}` + url: `/pagesA/common/webview/index?title=${title}&url=${url}` }); }, // 服务协议 @@ -215,7 +215,7 @@ let title = this.$tt('login.serviceAgreement'); let url = projectConfig.officialWebUrl + 'service-agreement.html'; uni.navigateTo({ - url: `/pages/common/webview/index?title=${title}&url=${url}` + url: `/pagesA/common/webview/index?title=${title}&url=${url}` }); }, // 儿童隐私保护声明 @@ -223,7 +223,7 @@ let title = this.$tt('login.childProtectionStatement'); let url = projectConfig.officialWebUrl + 'child-protection-statement.html'; uni.navigateTo({ - url: `/pages/common/webview/index?title=${title}&url=${url}` + url: `/pagesA/common/webview/index?title=${title}&url=${url}` }); }, // 第三方信息共享清单 @@ -231,7 +231,7 @@ let title = this.$tt('login.commonBill'); let url = projectConfig.officialWebUrl + 'common-bill.html'; uni.navigateTo({ - url: `/pages/common/webview/index?title=${title}&url=${url}` + url: `/pagesA/common/webview/index?title=${title}&url=${url}` }); }, // 勾选协议 @@ -247,7 +247,7 @@ }, openhpLink () { uni.navigateTo({ - url: '/pages/common/webview/index?url=https://ycdat.cn/' + url: '/pagesA/common/webview/index?url=https://ycdat.cn/' }); } } diff --git a/yack-app/pagesB/login/bindRegister.vue b/yack-app/pagesB/login/bindRegister.vue index 11d9ba69..cea65892 100644 --- a/yack-app/pagesB/login/bindRegister.vue +++ b/yack-app/pagesB/login/bindRegister.vue @@ -215,7 +215,7 @@ let title = this.$tt('login.privacyPolicy'); let url = projectConfig.officialWebUrl + 'privacy-policy.html'; uni.navigateTo({ - url: `/pages/common/webview/index?title=${title}&url=${url}` + url: `/pagesA/common/webview/index?title=${title}&url=${url}` }); }, // 服务协议 @@ -223,7 +223,7 @@ let title = this.$tt('login.serviceAgreement'); let url = projectConfig.officialWebUrl + 'service-agreement.html'; uni.navigateTo({ - url: `/pages/common/webview/index?title=${title}&url=${url}` + url: `/pagesA/common/webview/index?title=${title}&url=${url}` }); }, // 儿童隐私保护声明 @@ -231,7 +231,7 @@ let title = this.$tt('login.childProtectionStatement'); let url = projectConfig.officialWebUrl + 'child-protection-statement.html'; uni.navigateTo({ - url: `/pages/common/webview/index?title=${title}&url=${url}` + url: `/pagesA/common/webview/index?title=${title}&url=${url}` }); }, // 第三方信息共享清单 @@ -239,7 +239,7 @@ let title = this.$tt('login.commonBill'); let url = projectConfig.officialWebUrl + 'common-bill.html'; uni.navigateTo({ - url: `/pages/common/webview/index?title=${title}&url=${url}` + url: `/pagesA/common/webview/index?title=${title}&url=${url}` }); }, // 勾选协议 diff --git a/yack-app/pagesB/login/firstOpen.vue b/yack-app/pagesB/login/firstOpen.vue index e983080a..7f5354fb 100644 --- a/yack-app/pagesB/login/firstOpen.vue +++ b/yack-app/pagesB/login/firstOpen.vue @@ -33,7 +33,7 @@ let title = this.$tt('login.privacyPolicy'); let url = projectConfig.officialWebUrl + 'privacy-policy.html'; uni.navigateTo({ - url: `/pages/common/webview/index?title=${title}&url=${url}` + url: `/pagesA/common/webview/index?title=${title}&url=${url}` }); }, // 服务协议 @@ -41,7 +41,7 @@ let title = this.$tt('login.serviceAgreement'); let url = projectConfig.officialWebUrl + 'service-agreement.html'; uni.navigateTo({ - url: `/pages/common/webview/index?title=${title}&url=${url}` + url: `/pagesA/common/webview/index?title=${title}&url=${url}` }); }, // 儿童隐私保护声明 @@ -49,7 +49,7 @@ let title = this.$tt('login.childProtectionStatement'); let url = projectConfig.officialWebUrl + 'child-protection-statement.html'; uni.navigateTo({ - url: `/pages/common/webview/index?title=${title}&url=${url}` + url: `/pagesA/common/webview/index?title=${title}&url=${url}` }); }, // 第三方信息共享清单 @@ -57,7 +57,7 @@ let title = this.$tt('login.commonBill'); let url = projectConfig.officialWebUrl + 'common-bill.html'; uni.navigateTo({ - url: `/pages/common/webview/index?title=${title}&url=${url}` + url: `/pagesA/common/webview/index?title=${title}&url=${url}` }); }, //点击同意 diff --git a/yack-app/pagesB/login/register.vue b/yack-app/pagesB/login/register.vue index 8705ad48..7760230e 100644 --- a/yack-app/pagesB/login/register.vue +++ b/yack-app/pagesB/login/register.vue @@ -204,7 +204,7 @@ let title = this.$tt('login.privacyPolicy'); let url = projectConfig.officialWebUrl + 'privacy-policy.html'; uni.navigateTo({ - url: `/pages/common/webview/index?title=${title}&url=${url}` + url: `/pagesA/common/webview/index?title=${title}&url=${url}` }); }, // 服务协议 @@ -212,7 +212,7 @@ let title = this.$tt('login.serviceAgreement'); let url = projectConfig.officialWebUrl + 'service-agreement.html'; uni.navigateTo({ - url: `/pages/common/webview/index?title=${title}&url=${url}` + url: `/pagesA/common/webview/index?title=${title}&url=${url}` }); }, // 儿童隐私保护声明 @@ -220,7 +220,7 @@ let title = this.$tt('login.childProtectionStatement'); let url = projectConfig.officialWebUrl + 'child-protection-statement.html'; uni.navigateTo({ - url: `/pages/common/webview/index?title=${title}&url=${url}` + url: `/pagesA/common/webview/index?title=${title}&url=${url}` }); }, // 第三方信息共享清单 @@ -228,7 +228,7 @@ let title = this.$tt('login.commonBill'); let url = projectConfig.officialWebUrl + 'common-bill.html'; uni.navigateTo({ - url: `/pages/common/webview/index?title=${title}&url=${url}` + url: `/pagesA/common/webview/index?title=${title}&url=${url}` }); }, // 勾选协议 diff --git a/yack-app/pagesB/login/smsLogin.vue b/yack-app/pagesB/login/smsLogin.vue index 8bb14c67..22976914 100644 --- a/yack-app/pagesB/login/smsLogin.vue +++ b/yack-app/pagesB/login/smsLogin.vue @@ -182,7 +182,7 @@ let title = this.$tt('login.serviceAgreement'); let url = projectConfig.officialWebUrl + 'service-agreement.html'; uni.navigateTo({ - url: `/pages/common/webview/index?title=${title}&url=${url}` + url: `/pagesA/common/webview/index?title=${title}&url=${url}` }); }, // 隐私政策 @@ -190,12 +190,12 @@ let title = this.$tt('login.privacyPolicy'); let url = projectConfig.officialWebUrl + 'privacy-policy.html'; uni.navigateTo({ - url: `/pages/common/webview/index?title=${title}&url=${url}` + url: `/pagesA/common/webview/index?title=${title}&url=${url}` }); }, openhpLink () { uni.navigateTo({ - url: '/pages/common/webview/index?url=https://ycdat.cn/' + url: '/pagesA/common/webview/index?url=https://ycdat.cn/' }); } } diff --git a/yack-app/pagesB/login/waitLogin.vue b/yack-app/pagesB/login/waitLogin.vue index 7955789c..0ded6c5f 100644 --- a/yack-app/pagesB/login/waitLogin.vue +++ b/yack-app/pagesB/login/waitLogin.vue @@ -75,7 +75,7 @@ let title = this.$tt('login.privacyPolicy'); let url = projectConfig.officialWebUrl + 'privacy-policy.html'; uni.navigateTo({ - url: `/pages/common/webview/index?title=${title}&url=${url}` + url: `/pagesA/common/webview/index?title=${title}&url=${url}` }); }, // 服务协议 @@ -83,7 +83,7 @@ let title = this.$tt('login.serviceAgreement'); let url = projectConfig.officialWebUrl + 'service-agreement.html'; uni.navigateTo({ - url: `/pages/common/webview/index?title=${title}&url=${url}` + url: `/pagesA/common/webview/index?title=${title}&url=${url}` }); }, // 儿童隐私保护声明 @@ -91,7 +91,7 @@ let title = this.$tt('login.childProtectionStatement'); let url = projectConfig.officialWebUrl + 'child-protection-statement.html'; uni.navigateTo({ - url: `/pages/common/webview/index?title=${title}&url=${url}` + url: `/pagesA/common/webview/index?title=${title}&url=${url}` }); }, // 第三方信息共享清单 @@ -99,7 +99,7 @@ let title = this.$tt('login.commonBill'); let url = projectConfig.officialWebUrl + 'common-bill.html'; uni.navigateTo({ - url: `/pages/common/webview/index?title=${title}&url=${url}` + url: `/pagesA/common/webview/index?title=${title}&url=${url}` }); }, //前往登录页面 diff --git a/yack-app/pagesB/user/avatar.vue b/yack-app/pagesB/user/avatar.vue index 5a37057e..2498a276 100644 --- a/yack-app/pagesB/user/avatar.vue +++ b/yack-app/pagesB/user/avatar.vue @@ -5,7 +5,7 @@