频率数值调整

Reviewed-on: #34

.hbuilderx/launch.json

@@ -2,13 +2,23 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "playground" : "standard",
+            "playground" : "custom",
             "type" : "uni-app:app-ios"
         },
         {
             "customPlaygroundType" : "local",
-            "playground" : "standard",
+            "playground" : "custom",
             "type" : "uni-app:app-android"
+        },
+        {
+            "app" : {
+                "launchtype" : "remote"
+            },
+            "default" : {
+                "launchtype" : "local"
+            },
+            "provider" : "aliyun",
+            "type" : "uniCloud"
         }
     ]
 }

App.vue

@@ -29,19 +29,55 @@
 			// uni.clearStorageSync();
 			//以上代码仅在开发时使用,否则会出现不可预知的问题。
 
-			// #ifdef APP-PLUS
+			// #ifdef APP|APP-PLUS
+			
+			bleTool.getBleTool();
+			
 			var appid = plus.runtime.appid;
 			console.log('应用的 appid 为：' + appid);
+			
+		
+			uni.getPushClientId({
+				success(res) {
+					console.log("推送信息:", res);
+					uni.setStorageSync('push_cid', res.cid);
+				},
+				fail(err) {
+					console.error(err)
+				}
+			});
+			if(!uni.setAppBadgeNumber){//兼容鸿蒙的写法
+				uni.setAppBadgeNumber=plus.runtime.setBadgeNumber;
+			}
+			uni.onPushMessage((res) => {
+				console.log("收到推送消息：", res); //监听推送消息
+				if(res.type=='click'){
+					//将App角标设置为0，清空app在消息中心的所有消息
+					uni.setAppBadgeNumber(0);					
+					plus.push.clear();
+					return;
+				}
+				uni.createPushMessage({
+					title: res.data.title,
+					content: res.data.content,
+					payload:res.data.payload
+				});
+
+			});
+
+
+			
+
 			// #endif
 		},
 		onShow: function() {
 			console.log('App Show');
-				
+
 			//将检查更新换到onshow,因为苹果用户喜欢一直挂着
 			uni.getSystemInfo({
 				success: function(res) {
 					if (res.uniPlatform == 'app') {
-						bleTool.getBleTool();
+						
 						let appid = plus.runtime.appid;
 						if (appid !== 'HBuilder') {
 							console.log("appid=", appid);
@@ -55,7 +91,7 @@
 			console.log('App Hide');
 		},
 		onError(ex) {
-			console.error("出现了未知的异常",ex);
+			console.error("出现了未知的异常", ex);
 		}
 	}
 </script>
@@ -152,7 +188,8 @@
 		.displayNone {
 			display: none !important;
 		}
-		.visibilityHidden{
+
+		.visibilityHidden {
 			visibility: hidden !important;
 		}
 

androidPrivacy.json

@@ -2,7 +2,7 @@
     "version" : "1",
     "prompt" : "template",
     "title" : "服务协议和隐私政策",
-    "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://dmsapp.skf.com.cn/HummerService/Resource/Template/1765175615670.html\">《服务协议》</a>和<a href=\"https://dmsapp.skf.com.cn/HummerService/Resource/Template/1765176086420.html\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+    "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://cnxhyc.com/jquan/2026/02/09/80806c4209c74bd0a223415683ec300d.html\">《服务协议》</a>和<a href=\"https://cnxhyc.com/jquan/2026/02/09/4a4d05227c1242d1a505b98586704c39.html\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
     "buttonAccept" : "同意并接受",
     "buttonRefuse" : "暂不同意",
     "hrefLoader" : "system",

api/100J/HBY100-J.js

@@ -24,10 +24,68 @@ export function deviceDeleteAudioFile(params) {
   })
 }
 
+// 更新语音,使用语音
+export function deviceUpdateVoice(data) {
+  return request({
+    url: `/app/hby100j/device/updateVoice`,
+    method: 'post',
+	data:data
+  })
+}
 // 100J信息
 export function deviceDetail(id) {
   return request({
-    url: `/app/hby100/device/${id}`,
+    url: `/app/hby100j/device/${id}`,
     method: 'get',
   })
+}
+// 爆闪模式
+export function deviceStrobeMode(data) {
+  return request({
+    url: `/app/hby100j/device/strobeMode`,
+    method: 'post',
+	data:data
+  })
+}
+
+// 强制报警
+export function deviceForceAlarmActivation(data) {
+  return request({
+    url: `/app/hby100j/device/forceAlarmActivation`,
+    method: 'post',
+	data:data
+  })
+}
+// 爆闪频率
+export function deviceStrobeFrequency(data) {
+  return request({
+    url: `/app/hby100j/device/strobeFrequency`,
+    method: 'post',
+	data:data
+  })
+}
+// 灯光调节亮度
+export function deviceLightAdjustment(data) {
+  return request({
+    url: `/app/hby100j/device/lightAdjustment`,
+    method: 'post',
+	data:data
+  })
+}
+
+// 调节音量
+export function deviceUpdateVolume(data) {
+  return request({
+    url: `/app/hby100j/device/updateVolume`,
+    method: 'post',
+	data:data
+  })
+}
+// 语音播放
+export function deviceVoiceBroadcast(data) {
+  return request({
+    url: `/app/hby100j/device/voiceBroadcast`,
+    method: 'post',
+	data:data
+  })
 }

api/6170/callPolice.js

@@ -6,4 +6,8 @@ export function deviceSendAlarmMessage(data) {
     method: 'post',
     data: data
   })
+}
+
+export function deviceDefaultAlarm(data){
+	return Promise.reject(data);
 }

components/MessagePopup/MessagePopup.vue

@@ -48,7 +48,7 @@
 		  
 		  <view
 		    class="popup-button-cancel" 
-			
+			v-if="showCancel"
 		   :style="{display:showCancel?'block':'none'}"
 		    @click="handleCancelClick"
 		  >{{ buttonCancelText?buttonCancelText:'取消' }}</view>

components/MsgBox/MsgBox.vue

@@ -0,0 +1,187 @@
+<template>
+	<view class="msgBox" v-if="Msgboxs.length>0">
+		
+		<MessagePopup v-for="item,index in Msgboxs" :visible="item.showPop" :type="item.popType" :bgColor="item.bgColor"
+			:borderColor="item.borderColor" :textColor="item.textColor" :buttonBgColor="item.buttonBgColor"
+			:buttonTextColor="item.buttonTextColor" :iconUrl="item.iconUrl" :message="item.message"
+			:buttonText="item.buttonText" @buttonClick="okCallback(item,index)" :visiblePrompt="item.visiblePrompt"
+			:promptTitle="item.promptTitle" v-model="item.modelValue" @closePop="closePop(item)"
+			:buttonCancelText="item.buttonCancelText" :showCancel="item.showCancel" @cancelPop="cancelClick(item,index)" />
+	</view>
+</template>
+
+<script>
+	export default {
+		 name: 'MsgBox',
+		data() {
+			return {
+				Msgboxs:[]
+			}
+		},
+		methods: {
+			//确认按钮事件，如果回调函数返回true,将阻止关闭弹窗
+			okCallback(item,index){
+				let flag=false;
+				if(item.okCallback){
+					flag=item.okCallback(item,index)
+				}
+				
+				if(flag){
+					return;
+				}
+				this.closePop(item);
+			},
+			//取消按钮,如果回调函数返回true，将阻止关闭弹窗
+			cancelClick(item,index){
+				let flag=false;
+				if(item.cancelCallback){
+					flag=item.cancelCallback(item,index)
+				}
+				
+				if(flag){
+					return;
+				}
+				this.closePop(item);
+			},
+			closePop: function(item) {
+			
+				if (item) {
+					this.Msgboxs.find((v, i) => {
+						if (item.key === v.key) {
+							this.Msgboxs.splice(i, 1);
+						}
+					});
+			
+					if (item.cancelCallback) {
+						item.cancelCallback();
+					}
+				} else {
+					if (this.Msgboxs.length > 0) {
+						this.Msgboxs.splice(this.Msgboxs.length - 1, 1);
+					}
+			
+				}
+			
+			},
+			//根据传入的配置，自定义一个弹窗
+			showPop: function(option,isClear) {
+				let def = {
+					key: '',
+					showPop: true, //是否显示弹窗
+					popType: 'custom',
+					bgColor: '#383934bd',
+					borderColor: '#BBE600',
+					textColor: '#ffffffde',
+					buttonBgColor: '#BBE600',
+					buttonTextColor: '#232323DE',
+					iconUrl: '',
+					message: '',
+					buttonText: '确定',
+					clickEvt: '',
+					visiblePrompt: false,
+					promptTitle: '',
+					modelValue: '',
+					visibleClose: false,
+					okCallback: null,
+					showSlot: false,
+					buttonCancelText: '',
+					showCancel: false,
+					cancelCallback: null
+				}
+				let json = {};
+				let keys = Object.keys(def);
+			
+				for (let i = 0; i < keys.length; i++) {
+					let key = keys[i];
+			
+					json[key] = def[key];
+				}
+				if (option) {
+					keys = Object.keys(option);
+					for (let i = 0; i < keys.length; i++) {
+						let key = keys[i];
+			
+						json[key] = option[key];
+					}
+				}
+			
+				if (!json.borderColor) {
+					json.borderColor = '#BBE600';
+					json.buttonBgColor = '#BBE600';
+				}
+				json.showPop = true;
+				if (!('key' in json)) {
+					json.key = new Date().getTime();
+				}
+				
+				this.Msgboxs.push(json);
+				
+				return json;
+			},
+			//弹出预定好的三种弹窗
+			showMsg(msg,btnTxt, type,okCallback) {
+			
+				let cfg = {
+					error: {
+						icoUrl: '/static/images/6155/DeviceDetail/uploadErr.png',
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434"
+					},
+					succ: {
+						icoUrl: '/static/images/common/success.png',
+						borderColor: "#BBE600",
+						buttonBgColor: "#BBE600"
+					},
+					warn: {
+						icoUrl: '/static/images/common/warning.png',
+						borderColor: "#FFC84E",
+						buttonBgColor: "#FFC84E",
+					}
+				}
+			
+				if (!type) {
+					type = 'error';
+				}
+				if (!cfg[type]) {
+					type = 'error';
+				}
+			
+			
+				let guid =  new Date().getTime()+"";
+				let options = {
+					key: guid,
+					message: msg,
+					iconUrl: cfg[type].icoUrl,
+					borderColor: cfg[type].borderColor,
+					buttonBgColor: cfg[type].buttonBgColor,
+					buttonText: btnTxt?btnTxt:'确定',
+					okCallback: okCallback?okCallback:this.closePop
+				};
+				return this.showPop(options);
+				
+			},					
+			//清除所有弹窗
+			clearPops(){
+				this.Msgboxs=[];
+			},
+			//获取当前所有弹窗的数量
+			getPops(){
+				return this.Msgboxs.length;
+			}
+		}
+	}
+</script>
+
+<style>
+.msgBox{
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	z-index: 9999;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+</style>

config/index.js

@@ -2,13 +2,13 @@
 const config = {
 	// 开发环境
 	development: {
-		BASE_URL: 'http://192.168.110.172:8000',//http://139.224.253.23:8000
+		BASE_URL: 'http://192.168.110.172:8000',//http://139.224.253.23:8000		
 		API_PREFIX: '',
 		// MQTT 配置
-		MQTT_HOST: 'www.cnxhyc.com',
-		MQTT_PORT: 8083,
+		MQTT_HOST: '47.120.79.150',
+		MQTT_PORT: 9083,
 		MQTT_USERNAME: 'admin',
-		MQTT_PASSWORD: '#YtvpSfCNG'    
+		MQTT_PASSWORD: '#YtvpSfCNG' 
 	},
 	// 生产环境
 	production: {

manifest.json

@@ -2,7 +2,7 @@
     "name" : "星汉物联",
     "appid" : "__UNI__A21EF43",
     "description" : "设备管控",
-    "versionName" : "1.0.15",
+    "versionName" : "1.0.18",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */
@@ -27,7 +27,8 @@
             "Geolocation" : {},
             "Maps" : {},
             "Record" : {},
-            "VideoPlayer" : {}
+            "VideoPlayer" : {},
+            "Push" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -99,7 +100,8 @@
                 },
                 "push" : {
                     "unipush" : {
-                        "offline" : false
+                        "version" : "2",
+                        "offline" : true
                     }
                 }
             },
@@ -165,7 +167,12 @@
     },
     "vueVersion" : "2",
     "locale" : "zh-Hans",
-    "fallbackLocale" : "zh-Hans"
+    "fallbackLocale" : "zh-Hans",
+    "app-harmony" : {
+        "distribute" : {
+            "modules" : {}
+        }
+    }
 }
 /* 5+App特有相关 */
 

pages.json

@@ -414,9 +414,33 @@
 			{
 				"navigationBarTitleText" : "录制语音"
 			}
+		},
+		{
+			"path" : "pages/common/addScan/ScanEquip",
+			"style" : 
+			{
+				"navigationBarTitleText" : "扫码",
+				"navigationStyle": "custom"	
+			}
+		},
+		{
+			"path": "pages/common/addDevice/TypeList",
+			"style": {
+				"navigationBarTitleText": "设备类型"
+			}
+		},
+		{
+			"path": "pages/common/addDevice/addImei",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/common/addDevice/addBle",
+			"style": {
+				"navigationBarTitleText": "蓝牙添加设备"
+			}
 		}
-		
-
 
 	],
 	"tabBar": {

pages/018A/HBY018A.vue

@@ -505,7 +505,11 @@
 					return;
 				}
 				if (res.deviceId == these.formData.deviceId) {
-					this.formData.bleStatu = false;
+					if(res.device){
+						these.formData.bleStatu = 'connecting';
+					}else{
+						this.formData.bleStatu = false;
+					}
 					setTimeout(() => {
 						hideLoading(these, 1000);
 					});

pages/100/HBY100.vue

@@ -57,9 +57,9 @@
 				<text class="lbl">蓝牙名称</text>
 				<text class="value">{{device.bluetoothName}}</text>
 			</view>
-			<view class="item">
+			<view class="item" @click.top="bleStatuToggle">
 				<text class="lbl">蓝牙状态</text>
-				<text class="value" :class="formData.bleStatu?'green':'red'">{{formData.bleStatu?'已连接':'未连接'}}</text>
+				<text class="value" :class="formData.bleStatu?'green':'red'">{{getbleStatu}}</text>
 			</view>
 			<!-- <view class="item">
 				<text class="lbl">设备状态</text>
@@ -572,8 +572,11 @@
 
 				these.formData.bleStatu = false;
 				these.formData.deviceId = f.deviceId;
+			these.formData.bleStatu = 'connecting';
 				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
 					these.formData.bleStatu = true;
+				}).catch(ex=>{
+					these.formData.bleStatu = 'err';
 				});
 				these.setBleFormData();
 
@@ -589,7 +592,21 @@
 			this.Status.pageHide = false;
 		},
 		computed: {
-
+			getbleStatu(){
+				if(this.formData.bleStatu===true){
+					return '已连接';
+				}
+				if(this.formData.bleStatu==='connecting'){
+					return '连接中';
+				}
+				if(this.formData.bleStatu==='dicconnect'){
+					return '正在断开';
+				}
+				if(this.formData.bleStatu==='err'){
+					return '连接异常';
+				}
+				return '未连接';
+			}
 		},
 		methods: {
 			handleRightClick(item, s) {
@@ -736,7 +753,7 @@
 								for (let i = 0; i < header.length; i++) {
 									dataView.setUint8(i, header[i]);
 								}
-								console.log("curr=" + curr + "orderNo=", orderNo);
+								// console.log("curr=" + curr + "orderNo=", orderNo);
 								dataView.setUint8(14, '0x' + orderNo.substring(0, 2));
 								dataView.setUint8(15, '0x' + orderNo.substring(2, 4));
 
@@ -764,7 +781,7 @@
 											});
 										}
 
-										console.log("发送成功," + curr + "/" + total);
+										// console.log("发送成功," + curr + "/" + total);
 										this.Status.curr = curr;
 										curr++;
 
@@ -1179,7 +1196,11 @@
 					return;
 				}
 				if (res.deviceId == these.formData.deviceId) {
-					this.formData.bleStatu = false;
+					if(res.device){
+						these.formData.bleStatu = 'connecting';
+					}else{
+						this.formData.bleStatu = false;
+					}
 					setTimeout(() => {
 						hideLoading(these, 1000);
 					});
@@ -1212,12 +1233,14 @@
 				showLoading(this, {
 					text: "蓝牙恢复可用,正在连接设备"
 				});
+				these.formData.bleStatu='connecting';
 				ble.LinkBlue(these.formData.deviceId).then(() => {
 					these.formData.bleStatu = true;
 					updateLoading(these, {
 						text: '连接成功'
 					});
 				}).catch(ex => {
+					these.formData.bleStatu='err';
 					updateLoading(these, {
 						text: ex.msg
 					})
@@ -1304,6 +1327,33 @@
 
 				return f;
 			},
+			
+			bleStatuToggle(){
+				let f=this.getDevice();
+				if(!f){
+					this.showBleUnConnect();
+					return;
+				}
+				if(this.formData.bleStatu===true){
+					this.formData.bleStatu='dicconnect';
+					ble.disconnectDevice(f.deviceId).finally(r=>{
+						this.formData.bleStatu=false;
+					});
+					return;
+				}
+				
+				if(this.formData.bleStatu===false  || this.formData.bleStatu==='err'){
+					this.formData.bleStatu='connecting';
+					ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+						these.formData.bleStatu = true;
+					}).catch(ex=>{
+						these.formData.bleStatu = 'err';
+					});
+					return;
+				}
+				
+				
+			},
 
 
 			setBleFormData() {

pages/100J/HBY100-J.vue

@@ -22,7 +22,9 @@
 					<view class="row">
 						<image class="img" src="/static/images/6155/DeviceDetail/time.png" mode="aspectFit"></image>
 						<view class="txt">
-							<view class="bigTxt">{{ deviceInfo.batteryRemainingTime || '0' }}分钟
+							<view class="bigTxt">
+								{{ Math.floor((Number(deviceInfo.batteryRemainingTime) || 0) / 60) }}小时
+								{{ (Number(deviceInfo.batteryRemainingTime) || 0) % 60 }}分钟
 							</view>
 							<view class="smallTxt">续航时间</view>
 						</view>
@@ -40,19 +42,19 @@
 				</view>
 				<view class="item">
 					<text class="lbl">设备状态</text>
-					<text
-						class="value status-running">{{ deviceInfo.onlineStatus === 0 ? '离线' : deviceInfo.onlineStatus === 2 ? '故障' : '在线' }}</text>
+					<text class="value">{{ deviceInfo.onlineStatus === 0 ? '离线' : deviceInfo.onlineStatus
+						=== 2 ? '故障' : '在线' }}</text>
 				</view>
-				<view class="item">
-					<text class="lbl">定位信息</text>
-					<view class="info-value status-running">
+				<view class="info-row">
+					<text class="info-label" style="display: flex; align-items: center;">定位信息</text>
+					<view class="info-value status-running" @click="gpsPosition(deviceInfo)">
 						<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;" /> -->
+							<uni-icons type="location" size="17" color="rgba(255, 255, 255, 0.8)"
+								style="vertical-align: bottom;" />
 							{{ deviceInfo.address }}
 						</view>
 					</view>
@@ -60,9 +62,9 @@
 			</view>
 			<view class="lampMode">
 				<view class="sosContent">
-					<view class="btnSos openSos center" :class="{ active: formData.sta_SOSType === 1 }"
+					<view class="btnSos openSos center" :class="{ active: deviceInfo.voiceStrobeAlarm === 1 }"
 						@click="sosSetting(1)">
-						{{ formData.sta_SOSType === 1 ? '报警中' : '强制报警' }}
+						{{ deviceInfo.voiceStrobeAlarm === 1 ? '报警中' : '强制报警' }}
 					</view>
 					<view class="btnSos closeSos center" @click="sosSetting(0)">解除</view>
 				</view>
@@ -80,7 +82,7 @@
 						<view class="arrow" @click.stop="openVolume(item, index)" v-if="item.show"
 							v-for="item, index in dic.sta_VoiceType" :class="{
 								'active': formData.sta_VoiceType === item.key,
-								'displayNone': !Status.usrToggle && index > 3
+								'displayNone': !Status.usrToggle && index > 2
 							}">
 							<view class="outCircle">
 								<view class="item">
@@ -97,19 +99,18 @@
 				</view>
 			</view>
 			<view class="lampMode">
-				<view class="mode fleft " v-on:click.stop="openVolume(null, '8')"
-					:class="{ 'active': formData.sta_VoiceType === '8' }">
+				<view class="mode fleft " v-on:click.stop="openVolume(null, '7')"
+					:class="{ 'active': formData.sta_VoiceType === '7' }">
 					<view class="leftImg">
-						<image class="img" :class="{ 'displayNone': formData.sta_VoiceType === '8' }"
+						<image class="img" :class="{ 'displayNone': formData.sta_VoiceType === '7' }"
 							src="/static/images/common/play.png" mode="aspectFit"></image>
-						<image class="img" :class="{ 'displayNone': formData.sta_VoiceType !== '8' }"
+						<image class="img" :class="{ 'displayNone': formData.sta_VoiceType !== '7' }"
 							src="/static/images/common/pauseActive.png" mode="aspectFit"></image>
 					</view>
 					<view class="rightTxt">
 						<text class="bigTxt">播放语音</text>
 					</view>
 				</view>
-
 				<view class="mode fleft marginLeft" v-on:click.stop="audioManager(deviceInfo)">
 					<view class="leftImg">
 						<image class="img" src="/static/images/common/uploadCloud.png" mode="aspectFit"></image>
@@ -149,39 +150,33 @@
 				</view>
 				<view class="header paddingTop0">
 					<text class="sliderTxt">亮度</text>
-					<text class="sliderVal">{{ formData.sta_LightDimmer }}%</text>
+					<text class="sliderVal">{{ formData.lightBrightness }}%</text>
 				</view>
 				<view class="slider-container">
-					<slider min="10" max="100" step="10" :disabled="false" :value="formData.sta_LightDimmer"
+					<slider min="10" max="100" step="10" :disabled="false" :value="formData.lightBrightness"
 						activeColor="#bbe600" backgroundColor="#686767" block-size="20" block-color="#ffffffde"
 						@change="onBrightnessChanging" @changing="onBrightnessChanging" class="custom-slider" />
 				</view>
 				<view class="line"></view>
 				<view class="header paddingTop0">
 					<text class="sliderTxt">频率</text>
-					<text class="sliderVal">{{ formData.sta_LightFreq }}HZ</text>
+					<text class="sliderVal">{{ formData.strobeFrequency }}HZ</text>
 				</view>
-
 				<view class="slider-container">
-					<slider min="0.5" max="10" step="0.5" :disabled="false" :value="formData.sta_LightFreq"
+					<slider min="1" max="10" step="1" :disabled="false" :value="formData.strobeFrequency"
 						activeColor="#bbe600" backgroundColor="#686767" block-size="20" block-color="#ffffffde"
 						@change="onFreqChanging" @changing="onFreqChanging" class="custom-slider" />
-
 				</view>
 				<view class="line"></view>
 				<view class="header paddingTop0">
 					<text class="sliderTxt">音量</text>
-					<text class="sliderVal">{{ formData.sta_VoiceVolume }}</text>
+					<text class="sliderVal">{{ formData.volume }}</text>
 				</view>
-
 				<view class="slider-container">
-					<slider min="1" max="8" step="1" :disabled="false" :value="formData.sta_VoiceVolume"
-						activeColor="#bbe600" backgroundColor="#686767" block-size="20" block-color="#ffffffde"
-						@change="onVolumeChanging" @changing="onVolumeChanging" class="custom-slider" />
+					<slider min="10" max="100" step="1" :disabled="false" :value="formData.volume" activeColor="#bbe600"
+						backgroundColor="#686767" block-size="20" block-color="#ffffffde" @change="onVolumeChanging"
+						@changing="onVolumeChanging" class="custom-slider" />
 				</view>
-
-
-
 				<view class="proinfo lamp">
 					<text class="title">产品信息</text>
 					<view class="itemcontent">
@@ -202,7 +197,6 @@
 						</view>
 					</view>
 				</view>
-
 				<!-- 弹窗通知 -->
 				<MessagePopup :visible="Status.Pop.showPop" :type="Status.Pop.popType" :bgColor="Status.Pop.bgColor"
 					:borderColor="Status.Pop.borderColor" :textColor="Status.Pop.textColor"
@@ -219,6 +213,7 @@
 
 <script>
 	import gbk from '@/utils/gbk.js'
+	import MqttClient from '@/utils/mqtt.js';
 	import {
 		showLoading,
 		hideLoading,
@@ -228,7 +223,13 @@
 		baseURL
 	} from '@/utils/request.js';
 	import {
-		deviceDetail
+		deviceDetail,
+		deviceStrobeMode,
+		deviceForceAlarmActivation,
+		deviceStrobeFrequency,
+		deviceLightAdjustment,
+		deviceUpdateVolume,
+		deviceVoiceBroadcast
 	} from '@/api/100J/HBY100-J.js'
 	var these = null;
 	import Common from '@/utils/Common.js'
@@ -236,6 +237,8 @@
 	export default {
 		data() {
 			return {
+				mqttClient: null,
+				activePermissions: [], // 存储当前设备的权限数组
 				Status: {
 					isRightIconVisible: false,
 					navTitle: '',
@@ -244,6 +247,7 @@
 					curr: 0,
 					total: 0,
 					pageHide: false,
+
 					Pop: {
 						showPop: false, //是否显示弹窗
 						popType: 'custom',
@@ -305,14 +309,13 @@
 					macAddress: '',
 					bleStatu: false,
 					sta_address: '',
-					sta_VoiceType: '',
-					sta_VoiceVolume: 1,
+					sta_VoiceType: '0',
+					volume: 10,
 					sta_LightType: '',
-					sta_LightFreq: 0.5,
-					sta_LightDimmer: 10,
+					strobeFrequency: 0.5,
+					lightBrightness: 10,
 					sta_system: '',
 					warnTime: 0,
-					sta_SOSType: 0
 				},
 				dic: {
 					sta_VoiceType: {
@@ -321,8 +324,8 @@
 							name: '消防',
 							show: true
 						},
-						"2": {
-							key: "2",
+						"0": {
+							key: "0",
 							name: '公安',
 							show: true
 						},
@@ -336,8 +339,8 @@
 							name: '市政',
 							show: true
 						},
-						"5": {
-							key: "5",
+						"2": {
+							key: "2",
 							name: '应急',
 							show: true
 						},
@@ -346,60 +349,60 @@
 							name: '医疗',
 							show: true
 						},
-						"7": {
-							key: "7",
+						"5": {
+							key: "5",
 							name: '铁道',
 							show: true
 						},
-						"8": {
-							key: "8",
+						"7": {
+							key: "7",
 							name: 'app语音',
 							show: false
 						},
-						"0": {
-							key: "0",
+						"-1": {
+							key: "-1",
 							name: '关闭',
 							show: false
 						}
 					},
 
 					sta_LightType: [{
-							key: "1",
-							name: '红蓝',
-							show: true
-						},
-						{
-							key: "2",
-							name: '红闪',
-							show: true
-						},
-						{
-							key: "3",
-							name: '黄闪',
-							show: true
-						},
-						{
-							key: "4",
-							name: '蓝闪',
-							show: true
-						},
-						{
-							key: "5",
-							name: '红流水',
-							show: true
-						},
-						{
 							key: "6",
-							name: '黄流水',
-							show: true
-						},
-						{
-							key: "7",
-							name: '蓝流水',
+							name: '红蓝交替',
 							show: true
 						},
 						{
 							key: "0",
+							name: '红闪',
+							show: true
+						},
+						{
+							key: "2",
+							name: '黄闪',
+							show: true
+						},
+						{
+							key: "1",
+							name: '蓝闪',
+							show: true
+						},
+						{
+							key: "3",
+							name: '红色顺时针',
+							show: true
+						},
+						{
+							key: "4",
+							name: '黄色顺时针',
+							show: true
+						},
+						{
+							key: "5",
+							name: '红蓝顺时针',
+							show: true
+						},
+						{
+							key: "-1",
 							name: '关闭',
 							show: false
 						}
@@ -452,19 +455,141 @@
 				these.Status.navTitle = data.data.deviceName;
 				these.Status.apiType = data.apiType;
 				these.Status.isRightIconVisible = these.Status.apiType === 'listA';
-				if (data.apiType !== 'listA') {
-					Common.getdeviceShareId(data.data.id).then(res => {
-						if (res.code == 200) {
-							if (res.data.permission) {
-								these.permissions = res.data.permission.split(',');
-							}
-						}
-					});
 
-				}
+				this.mqttClient = new MqttClient();
+
+				this.mqttClient.connect(() => {
+					// 订阅来自设备的状态更新
+					const statusTopic = `status/894078/HBY100/${data.data.deviceImei}`;
+					this.mqttClient.subscribe(statusTopic, (payload) => {
+						try {
+							// 解析MQTT返回的payload
+							const payloadObj = typeof payload === 'string' ? JSON.parse(
+								payload) : payload;
+							console.log(payloadObj, '这是我的数据类型么');
+							const data = payloadObj.data ?? {};
+							const funcType = payloadObj.funcType ?? ''; // 从顶层获取funcType
+							const {
+								siren_alarm = {
+										enable: 0,
+										mode: 0
+									},
+									led_strobe = {
+										enable: 0,
+										mode: 0,
+										frequency: 0
+									},
+									volume = 0,
+									brightness = {
+										red: 0,
+										green: 0,
+										blue: 0
+									},
+
+							} = data;
+							// 3. 赋值对应的字段
+							// 续航时间相关
+							if (funcType == '4') {
+								these.deviceInfo.batteryPercentage = data.level //电量
+								these.deviceInfo.batteryRemainingTime = data
+									.battery_remaining_time //续航时间
+								// 设备按键, app同步
+							} else if (funcType == '14') {
+								// 调节亮度，音量，频率相关字段
+								these.formData.strobeFrequency = led_strobe.frequency ||
+									0.5; //频率
+								these.formData.volume = volume || 10; //音量
+								these.formData.lightBrightness = brightness.red ||
+									10; //亮度值
+								// 警示灯
+								const enable1 = led_strobe.enable ?? 0; // 开关：1=开，0=关
+								const mode1 = led_strobe.mode ?? 0; // 模式：0/1/2/3/4/5/6
+								if (enable1 === 1) {
+									// 开启状
+									these.formData.sta_LightType = mode1 + '';
+								} else {
+									// 关闭状态：赋值-1，表示关闭
+									these.formData.sta_LightType = '-1';
+								}
+								//  报警模式，选中，首次上报值，或者切换设备按键上报值
+								const enable = siren_alarm.enable ?? 0; // 报警开关：1=开，0=关
+								const mode = siren_alarm.mode ?? 0; // 模式：0/1/2/3/4/5/6
+								if (these.formData.sta_VoiceType != 7) {
+									if (enable === 1) {
+										// 开启状态
+										these.formData.sta_VoiceType = mode + '';
+									} else {
+										// 关闭状态：赋值-1，表示关闭
+										these.formData.sta_VoiceType = mode + '';
+									}
+								} else {
+									// 播放语音,上报消息
+									const voiceStrobeAlarm = data.voice_broadcast ?? 0;
+									if (voiceStrobeAlarm === 1) {
+										these.formData.sta_VoiceType = '7'
+									} else {
+										these.formData.sta_VoiceType = '-1'
+									}
+								}
+							}
+							// 报警模式相关字段赋值，是语音播放根据这个字段
+							if (funcType === '6') {
+								console.log('我是谁', data.voice_broadcast);
+								// 语音频闪报警：0=关闭，1=开启 ui7是播放的状态
+								const voiceStrobeAlarm = data.voice_broadcast ?? 0;
+								if (voiceStrobeAlarm === 1) {
+									these.formData.sta_VoiceType = '7'
+								} else {
+									these.formData.sta_VoiceType = '-1'
+								}
+								// 强制报警按键解除报警状态,app同步
+							} else if (funcType === '12') {
+								const enable_alarm = data.voice_strobe_alarm ??
+									0; // 报警开关：1=开，0=关
+								const mode_alarm = data.mode ?? 0; // 模式：0/1/2/3/4/5/6
+								if (enable_alarm === 1) {
+									// 开启状
+									these.deviceInfo.voiceStrobeAlarm = 1;
+									these.formData.sta_VoiceType = mode_alarm + ''
+								} else {
+									// 关闭状态：赋值-1，表示关闭
+									these.deviceInfo.voiceStrobeAlarm = -1;
+									// 模式还是选中的,模式,解除也是
+									these.formData.sta_VoiceType = mode_alarm + ''
+								}
+							}
+							// 警示灯模式选中切换
+							if (funcType === '10') {
+								const enable = data.enable ?? 0; // 开关：1=开，0=关
+								const mode = data.mode ?? 0; // 模式：0/1/2/3/4/5/6
+								if (enable === 1) {
+									// 开启状
+									these.formData.sta_LightType = mode + '';
+								} else {
+									// 关闭状态：赋值-1，表示关闭
+									these.formData.sta_LightType = '-1';
+								}
+							}
+							// 报警模式相关字段
+							console.log('formData赋值完成：', these.formData);
+						} catch (e) {
+							// 捕获异常并打印，方便排查问题（不要空catch）
+							console.log('解析MQTT payload失败：', e);
+						}
+					})
+				})
 				console.log(data, 'datatatatat');
-				these.fetchDeviceDetail(data.data.id)
+				// 分享接口
+				if (these.Status.apiType === 'listA') {
+					these.fetchDeviceDetail(data.data.id)
+				} else {
+					this.activePermissions = data.data.permission ? data.data.permission.split(',') : [];
+					console.log(this.activePermissions,'this.activePermissions');
+					these.fetchDeviceDetail(data.data.deviceId)
+				}
+
 			});
+			this.createThrottledFunctions();
 
 		},
 		onHide: function() {
@@ -476,15 +601,52 @@
 		computed: {
 
 		},
+
 		methods: {
+			createThrottledFunctions() {
+				// 创建节流函数
+				this.throttledBrightnessChange = this.throttle(this.handleBrightnessChange, 500);
+				this.throttledFreqChange = this.throttle(this.handleFreqChange, 500);
+				this.throttledVolumeChange = this.throttle(this.handleVolumeChange, 500);
+			},
 			// 获取设备详情（普通详情）
 			fetchDeviceDetail(id) {
+				let that = this
 				deviceDetail(id).then((res) => {
 					if (res.code == 200) {
-						this.deviceInfo = res.data
+						const validData = Object.fromEntries(
+							Object.entries(res.data).filter(([key, value]) => {
+								// 过滤规则：值为 null/undefined/0 的字段都不参与合并
+								return value !== null && value !== undefined && value !== 0;
+							})
+						);
+						Object.assign(this.formData, validData);
+						that.deviceInfo = res.data;
+						const strobeEnable = res.data.strobeEnable ?? 0; // 0=关闭，1=开启
+						const strobeMode = res.data.strobeMode ?? 0; // 0=红闪、1=蓝闪、3=红色顺时针...
+						if (strobeEnable === 1) {
+							// 开启状态
+							that.formData.sta_LightType = strobeMode + '';
+						} else {
+							// 关闭状态
+							that.formData.sta_LightType = '-1';
+						}
+						if (this.formData_VoiceType == 7) {
+							this.formData.sta_VoiceType = res.data.voiceStrobeAlarm ?? 0;
+						} else {
+							this.formData.sta_VoiceType = res.data.alarmMode + ''
+						}
 					}
 				})
 			},
+			// 检查权限的方法
+			hasPermission(permissionCode) {
+				// 如果还在加载中，直接返回false
+				if (this.pageLoading) return false
+				// 如果不是分享设备，默认有全部权限
+				if (!this.isSharedDevice) return true
+				return this.activePermissions.includes(permissionCode)
+			},
 			handleRightClick(item, s) {
 				if (item && item.callback) {
 					item.callback(item, s);
@@ -502,9 +664,9 @@
 					},
 					success: (res) => {
 						let json = {
-							persissonType: '670'
+							persissonType: '100J'
 						};
-
+						Object.assign(json, this.deviceInfo);
 						res.eventChannel.emit('share', {
 							data: json
 						});
@@ -516,18 +678,7 @@
 				if (this.Status.apiType !== 'listA') {}
 				uni.navigateTo({
 					url: '/pages/100J/audioManager/AudioList',
-					events: {
-						audioApply: function(id) {
-							//应用某个语音时，将数据发送给设备
-							console.log("准备发送数据", id);
-							showLoading(these, {
-								text: '准备发送数据'
-							});
-							these.audioData.hexs = uni.getStorageSync(Common.pcmStorageKey + "_" + id);
-							console.log("hexs.length=", these.audioData.hexs.length)
-							these.HoldYouHand();
-						}
-					},
+					events: {},
 					success: (res) => {
 						// 页面跳转成功后的回调函数
 						res.eventChannel.emit('deviceData', {
@@ -538,18 +689,155 @@
 			},
 			//频率
 			onFreqChanging(e) {
-				this.formData.sta_LightFreq = e.detail.value;
+				this.formData.strobeFrequency = e.detail.value;
+				this.throttledFreqChange(e.detail.value);
 			},
 			//音量
 			onVolumeChanging(e) {
-				this.formData.sta_VoiceVolume = e.detail.value;
+				this.formData.volume = e.detail.value;
+				this.throttledVolumeChange(e.detail.value);
 			},
+
 			// 亮度调节
 			onBrightnessChanging(e) {
-				this.formData.sta_LightDimmer = e.detail.value;
+				this.formData.lightBrightness = e.detail.value;
+				this.throttledBrightnessChange(e.detail.value);
 			},
+			// 亮度调节
+			handleBrightnessChange(brightnessValue) {
+				let data = {
+					deviceId: this.deviceInfo.deviceId,
+					brightness: brightnessValue
+				};
+				console.log('发送亮度调节请求:', data);
+				deviceLightAdjustment(data).then((res) => {
+					if (res.code === 200) {
+						console.log('亮度调节成功');
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 1000
+						});
+					} else {
+						uni.showToast({
+							title: res.msg || '调节失败',
+							icon: 'none',
+							duration: 1000
+						});
+					}
+				}).catch((err) => {
+
+				});
+			},
+			// 频率调节
+			handleFreqChange(freqValue) {
+				let data = {
+					deviceId: this.deviceInfo.deviceId,
+					frequency: freqValue
+				};
+
+				deviceStrobeFrequency(data).then((res) => {
+					if (res.code === 200) {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 1000
+						});
+					} else {
+						uni.showToast({
+							title: res.msg || '调节失败',
+							icon: 'none',
+							duration: 1000
+						});
+					}
+				}).catch((err) => {});
+			},
+			// 音量调节处理函数
+			handleVolumeChange(volumeValue) {
+				let data = {
+					deviceId: this.deviceInfo.deviceId,
+					volume: volumeValue
+				};
+				deviceUpdateVolume(data).then((res) => {
+					if (res.code === 200) {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 1000
+						});
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 1000
+						});
+					}
+				}).catch((err) => {});
+			},
+			// 节流函数
+			throttle(func, delay = 500) {
+				let timer = null;
+				let lastArgs = null;
+				let lastThis = null;
+				return function(...args) {
+					lastArgs = args;
+					lastThis = this;
+					if (!timer) {
+						timer = setTimeout(() => {
+							timer = null;
+							func.apply(lastThis, lastArgs);
+						}, delay);
+					}
+				};
+
+			},
+			// *******定位******
+			gpsPosition(item) {
+				// 添加调试日志
+				uni.navigateTo({
+					url: '/pages/common/map/index',
+					events: {
+						ack: function(data) {}
+					},
+					success: (res) => {
+						res.eventChannel.emit('Map', {
+							data: item
+						});
+					}
+				})
+			},
+			// 警示灯开关闭
 			lightTypeSet(item, index) {
-				this.formData.sta_LightType = item.key;
+				console.log('走了么');
+				let val = item.key;
+				// 切换选中/取消选中逻辑
+				if (this.formData.sta_LightType === val) {
+					val = '-1';
+				}
+				this.formData.sta_LightType = val;
+				let data = {
+					deviceId: this.deviceInfo.deviceId,
+					// 开启/关闭：选中模式时传1，关闭时传0
+					enable: val === '-1' ? 0 : 1,
+					// 0 红色爆闪，1 蓝色爆闪，2 黄色爆闪，3，红色顺时针旋转爆闪，4黄色顺时针旋转爆闪，5，红蓝顺时针旋转爆闪，6 红蓝交替爆闪
+					mode: item.key
+				};
+				deviceStrobeMode(data).then((res) => {
+					if (res.code == 200) {
+						const tipText = data.enable === 1 ? '开启成功' : '关闭成功';
+						uni.showToast({
+							title: tipText,
+							icon: 'none',
+							duration: 1000
+						});
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 1000
+						});
+					}
+				})
 			},
 			// 报警模式
 			setUsrToggle() {
@@ -557,22 +845,70 @@
 			},
 			// 播放语音
 			openVolume(item, index) {
-				if (item) {
-					console.log(item.key, 'keyyy');
-					this.formData.sta_VoiceType = item.key;
-				} else if (index === '8') { // 点击“播放语音”的场景
-					this.formData.sta_VoiceType = '8';
-
+				if (!item) {
+					item = this.dic.sta_VoiceType[index];
+				}
+				let val = item.key;
+				if (this.formData.sta_VoiceType === val) {
+					val = '-1';
+				}
+				this.formData.sta_VoiceType = val;
+				// 模式类型为7时才去判断
+				console.log(val, 'valllll');
+				const isVoiceOperate = val === '7' || val === '-1'; // 标记是否是语音开启/关闭操作
+				if (this.deviceInfo.voiceStrobeAlarm == 1) {
+					// 如果强制报警已经开启了，那么切换下面的模式需要时，需要触发报警指令
+					const data = {
+						deviceIds: [this.deviceInfo.deviceId],
+						// 声光报警开关开启传1
+						voiceStrobeAlarm: 1,
+						mode: this.formData.sta_VoiceType
+					};
+					deviceForceAlarmActivation(data).then((res) => {
+						if (res.code === 200) {
+							uni.showToast({
+								title: '强制报警已开启',
+								icon: 'none'
+							});
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none'
+							});
+						}
+					})
+				} else if (isVoiceOperate) {
+					console.log('我是谁');
+					let data = {
+						deviceId: this.deviceInfo.deviceId,
+						voiceBroadcast: Number(this.formData.sta_VoiceType) === -1 ? 0 : 1
+					}
+					deviceVoiceBroadcast(data).then((res) => {
+						if (res.code == 200) {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none'
+							});
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none'
+							});
+						}
+					})
 				}
 			},
 			// 报警模式
 			sosSetting(item) {
+				console.log(this.deviceInfo, '44444');
+				console.log(item, 'tent');
 				const isClose = item === 0;
 				if (!this.Status) this.Status = {};
 				if (!this.Status.Pop) this.Status.Pop = {
 					showPop: false
 				};
-				//弹窗配置
+
+				// 弹窗配置
 				this.Status.Pop = {
 					...this.Status.Pop,
 					showPop: true,
@@ -583,11 +919,29 @@
 					showCancel: true,
 					buttonCancelText: '取消',
 					okCallback: () => {
-						this.formData.sta_SOSType = item;
-						uni.showToast({
-							title: isClose ? '声光报警已解除' : '强制报警已开启',
-							icon: 'none'
-						});
+						this.deviceInfo.voiceStrobeAlarm = isClose ? 0 : 1; //强制报警,报警中 0是强制报警,1是报警中
+						const data = {
+							deviceIds: [this.deviceInfo.deviceId],
+							// 声光报警开关：关闭传0，开启传1
+							voiceStrobeAlarm: isClose ? 0 : 1,
+							mode: this.formData.sta_VoiceType
+						};
+						deviceForceAlarmActivation(data).then((res) => {
+							if (res.code === 200) {
+								uni.showToast({
+									title: isClose ? '声光报警已解除' : '强制报警已开启',
+									icon: 'none'
+								});
+								if (isClose && this.formData.sta_VoiceType === '7') {
+									this.formData.sta_VoiceType = '-1';
+								}
+							} else {
+								uni.showToast({
+									title: res.msg,
+									icon: 'none'
+								});
+							}
+						}).catch((err) => {});
 					}
 				};
 			},
@@ -597,12 +951,11 @@
 			bleStateBreak() {},
 			bleStateRecovry() {},
 			previewImg(img) {},
-
 			bleValueNotify: function(receive, device, path, recArr) { //订阅消息
 				if (receive.deviceId !== this.formData.deviceId) {
 					return;
 				}
-				if (this.formData.sta_battery <= 20) {
+				if (this.deviceInfo.batteryPercentage <= 20) {
 					this.showMsg("设备电量低");
 				}
 			},
@@ -792,14 +1145,14 @@
 		border-radius: 16rpx;
 		background: rgba(26, 26, 26, 1);
 		box-sizing: border-box;
-		padding: 14rpx 0rpx;
+		padding: 15rpx 30rpx;
 	}
 
 	.eqinfo .item {
 		width: 100%;
 		height: 60rpx;
 		line-height: 60rpx;
-		padding: 0rpx 28rpx;
+		/* padding: 0rpx 28rpx; */
 		box-sizing: border-box;
 		display: flex;
 		flex-direction: row;
@@ -824,11 +1177,18 @@
 		font-family: PingFang SC;
 		font-size: 28rpx;
 		font-weight: 400;
-
 		letter-spacing: 0.07px;
 		text-align: left;
 	}
 
+	.eqinfo .info-value {
+		/* margin-top: 30rpx; */
+	}
+
+	/* .eqinfo .status-running {
+		color: rgba(174, 214, 0, 1);
+	} */
+
 	.lamp {
 		margin-top: 24rpx;
 	}
@@ -1088,8 +1448,6 @@
 	.proinfo .item .img {
 		width: 50rpx;
 		height: 50rpx;
-
-
 	}
 
 	.proinfo .item .txt {
@@ -1102,14 +1460,10 @@
 		text-align: left;
 	}
 
-
 	.slider-container {
 		padding: 0px;
 	}
 
-
-
-
 	.addIco {
 		width: 100%;
 		height: 360rpx;
@@ -1530,4 +1884,33 @@
 		width: 100%;
 		font-size: 32rpx;
 	}
+
+	.info-row {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.info-label {
+		font-size: 28rpx;
+		color: rgba(255, 255, 255, 0.87);
+		white-space: nowrap;
+	}
+
+	.info-value {
+		font-size: 28rpx;
+		color: rgba(255, 255, 255, 0.6);
+	}
+
+	.status-running {
+		/* color: rgba(255, 255, 255, 0.6); */
+		text-align: end;
+	}
+
+	.locationGPS {
+		width: 88%;
+		text-align: end;
+		float: right;
+		line-height: 45rpx;
+		font-size: 28rpx;
+	}
 </style>

pages/100J/audioManager/AudioList.vue

@@ -4,31 +4,33 @@
 			:down="downOption" :fixed="false" :style="{ height: mescrollHeight + 'px' }">
 			<uni-swipe-action ref="swipeAction">
 				<view v-for="(item, index) in dataListA" class="li" :key="index" :ref="'swipeItem_' + index">
-					<view class="itemIcon center" :class="{'displayNone':!Status.isEdit,'check':isCheck(item,index)}"
-						v-on:click.stop="checkToggle(item,index)">
-						<image class="img" :class="{'displayNone':!isCheck(item,index)}"
+					<view class="itemIcon center"
+						:class="{ 'displayNone': !Status.isEdit, 'check': isCheck(item, index) }"
+						v-on:click.stop="checkToggle(item, index)">
+						<image class="img" :class="{ 'displayNone': !isCheck(item, index) }"
 							src="/static/images/common/gou.png" mode="aspectFit"></image>
 					</view>
-					<view class="itemMain " :class="{'Edit':Status.isEdit}">
+					<view class="itemMain " :class="{ 'Edit': Status.isEdit }">
 						<uni-swipe-action-item :right-options="Options" @click="handleSwipeClick($event, item, index)"
 							class="device-card ">
-							<view @click.stop="handleFile(item,index)">
+							<view @click.stop="handleFile(item, index)">
 								<view class="item">
 									<view class="itemLeft ">
 										<view class="title">{{ item.fileNameExt }}</view>
 										<view class="smallTitle">
 											<!-- 展示前端生成的时间 -->
-											<text>{{item.createTime || Common.DateFormat(new Date(), "yyyy年MM月dd日")}}</text>
-											<text v-show="item.duration">{{item.duration}}秒</text>
-											<image :class="{'displayNone':!item.fileUrl}" class="img"
+											<text>{{ item.createTime || Common.DateFormat(new Date(),
+												"yyyy年MM月dd日") }}</text>
+											<text v-show="item.duration">{{ item.duration }}秒</text>
+											<image :class="{ 'displayNone': !item.fileUrl }" class="img"
 												src="/static/images/100/volume.png" mode="aspectFit"
-												@click.stop="play(item,index)"></image>
+												@click.stop="play(item, index)"></image>
 										</view>
 									</view>
 									<view class="itemRight ">
-										<view class="btn" @click.stop="Apply(item,index)"
-											:class="{'active':item.isApply,'btn-default':!item.isApply}">
-											{{item.isApply ?'使用中':'使用'}}
+										<view class="btn" @click.stop="Apply(item, index)"
+											:class="{ 'active': item.useStatus, 'btn-default': !item.useStatus }">
+											{{ item.useStatus == 1 ? '使用中' : '使用' }}
 										</view>
 									</view>
 									<view class="clear"></view>
@@ -40,7 +42,7 @@
 			</uni-swipe-action>
 		</mescroll-uni>
 		<view class="footer">
-			<view class="addContent" :class="{'displayNone':Status.isEdit}">
+			<view class="addContent" :class="{ 'displayNone': Status.isEdit }">
 				<view class="addItem" @click="gotoRecord('Record')">
 					<view class="imgContent center">
 						<image class="img" src="/static/images/100/record.png" mode="aspectFit"></image>
@@ -60,7 +62,7 @@
 					<view class="txt">文字转语音</view>
 				</view>
 			</view>
-			<view class="editContent" :class="{'displayNone':!Status.isEdit}">
+			<view class="editContent" :class="{ 'displayNone': !Status.isEdit }">
 				<view class="btn-del" @click.stop="delCheckList()">删除</view>
 			</view>
 		</view>
@@ -80,6 +82,12 @@
 			<audio :src="cPlay.src" :id="cPlay.Id" :name="cPlay.name" author="">
 		</view> -->
 		<global-loading ref="loading"></global-loading>
+		<!-- 圆形进度条 + 全屏遮罩层（升级中显示） -->
+		<view v-if="isUpdating" class="mask-layer">
+			<view class="circle-progress-box">
+				<progress :percent="updateProgress" activeColor="#bbe600" backgroundColor="#686767" :border-radius='22' show-info stroke-width="15" class="custom-progress" />
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -91,10 +99,12 @@
 	var timeout = null;
 	import MescrollUni from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-uni.vue'
 	import BleTool from '@/utils/BleHelper.js'
+	import MqttClient from '@/utils/mqtt.js';
 	import {
 		deviceVoliceList,
 		videRenameAudioFile,
-		deviceDeleteAudioFile
+		deviceDeleteAudioFile,
+		deviceUpdateVoice
 	} from '@/api/100J/HBY100-J.js'
 	import {
 		showLoading,
@@ -113,6 +123,7 @@
 					isEdit: false,
 					playState: '',
 					playPath: '',
+					mqttClient: null,
 					Pop: {
 						showPop: false, //是否显示弹窗
 						popType: 'custom',
@@ -185,9 +196,6 @@
 					createTime: "", //创建时间
 					fileUrl: "", //本地地址
 					fileUrl: "", //网络地址
-					statu: "", //状态,是否公开
-					isApply: "" //是否使用中
-
 				},
 				cPlay: {
 					Id: "", //编号
@@ -195,9 +203,10 @@
 					createTime: "", //创建时间
 					fileUrl: "", //本地地址
 					fileUrl: "", //网络地址
-					statu: "", //状态,是否公开
-					isApply: "" //是否使用中
-				}
+				},
+				updateProgress: 0, // 升级进度，0-100
+				isUpdating: false, // 是否正在升级（控制进度条显示/隐藏）
+				mqttSubscribeSuccess: false // MQTT订阅是否成功
 			}
 		},
 		onLoad() {
@@ -208,7 +217,7 @@
 				console.log(rec, 'ressss');
 				this.blue = rec.ble;
 				this.device = rec.data;
-				this.getinitData(rec.data.deviceId,true)
+				this.getinitData(rec.data.deviceId, true)
 			});
 
 		},
@@ -216,11 +225,14 @@
 			console.log("页面返回")
 		},
 		onUnload() {
-			console.log("页面卸载了");
+			// 页面卸载时断开MQTT连接
+			if (this.mqttClient) {
+				this.mqttClient.disconnect();
+			}
 		},
 		methods: {
 			//语音管理列表
-			getinitData(val,isLoadMore = false) {
+			getinitData(val, isLoadMore = false) {
 				let data = {
 					deviceId: this.device.deviceId
 				}
@@ -456,41 +468,71 @@
 				}
 			},
 			Apply(item, index) {
-				if (item.isApply) {
-					return;
+				this.mqttClient = new MqttClient();
+				let data = {
+					id: item.id
 				}
-				let task = () => {
-					let fileList = uni.getStorageSync(Common.audioStorageKey);
-					for (let i = 0; i < these.dataListA.length; i++) {
-						let ele = these.dataListA[i];
-						if (i === index) {
-							these.$set(these.dataListA[index], "isApply", true);
-							fileList.find(v => {
-								if (!v.devices) {
-									v.devices = [];
-								}
-								if (v.Id == ele.Id) {
-									v.devices.push(these.device.id);
-									return true;
-								} else {
-									for (let j = 0; j < v.devices.length; j++) {
-										if (v.devices[j] === these.device.id) {
-											v.devices.splice(j, 1);
-											break
-										};
+				deviceUpdateVoice(data).then((RES) => {
+					console.log(RES,'RES');
+					if (RES.code == 200) {
+						this.updateProgress = 0;
+						this.isUpdating = true;
+						this.mqttClient.connect(() => {
+							// 订阅来自设备的状态更新
+							const statusTopic = `status/894078/HBY100/${this.device.deviceImei}`;
+							this.mqttClient.subscribe(statusTopic, (payload) => {
+								console.log(payload, 'payloadpayloadpayload');
+								try {
+									// 解析MQTT返回的payload
+									const payloadObj = typeof payload === 'string' ? JSON.parse(
+										payload) : payload;
+									// 取出进度值（用可选链避免字段不存在报错）
+									const progress = payloadObj.data?.progress;
+									if (progress !== undefined && !isNaN(progress) && progress >=
+										0 && progress <= 100) {
+										this.updateProgress = progress;
+										console.log('当前升级进度：', progress + '%');
+										// 进度到100%时，触发升级完成逻辑
+										if (progress === 100) {
+											clearTimeout(this.upgradeTimer);
+											uni.showToast({
+												title: '升级完成！',
+												icon: 'success',
+												duration: 2000
+											});
+											this.isUpdating = false;
+											setTimeout(() => {
+												uni.navigateBack();
+											}, 1500);
+										}
 									}
+								} catch (e) {
+									 clearTimeout(this.upgradeTimer);
+									console.error('解析MQTT payload失败：', e);
 								}
-								return false;
-							});
-						} else {
-							these.$set(these.dataListA[i], "isApply", false);
-						}
+							})
+						})
+					} else {
+						uni.showToast({
+							title: RES.msg,
+							icon: 'none',
+							duration: 1000
+						});
+
 					}
-					console.log("状态修改完成");
-					eventChannel.emit('audioApply', item.Id);
-					console.log("返回上一页");
-					uni.navigateBack();
-				}
+				})
+				 this.upgradeTimer = setTimeout(() => {
+				    // 超时后执行：隐藏进度条+提示超时+重置进度
+				    uni.showToast({
+				      title: '升级进度同步超时',
+				      icon: 'none',
+				      duration: 2000
+				    });
+				    this.isUpdating = false; // 关闭进度条
+				    this.updateProgress = 0; // 重置进度值
+				    // 可选：如果需要取消MQTT订阅，加这行（根据需求选择）
+				    // this.mqttClient.unsubscribe(statusTopic);
+				  }, 6000); // 6000ms = 6秒，时间可直接修改
 			},
 			closePop: function() {
 				this.Status.Pop.showPop = false;
@@ -596,7 +638,18 @@
 	}
 </script>
 
-<style>
+<style  lang="less">
+.custom-progress{
+	border-radius: 10rpx;
+}
+.custom-progress .uni-progress-bar{
+	border-radius: 10rpx !important;
+}
+.custom-progress .uni-progress-info{
+	color: #BBE600;
+	font-size: 40rpx;
+	font-weight: 600;
+}
 	.popup-prompt {
 		width: 100%;
 		margin-top: 40rpx;
@@ -633,8 +686,6 @@
 
 	}
 
-	.li .itemMain {}
-
 	.li .item {
 		width: 100%;
 		height: 200rpx;
@@ -837,4 +888,28 @@
 		height: 100%;
 		justify-content: flex-end;
 	}
+
+	/* 全屏遮罩层：半透明黑色，覆盖整个页面，禁止底层滚动/点击 */
+	.mask-layer {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, 0.7);
+		/* 半透明黑，可调整透明度 */
+		z-index: 9999;
+		/* 遮罩层层级拉满，确保在最上层 */
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		/* 让内部圆形进度条垂直+水平居中 */
+	}
+
+	/* 圆形进度条容器 */
+	.circle-progress-box {
+		position: relative;
+		width: 70%;
+		height: 100rpx;
+	}
 </style>

pages/102/HBY102.vue

@@ -58,9 +58,9 @@
 				<text class="lbl">蓝牙名称</text>
 				<text class="value">{{device.bluetoothName}}</text>
 			</view>
-			<view class="item">
+			<view class="item" @click.top="bleStatuToggle">
 				<text class="lbl">蓝牙状态</text>
-				<text class="value" :class="formData.bleStatu?'green':'red'">{{formData.bleStatu?'已连接':'未连接'}}</text>
+				<text class="value" :class="formData.bleStatu?'green':'red'">{{getbleStatu}}</text>
 			</view>
 			<!-- <view class="item">
 				<text class="lbl">设备状态</text>
@@ -147,7 +147,7 @@
 		</view>
 
 
-		<view  style="padding-bottom: 20rpx;">
+		<view style="padding-bottom: 20rpx;">
 
 
 			<view class="proinfo lamp">
@@ -489,8 +489,11 @@
 
 				these.formData.bleStatu = false;
 				these.formData.deviceId = f.deviceId;
+				these.formData.bleStatu = 'connecting';
 				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
 					these.formData.bleStatu = true;
+				}).catch(ex => {
+					these.formData.bleStatu = 'err';
 				});
 				these.formData.sta_IntrusTime = 0;
 				these.formData.sta_sosadd = "";
@@ -530,10 +533,25 @@
 					}
 				});
 				return active;
+			},
+			getbleStatu() {
+				if (this.formData.bleStatu === true) {
+					return '已连接';
+				}
+				if (this.formData.bleStatu === 'connecting') {
+					return '连接中';
+				}
+				if (this.formData.bleStatu === 'dicconnect') {
+					return '正在断开';
+				}
+				if (this.formData.bleStatu === 'err') {
+					return '连接异常';
+				}
+				return '未连接';
 			}
 		},
 		methods: {
-			getLinkedCnt() {//获取在线设备的数量
+			getLinkedCnt() { //获取在线设备的数量
 
 				let f = this.getDevice();
 				// #ifdef  APP-PLUS
@@ -552,11 +570,11 @@
 					let buffer = {
 						ins_Quantity: "query"
 					};
-					ble.sendString(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 30).then(res=>{
-						setTimeout(()=>{
+					ble.sendString(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 30).then(res => {
+						setTimeout(() => {
 							this.getWarns();
-						},1500);
-					}).catch(()=>{
+						}, 1500);
+					}).catch(() => {
 						this.getWarns();
 					})
 				}
@@ -591,12 +609,12 @@
 						uni.getStorage({
 							key: linkKey,
 							success(res) {
-								console.error("获取到联机数据",res);
+								console.error("获取到联机数据", res);
 								let data = res.data;
 								let fs = data.filter(v => {
 									return !v.read
 								});
-								console.error("未读联机数据",fs);
+								console.error("未读联机数据", fs);
 								succ(fs);
 							},
 							fail(ex) {
@@ -609,12 +627,12 @@
 						let fs = [];
 
 						if (results[0].status == 'fulfilled') {
-							fs=fs.concat(results[0].value);
+							fs = fs.concat(results[0].value);
 						}
 						if (results[1].status == 'fulfilled') {
-							fs=fs.concat(results[1].value);
+							fs = fs.concat(results[1].value);
 						}
-console.error("获取到未读消息",fs);
+						console.error("获取到未读消息", fs);
 						these.$set(these.Status.navbar.icons[0], "math", fs.length);
 					});
 
@@ -961,7 +979,11 @@ console.error("获取到未读消息",fs);
 					return;
 				}
 				if (res.deviceId == these.formData.deviceId) {
-					this.formData.bleStatu = false;
+					if(res.device){
+						these.formData.bleStatu = 'connecting';
+					}else{
+						this.formData.bleStatu = false;
+					}
 					setTimeout(() => {
 						hideLoading(these, 1000);
 					});
@@ -994,12 +1016,14 @@ console.error("获取到未读消息",fs);
 				showLoading(this, {
 					text: "蓝牙恢复可用,正在连接设备"
 				});
+				this.formData.bleStatu = 'connecting';
 				ble.LinkBlue(these.formData.deviceId).then(() => {
 					these.formData.bleStatu = true;
 					updateLoading(these, {
 						text: '连接成功'
 					});
 				}).catch(ex => {
+					these.formData.bleStatu = 'err';
 					updateLoading(these, {
 						text: ex.msg
 					})
@@ -1031,9 +1055,9 @@ console.error("获取到未读消息",fs);
 				let json = recei.ReceiveData(receive, device, pagePath, recArr);
 
 				console.log("json=", json)
-				setTimeout(()=>{
+				setTimeout(() => {
 					this.getWarns();
-				},500);
+				}, 500);
 
 
 				let active = -1;
@@ -1216,6 +1240,32 @@ console.error("获取到未读消息",fs);
 				return f;
 			},
 
+			bleStatuToggle() {
+				let f = this.getDevice();
+				if (!f) {
+					this.showBleUnConnect();
+					return;
+				}
+				if (this.formData.bleStatu === true) {
+					this.formData.bleStatu = 'dicconnect';
+					ble.disconnectDevice(f.deviceId).finally(r => {
+						this.formData.bleStatu = false;
+					});
+					return;
+				}
+
+				if (this.formData.bleStatu === false || this.formData.bleStatu === 'err') {
+					this.formData.bleStatu = 'connecting';
+					ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+						these.formData.bleStatu = true;
+					}).catch(ex => {
+						these.formData.bleStatu = 'err';
+					});
+					return;
+				}
+
+
+			},
 
 			setBleFormData() {
 				ble.data.LinkedList.find((v) => {

pages/4877/BJQ4877.vue

@@ -14,11 +14,11 @@
 						<image class="img" :src="item.src" mode="aspectFit"></image>
 						<view class="baber" v-if="item.math">{{item.math>9?'9+':item.math}}</view>
 					</view>
-		
+
 				</view>
-		
+
 			</view>
-		
+
 		</uni-nav-bar>
 		<view class="eq">
 			<view class="leftImg" @click.stop="previewImg(device.devicePic?device.devicePic:formData.img)">
@@ -54,9 +54,9 @@
 				<text class="lbl">蓝牙名称</text>
 				<text class="value">{{device.bluetoothName}}</text>
 			</view>
-			<view class="item">
+			<view class="item" @click.top="bleStatuToggle">
 				<text class="lbl">蓝牙状态</text>
-				<text class="value" :class="formData.bleStatu?'green':'red'">{{formData.bleStatu?'已连接':'未连接'}}</text>
+				<text class="value" :class="formData.bleStatu?'green':'red'">{{getbleStatu}}</text>
 			</view>
 			<view class="item">
 				<text class="lbl">信道:{{formData.sta_Channel}}</text>
@@ -175,15 +175,15 @@
 					</view>
 					<view class="text">朝右</view>
 				</view>
-				
-				
-				
+
+
+
 
 			</view>
 			<view class="line"></view>
-			
+
 			<view class="modeSetting">
-			
+
 				<view class="arrow" @click.stop="ArrowSet('red_front')"
 					:class="formData.sta_ArrowType=='red_front'?'redactive':''">
 					<view class="outCircle">
@@ -191,7 +191,7 @@
 							<view class="text">红色</view>
 						</view>
 					</view>
-					
+
 				</view>
 				<view class="arrow" @click.stop="ArrowSet('green_back')"
 					:class="formData.sta_ArrowType=='green_back'?'greenactive':''">
@@ -200,10 +200,10 @@
 							<view class="text">绿色</view>
 						</view>
 					</view>
-					
+
 				</view>
 			</view>
-			
+
 		</view>
 
 		<view class="lamp noPadding">
@@ -295,7 +295,9 @@
 		hideLoading,
 		updateLoading
 	} from '@/utils/loading.js'
-import request, { baseURL } from '@/utils/request.js';
+	import request, {
+		baseURL
+	} from '@/utils/request.js';
 	import Common from '@/utils/Common.js';
 	import {
 		colors as groupColors
@@ -323,7 +325,7 @@ import request, { baseURL } from '@/utils/request.js';
 							apiType: 'listA'
 						}],
 						title: 'BJQ4877'
-					
+
 					},
 					ShowEditChannel: false,
 					pageHide: false,
@@ -403,9 +405,9 @@ import request, { baseURL } from '@/utils/request.js';
 					sta_ArrowType: '', //箭头方向
 					warnTime: 0,
 					sta_Channel: 31,
-					sta_ArrowMode:'',
+					sta_ArrowMode: '',
 					groups: [
-					
+
 					]
 				},
 				dic: {
@@ -422,7 +424,7 @@ import request, { baseURL } from '@/utils/request.js';
 							activeImg: '/static/images/4877/fanActive.png'
 						}
 					]
-					
+
 				},
 				device: {
 					id: "",
@@ -480,7 +482,7 @@ import request, { baseURL } from '@/utils/request.js';
 				// console.log("收到父页面的参数：" + JSON.stringify(data));
 				let device = data.data;
 				these.device = device;
-				
+
 				these.Status.apiType = data.apiType;
 				these.Status.navbar.title = device.deviceName;
 				if (data.apiType !== 'listA') {
@@ -492,7 +494,7 @@ import request, { baseURL } from '@/utils/request.js';
 						}
 					});
 				}
-				
+
 				let checkIds = uni.getStorageSync("4877CheckColor_" + data.data.id);
 				if (checkIds && checkIds.length) {
 					let groups = groupColors.filter(v => {
@@ -508,7 +510,7 @@ import request, { baseURL } from '@/utils/request.js';
 					these.formData.groups = groups;
 
 				}
-				
+
 
 				let arr = [{
 						topic: 'C/4877_Groups_' + these.device.id,
@@ -556,6 +558,7 @@ import request, { baseURL } from '@/utils/request.js';
 				these.formData.deviceId = f.deviceId;
 				these.formData.warnTime = null;
 				these.formData.sta_SOSType = 'sos_off';
+				these.formData.bleStatu = 'connecting';
 				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
 					these.formData.bleStatu = true;
 				});
@@ -573,9 +576,50 @@ import request, { baseURL } from '@/utils/request.js';
 			this.Status.pageHide = false;
 		},
 		computed: {
-
+			getbleStatu() {
+				if (this.formData.bleStatu === true) {
+					return '已连接';
+				}
+				if (this.formData.bleStatu === 'connecting') {
+					return '连接中';
+				}
+				if (this.formData.bleStatu === 'dicconnect') {
+					return '正在断开';
+				}
+				if (this.formData.bleStatu === 'err') {
+					return '连接异常';
+				}
+				return '未连接';
+			}
 		},
 		methods: {
+
+			bleStatuToggle() {
+				let f = this.getDevice();
+				if (!f) {
+					this.showBleUnConnect();
+					return;
+				}
+				if (this.formData.bleStatu === true) {
+					this.formData.bleStatu = 'dicconnect';
+					ble.disconnectDevice(f.deviceId).finally(r => {
+						this.formData.bleStatu = false;
+					});
+					return;
+				}
+
+				if (this.formData.bleStatu === false || this.formData.bleStatu === 'err') {
+					these.formData.bleStatu = 'connecting';
+					ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+						these.formData.bleStatu = true;
+					}).catch(ex => {
+						these.formData.bleStatu = 'err';
+					});
+					return;
+				}
+
+
+			},
 			handleRightClick(item, s) {
 				if (item && item.callback) {
 					item.callback(item, s);
@@ -583,7 +627,7 @@ import request, { baseURL } from '@/utils/request.js';
 					uni.showModal({
 						content: '敬请期待'
 					})
-			
+
 				}
 			},
 			navigatorBack() {
@@ -612,11 +656,11 @@ import request, { baseURL } from '@/utils/request.js';
 
 					let str = rec.receive.payloadString;
 					let json = JSON.parse(str);
-					if('ins_channel' in json){
-						this.formData.sta_Channel=json.ins_channel;
+					if ('ins_channel' in json) {
+						this.formData.sta_Channel = json.ins_channel;
 						these.setBleFormData();
-					}	
-							
+					}
+
 				} catch (err) {
 
 				}
@@ -636,8 +680,8 @@ import request, { baseURL } from '@/utils/request.js';
 						return false;
 					});
 
-					 these.formData.groups = groups;
-					console.error("groups=",these.formData.groups);
+					these.formData.groups = groups;
+					console.error("groups=", these.formData.groups);
 					let checks = groups.map(item => {
 						return item.id
 					});
@@ -655,9 +699,9 @@ import request, { baseURL } from '@/utils/request.js';
 
 			},
 			ShowChannelEdit() {
-				
+
 				if (!this.permissions.includes('55') && this.Status.apiType !== 'listA') {
-				
+
 					this.showPop({
 						message: '无操作权限',
 						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
@@ -668,7 +712,7 @@ import request, { baseURL } from '@/utils/request.js';
 					})
 					return;
 				}
-				
+
 				this.Status.ShowEditChannel = true;
 				this.showPop({
 					showPop: true, //是否显示弹窗
@@ -736,9 +780,9 @@ import request, { baseURL } from '@/utils/request.js';
 
 			},
 			ArrowModeSet(val) {
-				
+
 				if (!this.permissions.includes('53') && this.Status.apiType !== 'listA') {
-				
+
 					this.showPop({
 						message: '无操作权限',
 						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
@@ -749,12 +793,12 @@ import request, { baseURL } from '@/utils/request.js';
 					})
 					return;
 				}
-				
+
 				if (this.formData.sta_SOSType === 'sos') {
 					this.showMsg("设备强制报警中,请先关闭报警")
 					return;
 				}
-			
+
 				let f = this.getDevice();
 				if (!f) {
 					this.showBleUnConnect();
@@ -763,7 +807,7 @@ import request, { baseURL } from '@/utils/request.js';
 				if (this.formData.sta_ArrowMode === val) {
 					return;
 				}
-			
+
 				var json = {
 					ins_right_side: val
 				}
@@ -800,8 +844,8 @@ import request, { baseURL } from '@/utils/request.js';
 				});
 			},
 			groupCheck() {
-if (!this.permissions.includes('54') && this.Status.apiType !== 'listA') {
-				
+				if (!this.permissions.includes('54') && this.Status.apiType !== 'listA') {
+
 					this.showPop({
 						message: '无操作权限',
 						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
@@ -882,9 +926,9 @@ if (!this.permissions.includes('54') && this.Status.apiType !== 'listA') {
 				// });
 			},
 			groupSetting(item, index) {
-				
+
 				if (!this.permissions.includes('54') && this.Status.apiType !== 'listA') {
-				
+
 					this.showPop({
 						message: '无操作权限',
 						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
@@ -895,7 +939,7 @@ if (!this.permissions.includes('54') && this.Status.apiType !== 'listA') {
 					})
 					return;
 				}
-				
+
 				if (this.formData.sta_SOSType === 'sos') {
 					this.showMsg("设备强制报警中,请先关闭报警")
 					return;
@@ -942,8 +986,8 @@ if (!this.permissions.includes('54') && this.Status.apiType !== 'listA') {
 			},
 
 			sosSetting(item, index) {
-if (!this.permissions.includes('42') && this.Status.apiType !== 'listA') {
-				
+				if (!this.permissions.includes('42') && this.Status.apiType !== 'listA') {
+
 					this.showPop({
 						message: '无操作权限',
 						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
@@ -1043,7 +1087,11 @@ if (!this.permissions.includes('42') && this.Status.apiType !== 'listA') {
 					return;
 				}
 				if (res.deviceId == these.formData.deviceId) {
-					this.formData.bleStatu = false;
+					if(res.device){
+						these.formData.bleStatu = 'connecting';
+					}else{
+						this.formData.bleStatu = false;
+					}
 					setTimeout(() => {
 						hideLoading(these, 1000);
 					});
@@ -1076,6 +1124,7 @@ if (!this.permissions.includes('42') && this.Status.apiType !== 'listA') {
 				showLoading(this, {
 					text: "蓝牙恢复可用,正在连接设备"
 				});
+				these.formData.bleStatu = 'connecting';
 				ble.LinkBlue(these.formData.deviceId).then(() => {
 					these.formData.bleStatu = true;
 					updateLoading(these, {
@@ -1822,22 +1871,23 @@ if (!this.permissions.includes('42') && this.Status.apiType !== 'listA') {
 		letter-spacing: 0.14rpx;
 
 	}
-	
-	
+
+
 	.modeSetting .arrow .outCircle .text {
-		margin-top:0rpx !important;
-		
-	
+		margin-top: 0rpx !important;
+
+
 	}
 
 
-.arrowContent .line {
-	width:calc(100% - 60rpx);
-	
-	height: 0rpx;
-	border-bottom:1px solid #ffffff30;
-	margin: 30rpx ;
-}
+	.arrowContent .line {
+		width: calc(100% - 60rpx);
+
+		height: 0rpx;
+		border-bottom: 1px solid #ffffff30;
+		margin: 30rpx;
+	}
+
 	.modeSetting .arrow .outCircle {
 		width: 120rpx;
 		height: 120rpx;
@@ -1881,33 +1931,33 @@ if (!this.permissions.includes('42') && this.Status.apiType !== 'listA') {
 		border-radius: 50%;
 
 	}
-	
-	
+
+
 	.modeSetting .arrow.redactive .outCircle {
 		border: 4rpx solid #EC2A2A;
 		padding: 4rpx;
 	}
-	
+
 	.modeSetting .arrow.redactive .item {
 		background: #EC2A2A;
 		border-radius: 50%;
-	
+
 	}
-	
+
 	.modeSetting .arrow.greenactive .outCircle {
 		border: 4rpx solid #00BD00;
 		padding: 4rpx;
 	}
-	
+
 	.modeSetting .arrow.greenactive .item {
 		background: #00BD00;
 		border-radius: 50%;
-	
+
 	}
-	
+
 	.modeSetting .arrow.redactive .item .text,
-	.modeSetting .arrow.greenactive .item .text{
-		color:#FFFFFFde !important;
+	.modeSetting .arrow.greenactive .item .text {
+		color: #FFFFFFde !important;
 	}
 
 
@@ -2202,29 +2252,29 @@ if (!this.permissions.includes('42') && this.Status.apiType !== 'listA') {
 		text-align: center;
 
 	}
-	
-	
-	
-	
+
+
+
+
 	.navbarRight {
 		width: 40px;
 		height: 100%;
-	
+
 	}
-	
+
 	.navbarRight .imgContent {
 		width: 36rpx;
 		height: 36rpx;
 		position: relative;
 	}
-	
+
 	.navbarRight .imgContent:first-child {
-	
+
 		width: 38rpx !important;
 		height: 38rpx !important;
 		margin-top: -2rpx;
 	}
-	
+
 	.navbarRight .imgContent .baber {
 		position: absolute;
 		z-index: 100;
@@ -2240,33 +2290,33 @@ if (!this.permissions.includes('42') && this.Status.apiType !== 'listA') {
 		font-style: Regular;
 		font-size: 20rpx;
 		font-weight: 400;
-	
+
 		text-align: center;
 		overflow: hidden;
 		white-space: nowrap;
-	
+
 	}
-	
+
 	.navbarRight .imgContent .img {
 		width: 100%;
 		height: 100%;
-	
+
 		box-sizing: border-box;
 		position: relative;
 	}
-	
+
 	.navbarRight .imgContent .img:last-child {
 		padding: 1rpx;
 	}
-	
+
 	.nvbar {
 		top: 0px;
 	}
-	
+
 	/deep/ .uni-navbar--fixed {
 		top: 0px;
 	}
-	
+
 	.uninavebartext {
 		width: 100%;
 		font-size: 32rpx;

pages/4877/BJQ4877V1.vue

@@ -603,7 +603,11 @@ import request, { baseURL } from '@/utils/request.js';
 					return;
 				}
 				if (res.deviceId == these.formData.deviceId) {
-					this.formData.bleStatu = false;
+					if(res.device){
+						these.formData.bleStatu = 'connecting';
+					}else{
+						this.formData.bleStatu = false;
+					}
 					setTimeout(() => {
 						hideLoading(these, 1000);
 					});

pages/6107/BJQ6107.vue

@@ -976,7 +976,7 @@
 						buttonBgColor: "#BBE600"
 					},
 					warn: {
-						icoUrl: '/static/images/6170/svg.png',
+						icoUrl: '/static/images/common/warning.png',
 						borderColor: "#FFC84E",
 						buttonBgColor: "#FFC84E",
 					}

pages/6155/BJQ6155.vue

@@ -9,8 +9,8 @@
 			</view>
 			<view slot="right">
 				<view class="navbarRight center">
-					<view class="imgContent" :class="{'visibilityHidden':Status.apiType!=item.apiType}" @click.stop="handleRightClick(item,index)"
-						v-for="item,index in Status.navbar.icons">
+					<view class="imgContent" :class="{'visibilityHidden':Status.apiType!=item.apiType}"
+						@click.stop="handleRightClick(item,index)" v-for="item,index in Status.navbar.icons">
 						<image class="img" :src="item.src" mode="aspectFit"></image>
 						<view class="baber" v-if="item.math">{{item.math>9?'9+':item.math}}</view>
 					</view>
@@ -61,9 +61,9 @@
 				<text class="lbl">蓝牙名称</text>
 				<text class="value">{{device.bluetoothName}}</text>
 			</view>
-			<view class="item">
+			<view class="item" @click.top="bleStatuToggle">
 				<text class="lbl">蓝牙状态</text>
-				<text class="value" :class="formData.bleStatu?'green':'red'">{{formData.bleStatu?'已连接':'未连接'}}</text>
+				<text class="value" :class="formData.bleStatu?'green':'red'">{{getbleStatu}}</text>
 			</view>
 		</view>
 		<view class="lamp">
@@ -219,7 +219,7 @@
 						icons: [{
 							src: '/static/images/common/shape.png',
 							callback: this.gotoShare,
-							apiType:'listA'
+							apiType: 'listA'
 						}],
 						title: 'BJQ6155'
 
@@ -373,7 +373,7 @@
 				let device = data.data;
 				these.device = device;
 				these.Status.apiType = data.apiType;
-				these.Status.navbar.title=device.deviceName;
+				these.Status.navbar.title = device.deviceName;
 				if (data.apiType !== 'listA') {
 					Common.getdeviceShareId(data.data.id).then(res => {
 						if (res.code == 200) {
@@ -410,7 +410,7 @@
 
 				these.formData.id = device.id;
 				these.formData.deviceId = f.deviceId;
-				these.formData.bleStatu = false;
+				these.formData.bleStatu = 'connecting';
 				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
 					these.formData.bleStatu = true;
 				});
@@ -433,12 +433,50 @@
 
 		},
 		computed: {
-			cModeItems: function() {
-
+			getbleStatu() {
+				if (this.formData.bleStatu === true) {
+					return '已连接';
+				}
+				if (this.formData.bleStatu === 'connecting') {
+					return '连接中';
+				}
+				if (this.formData.bleStatu === 'dicconnect') {
+					return '正在断开';
+				}
+				if (this.formData.bleStatu === 'err') {
+					return '连接异常';
+				}
+				return '未连接';
 			}
 
 		},
 		methods: {
+			bleStatuToggle() {
+				let f = this.getDevice();
+				if (!f) {
+					this.showBleUnConnect();
+					return;
+				}
+				if (this.formData.bleStatu === true) {
+					this.formData.bleStatu = 'dicconnect';
+					ble.disconnectDevice(f.deviceId).finally(r => {
+						this.formData.bleStatu = false;
+					});
+					return;
+				}
+
+				if (this.formData.bleStatu === false || this.formData.bleStatu === 'err') {
+					these.formData.bleStatu = 'connecting';
+					ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+						these.formData.bleStatu = true;
+					}).catch(ex => {
+						these.formData.bleStatu = 'err';
+					});
+					return;
+				}
+
+
+			},
 			handleRightClick(item, s) {
 				if (item && item.callback) {
 					item.callback(item, s);
@@ -547,7 +585,11 @@
 					return;
 				}
 				if (res.deviceId == these.formData.deviceId) {
-					this.formData.bleStatu = false;
+					if(res.device){
+						these.formData.bleStatu = 'connecting';
+					}else{
+						this.formData.bleStatu = false;
+					}
 					setTimeout(() => {
 						hideLoading(these, 1000);
 					});
@@ -580,6 +622,7 @@
 				showLoading(this, {
 					text: "蓝牙恢复可用,正在连接设备"
 				});
+				these.formData.bleStatu = 'connecting';
 				ble.LinkBlue(these.formData.deviceId).then(() => {
 					these.formData.bleStatu = true;
 					updateLoading(these, {
@@ -656,7 +699,7 @@
 			proParam: function() {
 
 				uni.navigateTo({
-					url: '/pages/common/productDes/index?id=' + this.formData.id,
+					url: '/pages/common/productDes/index?id=' + this.device.id,
 					success(ev) {
 
 					}
@@ -664,7 +707,7 @@
 			},
 			handRemark: function() {
 				uni.navigateTo({
-					url: '/pages/common/operatingInstruct/index?id=' + this.formData.id,
+					url: '/pages/common/operatingInstruct/index?id=' + this.device.id,
 					success(ev) {
 
 					}
@@ -672,7 +715,7 @@
 			},
 			handVideo: function() {
 				uni.navigateTo({
-					url: '/pages/common/operationVideo/index?id=' + this.formData.id,
+					url: '/pages/common/operationVideo/index?id=' + this.device.id,
 					success(ev) {
 
 					}
@@ -1745,7 +1788,7 @@
 
 			},
 			sliderChange: function(evt) {
-				
+
 				if (!this.permissions.includes('1') && this.Status.apiType !== 'listA') {
 
 					this.showPop({

pages/6155/deviceDetail.vue

@@ -62,9 +62,9 @@
 				<text class="lbl">蓝牙名称</text>
 				<text class="value">{{device.bluetoothName}}</text>
 			</view>
-			<view class="item">
+			<view class="item" @click.top="bleStatuToggle">
 				<text class="lbl">蓝牙状态</text>
-				<text class="value" :class="formData.bleStatu?'green':'red'">{{formData.bleStatu?'已连接':'未连接'}}</text>
+				<text class="value" :class="formData.bleStatu?'green':'red'">{{getbleStatu}}</text>
 			</view>
 		</view>
 		<view class="lamp">
@@ -380,7 +380,7 @@
 
 				these.formData.id = device.id;
 				these.formData.deviceId = f.deviceId;
-				these.formData.bleStatu = false;
+				these.formData.bleStatu = 'connecting';
 				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
 					these.formData.bleStatu = true;
 				});
@@ -403,25 +403,50 @@
 
 		},
 		computed: {
-			RSSIRemark: function() {
-				let remark = '极弱';
-				if (this.formData.RSSI <= 0 && this.formData.RSSI >= -30) {
-					remark = '强';
+			getbleStatu() {
+				if (this.formData.bleStatu === true) {
+					return '已连接';
 				}
-
-				if (this.formData.RSSI < -30 && this.formData.RSSI >= -60) {
-					remark = '一般';
+				if (this.formData.bleStatu === 'connecting') {
+					return '连接中';
 				}
-				if (this.formData.RSSI < -60 && this.formData.RSSI >= -85) {
-					remark = '弱';
+				if (this.formData.bleStatu === 'dicconnect') {
+					return '正在断开';
 				}
-				if (this.formData.RSSI < -85 && this.formData.RSSI >= -100) {
-					remark = '微弱';
+				if (this.formData.bleStatu === 'err') {
+					return '连接异常';
 				}
-			},
+				return '未连接';
+			}
 
 		},
 		methods: {
+			bleStatuToggle() {
+				let f = this.getDevice();
+				if (!f) {
+					this.showBleUnConnect();
+					return;
+				}
+				if (this.formData.bleStatu === true) {
+					this.formData.bleStatu = 'dicconnect';
+					ble.disconnectDevice(f.deviceId).finally(r => {
+						this.formData.bleStatu = false;
+					});
+					return;
+				}
+
+				if (this.formData.bleStatu === false || this.formData.bleStatu === 'err') {
+					these.formData.bleStatu = 'connecting';
+					ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+						these.formData.bleStatu = true;
+					}).catch(ex => {
+						these.formData.bleStatu = 'err';
+					});
+					return;
+				}
+
+
+			},
 			handleRightClick(item, s) {
 				if (item && item.callback) {
 					item.callback(item, s);
@@ -541,7 +566,11 @@
 					return;
 				}
 				if (res.deviceId == these.formData.deviceId) {
-					this.formData.bleStatu = false;
+					if(res.device){
+						these.formData.bleStatu = 'connecting';
+					}else{
+						this.formData.bleStatu = false;
+					}
 					setTimeout(() => {
 						hideLoading(these, 1000);
 					});
@@ -574,6 +603,7 @@
 				showLoading(this, {
 					text: "蓝牙恢复可用,正在连接设备"
 				});
+				these.formData.bleStatu = 'connecting';
 				ble.LinkBlue(these.formData.deviceId).then(() => {
 					these.formData.bleStatu = true;
 					updateLoading(these, {
@@ -649,7 +679,7 @@
 			proParam: function() {
 
 				uni.navigateTo({
-					url: '/pages/common/productDes/index?id=' + this.formData.id,
+					url: '/pages/common/productDes/index?id=' + this.device.id,
 					success(ev) {
 
 					}
@@ -657,7 +687,7 @@
 			},
 			handRemark: function() {
 				uni.navigateTo({
-					url: '/pages/common/operatingInstruct/index?id=' + this.formData.id,
+					url: '/pages/common/operatingInstruct/index?id=' + this.device.id,
 					success(ev) {
 
 					}
@@ -665,7 +695,7 @@
 			},
 			handVideo: function() {
 				uni.navigateTo({
-					url: '/pages/common/operationVideo/index?id=' + this.formData.id,
+					url: '/pages/common/operationVideo/index?id=' + this.device.id,
 					success(ev) {
 
 					}
@@ -715,7 +745,7 @@
 					return new Promise((resolve, reject) => {
 						// 创建RGB565格式的像素数据
 						// console.log("pixels=",pixels);
-						const arr = ble.convertToRGB565(pixels, 'bgr');
+						const arr = Common.convertToRGB565(pixels, 'bgr');
 
 						var list = [];
 						let index = 0; // 用于追踪arr的当前位置
@@ -1794,7 +1824,7 @@
 				}
 
 			}
-			
+
 
 
 		}

pages/6170/callPolice/index.vue

@@ -55,12 +55,19 @@
 	import {
 		deviceInfo,
 	} from '@/api/common/index.js'
+	// 1. 导入所有需要的报警接口
 	import {
-		deviceSendAlarmMessage
+		deviceSendAlarmMessage, //6170对应类型接口
+		deviceDefaultAlarm
 	} from '@/api/6170/callPolice.js'
+	import {
+		deviceForceAlarmActivation
+	} from '@/api/100J/HBY100-J.js'
+	// BJQ100J 对应的接口
 	import {
 		deviceRealTimeStatus //设备状态
 	} from '@/api/6170/deviceControl.js'
+
 	export default {
 		components: {
 			CustomPopup
@@ -74,12 +81,34 @@
 				popupConfirmText: '确认',
 				popupType: 'force', // 'force' or 'cancel'
 				pendingAlarmAction: '',
-				sendInfo: ''
+				sendInfo: '',
+				// 2. 核心：typeName 与接口的映射表
+				alarmApiMapping: {
+					'HBY100-J': { //100J类型
+						sendApi: deviceForceAlarmActivation,
+						statusTypeName: 'FunctionAccessBatchStatusRule_BJQ100J'
+					},
+					'BJQ6170': { //6170类型
+						sendApi: deviceSendAlarmMessage,
+						statusTypeName: 'FunctionAccessBatchStatusRule_BJQ200J'
+					}
+				},
+				loading: false,
+				total: 0
 			}
 		},
 		computed: {
 			selectedDeviceIds() {
 				return this.deviceList.filter(item => item.checked).map(item => item.id);
+			},
+			// 自动匹配当前typeName对应的接口配置
+			currentApiConfig() {
+				const currentTypeName = this.sendInfo.typeName || '';
+				// 匹配到则用对应配置，匹配不到用默认配置
+				return this.alarmApiMapping[currentTypeName] || {
+					sendApi: deviceDefaultAlarm,
+					statusTypeName: 'FunctionAccessBatchStatusRule_Default'
+				};
 			}
 		},
 		methods: {
@@ -93,15 +122,19 @@
 			// 全选/取消全选
 			selectAll() {
 				console.log('123');
-				const allSelected = this.deviceList.every(item => item.checked);
+				// 仅对在线设备进行全选/取消
+				const allSelected = this.deviceList.every(item => item.onlineStatus === 1 && item.checked);
 				this.deviceList.forEach(item => {
-					item.checked = !allSelected;
+					// 离线设备不修改checked状态
+					if (item.onlineStatus === 1) {
+						item.checked = !allSelected;
+					}
 				});
-
 				this.$forceUpdate();
 			},
 			// 获取设备列表
 			getData(deviceType) {
+				console.log(deviceType, 'deviceTypedeviceType');
 				this.loading = true;
 				let data = {
 					pageNum: 1,
@@ -127,7 +160,7 @@
 				const selectedDevices = this.deviceList.filter(item => item.checked)
 				if (selectedDevices.length === 0) {
 					uni.showToast({
-						title: '请选择一个设备',
+						title: '请选择一个在线设备',
 						icon: 'none'
 					});
 					return;
@@ -136,14 +169,13 @@
 				this.popupMessage = '确认要对所选设备开启强制报警?';
 				this.showPopupFlag = true;
 				this.pendingAlarmAction = 1
-
 			},
 			// 解除报警
 			cancelAlarm() {
 				const selectedDevices = this.deviceList.filter(item => item.checked);
 				if (selectedDevices.length === 0) {
 					uni.showToast({
-						title: '请选择一个设备',
+						title: '请选择一个在线设备',
 						icon: 'none'
 					});
 					return;
@@ -153,61 +185,61 @@
 				this.showPopupFlag = true;
 				this.pendingAlarmAction = 0
 			},
-			// 确认
+			//动态调用对应接口
 			async sendAlarmCommand() {
 				const selectedDevices = this.deviceList.filter(item => item.checked);
 				const deviceIds = selectedDevices.map(item => item.id);
 				const deviceImeiList = selectedDevices.map(item => item.deviceImei);
 				const isAlarming = this.pendingAlarmAction == 1;
+				if (selectedDevices.length === 0) {
+					uni.showToast({
+						title: '请选择在线设备',
+						icon: 'none'
+					});
+					return;
+				}
 				try {
-
 					uni.showLoading({
 						title: isAlarming ? '设备报警中...' : '解除报警中...',
 						mask: true
 					});
-					// 2. 准备请求数据
-					const batchId = generateShortId();
-					const data = {
-						deviceIds: deviceIds,
+					// 获取当前typeName对应的接口和参数配置
+					const {
+						sendApi,
+						statusTypeName
+					} = this.currentApiConfig;
+					// 准备请求数据
+					// const batchId = generateShortId();
+					const requestData = {
+						deviceIds: deviceIds,   
 						typeName: this.sendInfo.typeName,
 						deviceImeiList: deviceImeiList,
-						batchId: batchId,
-						instructValue: this.pendingAlarmAction == 1 ? '1' : '0'
+						// batchId: batchId,
+						voiceStrobeAlarm: this.pendingAlarmAction == 1 ? '1' : '0'
 					};
-					const registerRes = await deviceSendAlarmMessage(data);
-					if (registerRes.code !== 200) {
+					// 动态调用匹配的接口
+					const registerRes = await sendApi(requestData);
+					if (registerRes.code == 200) {
 						uni.showToast({
-							title: registerRes.msg,
-							icon: 'none'
-						})
-						return
-					}
-					// 4. 获取设备状态
-					let deviceImei = this.sendInfo.deviceImei
-					let typeName = this.sendInfo.typeName
-					const statusRes = await getdeviceSTatus({
-							functionMode: 2,
-							batchId,
-							typeName:'FunctionAccessBatchStatusRule',
-							deviceImei,
-							interval: 500
-						},
-						deviceRealTimeStatus
-					);
-					if (statusRes.data.functionAccess === 'OK') {
-						uni.showToast({
-							title: statusRes.msg,
-							icon: 'none'
+							title: isAlarming ? '强制报警开启成功' : '报警已解除',
+							icon: 'success'
 						});
 						this.showPopupFlag = false
 						uni.$emit('deviceStatusUpdate', {});
 						setTimeout(() => {
 							uni.navigateBack()
 						}, 500)
+					} else {
+						uni.showToast({
+							title: registerRes.msg || '状态查询失败',
+							icon: 'none'
+						});
 					}
+
 				} catch (error) {
+					console.error('报警操作异常：', error);
 					uni.showToast({
-						title: error.message,
+						title: '网络异常，请重试',
 						icon: 'none'
 					});
 				} finally {
@@ -217,7 +249,6 @@
 			// 点击确认状态
 			onPopupConfirm() {
 				this.sendAlarmCommand(this.popupType);
-				// 处理确认逻辑
 			},
 		},
 		onLoad(options) {
@@ -227,7 +258,6 @@
 				this.getData(data.data.id)
 				this.sendInfo = data.data
 			});
-			// 如果需要向调用页面返回数据，可以触发 'ack' 事件
 			eventChannel.emit('ack', {})
 		},
 	}
@@ -236,7 +266,7 @@
 <style scoped>
 	.container {
 		min-height: 100vh;
-		background-color:rgb(18, 18, 18);
+		background-color: rgb(18, 18, 18);
 		box-sizing: border-box;
 		overflow-x: hidden;
 

pages/6331/BJQ6331.vue

@@ -617,7 +617,11 @@ import request, { baseURL } from '@/utils/request.js';
 					return;
 				}
 				if (res.deviceId == these.formData.deviceId) {
-					this.formData.bleStatu = false;
+					if(res.device){
+						these.formData.bleStatu = 'connecting';
+					}else{
+						this.formData.bleStatu = false;
+					}
 					setTimeout(() => {
 						hideLoading(these, 1000);
 					});

pages/650/HBY650.vue

@@ -55,9 +55,9 @@
 				<text class="lbl">设备名称</text>
 				<text class="value">{{device.deviceName}}</text>
 			</view>
-			<view class="item">
+			<view class="item" @click.top="bleStatuToggle">
 				<text class="lbl">蓝牙状态</text>
-				<text class="value" :class="formData.bleStatu?'green':'red'">{{formData.bleStatu?'已连接':'未连接'}}</text>
+				<text class="value" :class="formData.bleStatu?'green':'red'">{{getbleStatu}}</text>
 			</view>
 			<view class="item">
 				<text class="lbl">预警级别</text>
@@ -401,6 +401,7 @@ import request, { baseURL } from '@/utils/request.js';
 
 				these.formData.bleStatu = false;
 				these.formData.deviceId = f.deviceId;
+				these.formData.bleStatu='connecting';
 				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
 					these.formData.bleStatu = true;
 				});
@@ -419,24 +420,49 @@ import request, { baseURL } from '@/utils/request.js';
 			this.Status.pageHide = false;
 		},
 		computed: {
-			RSSIRemark: function() {
-				let remark = '极弱';
-				if (this.formData.RSSI <= 0 && this.formData.RSSI >= -30) {
-					remark = '强';
-				}
-
-				if (this.formData.RSSI < -30 && this.formData.RSSI >= -60) {
-					remark = '一般';
-				}
-				if (this.formData.RSSI < -60 && this.formData.RSSI >= -85) {
-					remark = '弱';
-				}
-				if (this.formData.RSSI < -85 && this.formData.RSSI >= -100) {
-					remark = '微弱';
-				}
-			}
+			getbleStatu(){
+						if(this.formData.bleStatu===true){
+							return '已连接';
+						}
+						if(this.formData.bleStatu==='connecting'){
+							return '连接中';
+						}
+						if(this.formData.bleStatu==='dicconnect'){
+							return '正在断开';
+						}
+						if(this.formData.bleStatu==='err'){
+							return '连接异常';
+						}
+						return '未连接';
+					}
 		},
 		methods: {
+			bleStatuToggle(){
+							let f=this.getDevice();
+							if(!f){
+								this.showBleUnConnect();
+								return;
+							}
+							if(this.formData.bleStatu===true){
+								this.formData.bleStatu='dicconnect';
+								ble.disconnectDevice(f.deviceId).finally(r=>{
+									this.formData.bleStatu=false;
+								});
+								return;
+							}
+							
+							if(this.formData.bleStatu===false  || this.formData.bleStatu==='err'){
+								this.formData.bleStatu='connecting';
+								ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+									these.formData.bleStatu = true;
+								}).catch(ex=>{
+									these.formData.bleStatu = 'err';
+								});
+								return;
+							}
+							
+							
+						},
 			handleRightClick(item, s) {
 				if (item && item.callback) {
 					item.callback(item, s);
@@ -488,7 +514,11 @@ import request, { baseURL } from '@/utils/request.js';
 					return;
 				}
 				if (res.deviceId == these.formData.deviceId) {
-					this.formData.bleStatu = false;
+					if(res.device){
+						these.formData.bleStatu = 'connecting';
+					}else{
+						this.formData.bleStatu = false;
+					}
 					setTimeout(() => {
 						hideLoading(these, 1000);
 					});
@@ -521,6 +551,7 @@ import request, { baseURL } from '@/utils/request.js';
 				showLoading(this, {
 					text: "蓝牙恢复可用,正在连接设备"
 				});
+				this.formData.bleStatu='connecting';
 				ble.LinkBlue(these.formData.deviceId).then(() => {
 					these.formData.bleStatu = true;
 					updateLoading(these, {
@@ -1029,7 +1060,7 @@ import request, { baseURL } from '@/utils/request.js';
 								});
 
 								these.Status.BottomMenu.show = false;
-								these.rgb565Data = ble.convertToRGB565(data.piexls);
+								these.rgb565Data = Common.convertToRGB565(data.piexls);
 								setTimeout(function() {
 									sendImagePackets().catch(() => {
 

pages/670/HBY670.vue

@@ -1,8 +1,5 @@
 <template>
 	<view class="content contentBg">
-		<!-- 	<custom-navbar :title="Status.navbar.title" :showBack="Status.navbar.showBack" color="#FFFFFF"
-			:rightIcons="Status.navbar.icons" @icon-click="handleRightClick" backgroundColor="#121212"></custom-navbar>
-		 -->
 		<uni-nav-bar :border="false" @clickLeft="prevPage" fixed="true" statusBar="true" 
 			background-color="#121212" color="#FFFFFF" :title="Status.navbar.title">
 			 <template v-slot:left><view>
@@ -58,9 +55,9 @@
 				<text class="lbl">蓝牙名称</text>
 				<text class="value valueFont">{{device.bluetoothName}}</text>
 			</view>
-			<view class="item">
+			<view class="item"  @click.top="bleStatuToggle">
 				<text class="lbl">蓝牙状态</text>
-				<text class="value" :class="formData.bleStatu?'green':'red'">{{formData.bleStatu?'已连接':'未连接'}}</text>
+				<text class="value" :class="formData.bleStatu?'green':'red'">{{getbleStatu}}</text>
 			</view>
 			<view class="item">
 				<text class="lbl">设备状态</text>
@@ -550,7 +547,8 @@
 					these.formData['imei'] = these.device.deviceImei;
 				}
 				these.getDetail();
-				these.formData.bleStatu = false;
+				
+				these.formData.bleStatu='connecting';
 				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
 					these.formData.bleStatu = true;
 				});
@@ -567,9 +565,49 @@
 			ble.removeReceiveCallback(pagePath);
 		},
 		computed: {
-
+	getbleStatu(){
+				if(this.formData.bleStatu===true){
+					return '已连接';
+				}
+				if(this.formData.bleStatu==='connecting'){
+					return '连接中';
+				}
+				if(this.formData.bleStatu==='dicconnect'){
+					return '正在断开';
+				}
+				if(this.formData.bleStatu==='err'){
+					return '连接异常';
+				}
+				return '未连接';
+			}
 		},
 		methods: {
+			bleStatuToggle(){
+							let f=this.getDevice();
+							if(!f){
+								this.showBleUnConnect();
+								return;
+							}
+							if(this.formData.bleStatu===true){
+								this.formData.bleStatu='dicconnect';
+								ble.disconnectDevice(f.deviceId).finally(r=>{
+									this.formData.bleStatu=false;
+								});
+								return;
+							}
+							
+							if(this.formData.bleStatu===false  || this.formData.bleStatu==='err'){
+								this.formData.bleStatu='connecting';
+								ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+									these.formData.bleStatu = true;
+								}).catch(ex=>{
+									these.formData.bleStatu = 'err';
+								});
+								return;
+							}
+							
+							
+						},
 			prevPage() {
 				uni.navigateBack({
 
@@ -596,7 +634,11 @@
 					return;
 				}
 				if (res.deviceId == these.formData.deviceId) {
-					this.formData.bleStatu = false;
+					if(res.device){
+						these.formData.bleStatu = 'connecting';
+					}else{
+						this.formData.bleStatu = false;
+					}
 					setTimeout(() => {
 						hideLoading(these, 1000);
 					});
@@ -629,6 +671,7 @@
 				showLoading(this, {
 					text: "蓝牙恢复可用,正在连接设备"
 				});
+				this.formData.bleStatu='connecting';
 				ble.LinkBlue(these.formData.deviceId).then(() => {
 					these.formData.bleStatu = true;
 					updateLoading(these, {
@@ -1848,7 +1891,7 @@
 
 								these.Status.BottomMenu.show = false;
 								these.picPath = data.picPath;
-								these.rgb565Data = ble.convertToRGB565(data.piexls);
+								these.rgb565Data = Common.convertToRGB565(data.piexls);
 								setTimeout(function() {
 
 									sendImagePackets().catch(() => {

pages/7305/BJQ7305.vue

@@ -9,16 +9,16 @@
 			</view>
 			<view slot="right">
 				<view class="navbarRight center">
-					<view class="imgContent" :class="{'visibilityHidden':Status.apiType!=item.apiType}" @click.stop="handleRightClick(item,index)"
-						v-for="item,index in Status.navbar.icons">
+					<view class="imgContent" :class="{'visibilityHidden':Status.apiType!=item.apiType}"
+						@click.stop="handleRightClick(item,index)" v-for="item,index in Status.navbar.icons">
 						<image class="img" :src="item.src" mode="aspectFit"></image>
 						<view class="baber" v-if="item.math">{{item.math>9?'9+':item.math}}</view>
 					</view>
-		
+
 				</view>
-		
+
 			</view>
-		
+
 		</uni-nav-bar>
 		<view class="eq">
 			<view class="leftImg" @click.stop="previewImg(device.devicePic?device.devicePic:formData.img)">
@@ -60,9 +60,9 @@
 			</view>
 
 
-			<view class="item">
+			<view class="item" @click.top="bleStatuToggle">
 				<text class="lbl">蓝牙状态</text>
-				<text class="value" :class="formData.bleStatu?'green':'red'">{{formData.bleStatu?'已连接':'未连接'}}</text>
+				<text class="value" :class="formData.bleStatu?'green':'red'">{{getbleStatu}}</text>
 			</view>
 		</view>
 		<view class="lamp">
@@ -182,7 +182,7 @@
 		updateLoading
 	} from '@/utils/loading.js'
 	import BleReceive from '@/utils/BleReceive';
-import Common from '@/utils/Common.js';
+	import Common from '@/utils/Common.js';
 
 	var ble = null;
 	var these = null;
@@ -201,10 +201,10 @@ import Common from '@/utils/Common.js';
 						icons: [{
 							src: '/static/images/common/shape.png',
 							callback: this.gotoShare,
-							apiType:'listA'
+							apiType: 'listA'
 						}],
 						title: 'BJQ6155'
-					
+
 					},
 					pageHide: false,
 					Pop: {
@@ -320,8 +320,8 @@ import Common from '@/utils/Common.js';
 
 				let device = data.data;
 				these.device = device;
-these.Status.apiType = data.apiType;
-				these.Status.navbar.title=device.deviceName;
+				these.Status.apiType = data.apiType;
+				these.Status.navbar.title = device.deviceName;
 				if (data.apiType !== 'listA') {
 					Common.getdeviceShareId(data.data.id).then(res => {
 						if (res.code == 200) {
@@ -358,7 +358,7 @@ these.Status.apiType = data.apiType;
 
 				these.formData.id = device.id;
 				these.formData.deviceId = f.deviceId;
-				these.formData.bleStatu = false;
+				these.formData.bleStatu = 'connecting';
 				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
 					console.log("连接成功")
 					these.formData.bleStatu = true;
@@ -378,21 +378,20 @@ these.Status.apiType = data.apiType;
 			this.Status.pageHide = false;
 		},
 		computed: {
-			RSSIRemark: function() {
-				let remark = '极弱';
-				if (this.formData.RSSI <= 0 && this.formData.RSSI >= -30) {
-					remark = '强';
+			getbleStatu() {
+				if (this.formData.bleStatu === true) {
+					return '已连接';
 				}
-
-				if (this.formData.RSSI < -30 && this.formData.RSSI >= -60) {
-					remark = '一般';
+				if (this.formData.bleStatu === 'connecting') {
+					return '连接中';
 				}
-				if (this.formData.RSSI < -60 && this.formData.RSSI >= -85) {
-					remark = '弱';
+				if (this.formData.bleStatu === 'dicconnect') {
+					return '正在断开';
 				}
-				if (this.formData.RSSI < -85 && this.formData.RSSI >= -100) {
-					remark = '微弱';
+				if (this.formData.bleStatu === 'err') {
+					return '连接异常';
 				}
+				return '未连接';
 			},
 			getMode() {
 				let txt = "关闭";
@@ -425,6 +424,32 @@ these.Status.apiType = data.apiType;
 			}
 		},
 		methods: {
+			bleStatuToggle() {
+				let f = this.getDevice();
+				if (!f) {
+					this.showBleUnConnect();
+					return;
+				}
+				if (this.formData.bleStatu === true) {
+					this.formData.bleStatu = 'dicconnect';
+					ble.disconnectDevice(f.deviceId).finally(r => {
+						this.formData.bleStatu = false;
+					});
+					return;
+				}
+
+				if (this.formData.bleStatu === false || this.formData.bleStatu === 'err') {
+					these.formData.bleStatu = 'connecting';
+					ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+						these.formData.bleStatu = true;
+					}).catch(ex => {
+						these.formData.bleStatu = 'err';
+					});
+					return;
+				}
+
+
+			},
 			handleRightClick(item, s) {
 				if (item && item.callback) {
 					item.callback(item, s);
@@ -432,7 +457,7 @@ these.Status.apiType = data.apiType;
 					uni.showModal({
 						content: '敬请期待'
 					})
-			
+
 				}
 			},
 			navigatorBack() {
@@ -477,7 +502,12 @@ these.Status.apiType = data.apiType;
 					return;
 				}
 				if (res.deviceId == these.formData.deviceId) {
-					this.formData.bleStatu = false;
+					if (res.device) {
+						these.formData.bleStatu = 'connecting';
+					} else {
+						this.formData.bleStatu = false;
+					}
+
 					// 断开连接时先将充电状态复位，避免保持旧值
 					this.formData.statu = '未充电';
 					this.setBleFormData();
@@ -513,6 +543,7 @@ these.Status.apiType = data.apiType;
 				showLoading(this, {
 					text: "蓝牙恢复可用,正在连接设备"
 				});
+				these.formData.bleStatu = 'connecting';
 				ble.LinkBlue(these.formData.deviceId).then(() => {
 					these.formData.bleStatu = true;
 					updateLoading(these, {
@@ -554,9 +585,9 @@ these.Status.apiType = data.apiType;
 				if (this.Status.pageHide) {
 					return;
 				}
-				
+
 				let json = recei.ReceiveData(receive, device, path, recArr);
-				console.log("收到消息:",receive.hexs);
+				console.log("收到消息:", receive.hexs);
 				if (!json) {
 					return;
 				}
@@ -590,7 +621,7 @@ these.Status.apiType = data.apiType;
 			proParam: function() {
 
 				uni.navigateTo({
-					url: '/pages/common/productDes/index?id=' + this.formData.id,
+					url: '/pages/common/productDes/index?id=' + this.device.id,
 					success(ev) {
 
 					}
@@ -598,7 +629,7 @@ these.Status.apiType = data.apiType;
 			},
 			handRemark: function() {
 				uni.navigateTo({
-					url: '/pages/common/operatingInstruct/index?id=' + this.formData.id,
+					url: '/pages/common/operatingInstruct/index?id=' + this.device.id,
 					success(ev) {
 
 					}
@@ -606,7 +637,7 @@ these.Status.apiType = data.apiType;
 			},
 			handVideo: function() {
 				uni.navigateTo({
-					url: '/pages/common/operationVideo/index?id=' + this.formData.id,
+					url: '/pages/common/operationVideo/index?id=' + this.device.id,
 					success(ev) {
 
 					}
@@ -887,7 +918,7 @@ these.Status.apiType = data.apiType;
 			},
 			UploadOpenImg: function() {
 				if (!this.permissions.includes('3') && this.Status.apiType !== 'listA') {
-				
+
 					this.showPop({
 						message: '无操作权限',
 						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
@@ -898,7 +929,7 @@ these.Status.apiType = data.apiType;
 					})
 					return;
 				}
-				
+
 				//上传开机画面
 				this.Status.BottomMenu.menuItems = [];
 				this.Status.BottomMenu.title = "上传开机画面";
@@ -906,7 +937,7 @@ these.Status.apiType = data.apiType;
 				this.Status.BottomMenu.show = true;
 			},
 			ModeSetting: function(type) {
-if (!this.permissions.includes('1') && this.Status.apiType !== 'listA') {
+				if (!this.permissions.includes('1') && this.Status.apiType !== 'listA') {
 
 					this.showPop({
 						message: '无操作权限',
@@ -1151,7 +1182,7 @@ if (!this.permissions.includes('1') && this.Status.apiType !== 'listA') {
 			},
 			sendUsr() {
 				if (!this.permissions.includes('4') && this.Status.apiType !== 'listA') {
-				
+
 					this.showPop({
 						message: '无操作权限',
 						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
@@ -1366,7 +1397,7 @@ if (!this.permissions.includes('1') && this.Status.apiType !== 'listA') {
 				//给蓝牙设备发送信号更新亮度
 				BrighInteval = setTimeout(() => {
 					if (!this.permissions.includes('1') && this.Status.apiType !== 'listA') {
-					
+
 						this.showPop({
 							message: '无操作权限',
 							iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
@@ -1377,7 +1408,7 @@ if (!this.permissions.includes('1') && this.Status.apiType !== 'listA') {
 						})
 						return;
 					}
-					
+
 					this.sendBrightness();
 					this.setBleFormData();
 				}, 100);
@@ -1896,27 +1927,27 @@ if (!this.permissions.includes('1') && this.Status.apiType !== 'listA') {
 		left: -99999rpx;
 		visibility: hidden;
 	}
-	
-	
+
+
 	.navbarRight {
 		width: 40px;
 		height: 100%;
-	
+
 	}
-	
+
 	.navbarRight .imgContent {
 		width: 36rpx;
 		height: 36rpx;
 		position: relative;
 	}
-	
+
 	.navbarRight .imgContent:first-child {
-	
+
 		width: 38rpx !important;
 		height: 38rpx !important;
 		margin-top: -2rpx;
 	}
-	
+
 	.navbarRight .imgContent .baber {
 		position: absolute;
 		z-index: 100;
@@ -1932,33 +1963,33 @@ if (!this.permissions.includes('1') && this.Status.apiType !== 'listA') {
 		font-style: Regular;
 		font-size: 20rpx;
 		font-weight: 400;
-	
+
 		text-align: center;
 		overflow: hidden;
 		white-space: nowrap;
-	
+
 	}
-	
+
 	.navbarRight .imgContent .img {
 		width: 100%;
 		height: 100%;
-	
+
 		box-sizing: border-box;
 		position: relative;
 	}
-	
+
 	.navbarRight .imgContent .img:last-child {
 		padding: 1rpx;
 	}
-	
+
 	.nvbar {
 		top: 0px;
 	}
-	
+
 	/deep/ .uni-navbar--fixed {
 		top: 0px;
 	}
-	
+
 	.uninavebartext {
 		width: 100%;
 		font-size: 32rpx;

pages/common/addBLE/addEquip.vue

@@ -481,7 +481,10 @@
 					}
 
 					plus.android.requestPermissions(
-						['android.permission.BLUETOOTH','android.permission.BLUETOOTH_ADMIN','android.permission.ACCESS_FINE_LOCATION','android.permission.ACCESS_COARSE_LOCATION'],
+						['android.permission.BLUETOOTH', 'android.permission.BLUETOOTH_ADMIN',
+							'android.permission.ACCESS_FINE_LOCATION',
+							'android.permission.ACCESS_COARSE_LOCATION'
+						],
 						(result) => {
 							if (result.granted && result.granted.length > 0) {
 								console.log('定位权限已授予');
@@ -533,22 +536,24 @@
 						return;
 					}
 				}
-				showLoading(these,{text:'正在刷新'})
+				showLoading(these, {
+					text: '正在刷新'
+				})
 				let time = null;
 				let startSearch = () => {
-					
-					if(time!==null){
-						clearTimeout(time);	
+
+					if (time !== null) {
+						clearTimeout(time);
 					}
-					
+
 					time = setTimeout(() => {
 						these.EquipMents = [];
 						these.PairEquip = [];
 
 						ble.StartSearch().then(result => {
-							console.log("开始搜索成功",result);
-							
-						}).catch(err => {							
+							console.log("开始搜索成功", result);
+
+						}).catch(err => {
 							console.error("开始搜索失败:", err);
 							if (err.code === 10001) {
 								these.showOpenSetting();
@@ -557,9 +562,9 @@
 									title: '提示',
 									content: '出现错误:' + err.msg
 								});
-								
+
 							}
-						}).finally(()=>{
+						}).finally(() => {
 							hideLoading(these);
 						});
 					}, 200);
@@ -905,11 +910,11 @@
 		position: absolute;
 		border-radius: 50%;
 		background-color: #bbe60033;
-		animation: expand 4s infinite ease-out;
+
 		display: inline-block;
 		transform: translate(-50%, -50%);
 		border: 1rpx solid #bbe6003d;
-		animation: expand 5s infinite ease-in-out;
+		animation: expand 4s infinite ease-in-out;
 	}
 
 	.circle:nth-child(2) {
@@ -927,17 +932,16 @@
 			opacity: 0.8;
 		}
 
-		80% {
-			width: 18.75rem;
-			height: 18.75rem;
-			opacity: 0.2;
+		90% {
+			width: 18rem;
+			height: 18rem;
+			opacity: 0;
 		}
 
 		100% {
-
-			width: 0.5rem;
-			height: 0.5rem;
-			opacity: 0.5;
+			width: 0rem;
+			height: 0rem;
+			opacity: 0;
 		}
 	}
 

pages/common/addDevice/TypeList.vue

@@ -0,0 +1,229 @@
+<template>
+	<view class="content contentBg">
+		<view class="topStatric">
+			<uni-easyinput :styles="{color:'#ffffff'}" :clearable="true" class="uni-mt-5" :trim="'both'"
+				prefixIcon="search" v-model="search" placeholder="名称筛选"></uni-easyinput>
+		</view>
+
+		<view class="mainContent">
+			<view class="item " :class="{'displayNone':item.typeName.toLowerCase().indexOf(search.toLowerCase())===-1}"
+				v-for="item,index in list" v-on:click.stop="gotoAdd(item)">
+				<view class="itemLine">
+					<view class="imgContent">
+						<image class="img" :src="item.devicePic?item.devicePic:'/static/images/path3.png'" mode="aspectFit"></image>
+						
+						
+					</view>
+
+					<text class="typeName">{{item['typeName']}}</text>
+					<text class="netName">
+						({{(item['communicationMode']=='0' || item['communicationMode']===0)?'4G':(item['communicationMode']===1|| item['communicationMode']==='1')?'蓝牙':'蓝牙&4G'}})
+					</text>
+				</view>
+				<uni-icons type="forward" size="18" color="#FFFFFFde"></uni-icons>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import request from '@/utils/request';
+	var these = null;
+	export default {
+		data() {
+			return {
+				v: '',
+				search: '',
+				list: []
+			}
+		},
+		onLoad: function(op) {
+			these = this;
+
+			this.getDevList();
+			let time = null;
+			let channel = this.getOpenerEventChannel();
+			channel.on('checkTypes', function(data) {
+				these.v = data;
+			})
+
+		},
+		methods: {
+			getDevList() {
+				let arr = [
+
+				];
+				request({
+					url: '/app/xinghan/device/typeAll',
+					method: 'get'
+				}).then(res => {
+					if (res && res.code == 200) {
+						console.log("获取到类型", res.data);
+						arr = res.data;
+					}
+
+					this.list = arr;
+				}).catch(ex => {
+					uni.showModal({
+						content: "获取类型列表失败"
+					})
+				})
+			},
+			gotoAdd(item, index) {
+				debugger;
+				if (this.v) {
+					let eventChannel = this.getOpenerEventChannel();
+					eventChannel.emit('checkType', item);
+					uni.navigateBack();
+					return;
+				}
+				let url = '';
+
+				let goto = () => {
+					uni.navigateTo({
+						url: url,
+						success(res) {
+							res.eventChannel.emit('addType', {
+								data: item
+							})
+						},
+						fail(ex) {
+							console.log("页面跳转失败了", ex);
+						}
+					});
+				}
+				if (item.communicationMode === 1 || item.communicationMode === '1') { //蓝牙添加
+					url = '/pages/common/addDevice/addBle';
+				} else if (item.communicationMode === 0 || item.communicationMode === '0') { //扫码或输入IMEI添加
+					url = '/pages/common/addDevice/addImei?type=imei';
+				} else {
+					uni.showActionSheet({
+						title: '添加方式',
+						itemColor: '#aed600',
+						itemList: ["扫一扫添加", "蓝牙添加"],
+						success: function(res) {
+							switch (res.tapIndex) {
+								case 0:
+									url = '/pages/common/addDevice/addImei?type=blueAndImei';
+									break;
+								case 1:
+									url = '/pages/common/addDevice/addBle';
+									break;
+							}
+
+							goto();
+						}
+					})
+				}
+				goto();
+			}
+		}
+	}
+</script>
+
+<style>
+	.content {
+		box-sizing: border-box;
+		width: 100%;
+		min-height: 100vh;
+		height: auto;
+		padding: 30rpx;
+	}
+
+	.item {
+		margin-bottom: 20rpx;
+		box-sizing: border-box;
+		width: 100%;
+		height: 80rpx;
+		border-bottom: 1rpx dashed #FFFFFF3d;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+		font-size: 30rpx;
+	}
+
+	.itemLine {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: flex-start;
+		align-items: center;
+	}
+
+	.netName {
+		color: #838282;
+		font-size: 26rpx;
+		margin-left: 10rpx;
+	}
+
+	.typeName {
+		color: #FFFFFF;
+	}
+
+
+
+
+	.topStatric {
+		width: calc(100% - 60rpx);
+		box-sizing: border-box;
+
+		position: fixed;
+		top: 0rpx;
+		z-index: 99;
+		background-color: #121212;
+	}
+
+	/* #ifdef H5 */
+	.topStatric {
+		top: 44px;
+	}
+
+	.mainContent {
+		margin-top: 60rpx;
+	}
+
+
+	/* #endif */
+
+	/* #ifdef APP */
+	.mainContent {
+
+		margin-top: 60rpx;
+	}
+
+	/* #endif */
+	.uni-mt-5 {
+		background-color: #000000;
+	}
+
+	.uni-easyinput__content {
+		background-color: #121212 !important;
+	}
+
+	.imgContent {
+		width: 70rpx;
+		height: 70rpx;
+		border: 1px solid #838282;
+		border-radius: 10rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+		margin-right: 20rpx;
+		box-sizing: border-box;
+		padding: 10rpx;
+	}
+
+	.img {
+		width: 60rpx;
+		height: 60rpx;
+
+
+	}
+</style>

pages/common/addDevice/addImei.vue

@@ -0,0 +1,507 @@
+<template>
+	<view class="content contentBg">
+
+<uni-nav-bar class="nvbar" leftIcon="left" @clickLeft="navigatorBack">
+			<view slot="left">
+				<uni-icons type="back" size="23" color="#FFFFFF"></uni-icons>
+			</view>
+			<view slot="default" class="center uninavebartext">
+				{{Status.navbar.title}}
+			</view>
+			<view slot="right">
+				<view class="navbarRight center">
+					<view class="imgContent" :class="{'visibilityHidden':Status.apiType!=item.apiType}"
+						@click.stop="handleRightClick(item,index)" v-for="item,index in Status.navbar.icons">
+						<image class="img" :src="item.src" mode="aspectFit"></image>
+						<view class="baber" v-if="item.math">{{item.math>9?'9+':item.math}}</view>
+					</view>
+
+				</view>
+
+			</view>
+
+		</uni-nav-bar>
+
+
+
+		<view class="ul">
+			<view class="red">扫码或输入IMEI,以添加设备</view>
+			<text>IMEI列表:</text>
+			<view class="li" v-for="item,index in imeis">
+				<view>
+					<view class="txt">IMEI:{{item.imei}}</view>
+					<view class="txt">Mac:{{item.mac}}</view>
+					<view class="remark" :class="item.isUpload?'green':'red'">状态:{{item.msg}}</view>
+				</view>
+
+				<image :src="isItemLink(item,index,'upload')" class="img" mode="aspectFit">
+				</image>
+
+			</view>
+		</view>
+
+		<view class="footer">
+			<view class="row">
+
+
+				<view class="inputContent">
+
+					<uni-easyinput v-model="input" placeholder="请输入IMEI"></uni-easyinput>
+
+				</view>
+				<view class="btn" @click="addImei(null)">
+					确定
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import Common from '@/utils/Common';
+	import request from '@/utils/request';
+	import MqHelper from '@/utils/MqHelper';
+
+	var eventChannel = null;
+	var these = null;
+	var mq = null;
+	export default {
+		data() {
+			return {
+				Status:{
+					navbar: {
+						icons: [{
+							src: '/static/images/common/scane.png',
+							callback: this.scan
+							
+						}],
+						title: '添加IMEI'
+					
+					}
+				},
+				groupid: '',
+				type: {
+
+
+				},
+				input: '',
+				imeis: [],
+				topic: ""
+			}
+		},
+	
+		onUnload() {
+			if (mq) {
+				mq.unSubscribes();
+				mq.disconnect();
+				mq = null;
+			}
+		},
+		onLoad(opt) {
+			this.groupid = Common.DateFormat(new Date(), 'yyyy-MM-dd HH:mm:ss');
+			these = this;
+			eventChannel = this.getOpenerEventChannel();
+
+
+			eventChannel.on('addType', function(rec) {
+				console.log("接收到父页面的参数:", rec);
+				these.type = rec.data;
+				these.Status.navbar.title="添加" + rec.data.typeName;
+				
+				
+				let typeName = these.type.typeName.replace(/-/g, '').replace(/_/g, '').replace(
+					/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '').toUpperCase();
+				these.topic = 'regis/equip/' + typeName;
+				mq = MqHelper.getMqTool();
+				mq.init().then(res => {
+					let arr = [{
+						topic: these.topic,
+						callback: these.mqReceive
+					}];
+					mq.subscribes(arr).catch(ex => {
+						console.error("出现错误", ex);
+					});
+				});
+			});
+
+
+		},
+		methods: {
+			handleRightClick(item, s) {
+				if (item && item.callback) {
+					item.callback(item, s);
+				} else {
+					uni.showModal({
+						content: '敬请期待'
+					})
+			
+				}
+			},
+			navigatorBack() {
+				uni.navigateBack();
+			},
+			//收到上报消息时的处理方法
+			mqReceive(receive) {
+				console.log("收到主题消息：", receive);
+
+				let task = () => {
+					return new Promise((resolve, reject) => {
+						try {
+							let json = JSON.parse(receive.payload);
+							let imei = "";
+							if (json.imei) {
+								imei = json.imei;
+							}
+
+							let f = this.imeis.find(v => {
+								return v.imei === imei
+							});
+
+							let mac = "";
+							if (json.mac) {
+								if (!json.mac.includes(':')) {
+									mac = json.mac.replace(/(.{2})/g, '$1:').slice(0, -1)
+								}
+							}
+
+
+							let dev = {
+								imei: imei,
+								mac: mac,
+								isUpload: false,
+								msg: '正在上传'
+							};
+							if (!f) {
+								this.imeis.unshift(dev);
+							}
+
+
+							this.uploadItem(dev).then(res => {
+								this.sendSuccNotice(imei);
+								resolve(true);
+							}).catch(ex => {
+								console.error("ex=", ex);
+								reject(ex);
+							});
+						} catch (err) {
+							console.error("出现错误:", err);
+							reject(err);
+						}
+					});
+				}
+
+				task();
+			},
+			//发送成功的通知
+			sendSuccNotice(imei) {
+				let json = JSON.stringify({
+					code: 200
+				});
+				mq.sendData("regis/" + imei, json, false);
+			},
+			isItemLink: function(item, index, type) {
+				console.log("item=", item);
+				let src = '/static/images/BLEAdd/noLink.png';
+				if (!item) {
+
+					return src;
+				}
+
+				if (type == 'upload') {
+					if (item.isUpload) {
+						src = '/static/images/BLEAdd/linked.png';
+					}
+				}
+
+				return src;
+			},
+			//扫码
+			scan() {
+				let systemInfo = uni.getSystemInfoSync();
+				if (systemInfo.uniPlatform == 'web') {
+					uni.showModal({
+						content:"Web平台不支持此功能,请手工录入或设备开机上报"
+					});
+					return;
+				}
+				
+				uni.scanCode({
+					onlyFromCamera: false,
+					scanType: ['qrCode'],
+					autoDecodeCharset: true,
+					autoZoom: true,
+					barCodeInput: true,
+					hideAlbum: false,
+					success: (res) => {
+
+						if (res.result) {
+
+							console.log("扫码成功,", res);
+							this.input = res.res
+							this.addImei(res.result);
+						}
+					},
+					fail: (ex) => {
+						console.log("扫码失败,", ex);
+					}
+				});
+			},
+			//手动输入
+			addImei(txt) {
+				debugger;
+				if (!txt) {
+					txt = this.input
+				}
+				let imei = "";
+				let mac = "";
+				console.log("txt=", txt);
+				try {
+					let json = JSON.parse(txt);
+					if ('blue' in json) {
+						mac = json.blue;
+						if (mac) {
+							if (!mac.includes(':')) {
+								mac = mac.replace(/(.{2})/g, '$1:').slice(0, -1)
+							}
+
+						}
+					}
+
+					if ('imei' in json) {
+						imei = json.imei;
+						console.log("imei=", imei)
+					}
+
+				} catch (error) {
+					console.error("出现异常:", error);
+					imei = txt;
+				}
+
+				let f = this.imeis.find(v => {
+					return v.imei === imei
+				});
+
+				if (!f) {
+					let dev = {
+						imei: imei,
+						mac: mac,
+						isUpload: false,
+						msg: '正在上传'
+					};
+					this.imeis.unshift(dev);
+
+					this.uploadItem(dev).then(res => {
+
+					}).catch(ex => {
+						console.error("ex=", ex);
+					});
+
+				} else {
+					uni.showModal({
+						content: "IMEI重复了"
+					})
+				}
+			},
+			//上报设备至服务器
+			uploadItem(item) {
+				return new Promise((resolve, reject) => {
+					console.log("item=", this.type);
+					let json = {
+						"deviceType": this.type.id,
+						"deviceName": this.type.typeName,
+						"deviceImei": item.imei,
+						"remark": this.groupid,
+						"deviceMac": item.mac,
+						"bluetoothName": this.type.typeName,
+					}
+					console.log("111111", json)
+					request({
+						url: '/app/xinghan/device/add',
+						method: 'post',
+						data: json
+					}).then(res => {
+
+						if (res && res.code) {
+
+
+							this.imeis.find((v, index) => {
+								if (v.imei == item.imei) {
+									this.$set(this.imeis[index], "isUpload", (res && res.code ==
+										200));
+									this.$set(this.imeis[index], "msg", res.msg);
+									return true;
+								}
+								return false;
+							});
+							this.input = "";
+							if (res.code == 200) {
+								console.log("成功了,", res);
+								resolve(true);
+								return;
+							} else if (res.code == 500) {
+								if (res.msg.indexOf('已存在') > -1) {
+									resolve(true);
+									return;
+								}
+							}
+							
+							
+						}
+
+							console.log("出现错误，", res);
+							reject(res);
+						
+
+					});
+				});
+
+			}
+		}
+	}
+</script>
+
+<style>
+	.content {
+		box-sizing: border-box;
+		width: 100%;
+		min-height: 100vh;
+		height: auto;
+		padding: 30rpx;
+	}
+
+
+
+	.li {
+		width: 100%;
+
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		align-items: center;
+		justify-content: space-between;
+		background: #1A1A1A;
+		box-sizing: border-box;
+		padding: 20rpx;
+		border-radius: 16rpx;
+		margin-top: 20rpx;
+	}
+
+	.txt {
+		font-size: 34rpx;
+		font-weight: 400;
+
+	}
+
+	.remark {
+		font-size: 26rpx;
+		font-weight: 300;
+	}
+
+	.img {
+		width: 50rpx;
+		height: 50rpx;
+	}
+
+	.footer {
+		position: fixed;
+		width: 100%;
+		bottom: 0rpx;
+		left: 0rpx;
+	}
+
+	.footer .row {
+		width: 100%;
+		height: auto;
+		box-sizing: border-box;
+		padding: 20rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.inputContent {
+		width: calc(100% - 110rpx);
+	}
+
+	.footer .btn {
+		width: 100rpx;
+		text-align: center;
+		background-color: #09a0f7;
+		color: #fff;
+		border-radius: 16rpx;
+		height: 70rpx;
+		line-height: 70rpx;
+	}
+	
+	
+	
+	.navbarRight {
+		width: 40px;
+		height: 100%;
+	
+	}
+	
+	.navbarRight .imgContent {
+		width: 36rpx;
+		height: 36rpx;
+		position: relative;
+	}
+	
+	.navbarRight .imgContent:first-child {
+	
+		width: 38rpx !important;
+		height: 38rpx !important;
+		margin-top: -2rpx;
+	}
+	
+	.navbarRight .imgContent .baber {
+		position: absolute;
+		z-index: 100;
+		width: 30rpx;
+		height: 30rpx;
+		line-height: 30rpx;
+		right: -15rpx;
+		top: -15rpx;
+		border-radius: 50%;
+		background: #f12828;
+		color: #ffffff;
+		font-family: 'PingFang SC';
+		font-style: Regular;
+		font-size: 20rpx;
+		font-weight: 400;
+	
+		text-align: center;
+		overflow: hidden;
+		white-space: nowrap;
+	
+	}
+	
+	.navbarRight .imgContent .img {
+		width: 100%;
+		height: 100%;
+	
+		box-sizing: border-box;
+		position: relative;
+	}
+	
+	.navbarRight .imgContent .img:last-child {
+		padding: 1rpx;
+	}
+	
+	.nvbar {
+		top: 0px;
+	}
+	
+	/deep/ .uni-navbar--fixed {
+		top: 0px;
+	}
+	
+	.uninavebartext {
+		width: 100%;
+		font-size: 32rpx;
+	}
+</style>

pages/common/addScan/ScanEquip.vue

@@ -0,0 +1,396 @@
+<template>
+	<view class="maincontent contentBg">
+		<uni-nav-bar class="nvbar" leftIcon="left" @clickLeft="navigatorBack">
+			<view slot="left">
+				<uni-icons type="back" size="23" color="#FFFFFF"></uni-icons>
+			</view>
+			<view slot="default" class="center uninavebartext">
+				{{Status.navbar.title}}
+			</view>
+			<view slot="right">
+				<view class="navbarRight center">
+					<view class="imgContent" @click.stop="handleRightClick(item,index)"
+						v-for="item,index in Status.navbar.icons">
+						<image class="img" :src="item.src" mode="aspectFit"></image>
+						<view class="baber" v-if="item.math">{{item.math>9?'9+':item.math}}</view>
+					</view>
+
+				</view>
+
+			</view>
+
+		</uni-nav-bar>
+
+		<view class="scanPanel center">
+			<image @click.stop="scan" class="img" src="/static/images/common/scan.png" mode="aspectFit"></image>
+		</view>
+		<view class="txt">
+			对准二维码进行扫描
+		</view>
+
+		<view class="form">
+
+			<input class="formInput" type="text" v-model="formData.inputCode" placeholder="输入二维码内容"
+				placeholder-class="placeholder-class" cursor-spacing="30" cursor-color="#BBE600" />
+
+			<view class="btnOK" :class="{active:formData.inputCode}" @click.stop="addCode">确定</view>
+		</view>
+
+
+		<MsgBox ref="msgPop" />
+
+		<global-loading ref="loading" />
+	</view>
+</template>
+
+<script>
+	import request from '@/utils/request.js';
+	import {
+		showLoading,
+		hideLoading,
+		updateLoading
+	} from '@/utils/loading.js';
+
+	import {
+		MsgSuccess,
+		MsgError,
+		MsgClose,
+		MsgWarning,
+		showPop
+	} from '@/utils/MsgPops.js'
+	import Common from '@/utils/Common.js';
+	var eventChannel = null;
+	var these = null;
+
+	export default {
+		data() {
+			return {
+				Status: {
+					navbar: {
+						icons: [{
+							src: '/static/images/common/scane.png',
+							callback: this.scan
+						}],
+						title: '扫码'
+
+					},
+				},
+				formData: {
+					inputCode: ''
+				}
+			}
+		},
+		onLoad() {
+
+			these = this;
+			setTimeout(this.scan, 500)
+
+		},
+		methods: {
+			addCode() {
+				debugger;
+				if (!this.formData.inputCode) {
+					MsgWarning("请输入二维码内容","确定", this);
+					return;
+				}
+
+				let macStr = this.formData.inputCode;
+
+				if (macStr.indexOf(':') == -1) {
+					macStr = macStr.replace(/(.{2})/g, '$1:').slice(0, -1);
+				}
+				//通过mac地址查询
+				let p1 = new Promise((resolve, reject) => {
+
+					request({
+						url: '/app/device/getDeviceInfoByDeviceMac',
+						method: 'GET',
+						data: {
+							deviceMac: macStr
+						}
+					}).then(res => {
+
+						console.log("获取设备信息", res);
+						if (res && res.code == 200) {
+							console.log("res=", res);
+							let data = res.data;
+						
+							if (data && data.id) {
+								resolve(data);
+								return;
+							}
+
+						}
+						reject(null);
+					}).catch(() => {
+						reject(null);
+					});
+				});
+
+				p1.then(dev => {
+					//蓝牙产品
+					this.qrCodeResult(macStr, false, 'ble');
+				}).catch(() => {
+					this.qrCodeResult(this.formData.inputCode, false, 'imei');
+				})
+
+			},
+
+
+			handleRightClick(item, s) {
+				if (item && item.callback) {
+					item.callback(item, s);
+				} else {
+					uni.showModal({
+						content: '敬请期待'
+					})
+
+				}
+			},
+			navigatorBack() {
+				uni.navigateBack();
+			},
+			qrCodeResult(cleanedResult, isConvert, type) { //条码文本，是否尝试解析，已知类型
+
+
+				let url = `/pages/common/qrcode/qrcode?deviceId=${encodeURIComponent(cleanedResult)}`;
+				try {
+					if (isConvert) {
+						let json = JSON.parse(cleanedResult);
+						if ('imei' in json) {
+							url =
+								`/pages/common/qrcode/qrcode?deviceId=${encodeURIComponent(json.imei)}`;
+						} else if ('blue' in json || 'ble' in json) {
+							if (json.ble) {
+								json.blue = json.ble;
+							}
+							if (json.blue) {
+								if (!json.blue.includes(':')) {
+									json.blue = json.blue.replace(
+											/(.{2})/g, '$1:')
+										.slice(0, -1)
+								}
+							}
+
+							url = `/pages/common/addBLE/LinkBle?mac=${encodeURIComponent(json.blue)}`;
+						}
+					} else {
+						if (type === 'imei') {
+							url = `/pages/common/qrcode/qrcode?deviceId=${encodeURIComponent(cleanedResult)}`;
+						} else {
+							url = `/pages/common/addBLE/LinkBle?mac=${encodeURIComponent(cleanedResult)}`;
+						}
+					}
+
+				} catch (ex) {
+					console.error("解析条码出现异常,", ex);
+				}
+				// 跳转并传递扫描结果
+				uni.navigateTo({
+					url: url
+				});
+			},
+			scan(item, s) {
+				debugger;
+				let systemInfo = uni.getSystemInfoSync();
+				if (systemInfo.uniPlatform == 'web') {
+					MsgError("Web平台不支持此功能,请手工录入条码", "确定", these);
+					return;
+				}
+
+				uni.scanCode({
+					autoDecodeCharset: true,
+					autoZoom: true,
+					barCodeInput: true,
+					success: (res) => {
+						console.log('条码内容：', res);
+						let cleanedResult = res.result.trim();
+						this.qrCodeResult(cleanedResult, true, null);
+					},
+					fail: (err) => {
+						this.showMsg("扫码失败:" + err.errMsg, MsgType.error);
+					}
+				});
+			},
+
+
+		}
+	}
+</script>
+
+<style scoped>
+	.scanPanel {
+		width: 100%;
+		height: 600rpx;
+	}
+
+	.scanPanel .img {
+		width: 350rpx;
+		height: 350rpx;
+	}
+
+	.txt {
+		width: 100%;
+		text-align: center;
+		color: rgba(255, 255, 255, 0.6);
+
+		font-family: 'PingFang SC';
+
+		font-size: 28rpx;
+		font-weight: 400;
+		line-height: 20px;
+		letter-spacing: 0px;
+
+	}
+
+	.form {
+		width: 100%;
+		height: 250rpx;
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: center;
+		align-items: center;
+		justify-content: flex-end;
+	}
+
+	.formInput {
+		width: 90%;
+		height: 80rpx;
+		line-height: 80rpx;
+		border-radius: 40rpx;
+		color: rgba(255, 255, 255, 0.87);
+
+		font-family: "PingFang SC";
+		font-style: Regular;
+		font-size: 28rpx;
+		font-weight: 400;
+		background: rgba(42, 42, 42, 1);
+		letter-spacing: 0px;
+		text-align: left;
+		text-indent: 30rpx;
+		margin-bottom: 30rpx;
+	}
+
+	/deep/.placeholder-class {
+		font-family: "PingFang SC";
+		font-style: Regular;
+		font-size: 26rpx;
+		font-weight: 400;
+		color: rgba(255, 255, 255, 0.6);
+		letter-spacing: 0px;
+		text-align: left;
+	}
+
+	.btnOK {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: 'PingFang SC';
+		font-size: 30rpx;
+		font-weight: 400;
+		letter-spacing: 5rpx;
+	}
+
+	.btnOK.active {
+		color: #AED600;		
+	}
+
+	.navbarRight {
+		width: 40px;
+		height: 100%;
+
+	}
+
+	.navbarRight .imgContent {
+		width: 36rpx;
+		height: 36rpx;
+		position: relative;
+	}
+
+	.navbarRight .imgContent:first-child {
+
+		width: 38rpx !important;
+		height: 38rpx !important;
+		margin-top: -2rpx;
+	}
+
+	.navbarRight .imgContent .baber {
+		position: absolute;
+		z-index: 100;
+		width: 30rpx;
+		height: 30rpx;
+		line-height: 30rpx;
+		right: -15rpx;
+		top: -15rpx;
+		border-radius: 50%;
+		background: #f12828;
+		color: #ffffff;
+		font-family: 'PingFang SC';
+		font-style: Regular;
+		font-size: 20rpx;
+		font-weight: 400;
+
+		text-align: center;
+		overflow: hidden;
+		white-space: nowrap;
+
+	}
+
+	.navbarRight .imgContent .img {
+		width: 100%;
+		height: 100%;
+
+		box-sizing: border-box;
+		position: relative;
+	}
+
+	.navbarRight .imgContent .img:last-child {
+		padding: 1rpx;
+	}
+
+	.nvbar {
+		top: 0px;
+	}
+
+	/deep/ .uni-navbar--fixed {
+		top: 0px;
+	}
+
+	.uninavebartext {
+		width: 100%;
+		font-size: 32rpx;
+	}
+
+	.footer {
+		position: fixed;
+		width: 100%;
+		bottom: 0rpx;
+		left: 0rpx;
+	}
+
+	.footer .row {
+		width: 100%;
+		height: auto;
+		box-sizing: border-box;
+		padding: 20rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.inputContent {
+		width: calc(100% - 110rpx);
+	}
+
+	.footer .btn {
+		width: 100rpx;
+		text-align: center;
+		background-color: #09a0f7;
+		color: #fff;
+		border-radius: 16rpx;
+		height: 70rpx;
+		line-height: 70rpx;
+	}
+</style>

pages/common/allShare/index.vue

@@ -147,7 +147,7 @@
 						// 页面跳转成功后的回调函数
 						res.eventChannel.emit('detailData', {
 							data: item,
-							apiType: 'listB' // 自定义标识 // 自定义标识，详情哪里根据这个参数不同信息
+							apiType:this.activeTab===0?'listA':'listB' // 自定义标识 // 自定义标识，详情哪里根据这个参数不同信息
 						});
 					}
 				})

pages/common/audioManager/AudioList.vue

@@ -91,9 +91,9 @@
 		</MessagePopup>
 
 
-		<view class="displayNone">
+		<!-- <view class="displayNone">
 			<audio :src="cPlay.src" :id="cPlay.Id" :name="cPlay.name" author=""></audio>
-		</view>
+		</view> -->
 		<global-loading ref="loading"></global-loading>
 	</view>
 	
@@ -216,16 +216,16 @@
 					statu: "", //状态,是否公开
 					isApply: "" //是否使用中
 
-				},
-				cPlay: {
-					Id: "", //编号
-					name: "", //名称
-					createTime: "", //创建时间
-					localPath: "", //本地地址
-					webPath: "", //网络地址
-					statu: "", //状态,是否公开
-					isApply: "" //是否使用中
-				}
+				}//,
+				// cPlay: {
+				// 	Id: "", //编号
+				// 	name: "", //名称
+				// 	createTime: "", //创建时间
+				// 	localPath: "", //本地地址
+				// 	webPath: "", //网络地址
+				// 	statu: "", //状态,是否公开
+				// 	isApply: "" //是否使用中
+				// }
 			}
 		},
 		onLoad() {

pages/common/index/index.vue

@@ -18,11 +18,11 @@
 					<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 || activeTabInfo.communicationMode==2">
+		<!-- 	<view class="sendFlex" v-if="activeTab && activeTab.id !== ''&& activeTabInfo.communicationMode==0 || activeTabInfo.communicationMode==2">
 				<view class="callpolice" @click="callpolice">报警</view>
 				<view class="Sendmessage" @click="location">位置</view>
-				<view class="Sendmessage" @click="handleSend">发送信息</view>
-			</view>
+				<view class="Sendmessage" @click="handleSend" v-if="activeTabInfo.typeName!=='HBY100-J'">发送信息</view>
+			</view> -->
 			<!-- <scroll-view class="device-list" scroll-y @scrolltolower="onScrollToLower" :lower-threshold="100" style="height:80vh;"> -->
 			<mescroll-uni class="device-list"  @init="mescrollInit" @down="downCallback" @up="upCallback" :up="upOption"
 				:down="downOption" :fixed="false" :style="{ height: mescrollHeight + 'px' }">
@@ -40,15 +40,15 @@
 										<view class="device-name">
 											<view>设备:{{item.deviceName}}</view>
 											<view class="ID">
-												<view class="ID" v-if="item.communicationMode==0">ID:{{item.deviceImei}}
+												<view class="ID" v-if="item.communicationMode==0 || item.communicationMode==2">ID:{{item.deviceImei}}
 												</view>
 												<view class="ID" v-else>ID:{{item.deviceMac}}</view>
 												<!-- 在线状态 -->
 												<view class="onlines"
-													v-if="item.communicationMode==0 && item.onlineStatus==1">在线</view>
+													v-if="item.onlineStatus==1">在线</view>
 												<!-- 离线状态 -->
 												<view class="offlines"
-													v-if="item.communicationMode==0 && item.onlineStatus==0">离线</view>
+													v-if="item.onlineStatus==0">离线</view>
 												<view>电量：{{item.battery || '0'}}%</view>
 											</view>
 										</view>
@@ -116,7 +116,7 @@
 			<view class="tooltip-content" @click.stop>
 				<view class="tooltip-item" v-for="(item, index) in menuItems" :key="index"
 					@click="handleMenuClick(item)">
-					<image :src="item.icon" class="item-icon" />
+					<image :src="item.icon" class="item-icon"  mode="aspectFit"/>
 					<text>{{ item.text }}</text>
 				</view>
 			</view>
@@ -243,9 +243,9 @@ import BleReceive from '@/utils/BleReceive';
 				// 底部 footer 高度约 220rpx + 120rpx = 340rpx，转换为 px（1rpx = sysInfo.pixelRatio / 750 * 屏幕宽度？不，直接用 rpx 转 px 公式）
 				let footerHeight = 340 * (sysInfo.screenWidth / 750); // rpx 转 px
 
-				console.log("footerHeight=", footerHeight);
+				// console.log("footerHeight=", footerHeight);
 				this.mescrollHeight = sysInfo.screenHeight - footerHeight;
-				console.log("mescrollHeight=", this.mescrollHeight);
+				// console.log("mescrollHeight=", this.mescrollHeight);
 			},
 			mescrollInit(mescroll) {
 				this.mescroll = mescroll;
@@ -253,7 +253,7 @@ import BleReceive from '@/utils/BleReceive';
 			// 下拉刷新
 			downCallback() {
 
-				console.log("下拉加载")
+			
 				if (this.mescroll) {
 					this.mescroll.resetUpScroll(false);
 					this.mescroll.scrollTo(0, 0);
@@ -265,7 +265,7 @@ import BleReceive from '@/utils/BleReceive';
 			// 上拉加载 
 			upCallback() {
 
-				console.log("上拉加载")
+			
 
 				this.getData();
 			},
@@ -386,7 +386,7 @@ import BleReceive from '@/utils/BleReceive';
 					if (res.code == 200) {
 						//console.log("deviceTypeList=" + JSON.stringify(res.data));
 						this.tabs = [{
-								id: '',
+								id: '',         
 								name: '全部设备',
 								typeName: '全部设备'
 							},
@@ -405,16 +405,13 @@ import BleReceive from '@/utils/BleReceive';
 				this.deviceList = [];
 				this.activeTab = index;
 				this.activeTabInfo = tab
-
-
-
 				this.downCallback();
 			},
 			// 获取设备列表
 			getData() {
 
 				var task = () => {
-					console.error("正在加载第" + this.mescroll.num + "页数据");
+				
 					return new Promise((resolve, reject) => {
 						let data = {
 							pageNum: this.mescroll.num,
@@ -497,60 +494,21 @@ import BleReceive from '@/utils/BleReceive';
 				switch (item.action) {
 					case 'scan':
 						// 扫一扫
-						uni.scanCode({
-							autoDecodeCharset:true,
-							autoZoom:true,
-							barCodeInput:true,
-							success: (res) => {
-								console.log('条码内容：', res);
-								// 清除之前的数据
-								this.previousScanResult = null;
-								// 处理新的扫码结果
-								const cleanedResult = res.result.trim();
-								console.log('扫码结果：', cleanedResult);
-								let url =
-									`/pages/common/qrcode/qrcode?deviceId=${encodeURIComponent(cleanedResult)}`;
-								try {
-									let json = JSON.parse(cleanedResult);
-									if ('imei' in json) {
-										url =
-											`/pages/common/qrcode/qrcode?deviceId=${encodeURIComponent(json.imei)}`;
-									} else if ('blue' in json || 'ble' in json) {
-										if(json.ble){
-											json.blue=json.ble;
-										}
-										if(json.blue){
-											if (!json.blue.includes(':')) {
-												json.blue = json.blue.replace(
-														/(.{2})/g, '$1:')
-													.slice(0, -1)
-											}
-										}
-										
-										url =`/pages/common/addBLE/LinkBle?mac=${encodeURIComponent(json.blue)}`;
-									}
-								} catch (ex) {
-
-								}
-								// 跳转并传递扫描结果
-								uni.navigateTo({
-									url: url
-								});
-							},
-							fail: (err) => {
-								console.log('扫码失败', err);
-								uni.showToast({
-									title: '扫码失败',
-									icon: 'none'
-								});
-							}
+						uni.navigateTo({
+							url:'/pages/common/addScan/ScanEquip'
 						});
+						
 						break;
 					case 'bluetooth':
 						uni.navigateTo({
 							url: "/pages/common/addBLE/addEquip"
 						})
 						break;
+					case "add":
+						uni.navigateTo({
+							url: "/pages/common/addDevice/TypeList"
+						})
+						break;
 				}
 			},
 			// 右滑点击事件处理
@@ -765,9 +723,11 @@ import BleReceive from '@/utils/BleReceive';
 		},
 		onLoad() {
 			
-			console.error("首页加载");
+			// console.error("首页加载");
 			this.getTab()
 			this.downCallback();
+			
+			
 			// 绑定页面做了监听,新增成功,刷新页面
 			uni.$on('refreshDeviceList', () => {
 				this.getTab() // 刷新数据
@@ -810,7 +770,15 @@ import BleReceive from '@/utils/BleReceive';
 				recei.ReceiveData(receive, device, path, recArr);
 				this.updateBleStatu();
 			}, pagePath);
-
+			
+			let phone=uni.getStorageSync("phone");
+			if(phone==='17671332251'){//先写死方便自己使用，后面按人员权限区分
+				this.menuItems.push({
+					text: '上报设备',
+					icon: '/static/images/common/add.png',
+					action: 'add'
+				});
+			}
 			this.getSystemInfoSyncH();
 		},
 

pages/common/login/index.vue

@@ -92,7 +92,7 @@
 				}
 				let currTime = new Date().getTime();
 				if (currTime < time) {
-					console.log("登陆过，并且没过期，自动进入设备页");
+					// console.log("登陆过，并且没过期，自动进入设备页");
 					uni.switchTab({
 						url: '/pages/common/index/index'
 					});

pages/common/shareDevices/index.vue

@@ -147,6 +147,19 @@
 					});
 					return false;
 				}
+				else{
+					let phone= uni.getStorageSync('phone');
+					if(phone==phoneNumber){
+						uni.showToast({
+							title: '手机号不能是自己账号',
+							icon: 'none',
+							duration: 1000
+						});
+						return false;
+					}
+				}
+				
+				
 				try {
 					await deviceShareCode({
 						phonenumber: this.phone
@@ -203,7 +216,7 @@
 					const res = await deviceShareAdd({
 						phonenumber: this.phone,
 						smsCode: this.code,
-						deviceId: this.itemInfo.id,
+						deviceId: this.itemInfo.id || this.itemInfo.deviceId,
 						permission: selectedPermissions.join(',')
 					})
 					
@@ -237,8 +250,8 @@
 			const eventChannel = this.getOpenerEventChannel();
 			// 监听 'shareDevice' 事件，获取传过来的数据
 			eventChannel.on('shareDevice', (data) => {
-				console.log(data, 'data1t111');
 				this.itemInfo = data.data;
+				console.log(this.itemInfo,'this.itemInfo');
 				this.permissions=Common.getPermissions(this.itemInfo.persissonType);
 				console.log(this.itemInfo.persissonType,'this.itemInfo.persissonType');
 			})

pages/common/shareManagement/index.vue

@@ -86,7 +86,9 @@
 			},
 			getData(val) {
 				let data = {
-					deviceId: val
+					deviceId: val,
+					pageNum: 1,
+					pageSize: 500
 				}
 				deviceShareList(data).then((res) => {
 					if (res.code == 200) {
@@ -117,7 +119,7 @@
 			eventChannel.on('shareManagement', (data) => {
 				console.log(data, 'data1t111');
 				this.itemInfo = data.data;
-				this.getData(this.itemInfo.id)
+				this.getData(this.itemInfo.id ||this.itemInfo.deviceId)
 			})
 		}
 	}
@@ -179,12 +181,13 @@
 		border-radius: 32px;
 		background: rgba(255, 200, 78, 0.06);
 		display: inline-block;
-		width: 152rpx;
-		height: 60rpx;
+		width: 100rpx;
+		height: 50rpx;
 		text-align: center;
-		line-height: 60rpx;
+		line-height: 50rpx;
 		color: rgba(224, 52, 52, 1);
 		cursor: pointer;
+		margin-top: 30rpx;
 	}
 
 	.IMG {

uniCloud-aliyun/cloudfunctions/push/index.js

@@ -0,0 +1,16 @@
+// 简单的使用示例
+'use strict';
+const uniPush = uniCloud.getPushManager({appId:"__UNI__A21EF43"});
+exports.main = async (event, context) => {	
+	let body=JSON.parse(event.body);
+	let push_clientid=body.push_clientid;
+	let title=body.title;
+	let content=body.content;
+	let payload=body.payload;
+	return await uniPush.sendMessage({
+		"push_clientid": push_clientid, 
+		"title": title?title:"消息",	
+		"content": content?content:"消息通知",
+		"payload":payload
+	})
+};

uniCloud-aliyun/cloudfunctions/push/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "push",
+  "dependencies": {
+    "uni-config-center": "file:../../../uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center",
+    "uni-id-common": "file:../../../uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common",
+    "uni-open-bridge-common": "file:../../../uni_modules/uni-open-bridge-common/uniCloud/cloudfunctions/common/uni-open-bridge-common"
+  },
+  "extensions": {
+    "uni-cloud-push": {}
+  }
+}

uniCloud-aliyun/database/JQL查询.jql

@@ -0,0 +1,12 @@
+// 本文件用于，使用JQL语法操作项目关联的uniCloud空间的数据库，方便开发调试和远程数据库管理
+// 编写clientDB的js API（也支持常规js语法，比如var），可以对云数据库进行增删改查操作。不支持uniCloud-db组件写法
+// 可以全部运行，也可以选中部分代码运行。点击工具栏上的运行按钮或者按下【F5】键运行代码
+// 如果文档中存在多条JQL语句，只有最后一条语句生效
+// 如果混写了普通js，最后一条语句需是数据库操作语句
+// 此处代码运行不受DB Schema的权限控制，移植代码到实际业务中注意在schema中配好permission
+// 不支持clientDB的action
+// 数据库查询有最大返回条数限制，详见：https://uniapp.dcloud.net.cn/uniCloud/cf-database.html#limit
+// 详细JQL语法，请参考：https://uniapp.dcloud.net.cn/uniCloud/jql.html
+
+// 下面示例查询uni-id-users表的所有数据
+db.collection('JqUsrClent').get();

uniCloud-aliyun/database/jq-usr-device.schema.json

@@ -0,0 +1,24 @@
+// 文档教程: https://uniapp.dcloud.net.cn/uniCloud/schema
+{
+	"bsonType": "object",
+	"required": [],
+	"permission": {
+		"read": true,
+		"create": true,
+		"update": true,
+		"delete": true
+	},
+	"properties": {
+		"_id": {
+			"description": "ID，系统自动生成"
+		},
+		"phone":{
+			"bsonType": "string",
+			"description": "用户手机号"
+		},
+		"pushcid":{
+			"bsonType": "string",
+			"description": "用户的推送cid"
+		}
+	}
+}

uniCloud-aliyun/database/opendb-device.index.json

@@ -0,0 +1,14 @@
+[
+	{
+		"IndexName": "index_device_id",
+		"MgoKeySchema": {
+			"MgoIndexKeys": [
+				{
+					"Name": "device_id",
+					"Direction": "1"
+				}
+			],
+			"MgoIsUnique": true
+		}
+	}
+]

uniCloud-aliyun/database/opendb-device.schema.json

@@ -0,0 +1 @@
+{"bsonType":"object","required":[],"permission":{"read":false,"create":false,"update":false,"delete":false},"properties":{"_id":{"description":"ID，系统自动生成"},"appid":{"bsonType":"string","description":"DCloud appid"},"device_id":{"bsonType":"string","description":"设备唯一标识"},"vendor":{"bsonType":"string","description":"设备厂商"},"push_clientid":{"bsonType":"string","description":"推送设备客户端标识"},"imei":{"bsonType":"string","description":"国际移动设备识别码IMEI(International Mobile Equipment Identity)"},"oaid":{"bsonType":"string","description":"移动智能设备标识公共服务平台提供的匿名设备标识符(OAID)"},"idfa":{"bsonType":"string","description":"iOS平台配置应用使用广告标识(IDFA)"},"imsi":{"bsonType":"string","description":"国际移动用户识别码(International Mobile Subscriber Identification Number)"},"model":{"bsonType":"string","description":"设备型号"},"platform":{"bsonType":"string","description":"平台类型"},"uni_platform":{"bsonType":"string","description":"uni-app 运行平台，与条件编译平台相同。"},"os_name":{"bsonType":"string","description":"ios|android|windows|mac|linux "},"os_version":{"bsonType":"string","description":"操作系统版本号 "},"os_language":{"bsonType":"string","description":"操作系统语言 "},"os_theme":{"bsonType":"string","description":"操作系统主题 light|dark"},"pixel_ratio":{"bsonType":"string","description":"设备像素比 "},"network_model":{"bsonType":"string","description":"设备网络型号wifi\/3G\/4G\/"},"window_width":{"bsonType":"string","description":"设备窗口宽度 "},"window_height":{"bsonType":"string","description":"设备窗口高度"},"screen_width":{"bsonType":"string","description":"设备屏幕宽度"},"screen_height":{"bsonType":"string","description":"设备屏幕高度"},"rom_name":{"bsonType":"string","description":"rom 名称"},"rom_version":{"bsonType":"string","description":"rom 版本"},"location_latitude":{"bsonType":"double","description":"纬度"},"location_longitude":{"bsonType":"double","description":"经度"},"location_country":{"bsonType":"string","description":"国家"},"location_province":{"bsonType":"string","description":"省份"},"location_city":{"bsonType":"string","description":"城市"},"create_date":{"bsonType":"timestamp","description":"创建时间","forceDefaultValue":{"$env":"now"}},"last_update_date":{"bsonType":"timestamp","description":"最后一次修改时间","forceDefaultValue":{"$env":"now"}}},"version":"0.0.1"}

uniCloud-aliyun/database/opendb-tempdata.schema.json

@@ -0,0 +1 @@
+{"bsonType":"object","required":["value","expired"],"permission":{"read":false,"create":false,"update":false,"delete":false},"properties":{"_id":{"description":"ID，系统自动生成"},"value":{"description":"值"},"expired":{"description":"过期时间","bsonType":"timestamp"}},"version":"0.0.1"}

uniCloud-aliyun/database/uni-id-device.index.json

@@ -0,0 +1,38 @@
+[
+	{
+		"IndexName": "device_id",
+		"MgoKeySchema": {
+			"MgoIndexKeys": [
+				{
+					"Name": "device_id",
+					"Direction": "1"
+				}
+			],
+			"MgoIsUnique": false
+		}
+	},
+	{
+		"IndexName": "oaid",
+		"MgoKeySchema": {
+			"MgoIndexKeys": [
+				{
+					"Name": "oaid",
+					"Direction": "1"
+				}
+			],
+			"MgoIsUnique": false
+		}
+	},
+	{
+		"IndexName": "imei",
+		"MgoKeySchema": {
+			"MgoIndexKeys": [
+				{
+					"Name": "imei",
+					"Direction": "1"
+				}
+			],
+			"MgoIsUnique": false
+		}
+	}
+]

uniCloud-aliyun/database/uni-id-device.schema.json

@@ -0,0 +1 @@
+{"bsonType":"object","required":["user_id"],"properties":{"_id":{"description":"ID，系统自动生成"},"user_id":{"bsonType":"string","description":"用户id，参考uni-id-users表"},"ua":{"bsonType":"string","description":"userAgent"},"uuid":{"bsonType":"string","description":"设备唯一标识(需要加密存储)"},"os_name":{"bsonType":"string","description":"ios|android|windows|mac|linux "},"os_version":{"bsonType":"string","description":"操作系统版本号 "},"os_language":{"bsonType":"string","description":"操作系统语言 "},"os_theme":{"bsonType":"string","description":"操作系统主题 light|dark"},"vendor":{"bsonType":"string","description":"设备厂商"},"push_clientid":{"bsonType":"string","description":"推送设备客户端标识"},"device_id":{"bsonType":"string","description":"设备id"},"imei":{"bsonType":"string","description":"国际移动设备识别码IMEI(International Mobile Equipment Identity)"},"oaid":{"bsonType":"string","description":"移动智能设备标识公共服务平台提供的匿名设备标识符(OAID)"},"idfa":{"bsonType":"string","description":"iOS平台配置应用使用广告标识(IDFA)"},"model":{"bsonType":"string","description":"设备型号"},"platform":{"bsonType":"string","description":"平台类型"},"create_date":{"bsonType":"timestamp","description":"创建时间","forceDefaultValue":{"$env":"now"}},"last_active_date":{"bsonType":"timestamp","description":"最后登录时间"},"last_active_ip":{"bsonType":"string","description":"最后登录IP"}},"version":"0.0.1"}

uniCloud-aliyun/database/uni-push-message.schema.json

@@ -0,0 +1 @@
+{"bsonType":"object","required":[],"permission":{"read":true,"create":false,"update":"doc.user_id == auth.uid","delete":false},"properties":{"_id":{"description":"ID，系统自动生成"},"is_read":{"bsonType":"bool","defaultValue":false},"payload":{"state":[]}},"version":"0.0.1"}

uni_modules/uni-config-center/changelog.md

@@ -0,0 +1,6 @@
+## 0.0.3（2022-11-11）
+- 修复 config 方法获取根节点为数组格式配置时错误的转化为了对象的Bug
+## 0.0.2（2021-04-16）
+- 修改插件package信息
+## 0.0.1（2021-03-15）
+- 初始化项目

uni_modules/uni-config-center/package.json

@@ -0,0 +1,81 @@
+{
+  "id": "uni-config-center",
+  "displayName": "uni-config-center",
+  "version": "0.0.3",
+  "description": "uniCloud 配置中心",
+  "keywords": [
+    "配置",
+    "配置中心"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "",
+    "type": "unicloud-template-function"
+  },
+  "directories": {
+    "example": "../../../scripts/dist"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "u",
+          "Android Browser": "u",
+          "微信浏览器(Android)": "u",
+          "QQ浏览器(Android)": "u"
+        },
+        "H5-pc": {
+          "Chrome": "u",
+          "IE": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "u"
+        },
+        "小程序": {
+          "微信": "u",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "u"
+        }
+      }
+    }
+  }
+}

uni_modules/uni-config-center/readme.md

@@ -0,0 +1,93 @@
+# 为什么使用uni-config-center
+
+实际开发中很多插件需要配置文件才可以正常运行，如果每个插件都单独进行配置的话就会产生下面这样的目录结构
+
+```bash
+cloudfunctions
+└─────common 公共模块
+        ├─plugin-a // 插件A对应的目录
+        │  ├─index.js
+        │  ├─config.json // plugin-a对应的配置文件
+        │  └─other-file.cert  // plugin-a依赖的其他文件
+        └─plugin-b // plugin-b对应的目录
+           ├─index.js
+           └─config.json // plugin-b对应的配置文件
+```
+
+假设插件作者要发布一个项目模板，里面使用了很多需要配置的插件，无论是作者发布还是用户使用都是一个大麻烦。
+
+uni-config-center就是用了统一管理这些配置文件的，使用uni-config-center后的目录结构如下
+
+```bash
+cloudfunctions
+└─────common 公共模块
+        ├─plugin-a // 插件A对应的目录
+        │  └─index.js
+        ├─plugin-b // plugin-b对应的目录
+        │  └─index.js
+        └─uni-config-center
+           ├─index.js // config-center入口文件
+           ├─plugin-a
+           │  ├─config.json  // plugin-a对应的配置文件
+           │  └─other-file.cert  // plugin-a依赖的其他文件
+           └─plugin-b
+              └─config.json  // plugin-b对应的配置文件
+```
+
+使用uni-config-center后的优势
+
+- 配置文件统一管理，分离插件主体和配置信息，更新插件更方便
+- 支持对config.json设置schema，插件使用者在HBuilderX内编写config.json文件时会有更好的提示（后续HBuilderX会提供支持）
+
+# 用法
+
+在要使用uni-config-center的公共模块或云函数内引入uni-config-center依赖，请参考：[使用公共模块](https://uniapp.dcloud.net.cn/uniCloud/cf-common)
+
+```js
+const createConfig = require('uni-config-center')
+
+const uniIdConfig = createConfig({
+    pluginId: 'uni-id', // 插件id
+    defaultConfig: { // 默认配置
+        tokenExpiresIn: 7200,
+        tokenExpiresThreshold: 600,
+    },
+    customMerge: function(defaultConfig, userConfig) { // 自定义默认配置和用户配置的合并规则，不设置的情况侠会对默认配置和用户配置进行深度合并
+        // defaudltConfig 默认配置
+        // userConfig 用户配置
+        return Object.assign(defaultConfig, userConfig)
+    }
+})
+
+
+// 以如下配置为例
+// {
+//   "tokenExpiresIn": 7200,
+//   "passwordErrorLimit": 6,
+//   "bindTokenToDevice": false,
+//   "passwordErrorRetryTime": 3600,
+//   "app-plus": {
+//     "tokenExpiresIn": 2592000
+//   },
+//   "service": {
+//     "sms": {
+//       "codeExpiresIn": 300
+//     }
+//   }
+// }
+
+// 获取配置
+uniIdConfig.config() // 获取全部配置，注意：uni-config-center内不存在对应插件目录时会返回空对象
+uniIdConfig.config('tokenExpiresIn') // 指定键值获取配置，返回：7200
+uniIdConfig.config('service.sms.codeExpiresIn') // 指定键值获取配置，返回：300
+uniIdConfig.config('tokenExpiresThreshold', 600) // 指定键值获取配置，如果不存在则取传入的默认值，返回：600
+
+// 获取文件绝对路径
+uniIdConfig.resolve('custom-token.js') // 获取uni-config-center/uni-id/custom-token.js文件的路径
+
+// 引用文件（require）
+uniIDConfig.requireFile('custom-token.js') // 使用require方式引用uni-config-center/uni-id/custom-token.js文件。文件不存在时返回undefined，文件内有其他错误导致require失败时会抛出错误。
+
+// 判断是否包含某文件
+uniIDConfig.hasFile('custom-token.js') // 配置目录是否包含某文件，true: 文件存在，false: 文件不存在
+```

uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/package.json

@@ -0,0 +1,13 @@
+{
+    "name": "uni-config-center",
+    "version": "0.0.3",
+    "description": "配置中心",
+    "main": "index.js",
+    "keywords": [],
+    "author": "DCloud",
+    "license": "Apache-2.0",
+    "origin-plugin-dev-name": "uni-config-center",
+    "origin-plugin-version": "0.0.3",
+    "plugin-dev-name": "uni-config-center",
+    "plugin-version": "0.0.3"
+}

uni_modules/uni-datetime-picker/changelog.md

@@ -0,0 +1,173 @@
+## 2.2.42（2025-08-20）
+- 修复 datetime-picker 小程序样式警告
+## 2.2.41（2025-08-20）
+- 修复 uni-datetime-picker组件时间对比报错问题
+## 2.2.40（2025-04-14）
+- 修复 绑定字符串值的时，日历面板选中状态未重置到默认值的问题
+## 2.2.39（2025-04-14）
+- 修复 在 iOS 微信小程序上type='daterange'时，传入'YYYY-MM-DD'格式不生效的问题
+
+## 2.2.38（2024-10-15）
+- 修复 微信小程序中的getSystemInfo警告
+## 2.2.35（2024-09-21）
+- 修复 没有选中日期时点击确定直接报错的Bug [详情](https://ask.dcloud.net.cn/question/198168)
+## 2.2.34（2024-04-24）
+- 新增 日期点击事件，在点击日期时会触发该事件。
+## 2.2.33（2024-04-15）
+- 修复 抖音小程序事件传递失效bug
+## 2.2.32（2024-02-20）
+- 修复 日历的close事件触发异常的bug [详情](https://github.com/dcloudio/uni-ui/issues/844)
+## 2.2.31（2024-02-20）
+- 修复 h5平台 右边日历的月份默认+1的bug [详情](https://github.com/dcloudio/uni-ui/issues/841)
+## 2.2.30（2024-01-31）
+- 修复 隐藏“秒”时，在IOS15及以下版本时出现 结束时间在开始时间之前 的bug [详情](https://github.com/dcloudio/uni-ui/issues/788)
+## 2.2.29（2024-01-20）
+- 新增 show事件，弹窗弹出时触发该事件 [详情](https://github.com/dcloudio/uni-app/issues/4694)
+## 2.2.28（2024-01-18）
+- 去除 noChange事件，当进行日期范围选择时，若只选了一天，则开始结束日期都为同一天 [详情](https://github.com/dcloudio/uni-ui/issues/815)
+## 2.2.27（2024-01-10）
+- 优化 增加noChange事件，当进行日期范围选择时，若有空值，则触发该事件 [详情](https://github.com/dcloudio/uni-ui/issues/815)
+## 2.2.26（2024-01-08）
+- 修复 字节小程序时间选择范围器失效问题 [详情](https://github.com/dcloudio/uni-ui/issues/834)
+## 2.2.25（2023-10-18）
+- 修复 PC端初次修改时间，开始时间未更新的Bug [详情](https://github.com/dcloudio/uni-ui/issues/737)
+## 2.2.24（2023-06-02）
+- 修复 部分情况修改时间，开始、结束时间显示异常的Bug [详情](https://ask.dcloud.net.cn/question/171146)
+- 优化 当前月可以选择上月、下月的日期的Bug
+## 2.2.23（2023-05-02）
+- 修复 部分情况修改时间，开始时间未更新的Bug [详情](https://github.com/dcloudio/uni-ui/issues/737)
+- 修复 部分平台及设备第一次点击无法显示弹框的Bug
+- 修复 ios 日期格式未补零显示及使用异常的Bug [详情](https://ask.dcloud.net.cn/question/162979)
+## 2.2.22（2023-03-30）
+- 修复 日历 picker 修改年月后，自动选中当月1日的Bug [详情](https://ask.dcloud.net.cn/question/165937)
+- 修复 小程序端 低版本 ios NaN的Bug [详情](https://ask.dcloud.net.cn/question/162979)
+## 2.2.21（2023-02-20）
+- 修复 firefox 浏览器显示区域点击无法拉起日历弹框的Bug [详情](https://ask.dcloud.net.cn/question/163362)
+## 2.2.20（2023-02-17）
+- 优化 值为空依然选中当天问题
+- 优化 提供 default-value 属性支持配置选择器打开时默认显示的时间
+- 优化 非范围选择未选择日期时间，点击确认按钮选中当前日期时间
+- 优化 字节小程序日期时间范围选择，底部日期换行的Bug
+## 2.2.19（2023-02-09）
+- 修复 2.2.18 引起范围选择配置 end 选择无效的Bug [详情](https://github.com/dcloudio/uni-ui/issues/686)
+## 2.2.18（2023-02-08）
+- 修复 移动端范围选择change事件触发异常的Bug [详情](https://github.com/dcloudio/uni-ui/issues/684)
+- 优化 PC端输入日期格式错误时返回当前日期时间
+- 优化 PC端输入日期时间超出 start、end 限制的Bug
+- 优化 移动端日期时间范围用法时间展示不完整问题
+## 2.2.17（2023-02-04）
+- 修复 小程序端绑定 Date 类型报错的Bug [详情](https://github.com/dcloudio/uni-ui/issues/679)
+- 修复 vue3 time-picker 无法显示绑定时分秒的Bug
+## 2.2.16（2023-02-02）
+- 修复 字节小程序报错的Bug
+## 2.2.15（2023-02-02）
+- 修复 某些情况切换月份错误的Bug
+## 2.2.14（2023-01-30）
+- 修复 某些情况切换月份错误的Bug [详情](https://ask.dcloud.net.cn/question/162033)
+## 2.2.13（2023-01-10）
+- 修复 多次加载组件造成内存占用的Bug
+## 2.2.12（2022-12-01）
+- 修复 vue3 下 i18n 国际化初始值不正确的Bug
+## 2.2.11（2022-09-19）
+- 修复 支付宝小程序样式错乱的Bug [详情](https://github.com/dcloudio/uni-app/issues/3861)
+## 2.2.10（2022-09-19）
+- 修复 反向选择日期范围，日期显示异常的Bug [详情](https://ask.dcloud.net.cn/question/153401?item_id=212892&rf=false)
+## 2.2.9（2022-09-16）
+- 可以使用 uni-scss 控制主题色
+## 2.2.8（2022-09-08）
+- 修复 close事件无效的Bug
+## 2.2.7（2022-09-05）
+- 修复 移动端 maskClick 无效的Bug [详情](https://ask.dcloud.net.cn/question/140824)
+## 2.2.6（2022-06-30）
+- 优化 组件样式，调整了组件图标大小、高度、颜色等，与uni-ui风格保持一致
+## 2.2.5（2022-06-24）
+- 修复 日历顶部年月及底部确认未国际化的Bug
+## 2.2.4（2022-03-31）
+- 修复 Vue3 下动态赋值,单选类型未响应的Bug
+## 2.2.3（2022-03-28）
+- 修复 Vue3 下动态赋值未响应的Bug
+## 2.2.2（2021-12-10）
+- 修复 clear-icon 属性在小程序平台不生效的Bug
+## 2.2.1（2021-12-10）
+- 修复 日期范围选在小程序平台，必须多点击一次才能取消选中状态的Bug
+## 2.2.0（2021-11-19）
+- 优化 组件UI，并提供设计资源 [详情](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移 [https://uniapp.dcloud.io/component/uniui/uni-datetime-picker](https://uniapp.dcloud.io/component/uniui/uni-datetime-picker)
+## 2.1.5（2021-11-09）
+- 新增 提供组件设计资源，组件样式调整
+## 2.1.4（2021-09-10）
+- 修复 hide-second 在移动端的Bug
+- 修复 单选赋默认值时，赋值日期未高亮的Bug
+- 修复 赋默认值时，移动端未正确显示时间的Bug
+## 2.1.3（2021-09-09）
+- 新增 hide-second 属性，支持只使用时分，隐藏秒
+## 2.1.2（2021-09-03）
+- 优化 取消选中时（范围选）直接开始下一次选择, 避免多点一次
+- 优化 移动端支持清除按钮，同时支持通过 ref 调用组件的 clear 方法
+- 优化 调整字号大小，美化日历界面
+- 修复 因国际化导致的 placeholder 失效的Bug
+## 2.1.1（2021-08-24）
+- 新增 支持国际化
+- 优化 范围选择器在 pc 端过宽的问题
+## 2.1.0（2021-08-09）
+- 新增 适配 vue3
+## 2.0.19（2021-08-09）
+- 新增 支持作为 uni-forms 子组件相关功能
+- 修复 在 uni-forms 中使用时，选择时间报 NAN 错误的Bug
+## 2.0.18（2021-08-05）
+- 修复 type 属性动态赋值无效的Bug
+- 修复 ‘确认’按钮被 tabbar 遮盖 bug
+- 修复 组件未赋值时范围选左、右日历相同的Bug
+## 2.0.17（2021-08-04）
+- 修复 范围选未正确显示当前值的Bug
+- 修复 h5 平台（移动端）报错 'cale' of undefined 的Bug
+## 2.0.16（2021-07-21）
+- 新增 return-type 属性支持返回 date 日期对象
+## 2.0.15（2021-07-14）
+- 修复 单选日期类型，初始赋值后不在当前日历的Bug
+- 新增 clearIcon 属性，显示框的清空按钮可配置显示隐藏（仅 pc 有效）
+- 优化 移动端移除显示框的清空按钮，无实际用途
+## 2.0.14（2021-07-14）
+- 修复 组件赋值为空，界面未更新的Bug
+- 修复 start 和 end 不能动态赋值的Bug
+- 修复 范围选类型，用户选择后再次选择右侧日历（结束日期）显示不正确的Bug
+## 2.0.13（2021-07-08）
+- 修复 范围选择不能动态赋值的Bug
+## 2.0.12（2021-07-08）
+- 修复 范围选择的初始时间在一个月内时，造成无法选择的bug
+## 2.0.11（2021-07-08）
+- 优化 弹出层在超出视窗边缘定位不准确的问题
+## 2.0.10（2021-07-08）
+- 修复 范围起始点样式的背景色与今日样式的字体前景色融合，导致日期字体看不清的Bug
+- 优化 弹出层在超出视窗边缘被遮盖的问题
+## 2.0.9（2021-07-07）
+- 新增 maskClick 事件
+- 修复 特殊情况日历 rpx 布局错误的Bug，rpx -> px
+- 修复 范围选择时清空返回值不合理的bug，['', ''] -> []
+## 2.0.8（2021-07-07）
+- 新增 日期时间显示框支持插槽
+## 2.0.7（2021-07-01）
+- 优化 添加 uni-icons 依赖
+## 2.0.6（2021-05-22）
+- 修复 图标在小程序上不显示的Bug
+- 优化 重命名引用组件，避免潜在组件命名冲突
+## 2.0.5（2021-05-20）
+- 优化 代码目录扁平化
+## 2.0.4（2021-05-12）
+- 新增 组件示例地址
+## 2.0.3（2021-05-10）
+- 修复 ios 下不识别 '-' 日期格式的Bug
+- 优化 pc 下弹出层添加边框和阴影
+## 2.0.2（2021-05-08）
+- 修复 在 admin 中获取弹出层定位错误的bug
+## 2.0.1（2021-05-08）
+- 修复 type 属性向下兼容，默认值从 date 变更为 datetime
+## 2.0.0（2021-04-30）
+- 支持日历形式的日期+时间的范围选择
+ > 注意：此版本不向后兼容，不再支持单独时间选择（type=time）及相关的 hide-second 属性（时间选可使用内置组件 picker）
+## 1.0.6（2021-03-18）
+- 新增 hide-second 属性，时间支持仅选择时、分
+- 修复 选择跟显示的日期不一样的Bug
+- 修复 chang事件触发2次的Bug
+- 修复 分、秒 end 范围错误的Bug
+- 优化 更好的 nvue 适配

uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue

@@ -0,0 +1,177 @@
+<template>
+	<view class="uni-calendar-item__weeks-box" :class="{
+		'uni-calendar-item--disable':weeks.disable,
+		'uni-calendar-item--before-checked-x':weeks.beforeMultiple,
+		'uni-calendar-item--multiple': weeks.multiple,
+		'uni-calendar-item--after-checked-x':weeks.afterMultiple,
+		}" @click="choiceDate(weeks)" @mouseenter="handleMousemove(weeks)">
+		<view class="uni-calendar-item__weeks-box-item" :class="{
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && (calendar.userChecked || !checkHover),
+				'uni-calendar-item--checked-range-text': checkHover,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">
+			<text v-if="selected && weeks.extraInfo" class="uni-calendar-item__weeks-box-circle"></text>
+			<text class="uni-calendar-item__weeks-box-text uni-calendar-item__weeks-box-text-disable uni-calendar-item--checked-text">{{weeks.date}}</text>
+		</view>
+		<view :class="{'uni-calendar-item--today': weeks.isToday}"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			weeks: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			calendar: {
+				type: Object,
+				default: () => {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			checkHover: {
+				type: Boolean,
+				default: false
+			}
+		},
+		methods: {
+			choiceDate(weeks) {
+				this.$emit('change', weeks)
+			},
+			handleMousemove(weeks) {
+				this.$emit('handleMouse', weeks)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	$uni-primary: #007aff !default;
+
+	.uni-calendar-item__weeks-box {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		margin: 1px 0;
+		position: relative;
+	}
+
+	.uni-calendar-item__weeks-box-text {
+		font-size: 14px;
+		// font-family: Lato-Bold, Lato;
+		font-weight: bold;
+		color: darken($color: $uni-primary, $amount: 40%);
+	}
+
+	.uni-calendar-item__weeks-box-item {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		width: 40px;
+		height: 40px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+
+	.uni-calendar-item__weeks-box-circle {
+		position: absolute;
+		top: 5px;
+		right: 5px;
+		width: 8px;
+		height: 8px;
+		border-radius: 8px;
+		background-color: #dd524d;
+
+	}
+
+	.uni-calendar-item__weeks-box .uni-calendar-item--disable {
+		cursor: default;
+	}
+
+	.uni-calendar-item--disable .uni-calendar-item__weeks-box-text-disable {
+		color: #D1D1D1;
+	}
+
+	.uni-calendar-item--today {
+		position: absolute;
+		top: 10px;
+		right: 17%;
+		background-color: #dd524d;
+		width:6px;
+		height: 6px;
+		border-radius: 50%;
+	}
+
+	.uni-calendar-item--extra {
+		color: #dd524d;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item__weeks-box .uni-calendar-item--checked {
+		background-color: $uni-primary;
+		border-radius: 50%;
+		box-sizing: border-box;
+		border: 3px solid #fff;
+	}
+
+	.uni-calendar-item--checked .uni-calendar-item--checked-text {
+		color: #fff;
+	}
+
+	.uni-calendar-item--multiple .uni-calendar-item--checked-range-text {
+		color: #333;
+	}
+
+	.uni-calendar-item--multiple {
+		background-color:  #F6F7FC;
+		// color: #fff;
+	}
+
+	.uni-calendar-item--multiple .uni-calendar-item--before-checked,
+	.uni-calendar-item--multiple .uni-calendar-item--after-checked {
+		background-color: $uni-primary;
+		border-radius: 50%;
+		box-sizing: border-box;
+		border: 3px solid #F6F7FC;
+	}
+
+	.uni-calendar-item--before-checked .uni-calendar-item--checked-text,
+	.uni-calendar-item--after-checked .uni-calendar-item--checked-text {
+		color: #fff;
+	}
+
+	.uni-calendar-item--before-checked-x {
+		border-top-left-radius: 50px;
+		border-bottom-left-radius: 50px;
+		box-sizing: border-box;
+		background-color: #F6F7FC;
+	}
+
+	.uni-calendar-item--after-checked-x {
+		border-top-right-radius: 50px;
+		border-bottom-right-radius: 50px;
+		background-color: #F6F7FC;
+	}
+</style>

uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue

@@ -0,0 +1,948 @@
+<template>
+	<view class="uni-calendar" @mouseleave="leaveCale">
+
+		<view v-if="!insert && show" class="uni-calendar__mask" :class="{'uni-calendar--mask-show':aniMaskShow}"
+			@click="maskClick"></view>
+
+		<view v-if="insert || show" class="uni-calendar__content"
+			:class="{'uni-calendar--fixed':!insert,'uni-calendar--ani-show':aniMaskShow, 'uni-calendar__content-mobile': aniMaskShow}">
+			<view class="uni-calendar__header" :class="{'uni-calendar__header-mobile' :!insert}">
+
+				<view class="uni-calendar__header-btn-box" @click.stop="changeMonth('pre')">
+					<view class="uni-calendar__header-btn uni-calendar--left"></view>
+				</view>
+
+				<picker mode="date" :value="date" fields="month" @change="bindDateChange">
+					<text
+						class="uni-calendar__header-text">{{ (nowDate.year||'') + yearText + ( nowDate.month||'') + monthText}}</text>
+				</picker>
+
+				<view class="uni-calendar__header-btn-box" @click.stop="changeMonth('next')">
+					<view class="uni-calendar__header-btn uni-calendar--right"></view>
+				</view>
+
+				<view v-if="!insert" class="dialog-close" @click="maskClick">
+					<view class="dialog-close-plus" data-id="close"></view>
+					<view class="dialog-close-plus dialog-close-rotate" data-id="close"></view>
+				</view>
+			</view>
+			<view class="uni-calendar__box">
+
+				<view v-if="showMonth" class="uni-calendar__box-bg">
+					<text class="uni-calendar__box-bg-text">{{nowDate.month}}</text>
+				</view>
+
+				<view class="uni-calendar__weeks" style="padding-bottom: 7px;">
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SUNText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{MONText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{TUEText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{WEDText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{THUText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{FRIText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SATText}}</text>
+					</view>
+				</view>
+
+				<view class="uni-calendar__weeks" v-for="(item,weekIndex) in weeks" :key="weekIndex">
+					<view class="uni-calendar__weeks-item" v-for="(weeks,weeksIndex) in item" :key="weeksIndex">
+						<calendar-item class="uni-calendar-item--hook" :weeks="weeks" :calendar="calendar" :selected="selected"
+							:checkHover="range" @change="choiceDate" @handleMouse="handleMouse">
+						</calendar-item>
+					</view>
+				</view>
+			</view>
+
+			<view v-if="!insert && !range && hasTime" class="uni-date-changed uni-calendar--fixed-top"
+				style="padding: 0 80px;">
+				<view class="uni-date-changed--time-date">{{tempSingleDate ? tempSingleDate : selectDateText}}</view>
+				<time-picker type="time" :start="timepickerStartTime" :end="timepickerEndTime" v-model="time"
+					:disabled="!tempSingleDate" :border="false" :hide-second="hideSecond" class="time-picker-style">
+				</time-picker>
+			</view>
+
+			<view v-if="!insert && range && hasTime" class="uni-date-changed uni-calendar--fixed-top">
+				<view class="uni-date-changed--time-start">
+					<view class="uni-date-changed--time-date">{{tempRange.before ? tempRange.before : startDateText}}
+					</view>
+					<time-picker type="time" :start="timepickerStartTime" v-model="timeRange.startTime" :border="false"
+						:hide-second="hideSecond" :disabled="!tempRange.before" class="time-picker-style">
+					</time-picker>
+				</view>
+				<view style="line-height: 50px;">
+					<uni-icons type="arrowthinright" color="#999"></uni-icons>
+				</view>
+				<view class="uni-date-changed--time-end">
+					<view class="uni-date-changed--time-date">{{tempRange.after ? tempRange.after : endDateText}}</view>
+					<time-picker type="time" :end="timepickerEndTime" v-model="timeRange.endTime" :border="false"
+						:hide-second="hideSecond" :disabled="!tempRange.after" class="time-picker-style">
+					</time-picker>
+				</view>
+			</view>
+
+			<view v-if="!insert" class="uni-date-changed uni-date-btn--ok">
+				<view class="uni-datetime-picker--btn" @click="confirm">{{confirmText}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		Calendar,
+		getDate,
+		getTime
+	} from './util.js';
+	import calendarItem from './calendar-item.vue'
+	import timePicker from './time-picker.vue'
+
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import i18nMessages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(i18nMessages)
+
+	/**
+	 * Calendar 日历
+	 * @description 日历组件可以查看日期，选择任意范围内的日期，打点操作。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=56
+	 * @property {String} date 自定义当前时间，默认为今天
+	 * @property {String} startDate 日期选择范围-开始日期
+	 * @property {String} endDate 日期选择范围-结束日期
+	 * @property {Boolean} range 范围选择
+	 * @property {Boolean} insert = [true|false] 插入模式,默认为false
+	 * 	@value true 弹窗模式
+	 * 	@value false 插入模式
+	 * @property {Boolean} clearDate = [true|false] 弹窗模式是否清空上次选择内容
+	 * @property {Array} selected 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]
+	 * @property {Boolean} showMonth 是否选择月份为背景
+	 * @property {[String} defaultValue 选择器打开时默认显示的时间
+	 * @event {Function} change 日期改变，`insert :ture` 时生效
+	 * @event {Function} confirm 确认选择`insert :false` 时生效
+	 * @event {Function} monthSwitch 切换月份时触发
+	 * @example <uni-calendar :insert="true" :start-date="'2019-3-2'":end-date="'2019-5-20'"@change="change" />
+	 */
+	export default {
+		components: {
+			calendarItem,
+			timePicker
+		},
+
+		options: {
+			// #ifdef MP-TOUTIAO
+			virtualHost: false,
+			// #endif
+			// #ifndef MP-TOUTIAO
+			virtualHost: true
+			// #endif
+		},
+		props: {
+			date: {
+				type: String,
+				default: ''
+			},
+			defTime: {
+				type: [String, Object],
+				default: ''
+			},
+			selectableTimes: {
+				type: [Object],
+				default () {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			startDate: {
+				type: String,
+				default: ''
+			},
+			endDate: {
+				type: String,
+				default: ''
+			},
+			startPlaceholder: {
+				type: String,
+				default: ''
+			},
+			endPlaceholder: {
+				type: String,
+				default: ''
+			},
+			range: {
+				type: Boolean,
+				default: false
+			},
+			hasTime: {
+				type: Boolean,
+				default: false
+			},
+			insert: {
+				type: Boolean,
+				default: true
+			},
+			showMonth: {
+				type: Boolean,
+				default: true
+			},
+			clearDate: {
+				type: Boolean,
+				default: true
+			},
+			checkHover: {
+				type: Boolean,
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean],
+				default: false
+			},
+			pleStatus: {
+				type: Object,
+				default () {
+					return {
+						before: '',
+						after: '',
+						data: [],
+						fulldate: ''
+					}
+				}
+			},
+			defaultValue: {
+				type: [String, Object, Array],
+				default: ''
+			}
+		},
+		data() {
+			return {
+				show: false,
+				weeks: [],
+				calendar: {},
+				nowDate: {},
+				aniMaskShow: false,
+				firstEnter: true,
+				time: '',
+				timeRange: {
+					startTime: '',
+					endTime: ''
+				},
+				tempSingleDate: '',
+				tempRange: {
+					before: '',
+					after: ''
+				}
+			}
+		},
+		watch: {
+			date: {
+				immediate: true,
+				handler(newVal) {
+					if (!this.range) {
+						this.tempSingleDate = newVal
+						setTimeout(() => {
+							this.init(newVal)
+						}, 100)
+					}
+				}
+			},
+			defTime: {
+				immediate: true,
+				handler(newVal) {
+					if (!this.range) {
+						this.time = newVal
+					} else {
+						this.timeRange.startTime = newVal.start
+						this.timeRange.endTime = newVal.end
+					}
+				}
+			},
+			startDate(val) {
+				// 字节小程序 watch 早于 created
+				if (!this.cale) {
+					return
+				}
+				this.cale.setStartDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			endDate(val) {
+				// 字节小程序 watch 早于 created
+				if (!this.cale) {
+					return
+				}
+				this.cale.setEndDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			selected(newVal) {
+				// 字节小程序 watch 早于 created
+				if (!this.cale) {
+					return
+				}
+				this.cale.setSelectInfo(this.nowDate.fullDate, newVal)
+				this.weeks = this.cale.weeks
+			},
+			pleStatus: {
+				immediate: true,
+				handler(newVal) {
+					const {
+						before,
+						after,
+						fulldate,
+						which
+					} = newVal
+					this.tempRange.before = before
+					this.tempRange.after = after
+					setTimeout(() => {
+						if (fulldate) {
+							this.cale.setHoverMultiple(fulldate)
+							if (before && after) {
+								this.cale.lastHover = true
+								if (this.rangeWithinMonth(after, before)) return
+								this.setDate(before)
+							} else {
+								this.cale.setMultiple(fulldate)
+								this.setDate(this.nowDate.fullDate)
+								this.calendar.fullDate = ''
+								this.cale.lastHover = false
+							}
+						} else {
+							// 字节小程序 watch 早于 created
+							if (!this.cale) {
+								return
+							}
+
+							this.cale.setDefaultMultiple(before, after)
+							if (which === 'left' && before) {
+								this.setDate(before)
+								this.weeks = this.cale.weeks
+							} else if (after) {
+								this.setDate(after)
+								this.weeks = this.cale.weeks
+							}
+							this.cale.lastHover = true
+						}
+					}, 16)
+				}
+			}
+		},
+		computed: {
+			timepickerStartTime() {
+				const activeDate = this.range ? this.tempRange.before : this.calendar.fullDate
+				return activeDate === this.startDate ? this.selectableTimes.start : ''
+			},
+			timepickerEndTime() {
+				const activeDate = this.range ? this.tempRange.after : this.calendar.fullDate
+				return activeDate === this.endDate ? this.selectableTimes.end : ''
+			},
+			/**
+			 * for i18n
+			 */
+			selectDateText() {
+				return t("uni-datetime-picker.selectDate")
+			},
+			startDateText() {
+				return this.startPlaceholder || t("uni-datetime-picker.startDate")
+			},
+			endDateText() {
+				return this.endPlaceholder || t("uni-datetime-picker.endDate")
+			},
+			okText() {
+				return t("uni-datetime-picker.ok")
+			},
+			yearText() {
+				return t("uni-datetime-picker.year")
+			},
+			monthText() {
+				return t("uni-datetime-picker.month")
+			},
+			MONText() {
+				return t("uni-calender.MON")
+			},
+			TUEText() {
+				return t("uni-calender.TUE")
+			},
+			WEDText() {
+				return t("uni-calender.WED")
+			},
+			THUText() {
+				return t("uni-calender.THU")
+			},
+			FRIText() {
+				return t("uni-calender.FRI")
+			},
+			SATText() {
+				return t("uni-calender.SAT")
+			},
+			SUNText() {
+				return t("uni-calender.SUN")
+			},
+			confirmText() {
+				return t("uni-calender.confirm")
+			},
+		},
+		created() {
+			// 获取日历方法实例
+			this.cale = new Calendar({
+				selected: this.selected,
+				startDate: this.startDate,
+				endDate: this.endDate,
+				range: this.range,
+			})
+			// 选中某一天
+			this.init(this.date)
+		},
+		methods: {
+			leaveCale() {
+				this.firstEnter = true
+			},
+			handleMouse(weeks) {
+				if (weeks.disable) return
+				if (this.cale.lastHover) return
+				let {
+					before,
+					after
+				} = this.cale.multipleStatus
+				if (!before) return
+				this.calendar = weeks
+				// 设置范围选
+				this.cale.setHoverMultiple(this.calendar.fullDate)
+				this.weeks = this.cale.weeks
+				// hover时，进入一个日历，更新另一个
+				if (this.firstEnter) {
+					this.$emit('firstEnterCale', this.cale.multipleStatus)
+					this.firstEnter = false
+				}
+			},
+			rangeWithinMonth(A, B) {
+				const [yearA, monthA] = A.split('-')
+				const [yearB, monthB] = B.split('-')
+				return yearA === yearB && monthA === monthB
+			},
+			// 蒙版点击事件
+			maskClick() {
+				this.close()
+				this.$emit('maskClose')
+			},
+
+			clearCalender() {
+				if (this.range) {
+					this.timeRange.startTime = ''
+					this.timeRange.endTime = ''
+					this.tempRange.before = ''
+					this.tempRange.after = ''
+					this.cale.multipleStatus.before = ''
+					this.cale.multipleStatus.after = ''
+					this.cale.multipleStatus.data = []
+					this.cale.lastHover = false
+				} else {
+					this.time = ''
+					this.tempSingleDate = ''
+				}
+				this.calendar.fullDate = ''
+				this.setDate(new Date())
+			},
+
+			bindDateChange(e) {
+				const value = e.detail.value + '-1'
+				this.setDate(value)
+			},
+			/**
+			 * 初始化日期显示
+			 * @param {Object} date
+			 */
+			init(date) {
+				// 字节小程序 watch 早于 created
+				if (!this.cale) {
+					return
+				}
+				this.cale.setDate(date || new Date())
+				this.weeks = this.cale.weeks
+				this.nowDate = this.cale.getInfo(date)
+				this.calendar = {
+					...this.nowDate
+				}
+				if (!date) {
+					// 优化date为空默认不选中今天
+					this.calendar.fullDate = ''
+					if (this.defaultValue && !this.range) {
+						// 暂时只支持移动端非范围选择
+						const defaultDate = new Date(this.defaultValue)
+						const fullDate = getDate(defaultDate)
+						const year = defaultDate.getFullYear()
+						const month = defaultDate.getMonth() + 1
+						const date = defaultDate.getDate()
+						const day = defaultDate.getDay()
+						this.calendar = {
+								fullDate,
+								year,
+								month,
+								date,
+								day
+							},
+							this.tempSingleDate = fullDate
+						this.time = getTime(defaultDate, this.hideSecond)
+					}
+				}
+			},
+			/**
+			 * 打开日历弹窗
+			 */
+			open() {
+				// 弹窗模式并且清理数据
+				if (this.clearDate && !this.insert) {
+					this.cale.cleanMultipleStatus()
+					this.init(this.date)
+				}
+				this.show = true
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.aniMaskShow = true
+					}, 50)
+				})
+			},
+			/**
+			 * 关闭日历弹窗
+			 */
+			close() {
+				this.aniMaskShow = false
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.show = false
+						this.$emit('close')
+					}, 300)
+				})
+			},
+			/**
+			 * 确认按钮
+			 */
+			confirm() {
+				this.setEmit('confirm')
+				this.close()
+			},
+			/**
+			 * 变化触发
+			 */
+			change(isSingleChange) {
+				if (!this.insert && !isSingleChange) return
+				this.setEmit('change')
+			},
+			/**
+			 * 选择月份触发
+			 */
+			monthSwitch() {
+				let {
+					year,
+					month
+				} = this.nowDate
+				this.$emit('monthSwitch', {
+					year,
+					month: Number(month)
+				})
+			},
+			/**
+			 * 派发事件
+			 * @param {Object} name
+			 */
+			setEmit(name) {
+				if (!this.range) {
+					if (!this.calendar.fullDate) {
+						this.calendar = this.cale.getInfo(new Date())
+						this.tempSingleDate = this.calendar.fullDate
+					}
+					if (this.hasTime && !this.time) {
+						this.time = getTime(new Date(), this.hideSecond)
+					}
+				}
+				let {
+					year,
+					month,
+					date,
+					fullDate,
+					extraInfo
+				} = this.calendar
+				this.$emit(name, {
+					range: this.cale.multipleStatus,
+					year,
+					month,
+					date,
+					time: this.time,
+					timeRange: this.timeRange,
+					fulldate: fullDate,
+					extraInfo: extraInfo || {}
+				})
+			},
+			/**
+			 * 选择天触发
+			 * @param {Object} weeks
+			 */
+			choiceDate(weeks) {
+				if (weeks.disable) return
+				this.calendar = weeks
+				this.calendar.userChecked = true
+				// 设置多选
+				this.cale.setMultiple(this.calendar.fullDate, true)
+				this.weeks = this.cale.weeks
+				this.tempSingleDate = this.calendar.fullDate
+				const beforeDate = new Date(this.cale.multipleStatus.before).getTime()
+				const afterDate = new Date(this.cale.multipleStatus.after).getTime()
+				if (beforeDate > afterDate && afterDate) {
+					this.tempRange.before = this.cale.multipleStatus.after
+					this.tempRange.after = this.cale.multipleStatus.before
+				} else {
+					this.tempRange.before = this.cale.multipleStatus.before
+					this.tempRange.after = this.cale.multipleStatus.after
+				}
+				this.change(true)
+			},
+			changeMonth(type) {
+				let newDate
+				if (type === 'pre') {
+					newDate = this.cale.getPreMonthObj(this.nowDate.fullDate).fullDate
+				} else if (type === 'next') {
+					newDate = this.cale.getNextMonthObj(this.nowDate.fullDate).fullDate
+				}
+
+				this.setDate(newDate)
+				this.monthSwitch()
+			},
+			/**
+			 * 设置日期
+			 * @param {Object} date
+			 */
+			setDate(date) {
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.cale.getInfo(date)
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss" >
+	$uni-primary: #007aff !default;
+
+	.uni-calendar {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+	}
+
+	.uni-calendar__mask {
+		position: fixed;
+		bottom: 0;
+		top: 0;
+		left: 0;
+		right: 0;
+		background-color: rgba(0, 0, 0, 0.4);
+		transition-property: opacity;
+		transition-duration: 0.3s;
+		opacity: 0;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--mask-show {
+		opacity: 1
+	}
+
+	.uni-calendar--fixed {
+		position: fixed;
+		bottom: calc(var(--window-bottom));
+		left: 0;
+		right: 0;
+		transition-property: transform;
+		transition-duration: 0.3s;
+		transform: translateY(460px);
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--ani-show {
+		transform: translateY(0);
+	}
+
+	.uni-calendar__content {
+		background-color: #121212;
+	}
+
+	.uni-calendar__content-mobile {
+		border-top-left-radius: 10px;
+		border-top-right-radius: 10px;
+		box-shadow: 0px 0px 5px 3px rgba(0, 0, 0, 0.1);
+	}
+
+	.uni-calendar__header {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 50px;
+	}
+
+	.uni-calendar__header-mobile {
+		padding: 10px;
+		padding-bottom: 0;
+	}
+
+	.uni-calendar--fixed-top {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+		border-top-color: rgba(0, 0, 0, 0.4);
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--fixed-width {
+		width: 50px;
+	}
+
+	.uni-calendar__backtoday {
+		position: absolute;
+		right: 0;
+		top: 25rpx;
+		padding: 0 5px;
+		padding-left: 10px;
+		height: 25px;
+		line-height: 25px;
+		font-size: 12px;
+		border-top-left-radius: 25px;
+		border-bottom-left-radius: 25px;
+		color: #fff;
+		background-color: #f1f1f1;
+	}
+
+	.uni-calendar__header-text {
+		text-align: center;
+		width: 100px;
+		font-size: 15px;
+		color: #666;
+	}
+
+	.uni-calendar__button-text {
+		text-align: center;
+		width: 100px;
+		font-size: 14px;
+		color: $uni-primary;
+		/* #ifndef APP-NVUE */
+		letter-spacing: 3px;
+		/* #endif */
+	}
+
+	.uni-calendar__header-btn-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		width: 50px;
+		height: 50px;
+	}
+
+	.uni-calendar__header-btn {
+		width: 9px;
+		height: 9px;
+		border-left-color: #808080;
+		border-left-style: solid;
+		border-left-width: 1px;
+		border-top-color: #555555;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--left {
+		transform: rotate(-45deg);
+	}
+
+	.uni-calendar--right {
+		transform: rotate(135deg);
+	}
+
+
+	.uni-calendar__weeks {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-calendar__weeks-item {
+		flex: 1;
+	}
+
+	.uni-calendar__weeks-day {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 40px;
+		border-bottom-color: #F5F5F5;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-calendar__weeks-day-text {
+		font-size: 12px;
+		color: #B2B2B2;
+	}
+
+	.uni-calendar__box {
+		position: relative;
+		// padding: 0 10px;
+		padding-bottom: 7px;
+	}
+
+	.uni-calendar__box-bg {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+	}
+
+	.uni-calendar__box-bg-text {
+		font-size: 200px;
+		font-weight: bold;
+		color: #999;
+		opacity: 0.1;
+		text-align: center;
+		/* #ifndef APP-NVUE */
+		line-height: 1;
+		/* #endif */
+	}
+
+	.uni-date-changed {
+		padding: 0 10px;
+		// line-height: 50px;
+		text-align: center;
+		color: #333;
+		border-top-color: #DCDCDC;
+		;
+		border-top-style: solid;
+		border-top-width: 1px;
+		flex: 1;
+	}
+
+	.uni-date-btn--ok {
+		padding: 20px 15px;
+	}
+
+	.uni-date-changed--time-start {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+	}
+
+	.uni-date-changed--time-end {
+		/* #ifndef APP-NVUE */
+    display: flex;
+		/* #endif */
+		align-items: center;
+	}
+
+	.uni-date-changed--time-date {
+    color: #999;
+		line-height: 50px;
+    /* #ifdef MP-TOUTIAO */
+    font-size: 16px;
+    /* #endif */
+		margin-right: 5px;
+		// opacity: 0.6;
+	}
+
+	.time-picker-style {
+		// width: 62px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center
+	}
+
+	.mr-10 {
+		margin-right: 10px;
+	}
+
+	.dialog-close {
+		position: absolute;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		padding: 0 25px;
+		margin-top: 10px;
+	}
+
+	.dialog-close-plus {
+		width: 16px;
+		height: 2px;
+		background-color: #737987;
+		border-radius: 2px;
+		transform: rotate(45deg);
+	}
+
+	.dialog-close-rotate {
+		position: absolute;
+		transform: rotate(-45deg);
+	}
+
+	.uni-datetime-picker--btn {
+		border-radius: 100px;
+		height: 40px;
+		line-height: 40px;
+		background-color: $uni-primary;
+		color: #fff;
+		font-size: 16px;
+		letter-spacing: 2px;
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-datetime-picker--btn:active {
+		opacity: 0.7;
+	}
+	/* #endif */
+</style>
+

uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json

@@ -0,0 +1,22 @@
+{
+	"uni-datetime-picker.selectDate": "select date",
+	"uni-datetime-picker.selectTime": "select time",
+	"uni-datetime-picker.selectDateTime": "select date and time",
+	"uni-datetime-picker.startDate": "start date",
+	"uni-datetime-picker.endDate": "end date",
+	"uni-datetime-picker.startTime": "start time",
+	"uni-datetime-picker.endTime": "end time",
+	"uni-datetime-picker.ok": "ok",
+	"uni-datetime-picker.clear": "clear",
+	"uni-datetime-picker.cancel": "cancel",
+	"uni-datetime-picker.year": "-",
+	"uni-datetime-picker.month": "",
+	"uni-calender.MON": "MON",
+	"uni-calender.TUE": "TUE",
+	"uni-calender.WED": "WED",
+	"uni-calender.THU": "THU",
+	"uni-calender.FRI": "FRI",
+	"uni-calender.SAT": "SAT",
+	"uni-calender.SUN": "SUN",
+	"uni-calender.confirm": "confirm"
+}

uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js

@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}

uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json

@@ -0,0 +1,22 @@
+{
+	"uni-datetime-picker.selectDate": "选择日期",
+	"uni-datetime-picker.selectTime": "选择时间",
+	"uni-datetime-picker.selectDateTime": "选择日期时间",
+	"uni-datetime-picker.startDate": "开始日期",
+	"uni-datetime-picker.endDate": "结束日期",
+	"uni-datetime-picker.startTime": "开始时间",
+	"uni-datetime-picker.endTime": "结束时间",
+	"uni-datetime-picker.ok": "确定",
+	"uni-datetime-picker.clear": "清除",
+	"uni-datetime-picker.cancel": "取消",
+	"uni-datetime-picker.year": "年",
+	"uni-datetime-picker.month": "月",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六",
+	"uni-calender.confirm": "确认"
+}

uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json

@@ -0,0 +1,22 @@
+{
+  "uni-datetime-picker.selectDate": "選擇日期",
+  "uni-datetime-picker.selectTime": "選擇時間",
+  "uni-datetime-picker.selectDateTime": "選擇日期時間",
+  "uni-datetime-picker.startDate": "開始日期",
+  "uni-datetime-picker.endDate": "結束日期",
+  "uni-datetime-picker.startTime": "開始时间",
+  "uni-datetime-picker.endTime": "結束时间",
+  "uni-datetime-picker.ok": "確定",
+  "uni-datetime-picker.clear": "清除",
+  "uni-datetime-picker.cancel": "取消",
+  "uni-datetime-picker.year": "年",
+  "uni-datetime-picker.month": "月",
+  "uni-calender.SUN": "日",
+  "uni-calender.MON": "一",
+  "uni-calender.TUE": "二",
+  "uni-calender.WED": "三",
+  "uni-calender.THU": "四",
+  "uni-calender.FRI": "五",
+  "uni-calender.SAT": "六",
+  "uni-calender.confirm": "確認"
+}

uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue

@@ -0,0 +1,940 @@
+<template>
+	<view class="uni-datetime-picker">
+		<view @click="initTimePicker">
+			<slot>
+				<view class="uni-datetime-picker-timebox-pointer"
+					:class="{'uni-datetime-picker-disabled': disabled, 'uni-datetime-picker-timebox': border}">
+					<text class="uni-datetime-picker-text">{{time}}</text>
+					<view v-if="!time" class="uni-datetime-picker-time">
+						<text class="uni-datetime-picker-text">{{selectTimeText}}</text>
+					</view>
+				</view>
+			</slot>
+		</view>
+		<view v-if="visible" id="mask" class="uni-datetime-picker-mask" @click="tiggerTimePicker"></view>
+		<view v-if="visible" class="uni-datetime-picker-popup" :class="[dateShow && timeShow ? '' : 'fix-nvue-height']"
+			:style="fixNvueBug">
+			<view class="uni-title">
+				<text class="uni-datetime-picker-text">{{selectTimeText}}</text>
+			</view>
+			<view v-if="dateShow" class="uni-datetime-picker__container-box">
+				<picker-view class="uni-datetime-picker-view" :indicator-style="indicatorStyle" :value="ymd"
+					@change="bindDateChange">
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in years" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in months" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in days" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<!-- 兼容 nvue 不支持伪类 -->
+				<text class="uni-datetime-picker-sign sign-left">-</text>
+				<text class="uni-datetime-picker-sign sign-right">-</text>
+			</view>
+			<view v-if="timeShow" class="uni-datetime-picker__container-box">
+				<picker-view class="uni-datetime-picker-view" :class="[hideSecond ? 'time-hide-second' : '']"
+					:indicator-style="indicatorStyle" :value="hms" @change="bindTimeChange">
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in hours" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in minutes" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!hideSecond">
+						<view class="uni-datetime-picker-item" v-for="(item,index) in seconds" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<!-- 兼容 nvue 不支持伪类 -->
+				<text class="uni-datetime-picker-sign" :class="[hideSecond ? 'sign-center' : 'sign-left']">:</text>
+				<text v-if="!hideSecond" class="uni-datetime-picker-sign sign-right">:</text>
+			</view>
+			<view class="uni-datetime-picker-btn">
+				<view @click="clearTime">
+					<text class="uni-datetime-picker-btn-text">{{clearText}}</text>
+				</view>
+				<view class="uni-datetime-picker-btn-group">
+					<view class="uni-datetime-picker-cancel" @click="tiggerTimePicker">
+						<text class="uni-datetime-picker-btn-text">{{cancelText}}</text>
+					</view>
+					<view @click="setTime">
+						<text class="uni-datetime-picker-btn-text">{{okText}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import i18nMessages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(i18nMessages)
+	import {
+		fixIosDateFormat
+	} from './util'
+
+	/**
+	 * DatetimePicker 时间选择器
+	 * @description 可以同时选择日期和时间的选择器
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=xxx
+	 * @property {String} type = [datetime | date | time] 显示模式
+	 * @property {Boolean} multiple = [true|false] 是否多选
+	 * @property {String|Number} value 默认值
+	 * @property {String|Number} start 起始日期或时间
+	 * @property {String|Number} end 起始日期或时间
+	 * @property {String} return-type = [timestamp | string]
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: 'UniDatetimePicker',
+		data() {
+			return {
+				indicatorStyle: `height: 50px;`,
+				visible: false,
+				fixNvueBug: {},
+				dateShow: true,
+				timeShow: true,
+				title: '日期和时间',
+				// 输入框当前时间
+				time: '',
+				// 当前的年月日时分秒
+				year: 1920,
+				month: 0,
+				day: 0,
+				hour: 0,
+				minute: 0,
+				second: 0,
+				// 起始时间
+				startYear: 1920,
+				startMonth: 1,
+				startDay: 1,
+				startHour: 0,
+				startMinute: 0,
+				startSecond: 0,
+				// 结束时间
+				endYear: 2120,
+				endMonth: 12,
+				endDay: 31,
+				endHour: 23,
+				endMinute: 59,
+				endSecond: 59,
+			}
+		},
+		options: {
+			// #ifdef MP-TOUTIAO
+			virtualHost: false,
+			// #endif
+			// #ifndef MP-TOUTIAO
+			virtualHost: true
+			// #endif
+		},
+		props: {
+			type: {
+				type: String,
+				default: 'datetime'
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			start: {
+				type: [Number, String],
+				default: ''
+			},
+			end: {
+				type: [Number, String],
+				default: ''
+			},
+			returnType: {
+				type: String,
+				default: 'string'
+			},
+			disabled: {
+				type: [Boolean, String],
+				default: false
+			},
+			border: {
+				type: [Boolean, String],
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean, String],
+				default: false
+			}
+		},
+		watch: {
+			// #ifndef VUE3
+			value: {
+				handler(newVal) {
+					if (newVal) {
+						this.parseValue(fixIosDateFormat(newVal))
+						this.initTime(false)
+					} else {
+						this.time = ''
+						this.parseValue(Date.now())
+					}
+				},
+				immediate: true
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				handler(newVal) {
+					if (newVal) {
+						this.parseValue(fixIosDateFormat(newVal))
+						this.initTime(false)
+					} else {
+						this.time = ''
+						this.parseValue(Date.now())
+					}
+				},
+				immediate: true
+			},
+			// #endif
+			type: {
+				handler(newValue) {
+					if (newValue === 'date') {
+						this.dateShow = true
+						this.timeShow = false
+						this.title = '日期'
+					} else if (newValue === 'time') {
+						this.dateShow = false
+						this.timeShow = true
+						this.title = '时间'
+					} else {
+						this.dateShow = true
+						this.timeShow = true
+						this.title = '日期和时间'
+					}
+				},
+				immediate: true
+			},
+			start: {
+				handler(newVal) {
+					this.parseDatetimeRange(fixIosDateFormat(newVal), 'start')
+				},
+				immediate: true
+			},
+			end: {
+				handler(newVal) {
+					this.parseDatetimeRange(fixIosDateFormat(newVal), 'end')
+				},
+				immediate: true
+			},
+
+			// 月、日、时、分、秒可选范围变化后，检查当前值是否在范围内，不在则当前值重置为可选范围第一项
+			months(newVal) {
+				this.checkValue('month', this.month, newVal)
+			},
+			days(newVal) {
+				this.checkValue('day', this.day, newVal)
+			},
+			hours(newVal) {
+				this.checkValue('hour', this.hour, newVal)
+			},
+			minutes(newVal) {
+				this.checkValue('minute', this.minute, newVal)
+			},
+			seconds(newVal) {
+				this.checkValue('second', this.second, newVal)
+			}
+		},
+		computed: {
+			// 当前年、月、日、时、分、秒选择范围
+			years() {
+				return this.getCurrentRange('year')
+			},
+
+			months() {
+				return this.getCurrentRange('month')
+			},
+
+			days() {
+				return this.getCurrentRange('day')
+			},
+
+			hours() {
+				return this.getCurrentRange('hour')
+			},
+
+			minutes() {
+				return this.getCurrentRange('minute')
+			},
+
+			seconds() {
+				return this.getCurrentRange('second')
+			},
+
+			// picker 当前值数组
+			ymd() {
+				return [this.year - this.minYear, this.month - this.minMonth, this.day - this.minDay]
+			},
+			hms() {
+				return [this.hour - this.minHour, this.minute - this.minMinute, this.second - this.minSecond]
+			},
+
+			// 当前 date 是 start
+			currentDateIsStart() {
+				return this.year === this.startYear && this.month === this.startMonth && this.day === this.startDay
+			},
+
+			// 当前 date 是 end
+			currentDateIsEnd() {
+				return this.year === this.endYear && this.month === this.endMonth && this.day === this.endDay
+			},
+
+			// 当前年、月、日、时、分、秒的最小值和最大值
+			minYear() {
+				return this.startYear
+			},
+			maxYear() {
+				return this.endYear
+			},
+			minMonth() {
+				if (this.year === this.startYear) {
+					return this.startMonth
+				} else {
+					return 1
+				}
+			},
+			maxMonth() {
+				if (this.year === this.endYear) {
+					return this.endMonth
+				} else {
+					return 12
+				}
+			},
+			minDay() {
+				if (this.year === this.startYear && this.month === this.startMonth) {
+					return this.startDay
+				} else {
+					return 1
+				}
+			},
+			maxDay() {
+				if (this.year === this.endYear && this.month === this.endMonth) {
+					return this.endDay
+				} else {
+					return this.daysInMonth(this.year, this.month)
+				}
+			},
+			minHour() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart) {
+						return this.startHour
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					return this.startHour
+				}
+			},
+			maxHour() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd) {
+						return this.endHour
+					} else {
+						return 23
+					}
+				}
+				if (this.type === 'time') {
+					return this.endHour
+				}
+			},
+			minMinute() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart && this.hour === this.startHour) {
+						return this.startMinute
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.startHour) {
+						return this.startMinute
+					} else {
+						return 0
+					}
+				}
+			},
+			maxMinute() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd && this.hour === this.endHour) {
+						return this.endMinute
+					} else {
+						return 59
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.endHour) {
+						return this.endMinute
+					} else {
+						return 59
+					}
+				}
+			},
+			minSecond() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart && this.hour === this.startHour && this.minute === this.startMinute) {
+						return this.startSecond
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.startHour && this.minute === this.startMinute) {
+						return this.startSecond
+					} else {
+						return 0
+					}
+				}
+			},
+			maxSecond() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd && this.hour === this.endHour && this.minute === this.endMinute) {
+						return this.endSecond
+					} else {
+						return 59
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.endHour && this.minute === this.endMinute) {
+						return this.endSecond
+					} else {
+						return 59
+					}
+				}
+			},
+
+			/**
+			 * for i18n
+			 */
+			selectTimeText() {
+				return t("uni-datetime-picker.selectTime")
+			},
+			okText() {
+				return t("uni-datetime-picker.ok")
+			},
+			clearText() {
+				return t("uni-datetime-picker.clear")
+			},
+			cancelText() {
+				return t("uni-datetime-picker.cancel")
+			}
+		},
+
+		mounted() {
+			// #ifdef APP-NVUE
+			const res = uni.getSystemInfoSync();
+			this.fixNvueBug = {
+				top: res.windowHeight / 2,
+				left: res.windowWidth / 2
+			}
+			// #endif
+		},
+
+		methods: {
+			/**
+			 * @param {Object} item
+			 * 小于 10 在前面加个 0
+			 */
+
+			lessThanTen(item) {
+				return item < 10 ? '0' + item : item
+			},
+
+			/**
+			 * 解析时分秒字符串，例如：00:00:00
+			 * @param {String} timeString
+			 */
+			parseTimeType(timeString) {
+				if (timeString) {
+					let timeArr = timeString.split(':')
+					this.hour = Number(timeArr[0])
+					this.minute = Number(timeArr[1])
+					this.second = Number(timeArr[2])
+				}
+			},
+
+			/**
+			 * 解析选择器初始值，类型可以是字符串、时间戳，例如：2000-10-02、'08:30:00'、 1610695109000
+			 * @param {String | Number} datetime
+			 */
+			initPickerValue(datetime) {
+				let defaultValue = null
+				if (datetime) {
+					defaultValue = this.compareValueWithStartAndEnd(datetime, this.start, this.end)
+				} else {
+					defaultValue = Date.now()
+					defaultValue = this.compareValueWithStartAndEnd(defaultValue, this.start, this.end)
+				}
+				this.parseValue(defaultValue)
+			},
+
+			/**
+			 * 初始值规则：
+			 * - 用户设置初始值 value
+			 * 	- 设置了起始时间 start、终止时间 end，并 start < value < end，初始值为 value， 否则初始值为 start
+			 * 	- 只设置了起始时间 start，并 start < value，初始值为 value，否则初始值为 start
+			 * 	- 只设置了终止时间 end，并 value < end，初始值为 value，否则初始值为 end
+			 * 	- 无起始终止时间，则初始值为 value
+			 * - 无初始值 value，则初始值为当前本地时间 Date.now()
+			 * @param {Object} value
+			 * @param {Object} dateBase
+			 */
+			compareValueWithStartAndEnd(value, start, end) {
+				let winner = null
+				value = this.superTimeStamp(value)
+				start = this.superTimeStamp(start)
+				end = this.superTimeStamp(end)
+
+				if (start && end) {
+					if (value < start) {
+						winner = new Date(start)
+					} else if (value > end) {
+						winner = new Date(end)
+					} else {
+						winner = new Date(value)
+					}
+				} else if (start && !end) {
+					winner = start <= value ? new Date(value) : new Date(start)
+				} else if (!start && end) {
+					winner = value <= end ? new Date(value) : new Date(end)
+				} else {
+					winner = new Date(value)
+				}
+
+				return winner
+			},
+
+			/**
+			 * 转换为可比较的时间戳，接受日期、时分秒、时间戳
+			 * @param {Object} value
+			 */
+			superTimeStamp(value) {
+				let dateBase = ''
+				if (this.type === 'time' && value && typeof value === 'string') {
+					const now = new Date()
+					const year = now.getFullYear()
+					const month = now.getMonth() + 1
+					const day = now.getDate()
+					dateBase = year + '/' + month + '/' + day + ' '
+				}
+				if (Number(value)) {
+					value = parseInt(value)
+					dateBase = 0
+				}
+				return this.createTimeStamp(dateBase + value)
+			},
+
+			/**
+			 * 解析默认值 value，字符串、时间戳
+			 * @param {Object} defaultTime
+			 */
+			parseValue(value) {
+				if (!value) {
+					return
+				}
+				if (this.type === 'time' && typeof value === "string") {
+					this.parseTimeType(value)
+				} else {
+					let defaultDate = null
+					defaultDate = new Date(value)
+					if (this.type !== 'time') {
+						this.year = defaultDate.getFullYear()
+						this.month = defaultDate.getMonth() + 1
+						this.day = defaultDate.getDate()
+					}
+					if (this.type !== 'date') {
+						this.hour = defaultDate.getHours()
+						this.minute = defaultDate.getMinutes()
+						this.second = defaultDate.getSeconds()
+					}
+				}
+				if (this.hideSecond) {
+					this.second = 0
+				}
+			},
+
+			/**
+			 * 解析可选择时间范围 start、end，年月日字符串、时间戳
+			 * @param {Object} defaultTime
+			 */
+			parseDatetimeRange(point, pointType) {
+				// 时间为空，则重置为初始值
+				if (!point) {
+					if (pointType === 'start') {
+						this.startYear = 1920
+						this.startMonth = 1
+						this.startDay = 1
+						this.startHour = 0
+						this.startMinute = 0
+						this.startSecond = 0
+					}
+					if (pointType === 'end') {
+						this.endYear = 2120
+						this.endMonth = 12
+						this.endDay = 31
+						this.endHour = 23
+						this.endMinute = 59
+						this.endSecond = 59
+					}
+					return
+				}
+				if (this.type === 'time') {
+					const pointArr = point.split(':')
+					this[pointType + 'Hour'] = Number(pointArr[0])
+					this[pointType + 'Minute'] = Number(pointArr[1])
+					this[pointType + 'Second'] = Number(pointArr[2])
+				} else {
+					if (!point) {
+						pointType === 'start' ? this.startYear = this.year - 60 : this.endYear = this.year + 60
+						return
+					}
+					if (Number(point)) {
+						point = parseInt(point)
+					}
+					// datetime 的 end 没有时分秒, 则不限制
+					const hasTime = /[0-9]:[0-9]/
+					if (this.type === 'datetime' && pointType === 'end' && typeof point === 'string' && !hasTime.test(
+							point)) {
+						point = point + ' 23:59:59'
+					}
+					const pointDate = new Date(point)
+					this[pointType + 'Year'] = pointDate.getFullYear()
+					this[pointType + 'Month'] = pointDate.getMonth() + 1
+					this[pointType + 'Day'] = pointDate.getDate()
+					if (this.type === 'datetime') {
+						this[pointType + 'Hour'] = pointDate.getHours()
+						this[pointType + 'Minute'] = pointDate.getMinutes()
+						this[pointType + 'Second'] = pointDate.getSeconds()
+					}
+				}
+			},
+
+			// 获取 年、月、日、时、分、秒 当前可选范围
+			getCurrentRange(value) {
+				const range = []
+				for (let i = this['min' + this.capitalize(value)]; i <= this['max' + this.capitalize(value)]; i++) {
+					range.push(i)
+				}
+				return range
+			},
+
+			// 字符串首字母大写
+			capitalize(str) {
+				return str.charAt(0).toUpperCase() + str.slice(1)
+			},
+
+			// 检查当前值是否在范围内，不在则当前值重置为可选范围第一项
+			checkValue(name, value, values) {
+				if (values.indexOf(value) === -1) {
+					this[name] = values[0]
+				}
+			},
+
+			// 每个月的实际天数
+			daysInMonth(year, month) { // Use 1 for January, 2 for February, etc.
+				return new Date(year, month, 0).getDate();
+			},
+
+			/**
+			 * 生成时间戳
+			 * @param {Object} time
+			 */
+			createTimeStamp(time) {
+				if (!time) return
+				if (typeof time === "number") {
+					return time
+				} else {
+					time = time.replace(/-/g, '/')
+					if (this.type === 'date') {
+						time = time + ' ' + '00:00:00'
+					}
+					return Date.parse(time)
+				}
+			},
+
+			/**
+			 * 生成日期或时间的字符串
+			 */
+			createDomSting() {
+				const yymmdd = this.year +
+					'-' +
+					this.lessThanTen(this.month) +
+					'-' +
+					this.lessThanTen(this.day)
+
+				let hhmmss = this.lessThanTen(this.hour) +
+					':' +
+					this.lessThanTen(this.minute)
+
+				if (!this.hideSecond) {
+					hhmmss = hhmmss + ':' + this.lessThanTen(this.second)
+				}
+
+				if (this.type === 'date') {
+					return yymmdd
+				} else if (this.type === 'time') {
+					return hhmmss
+				} else {
+					return yymmdd + ' ' + hhmmss
+				}
+			},
+
+			/**
+			 * 初始化返回值，并抛出 change 事件
+			 */
+			initTime(emit = true) {
+				this.time = this.createDomSting()
+				if (!emit) return
+				if (this.returnType === 'timestamp' && this.type !== 'time') {
+					this.$emit('change', this.createTimeStamp(this.time))
+					this.$emit('input', this.createTimeStamp(this.time))
+					this.$emit('update:modelValue', this.createTimeStamp(this.time))
+				} else {
+					this.$emit('change', this.time)
+					this.$emit('input', this.time)
+					this.$emit('update:modelValue', this.time)
+				}
+			},
+
+			/**
+			 * 用户选择日期或时间更新 data
+			 * @param {Object} e
+			 */
+			bindDateChange(e) {
+				const val = e.detail.value
+				this.year = this.years[val[0]]
+				this.month = this.months[val[1]]
+				this.day = this.days[val[2]]
+			},
+			bindTimeChange(e) {
+				const val = e.detail.value
+				this.hour = this.hours[val[0]]
+				this.minute = this.minutes[val[1]]
+				this.second = this.seconds[val[2]]
+			},
+
+			/**
+			 * 初始化弹出层
+			 */
+			initTimePicker() {
+				if (this.disabled) return
+				const value = fixIosDateFormat(this.time)
+				this.initPickerValue(value)
+				this.visible = !this.visible
+			},
+
+			/**
+			 * 触发或关闭弹框
+			 */
+			tiggerTimePicker(e) {
+				this.visible = !this.visible
+			},
+
+			/**
+			 * 用户点击“清空”按钮，清空当前值
+			 */
+			clearTime() {
+				this.time = ''
+				this.$emit('change', this.time)
+				this.$emit('input', this.time)
+				this.$emit('update:modelValue', this.time)
+				this.tiggerTimePicker()
+			},
+
+			/**
+			 * 用户点击“确定”按钮
+			 */
+			setTime() {
+				this.initTime()
+				this.tiggerTimePicker()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-primary: #007aff !default;
+
+	.uni-datetime-picker {
+		/* #ifndef APP-NVUE */
+		/* width: 100%; */
+		/* #endif */
+	}
+
+	.uni-datetime-picker-view {
+		height: 130px;
+		width: 270px;
+		/* #ifndef APP-NVUE */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-item {
+		height: 50px;
+		line-height: 50px;
+		text-align: center;
+		font-size: 14px;
+	}
+
+	.uni-datetime-picker-btn {
+		margin-top: 60px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+	}
+
+	.uni-datetime-picker-btn-text {
+		font-size: 14px;
+		color: $uni-primary;
+	}
+
+	.uni-datetime-picker-btn-group {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-datetime-picker-cancel {
+		margin-right: 30px;
+	}
+
+	.uni-datetime-picker-mask {
+		position: fixed;
+		bottom: 0px;
+		top: 0px;
+		left: 0px;
+		right: 0px;
+		background-color: rgba(0, 0, 0, 0.4);
+		transition-duration: 0.3s;
+		z-index: 998;
+	}
+
+	.uni-datetime-picker-popup {
+		border-radius: 8px;
+		padding: 30px;
+		width: 270px;
+		/* #ifdef APP-NVUE */
+		height: 500px;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		width: 330px;
+		/* #endif */
+		background-color: #fff;
+		position: fixed;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		transition-duration: 0.3s;
+		z-index: 999;
+	}
+
+	.fix-nvue-height {
+		/* #ifdef APP-NVUE */
+		height: 330px;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-time {
+		color: grey;
+	}
+
+	.uni-datetime-picker-column {
+		height: 50px;
+	}
+
+	.uni-datetime-picker-timebox {
+
+		border: 1px solid #E5E5E5;
+		border-radius: 5px;
+		padding: 7px 10px;
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-timebox-pointer {
+		/* #ifndef APP-NVUE */
+		cursor: pointer;
+		/* #endif */
+	}
+
+
+	.uni-datetime-picker-disabled {
+		opacity: 0.4;
+		/* #ifdef H5 */
+		cursor: not-allowed !important;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-text {
+		font-size: 14px;
+		line-height: 50px
+	}
+
+	.uni-datetime-picker-sign {
+		position: absolute;
+		top: 53px;
+		/* 减掉 10px 的元素高度，兼容nvue */
+		color: #999;
+		/* #ifdef APP-NVUE */
+		font-size: 16px;
+		/* #endif */
+	}
+
+	.sign-left {
+		left: 86px;
+	}
+
+	.sign-right {
+		right: 86px;
+	}
+
+	.sign-center {
+		left: 135px;
+	}
+
+	.uni-datetime-picker__container-box {
+		position: relative;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-top: 40px;
+	}
+
+	.time-hide-second {
+		width: 180px;
+	}
+</style>

uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js

@@ -0,0 +1,421 @@
+class Calendar {
+	constructor({
+		selected,
+		startDate,
+		endDate,
+		range,
+	} = {}) {
+		// 当前日期
+		this.date = this.getDateObj(new Date()) // 当前初入日期
+		// 打点信息
+		this.selected = selected || [];
+		// 起始时间
+		this.startDate = startDate
+		// 终止时间
+		this.endDate = endDate
+		// 是否范围选择
+		this.range = range
+		// 多选状态
+		this.cleanMultipleStatus()
+		// 每周日期
+		this.weeks = {}
+		this.lastHover = false
+	}
+	/**
+	 * 设置日期
+	 * @param {Object} date
+	 */
+	setDate(date) {
+		const selectDate = this.getDateObj(date)
+		this.getWeeks(selectDate.fullDate)
+	}
+
+	/**
+	 * 清理多选状态
+	 */
+	cleanMultipleStatus() {
+		this.multipleStatus = {
+			before: '',
+			after: '',
+			data: []
+		}
+	}
+
+	setStartDate(startDate) {
+		this.startDate = startDate
+	}
+
+	setEndDate(endDate) {
+		this.endDate = endDate
+	}
+
+	getPreMonthObj(date) {
+		date = fixIosDateFormat(date)
+		date = new Date(date)
+
+		const oldMonth = date.getMonth()
+		date.setMonth(oldMonth - 1)
+		const newMonth = date.getMonth()
+		if (oldMonth !== 0 && newMonth - oldMonth === 0) {
+			date.setMonth(newMonth - 1)
+		}
+		return this.getDateObj(date)
+	}
+	getNextMonthObj(date) {
+		date = fixIosDateFormat(date)
+		date = new Date(date)
+
+		const oldMonth = date.getMonth()
+		date.setMonth(oldMonth + 1)
+		const newMonth = date.getMonth()
+		if (newMonth - oldMonth > 1) {
+			date.setMonth(newMonth - 1)
+		}
+		return this.getDateObj(date)
+	}
+
+	/**
+	 * 获取指定格式Date对象
+	 */
+	getDateObj(date) {
+		date = fixIosDateFormat(date)
+		date = new Date(date)
+
+		return {
+			fullDate: getDate(date),
+			year: date.getFullYear(),
+			month: addZero(date.getMonth() + 1),
+			date: addZero(date.getDate()),
+			day: date.getDay()
+		}
+	}
+
+	/**
+	 * 获取上一个月日期集合
+	 */
+	getPreMonthDays(amount, dateObj) {
+		const result = []
+		for (let i = amount - 1; i >= 0; i--) {
+			const month = dateObj.month - 1
+			result.push({
+				date: new Date(dateObj.year, month, -i).getDate(),
+				month,
+				disable: true
+			})
+		}
+		return result
+	}
+	/**
+	 * 获取本月日期集合
+	 */
+	getCurrentMonthDays(amount, dateObj) {
+		const result = []
+		const fullDate = this.date.fullDate
+		for (let i = 1; i <= amount; i++) {
+			const currentDate = `${dateObj.year}-${dateObj.month}-${addZero(i)}`
+			const isToday = fullDate === currentDate
+			// 获取打点信息
+			const info = this.selected && this.selected.find((item) => {
+				if (this.dateEqual(currentDate, item.date)) {
+					return item
+				}
+			})
+
+			// 日期禁用
+			let disableBefore = true
+			let disableAfter = true
+			if (this.startDate) {
+				disableBefore = dateCompare(this.startDate, currentDate)
+			}
+
+			if (this.endDate) {
+				disableAfter = dateCompare(currentDate, this.endDate)
+			}
+
+			let multiples = this.multipleStatus.data
+			let multiplesStatus = -1
+			if (this.range && multiples) {
+				multiplesStatus = multiples.findIndex((item) => {
+					return this.dateEqual(item, currentDate)
+				})
+			}
+			const checked = multiplesStatus !== -1
+
+			result.push({
+				fullDate: currentDate,
+				year: dateObj.year,
+				date: i,
+				multiple: this.range ? checked : false,
+				beforeMultiple: this.isLogicBefore(currentDate, this.multipleStatus.before, this.multipleStatus.after),
+				afterMultiple: this.isLogicAfter(currentDate, this.multipleStatus.before, this.multipleStatus.after),
+				month: dateObj.month,
+				disable: (this.startDate && !dateCompare(this.startDate, currentDate)) || (this.endDate && !dateCompare(
+					currentDate, this.endDate)),
+				isToday,
+				userChecked: false,
+				extraInfo: info
+			})
+		}
+		return result
+	}
+	/**
+	 * 获取下一个月日期集合
+	 */
+	_getNextMonthDays(amount, dateObj) {
+		const result = []
+		const month = dateObj.month + 1
+		for (let i = 1; i <= amount; i++) {
+			result.push({
+				date: i,
+				month,
+				disable: true
+			})
+		}
+		return result
+	}
+
+	/**
+	 * 获取当前日期详情
+	 * @param {Object} date
+	 */
+	getInfo(date) {
+		if (!date) {
+			date = new Date()
+		}
+		const res = this.calendar.find(item => item.fullDate === this.getDateObj(date).fullDate)
+		return res ? res : this.getDateObj(date)
+	}
+
+	/**
+	 * 比较时间是否相等
+	 */
+	dateEqual(before, after) {
+		before = new Date(fixIosDateFormat(before))
+		after = new Date(fixIosDateFormat(after))
+		return before.valueOf() === after.valueOf()
+	}
+
+	/**
+	 *  比较真实起始日期
+	 */
+
+	isLogicBefore(currentDate, before, after) {
+		let logicBefore = before
+		if (before && after) {
+			logicBefore = dateCompare(before, after) ? before : after
+		}
+		return this.dateEqual(logicBefore, currentDate)
+	}
+
+	isLogicAfter(currentDate, before, after) {
+		let logicAfter = after
+		if (before && after) {
+			logicAfter = dateCompare(before, after) ? after : before
+		}
+		return this.dateEqual(logicAfter, currentDate)
+	}
+
+	/**
+	 * 获取日期范围内所有日期
+	 * @param {Object} begin
+	 * @param {Object} end
+	 */
+	geDateAll(begin, end) {
+		var arr = []
+		var ab = begin.split('-')
+		var ae = end.split('-')
+		var db = new Date()
+		db.setFullYear(ab[0], ab[1] - 1, ab[2])
+		var de = new Date()
+		de.setFullYear(ae[0], ae[1] - 1, ae[2])
+		var unixDb = db.getTime() - 24 * 60 * 60 * 1000
+		var unixDe = de.getTime() - 24 * 60 * 60 * 1000
+		for (var k = unixDb; k <= unixDe;) {
+			k = k + 24 * 60 * 60 * 1000
+			arr.push(this.getDateObj(new Date(parseInt(k))).fullDate)
+		}
+		return arr
+	}
+
+	/**
+	 *  获取多选状态
+	 */
+	setMultiple(fullDate) {
+		if (!this.range) return
+
+		let {
+			before,
+			after
+		} = this.multipleStatus
+		if (before && after) {
+			if (!this.lastHover) {
+				this.lastHover = true
+				return
+			}
+			this.multipleStatus.before = fullDate
+			this.multipleStatus.after = ''
+			this.multipleStatus.data = []
+			this.multipleStatus.fulldate = ''
+			this.lastHover = false
+		} else {
+			if (!before) {
+				this.multipleStatus.before = fullDate
+				this.multipleStatus.after = undefined;
+				this.lastHover = false
+			} else {
+				this.multipleStatus.after = fullDate
+				if (dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus
+						.after);
+				} else {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus
+						.before);
+				}
+				this.lastHover = true
+			}
+		}
+		this.getWeeks(fullDate)
+	}
+
+	/**
+	 *  鼠标 hover 更新多选状态
+	 */
+	setHoverMultiple(fullDate) {
+		//抖音小程序点击会触发hover事件，需要避免一下
+		// #ifndef MP-TOUTIAO
+		if (!this.range || this.lastHover) return
+		const {
+			before
+		} = this.multipleStatus
+
+		if (!before) {
+			this.multipleStatus.before = fullDate
+		} else {
+			this.multipleStatus.after = fullDate
+			if (dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+				this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus.after);
+			} else {
+				this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus.before);
+			}
+		}
+		this.getWeeks(fullDate)
+		// #endif
+
+	}
+
+	/**
+	 * 更新默认值多选状态
+	 */
+	setDefaultMultiple(before, after) {
+		this.multipleStatus.before = before
+		this.multipleStatus.after = after
+		if (before && after) {
+			if (dateCompare(before, after)) {
+				this.multipleStatus.data = this.geDateAll(before, after);
+				this.getWeeks(after)
+			} else {
+				this.multipleStatus.data = this.geDateAll(after, before);
+				this.getWeeks(before)
+			}
+		}
+	}
+
+	/**
+	 * 获取每周数据
+	 * @param {Object} dateData
+	 */
+	getWeeks(dateData) {
+		const {
+			year,
+			month,
+		} = this.getDateObj(dateData)
+
+		const preMonthDayAmount = new Date(year, month - 1, 1).getDay()
+		const preMonthDays = this.getPreMonthDays(preMonthDayAmount, this.getDateObj(dateData))
+
+		const currentMonthDayAmount = new Date(year, month, 0).getDate()
+		const currentMonthDays = this.getCurrentMonthDays(currentMonthDayAmount, this.getDateObj(dateData))
+
+		const nextMonthDayAmount = 42 - preMonthDayAmount - currentMonthDayAmount
+		const nextMonthDays = this._getNextMonthDays(nextMonthDayAmount, this.getDateObj(dateData))
+
+		const calendarDays = [...preMonthDays, ...currentMonthDays, ...nextMonthDays]
+
+		const weeks = new Array(6)
+		for (let i = 0; i < calendarDays.length; i++) {
+			const index = Math.floor(i / 7)
+			if (!weeks[index]) {
+				weeks[index] = new Array(7)
+			}
+			weeks[index][i % 7] = calendarDays[i]
+		}
+
+		this.calendar = calendarDays
+		this.weeks = weeks
+	}
+}
+
+function getDateTime(date, hideSecond) {
+	return `${getDate(date)} ${getTime(date, hideSecond)}`
+}
+
+function getDate(date) {
+	date = fixIosDateFormat(date)
+	date = new Date(date)
+	const year = date.getFullYear()
+	const month = date.getMonth() + 1
+	const day = date.getDate()
+	return `${year}-${addZero(month)}-${addZero(day)}`
+}
+
+function getTime(date, hideSecond) {
+	date = fixIosDateFormat(date)
+	date = new Date(date)
+	const hour = date.getHours()
+	const minute = date.getMinutes()
+	const second = date.getSeconds()
+	return hideSecond ? `${addZero(hour)}:${addZero(minute)}` : `${addZero(hour)}:${addZero(minute)}:${addZero(second)}`
+}
+
+function addZero(num) {
+	if (num < 10) {
+		num = `0${num}`
+	}
+	return num
+}
+
+function getDefaultSecond(hideSecond) {
+	return hideSecond ? '00:00' : '00:00:00'
+}
+
+function dateCompare(startDate, endDate) {
+	startDate = new Date(fixIosDateFormat(typeof startDate === 'string' ? startDate.trim() : startDate))
+	endDate = new Date(fixIosDateFormat(typeof endDate === 'string' ? endDate.trim() : endDate))
+	return startDate <= endDate
+}
+
+function checkDate(date) {
+	const dateReg = /((19|20)\d{2})(-|\/)\d{1,2}(-|\/)\d{1,2}/g
+	return date.match(dateReg)
+}
+//ios低版本15及以下，无法匹配 没有 ’秒‘ 时的情况，所以需要在末尾 秒 加上 问号
+const dateTimeReg = /^\d{4}-(0?[1-9]|1[012])-(0?[1-9]|[12][0-9]|3[01])( [0-5]?[0-9]:[0-5]?[0-9](:[0-5]?[0-9])?)?$/;
+
+function fixIosDateFormat(value) {
+	if (typeof value === 'string' && dateTimeReg.test(value)) {
+		value = value.replace(/-/g, '/')
+	}
+	return value
+}
+
+export {
+	Calendar,
+	getDateTime,
+	getDate,
+	getTime,
+	addZero,
+	getDefaultSecond,
+	dateCompare,
+	checkDate,
+	fixIosDateFormat
+}

uni_modules/uni-datetime-picker/package.json

@@ -0,0 +1,107 @@
+{
+  "id": "uni-datetime-picker",
+  "displayName": "uni-datetime-picker 日期选择器",
+  "version": "2.2.42",
+  "description": "uni-datetime-picker 日期时间选择器，支持日历，支持范围选择",
+  "keywords": [
+    "uni-datetime-picker",
+    "uni-ui",
+    "uniui",
+    "日期时间选择器",
+    "日期时间"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "",
+    "uni-app": "^4.07",
+    "uni-app-x": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue",
+    "darkmode": "x",
+    "i18n": "x",
+    "widescreen": "x"
+  },
+  "uni_modules": {
+    "dependencies": [
+      "uni-scss",
+      "uni-icons"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "x",
+        "aliyun": "x",
+        "alipay": "x"
+      },
+      "client": {
+        "uni-app": {
+          "vue": {
+            "vue2": "√",
+            "vue3": "√"
+          },
+          "web": {
+            "safari": "√",
+            "chrome": "√"
+          },
+          "app": {
+            "vue": "√",
+            "nvue": "√",
+            "android": "√",
+            "ios": "√",
+            "harmony": "√"
+          },
+          "mp": {
+            "weixin": "√",
+            "alipay": "√",
+            "toutiao": "√",
+            "baidu": "√",
+            "kuaishou": "-",
+            "jd": "-",
+            "harmony": "-",
+            "qq": "√",
+            "lark": "-"
+          },
+          "quickapp": {
+            "huawei": "√",
+            "union": "√"
+          }
+        },
+        "uni-app-x": {
+          "web": {
+            "safari": "-",
+            "chrome": "-"
+          },
+          "app": {
+            "android": "-",
+            "ios": "-",
+            "harmony": "-"
+          },
+          "mp": {
+            "weixin": "-"
+          }
+        }
+      }
+    }
+  }
+}

uni_modules/uni-datetime-picker/readme.md

@@ -0,0 +1,21 @@
+
+
+> `重要通知：组件升级更新 2.0.0 后，支持日期+时间范围选择，组件 ui 将使用日历选择日期，ui 变化较大，同时支持 PC 和 移动端。此版本不向后兼容，不再支持单独的时间选择（type=time）及相关的 hide-second 属性（时间选可使用内置组件 picker）。若仍需使用旧版本，可在插件市场下载*非uni_modules版本*，旧版本将不再维护`
+
+## DatetimePicker 时间选择器
+
+> **组件名：uni-datetime-picker**
+> 代码块： `uDatetimePicker`
+
+
+该组件的优势是，支持**时间戳**输入和输出（起始时间、终止时间也支持时间戳），可**同时选择**日期和时间。
+
+若只是需要单独选择日期和时间，不需要时间戳输入和输出，可使用原生的 picker 组件。
+
+**_点击 picker 默认值规则：_**
+
+- 若设置初始值 value, 会显示在 picker 显示框中
+- 若无初始值 value，则初始值 value 为当前本地时间 Date.now()， 但不会显示在 picker 显示框中
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-datetime-picker)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 

uni_modules/uni-id-common/changelog.md

@@ -0,0 +1,38 @@
+## 1.0.19（2025-12-16）
+- 增加配置参数缺失时的错误提示，指明配置文件路径
+## 1.0.18（2024-07-08）
+- checkToken时如果传入的token为空则返回uni-id-check-token-failed错误码以便uniIdRouter能正常跳转
+## 1.0.17（2024-04-26）
+- 兼容uni-app-x对客户端uniPlatform的调整（uni-app-x内uniPlatform区分app-android、app-ios）
+## 1.0.16（2023-04-25）
+- 新增maxTokenLength配置，用于限制数据库用户记录token数组的最大长度
+## 1.0.15（2023-04-06）
+- 修复部分语言国际化出错的Bug
+## 1.0.14（2023-03-07）
+- 修复 admin用户包含其他角色时未包含在token的Bug
+## 1.0.13（2022-07-21）
+- 修复 创建token时未传角色权限信息生成的token不正确的bug
+## 1.0.12（2022-07-15）
+- 提升与旧版本uni-id的兼容性（补充读取配置文件时回退平台app-plus、h5），但是仍推荐使用新平台名进行配置（app、web）
+## 1.0.11（2022-07-14）
+- 修复 部分情况下报`read property 'reduce' of undefined`的错误
+## 1.0.10（2022-07-11）
+- 将token存储在用户表的token字段内，与旧版本uni-id保持一致
+## 1.0.9（2022-07-01）
+- checkToken兼容token内未缓存角色权限的情况，此时将查库获取角色权限
+## 1.0.8（2022-07-01）
+- 修复clientDB默认依赖时部分情况下获取不到uni-id配置的Bug
+## 1.0.7（2022-06-30）
+- 修复config文件不合法时未抛出具体错误的Bug
+## 1.0.6（2022-06-28）
+- 移除插件内的数据表schema
+## 1.0.5（2022-06-27）
+- 修复使用多应用配置时报`Cannot read property 'appId' of undefined`的Bug
+## 1.0.4（2022-06-27）
+- 修复使用自定义token内容功能报错的Bug [详情](https://ask.dcloud.net.cn/question/147945)
+## 1.0.2（2022-06-23）
+- 对齐旧版本uni-id默认配置
+## 1.0.1（2022-06-22）
+- 补充对uni-config-center的依赖
+## 1.0.0（2022-06-21）
+- 提供uni-id token创建、校验、刷新接口，简化旧版uni-id公共模块

uni_modules/uni-id-common/package.json

@@ -0,0 +1,101 @@
+{
+  "id": "uni-id-common",
+  "displayName": "uni-id-common",
+  "version": "1.0.19",
+  "description": "包含uni-id token生成、校验、刷新功能的云函数公共模块",
+  "keywords": [
+    "uni-id-common",
+    "uniCloud",
+    "token",
+    "权限"
+],
+  "repository": "https://gitcode.net/dcloud/uni-id-common",
+  "engines": {
+    "uni-app": "^3.1.0",
+    "uni-app-x": "^3.1.0"
+  },
+  "dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "",
+    "type": "unicloud-template-function",
+    "darkmode": "-",
+    "i18n": "-",
+    "widescreen": "-"
+  },
+  "uni_modules": {
+    "dependencies": [
+      "uni-config-center"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "√",
+        "aliyun": "√",
+        "alipay": "√"
+      },
+      "client": {
+        "uni-app": {
+          "vue": {
+            "vue2": "-",
+            "vue3": "-"
+          },
+          "web": {
+            "safari": "-",
+            "chrome": "-"
+          },
+          "app": {
+            "vue": "-",
+            "nvue": "-",
+            "android": "-",
+            "ios": "-",
+            "harmony": "-"
+          },
+          "mp": {
+            "weixin": "-",
+            "alipay": "-",
+            "toutiao": "-",
+            "baidu": "-",
+            "kuaishou": "-",
+            "jd": "-",
+            "harmony": "-",
+            "qq": "-",
+            "lark": "-"
+          },
+          "quickapp": {
+            "huawei": "-",
+            "union": "-"
+          }
+        },
+        "uni-app-x": {
+          "web": {
+            "safari": "-",
+            "chrome": "-"
+          },
+          "app": {
+            "android": "-",
+            "ios": "-",
+            "harmony": "-"
+          },
+          "mp": {
+            "weixin": "-"
+          }
+        }
+      }
+    }
+  }
+}

uni_modules/uni-id-common/readme.md

@@ -0,0 +1,3 @@
+# uni-id-common
+
+文档请参考：[uni-id-common](https://uniapp.dcloud.net.cn/uniCloud/uni-id-common.html)

uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/package.json

@@ -0,0 +1,20 @@
+{
+    "name": "uni-id-common",
+    "version": "1.0.19",
+    "description": "uni-id token生成、校验、刷新",
+    "main": "index.js",
+    "homepage": "https:\/\/uniapp.dcloud.io\/uniCloud\/uni-id-common.html",
+    "repository": {
+        "type": "git",
+        "url": "git+https:\/\/gitee.com\/dcloud\/uni-id-common.git"
+    },
+    "author": "DCloud",
+    "license": "Apache-2.0",
+    "dependencies": {
+        "uni-config-center": "file:..\/..\/..\/..\/..\/uni-config-center\/uniCloud\/cloudfunctions\/common\/uni-config-center"
+    },
+    "origin-plugin-dev-name": "uni-id-common",
+    "origin-plugin-version": "1.0.19",
+    "plugin-dev-name": "uni-id-common",
+    "plugin-version": "1.0.19"
+}

utils/BleHelper.js

@@ -779,23 +779,23 @@ class BleHelper {
 					str: str,
 					hexs: hexs
 				};
-				 console.log("监听到特征值:" + JSON.stringify(recData));
+				 // console.log("监听到特征值:",recData);
 				if (this.cfg.receivDataCallback) {
 
 					if (this.cfg.receivDataCallback.length > 0) {
 
-						// console.log("有人订阅消息")
+						 // console.log("有人订阅消息")
 						this.cfg.receivDataCallback.forEach((
 							rec) => {
-							// console.log("有人订阅消息111", )
+							 // console.log("有人订阅消息111", )
 							if (rec.callback) {
 								try {
-									// console.log("正在处理订阅消息",rec);
+									 // console.log("正在处理订阅消息",rec);
 									rec.callback(recData, f,
 										rec.key, this.cfg
 										.receivDataCallback
 									);
-									// console.log("处理订阅消息完毕");
+									 // console.log("处理订阅消息完毕");
 								} catch (err) {
 									console.error(
 										"订阅消息出现异常",
@@ -2030,29 +2030,7 @@ class BleHelper {
 
 	}
 
-	//将点阵数据转换成RGB565
-	convertToRGB565(pixels, type) {
-		if (!type) {
-			type = 'rgb';
-		}
-		const result = new Uint16Array(pixels.length / 4);
-		let index = 0;
-		for (let i = 0; i < pixels.length; i += 4) {
-			let r = pixels[i];
-			let g = pixels[i + 1];
-			let b = pixels[i + 2];
-			let a = pixels[i + 3];
-
-			if (type == 'bgr') {
-				result[index++] = ((b & 0xF8) << 8) | ((g & 0xFC) << 3) | (r >> 3);
-			} else {
-				result[index++] = ((r & 0xF8) << 8) | ((g & 0xFC) << 3) | (b >> 3);
-			}
-
-		}
-
-		return result;
-	}
+	
 
 
 

utils/BleReceive.js

@@ -37,6 +37,7 @@ class BleReceive {
 					});
 
 					uni.setStorageSync(this.StorageKey, linkedList);
+					return true;
 				}
 			});
 		}
@@ -49,20 +50,20 @@ class BleReceive {
 			let handler = null;
 			let keys = Object.keys(this.HandlerMap);
 			let devKey = f.device.detailPageUrl ? f.device.detailPageUrl.replace(/\//g, '').toLowerCase() : '';
-			// console.log("查找handler - detailPageUrl:", f.device.detailPageUrl, "转换后:", devKey);
+		
 			for (let index = 0; index < keys.length; index++) {
 				let devKey = f.device.detailPageUrl ? f.device.detailPageUrl.replace(/\//g, "").toLowerCase() : '';
 				let key = keys[index].replace(/\//g, '').toLowerCase();
 				if (key == devKey) {
 					handler = this.HandlerMap[keys[index]];
-					// console.log("找到匹配的handler:", keys[index]);
+					
 					break;
 				}
 			}
 
 			if (handler) {
-				let data = handler(receive, f, path, recArr);
-				// console.log("设备"+f.device.deviceName+"收到消息,数据:", data);
+				let data = handler(receive, f, path, recArr);			
+				this.setBleFormData(data, f);
 				return data;
 			} else {
 				console.error("已收到消息,但无指定处理程序, deviceUrl:", f.device.detailPageUrl, "可用handlers:", keys);
@@ -159,7 +160,7 @@ class BleReceive {
 					formData.modeCurr = modeCurr;
 					formData.warnLevel = warn;
 					formData.iswarn = iswarn;
-					this.setBleFormData(formData, f);
+			
 
 					let recCnt = recArr.find(v => {
 						return v.key.replace(/\//g, "").toLowerCase() == f.device.detailPageUrl
@@ -208,7 +209,7 @@ class BleReceive {
 					if (str.indexOf('mac address:') == 0) {
 						let formData = {};
 						formData.macAddress = str.split(':')[1];
-						this.setBleFormData(formData, f);
+						
 						return formData;
 					} else {
 						let receiveData = {
@@ -327,7 +328,7 @@ class BleReceive {
 					receiveData.fourGStrenth = fourGStrenth;
 					receiveData.SOS = sosTxt;
 					receiveData.qzwarn = sosTxt === 'sg';
-					this.setBleFormData(receiveData, f);
+					
 					console.log("recArr=", recArr);
 					let recCnt = recArr.find(v => {
 						return v.key.replace(/\//g, "").toLowerCase() == f.device.detailPageUrl
@@ -415,8 +416,7 @@ class BleReceive {
 					console.log('将数据转文本失败', ex);
 				}
 			}
-			// console.log("todo",receiveData);
-			this.setBleFormData(receiveData, f);
+		
 			return receiveData;
 		}
 
@@ -503,8 +503,6 @@ class BleReceive {
 					}
 				}
 
-
-				this.setBleFormData(formData, f);
 				return formData;
 			} catch (error) {
 				console.log('7305数据解析错误:', error);
@@ -605,8 +603,6 @@ class BleReceive {
 					}
 				}
 
-
-				this.setBleFormData(formData, f);
 				return formData;
 			} catch (error) {
 				console.log('7305数据解析错误:', error);

utils/Common.js

@@ -307,21 +307,21 @@ export default {
 				value: "50",
 				label: "报警模式",
 				checked: false,
-				type: ['100']
+				type: ['100','100J']
 			},
 			
 			{
 				value: "51",
 				label: "警示灯",
 				checked: false,
-				type: ['100']
+				type: ['100','100J']
 			},
 			
 			{
 				value: "52",
 				label: "语音管理",
 				checked: false,
-				type: ['100']
+				type: ['100','100J']
 			},
 			
 			{
@@ -342,6 +342,12 @@ export default {
 				checked: false,
 				type: ['4877']
 			},
+			{
+				value: "56",
+				label: "灯光类型设置",
+				checked: false,
+				type: ['100J']
+			},
 		]
 
 		let arr = [];
@@ -456,5 +462,30 @@ export default {
 			url='https://www.pgyer.com/xhwl';
 		}
 		return {os:os,url:url};
+	},
+	
+	
+	//将点阵数据转换成RGB565
+	convertToRGB565(pixels, type) {
+		if (!type) {
+			type = 'rgb';
+		}
+		const result = new Uint16Array(pixels.length / 4);
+		let index = 0;
+		for (let i = 0; i < pixels.length; i += 4) {
+			let r = pixels[i];
+			let g = pixels[i + 1];
+			let b = pixels[i + 2];
+			let a = pixels[i + 3];
+	
+			if (type == 'bgr') {
+				result[index++] = ((b & 0xF8) << 8) | ((g & 0xFC) << 3) | (r >> 3);
+			} else {
+				result[index++] = ((r & 0xF8) << 8) | ((g & 0xFC) << 3) | (b >> 3);
+			}
+	
+		}
+	
+		return result;
 	}
 }

utils/MsgPops.js

@@ -0,0 +1,162 @@
+var MsgType = {
+	error: "error",
+	succ: "succ",
+	warn: "warn"
+}
+var time = null;
+// 显示成功
+export const MsgSuccess = (msg, btnTxt, ev) => {
+
+	if (!ev) {
+
+		return null;
+	}
+	if (!ev.$refs.msgPop) {
+
+		return null;
+	}
+	let option = ev.$refs.msgPop.showMsg(msg, btnTxt, MsgType.succ);
+
+	createClear(ev);
+	return option;
+}
+//显示失败
+export const MsgError = (msg, btnTxt, ev) => {
+
+	if (!ev) {
+
+		return null;
+	}
+	if (!ev.$refs.msgPop) {
+
+		return null;
+	}
+
+	let option = ev.$refs.msgPop.showMsg(msg, btnTxt, MsgType.error);
+	createClear(ev);
+	return option;
+}
+//显示警告
+export const MsgWarning = (msg, btnTxt, ev, isClear) => {
+	if (!ev) {
+
+		return null;
+	}
+	if (!ev.$refs.msgPop) {
+
+		return null;
+	}
+	let option = ev.$refs.msgPop.showMsg(msg, btnTxt, MsgType.warn);
+	if (isClear === undefined || isClear) {
+		createClear(ev);
+	}
+
+	return option;
+
+
+}
+
+
+// 隐藏loading
+export const MsgClose = (options, ev) => {
+
+
+	if (!ev) {
+
+		return;
+	}
+	if (!ev.$refs.msgPop) {
+
+		return;
+	}
+	if (typeof(options) == 'string') {
+		options = {
+			key: options
+		}
+	}
+	ev.$refs.msgPop.closePop(options);
+
+}
+
+
+
+export const showPop = (options, ev, isClear) => {
+
+
+	if (!ev) {
+
+		return null;
+	}
+	if (!ev.$refs.msgPop) {
+
+		return null;
+	}
+	let option = ev.$refs.msgPop.showPop(options);
+
+	if (isClear === undefined || isClear) {
+		createClear(ev);
+	}
+
+	return option;
+}
+
+const createClear = (ev) => {
+	let cnt = getPops(ev);
+	if (cnt >= 5) {
+		clearTimeout(time);
+		time = setTimeout(() => {
+			let key = new Date().getTime();
+			showPop({
+				key: key,
+				message: "消息太多, 是否全部关闭",
+				iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+				borderColor: "#e034344d",
+				buttonBgColor: "#E03434",
+				buttonText: '全部关闭',
+				buttonTextColor: '#232323de',
+				showCancel: true,
+				buttonCancelText: "取消",
+				cancelCallback: () => {
+
+					MsgClose(key, ev);
+				},
+				okCallback: function() {
+
+					MsgClear(ev);
+				}
+
+			}, ev, false);
+		}, 500);
+
+
+	}
+}
+
+//获取当前弹窗数量
+export const getPops = (ev) => {
+	if (!ev) {
+
+		return null;
+	}
+	if (!ev.$refs.msgPop) {
+
+		return null;
+	}
+	return ev.$refs.msgPop.getPops();
+
+}
+
+
+//清空所有弹窗
+export const MsgClear = (ev) => {
+	if (!ev) {
+
+		return null;
+	}
+	if (!ev.$refs.msgPop) {
+
+		return null;
+	}
+	return ev.$refs.msgPop.clearPops();
+
+}

utils/request.js

@@ -1,8 +1,8 @@
 import config from '../config/index.js';
-export const env = 'development'; //production development  //开发of线上 改这里就行
+export const env = 'production'; //production development  //开发of线上 改这里就行
 const BASE = config[env];
 const request = (options) => {
-	console.log("options" + JSON.stringify(options), BASE.BASE_URL)
+	// console.log("options" + JSON.stringify(options), BASE.BASE_URL)
 	return new Promise((resolve, reject) => {
 		// 处理GET请求参数
 		let url ="";
@@ -15,14 +15,14 @@ const request = (options) => {
 			url=BASE.BASE_URL + options.url;	 
 		 }
 		 
-		console.log("url" + url)
+		// console.log("url" + url)
 		if (options.method === 'GET' && options.data) {
 			// 使用qs序列化参数
 			const params = Object.keys(options.data)
 				.map(key => `${encodeURIComponent(key)}=${encodeURIComponent(options.data[key])}`)
 				.join('&');
 			url += `?${params}`;
-		}
+		}  
 
 		const config = {
 			url: url,
@@ -31,7 +31,7 @@ const request = (options) => {
 			header: options.header || {},
 			timeout: 30000,
 			success: (res) => {
-				console.log(res, 'resss');
+				// console.log(res, 'resss');
 				if (res.data.code === 401) {
 					uni.removeStorageSync('token');
 					uni.removeStorageSync('clientID');

utils/update.js

@@ -17,13 +17,13 @@ function checkAndUpdateWgt(updateUrl) {
 	// 1. 获取当前应用版本信息
 	plus.runtime.getProperty(plus.runtime.appid, (widgetInfo) => {
 		const currentVersion = widgetInfo.version;
-		console.log("当前版本:" + currentVersion);
+		// console.log("当前版本:" + currentVersion);
 
 
 		let callbck = (res) => {
 			let flag = false;
 			uni.hideLoading();
-			console.log("检查更新成功=", res)
+			// console.log("检查更新成功=", res)
 			if (res.statusCode === 200) {
 
 				const updateInfo = res.data.data;
@@ -51,7 +51,7 @@ function checkAndUpdateWgt(updateUrl) {
 		};
 
 		let Update = (url) => {
-			console.log("url=", url);
+			// console.log("url=", url);
 			return new Promise((resolve, reject) => {
 				uni.request({
 					url: url,
@@ -76,7 +76,7 @@ function checkAndUpdateWgt(updateUrl) {
 						reject(err);
 					},
 					complete: () => {
-						console.log("complete");
+						// console.log("complete");
 					}
 				});
 			});
@@ -146,7 +146,7 @@ function checkAndUpdateWgt(updateUrl) {
 			let length = results.length;
 			let flag = false;
 			for (var i = 0; i < length; i++) {
-				console.log('results[' + i + ']=', results[i]);
+				// console.log('results[' + i + ']=', results[i]);
 				if (results[i].status == 'fulfilled' && results[i].value.type === '1' && !flag) {
 					if (results[i].value.statusCode === 200) {
 						flag = callbck(results[i].value)
@@ -161,9 +161,9 @@ function checkAndUpdateWgt(updateUrl) {
 				}
 			}
 			if (!flag) {
-				console.log("检查更新失败了");
+				console.error("检查更新失败了");
 			} else {
-				console.log("检查更新成功");
+				// console.log("检查更新成功");
 			}
 		});