From 56f05e7eec738c788fc1d3cd6bcfcf9aacde170c Mon Sep 17 00:00:00 2001
From: fengerli <528575642@qq.com>
Date: Mon, 14 Jul 2025 16:10:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E7=BB=91=E4=BC=A0=E5=8F=82=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=8C=E9=9A=90=E7=A7=81=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=EF=BC=8C=E7=94=A8=E6=88=B7=E5=8D=8F=E8=AE=AE=EF=BC=8C?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E7=9B=B8=E5=AF=B9=E5=BA=94=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/common/index.js                           |   5 +-
 pages/6170/deviceControl/index.vue            |   2 +-
 pages/6170/editVideo/index.vue                |  11 -
 pages/6170/operatingInstruct/index.vue        | 350 ------------------
 pages/common/addBLE/addEquip.vue              |   2 -
 pages/common/index/index.vue                  |  36 +-
 pages/common/login/index.vue                  |  29 +-
 .../app-plus/static/images/delete-icon.png    | Bin 0 -> 605 bytes
 utils/request.js                              |   7 +-
 9 files changed, 25 insertions(+), 417 deletions(-)
 delete mode 100644 pages/6170/editVideo/index.vue
 delete mode 100644 pages/6170/operatingInstruct/index.vue
 create mode 100644 unpackage/dist/dev/app-plus/static/images/delete-icon.png

diff --git a/api/common/index.js b/api/common/index.js
index e842bef..26fda5f 100644
--- a/api/common/index.js
+++ b/api/common/index.js
@@ -18,11 +18,10 @@ export function deviceTypeList(params) {
 }
 
 // 删除设备列表接口
-export function deviceUnbind(data) {
+export function deviceUnbind(id) {
 	return request({
-		url: '/app/device/unBind',
+		url: `/app/device/unBind?id=${id}`,
 		method: 'DELETE',
-		data: data,
 	})
 }
 // 重命名设备
diff --git a/pages/6170/deviceControl/index.vue b/pages/6170/deviceControl/index.vue
index 145b08b..6903fce 100644
--- a/pages/6170/deviceControl/index.vue
+++ b/pages/6170/deviceControl/index.vue
@@ -79,7 +79,7 @@
 							<image src="/static/images/jg.png" class="setIMG"></image>
 							<view>
 								<view class="battery-v2">激光模式</view>
-								<!-- 								<view class="mode-v3">{{currentSecondaryMode}}</view> -->
+								<!--<view class="mode-v3">{{currentSecondaryMode}}</view> -->
 							</view>
 						</view>
 					</view>
diff --git a/pages/6170/editVideo/index.vue b/pages/6170/editVideo/index.vue
deleted file mode 100644
index fca7d0d..0000000
--- a/pages/6170/editVideo/index.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
-	<view>
-		<text>编辑视频</text>
-	</view>
-</template>
-
-<script>
-</script>
-
-<style scoped>
-</style>
\ No newline at end of file
diff --git a/pages/6170/operatingInstruct/index.vue b/pages/6170/operatingInstruct/index.vue
deleted file mode 100644
index 6690755..0000000
--- a/pages/6170/operatingInstruct/index.vue
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/pages/common/addBLE/addEquip.vue b/pages/common/addBLE/addEquip.vue
index 6f87957..d5b4a94 100644
--- a/pages/common/addBLE/addEquip.vue
+++ b/pages/common/addBLE/addEquip.vue
@@ -584,12 +584,10 @@
 		justify-content: center;
 
 	}
-
 	.openBlue .cancel {
 		border: 1px solid rgba(255, 255, 255, 1);
 		color: rgba(255, 255, 255, 1);
 	}
-
 	.openBlue .ok {
 		background-color: #BBE600;
 		color: #232323;
diff --git a/pages/common/index/index.vue b/pages/common/index/index.vue
index ba73163..68d2b5d 100644
--- a/pages/common/index/index.vue
+++ b/pages/common/index/index.vue
@@ -25,33 +25,7 @@
 				<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.stop="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> -->
+							@click="handleSwipeClick($event, item, index)" class="device-card">
 							<view @click.stop="handleFile(item)">
 								<view class="device-header">
 									<view class="deviceIMG">
@@ -282,11 +256,9 @@
 			},
 			// 右滑点击事件处理
 			handleSwipeClick(e, item, index) {
-				const {
-					content
-				} = e
+				const {content} = e
 				console.log(e, 'eeeee');
-				switch (content.text) {
+				switch (e.content.text) {
 					case '删除':
 						this.handleDeleteDevice(item, index)
 						break
@@ -307,7 +279,7 @@
 				let data = {
 					id: this.deviceId.id
 				}
-				deviceUnbind(data).then((res) => {
+				deviceUnbind(this.deviceId.id).then((res) => {
 					if (res.code == 200) {
 						uni.showToast({
 							title: '删除成功',
diff --git a/pages/common/login/index.vue b/pages/common/login/index.vue
index 9563062..36d7434 100644
--- a/pages/common/login/index.vue
+++ b/pages/common/login/index.vue
@@ -19,8 +19,9 @@
 					<view class="checkbox-icon" :class="{ checked: isChecked }">
 						<uni-icons v-if="isChecked" type="checkmarkempty" size="8" color="#fff"></uni-icons>
 					</view>
-					<text class="checkbox-label">我已认真阅读，理解并同意<a class="agreeT">《用户服务协议》</a>及<a
-							class="agreeT">《隐私政策》</a></text>
+					<text class="checkbox-label">我已认真阅读，理解并同意<a class="agreeT"
+							@click.stop="goToPage('agreement')">《用户服务协议》</a>及<a class="agreeT"
+							@click.stop="goToPage('privacy')">《隐私政策》</a></text>
 				</view>
 			</view>
 			<!-- 登录按钮 -->
@@ -61,7 +62,7 @@
 			return {
 				showView: false,
 				//codebtn: '获取验证码',
-				phone: '17671332251', //手机号码
+				phone: '13058067817', //手机号码
 				code: "123456", //验证码
 				agreed: false,
 				isCounting: false,
@@ -171,19 +172,15 @@
 				}
 
 			},
-			// 打开具体协议
-			openProtocol(type) {
-				if (type === 'user') {
-					// 跳转到用户协议页面
-					uni.navigateTo({
-						url: '/pages/protocol/user'
-					})
-				} else {
-					// 跳转到隐私政策页面
-					uni.navigateTo({
-						url: '/pages/protocol/privacy'
-					})
-				}
+			// 跳转到协议页面
+			goToPage(type) {
+				const url = type === 'agreement' ?
+					'/pages/common/userAgreement/index' // 服务协议
+					:
+					'/pages/common/privacyAgreement/index'; // 隐私政策
+				uni.navigateTo({
+					url: url
+				});
 			},
 
 			// 不同意
diff --git a/unpackage/dist/dev/app-plus/static/images/delete-icon.png b/unpackage/dist/dev/app-plus/static/images/delete-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..611fc9fe70b70abb4082b6ed5e583794cdf44f67
GIT binary patch
literal 605
zcmV-j0;2tiP)<h;3K|Lk000e1NJLTq001li001lq0{{R3DO##C00001b5ch_0olnc
ze*gdgT2M?>MF0Q*v*rNT?0wzqoaODo<LtWP?X~ak@7n8(=I+Dd?6ceKkmT*R)a-TS
z?Y!dcv&iT?yXFAZ>v-4egyQV6-R+*a=m62{ZQ$&y-0PR!^MK6kK<@d!|Ns9N@2;x=
z0016zQchC<3VOut_Wb|b>i^ZJgY*CY|NrN$VJwWZ%K!iW|5#}1CjbBehe<?1RCt_~
z)!P<=AP@ym6cp5wi<Kq$|G(LQlqeUCr;^<)1UiGzb`&KhRZVGKF<cfXH_E1^{^%}A
zdhKDJb0LJ3LMX-I>u`(GJApalyrJL`dxUm`=Sl{{@aNuQSU^Y}$6Nb~mi_71u5Qxq
zYd^Er>hWtI2iEGl!|cdP$thXvjnX44C8bx3hvUL#A-%DeGlfm*5^#5>FkBYez@5w&
zp7am51u9d=Y{z?^C-;%VI&f|kU_Fepn{4d7u7jY8iUifOZvj`R_OQ-az%^PoL$B-m
z+PD8}N<BRJv!OM3U4}m&v1S?G3$7w!?F$nB1)Z597OoP5L-9^<(NPN+?~Z%fuX(dC
zZkXdP+Rdrxl!eWJ=xeq|s1sJv&V=Faj_P;JLSY+{{kgx@u!QHiKdg&WlD+?~F#Cq>
znUMJf?|2+vUhMu8jQ>S$t~L+C+{SLIO^kaB!OH?J1Uw@5(3&_MOlwnWX>Ed=*4AI6
r)P`iY>6vX)CaD?Fj@i<VN!X4*9-U-GzSguF00000NkvXXu0mjfi1$2j

literal 0
HcmV?d00001

diff --git a/utils/request.js b/utils/request.js
index a891b42..fab8389 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,4 +1,4 @@
-const BASE_URL = 'http://192.168.2.23:8000';
+const BASE_URL = 'http://192.168.2.34:8000';
 const request = (options) => {
 	console.log("options"+JSON.stringify(options))
   return new Promise((resolve, reject) => {
@@ -40,5 +40,8 @@ const request = (options) => {
     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;
\ No newline at end of file