调整一些组件样式
This commit is contained in:
@ -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'
|
||||
@ -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 {
|
||||
|
||||
@ -623,7 +623,7 @@
|
||||
borderColor: "#e034344d",
|
||||
buttonBgColor: "#E03434",
|
||||
buttonText: '去连接',
|
||||
buttonTextColor: '#232323de',
|
||||
buttonTextColor: '#FFFFFFde',
|
||||
okCallback: function() {
|
||||
|
||||
uni.navigateTo({
|
||||
|
||||
@ -1360,7 +1360,7 @@ onFreqChanging(e){
|
||||
borderColor: "#e034344d",
|
||||
buttonBgColor: "#E03434",
|
||||
buttonText: '去连接',
|
||||
buttonTextColor: '#232323de',
|
||||
buttonTextColor: '#FFFFFFde',
|
||||
okCallback: function() {
|
||||
|
||||
uni.navigateTo({
|
||||
|
||||
@ -1196,7 +1196,7 @@
|
||||
.navbarRight .img {
|
||||
width: 35rpx;
|
||||
height: 35rpx;
|
||||
margin-right: 20rpx;
|
||||
margin-right: 30rpx;
|
||||
}
|
||||
|
||||
.uni-navbar--fixed {
|
||||
|
||||
@ -1365,7 +1365,7 @@
|
||||
borderColor: "#e034344d",
|
||||
buttonBgColor: "#E03434",
|
||||
buttonText: '去连接',
|
||||
buttonTextColor: '#232323de',
|
||||
buttonTextColor: '#FFFFFFde',
|
||||
okCallback: function() {
|
||||
|
||||
uni.navigateTo({
|
||||
|
||||
@ -1410,7 +1410,7 @@ display: flex;
|
||||
.navbarRight .img {
|
||||
width: 35rpx;
|
||||
height: 35rpx;
|
||||
margin-right: 20rpx;
|
||||
margin-right: 30rpx;
|
||||
}
|
||||
|
||||
.uni-navbar--fixed {
|
||||
|
||||
@ -1252,7 +1252,7 @@
|
||||
borderColor: "#e034344d",
|
||||
buttonBgColor: "#E03434",
|
||||
buttonText: '去连接',
|
||||
buttonTextColor: '#232323de',
|
||||
buttonTextColor: '#FFFFFFde',
|
||||
okCallback: function() {
|
||||
|
||||
uni.navigateTo({
|
||||
|
||||
@ -748,7 +748,7 @@ import request, { baseURL } from '@/utils/request.js';
|
||||
borderColor: "#e034344d",
|
||||
buttonBgColor: "#E03434",
|
||||
buttonText: '去连接',
|
||||
buttonTextColor: '#232323de',
|
||||
buttonTextColor: '#FFFFFFde',
|
||||
okCallback: function() {
|
||||
|
||||
uni.navigateTo({
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -840,7 +840,7 @@
|
||||
borderColor: "#e034344d",
|
||||
buttonBgColor: "#E03434",
|
||||
buttonText: '去连接',
|
||||
buttonTextColor: '#232323de',
|
||||
buttonTextColor: '#FFFFFFde',
|
||||
okCallback: function() {
|
||||
|
||||
uni.navigateTo({
|
||||
|
||||
@ -708,7 +708,7 @@
|
||||
borderColor: "#e034344d",
|
||||
buttonBgColor: "#E03434",
|
||||
buttonText: '去连接',
|
||||
buttonTextColor: '#232323de',
|
||||
buttonTextColor: '#FFFFFFde',
|
||||
okCallback: function() {
|
||||
// console.log("1111");
|
||||
uni.navigateTo({
|
||||
|
||||
@ -688,7 +688,7 @@
|
||||
borderColor: "#e034344d",
|
||||
buttonBgColor: "#E03434",
|
||||
buttonText: '去连接',
|
||||
buttonTextColor: '#232323de',
|
||||
buttonTextColor: '#FFFFFFde',
|
||||
okCallback: function() {
|
||||
// console.log("1111");
|
||||
uni.navigateTo({
|
||||
|
||||
@ -556,7 +556,7 @@
|
||||
borderColor: "#e034344d",
|
||||
buttonBgColor: "#E03434",
|
||||
buttonText: '去连接',
|
||||
buttonTextColor: '#232323de',
|
||||
buttonTextColor: '#FFFFFFde',
|
||||
showCancel: true,
|
||||
okCallback: function() {
|
||||
console.log("1111");
|
||||
|
||||
@ -739,7 +739,7 @@ import request, { baseURL } from '@/utils/request.js';
|
||||
borderColor: "#e034344d",
|
||||
buttonBgColor: "#E03434",
|
||||
buttonText: '去连接',
|
||||
buttonTextColor: '#232323de',
|
||||
buttonTextColor: '#FFFFFFde',
|
||||
okCallback: function() {
|
||||
|
||||
uni.navigateTo({
|
||||
|
||||
@ -822,7 +822,7 @@ import request, { baseURL } from '@/utils/request.js';
|
||||
borderColor: "#e034344d",
|
||||
buttonBgColor: "#E03434",
|
||||
buttonText: '去连接',
|
||||
buttonTextColor: '#232323de',
|
||||
buttonTextColor: '#FFFFFFde',
|
||||
okCallback: function() {
|
||||
|
||||
uni.navigateTo({
|
||||
|
||||
@ -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)
|
||||
@ -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;
|
||||
|
||||
@ -628,7 +628,7 @@
|
||||
borderColor: "#e034344d",
|
||||
buttonBgColor: "#E03434",
|
||||
buttonText: '去连接',
|
||||
buttonTextColor: '#232323de',
|
||||
buttonTextColor: '#FFFFFFde',
|
||||
okCallback: function() {
|
||||
console.log("1111");
|
||||
uni.navigateTo({
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user