liubiao/APP
1
0
Fork 0
forked from dyf/APP
Code Pull Requests Activity

Compare commits

base: liubiao:c4cd556bd4f17485bc0a0dc10c6fe3f7a798dd85
Branches Tags
liubiao:main liubiao:new-20250827 dyf:main
...
compare: liubiao:2f437e16b69dfba1fd6f08243ef7d0c3f57ef48f
Branches Tags
liubiao:new-20250827 liubiao:main dyf:main

2 Commits
c4cd556bd4 ... 2f437e16b6

Author SHA1 Message Date
liub
2f437e16b6 排除unpackge冲突 2025-08-28 15:05:34 +08:00
liub
8460aa1be2 670分享功能 2025-08-28 14:55:07 +08:00
1 changed files with 4 additions and 1 deletions
Expand all files Collapse all files

5
pages/670/HBY670.vue
View File

@ -629,7 +629,7 @@
receiveData.modeCurr = staticLevelText; receiveData.modeCurr = staticLevelText;
receiveData.lightCurr = lightingLevelText; receiveData.lightCurr = lightingLevelText;
receiveData.xuhang = json.sta_PowerTime + "分钟"; receiveData.xuhang = json.sta_PowerTime + "分钟";
receiveData.battary = json.sta_PowerPercent + "%"; receiveData.battary = json.sta_PowerPercent ;
receiveData.warnLevel = warn; receiveData.warnLevel = warn;
receiveData.staticWarn = staticWarn; receiveData.staticWarn = staticWarn;
@ -892,6 +892,7 @@
} }
if(!ispop){ if(!ispop){
closeEvt(); closeEvt();
return;
} }
this.showPop({ this.showPop({
showHeader: true, showHeader: true,
@ -1686,6 +1687,8 @@
showPop: function(option) { showPop: function(option) {
hideLoading(this); hideLoading(this);
let defaultCfg = { let defaultCfg = {
showHeader: false,
headerTxt: "",
showHeader: false, showHeader: false,
showCancel: false, showCancel: false,
borderColor: '#BBE600', borderColor: '#BBE600',