20260210:yack-app提交
This commit is contained in:
George
parent
ba3eb91485
commit
31dc1e0880
@ -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 = {
|
||||
@ -3,8 +3,9 @@
|
||||
<!-- #ifdef H5-->
|
||||
<view class="navbar h5">
|
||||
<view class="navbar-left" @click="toggleSearchMode">
|
||||
<view v-if="!isSearching" class="logo">
|
||||
<image src="../../static/logo-1.png" mode="widthFix" style="width: 260rpx;"></image>
|
||||
<view v-if="!isSearching" class="logo-wrap">
|
||||
<image src="/static/yack.png" mode="aspectFit" class="logo-img"></image>
|
||||
<text class="logo-title">{{$tt('common.fastbee')}}</text>
|
||||
</view>
|
||||
<view v-else class="icon"></view>
|
||||
</view>
|
||||
@ -22,9 +23,11 @@
|
||||
<!-- #endif -->
|
||||
<!-- #ifdef APP-PLUS || MP-WEIXIN-->
|
||||
<view class="navbar weixin">
|
||||
<!-- 首页搜索遮罩 -->
|
||||
<view class="navbar-left" @click="toggleSearchMode">
|
||||
<view v-if="!isSearching" class="logo">
|
||||
<image src="../../static/logo-1.png" mode="widthFix" style="width: 260rpx;"></image>
|
||||
<view v-if="!isSearching" class="logo-wrap">
|
||||
<image src="/static/yack.png" mode="aspectFit" class="logo-img"></image>
|
||||
<text class="logo-title">{{$tt('common.fastbee')}}</text>
|
||||
</view>
|
||||
<view v-else class="icon"></view>
|
||||
</view>
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -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,
|
||||
}
|
||||
@ -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",
|
||||
@ -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": "基本信息",
|
||||
@ -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" : "./"
|
||||
@ -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"
|
||||
}
|
||||
@ -1,7 +1,8 @@
|
||||
<template>
|
||||
<view class="login-wrap">
|
||||
<view class="top-wrap">
|
||||
<image src="../../static/logo_title.png" mode="widthFix" style="width: 500rpx;"></image>
|
||||
<image src="/static/yack.png" mode="widthFix" style="width: 500rpx;"></image>
|
||||
<view class="logo-text">{{$tt('common.fastbee')}}</view>
|
||||
</view>
|
||||
<view class="main-wrap">
|
||||
<u--form :model="loginForm" :rules="rules" ref="form" labelWidth="31">
|
||||
@ -89,7 +90,7 @@
|
||||
<view class="one-click-login-pop-wrap">
|
||||
<u-popup :show="isShowPop" mode="bottom" :round="10" closeable="true" @close="isShowPop = false">
|
||||
<view class="content-wrap">
|
||||
<u--image :showLoading="true" src="/static/logo_title.png" width="260rpx" height="90rpx"
|
||||
<u--image :showLoading="true" src="/static/yack.png" width="260rpx" height="90rpx"
|
||||
customStyle="float:left"></u--image>
|
||||
<text class="title">{{$tt("login.welcomeToLogin")}}</text>
|
||||
<view class="btn-login">
|
||||
@ -473,7 +474,7 @@
|
||||
},
|
||||
openhpLink() {
|
||||
uni.navigateTo({
|
||||
url: '/pages/common/webview/index?url=http://www.hpiot.cn/'
|
||||
url: '/pages/common/webview/index?url=https://ycdat.cn/'
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -496,8 +497,16 @@
|
||||
.top-wrap {
|
||||
height: 510rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
.logo-text {
|
||||
margin-top: 16rpx;
|
||||
font-size: 32rpx;
|
||||
color: #333;
|
||||
font-weight: 500;
|
||||
}
|
||||
}
|
||||
|
||||
.main-wrap {
|
||||
@ -488,7 +488,7 @@
|
||||
}
|
||||
|
||||
// 小程序中popup坑
|
||||
/deep/ .u-safe-bottom {
|
||||
::v-deep .u-safe-bottom {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
@ -109,10 +109,10 @@
|
||||
<view class="right"><u-icon class="iconfont" name="arrow-right" size="12" color="#333"></u-icon>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 华普 -->
|
||||
<view class="item" @tap="openhpLink">
|
||||
<!-- 岩安官网 -->
|
||||
<view class="item" @tap="openYanAnLink">
|
||||
<view class="left">
|
||||
<u-icon class="iconfont" name="/static/hp_logo.png" size="22" color="#fff"></u-icon>
|
||||
<u-icon class="iconfont" name="/static/yack.png" size="22" color="#fff"></u-icon>
|
||||
<text class="text">{{$tt('login.HuapuIoT')}}</text>
|
||||
</view>
|
||||
<view class="right"><u-icon class="iconfont" name="arrow-right" size="12" color="#333"></u-icon>
|
||||
@ -365,9 +365,9 @@
|
||||
})*/
|
||||
uni.$u.route('/pagesB/user/resetPsd');
|
||||
},
|
||||
openhpLink() {
|
||||
openYanAnLink() {
|
||||
uni.navigateTo({
|
||||
url: '/pages/common/webview/index?url=http://www.hpiot.cn/'
|
||||
url: '/pages/common/webview/index?url=https://ycdat.cn/'
|
||||
});
|
||||
},
|
||||
gotoAbout() {
|
||||
@ -741,14 +741,14 @@
|
||||
/* 设置文字颜色 */
|
||||
}
|
||||
|
||||
/deep/.uni-list-item__content-title[data-v-296a3d7e] {
|
||||
::v-deep.uni-list-item__content-title[data-v-296a3d7e] {
|
||||
font-size: 30rpx;
|
||||
color: #333;
|
||||
overflow: hidden;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
/deep/.uni-list-item__container {
|
||||
::v-deep.uni-list-item__container {
|
||||
padding: 30rpx;
|
||||
}
|
||||
|
||||
@ -443,7 +443,7 @@
|
||||
.time-shortcut {
|
||||
width: 190rpx;
|
||||
|
||||
/deep/ .uni-select {
|
||||
::v-deep .uni-select {
|
||||
height: 70rpx;
|
||||
}
|
||||
}
|
||||
@ -1377,7 +1377,7 @@
|
||||
padding: 0px 18px;
|
||||
border-radius: 5px;
|
||||
|
||||
/deep/ .u-line:first-child {
|
||||
::v-deep .u-line:first-child {
|
||||
border-bottom: transparent !important;
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user