图片调整路径

pages/210/deviceControl/index.vue

@@ -16,14 +16,14 @@
 					</view>
 					<view>
 						<view class="battery-v1">
-							<image src="/static/images/dl.png" class="dlIMG"></image>
+							<image src="/static/images/common/dl.png" class="dlIMG"></image>
 							<view>
 								<view class="battery-v2">{{deviceInfo.batteryPercentage}}%</view>
 								<view class="battery-v3">电量</view>
 							</view>
 						</view>
 						<view class="battery-v1">
-							<image src="/static/images/nz.png" class="dlIMG" mode="aspectFit"></image>
+							<image src="/static/images/common/nz.png" class="dlIMG" mode="aspectFit"></image>
 							<view>
 								<view class="battery-v2">1小时</view>
 								<view class="battery-v3">续航时间</view>
@@ -55,41 +55,72 @@
 							</view>
 						</view>
 					</view>
+				</view>
+				<!-- ===========主副机选择============= -->
+				<view class="mode-section">
+					
 				</view>
 				<!-- 灯光模式选择 -->
 				<view class="mode-section">
 					<view class="mode-buttons">
-						<view class="mode-v1" v-if="hasPermission('1')">
+						<view class="mode-v1">
 							<view class="mode-v2" @click="selectMode('main')">
-								<image src="/static/images/set.png" class="setIMG"></image>
+								<image src="/static/images/210/lj.png" class="setIMG"></image>
 								<view>
 									<view class="battery-v2">灯光模式</view>
 									<view class="mode-v3">{{ currentMainMode }}</view>
 								</view>
 							</view>
 						</view>
-						<view class="mode-v1" v-if="hasPermission('2')">
+						<view class="mode-v1">
-							<view class="mode-v2" @click="lasermode">
-								<image src="/static/images/jg.png" class="setIMG" mode="aspectFit"></image>
-								<view>
-									<view class="battery-v2">激光模式</view>
-								</view>
-							</view>
-						</view>
-						<view class="mode-v1" v-if="hasPermission('3')">
 							<view class="mode-v2" @click="uploadStartup">
-								<image src="/static/images/path7.png" class="setIMG" mode="aspectFit"></image>
+								<image src="/static/images/common/path7.png" class="setIMG" mode="aspectFit"></image>
 								<view>
 									<view class="battery-v2">开机画面</view>
 									<view class="mode-v3">上传</view>
 								</view>
 							</view>
 						</view>
+						<view class="mode-v1">
+							<view class="mode-v2" @click="lasermode">
+								<image src="/static/images/210/zd.png" class="setIMG" mode="aspectFit"></image>
+								<view>
+									<view class="battery-v2">自动报警</view>
+								</view>
+							</view>
+						</view>
+						<view class="mode-v1">
+							<view class="mode-v2" @click="lasermode">
+								<image src="/static/images/210/zd-HL.png" class="setIMG" mode="aspectFit"></image>
+								<view>
+									<view class="battery-v2">手动报警</view>
+								</view>
+							</view>
+						</view>
+						<view class="mode-v1">
+							<view class="mode-v2" @click="lasermode">
+								<image src="/static/images/210/bj.png" class="setIMG" mode="aspectFit"></image>
+								<view>
+									<view class="battery-v2">报警声音</view>
+									<view class="mode-v3">上传</view>
+								</view>
+							</view>
+						</view>
+						<view class="mode-v1">
+							<view class="mode-v2" @click="lasermode">
+								<image src="/static/images/jg.png" class="setIMG" mode="aspectFit"></image>
+								<view>
+									<view class="battery-v2">报警时长</view>
+									<view class="mode-v3">2分30秒</view>
+								</view>
+							</view>
+						</view>
+					
 					</view>
 				</view>
 
 				<!-- 人员信息登记 -->
-				<view class="form-section" v-if="hasPermission('4')">
+				<view class="form-section">
 					<view class="mode-buttons">
 						<view class="section-title">人员信息登记</view>
 						<view class="right-icons">
@@ -118,7 +149,7 @@
 					</view>
 				</view>
 				<!-- 人员信息登记 -->
-				<view class="form-section" v-if="hasPermission('5')">
+				<view class="form-section">
 					<view class="mode-buttons">
 						<view class="section-title">发送信息</view>
 						<button class="send-btn" @click="sendTextMessage">发送</button>
@@ -129,19 +160,19 @@
 					</view>
 				</view>
 				<!-- 产品信息 -->
-				<view v-if="hasPermission('6')">
+				<view>
 					<view class="section-title">产品信息</view>
 					<view class="mode-buttons">
 						<view class="mode_1" @click="productparams">
-							<image src="/static/images/cp.png" mode="" class="cpIMG" mode="aspectFit"></image>
+							<image src="/static/images/common/cp.png" mode="" class="cpIMG" mode="aspectFit"></image>
 							<view class="">产品参数</view>
 						</view>
 						<view class="mode_1" @click="operatingInst">
-							<image src="/static/images/sm.png" mode="" class="cpIMG" mode="aspectFit"></image>
+							<image src="/static/images/common/sm.png" mode="" class="cpIMG" mode="aspectFit"></image>
 							<view class="">操作说明</view>
 						</view>
 						<view class="mode_1" @click="operatingVideo">
-							<image src="/static/images/sp.png" mode="" class="cpIMG" mode="aspectFit"></image>
+							<image src="/static/images/common/sp.png" mode="" class="cpIMG" mode="aspectFit"></image>
 							<view class="">操作视频</view>
 						</view>
 					</view>
@@ -622,12 +653,6 @@
 						});
 					}
 				})
-				// const topic = `device/command/${this.deviceID}/message`;
-				// this.mqttClient.publish(topic, this.messageToSend);
-				// uni.showToast({
-				// 	title: '消息已发送',
-				// 	icon: 'success'
-				// });
 			},
 			// 统一处理返回方法
 			handleDeviceData(res, isFromShared = false) {
@@ -646,14 +671,6 @@
 					uni.hideLoading()
 				}
 			},
-			// 检查权限的方法
-			hasPermission(permissionCode) {
-				// 如果还在加载中，直接返回false
-				if (this.pageLoading) return false
-				// 如果不是分享设备，默认有全部权限
-				if (!this.isSharedDevice) return true
-				return this.activePermissions.includes(permissionCode)
-			},
 			// 获取设备详情（普通详情）
 			async fetchDeviceDetail(id) {
 				try {
@@ -685,7 +702,7 @@
 				this.mqttClient.connect(() => {
 					console.log('MQTT 连接成功，开始订阅主题');
 					// 订阅来自设备的状态更新
-					const statusTopic = `A/${this.itemInfo.nnnnnnnnnnnnnnnnnnn}`;
+					const statusTopic = `A/${this.itemInfo.id}`;
 					this.mqttClient.subscribe(statusTopic, (payload) => {
 						console.log(`收到来自 ${statusTopic} 的消息:`, payload);
 						// uni.showModal({

pages/6170/allShare/index.vue

@@ -41,7 +41,7 @@
 												<view class="ID">
 													ID:{{item.deviceImei}}</view>
 												<view class="onlines">在线</view>
-												<view>电量：{{item.battery || '80'}}%</view>
+												<view>电量：{{item.battery || '0'}}%</view>
 											</view>
 										</view>
 									</view>
@@ -67,7 +67,7 @@
 		<view class="agreement-mask" v-if="deleteShow" @click="closePopup('delete')">
 			<view class="agreement-popupC" @click.stop>
 				<view class="popup-content">
-					<image src="/static/images/delel.png"  class="svg" mode="aspectFit"></image>
+					<image src="/static/images/common/delel.png"  class="svg" mode="aspectFit"></image>
 					<uni-icon class="trash"></uni-icon>
 					<view class="popup-Title">
 						{{ tabs[activeTab].name === '我的分享' ? '确定停止分享该设备' : '确定移除他人分享给你的这台设备' }}

pages/6170/deviceControl/index.vue

@@ -6,7 +6,7 @@
 		<!-- 使用自定义导航栏 -->
 		<view v-show="!pageLoading">
 			<custom-navbar :title="navTitle" :showBack="true" color="#FFFFFF"
-				:rightIcon="isRightIconVisible ? '/static/images/shape.png' : ''"
+				:rightIcon="isRightIconVisible ? '/static/images/common/shape.png' : ''"
 				@right-click="shareUp"></custom-navbar>
 			<view class="device-detail-container" :style="{ paddingTop: navBarHeight + 'px' }">
 				<!-- 设备电量信息 -->
@@ -16,14 +16,14 @@
 					</view>
 					<view>
 						<view class="battery-v1">
-							<image src="/static/images/dl.png" class="dlIMG"></image>
+							<image src="/static/images/common/dl.png" class="dlIMG"></image>
 							<view>
 								<view class="battery-v2">{{deviceInfo.batteryPercentage}}%</view>
 								<view class="battery-v3">电量</view>
 							</view>
 						</view>
 						<view class="battery-v1">
-							<image src="/static/images/nz.png" class="dlIMG" mode="aspectFit"></image>
+							<image src="/static/images/common/nz.png" class="dlIMG" mode="aspectFit"></image>
 							<view>
 								<view class="battery-v2">{{deviceInfo.batteryRemainingTime || '0分钟'}}</view>
 								<view class="battery-v3">续航时间</view>
@@ -45,13 +45,16 @@
 						<text class="info-value status-running">{{deviceInfo.onlineStatus===0?'离线':'在线'}}</text>
 					</view>
 					<view class="info-row">
-						<text class="info-label">定位信息</text>
+						<text class="info-label" style="display: flex; align-items: center;">定位信息</text>
-						<view class="info-value status-running" @click="gpsPosition">
+						<view class="info-value status-running" @click="gpsPosition(deviceInfo)">
-							<view class="info-value status-running">114.72 30.28</view>
 							<view class="info-value status-running">
+								{{ deviceInfo && deviceInfo.longitude ? Number(deviceInfo.longitude).toFixed(4) : '' }}
+								{{ deviceInfo && deviceInfo.latitude ? Number(deviceInfo.latitude).toFixed(4) : '' }}
+							</view>
+							<view class="info-value status-running locationGPS">
 								<uni-icons @click="toggleForm" type="location" size="17"
 									color="rgba(255, 255, 255, 0.8)" style="vertical-align: bottom;" />
-								深圳市龙华区富源晟
+								{{deviceInfo.address}}
 							</view>
 						</view>
 
@@ -64,7 +67,7 @@
 				</view>
 
 				<!-- 灯光亮度控制 -->
-				<view class="control-card">
+				<view class="control-card" @touchmove.prevent>
 					<slider :value="sliderValue" min="10" max="100" activeColor="rgb(187, 230, 0)"
 						backgroundColor="rgb(26, 26, 26)" :show-value="false" @changing="onSliderChanging"
 						@change="onSliderChanging" />
@@ -75,7 +78,7 @@
 					<view class="mode-buttons">
 						<view class="mode-v1" v-if="hasPermission('1')">
 							<view class="mode-v2" @click="selectMode('main')">
-								<image src="/static/images/set.png" class="setIMG"></image>
+								<image src="/static/images/6170/set.png" class="setIMG"></image>
 								<view>
 									<view class="battery-v2">灯光模式</view>
 									<view class="mode-v3">{{ currentMainMode }}</view>
@@ -84,7 +87,7 @@
 						</view>
 						<view class="mode-v1" v-if="hasPermission('2')">
 							<view class="mode-v2" @click="lasermode">
-								<image src="/static/images/jg.png" class="setIMG" mode="aspectFit"></image>
+								<image src="/static/images/6170/jg.png" class="setIMG" mode="aspectFit"></image>
 								<view>
 									<view class="battery-v2">激光模式</view>
 								</view>
@@ -92,7 +95,7 @@
 						</view>
 						<view class="mode-v1" v-if="hasPermission('3')">
 							<view class="mode-v2" @click="uploadStartup">
-								<image src="/static/images/path7.png" class="setIMG" mode="aspectFit"></image>
+								<image src="/static/images/common/path7.png" class="setIMG" mode="aspectFit"></image>
 								<view>
 									<view class="battery-v2">开机画面</view>
 									<view class="mode-v3">上传</view>
@@ -147,15 +150,15 @@
 					<view class="section-title">产品信息</view>
 					<view class="mode-buttons">
 						<view class="mode_1" @click="productparams">
-							<image src="/static/images/cp.png" mode="" class="cpIMG" mode="aspectFit"></image>
+							<image src="/static/images/common/cp.png" mode="" class="cpIMG" mode="aspectFit"></image>
 							<view class="">产品参数</view>
 						</view>
 						<view class="mode_1" @click="operatingInst">
-							<image src="/static/images/sm.png" mode="" class="cpIMG" mode="aspectFit"></image>
+							<image src="/static/images/common/sm.png" mode="" class="cpIMG" mode="aspectFit"></image>
 							<view class="">操作说明</view>
 						</view>
 						<view class="mode_1" @click="operatingVideo">
-							<image src="/static/images/sp.png" mode="" class="cpIMG" mode="aspectFit"></image>
+							<image src="/static/images/common/sp.png" mode="" class="cpIMG" mode="aspectFit"></image>
 							<view class="">操作视频</view>
 						</view>
 					</view>
@@ -189,10 +192,7 @@
 					<view class="popup-title">上传开机画面</view>
 					<view class="popup-content">
 						<view class="example-body">
-							<!-- <uni-file-picker limit="1" class="custom-file-picker"></uni-file-picker> -->
 							<view class="icoContent" @click="checkImgUpload">
-								<!-- <image mode="aspectFit" class="img" src="/static/images/6155/DeviceDetail/add.png">
-								</image> -->
 								<image v-if="selectedImage" :src="selectedImage" mode="aspectFit" class="img"
 									style="width: 100%; height: 100%;"></image>
 								<image v-else mode="aspectFit" class="img"
@@ -228,7 +228,7 @@
 				</view>
 			</view>
 			<!-- 人员信息成功提示弹框 -->
-			<CustomPopup :show="showPopupFlag" :message="popupMessage" icon="/static/images/sendSucc.png"
+			<CustomPopup :show="showPopupFlag" :message="popupMessage" icon="/static/images/common/sendSucc.png"
 				:confirm-text="popupConfirmText" :show-cancel="false" @confirm="onPopupConfirm" />
 		</view>
 	</view>
@@ -306,9 +306,17 @@
 				this.lightModeC = false;
 			},
 			// *******定位******
-			gpsPosition() {
+			gpsPosition(item) {
 				uni.navigateTo({
-					url: '/pages/common/map/index'
+					url: '/pages/common/map/index',
+					events: {
+						ack: function(data) {}
+					},
+					success: (res) => {
+						res.eventChannel.emit('MapData', {
+							data: item
+						});
+					}
 				})
 			},
 			// ***********进度条***********
@@ -334,31 +342,31 @@
 					this.items = [{
 							text: '强光',
 							selected: this.currentMainMode === '强光', // 修正匹配条件
-							image: '/static/images/sett.png',
+							image: '/static/images/6170/sett.png',
 							instructValue: '1'
 						},
 						{
 							text: '弱光',
 							selected: this.currentMainMode === '弱光',
-							image: '/static/images/rg.png',
+							image: '/static/images/6170/rg.png',
 							instructValue: '2'
 						},
 						{
 							text: '爆闪',
 							selected: this.currentMainMode === '爆闪',
-							image: '/static/images/bs.png',
+							image: '/static/images/6170/bs.png',
 							instructValue: '3'
 						},
 						{
 							text: '泛光',
 							selected: this.currentMainMode === '泛光',
-							image: '/static/images/settt.png',
+							image: '/static/images/6170/settt.png',
 							instructValue: '4'
 						},
 						{
 							text: '关闭',
 							selected: this.currentMainMode === '关闭',
-							image: '/static/images/close.png',
+							image: '/static/images/6170/close.png',
 							instructValue: '0'
 						},
 					];
@@ -488,7 +496,7 @@
 				// 显示上传中加载提示
 				uni.showLoading({
 					title: '上传中...',
-					mask: true 
+					mask: true
 				});
 
 				uni.uploadFile({
@@ -737,14 +745,9 @@
 				this.mqttClient.connect(() => {
 					console.log('MQTT 连接成功，开始订阅主题');
 					// 订阅来自设备的状态更新
-					const statusTopic = `A/${this.itemInfo.nnnnnnnnnnnnnnnnnnn}`;
+					const statusTopic = `A/${this.deviceID}`;
 					this.mqttClient.subscribe(statusTopic, (payload) => {
 						console.log(`收到来自 ${statusTopic} 的消息:`, payload);
-						// uni.showModal({
-						// 	title: '收到设备消息',
-						// 	content: payload,
-						// 	showCancel: false
-						// });
 						// ✅ 发送全局事件通知主页面更新
 						uni.$emit('deviceStatusUpdate', {
 							message: JSON.stringify(payload), // 消息内容
@@ -899,7 +902,7 @@
 	.info-card {
 		background-color: rgb(26, 26, 26);
 		border-radius: 16rpx;
-		padding: 10rpx 30rpx 5rpx 30rpx;
+		padding: 10rpx 20rpx 5rpx 20rpx;
 		margin-bottom: 20rpx;
 
 	}
@@ -913,6 +916,7 @@
 	.info-label {
 		font-size: 28rpx;
 		color: rgba(255, 255, 255, 0.87);
+		white-space: nowrap;
 	}
 
 	.info-value {
@@ -924,7 +928,12 @@
 		color: rgba(255, 255, 255, 0.6);
 		text-align: end;
 	}
-
+	.locationGPS {
+		width:88%;
+		text-align: end;
+		float: right;
+		line-height:50rpx;
+	}
 	.control-card {
 		background-color: rgb(26, 26, 26);
 		border-radius: 16rpx;

pages/6170/shareDevices/index.vue

@@ -48,7 +48,7 @@
 		<view class="agreement-mask" v-if="shareShow" @click="closePopup('share')">
 			<view class="agreement-popup" @click.stop>
 				<view class="popup-content">
-					<image src="/static/images/success.png" mode="aspectFit" class="svg"></image>
+					<image src="/static/images/common/success.png" mode="aspectFit" class="svg"></image>
 					<view>
 						<view class="popup-Title">设备分享成功</view>
 					</view>

pages/6170/shareManagement/index.vue

@@ -4,7 +4,7 @@
 		<view class="device-info" v-for="(item, index) in deviceList" :key="index">
 			<view class="device-header" @click.stop="handleFile(item)">
 				<view class="deviceIMG">
-					<image src="@/static/images/user.png" mode="aspectFit" class="IMG"></image>
+					<image src="@/static/images/common/user.png" mode="aspectFit" class="IMG"></image>
 				</view>
 				<view class="device-name">
 					<view>用户名：{{item.deviceName}}</view>
@@ -22,7 +22,7 @@
 		<view class="agreement-mask" v-if="deleteShow" @click="closePopup('delete')">
 			<view class="agreement-popup" @click.stop>
 				<view class="popup-content">
-					<image src="/static/images/delel.png" mode="" class="svg"></image>
+					<image src="/static/images/common/delel.png" mode="" class="svg"></image>
 					<uni-icon class="trash"></uni-icon>
 					<view>
 						<view class="popup-Title">确定移除该用户！</view>

pages/common/addvideo/index.vue

@@ -25,7 +25,7 @@
 				<!-- 上传画面弹窗 -->
 				<view class="agreement-popupC">
 					<view class="popup-content">
-						<image src="/static/images/path2.png" mode="" class="path2"></image>
+						<image src="/static/images/common/path2.png" mode="" class="path2"></image>
 						<view class="popup-Title">
 							<view>保存成功！</view>
 						</view>

pages/common/allType/index.vue

@@ -4,7 +4,7 @@
 		<view class="vehicle-list" v-if="vehicles.length>0">
 			<view v-for="(item, index) in vehicles" :key="index">
 				<view class="vehicle-item" @click="alltypeInfo(item)">
-					<image src="/static/images/bip.6.png" mode="" class="IMG"></image>
+					<image src="/static/images/common/bip.6.png" mode="" class="IMG"></image>
 				</view>
 				<view class="plate-number">{{ item.typeName }}</view>
 			</view>

pages/common/index/index.vue

@@ -2,7 +2,7 @@
 	<view>
 		<!-- 使用自定义导航栏 -->
 		<custom-navbar :title="navTitle" :showBack="false" backgroundColor="#202020" color="#FFFFFF"
-			rightIcon="/static/images/add.png" @right-click="scan"></custom-navbar>
+			rightIcon="/static/images/common/add.png" @right-click="scan"></custom-navbar>
 		<view class="device-page" :style="{ paddingTop: navBarHeight + 'px' }">
 			<!-- handleSend   发送信息 -->
 			<view class="tab-bar-wrap">
@@ -15,7 +15,7 @@
 					</view>
 				</scroll-view>
 				<view class="tab-more" @click="allMore">
-					<image src="/static/images/more.png" mode="aspectFit" class="more"></image>
+					<image src="/static/images/common/more.png" mode="aspectFit" class="more"></image>
 				</view>
 			</view>
 			<view class="sendFlex" v-if="activeTab && activeTab.id !== ''&& activeTabInfo.communicationMode==0">
@@ -56,7 +56,7 @@
 										<view class="device-status unline">未连接</view>
 									</view>
 								</view>
-								<image src="/static/images/cires.png" class="circle" mode="aspectFit"></image>
+								<image src="/static/images/common/cires.png" class="circle" mode="aspectFit"></image>
 							</uni-swipe-action-item>
 						</block>
 					</uni-swipe-action>
@@ -77,7 +77,7 @@
 		<view class="agreement-mask" v-if="deleteShow" @click="closePopup('delete')">
 			<view class="agreement-popupC" @click.stop>
 				<view class="popup-content">
-					<image src="/static/images/dell.png" mode="" class="svg"></image>
+					<image src="/static/images/common/dell.png" mode="" class="svg"></image>
 					<uni-icon class="trash"></uni-icon>
 					<view>
 						<view class="popup-Title">确定删除所选设备！</view>
@@ -170,23 +170,23 @@
 				RenameModel: false,
 				menuItems: [{
 						text: '扫一扫添加',
-						icon: '/static/images/scane.png',
+						icon: '/static/images/common/scane.png',
 						action: 'scan'
 					},
 					{
 						text: '蓝牙添加',
-						icon: '/static/images/bluetooth.png',
+						icon: '/static/images/common/bluetooth.png',
 						action: 'bluetooth'
 					}
 				],
 				shareItems: [{
 						text: '所有类型',
-						icon: '/static/images/type.png',
+						icon: '/static/images/common/type.png',
 						action: 'type'
 					},
 					{
 						text: '所有分享',
-						icon: '/static/images/share.png',
+						icon: '/static/images/common/share.png',
 						action: 'share'
 					}
 				],
@@ -427,7 +427,7 @@
 			},
 			handleFile(item) {
 				//console.log('item' + JSON.stringify(item));
-				// communicationMode 0是4G 1是蓝牙
+				// communicationMode 0是4G 1是蓝牙,考虑多个4g设备
 				if (item.typeName == 'BJQ6170') {
 					uni.navigateTo({
 						url: "/pages/6170/deviceControl/index",

pages/common/login/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="pageContent">
-		<image src="/static/images/login.png" mode="" class="login-bg"></image>
+		<image src="/static/images/common/login.png" mode="" class="login-bg"></image>
 		<view class="content_con">
 			欢迎登录
 		</view>

pages/common/map/index.vue

@@ -147,7 +147,14 @@ export default {
       }
       this.map.off('click', this.hideCustomPopup)
     }
-  }
+  },
+  onLoad(options) {
+  	const eventChannel = this.getOpenerEventChannel();
+  	// 监听 'detailData' 事件，获取传过来的数据
+  	eventChannel.on('MapData', (data) => {
+		console.log(data,'data');
+	})
+	}
 }
 </script>
 

pages/common/operatingInstruct/index.vue

@@ -17,7 +17,7 @@
 
 						<!-- 多选模式下的选中标记 -->
 						<view class="checkmark" v-if="isDeleteMode && selectedImages.includes(index)">
-							<image src="/static/images/delete-icon.png" mode="aspectFill"></image>
+							<image src="/static/images/common/delete-icon.png" mode="aspectFill"></image>
 						</view>
 					</view>
 
@@ -38,7 +38,7 @@
 		<view class="agreement-mask" v-if="deleteShow">
 			<view class="agreement-popupC">
 				<view class="popup-content">
-					<image src="/static/images/dell.png" mode="" class="svg"></image>
+					<image src="/static/images/common/dell.png" mode="" class="svg"></image>
 					<uni-icon class="trash"></uni-icon>
 					<view>
 						<view class="popup-Title">确定删除所选设备！</view>

pages/common/operationVideo/index.vue

@@ -10,20 +10,20 @@
 							@click="handleSwipeClick($event, index,item)" class="content">
 							<view class="image-box" @click="openVideoUrl(item.videoUrl)">
 								<view class="deviceIMG">
-									<image src="/static/images/video.png" mode="" class="video"></image>
+									<image src="/static/images/common/video.png" mode="" class="video"></image>
 								</view>
 								<view class="">
 									<view class="file-title">{{item.videoName}}</view>
 									<view class="file-baidu">{{item.videoUrl}}</view>
 								</view>
 							</view>
-							<image src="/static/images/cires.png" class="circle"></image>
+							<image src="/static/images/common/cires.png" class="circle"></image>
 						</uni-swipe-action-item>
 					</block>
 				</uni-swipe-action>
 			</scroll-view>
 			<view class="content1" @click="addvideo">
-				<image src="/static/images/path1.png" class="path1"></image>
+				<image src="/static/images/common/path1.png" class="path1"></image>
 			</view>
 		</view>
 	</view>

pages/common/productDes/index.vue

@@ -17,7 +17,7 @@
 
 						<!-- 多选模式下的选中标记 -->
 						<view class="checkmark" v-if="isDeleteMode && selectedImages.includes(index)">
-							<image src="/static/images/delete-icon.png" mode="aspectFill"></image>
+							<image src="/static/images/common/delete-icon.png" mode="aspectFill"></image>
 						</view>
 					</view>
 
@@ -38,7 +38,7 @@
 		<view class="agreement-mask" v-if="deleteShow">
 			<view class="agreement-popupC">
 				<view class="popup-content">
-					<image src="/static/images/dell.png" mode="" class="svg"></image>
+					<image src="/static/images/common/dell.png" mode="" class="svg"></image>
 					<uni-icon class="trash"></uni-icon>
 					<view>
 						<view class="popup-Title">确定删除所选设备！</view>

pages/common/qrcode/qrcode.vue

@@ -2,7 +2,7 @@
 	<view class="pageContent">
 		<!-- 初始状态 -->
 		<view class="pause" v-if="!isConnecting">
-			<image src="/static/images/svg.png" class="svg"></image>
+			<image src="/static/images/common/svg.png" class="svg"></image>
 			<view class="scanT">ID: {{ deviceId }}</view>
 		</view>
 

pages/common/send/index.vue

@@ -38,7 +38,7 @@
 			</view>
 		</scroll-view>
 		<!-- 成功提示弹框 -->
-		<CustomPopup :show="showPopupFlag" :title="popupTitle" :message="popupMessage"  icon="/static/images/sendSucc.png"
+		<CustomPopup :show="showPopupFlag" :title="popupTitle" :message="popupMessage"  icon="/static/images/common/sendSucc.png"
 			:confirm-text="popupConfirmText" :show-cancel="false" @confirm="onPopupConfirm" />
 	</view>
 </template>

pages/common/user/index.vue

@@ -1,9 +1,9 @@
 <template>
 	<view class="pageContent">
-		<image src="/static/images/login.png" mode="" class="login-bg"></image>
+		<image src="/static/images/common/login.png" mode="" class="login-bg"></image>
 		<view class="content_con">
 			<view class="user_logo">
-				<image src="/static/images/logo.png" class="logo"></image>
+				<image src="/static/images/common/logo.png" class="logo"></image>
 			</view>
 			<view class="user-right">
 				<view class="user-title">星汉研创</view>
@@ -13,17 +13,17 @@
 		<view class="content">
 			<view class="menu-list">
 				<view class="menu-item" @click="userAgree">
-					<image src="/static/images/xy.png" class="icon"></image>
+					<image src="/static/images/common/xy.png" class="icon"></image>
 					<text class="title">用户协议</text>
 					<uni-icons type="right" size="25" color="rgba(255, 255, 255, 0.4)" class="uniIcon"></uni-icons>
 				</view>
 				<view class="menu-item" @click="privacyAgree">
-					<image src="/static/images/ys.png" class="icon"></image>
+					<image src="/static/images/common/ys.png" class="icon"></image>
 					<text class="title">隐私协议</text>
 					<uni-icons type="right" size="25" color="rgba(255, 255, 255, 0.4)" class="uniIcon"></uni-icons>
 				</view>
 				<view class="menu-item" @click="aboutUs">
-					<image src="/static/images/wm.png" class="icon"></image>
+					<image src="/static/images/common/wm.png" class="icon"></image>
 					<text class="title">关于我们</text>
 					<uni-icons type="right" size="25" color="rgba(255, 255, 255, 0.4)" class="uniIcon"></uni-icons>
 				</view>