Commit 5bb99306 by liangjianmin

修复bug

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