merge upstream

Reviewed-on: dyf/APP#22

api/6075/6075.js

@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+export function deviceDetail(id) {
+  return request({
+    url: `/app/bjq6075/device/${id}`,
+    method: 'get',
+  })
+}
+// 获取设备分享详细信息
+export function deviceShareId(id) {
+  return request({
+    url: `/app/bjq6075/device/getShareInfo/${id}`,
+    method: 'get',
+  })
+}
+// 人员信息登记
+export function registerPersonInfo(data) {
+  return request({
+    url: `/app/bjq6075/device/registerPersonInfo`,
+    method: 'post',
+	data: data
+  })
+}
+// 发送信息
+export function deviceSendMessage(data) {
+  return request({
+    url: `/app/bjq6075/device/sendMessage`,
+    method: 'post',
+	data: data
+  })
+}
+// 灯光模式设置
+export function lightModeSettings(data) {
+  return request({
+    url: `/app/bjq6075/device/lightModeSettings`,
+    method: 'post',
+	data: data
+  })
+}
+// 激光模式设置
+export function laserModeSettings(data) {
+  return request({
+    url: `/app/bjq6075/device/laserModeSettings`,
+    method: 'post',
+	data: data
+  })
+}
+// 灯光亮度设置
+export function lightBrightnessSettings(data) {
+  return request({
+    url: `/app/bjq6075/device/lightBrightnessSettings`,
+    method: 'post',
+	data: data
+  })
+}
+// 地图逆解析
+export function mapReverseGeocoding(data) {
+  return request({
+    url: `/app/bjq6075/device/mapReverseGeocoding`,
+    method: 'post',
+	data: data
+  })
+}

config/index.js

@@ -2,7 +2,7 @@
 const config = {
 	// 开发环境
 	development: {
-		BASE_URL: 'http://192.168.110.56:8000',
+		BASE_URL: 'http://192.168.2.23:8000',
 		API_PREFIX: '',
 		// MQTT 配置
 		MQTT_HOST: 'www.cnxhyc.com',

pages/670/HBY670.vue

@@ -815,7 +815,6 @@
 							ack: function(data) {}
 						},
 						success: (res) => {
-							debugger;
 							let json = {
 								persissonType: '670'
 							};

pages/common/login/index.vue

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

pages/common/shareDevices/index.vue

@@ -240,6 +240,7 @@
 				console.log(data, 'data1t111');
 				this.itemInfo = data.data;
 				this.permissions=Common.getPermissions(this.itemInfo.persissonType);
+				console.log(this.itemInfo.persissonType,'this.itemInfo.persissonType');
 			})
 		}
 	};