diff --git a/wumei-smart-app-master/.gitignore b/yack-app/.gitignore similarity index 100% rename from wumei-smart-app-master/.gitignore rename to yack-app/.gitignore diff --git a/wumei-smart-app-master/App.vue b/yack-app/App.vue similarity index 100% rename from wumei-smart-app-master/App.vue rename to yack-app/App.vue diff --git a/wumei-smart-app-master/README.md b/yack-app/README.md similarity index 100% rename from wumei-smart-app-master/README.md rename to yack-app/README.md diff --git a/wumei-smart-app-master/apis/http.api.js b/yack-app/apis/http.api.js similarity index 100% rename from wumei-smart-app-master/apis/http.api.js rename to yack-app/apis/http.api.js diff --git a/wumei-smart-app-master/apis/http.interceptor.js b/yack-app/apis/http.interceptor.js similarity index 100% rename from wumei-smart-app-master/apis/http.interceptor.js rename to yack-app/apis/http.interceptor.js diff --git a/wumei-smart-app-master/apis/modules/account.js b/yack-app/apis/modules/account.js similarity index 100% rename from wumei-smart-app-master/apis/modules/account.js rename to yack-app/apis/modules/account.js diff --git a/wumei-smart-app-master/apis/modules/alertLog.js b/yack-app/apis/modules/alertLog.js similarity index 100% rename from wumei-smart-app-master/apis/modules/alertLog.js rename to yack-app/apis/modules/alertLog.js diff --git a/wumei-smart-app-master/apis/modules/common.js b/yack-app/apis/modules/common.js similarity index 100% rename from wumei-smart-app-master/apis/modules/common.js rename to yack-app/apis/modules/common.js diff --git a/wumei-smart-app-master/apis/modules/device.js b/yack-app/apis/modules/device.js similarity index 100% rename from wumei-smart-app-master/apis/modules/device.js rename to yack-app/apis/modules/device.js diff --git a/wumei-smart-app-master/apis/modules/deviceLog.js b/yack-app/apis/modules/deviceLog.js similarity index 100% rename from wumei-smart-app-master/apis/modules/deviceLog.js rename to yack-app/apis/modules/deviceLog.js diff --git a/wumei-smart-app-master/apis/modules/deviceUser.js b/yack-app/apis/modules/deviceUser.js similarity index 100% rename from wumei-smart-app-master/apis/modules/deviceUser.js rename to yack-app/apis/modules/deviceUser.js diff --git a/wumei-smart-app-master/apis/modules/gateway.js b/yack-app/apis/modules/gateway.js similarity index 100% rename from wumei-smart-app-master/apis/modules/gateway.js rename to yack-app/apis/modules/gateway.js diff --git a/wumei-smart-app-master/apis/modules/group.js b/yack-app/apis/modules/group.js similarity index 100% rename from wumei-smart-app-master/apis/modules/group.js rename to yack-app/apis/modules/group.js diff --git a/wumei-smart-app-master/apis/modules/job.js b/yack-app/apis/modules/job.js similarity index 100% rename from wumei-smart-app-master/apis/modules/job.js rename to yack-app/apis/modules/job.js diff --git a/wumei-smart-app-master/apis/modules/log.js b/yack-app/apis/modules/log.js similarity index 100% rename from wumei-smart-app-master/apis/modules/log.js rename to yack-app/apis/modules/log.js diff --git a/wumei-smart-app-master/apis/modules/model.js b/yack-app/apis/modules/model.js similarity index 100% rename from wumei-smart-app-master/apis/modules/model.js rename to yack-app/apis/modules/model.js diff --git a/wumei-smart-app-master/apis/modules/notice.js b/yack-app/apis/modules/notice.js similarity index 100% rename from wumei-smart-app-master/apis/modules/notice.js rename to yack-app/apis/modules/notice.js diff --git a/wumei-smart-app-master/apis/modules/player.js b/yack-app/apis/modules/player.js similarity index 100% rename from wumei-smart-app-master/apis/modules/player.js rename to yack-app/apis/modules/player.js diff --git a/wumei-smart-app-master/apis/modules/product.js b/yack-app/apis/modules/product.js similarity index 100% rename from wumei-smart-app-master/apis/modules/product.js rename to yack-app/apis/modules/product.js diff --git a/wumei-smart-app-master/apis/modules/runtime.js b/yack-app/apis/modules/runtime.js similarity index 100% rename from wumei-smart-app-master/apis/modules/runtime.js rename to yack-app/apis/modules/runtime.js diff --git a/wumei-smart-app-master/apis/modules/scada.js b/yack-app/apis/modules/scada.js similarity index 100% rename from wumei-smart-app-master/apis/modules/scada.js rename to yack-app/apis/modules/scada.js diff --git a/wumei-smart-app-master/apis/modules/scene.js b/yack-app/apis/modules/scene.js similarity index 100% rename from wumei-smart-app-master/apis/modules/scene.js rename to yack-app/apis/modules/scene.js diff --git a/wumei-smart-app-master/apis/modules/sip.js b/yack-app/apis/modules/sip.js similarity index 100% rename from wumei-smart-app-master/apis/modules/sip.js rename to yack-app/apis/modules/sip.js diff --git a/wumei-smart-app-master/apis/modules/trend.js b/yack-app/apis/modules/trend.js similarity index 100% rename from wumei-smart-app-master/apis/modules/trend.js rename to yack-app/apis/modules/trend.js diff --git a/wumei-smart-app-master/common/bus.js b/yack-app/common/bus.js similarity index 100% rename from wumei-smart-app-master/common/bus.js rename to yack-app/common/bus.js diff --git a/wumei-smart-app-master/common/extend.js b/yack-app/common/extend.js similarity index 100% rename from wumei-smart-app-master/common/extend.js rename to yack-app/common/extend.js diff --git a/wumei-smart-app-master/common/filters.js b/yack-app/common/filters.js similarity index 100% rename from wumei-smart-app-master/common/filters.js rename to yack-app/common/filters.js diff --git a/wumei-smart-app-master/common/mqttTool.js b/yack-app/common/mqttTool.js similarity index 98% rename from wumei-smart-app-master/common/mqttTool.js rename to yack-app/common/mqttTool.js index ef44c223..1b80c2e1 100644 --- a/wumei-smart-app-master/common/mqttTool.js +++ b/yack-app/common/mqttTool.js @@ -1,6 +1,6 @@ import projectConfig from '@/env.config.js'; -var mqtt = require('mqtt/dist/mqtt.min.js') +var mqtt = require('mqtt') var url = projectConfig.mqttServer; let mqttTool = { diff --git a/wumei-smart-app-master/common/qqmap-wx-jssdk.min.js b/yack-app/common/qqmap-wx-jssdk.min.js similarity index 100% rename from wumei-smart-app-master/common/qqmap-wx-jssdk.min.js rename to yack-app/common/qqmap-wx-jssdk.min.js diff --git a/wumei-smart-app-master/common/tools.js b/yack-app/common/tools.js similarity index 100% rename from wumei-smart-app-master/common/tools.js rename to yack-app/common/tools.js diff --git a/wumei-smart-app-master/components/NavBar/NavBar.vue b/yack-app/components/NavBar/NavBar.vue similarity index 88% rename from wumei-smart-app-master/components/NavBar/NavBar.vue rename to yack-app/components/NavBar/NavBar.vue index e848c47b..8e2b3999 100644 --- a/wumei-smart-app-master/components/NavBar/NavBar.vue +++ b/yack-app/components/NavBar/NavBar.vue @@ -3,8 +3,9 @@ - @@ -22,9 +23,11 @@ + - @@ -150,22 +153,35 @@ display: flex; align-items: center; - .logo { + .logo-wrap { + display: flex; + align-items: center; + gap: 12rpx; animation: fadeIn 0.8s ease; + + .logo-img { + width: 70rpx; + height: 70rpx; + flex-shrink: 0; + object-fit: contain; + } + + .logo-title { + font-size: 26rpx; + color: #fff; + font-weight: 500; + white-space: nowrap; + line-height: 44px; + } } .icon { width: 70rpx; height: 70rpx; - background-image: url('/static/login/fastbee.png'); - background-size: cover; - filter: drop-shadow(0 2rpx 4rpx rgba(0, 0, 0, 0.2)); + background-image: url('/static/yack.png'); + background-size: contain; + background-repeat: no-repeat; animation: scaleUp 0.5s ease; - transition: transform 0.2s ease; - - &:hover { - animation: hoverAnimation 0.3s forwards; - } } } diff --git a/wumei-smart-app-master/components/circleProgress/circleProgress.vue b/yack-app/components/circleProgress/circleProgress.vue similarity index 100% rename from wumei-smart-app-master/components/circleProgress/circleProgress.vue rename to yack-app/components/circleProgress/circleProgress.vue diff --git a/wumei-smart-app-master/components/cl-icon/cl-icon.vue b/yack-app/components/cl-icon/cl-icon.vue similarity index 100% rename from wumei-smart-app-master/components/cl-icon/cl-icon.vue rename to yack-app/components/cl-icon/cl-icon.vue diff --git a/wumei-smart-app-master/components/cl-icon/iconfont.css b/yack-app/components/cl-icon/iconfont.css similarity index 100% rename from wumei-smart-app-master/components/cl-icon/iconfont.css rename to yack-app/components/cl-icon/iconfont.css diff --git a/wumei-smart-app-master/components/cl-icon/iconfont.json b/yack-app/components/cl-icon/iconfont.json similarity index 100% rename from wumei-smart-app-master/components/cl-icon/iconfont.json rename to yack-app/components/cl-icon/iconfont.json diff --git a/wumei-smart-app-master/components/cl-icon/iconfont.ttf b/yack-app/components/cl-icon/iconfont.ttf similarity index 100% rename from wumei-smart-app-master/components/cl-icon/iconfont.ttf rename to yack-app/components/cl-icon/iconfont.ttf diff --git a/wumei-smart-app-master/components/cl-icon/iconfont.woff b/yack-app/components/cl-icon/iconfont.woff similarity index 100% rename from wumei-smart-app-master/components/cl-icon/iconfont.woff rename to yack-app/components/cl-icon/iconfont.woff diff --git a/wumei-smart-app-master/components/cl-icon/iconfont.woff2 b/yack-app/components/cl-icon/iconfont.woff2 similarity index 100% rename from wumei-smart-app-master/components/cl-icon/iconfont.woff2 rename to yack-app/components/cl-icon/iconfont.woff2 diff --git a/wumei-smart-app-master/components/cl-icon/index.vue b/yack-app/components/cl-icon/index.vue similarity index 100% rename from wumei-smart-app-master/components/cl-icon/index.vue rename to yack-app/components/cl-icon/index.vue diff --git a/wumei-smart-app-master/components/cl-icon/readme.md b/yack-app/components/cl-icon/readme.md similarity index 100% rename from wumei-smart-app-master/components/cl-icon/readme.md rename to yack-app/components/cl-icon/readme.md diff --git a/wumei-smart-app-master/components/cl-test/cl-test.vue b/yack-app/components/cl-test/cl-test.vue similarity index 100% rename from wumei-smart-app-master/components/cl-test/cl-test.vue rename to yack-app/components/cl-test/cl-test.vue diff --git a/wumei-smart-app-master/components/cl-test/index.vue b/yack-app/components/cl-test/index.vue similarity index 100% rename from wumei-smart-app-master/components/cl-test/index.vue rename to yack-app/components/cl-test/index.vue diff --git a/wumei-smart-app-master/components/cropping/index.vue b/yack-app/components/cropping/index.vue similarity index 100% rename from wumei-smart-app-master/components/cropping/index.vue rename to yack-app/components/cropping/index.vue diff --git a/wumei-smart-app-master/components/model/vip-model.vue b/yack-app/components/model/vip-model.vue similarity index 100% rename from wumei-smart-app-master/components/model/vip-model.vue rename to yack-app/components/model/vip-model.vue diff --git a/wumei-smart-app-master/components/weather/index.vue b/yack-app/components/weather/index.vue similarity index 100% rename from wumei-smart-app-master/components/weather/index.vue rename to yack-app/components/weather/index.vue diff --git a/wumei-smart-app-master/env.config.js b/yack-app/env.config.js similarity index 61% rename from wumei-smart-app-master/env.config.js rename to yack-app/env.config.js index 5715f217..c6f8a021 100644 --- a/wumei-smart-app-master/env.config.js +++ b/yack-app/env.config.js @@ -17,19 +17,19 @@ let xinzhiKey = 'SBh45_yy21FU5ErV_'; const CONFIG = { // 开发环境配置 development: { - officialWebUrl: 'https://fastbee.cn/', - baseUrl: 'https://iot.fastbee.cn/prod-api/', - mqttServer: protocalDev + 'iot.fastbee.cn/mqtt', - decoderUrl: 'https://iot.fastbee.cn/', + officialWebUrl: 'http://localhost:8080/', + baseUrl: 'http://localhost:8080/', + mqttServer: protocalDev + 'localhost/mqtt', + decoderUrl: 'http://localhost:8080/', qqmapKey, xinzhiKey, }, // 生产环境配置 production: { - officialWebUrl: 'https://fastbee.cn/', - baseUrl: 'https://iot.fastbee.cn/prod-api/', - mqttServer: protocalProd + 'iot.fastbee.cn/mqtt', - decoderUrl: 'https://iot.fastbee.cn/', + officialWebUrl: 'https://ycdat.cn/', + baseUrl: 'https://ycdat.cn/prod-api/', + mqttServer: protocalProd + 'ycdat.cn/mqtt', + decoderUrl: 'https://ycdat.cn/', qqmapKey, xinzhiKey, } diff --git a/wumei-smart-app-master/helpers/common.js b/yack-app/helpers/common.js similarity index 100% rename from wumei-smart-app-master/helpers/common.js rename to yack-app/helpers/common.js diff --git a/wumei-smart-app-master/locale/en-US.json b/yack-app/locale/en-US.json similarity index 99% rename from wumei-smart-app-master/locale/en-US.json rename to yack-app/locale/en-US.json index d41206cc..8363e299 100644 --- a/wumei-smart-app-master/locale/en-US.json +++ b/yack-app/locale/en-US.json @@ -33,7 +33,7 @@ "navBar.deviceSharing": "Device Dharing", "navBar.shareDetails": "Share User Details", "navBar.about ": "About", - "common.fastbee": "Fastbee", + "common.fastbee": "YanAn", "navBar.latest": "Latest news", "navBar.newsDetail": "News Detail", "navBar.setting": "System Setting", @@ -87,7 +87,7 @@ "inputCode": "Please Input Code", "login": "Log in", "exampleAccount": "Example:fastbee 123456", - "HuapuIoT": "HuapuIoT", + "HuapuIoT": "YanAn", "registerNow": "Register", "readAndAgree": "Read and Agree", "serviceAgreement": "Service Agreement", @@ -119,7 +119,7 @@ "smsLogin": { "smsLogin": "Sms Login", "login": "Log in", - "HuapuIoT": "HuapuIoT ", + "HuapuIoT": "YanAn", "accountLogin": "Account Login", "obtainCode": "Obtain Code", "correctPhone": "Please Input Correct PhoneNumber", @@ -247,8 +247,8 @@ "group": "Group: 720136372, 1073236354", "webSite": "Official Website", "SourceCode": "View The Source Code", - "open": "FastBee-Open source IoT platform Version 2.5.1", - "message": "Qujing Fengxin Technology Co., Ltd | HuapuIOT | Official website fastbee.cn" + "open": "YanAn Data Platform Version 2.5.1", + "message": "YanAn Data Platform | fastbee.cn | ycdat.cn" }, "deviceDetail": { "basicMsg": "Basic Messages", diff --git a/wumei-smart-app-master/locale/index.js b/yack-app/locale/index.js similarity index 100% rename from wumei-smart-app-master/locale/index.js rename to yack-app/locale/index.js diff --git a/wumei-smart-app-master/locale/zh-CN.json b/yack-app/locale/zh-CN.json similarity index 98% rename from wumei-smart-app-master/locale/zh-CN.json rename to yack-app/locale/zh-CN.json index 7fa42ff8..c7e54e91 100644 --- a/wumei-smart-app-master/locale/zh-CN.json +++ b/yack-app/locale/zh-CN.json @@ -47,7 +47,7 @@ "navBar.eventLog": "事件日志", "navBar.orderLog": "指令日志", "navBar.player": "播放器", - "common.fastbee": "蜂信物联", + "common.fastbee": "岩安测控", "common.add": "添加", "common.delete": "删除", "common.save": "保存", @@ -85,7 +85,8 @@ "inputCode": "请输入验证码", "login": "登录", "exampleAccount": "演示账号: fastbee 123456", - "HuapuIoT": "华普物联", + + "HuapuIoT": "岩安WEB平台", "registerNow": "现在注册", "readAndAgree": "已阅读并同意", "serviceAgreement": "服务协议", @@ -96,7 +97,7 @@ "readAndCheckTheAgreement": "请阅读并勾选协议", "accontMsg": "账号信息不能为空", "phoneLogin": "手机号快捷登录", - "welcomeToLogin": "欢迎登录峰信物联", + "welcomeToLogin": "欢迎登录岩安测控", "phoneAuthorization": "手机授权登录", "remember": "记住密码", "other": "其他方式登录" @@ -119,7 +120,7 @@ "inputPhone": "请输入手机号码", "inputCode": "请输入验证码", "login": "登录", - "HuapuIoT": "华普物联", + "HuapuIoT": "岩安官网", "accountLogin": "账号登录", "obtainCode": "获取验证码", "correctPhone": "请输入正确的手机号码", @@ -155,7 +156,7 @@ }, "user": { "personalCentre": "个人中心", - "openIOT": "蜂信物联-开源物联网平台", + "openIOT": "岩安测控数据平台-开源物联网平台", "addDevice": "添加设备", "addScene": "添加场景", "groupManagement": "分组管理", @@ -247,8 +248,8 @@ "group": "交流群:720136372,1073236354", "webSite": "官方网站", "SourceCode": "查看源码", - "open": "开源物联网平台 Version 2.5.1", - "message": "曲靖蜂信科技有限公司 | 华普物联 | 官网 fastbee.cn" + "open": "岩安测控数据平台 Version 2.5.1", + "message": "岩安测控数据平台 | 官网 fastbee.cn | ycdat.cn" }, "deviceDetail": { "basicMsg": "基本信息", diff --git a/wumei-smart-app-master/main.js b/yack-app/main.js similarity index 100% rename from wumei-smart-app-master/main.js rename to yack-app/main.js diff --git a/wumei-smart-app-master/manifest.json b/yack-app/manifest.json similarity index 97% rename from wumei-smart-app-master/manifest.json rename to yack-app/manifest.json index 880c40c5..00140f60 100644 --- a/wumei-smart-app-master/manifest.json +++ b/yack-app/manifest.json @@ -1,7 +1,7 @@ { - "name" : "蜂信物联", + "name" : "岩安测控", "appid" : "__UNI__7E6DA69", - "description" : "开源物联网平台", + "description" : "岩安测控数据平台", "versionName" : "2.2.0", "versionCode" : 200, "transformPx" : false, @@ -65,7 +65,7 @@ "ad" : {}, "oauth" : { "weixin" : { - "appid" : "wx6be3f0d7bf7154e1", + "appid" : "wx8bcff4708d1f6d2b", "appsecret" : "b6c1d0da60bd5250857d211cdc64fdc9", "UniversalLinks" : "" } @@ -157,7 +157,7 @@ "enable" : false }, "h5" : { - "title" : "蜂信物联", + "title" : "岩安测控", "router" : { "mode" : "hash", "base" : "./" diff --git a/wumei-smart-app-master/package.json b/yack-app/package.json similarity index 60% rename from wumei-smart-app-master/package.json rename to yack-app/package.json index 07aaee1d..4712ad70 100644 --- a/wumei-smart-app-master/package.json +++ b/yack-app/package.json @@ -1,7 +1,7 @@ { "name": "fastbee-app", "version": "2.5.1", - "description": "手机端,可用于中小企业快速搭建物联网系统,个人学习搭建智能家居平台;适用于智能家居、智慧办公、智慧社区、农业监测、工业控制等", + "description": "岩安测控数据平台-手机端,可用于中小企业快速搭建物联网系统,个人学习搭建智能家居平台;适用于智能家居、智慧办公、智慧社区、农业监测、工业控制等", "homepage": "https://fastbee.cn", "main": "main.js", "dependencies": { @@ -20,6 +20,6 @@ "keywords": [ "fastbee" ], - "author": "fastbee", - "license": "ISC" +"author": "kerwincui", + "license": "AGPL-3.0" } diff --git a/wumei-smart-app-master/pages.json b/yack-app/pages.json similarity index 100% rename from wumei-smart-app-master/pages.json rename to yack-app/pages.json diff --git a/wumei-smart-app-master/pages/common/webview/index.vue b/yack-app/pages/common/webview/index.vue similarity index 100% rename from wumei-smart-app-master/pages/common/webview/index.vue rename to yack-app/pages/common/webview/index.vue diff --git a/wumei-smart-app-master/pages/login/index.vue b/yack-app/pages/login/index.vue similarity index 97% rename from wumei-smart-app-master/pages/login/index.vue rename to yack-app/pages/login/index.vue index 344175e5..0b5065b6 100644 --- a/wumei-smart-app-master/pages/login/index.vue +++ b/yack-app/pages/login/index.vue @@ -1,7 +1,8 @@