Compare commits
8 Commits
af352419b9
...
main
Author | SHA1 | Date | |
---|---|---|---|
56f05e7eec | |||
dd752d0478 | |||
c63089790d | |||
6e64044802 | |||
2772db349a | |||
6d119e26bc | |||
6f376c07bd | |||
cabd3c0987 |
@ -18,11 +18,10 @@ export function deviceTypeList(params) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 删除设备列表接口
|
// 删除设备列表接口
|
||||||
export function deviceUnbind(data) {
|
export function deviceUnbind(id) {
|
||||||
return request({
|
return request({
|
||||||
url: '/app/device/unBind',
|
url: `/app/device/unBind?id=${id}`,
|
||||||
method: 'DELETE',
|
method: 'DELETE',
|
||||||
data: data,
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
// 重命名设备
|
// 重命名设备
|
||||||
|
@ -120,6 +120,12 @@
|
|||||||
"navigationStyle": "custom",
|
"navigationStyle": "custom",
|
||||||
"fullscreen": true
|
"fullscreen": true
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"path": "pages/common/map/index",
|
||||||
|
"style": {
|
||||||
|
"navigationBarTitleText": "地图"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"tabBar": {
|
"tabBar": {
|
||||||
|
@ -79,7 +79,7 @@
|
|||||||
<image src="/static/images/jg.png" class="setIMG"></image>
|
<image src="/static/images/jg.png" class="setIMG"></image>
|
||||||
<view>
|
<view>
|
||||||
<view class="battery-v2">激光模式</view>
|
<view class="battery-v2">激光模式</view>
|
||||||
<!-- <view class="mode-v3">{{currentSecondaryMode}}</view> -->
|
<!--<view class="mode-v3">{{currentSecondaryMode}}</view> -->
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@ -446,6 +446,12 @@
|
|||||||
font-size: 26rpx;
|
font-size: 26rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
.mode-v3 {
|
.mode-v3 {
|
||||||
color: rgba(255, 255, 255, 0.6);
|
color: rgba(255, 255, 255, 0.6);
|
||||||
font-size: 26rpx;
|
font-size: 26rpx;
|
||||||
|
@ -1,11 +0,0 @@
|
|||||||
<template>
|
|
||||||
<view>
|
|
||||||
<text>编辑视频</text>
|
|
||||||
</view>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style scoped>
|
|
||||||
</style>
|
|
@ -1,350 +0,0 @@
|
|||||||
<template>
|
|
||||||
<!-- 使用自定义导航栏 -->
|
|
||||||
<view>
|
|
||||||
<custom-navbar :title="navTitle" :showBack="true" backgroundColor="#202020" color="#FFFFFF" right-text="编辑"
|
|
||||||
right-color="rgba(255, 255, 255, 0.87)" @right-click="handleEdit"></custom-navbar>
|
|
||||||
<view class="device-page" :style="{ paddingTop: navBarHeight + 'px' }">
|
|
||||||
<view class="pathContent">
|
|
||||||
<image src="/static/images/path3.png" mode="" class="path3"></image>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<!--上传文件弹框 -->
|
|
||||||
<view class="agreement-mask" v-if="opeartShow">
|
|
||||||
<!-- 上传画面弹窗 -->
|
|
||||||
<view class="agreement-popup">
|
|
||||||
<!-- 标题 -->
|
|
||||||
<view class="popup-title">编辑</view>
|
|
||||||
<view class="popup-content">
|
|
||||||
<view v-for="(item, index) in items" :key="index">
|
|
||||||
<view class="item" :class="{'selected': index === selectedItemIndex}"
|
|
||||||
@click="handleItemAction(index)"> <!-- 修改点击事件 -->
|
|
||||||
<image :src="item.image" class="setIMG"></image>
|
|
||||||
{{item.text}}
|
|
||||||
<!-- 隐藏的文件输入(仅用于上传模式) -->
|
|
||||||
<!-- <input v-if="index === 0" type="file" ref="fileInput" style="display: none"
|
|
||||||
@change="onFileSelect"> -->
|
|
||||||
<uni-file-picker v-if="index === 0" limit="1" file-mediatype="all"></uni-file-picker>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<!-- 按钮组 -->
|
|
||||||
<view class="popup-buttons">
|
|
||||||
<button class="agree" @click="handleupload">确定</button>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<view class="agreement-mask" v-if="opeartSuccess">
|
|
||||||
<view class="agreement-popupC">
|
|
||||||
<view class="popup-content">
|
|
||||||
<image src="/static/images/path5.png" mode="" class="path2"></image>
|
|
||||||
<view class="popup-Title">
|
|
||||||
<view>上传成功!</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<!-- 按钮组 -->
|
|
||||||
<view class="popup-buttons">
|
|
||||||
<button class="btn agreeBtn" @click="handleBtn">确定</button>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<!-- =============删除文件,列表文件=============== -->
|
|
||||||
<view class="agreement-mask" v-if="opeartDelect">
|
|
||||||
<!-- 上传画面弹窗 -->
|
|
||||||
<view class="agreement-popup">
|
|
||||||
<view class="popup-title">删除文件</view>
|
|
||||||
<view class="popup-content">
|
|
||||||
<!-- 设备列表 -->
|
|
||||||
<scroll-view class="device-list" scroll-y>
|
|
||||||
<view class="device-card" v-for="(item, index) in delectList" :key="index"
|
|
||||||
@click="toggleSelect(index)">
|
|
||||||
<!-- 复选框 -->
|
|
||||||
<view class="checkbox" :class="{ checked: item.checked }">
|
|
||||||
<uni-icons v-if="item.checked" type="checkmarkempty" size="18"
|
|
||||||
color="rgb(0, 0, 0)"></uni-icons>
|
|
||||||
</view>
|
|
||||||
<!-- 设备信息 -->
|
|
||||||
<view class="device-content">
|
|
||||||
<view class="device-header">
|
|
||||||
<view class="device-name">
|
|
||||||
<view>设备:001-00</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</scroll-view>
|
|
||||||
<!-- 按钮组 -->
|
|
||||||
<view class="popup-buttons">
|
|
||||||
<button class="agree" @click="handleopearBtn">确定</button>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
|
|
||||||
</template>
|
|
||||||
<script>
|
|
||||||
export default {
|
|
||||||
data() {
|
|
||||||
return {
|
|
||||||
navTitle: '操作说明',
|
|
||||||
navBarHeight: 70 + uni.getSystemInfoSync().statusBarHeight,
|
|
||||||
opeartShow: false,
|
|
||||||
items: [{
|
|
||||||
text: '点击选择上传文件',
|
|
||||||
selected: true,
|
|
||||||
image: '/static/images/upload.png'
|
|
||||||
},
|
|
||||||
{
|
|
||||||
text: '删除文件',
|
|
||||||
selected: false,
|
|
||||||
image: '/static/images/delete.png'
|
|
||||||
}
|
|
||||||
],
|
|
||||||
selectedItemIndex: 0, // 默认选中第一个
|
|
||||||
fileInput: false,
|
|
||||||
opeartSuccess: false,
|
|
||||||
opeartDelect: false,
|
|
||||||
delectList: Array(6).fill().map((_, i) => ({
|
|
||||||
id: `1321615${i}`,
|
|
||||||
checked: false,
|
|
||||||
showConfirm: false
|
|
||||||
})),
|
|
||||||
}
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
// 编辑
|
|
||||||
handleEdit() {
|
|
||||||
this.opeartShow = true
|
|
||||||
},
|
|
||||||
handleItemAction(index) {
|
|
||||||
this.selectedItemIndex = index;
|
|
||||||
if (index === 0) {
|
|
||||||
// 调用 Uni-app 文件选择 API
|
|
||||||
// uni.chooseFile({
|
|
||||||
// count: 1, // 最多选择1个文件
|
|
||||||
// success: (res) => {
|
|
||||||
// const file = res.tempFiles[0];
|
|
||||||
// this.items[0].text = `已选择: ${file.name}`;
|
|
||||||
// this.selectedFile = file; // 存储文件对象
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
} else {
|
|
||||||
// 这里是走删除弹框列表
|
|
||||||
this.opeartDelect = true //显示批量删除弹框列表
|
|
||||||
this.opeartShow = false //隐藏编辑弹框
|
|
||||||
}
|
|
||||||
|
|
||||||
},
|
|
||||||
|
|
||||||
onFileSelect(e) {
|
|
||||||
const files = e.target.files;
|
|
||||||
if (files.length > 0) {
|
|
||||||
// 这里拿到文件对象,可以立即上传或显示文件名
|
|
||||||
console.log("选择的文件:", files[0].name);
|
|
||||||
// 示例:显示文件名在item.text中
|
|
||||||
this.items[0].text = `已选择: ${files[0].name}`;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
// 确认
|
|
||||||
handleupload() {
|
|
||||||
this.opeartSuccess = true
|
|
||||||
//this.opeartShow = false;
|
|
||||||
},
|
|
||||||
// 上传成功后确实弹框提示确认
|
|
||||||
handleBtn() {
|
|
||||||
this.opeartSuccess = false
|
|
||||||
},
|
|
||||||
toggleSelect(index) {
|
|
||||||
this.delectList[index].checked = !this.delectList[index].checked
|
|
||||||
this.$forceUpdate()
|
|
||||||
},
|
|
||||||
// 批量删除文件确认按钮
|
|
||||||
handleopearBtn() {
|
|
||||||
this.opeartDelect = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style scoped>
|
|
||||||
.device-page {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
min-height: 100vh;
|
|
||||||
background-color: rgb(18, 18, 18);
|
|
||||||
padding: 30rpx;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pathContent {
|
|
||||||
background-color: rgb(52, 52, 52);
|
|
||||||
width: 100%;
|
|
||||||
min-height: 87vh;
|
|
||||||
}
|
|
||||||
|
|
||||||
.files-button uni-button {
|
|
||||||
background: red !important;
|
|
||||||
position: absolute;
|
|
||||||
left: 50rpx;
|
|
||||||
top: 50rpx
|
|
||||||
}
|
|
||||||
|
|
||||||
.path2 {
|
|
||||||
width: 64rpx;
|
|
||||||
height: 64rpx;
|
|
||||||
margin-right: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.popup-Title {
|
|
||||||
color: rgba(255, 255, 255, 0.87);
|
|
||||||
padding: 20rpx 0rpx;
|
|
||||||
font-size: 32rpx;
|
|
||||||
}
|
|
||||||
|
|
||||||
.path3 {
|
|
||||||
width: 172rpx;
|
|
||||||
height: 114rpx;
|
|
||||||
transform: translate(-50%, -50%);
|
|
||||||
position: absolute;
|
|
||||||
left: 50%;
|
|
||||||
top: 50%
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 遮罩层 */
|
|
||||||
.agreement-mask {
|
|
||||||
position: fixed;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
right: 0;
|
|
||||||
bottom: 0;
|
|
||||||
background-color: rgba(0, 0, 0, 0.5);
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
z-index: 9999;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 弹窗主体 */
|
|
||||||
.agreement-popup {
|
|
||||||
width: 100%;
|
|
||||||
height: 50%;
|
|
||||||
background-color: rgb(42, 42, 42);
|
|
||||||
border-radius: 60rpx 60rpx 0rpx 0rpx;
|
|
||||||
padding: 40rpx;
|
|
||||||
box-sizing: border-box;
|
|
||||||
position: absolute;
|
|
||||||
bottom: 0rpx;
|
|
||||||
}
|
|
||||||
|
|
||||||
.agreement-popupC {
|
|
||||||
width: 70%;
|
|
||||||
background-color: rgb(42, 42, 42);
|
|
||||||
border-radius: 40rpx;
|
|
||||||
padding: 30rpx;
|
|
||||||
box-sizing: border-box;
|
|
||||||
border: 1rpx solid rgba(187, 230, 0, 0.3);
|
|
||||||
}
|
|
||||||
|
|
||||||
.popup-title {
|
|
||||||
color: rgba(255, 255, 255, 0.87);
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.agree {
|
|
||||||
background-color: rgb(187, 230, 0);
|
|
||||||
color: #232323;
|
|
||||||
border: none;
|
|
||||||
font-size: 24rpx;
|
|
||||||
height: 88rpx;
|
|
||||||
line-height: 88rpx;
|
|
||||||
font-size: 32rpx;
|
|
||||||
width: 100%;
|
|
||||||
position: absolute;
|
|
||||||
bottom: 0rpx;
|
|
||||||
left: 0rpx
|
|
||||||
}
|
|
||||||
|
|
||||||
.item {
|
|
||||||
padding: 10px;
|
|
||||||
margin: 5px 0;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
cursor: pointer;
|
|
||||||
transition: background-color 0.3s;
|
|
||||||
color: #fff;
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
.setIMG {
|
|
||||||
width: 88rpx;
|
|
||||||
height: 88rpx;
|
|
||||||
margin-right: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.item.selected {
|
|
||||||
background-color: rgb(58, 58, 58);
|
|
||||||
color: rgba(255, 255, 255, 0.87);
|
|
||||||
border-radius: 8rpx;
|
|
||||||
}
|
|
||||||
|
|
||||||
.popup-content {
|
|
||||||
margin-top: 20rpx;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 通用按钮样式 */
|
|
||||||
.btn {
|
|
||||||
flex: 1;
|
|
||||||
height: 70rpx;
|
|
||||||
line-height: 70rpx;
|
|
||||||
border-radius: 40rpx;
|
|
||||||
font-size: 32rpx;
|
|
||||||
margin: 10rpx auto;
|
|
||||||
width: 200rpx;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 同意按钮 */
|
|
||||||
.agreeBtn {
|
|
||||||
background-color: rgb(187, 230, 0);
|
|
||||||
color: #232323;
|
|
||||||
border: none;
|
|
||||||
font-size: 24rpx;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 删除文件,弹框列表样式文件
|
|
||||||
*/
|
|
||||||
.device-card {
|
|
||||||
position: relative;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
.device-content {
|
|
||||||
border-radius: 8rpx;
|
|
||||||
background: rgba(58, 58, 58, 1);
|
|
||||||
margin-bottom: 20rpx;
|
|
||||||
position: relative;
|
|
||||||
align-items: center;
|
|
||||||
padding: 20rpx;
|
|
||||||
width: 93%;
|
|
||||||
color: rgba(255, 255, 255, 0.87);
|
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
|
|
||||||
.checkbox {
|
|
||||||
width: 40rpx;
|
|
||||||
height: 40rpx;
|
|
||||||
border: 2rpx solid rgba(255, 255, 255, 0.5);
|
|
||||||
margin-right: 20rpx;
|
|
||||||
border-radius: 4rpx;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
margin-top: -25rpx;
|
|
||||||
}
|
|
||||||
|
|
||||||
.checkbox.checked {
|
|
||||||
background-color: rgb(187, 230, 0);
|
|
||||||
border-color: rgb(187, 230, 0);
|
|
||||||
}
|
|
||||||
</style>
|
|
@ -584,12 +584,10 @@
|
|||||||
justify-content: center;
|
justify-content: center;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.openBlue .cancel {
|
.openBlue .cancel {
|
||||||
border: 1px solid rgba(255, 255, 255, 1);
|
border: 1px solid rgba(255, 255, 255, 1);
|
||||||
color: rgba(255, 255, 255, 1);
|
color: rgba(255, 255, 255, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
.openBlue .ok {
|
.openBlue .ok {
|
||||||
background-color: #BBE600;
|
background-color: #BBE600;
|
||||||
color: #232323;
|
color: #232323;
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
<view class="sendFlex">
|
<view class="sendFlex">
|
||||||
|
|
||||||
<view class="callpolice">报警</view>
|
<view class="callpolice">报警</view>
|
||||||
<view class="Sendmessage">位置</view>
|
<view class="Sendmessage" @click="location">位置</view>
|
||||||
<view class="Sendmessage" @click="handleSend">发送信息</view>
|
<view class="Sendmessage" @click="handleSend">发送信息</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
@ -25,33 +25,7 @@
|
|||||||
<uni-swipe-action ref="swipeAction">
|
<uni-swipe-action ref="swipeAction">
|
||||||
<block v-for="(item, index) in deviceList" :key="index" :ref="'swipeItem_' + index">
|
<block v-for="(item, index) in deviceList" :key="index" :ref="'swipeItem_' + index">
|
||||||
<uni-swipe-action-item :right-options="Options"
|
<uni-swipe-action-item :right-options="Options"
|
||||||
@click.stop="handleSwipeClick($event, item, index)" class="device-card">
|
@click="handleSwipeClick($event, item, index)" class="device-card">
|
||||||
<!-- 设备卡片内容保持不变 -->
|
|
||||||
<!-- <view @click.stop="handleFile(item)">
|
|
||||||
<view class="device-header">
|
|
||||||
<view class="deviceIMG">
|
|
||||||
<image :src="item.devicePic" class="IMG"></image>
|
|
||||||
</view>
|
|
||||||
<view class="device-name">
|
|
||||||
<view>设备:{{item.deviceName}}</view>
|
|
||||||
<view class="device-info">
|
|
||||||
<view class="ID" v-if="item.communicationMode==0">ID:{{item.deviceImei}}
|
|
||||||
</view>
|
|
||||||
<view class="ID" v-else>ID:{{item.deviceMac}}</view>
|
|
||||||
<view class="device-flex" v-if="item.communicationMode==0">
|
|
||||||
<view class="onlines" >在线</view>
|
|
||||||
<view class="line"></view>
|
|
||||||
<view>电量:90%</view>
|
|
||||||
</view>
|
|
||||||
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<view class="" v-if="item.communicationMode==1">
|
|
||||||
<view class="device-status online">已连接</view>
|
|
||||||
<view class="device-status unline">未连接</view>
|
|
||||||
</view>
|
|
||||||
</view> -->
|
|
||||||
<view @click.stop="handleFile(item)">
|
<view @click.stop="handleFile(item)">
|
||||||
<view class="device-header">
|
<view class="device-header">
|
||||||
<view class="deviceIMG">
|
<view class="deviceIMG">
|
||||||
@ -282,11 +256,9 @@
|
|||||||
},
|
},
|
||||||
// 右滑点击事件处理
|
// 右滑点击事件处理
|
||||||
handleSwipeClick(e, item, index) {
|
handleSwipeClick(e, item, index) {
|
||||||
const {
|
const {content} = e
|
||||||
content
|
|
||||||
} = e
|
|
||||||
console.log(e, 'eeeee');
|
console.log(e, 'eeeee');
|
||||||
switch (content.text) {
|
switch (e.content.text) {
|
||||||
case '删除':
|
case '删除':
|
||||||
this.handleDeleteDevice(item, index)
|
this.handleDeleteDevice(item, index)
|
||||||
break
|
break
|
||||||
@ -307,7 +279,7 @@
|
|||||||
let data = {
|
let data = {
|
||||||
id: this.deviceId.id
|
id: this.deviceId.id
|
||||||
}
|
}
|
||||||
deviceUnbind(data).then((res) => {
|
deviceUnbind(this.deviceId.id).then((res) => {
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: '删除成功',
|
title: '删除成功',
|
||||||
@ -366,6 +338,12 @@
|
|||||||
url: '/pages/common/send/index'
|
url: '/pages/common/send/index'
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
// 位置
|
||||||
|
location(){
|
||||||
|
uni.navigateTo({
|
||||||
|
url:'/pages/common/map/index'
|
||||||
|
})
|
||||||
|
},
|
||||||
handleFile(item) {
|
handleFile(item) {
|
||||||
console.log('item' + JSON.stringify(item));
|
console.log('item' + JSON.stringify(item));
|
||||||
// communicationMode 0是4G 1是蓝牙
|
// communicationMode 0是4G 1是蓝牙
|
||||||
@ -399,7 +377,7 @@
|
|||||||
this.page = 1;
|
this.page = 1;
|
||||||
this.finished = false;
|
this.finished = false;
|
||||||
this.getData(); // 重新加载第一页数据
|
this.getData(); // 重新加载第一页数据
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
onShow() {
|
onShow() {
|
||||||
this.getTab()
|
this.getTab()
|
||||||
|
@ -19,8 +19,9 @@
|
|||||||
<view class="checkbox-icon" :class="{ checked: isChecked }">
|
<view class="checkbox-icon" :class="{ checked: isChecked }">
|
||||||
<uni-icons v-if="isChecked" type="checkmarkempty" size="8" color="#fff"></uni-icons>
|
<uni-icons v-if="isChecked" type="checkmarkempty" size="8" color="#fff"></uni-icons>
|
||||||
</view>
|
</view>
|
||||||
<text class="checkbox-label">我已认真阅读,理解并同意<a class="agreeT">《用户服务协议》</a>及<a
|
<text class="checkbox-label">我已认真阅读,理解并同意<a class="agreeT"
|
||||||
class="agreeT">《隐私政策》</a></text>
|
@click.stop="goToPage('agreement')">《用户服务协议》</a>及<a class="agreeT"
|
||||||
|
@click.stop="goToPage('privacy')">《隐私政策》</a></text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<!-- 登录按钮 -->
|
<!-- 登录按钮 -->
|
||||||
@ -61,7 +62,7 @@
|
|||||||
return {
|
return {
|
||||||
showView: false,
|
showView: false,
|
||||||
//codebtn: '获取验证码',
|
//codebtn: '获取验证码',
|
||||||
phone: '17671332251', //手机号码
|
phone: '13058067817', //手机号码
|
||||||
code: "123456", //验证码
|
code: "123456", //验证码
|
||||||
agreed: false,
|
agreed: false,
|
||||||
isCounting: false,
|
isCounting: false,
|
||||||
@ -171,19 +172,15 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
// 打开具体协议
|
// 跳转到协议页面
|
||||||
openProtocol(type) {
|
goToPage(type) {
|
||||||
if (type === 'user') {
|
const url = type === 'agreement' ?
|
||||||
// 跳转到用户协议页面
|
'/pages/common/userAgreement/index' // 服务协议
|
||||||
uni.navigateTo({
|
:
|
||||||
url: '/pages/protocol/user'
|
'/pages/common/privacyAgreement/index'; // 隐私政策
|
||||||
})
|
uni.navigateTo({
|
||||||
} else {
|
url: url
|
||||||
// 跳转到隐私政策页面
|
});
|
||||||
uni.navigateTo({
|
|
||||||
url: '/pages/protocol/privacy'
|
|
||||||
})
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
|
|
||||||
// 不同意
|
// 不同意
|
||||||
|
37
pages/common/map/index.vue
Normal file
37
pages/common/map/index.vue
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
<template>
|
||||||
|
<view class="page-section page-section-gap">
|
||||||
|
<map class="map" :latitude="latitude" :longitude="longitude":show-location="true"
|
||||||
|
:markers="covers">
|
||||||
|
</map>
|
||||||
|
</view>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
export default {
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
id: 0, // 使用 marker点击事件 需要填写id
|
||||||
|
title: 'map',
|
||||||
|
latitude: 39.909,
|
||||||
|
longitude: 116.39742,
|
||||||
|
covers: [{
|
||||||
|
latitude: 39.909,
|
||||||
|
longitude: 116.39742,
|
||||||
|
|
||||||
|
}],
|
||||||
|
|
||||||
|
}
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.map {
|
||||||
|
width: 100%;
|
||||||
|
height: 100vh;
|
||||||
|
}
|
||||||
|
</style>
|
@ -1,8 +1,8 @@
|
|||||||
|
|
||||||
var isReady=false;var onReadyCallbacks=[];
|
var isReady=false;var onReadyCallbacks=[];
|
||||||
var isServiceReady=false;var onServiceReadyCallbacks=[];
|
var isServiceReady=false;var onServiceReadyCallbacks=[];
|
||||||
var __uniConfig = {"pages":["pages/common/login/index","pages/6155/deviceDetail","pages/common/index/index","pages/common/user/index","pages/common/scan/scan","pages/common/qrcode/qrcode","pages/common/send/index","pages/common/userAgreement/index","pages/common/privacyAgreement/index","pages/common/aboutUs/index","pages/6170/deviceControl/index","pages/6170/operationVideo/index","pages/6170/addvideo/index","pages/6170/editVideo/index","pages/6170/operatingInstruct/index","pages/common/addBLE/addEquip","pages/common/addBLE/LinkBle","pages/6155/ImgCrop"],"window":{"navigationBarTextStyle":"white","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#121212","backgroundColor":"#121212"},"tabBar":{"color":"#fff","selectedColor":"#BBE600","backgroundColor":"#202020","list":[{"pagePath":"pages/common/index/index","text":"我的设备","iconPath":"/static/tabs/device.png","selectedIconPath":"/static/tabs/device-HL.png"},{"pagePath":"pages/common/user/index","text":"我的","iconPath":"/static/tabs/my.png","selectedIconPath":"/static/tabs/my-HL.png"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"JingQuan","compilerVersion":"4.64","entryPagePath":"pages/common/login/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
|
var __uniConfig = {"pages":["pages/common/login/index","pages/common/index/index","pages/common/user/index","pages/common/scan/scan","pages/common/qrcode/qrcode","pages/common/send/index","pages/common/userAgreement/index","pages/common/privacyAgreement/index","pages/common/aboutUs/index","pages/6170/deviceControl/index","pages/common/operationVideo/index","pages/common/addvideo/index","pages/common/operatingInstruct/index","pages/common/productDes/index","pages/common/addBLE/addEquip","pages/common/addBLE/LinkBle","pages/6155/deviceDetail","pages/6155/ImgCrop","pages/common/map/index"],"window":{"navigationBarTextStyle":"white","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#121212","backgroundColor":"#121212"},"tabBar":{"color":"#fff","selectedColor":"#BBE600","backgroundColor":"#202020","list":[{"pagePath":"pages/common/index/index","text":"我的设备","iconPath":"/static/tabs/device.png","selectedIconPath":"/static/tabs/device-HL.png"},{"pagePath":"pages/common/user/index","text":"我的","iconPath":"/static/tabs/my.png","selectedIconPath":"/static/tabs/my-HL.png"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"JingQuan","compilerVersion":"4.64","entryPagePath":"pages/common/login/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
|
||||||
var __uniRoutes = [{"path":"/pages/common/login/index","meta":{"isQuit":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/6155/deviceDetail","meta":{},"window":{"navigationBarTitleText":"HBY 6155"}},{"path":"/pages/common/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/common/user/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"我的"}},{"path":"/pages/common/scan/scan","meta":{},"window":{"navigationBarTitleText":"扫描"}},{"path":"/pages/common/qrcode/qrcode","meta":{},"window":{"navigationBarTitleText":"扫描到的设备"}},{"path":"/pages/common/send/index","meta":{},"window":{"navigationBarTitleText":"发送信息"}},{"path":"/pages/common/userAgreement/index","meta":{},"window":{"navigationBarTitleText":"用户协议"}},{"path":"/pages/common/privacyAgreement/index","meta":{},"window":{"navigationBarTitleText":"隐私协议"}},{"path":"/pages/common/aboutUs/index","meta":{},"window":{"navigationBarTitleText":"关于我们"}},{"path":"/pages/6170/deviceControl/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/6170/operationVideo/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/6170/addvideo/index","meta":{},"window":{"navigationBarTitleText":"添加"}},{"path":"/pages/6170/editVideo/index","meta":{},"window":{"navigationBarTitleText":"编辑视频"}},{"path":"/pages/6170/operatingInstruct/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/common/addBLE/addEquip","meta":{},"window":{"navigationBarTitleText":"添加设备"}},{"path":"/pages/common/addBLE/LinkBle","meta":{},"window":{"navigationBarTitleText":"扫描到的设备"}},{"path":"/pages/6155/ImgCrop","meta":{},"window":{"navigationBarTitleText":"图像裁剪","navigationStyle":"custom","fullscreen":true}}];
|
var __uniRoutes = [{"path":"/pages/common/login/index","meta":{"isQuit":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/common/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/common/user/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"我的"}},{"path":"/pages/common/scan/scan","meta":{},"window":{"navigationBarTitleText":"扫描"}},{"path":"/pages/common/qrcode/qrcode","meta":{},"window":{"navigationBarTitleText":"扫描到的设备"}},{"path":"/pages/common/send/index","meta":{},"window":{"navigationBarTitleText":"发送信息"}},{"path":"/pages/common/userAgreement/index","meta":{},"window":{"navigationBarTitleText":"用户协议"}},{"path":"/pages/common/privacyAgreement/index","meta":{},"window":{"navigationBarTitleText":"隐私协议"}},{"path":"/pages/common/aboutUs/index","meta":{},"window":{"navigationBarTitleText":"关于我们"}},{"path":"/pages/6170/deviceControl/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/common/operationVideo/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/common/addvideo/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/common/operatingInstruct/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/common/productDes/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/common/addBLE/addEquip","meta":{},"window":{"navigationBarTitleText":"添加设备"}},{"path":"/pages/common/addBLE/LinkBle","meta":{},"window":{"navigationBarTitleText":"扫描到的设备"}},{"path":"/pages/6155/deviceDetail","meta":{},"window":{"navigationBarTitleText":"HBY 6155"}},{"path":"/pages/6155/ImgCrop","meta":{},"window":{"navigationBarTitleText":"图像裁剪","navigationStyle":"custom","fullscreen":true}},{"path":"/pages/common/map/index","meta":{},"window":{"navigationBarTitleText":"地图"}}];
|
||||||
__uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
|
__uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
|
||||||
__uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
|
__uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
|
||||||
service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}});
|
service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}});
|
||||||
|
5004
unpackage/dist/dev/app-plus/app-service.js
vendored
5004
unpackage/dist/dev/app-plus/app-service.js
vendored
File diff suppressed because one or more lines are too long
5512
unpackage/dist/dev/app-plus/app-view.js
vendored
5512
unpackage/dist/dev/app-plus/app-view.js
vendored
File diff suppressed because one or more lines are too long
BIN
unpackage/dist/dev/app-plus/static/images/delete-icon.png
vendored
Normal file
BIN
unpackage/dist/dev/app-plus/static/images/delete-icon.png
vendored
Normal file
Binary file not shown.
After Width: | Height: | Size: 605 B |
@ -1,5 +1,4 @@
|
|||||||
const BASE_URL = 'http://192.168.110.169:9001';
|
const BASE_URL = 'http://192.168.2.34:8000';
|
||||||
|
|
||||||
const request = (options) => {
|
const request = (options) => {
|
||||||
console.log("options"+JSON.stringify(options))
|
console.log("options"+JSON.stringify(options))
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
@ -41,5 +40,8 @@ const request = (options) => {
|
|||||||
uni.request(config);
|
uni.request(config);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
// 导出基础URL以便其他地方使用
|
||||||
|
export const baseURL = BASE_URL
|
||||||
|
export const getToken = () => uni.getStorageSync('token') // 获取token的方法
|
||||||
|
export const clientid =() => uni.getStorageSync('clientID');
|
||||||
export default request;
|
export default request;
|
Reference in New Issue
Block a user