dyf/APP
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整一些组件样式

Browse Source
This commit is contained in:
liub
2026-04-07 11:25:23 +08:00
parent 6715507125
commit bb49564646
27 changed files with 165 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
components/MsgBox/MsgBox.vue
View File

@ -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)" >
<slot />
</MessagePopup>
</view>
</template>
@ -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);

3
components/global-loading/global-loading.vue
View File

@ -142,8 +142,7 @@
align-items: center;
justify-content: center;
transform: translateZ(0);
/* 启用GPU加速 */
margin-top: -150rpx;
margin-top: 0rpx;
}
/* 刻度容器 */

9
pages/008A/HBY008A.vue
View File

@ -66,7 +66,9 @@
</view>
<ProParams :id="device.id"></ProParams>
<MsgBox ref="msgPop" />
<global-loading ref="loading" />
</view>
</template>
@ -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'
@ -227,7 +230,7 @@
eventChannel = this.getOpenerEventChannel();
eventChannel.on('detailData', function(data) {
eventChannel.on('detailData', (data)=> {
console.log("收到父页面的参数：" + JSON.stringify(data));
var device = data.data;
@ -1196,7 +1199,7 @@
.navbarRight .img {
width: 35rpx;
height: 35rpx;
margin-right: 20rpx;
margin-right: 30rpx;
}
.uni-navbar--fixed {

2
pages/018A/HBY018A.vue
View File

@ -623,7 +623,7 @@
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: '去连接',
buttonTextColor: '#232323de',
buttonTextColor: '#FFFFFFde',
okCallback: function() {
uni.navigateTo({

2
pages/100/HBY100.vue
View File

@ -1360,7 +1360,7 @@ onFreqChanging(e){
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: '去连接',
buttonTextColor: '#232323de',
buttonTextColor: '#FFFFFFde',
okCallback: function() {
uni.navigateTo({

2
pages/100Y/HBY100Y.vue
View File

@ -1196,7 +1196,7 @@
.navbarRight .img {
width: 35rpx;
height: 35rpx;
margin-right: 20rpx;
margin-right: 30rpx;
}
.uni-navbar--fixed {

2
pages/102/HBY102.vue
View File

@ -1365,7 +1365,7 @@
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: '去连接',
buttonTextColor: '#232323de',
buttonTextColor: '#FFFFFFde',
okCallback: function() {
uni.navigateTo({

2
pages/210/HBY210.vue
View File

@ -1410,7 +1410,7 @@ display: flex;
.navbarRight .img {
width: 35rpx;
height: 35rpx;
margin-right: 20rpx;
margin-right: 30rpx;
}
.uni-navbar--fixed {

2
pages/4877/BJQ4877.vue
View File

@ -1252,7 +1252,7 @@
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: '去连接',
buttonTextColor: '#232323de',
buttonTextColor: '#FFFFFFde',
okCallback: function() {
uni.navigateTo({

2
pages/4877/BJQ4877V1.vue
View File

@ -748,7 +748,7 @@ import request, { baseURL } from '@/utils/request.js';
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: '去连接',
buttonTextColor: '#232323de',
buttonTextColor: '#FFFFFFde',
okCallback: function() {
uni.navigateTo({

4
pages/6075J/BJQ6075J.vue
View File

@ -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 {

2
pages/6107/BJQ6107.vue
View File

@ -840,7 +840,7 @@
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: '去连接',
buttonTextColor: '#232323de',
buttonTextColor: '#FFFFFFde',
okCallback: function() {
uni.navigateTo({

2
pages/6155/BJQ6155.vue
View File

@ -708,7 +708,7 @@
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: '去连接',
buttonTextColor: '#232323de',
buttonTextColor: '#FFFFFFde',
okCallback: function() {
// console.log("1111");
uni.navigateTo({

2
pages/6155/deviceDetail.vue
View File

@ -688,7 +688,7 @@
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: '去连接',
buttonTextColor: '#232323de',
buttonTextColor: '#FFFFFFde',
okCallback: function() {
// console.log("1111");
uni.navigateTo({

2
pages/6170/deviceControl/index.vue
View File

@ -556,7 +556,7 @@
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: '去连接',
buttonTextColor: '#232323de',
buttonTextColor: '#FFFFFFde',
showCancel: true,
okCallback: function() {
console.log("1111");

2
pages/6331/BJQ6331.vue
View File

@ -739,7 +739,7 @@ import request, { baseURL } from '@/utils/request.js';
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: '去连接',
buttonTextColor: '#232323de',
buttonTextColor: '#FFFFFFde',
okCallback: function() {
uni.navigateTo({

2
pages/650/HBY650.vue
View File

@ -822,7 +822,7 @@ import request, { baseURL } from '@/utils/request.js';
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: '去连接',
buttonTextColor: '#232323de',
buttonTextColor: '#FFFFFFde',
okCallback: function() {
uni.navigateTo({

53
pages/670/HBY670.vue
View File

@ -180,7 +180,7 @@
<view class="item" @click="lightSetting('close')" :class="formData.lightCurr=='close'?'active':''">
<view class="imgContent center">
<image class="img"
:src="formData.lightCurr=='close'?'/static/images/lightImg/jieNActive.png':'/static/images/lightImg/jieN.png'"
:src="formData.lightCurr=='close'?'/static/images/lightImg/closeLightActive.png':'/static/images/lightImg/closeLight.png'"
mode="aspectFit"></image>
</view>
<view class="txt">关闭</view>
@ -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)
@ -2922,17 +2933,15 @@
}
.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;
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;

2
pages/7305/BJQ7305.vue
View File

@ -628,7 +628,7 @@
borderColor: "#e034344d",
buttonBgColor: "#E03434",
buttonText: '去连接',
buttonTextColor: '#232323de',
buttonTextColor: '#FFFFFFde',
okCallback: function() {
console.log("1111");
uni.navigateTo({

56
pages/common/index/index.vue
View File

@ -27,7 +27,7 @@
<mescroll-uni class="device-list" @init="mescrollInit" @down="downCallback" @up="upCallback" :up="upOption"
:down="downOption" :fixed="false" :style="{ height: mescrollHeight + 'px' }">
<view v-if="deviceList.length>0">
<uni-swipe-action ref="swipeAction">
<uni-swipe-action ref="swipeAction" >
<block v-for="(item, index) in deviceList" :key="index" :ref="'swipeItem_' + index">
<uni-swipe-action-item :right-options="Options"
@click="handleSwipeClick($event, item, index)" class="device-card"
@ -88,6 +88,7 @@
</view>
<!-- 按钮组 -->
<view class="popup-buttons">
<button class="btn cancelBtn" @click="closePopup('delete')">取消</button>
<button class="btn agreeBtn" @click="handleBtn">确定</button>
</view>
</view>
@ -98,14 +99,15 @@
<view class="popup-content">
<view>
<view class="popup-flex">
<text>设备名称</text>
<input type="text" v-model="deviceName" placeholder="请输入设备名称" class="popup-input"
<text>名称</text>
<input type="text" v-model="deviceName" placeholder="请输入名称" class="popup-input"
@click.stop />
</view>
</view>
</view>
<!-- 按钮组 -->
<view class="popup-buttons" style="margin-top:50rpx;">
<button class="btn cancelBtn" @click="closePopup('rename')">取消</button>
<button class="btn agreeBtn4" @click="handleBtnName">确定</button>
</view>
</view>
@ -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;
}

BIN
static/images/670/qiangActive.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
static/images/670/ruoActive.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
static/images/common/dell.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 298 B

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
static/images/lightImg/closeLight.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
static/images/lightImg/closeLightActive.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

4
utils/BleReceive.js
View File

@ -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),

23
utils/MsgPops.js
View File

@ -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