蓝牙设备添加分享功能

pages.json

@@ -240,7 +240,8 @@
 		{
 			"path": "pages/650/HBY650",
 			"style": {
-				"navigationBarTitleText": "HBY650"
+				"navigationBarTitleText": "HBY650",
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -252,7 +253,8 @@
 		{
 			"path": "pages/7305/BJQ7305",
 			"style": {
-				"navigationBarTitleText": "BJQ7305"
+				"navigationBarTitleText": "BJQ7305",
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -265,13 +267,15 @@
 		{
 			"path": "pages/4877/BJQ4877",
 			"style": {
-				"navigationBarTitleText": "BJQ 4877"
+				"navigationBarTitleText": "BJQ 4877",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/100/HBY100",
 			"style": {
-				"navigationBarTitleText": "HBY 100"
+				"navigationBarTitleText": "HBY 100",
+				"navigationStyle": "custom"
 			}
 		},
 		{

pages/100/HBY100.vue

@@ -1,5 +1,26 @@
 <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="eq">
 			<view class="leftImg" @click.stop="previewImg(device.devicePic?device.devicePic:formData.img)">
 				<image class="img" :src="device.devicePic?device.devicePic:formData.img" mode="aspectFit"></image>
@@ -243,7 +264,7 @@
 
 			<global-loading ref="loading" />
 		</view>
-		</view>
+	</view>
 </template>
 
 <script>
@@ -255,7 +276,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'
 	const pagePath = "/pages/100/HBY100";
@@ -271,6 +294,16 @@ import request, { baseURL } from '@/utils/request.js';
 		data() {
 			return {
 				Status: {
+					apiType: '',
+					navbar: {
+						icons: [{
+							src: '/static/images/common/shape.png',
+							callback: this.gotoShare,
+							apiType: 'listA'
+						}],
+						title: 'HBY100'
+
+					},
 					curr: 0,
 					total: 0,
 					pageHide: false,
@@ -464,7 +497,7 @@ import request, { baseURL } from '@/utils/request.js';
 					detailPageUrl: "/pages/650/HBY650",
 					showConfirm: false
 				},
-
+				permissions: [],
 				audioData: {
 					packetCtn: 0,
 					hexs: []
@@ -496,6 +529,17 @@ import request, { baseURL } from '@/utils/request.js';
 				// console.log("收到父页面的参数：" + JSON.stringify(data));
 				var device = data.data;
 				these.device = device;
+				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) {
+							if (res.data.permission) {
+								these.permissions = res.data.permission.split(',');
+							}
+						}
+					});
+				}
 				let f = ble.data.LinkedList.find((v) => {
 					if (v.macAddress == device.deviceMac) {
 						// console.log("找到设备了", v);
@@ -544,8 +588,49 @@ import request, { baseURL } from '@/utils/request.js';
 
 		},
 		methods: {
-			audioManager() {
+			handleRightClick(item, s) {
+				if (item && item.callback) {
+					item.callback(item, s);
+				} else {
+					uni.showModal({
+						content: '敬请期待'
+					})
 
+				}
+			},
+			navigatorBack() {
+				uni.navigateBack();
+			},
+			gotoShare(item, s) {
+				uni.navigateTo({
+					url: '/pages/common/share/index',
+					events: {
+						ack: function(data) {}
+					},
+					success: (res) => {
+						let json = {
+							persissonType: '100'
+						};
+						Object.assign(json, this.device);
+						res.eventChannel.emit('share', {
+							data: json
+						});
+					}
+				})
+			},
+			audioManager() {
+				if (!this.permissions.includes('52') && this.Status.apiType !== 'listA') {
+
+					this.showPop({
+						message: '无操作权限',
+						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+						okCallback: null,
+						buttonText: "确定"
+					})
+					return;
+				}
 				uni.navigateTo({
 					url: '/pages/common/audioManager/AudioList',
 					events: {
@@ -860,6 +945,19 @@ import request, { baseURL } from '@/utils/request.js';
 				}, 100);
 			},
 			lightTypeSet(item, index) {
+
+				if (!this.permissions.includes('51') && this.Status.apiType !== 'listA') {
+
+					this.showPop({
+						message: '无操作权限',
+						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+						okCallback: null,
+						buttonText: "确定"
+					})
+					return;
+				}
 				let f = this.getDevice();
 				// #ifdef  APP-PLUS
 				if (!f) {
@@ -899,6 +997,20 @@ import request, { baseURL } from '@/utils/request.js';
 				this.Status.usrToggle = !this.Status.usrToggle;
 			},
 			openVolume(item, index) {
+
+				if (!this.permissions.includes('50') && this.Status.apiType !== 'listA') {
+
+					this.showPop({
+						message: '无操作权限',
+						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+						okCallback: null,
+						buttonText: "确定"
+					})
+					return;
+				}
+
 				let f = this.getDevice();
 				// #ifdef  APP-PLUS
 				if (!f) {
@@ -950,6 +1062,20 @@ import request, { baseURL } from '@/utils/request.js';
 				});
 			},
 			sosSetting(item, isOk) {
+
+				if (!this.permissions.includes('50') && this.Status.apiType !== 'listA') {
+
+					this.showPop({
+						message: '无操作权限',
+						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+						okCallback: null,
+						buttonText: "确定"
+					})
+					return;
+				}
+
 				if (item === 0 && this.formData.sta_SOSType === item) {
 					return;
 				}
@@ -1115,7 +1241,7 @@ import request, { baseURL } from '@/utils/request.js';
 
 				let json = recei.ReceiveData(receive, device, pagePath, recArr);
 
-				 console.log("收到设备的数据", json)
+				console.log("收到设备的数据", json)
 				let key = 'sta_VoiceDate';
 				if (key in json) {
 
@@ -2102,4 +2228,71 @@ import request, { baseURL } from '@/utils/request.js';
 		letter-spacing: 0.07px;
 
 	}
+
+
+	.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/4877/BJQ4877.vue

@@ -1,5 +1,25 @@
 <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="eq">
 			<view class="leftImg" @click.stop="previewImg(device.devicePic?device.devicePic:formData.img)">
 				<image class="img" :src="device.devicePic?device.devicePic:formData.img" mode="aspectFit"></image>
@@ -276,6 +296,7 @@
 		updateLoading
 	} from '@/utils/loading.js'
 import request, { baseURL } from '@/utils/request.js';
+	import Common from '@/utils/Common.js';
 	import {
 		colors as groupColors
 	} from '@/api/4877/BJQ4877.js';
@@ -294,6 +315,16 @@ import request, { baseURL } from '@/utils/request.js';
 		data() {
 			return {
 				Status: {
+					apiType: '',
+					navbar: {
+						icons: [{
+							src: '/static/images/common/shape.png',
+							callback: this.gotoShare,
+							apiType: 'listA'
+						}],
+						title: 'BJQ4877'
+					
+					},
 					ShowEditChannel: false,
 					pageHide: false,
 					Pop: {
@@ -355,6 +386,7 @@ import request, { baseURL } from '@/utils/request.js';
 					},
 					usrToggle: true,
 				},
+				permissions: [],
 				formData: {
 					img: '/static/images/common/BJQ4877.png',
 					sta_PowerPercent: '',
@@ -446,7 +478,21 @@ import request, { baseURL } from '@/utils/request.js';
 			eventChannel.on('detailData', function(data) {
 
 				// 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') {
+					Common.getdeviceShareId(data.data.id).then(res => {
+						if (res.code == 200) {
+							if (res.data.permission) {
+								these.permissions = res.data.permission.split(',');
+							}
+						}
+					});
+				}
+				
 				let checkIds = uni.getStorageSync("4877CheckColor_" + data.data.id);
 				if (checkIds && checkIds.length) {
 					let groups = groupColors.filter(v => {
@@ -462,8 +508,7 @@ import request, { baseURL } from '@/utils/request.js';
 					these.formData.groups = groups;
 
 				}
-				var device = data.data;
+				
-				these.device = device;
 
 				let arr = [{
 						topic: 'C/4877_Groups_' + these.device.id,
@@ -531,6 +576,36 @@ import request, { baseURL } from '@/utils/request.js';
 
 		},
 		methods: {
+			handleRightClick(item, s) {
+				if (item && item.callback) {
+					item.callback(item, s);
+				} else {
+					uni.showModal({
+						content: '敬请期待'
+					})
+			
+				}
+			},
+			navigatorBack() {
+				uni.navigateBack();
+			},
+			gotoShare(item, s) {
+				uni.navigateTo({
+					url: '/pages/common/share/index',
+					events: {
+						ack: function(data) {}
+					},
+					success: (res) => {
+						let json = {
+							persissonType: '4877'
+						};
+						Object.assign(json, this.device);
+						res.eventChannel.emit('share', {
+							data: json
+						});
+					}
+				})
+			},
 			getChannel(rec) {
 				console.error("收到MQ信道保留消息:", rec);
 				try {
@@ -580,6 +655,20 @@ 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",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+						okCallback: null,
+						buttonText: "确定"
+					})
+					return;
+				}
+				
 				this.Status.ShowEditChannel = true;
 				this.showPop({
 					showPop: true, //是否显示弹窗
@@ -647,6 +736,20 @@ 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",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+						okCallback: null,
+						buttonText: "确定"
+					})
+					return;
+				}
+				
 				if (this.formData.sta_SOSType === 'sos') {
 					this.showMsg("设备强制报警中,请先关闭报警")
 					return;
@@ -697,7 +800,18 @@ import request, { baseURL } from '@/utils/request.js';
 				});
 			},
 			groupCheck() {
-
+if (!this.permissions.includes('54') && this.Status.apiType !== 'listA') {
+				
+					this.showPop({
+						message: '无操作权限',
+						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+						okCallback: null,
+						buttonText: "确定"
+					})
+					return;
+				}
 				uni.navigateTo({
 					url: '/pages/4877/BJQ4877CheckColor',
 					events: {
@@ -768,6 +882,20 @@ import request, { baseURL } from '@/utils/request.js';
 				// });
 			},
 			groupSetting(item, index) {
+				
+				if (!this.permissions.includes('54') && this.Status.apiType !== 'listA') {
+				
+					this.showPop({
+						message: '无操作权限',
+						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+						okCallback: null,
+						buttonText: "确定"
+					})
+					return;
+				}
+				
 				if (this.formData.sta_SOSType === 'sos') {
 					this.showMsg("设备强制报警中,请先关闭报警")
 					return;
@@ -814,7 +942,18 @@ import request, { baseURL } from '@/utils/request.js';
 			},
 
 			sosSetting(item, index) {
-
+if (!this.permissions.includes('42') && this.Status.apiType !== 'listA') {
+				
+					this.showPop({
+						message: '无操作权限',
+						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+						okCallback: null,
+						buttonText: "确定"
+					})
+					return;
+				}
 				let f = this.getDevice();
 				if (!f) {
 					this.showBleUnConnect();
@@ -2063,4 +2202,73 @@ import request, { baseURL } from '@/utils/request.js';
 		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;
+		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/6155/deviceDetail.vue

@@ -1793,49 +1793,8 @@
 
 				}
 
-			},
-			//获取当前设备状态
-			GetDeviceStatu: function() {
-				//数据头 命令码 数据 校验码
-				//JQOC    0B    00   9C41
-
-				//硬件响应
-				//数据头 命令码 主灯模式 副灯模式 亮度(%) 电量(%) 充电状态 校验码
-				//JQOC    0B     01      01      64      85     01     9C41
-				this.sendCmd('0x0B');
-			},
-			//设备重启
-			DeviceReStart: function() {
-				//数据头 命令码 数据 校验码
-				//JQOC   0C    01  9C412
-				this.sendCmd('0x0C');
-			},
-			//恢复出厂设置
-			DeviceReSet: function() {
-				//数据头 命令码 数据 校验码
-				//JQOC   0D    01  9C412
-				this.sendCmd('0x0D');
-			},
-			sendCmd: function(type, callback) {
-				//数据头 命令码 数据 校验码
-
-				const buffer = new ArrayBuffer(7);
-				const dataView = new DataView(buffer);
-				let data = '0x' + parseInt(this.formData.liangDu).toString(16);
-				console.log("亮度:" + this.formData.liangDu + ',16进制:' + data);
-				dataView.setUint8(0, 'JQOC'); // 帧头
-				dataView.setUint8(1, type); // 帧类型：亮度调节
-				dataView.setUint8(2, '0x01'); // 包序号				
-				dataView.setUint8(3, '9C41'); // 数据长度				
-				let f = this.getDevice();
-				if (f) {
-					// 发送数据
-
-					ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 30);
-
-
-				}
 			}
+			
 
 
 		}

pages/650/HBY650.vue

@@ -1,5 +1,26 @@
 <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="eq">
 			<view class="leftImg" @click.stop="previewImg(device.devicePic?device.devicePic:formData.img)">
 				<image class="img" :src="device.devicePic?device.devicePic:formData.img" mode="aspectFit"></image>
@@ -184,6 +205,7 @@
 	import gbk from '@/utils/gbk.js'
 	import BleTool from '@/utils/BleHelper.js'
 	import BleReceive from '@/utils/BleReceive';
+	import Common from '@/utils/Common.js'
 	import {
 		showLoading,
 		hideLoading,
@@ -201,6 +223,16 @@ import request, { baseURL } from '@/utils/request.js';
 		data() {
 			return {
 				Status: {
+					apiType: '',
+					navbar: {
+						icons: [{
+							src: '/static/images/common/shape.png',
+							callback: this.gotoShare,
+							apiType: 'listA'
+						}],
+						title: 'HBY650'
+					
+					},
 					pageHide: false,
 					Pop: {
 						showPop: false, //是否显示弹窗
@@ -282,6 +314,7 @@ import request, { baseURL } from '@/utils/request.js';
 				},
 				rgb565Data: [],
 				videoHexArray: [],
+				permissions: [],
 				device: {
 					id: "",
 					deviceName: "",
@@ -328,6 +361,17 @@ import request, { baseURL } from '@/utils/request.js';
 				// console.log("收到父页面的参数：" + JSON.stringify(data));
 				var device = data.data;
 				these.device = device;
+				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) {
+							if (res.data.permission) {
+								these.permissions = res.data.permission.split(',');
+							}
+						}
+					});
+				}
 				let f = ble.data.LinkedList.find((v) => {
 					if (v.macAddress == device.deviceMac) {
 						// console.log("找到设备了", v);
@@ -393,6 +437,36 @@ import request, { baseURL } from '@/utils/request.js';
 			}
 		},
 		methods: {
+			handleRightClick(item, s) {
+				if (item && item.callback) {
+					item.callback(item, s);
+				} else {
+					uni.showModal({
+						content: '敬请期待'
+					})
+			
+				}
+			},
+			navigatorBack() {
+				uni.navigateBack();
+			},
+			gotoShare(item, s) {
+				uni.navigateTo({
+					url: '/pages/common/share/index',
+					events: {
+						ack: function(data) {}
+					},
+					success: (res) => {
+						let json = {
+							persissonType: '650'
+						};
+						Object.assign(json, this.device);
+						res.eventChannel.emit('share', {
+							data: json
+						});
+					}
+				})
+			},
 			deviceRecovry(res) {
 				if (this.Status.pageHide) {
 					return;
@@ -616,6 +690,20 @@ import request, { baseURL } from '@/utils/request.js';
 				uni.setStorageSync(ble.StorageKey, ble.data.LinkedList);
 			},
 			MainModeSetting: function(type, byteType) {
+				
+				if (!this.permissions.includes('41') && this.Status.apiType !== 'listA') {
+				
+					this.showPop({
+						message: '无操作权限',
+						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+						okCallback: null,
+						buttonText: "确定"
+					})
+					return;
+				}
+				
 				if (this.formData.modeCurr == type) {
 					type = 'close';
 				}
@@ -741,7 +829,18 @@ import request, { baseURL } from '@/utils/request.js';
 				});
 			},
 			LampToggle: function() {
+				if (!this.permissions.includes('1') && this.Status.apiType !== 'listA') {
 
+					this.showPop({
+						message: '无操作权限',
+						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+						okCallback: null,
+						buttonText: "确定"
+					})
+					return;
+				}
 				this.formData.cMode = !this.formData.cMode;
 				this.MainModeSetting(this.formData.cMode, "lamp");
 			},
@@ -1238,6 +1337,19 @@ import request, { baseURL } from '@/utils/request.js';
 
 			},
 			ShowUpload: function() {
+				
+				if (!this.permissions.includes('3') && this.Status.apiType !== 'listA') {
+				
+					this.showPop({
+						message: '无操作权限',
+						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+						okCallback: null,
+						buttonText: "确定"
+					})
+					return;
+				}
 				//上传开机画面
 				this.Status.BottomMenu.menuItems = [];
 				this.Status.BottomMenu.title = "上传开机画面";
@@ -1345,7 +1457,18 @@ import request, { baseURL } from '@/utils/request.js';
 			},
 			sendUsr: function(ReSendNo) {
 
+	if (!this.permissions.includes('4') && this.Status.apiType !== 'listA') {
 
+					this.showPop({
+						message: '无操作权限',
+						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+						okCallback: null,
+						buttonText: "确定"
+					})
+					return;
+				}
 
 				var textLines = [
 					this.formData.company,
@@ -2111,4 +2234,71 @@ import request, { baseURL } from '@/utils/request.js';
 	.net.active {
 		background: #FFFFFF !important;
 	}
+	
+	
+	.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/670/HBY670.vue

@@ -15,6 +15,9 @@
 				
 			</block>
 		</uni-nav-bar>
+		
+		
+		
 
 		<view class="eq" :style="{marginTop:Status.navbar.height+'px'}">
 			<view class="leftImg" @click.stop="previewImg(device.devicePic?device.devicePic:formData.img)">
@@ -3346,4 +3349,8 @@
 	.uni-navbar--fixed{
 		top:0rpx;
 	}
+	
+	/deep/ .uni-navbar--fixed {
+		top: 0px;
+	}
 </style>

pages/7305/BJQ7305.vue

@@ -1,5 +1,25 @@
 <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="eq">
 			<view class="leftImg" @click.stop="previewImg(device.devicePic?device.devicePic:formData.img)">
 				<image class="img" :src="device.devicePic?device.devicePic:formData.img" mode="aspectFit"></image>
@@ -162,7 +182,7 @@
 		updateLoading
 	} from '@/utils/loading.js'
 	import BleReceive from '@/utils/BleReceive';
-
+import Common from '@/utils/Common.js';
 
 	var ble = null;
 	var these = null;
@@ -176,6 +196,16 @@
 		data() {
 			return {
 				Status: {
+					apiType: '',
+					navbar: {
+						icons: [{
+							src: '/static/images/common/shape.png',
+							callback: this.gotoShare,
+							apiType:'listA'
+						}],
+						title: 'BJQ6155'
+					
+					},
 					pageHide: false,
 					Pop: {
 						showPop: false, //是否显示弹窗
@@ -265,7 +295,8 @@
 					alarmStatus: null,
 					detailPageUrl: "/pages/6155/deviceDetail",
 					showConfirm: false
-				}
+				},
+				permissions: []
 
 			}
 		},
@@ -289,7 +320,17 @@
 
 				let device = data.data;
 				these.device = device;
-
+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) {
+							if (res.data.permission) {
+								these.permissions = res.data.permission.split(',');
+							}
+						}
+					});
+				}
 				let f = ble.data.LinkedList.find((v) => {
 					if (v.macAddress == device.deviceMac) {
 						console.log("找到设备了", v);
@@ -384,6 +425,36 @@
 			}
 		},
 		methods: {
+			handleRightClick(item, s) {
+				if (item && item.callback) {
+					item.callback(item, s);
+				} else {
+					uni.showModal({
+						content: '敬请期待'
+					})
+			
+				}
+			},
+			navigatorBack() {
+				uni.navigateBack();
+			},
+			gotoShare(item, s) {
+				uni.navigateTo({
+					url: '/pages/common/share/index',
+					events: {
+						ack: function(data) {}
+					},
+					success: (res) => {
+						let json = {
+							persissonType: '7305'
+						};
+						Object.assign(json, this.device);
+						res.eventChannel.emit('share', {
+							data: json
+						});
+					}
+				})
+			},
 			deviceRecovry(res) {
 				if (this.Status.pageHide) {
 					return;
@@ -815,6 +886,19 @@
 				});
 			},
 			UploadOpenImg: function() {
+				if (!this.permissions.includes('3') && this.Status.apiType !== 'listA') {
+				
+					this.showPop({
+						message: '无操作权限',
+						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+						okCallback: null,
+						buttonText: "确定"
+					})
+					return;
+				}
+				
 				//上传开机画面
 				this.Status.BottomMenu.menuItems = [];
 				this.Status.BottomMenu.title = "上传开机画面";
@@ -822,7 +906,18 @@
 				this.Status.BottomMenu.show = true;
 			},
 			ModeSetting: function(type) {
+if (!this.permissions.includes('1') && this.Status.apiType !== 'listA') {
 
+					this.showPop({
+						message: '无操作权限',
+						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+						okCallback: null,
+						buttonText: "确定"
+					})
+					return;
+				}
 				this.formData.mode = type;
 				let items = [];
 				let title = '';
@@ -1055,6 +1150,18 @@
 				these.Status.Pop.showPop = true;
 			},
 			sendUsr() {
+				if (!this.permissions.includes('4') && this.Status.apiType !== 'listA') {
+				
+					this.showPop({
+						message: '无操作权限',
+						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+						okCallback: null,
+						buttonText: "确定"
+					})
+					return;
+				}
 				let f = this.getDevice();
 				if (!f) {
 					these.showBleUnConnect()
@@ -1258,6 +1365,19 @@
 				clearTimeout(BrighInteval)
 				//给蓝牙设备发送信号更新亮度
 				BrighInteval = setTimeout(() => {
+					if (!this.permissions.includes('1') && this.Status.apiType !== 'listA') {
+					
+						this.showPop({
+							message: '无操作权限',
+							iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+							borderColor: "#e034344d",
+							buttonBgColor: "#E03434",
+							okCallback: null,
+							buttonText: "确定"
+						})
+						return;
+					}
+					
 					this.sendBrightness();
 					this.setBleFormData();
 				}, 100);
@@ -1776,4 +1896,71 @@
 		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;
+		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>

utils/Common.js

@@ -218,7 +218,7 @@ export default {
 				value: "1",
 				label: "灯光模式",
 				checked: false,
-				type: ['6170', '670','102','6155']
+				type: ['6170', '670','102','6155','650','7305']
 			},
 			{
 				value: "2",
@@ -230,13 +230,13 @@ export default {
 				value: "3",
 				label: "开机画面",
 				checked: false,
-				type: ['210', '6170', '670','6155']
+				type: ['210', '6170', '670','6155','650','7305']
 			},
 			{
 				value: "4",
 				label: "人员信息登记",
 				checked: false,
-				type: ['210', '6170', '670','6155']
+				type: ['210', '6170', '670','6155','650','7305']
 			},
 			{
 				value: "5",
@@ -253,12 +253,12 @@ export default {
 				value: "41",
 				label: "静电探测",
 				checked: false,
-				type: ['670']
+				type: ['670','650']
 			}, {
 				value: "42",
 				label: "SOS",
 				checked: false,
-				type: ['670']
+				type: ['670','4877']
 			},
 			{
 				value: "43",
@@ -302,6 +302,46 @@ export default {
 				checked: false,
 				type: ['102']
 			},
+			
+			{
+				value: "50",
+				label: "报警模式",
+				checked: false,
+				type: ['100']
+			},
+			
+			{
+				value: "51",
+				label: "警示灯",
+				checked: false,
+				type: ['100']
+			},
+			
+			{
+				value: "52",
+				label: "语音管理",
+				checked: false,
+				type: ['100']
+			},
+			
+			{
+				value: "53",
+				label: "箭头模式",
+				checked: false,
+				type: ['4877']
+			},
+			{
+				value: "54",
+				label: "配组设置",
+				checked: false,
+				type: ['4877']
+			},
+			{
+				value: "55",
+				label: "修改信道",
+				checked: false,
+				type: ['4877']
+			},
 		]
 
 		let arr = [];