diff --git a/components/MsgBox/MsgBox.vue b/components/MsgBox/MsgBox.vue
index 41f8d0c..3c4bea3 100644
--- a/components/MsgBox/MsgBox.vue
+++ b/components/MsgBox/MsgBox.vue
@@ -6,10 +6,12 @@
:buttonTextColor="item.buttonTextColor" :iconUrl="item.iconUrl" :message="item.message"
:buttonText="item.buttonText" @buttonClick="okCallback(item,index)" :visiblePrompt="item.visiblePrompt"
:promptTitle="item.promptTitle" v-model="item.modelValue" @closePop="closePop(item)"
- :buttonCancelText="item.buttonCancelText" :showCancel="item.showCancel"
+ :buttonCancelText="item.buttonCancelText" :showCancel="item.showCancel" :showSlot="item.showSlot"
:showHeader="item.showHeader" :headerTxt="item.headerTxt"
- @cancelPop="cancelClick(item,index)" />
+ @cancelPop="cancelClick(item,index)" >
+
+
@@ -48,10 +50,10 @@
this.closePop(item);
},
closePop: function(item) {
- debugger;
+
if (item) {
this.Msgboxs.find((v, i) => {
- debugger;
+
if (item.key && v.key) {
if (item.key === v.key) {
this.Msgboxs.splice(i, 1);
@@ -79,7 +81,7 @@
showPop: true, //是否显示弹窗
popType: 'custom',
bgColor: '#383934bd',
- borderColor: '#BBE600',
+ borderColor: '#BBE6004d',
textColor: '#ffffffde',
buttonBgColor: '#BBE600',
buttonTextColor: '#232323DE',
@@ -116,7 +118,7 @@
}
if (!json.borderColor) {
- json.borderColor = '#BBE600';
+ json.borderColor = '#BBE6004d';
json.buttonBgColor = '#BBE600';
}
json.showPop = true;
@@ -137,21 +139,37 @@
error: {
icoUrl: '/static/images/common/uploadErr.png',
borderColor: "#e034344d",
- buttonBgColor: "#E03434"
+ buttonBgColor: "#E03434",
+ bgColor:'#38393466',
+ buttonTextColor:'#FFFFFFde'
},
succ: {
icoUrl: '/static/images/common/success.png',
- borderColor: "#BBE600",
- buttonBgColor: "#BBE600"
+ borderColor: "#BBE6004d",
+ buttonBgColor: "#BBE600",
+ bgColor:'#38393466'
},
warn: {
icoUrl: '/static/images/common/warning.png',
- borderColor: "#FFC84E",
+ borderColor: "#FFC84E4d",
buttonBgColor: "#FFC84E",
+ bgColor:'#38393466'
},
info:{
- borderColor: "#BBE600",
- buttonBgColor: "#BBE600"
+ borderColor: "#BBE6004d",
+ buttonBgColor: "#BBE600",
+ bgColor:'#38393466'
+ },
+ prompt:{
+
+
+ borderColor: "#aed6004d",
+ buttonBgColor: "#aed600",
+ bgColor:'#38393466',
+ buttonTextColor:'#232323de',
+ showSlot:true,
+ showCancel:true,
+ buttonCancelText:'取消'
}
}
@@ -171,7 +189,13 @@
borderColor: cfg[type].borderColor,
buttonBgColor: cfg[type].buttonBgColor,
buttonText: btnTxt ? btnTxt : '确定',
- okCallback: okCallback ? okCallback : this.closePop
+ okCallback: okCallback ? okCallback : this.closePop,
+ buttonTextColor:cfg[type].buttonTextColor,
+ bgColor:cfg[type].bgColor,
+ showSlot:cfg[type].showSlot,
+ showCancel:cfg[type].showCancel,
+ buttonCancelText:cfg[type].buttonCancelText
+
};
return this.showPop(options);
diff --git a/components/global-loading/global-loading.vue b/components/global-loading/global-loading.vue
index 2a73aab..138339e 100644
--- a/components/global-loading/global-loading.vue
+++ b/components/global-loading/global-loading.vue
@@ -141,9 +141,8 @@
flex-direction: column;
align-items: center;
justify-content: center;
- transform: translateZ(0);
- /* 启用GPU加速 */
- margin-top: -150rpx;
+ transform: translateZ(0);
+ margin-top: 0rpx;
}
/* 刻度容器 */
diff --git a/pages/008A/HBY008A.vue b/pages/008A/HBY008A.vue
index a6b2dd8..fabaf03 100644
--- a/pages/008A/HBY008A.vue
+++ b/pages/008A/HBY008A.vue
@@ -66,7 +66,9 @@
+
+
@@ -85,7 +87,8 @@
MsgClose,
MsgWarning,
showPop,
- MsgInfo
+ MsgInfo,
+ MsgPrompt
} from '@/utils/MsgPops.js'
import Common from '@/utils/Common.js';
import BleTool from '@/utils/BleHelper.js'
@@ -213,7 +216,7 @@
},
onLoad() {
-
+
these = this;
recei = BleReceive.getBleReceive();
ble = BleTool.getBleTool();
@@ -227,8 +230,8 @@
eventChannel = this.getOpenerEventChannel();
- eventChannel.on('detailData', function(data) {
-
+ eventChannel.on('detailData', (data)=> {
+
console.log("收到父页面的参数：" + JSON.stringify(data));
var device = data.data;
these.Status.apiType = data.apiType;
@@ -1196,7 +1199,7 @@
.navbarRight .img {
width: 35rpx;
height: 35rpx;
- margin-right: 20rpx;
+ margin-right: 30rpx;
}
.uni-navbar--fixed {
diff --git a/pages/018A/HBY018A.vue b/pages/018A/HBY018A.vue
index 2c38b37..2052a4e 100644
--- a/pages/018A/HBY018A.vue
+++ b/pages/018A/HBY018A.vue
@@ -623,7 +623,7 @@
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: '去连接',
- buttonTextColor: '#232323de',
+ buttonTextColor: '#FFFFFFde',
okCallback: function() {
uni.navigateTo({
diff --git a/pages/100/HBY100.vue b/pages/100/HBY100.vue
index 2e11bab..d988b27 100644
--- a/pages/100/HBY100.vue
+++ b/pages/100/HBY100.vue
@@ -1360,7 +1360,7 @@ onFreqChanging(e){
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: '去连接',
- buttonTextColor: '#232323de',
+ buttonTextColor: '#FFFFFFde',
okCallback: function() {
uni.navigateTo({
diff --git a/pages/100Y/HBY100Y.vue b/pages/100Y/HBY100Y.vue
index cf619a7..4c43935 100644
--- a/pages/100Y/HBY100Y.vue
+++ b/pages/100Y/HBY100Y.vue
@@ -1196,7 +1196,7 @@
.navbarRight .img {
width: 35rpx;
height: 35rpx;
- margin-right: 20rpx;
+ margin-right: 30rpx;
}
.uni-navbar--fixed {
diff --git a/pages/102/HBY102.vue b/pages/102/HBY102.vue
index 113d0ed..f9ab8c2 100644
--- a/pages/102/HBY102.vue
+++ b/pages/102/HBY102.vue
@@ -1365,7 +1365,7 @@
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: '去连接',
- buttonTextColor: '#232323de',
+ buttonTextColor: '#FFFFFFde',
okCallback: function() {
uni.navigateTo({
diff --git a/pages/210/HBY210.vue b/pages/210/HBY210.vue
index 10c07f6..edd15d3 100644
--- a/pages/210/HBY210.vue
+++ b/pages/210/HBY210.vue
@@ -1410,7 +1410,7 @@ display: flex;
.navbarRight .img {
width: 35rpx;
height: 35rpx;
- margin-right: 20rpx;
+ margin-right: 30rpx;
}
.uni-navbar--fixed {
diff --git a/pages/4877/BJQ4877.vue b/pages/4877/BJQ4877.vue
index 71d7976..11ca4e5 100644
--- a/pages/4877/BJQ4877.vue
+++ b/pages/4877/BJQ4877.vue
@@ -1252,7 +1252,7 @@
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: '去连接',
- buttonTextColor: '#232323de',
+ buttonTextColor: '#FFFFFFde',
okCallback: function() {
uni.navigateTo({
diff --git a/pages/4877/BJQ4877V1.vue b/pages/4877/BJQ4877V1.vue
index 894db34..cb07bc4 100644
--- a/pages/4877/BJQ4877V1.vue
+++ b/pages/4877/BJQ4877V1.vue
@@ -748,7 +748,7 @@ import request, { baseURL } from '@/utils/request.js';
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: '去连接',
- buttonTextColor: '#232323de',
+ buttonTextColor: '#FFFFFFde',
okCallback: function() {
uni.navigateTo({
diff --git a/pages/6075J/BJQ6075J.vue b/pages/6075J/BJQ6075J.vue
index 08d522c..86221db 100644
--- a/pages/6075J/BJQ6075J.vue
+++ b/pages/6075J/BJQ6075J.vue
@@ -1912,7 +1912,7 @@
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: '去连接',
- buttonTextColor: '#232323de',
+ buttonTextColor: '#FFFFFFde',
showCancel: true,
okCallback: function() {
console.log("1111");
@@ -2858,7 +2858,7 @@
.navbarRight .img {
width: 35rpx;
height: 35rpx;
- margin-right: 20rpx;
+ margin-right: 30rpx;
}
.uni-navbar--fixed {
diff --git a/pages/6107/BJQ6107.vue b/pages/6107/BJQ6107.vue
index 840d484..d56e3fa 100644
--- a/pages/6107/BJQ6107.vue
+++ b/pages/6107/BJQ6107.vue
@@ -840,7 +840,7 @@
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: '去连接',
- buttonTextColor: '#232323de',
+ buttonTextColor: '#FFFFFFde',
okCallback: function() {
uni.navigateTo({
diff --git a/pages/6155/BJQ6155.vue b/pages/6155/BJQ6155.vue
index d0a89a1..b83802b 100644
--- a/pages/6155/BJQ6155.vue
+++ b/pages/6155/BJQ6155.vue
@@ -708,7 +708,7 @@
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: '去连接',
- buttonTextColor: '#232323de',
+ buttonTextColor: '#FFFFFFde',
okCallback: function() {
// console.log("1111");
uni.navigateTo({
diff --git a/pages/6155/deviceDetail.vue b/pages/6155/deviceDetail.vue
index 5071785..56d92a9 100644
--- a/pages/6155/deviceDetail.vue
+++ b/pages/6155/deviceDetail.vue
@@ -688,7 +688,7 @@
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: '去连接',
- buttonTextColor: '#232323de',
+ buttonTextColor: '#FFFFFFde',
okCallback: function() {
// console.log("1111");
uni.navigateTo({
diff --git a/pages/6170/deviceControl/index.vue b/pages/6170/deviceControl/index.vue
index 067425d..5db95c3 100644
--- a/pages/6170/deviceControl/index.vue
+++ b/pages/6170/deviceControl/index.vue
@@ -556,7 +556,7 @@
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: '去连接',
- buttonTextColor: '#232323de',
+ buttonTextColor: '#FFFFFFde',
showCancel: true,
okCallback: function() {
console.log("1111");
diff --git a/pages/6331/BJQ6331.vue b/pages/6331/BJQ6331.vue
index ed179ee..e69a769 100644
--- a/pages/6331/BJQ6331.vue
+++ b/pages/6331/BJQ6331.vue
@@ -739,7 +739,7 @@ import request, { baseURL } from '@/utils/request.js';
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: '去连接',
- buttonTextColor: '#232323de',
+ buttonTextColor: '#FFFFFFde',
okCallback: function() {
uni.navigateTo({
diff --git a/pages/650/HBY650.vue b/pages/650/HBY650.vue
index b39916f..e71eadd 100644
--- a/pages/650/HBY650.vue
+++ b/pages/650/HBY650.vue
@@ -822,7 +822,7 @@ import request, { baseURL } from '@/utils/request.js';
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: '去连接',
- buttonTextColor: '#232323de',
+ buttonTextColor: '#FFFFFFde',
okCallback: function() {
uni.navigateTo({
diff --git a/pages/670/HBY670.vue b/pages/670/HBY670.vue
index a76b342..f2fbd45 100644
--- a/pages/670/HBY670.vue
+++ b/pages/670/HBY670.vue
@@ -180,7 +180,7 @@
关闭
@@ -340,7 +340,7 @@
borderColor: '#BBE600',
textColor: '#ffffffde',
buttonBgColor: '#BBE600',
- buttonTextColor: '#232323DE',
+ buttonTextColor: '#FFFFFFDE',
iconUrl: '',
message: '您确定要这样做吗？',
@@ -725,7 +725,7 @@
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: '去连接',
- buttonTextColor: '#232323de',
+ buttonTextColor: '#FFFFFFde',
showCancel: true,
cancelCallback: () => {
// this.closePop();
@@ -1178,6 +1178,7 @@
iconUrl: "/static/images/common/uploadErr.png",
borderColor: "#e034344d",
buttonBgColor: "#E03434",
+ buttonTextColor: "#FFFFFFde",
okCallback: null,
buttonText: "确定"
},these)
@@ -1221,6 +1222,7 @@
iconUrl: "/static/images/common/uploadErr.png",
borderColor: "#e034344d",
buttonBgColor: "#E03434",
+ buttonTextColor: "#FFFFFFde"
},these);
}).finally(() => {
@@ -1285,7 +1287,8 @@
message: "通信异常,请检查手机或设备网络",
iconUrl: "/static/images/common/uploadErr.png",
borderColor: "#e034344d",
- buttonBgColor: "#E03434",
+ buttonBgColor: "#E03434",
+ buttonTextColor: "#FFFFFFde"
},these);
}).finally(() => {
@@ -1367,7 +1370,8 @@
message: '无操作权限',
iconUrl: "/static/images/common/uploadErr.png",
borderColor: "#e034344d",
- buttonBgColor: "#E03434",
+ buttonBgColor: "#E03434",
+ buttonTextColor: "#FFFFFFde",
okCallback: null,
buttonText: "确定"
},these)
@@ -1439,7 +1443,8 @@
message: "通信异常,请检查手机或设备网络",
iconUrl: "/static/images/common/uploadErr.png",
borderColor: "#e034344d",
- buttonBgColor: "#E03434",
+ buttonBgColor: "#E03434",
+ buttonTextColor: "#FFFFFFde"
},these);
}).finally(() => {
@@ -1562,6 +1567,7 @@
iconUrl: "/static/images/common/uploadErr.png",
borderColor: "#e034344d",
buttonBgColor: "#E03434",
+ buttonTextColor:"#FFFFFFde",
okCallback: OpenSOS,
buttonText: "开启"
},these);
@@ -1591,6 +1597,7 @@
iconUrl: "/static/images/common/uploadErr.png",
borderColor: "#e034344d",
buttonBgColor: "#E03434",
+ buttonTextColor: "#FFFFFFde",
okCallback: null,
buttonText: "确定"
},these)
@@ -1632,7 +1639,8 @@
message: "通信异常,请检查手机或设备网络",
iconUrl: "/static/images/common/uploadErr.png",
borderColor: "#e034344d",
- buttonBgColor: "#E03434",
+ buttonBgColor: "#E03434",
+ buttonTextColor: "#FFFFFFde"
},these);
}).finally(() => {
@@ -2192,7 +2200,8 @@
message: '无操作权限',
iconUrl: "/static/images/common/uploadErr.png",
borderColor: "#e034344d",
- buttonBgColor: "#E03434",
+ buttonBgColor: "#E03434",
+ buttonTextColor: "#FFFFFFde",
okCallback: null,
buttonText: "确定"
},these)
@@ -2313,7 +2322,8 @@
message: '无操作权限',
iconUrl: "/static/images/common/uploadErr.png",
borderColor: "#e034344d",
- buttonBgColor: "#E03434",
+ buttonBgColor: "#E03434",
+ buttonTextColor: "#FFFFFFde",
okCallback: null,
buttonText: "确定"
},these)
@@ -2531,7 +2541,8 @@
message: '无操作权限',
iconUrl: "/static/images/common/uploadErr.png",
borderColor: "#e034344d",
- buttonBgColor: "#E03434",
+ buttonBgColor: "#E03434",
+ buttonTextColor: "#FFFFFFde",
okCallback: null,
buttonText: "确定"
},these)
@@ -2921,18 +2932,16 @@
}
- .usrinfo .btnSend {
- line-height: 65rpx;
- border-radius: 8px;
- width: 120rpx;
- height: 65rpx;
- color: rgba(35, 35, 35, 0.87);
- font-family: PingFang SC;
- font-size: 24rpx;
- font-weight: 400;
- letter-spacing: 0.15rpx;
- text-align: center;
- background-color: #BBE600;
+ .usrinfo .btnSend {
+ background-color: rgb(187, 230, 0);
+ color: rgba(35, 35, 35, 0.87);
+ height: 50rpx;
+ line-height: 50rpx;
+ border-radius: 16rpx;
+ font-size: 26rpx;
+ width: 112rpx;
+ white-space: nowrap;
+ text-align: center;
}
.usrinfo .item {
@@ -3330,7 +3339,7 @@
.navbarRight .img{
width: 35rpx;
height: 35rpx;
- margin-right: 20rpx;
+ margin-right: 30rpx;
}
.uni-navbar--fixed{
top:0rpx;
diff --git a/pages/7305/BJQ7305.vue b/pages/7305/BJQ7305.vue
index a5f89ab..f980767 100644
--- a/pages/7305/BJQ7305.vue
+++ b/pages/7305/BJQ7305.vue
@@ -628,7 +628,7 @@
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: '去连接',
- buttonTextColor: '#232323de',
+ buttonTextColor: '#FFFFFFde',
okCallback: function() {
console.log("1111");
uni.navigateTo({
diff --git a/pages/common/index/index.vue b/pages/common/index/index.vue
index d9dc6cd..0c95f43 100644
--- a/pages/common/index/index.vue
+++ b/pages/common/index/index.vue
@@ -27,7 +27,7 @@
-
+
@@ -98,14 +99,15 @@
@@ -878,12 +880,25 @@
text-align: center;
/* 文字居中 */
/* 设置最小宽度 */
+
+ position: relative;
}
- .active {
- color: rgba(187, 230, 0, 1);
- border-bottom: 6rpx solid rgba(187, 230, 0, 1);
+ .tab-item.active {
+ color: #bbe600;
+
height: 60rpx;
+ font-weight: bold;
+ }
+ .tab-item.active::before{
+ content: "";
+ background-color: #bbe600;
+ position: absolute;
+ top: 90%;
+ left:35%;
+ width: 30%;
+ height: 6rpx;
+ border-radius: 6rpx;
}
.sendFlex {
@@ -1133,14 +1148,32 @@
border-radius: 40rpx;
padding: 30rpx;
text-align: center;
- border: 1px solid rgba(255, 200, 78, 0.3);
+ border: 1px solid #E034344d;
}
+
+ .cancelBtn{
+
+
+ text-align: center;
+ width: 170rpx !important;
+ background-color: #00000000;
+ }
+
+ .agreement-popupC .cancelBtn{
+ border:1rpx solid #E034344d;
+ color:#E03434;
+ }
+
+ .agreement-popupD .cancelBtn{
+ border: 1rpx solid rgba(255, 255, 255, 0.6);
+ color:rgba(255, 255, 255, 0.6);
+ }
.agreement-popupD {
- width: 70%;
+ width: 75%;
background-color: rgb(42, 42, 42);
border-radius: 40rpx;
- padding: 40rpx;
+ padding: 40rpx 5rpx;
text-align: center;
border: 1px solid rgba(187, 230, 0, 0.3);
}
@@ -1162,6 +1195,7 @@
font-size: 28rpx;
text-align: left;
text-indent: 5rpx;
+ width: calc(100% - 75rpx);
}
.svg {
@@ -1182,8 +1216,8 @@
/* 同意按钮 */
.agreeBtn {
- background: #FFC84E;
- color: #232323;
+ background: #E03434;
+ color: #FFFFFF;
border: none;
width: 170rpx !important;
}
diff --git a/static/images/670/qiangActive.png b/static/images/670/qiangActive.png
index b4930b5..159feba 100644
Binary files a/static/images/670/qiangActive.png and b/static/images/670/qiangActive.png differ
diff --git a/static/images/670/ruoActive.png b/static/images/670/ruoActive.png
index 5c6f7d8..6d8ebeb 100644
Binary files a/static/images/670/ruoActive.png and b/static/images/670/ruoActive.png differ
diff --git a/static/images/common/dell.png b/static/images/common/dell.png
index 71ff6da..6c074f3 100644
Binary files a/static/images/common/dell.png and b/static/images/common/dell.png differ
diff --git a/static/images/lightImg/closeLight.png b/static/images/lightImg/closeLight.png
index 506ea9b..b849335 100644
Binary files a/static/images/lightImg/closeLight.png and b/static/images/lightImg/closeLight.png differ
diff --git a/static/images/lightImg/closeLightActive.png b/static/images/lightImg/closeLightActive.png
new file mode 100644
index 0000000..c2d3655
Binary files /dev/null and b/static/images/lightImg/closeLightActive.png differ
diff --git a/utils/BleReceive.js b/utils/BleReceive.js
index 2e6ae17..12206c1 100644
--- a/utils/BleReceive.js
+++ b/utils/BleReceive.js
@@ -14,7 +14,9 @@ import {
class BleReceive {
constructor(_ref) {
- this.ref = _ref;
+ if(_ref){
+ this.ref = _ref;
+ }
this.StorageKey = "linkedDevices";
this.HandlerMap = {
'/pages/6155/deviceDetail': this.Receive_6155.bind(this),
diff --git a/utils/MsgPops.js b/utils/MsgPops.js
index fd61c84..2cbb718 100644
--- a/utils/MsgPops.js
+++ b/utils/MsgPops.js
@@ -2,7 +2,8 @@ var MsgType = {
error: "error",
succ: "succ",
warn: "warn",
- info:'info'
+ info:'info',
+ prompt:'prompt'
}
var time = null;
// 显示成功
@@ -74,6 +75,26 @@ export const MsgInfo = (msg, btnTxt, ev, isClear,btnCallback) => {
return option;
+}
+
+//显示捕获窗口,用于自定义弹窗内容
+export const MsgPrompt = ( ev,refName, btnCallback,isClear) => {
+ if (!ev) {
+
+ return null;
+ }
+ if (!ev.$refs[refName]) {
+
+ return null;
+ }
+ let option = ev.$refs[refName].showMsg("", "", MsgType.prompt,btnCallback);
+ if (isClear === undefined || isClear) {
+ createClear(ev);
+ }
+
+ return option;
+
+
}
// 隐藏loading