diff --git a/pages/6170/allShare/index.vue b/pages/6170/allShare/index.vue
index ba5ba27..8d60e92 100644
--- a/pages/6170/allShare/index.vue
+++ b/pages/6170/allShare/index.vue
@@ -56,7 +56,8 @@
-->
-
+
+
暂无数据
@@ -189,7 +190,7 @@
},
// tab切换页
switchTab(tab, index) {
- console.log(tab, 'tabsss');
+ //console.log(tab, 'tabsss');
this.deviceList = [];
this.activeTab = index;
this.page = 1; // 重置页
@@ -197,7 +198,7 @@
},
// 获取设备列表
getData(tab) {
- console.log(tab.name, 'tab');
+ //console.log(tab.name, 'tab');
if (this.loading) return;
this.loading = true;
let data = {
@@ -421,7 +422,7 @@
color: rgba(255, 255, 255, 0.6);
font-size: 28rpx;
margin-bottom: 20rpx;
- margin-top: 20rpx;
+ margin-top: 1rpx;
}
.edit-btn {
@@ -468,11 +469,11 @@
.agreement-popupC {
width: 65%;
- background-color: rgb(42, 42, 42);
+ background: rgba(56, 57, 52, 0.4);
border-radius: 40rpx;
padding: 30rpx;
text-align: center;
- border: 1px solid rgba(255, 200, 78, 0.3);
+ border: 1px solid rgba(224, 52, 52, 0.3);
}
.popup-flex {
@@ -511,7 +512,7 @@
/* 同意按钮 */
.agreeBtn {
background: rgba(224, 52, 52, 1);
- color: #232323;
+ color: rgba(255, 255, 255, 0.87);
border: none;
width: 170rpx !important;
}
diff --git a/pages/6170/deviceControl/index.vue b/pages/6170/deviceControl/index.vue
index 0b6fb4a..3808b74 100644
--- a/pages/6170/deviceControl/index.vue
+++ b/pages/6170/deviceControl/index.vue
@@ -38,7 +38,7 @@
IMEI号
- {{deviceInfo.deviceImei}}
+ {{deviceInfo.deviceImei}}
设备状态
@@ -46,7 +46,7 @@
定位信息
-
+
114.72 30.28
深圳市龙华区富源晟
@@ -185,8 +185,12 @@
@@ -217,9 +221,8 @@
-
+
@@ -273,10 +276,9 @@
isSharedDevice: false, // 标记是否来自分享
isRightIconVisible: false,
showPopupFlag: false, //是否显示弹框
-
popupMessage: '！',
popupConfirmText: '确认',
- showUploadPopup:false
+ showUploadPopup: false
}
},
computed: {
@@ -285,6 +287,13 @@
}
},
methods: {
+ // *******定位******
+ gpsPosition(){
+ uni.navigateTo({
+ url:'/pages/common/map/index'
+ })
+ },
+ // ***********进度条***********
onSliderChanging(e) {
this.sliderValue = e.detail.value;
},
@@ -312,7 +321,6 @@
selected: this.currentMainMode === '泛光模式',
image: '/static/images/settt.png'
},
-
];
}
},
@@ -323,7 +331,6 @@
toggleForm() {
this.isFormExpanded = !this.isFormExpanded;
},
-
onItemClick(index) {
const selectedItem = this.items[index];
if (selectedItem.text === '激光') {
@@ -336,7 +343,6 @@
}));
this.currentMainMode = selectedItem.text;
this.selectedItemIndex = index;
-
// 强制更新视图（如果需要）
this.$forceUpdate();
}
@@ -348,7 +354,6 @@
const instruction = this.modeInstructions[selectedItem.text];
console.log(selectedItem, 'selectedItemselectedItem');
this.selectedItemIndex = selectedItem.text;
-
if (instruction) {
const topic = `B/${this.itemInfo.deviceImei}`;
const message = JSON.stringify(instruction);
@@ -356,12 +361,44 @@
console.log('已发送指令:', instruction);
}
this.lightModeA = false;
- // this.lightModeA = false
},
// 上传开机画面
uploadStartup() {
this.lightModeB = true
},
+ // 上传开机画面
+ checkImgUpload() {
+ uni.chooseImage({
+ count: 1,
+ sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+ sourceType: ['album', 'camera'], //从相册，相机选择，，
+ success: function(res) {
+ uni.navigateTo({
+ url: "/pages/6155/ImgCrop",
+ events: {
+ ImgCutOver: function(data) {
+ console.log("我收到裁剪后的图片了，感谢老铁," + data)
+ uni.showLoading({
+ title: "正在发送..."
+ });
+ setTimeout(function() {
+ processAndSendImageData(data).catch(() => {});
+ }, 0)
+ }
+ },
+ success(ev) {
+ ev.eventChannel.emit('checkImg', {
+ data: res.tempFiles[0].path
+ })
+ },
+ fail(ex) {
+ console.log("跳转页面失败" + JSON.stringify(ex));
+ }
+ });
+
+ }
+ });
+ },
// 上传开机画面确认按键
handleupload() {
this.lightModeB = false
@@ -741,12 +778,6 @@
font-size: 26rpx;
}
-
-
-
-
-
-
.mode-v3 {
color: rgba(255, 255, 255, 0.6);
font-size: 26rpx;
@@ -852,10 +883,23 @@
.example-body {
position: absolute;
left: 50%;
- top: 70%;
+ top: 65%;
width: 100%;
- transform: translate(-10%, -100%);
+ transform: translate(-20%, -100%);
+ }
+ .icoContent {
+ width: 320rpx;
+ height: 160rpx;
+ border-radius: 8rpx;
+ background: rgba(58, 58, 58, 1);
+ text-align: center;
+ line-height:200rpx;
+ }
+
+ .img {
+ width: 62rpx;
+ height: 62rpx;
}
.example_title {
@@ -995,7 +1039,7 @@
.agreement-popupB {
width: 100%;
- height: 40%;
+ height: 32%;
background-color: rgb(42, 42, 42);
border-radius: 60rpx 60rpx 0rpx 0rpx;
padding: 40rpx;
diff --git a/pages/6170/shareDevices/index.vue b/pages/6170/shareDevices/index.vue
index 664f6ca..1ec3e4b 100644
--- a/pages/6170/shareDevices/index.vue
+++ b/pages/6170/shareDevices/index.vue
@@ -278,7 +278,6 @@
padding-top: 10rpx;
position: relative;
}
-
.deviceIMG {
width: 100rpx;
height: 100rpx;
@@ -288,90 +287,75 @@
display: flex;
align-items: center;
}
-
.IMG {
width: 68rpx;
height: 50rpx;
margin-left: 17%;
}
-
.title {
font-size: 18px;
color: white;
}
-
.device-info {
width: 100%;
padding: 10px;
border-bottom: 1rpx solid rgba(255, 255, 255, 0.06);
}
-
.allSelect {
color: rgba(255, 255, 255, 0.87);
float: right;
}
-
.device-icon {
width: 30px;
height: 30px;
}
-
.device-id,
.device-serial {
color: white;
}
-
.permissions {
width: 100%;
margin-top: 20px;
padding: 10px;
border-bottom: 1rpx solid rgba(255, 255, 255, 0.06);
}
-
.permissions-title {
color: rgba(255, 255, 255, 0.87);
font-size: 30rpx;
/* padding: 30rpx 0rpx; */
}
-
.checkbox {
width: 40rpx;
height: 40rpx;
border: 2rpx solid rgba(255, 255, 255, 0.5);
- margin-right: 20rpx;
+ margin-right:30rpx;
border-radius: 4rpx;
display: flex;
align-items: center;
justify-content: center;
}
-
.checkbox.checked {
background-color: rgb(187, 230, 0);
border-color: rgb(187, 230, 0);
}
-
.permission-item {
- margin-top: 10px;
+ margin-top:35rpx;
display: flex;
color: rgba(255, 255, 255, 0.87);
line-height: 60rpx;
align-items: center;
cursor: pointer;
-
}
-
.recipient-info {
width: 100%;
margin-top: 20px;
padding: 10px;
border-radius: 5px;
}
-
.recipient-title {
color: rgba(255, 255, 255, 0.87);
font-size: 30rpx;
}
-
.phone-input {
width: 100%;
margin-top: 20rpx;
@@ -379,7 +363,6 @@
border-bottom: 1rpx solid rgba(255, 255, 255, 0.06);
color: rgba(255, 255, 255, 0.87);
}
-
.verification-code {
display: flex;
justify-content: space-between;
@@ -388,7 +371,6 @@
padding: 40rpx 0;
color: rgba(255, 255, 255, 0.87);
}
-
.get-code-btn {
margin-top: 10px;
background-color: transparent;
@@ -412,7 +394,7 @@
left: 0;
right: 0;
bottom: 0;
- background-color: rgba(0, 0, 0, 0.5);
+ background-color: rgba(0, 0, 0, 0.8);
display: flex;
justify-content: center;
align-items: center;
@@ -433,18 +415,16 @@
/* 弹窗主体 */
.agreement-popup {
width: 60%;
- background-color: rgb(42, 42, 42);
+ background: rgba(56, 57, 52, 0.4);
border-radius: 40rpx;
padding: 30rpx;
text-align: center;
border: 1px solid rgba(187, 230, 0, 0.3);
}
-
.svg {
width: 58rpx;
- height: 62rpx;
+ height:58rpx;
}
-
/* 通用按钮样式 */
.btn {
height: 60rpx;
diff --git a/pages/6170/shareManagement/index.vue b/pages/6170/shareManagement/index.vue
index d2d9bf4..46b862a 100644
--- a/pages/6170/shareManagement/index.vue
+++ b/pages/6170/shareManagement/index.vue
@@ -4,12 +4,12 @@