Commit 5bb99306 by liangjianmin

修复bug

parent 268e3cb1
......@@ -29,6 +29,9 @@
.iconfont {
font-size: 36rpx;
color: #404547;
&.curr {
animation: spin 1s infinite linear;
}
}
.t2 {
font-size: 22rpx;
......@@ -36,27 +39,36 @@
margin-left: 8rpx;
}
}
.list{
background: #FFFFFF;
.list {
background: #ffffff;
border-radius: 4rpx;
.box{
.box {
margin: 0 24rpx;
height: 88rpx;
border-bottom: 1px solid #E6EDF0;
&:last-child{
border-bottom: 1px solid #e6edf0;
&:last-child {
border-bottom: none;
}
.t1{
.t1 {
font-size: 28rpx;
color: #1E2021;
color: #1e2021;
}
.t2{
.t2 {
font-size: 26rpx;
color: #197ADB;
&.active{
color: #6E767A;
color: #197adb;
&.active {
color: #6e767a;
}
}
}
}
}
@keyframes spin {
0% {
transform: rotate(0deg);
}
100% {
transform: rotate(360deg);
}
}
......@@ -129,7 +129,7 @@ export default {
},
bindPickerReasonChange: function(e) {
this.unusual_reason_index = e.target.value;
this.form.unusual_reasony = parseInt(e.target.value) + 1;
this.form.unusual_reason = parseInt(e.target.value) + 1;
},
inputChange() {
if (this.form.check_in_remark.length <= 200) {
......@@ -241,9 +241,10 @@ export default {
});
}, 2000);
} else {
uni.showToast({
title: res.err_msg,
icon: 'error'
uni.showModal({
title: '提示',
content: res.err_msg,
showCancel: false,
});
}
});
......
......@@ -18,7 +18,7 @@
<view class="title row verCenter bothSide">
<text class="t1">搜索到蓝牙设备</text>
<view class="row verCenter" @click="refresh()">
<text class="iconfont icon-a-juxing12"></text>
<text class="iconfont icon-a-juxing12" :class="{ curr: refreshTransition }"></text>
<text class="t2">刷新</text>
</view>
</view>
......@@ -48,13 +48,14 @@ export default {
isOpenBle: false,
deviceId: '',
textArr: [],
current: -1
current: -1,
refreshTransition: false
};
},
onLoad() {
const deviceData = uni.getStorageSync('device') || ''; //获取已连接蓝牙设备信息
if (deviceData) {
this.status=true;
this.status = true;
this.deviceId = deviceData.deviceId;
this.deviceName = deviceData.name;
} else {
......@@ -227,6 +228,12 @@ export default {
console.log('停止搜索', JSON.stringify(res.errMsg));
this.list = [];
this.startBluetoothDeviceDiscovery();
//刷新图标交互
this.refreshTransition = true;
setTimeout(() => {
this.refreshTransition = false;
}, 3000);
}
});
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment