Merge branch 'master' of http://172.16.90.201:3000/parking/parking_pda

App.vue

@@ -1,20 +1,14 @@
 <script>
+	//#ifdef APP-PLUS
 	var AndroidLog = uni.requireNativePlugin("AndroidLog")
 	var device = uni.requireNativePlugin("DeviceInfo")
+	//#endif
 	export default {
 		onLaunch: function() {
+			//#ifdef APP-PLUS
 			//判断客户端类别
 			const _handlePush = function(message) {
-				// console.log("接收到推送消息:" ,message);
-				// alert(message)
 				//{"message":{"__UUID__":"androidPushMsg222631973","appid":"__UNI__29ECCC8","content":"{\"type\":2,\"jumpTo\":\"pages/login/login\"}","payload":{"jumpTo":"pages/login/login","type":2},"title":"智慧停车PDA"}}
-				AndroidLog.info({
-					message: message.content
-				})
-				let content = JSON.parse(message.content)
-				AndroidLog.info({
-					message: content.jumpTo
-				})
 
 			};
 			// 
@@ -40,14 +34,35 @@
 					clearTimeout()
 				}
 			}, 400);
-			// 
-
 			//监听系统通知栏消息点击事件  
 			plus.push.addEventListener('click', _handlePush, false);
-
 			//监听接收透传消息事件
 			plus.push.addEventListener('receive', _handlePush, false);
-			// this.$wxApi.config();
+			//#endif
+			//#ifdef H5
+			  this.$u.api.deviceReg({
+			  		deviceNo: '123456789',
+			  		pushCid: '123456789'
+			  	})
+			  	.then(res => {
+			  		if (res.code == 200) {
+						uni.showToast({
+							title: '设备注册成功',
+							duration: 2000
+						});
+			  		} else {
+						uni.showToast({
+							title: '设备注册失败',
+							duration: 2000
+						});
+			  		}
+			  	}).catch(err => {
+					uni.showToast({
+						title: '设备注册失败',
+						duration: 2000
+					});
+			  	});
+			//#endif
 		},
 		onShow: function() {
 			// console.log('App Show')

pages/index/index.vue

@@ -86,10 +86,12 @@
 </template>
 
 <script>
+	//#ifdef APP-PLUS
 	var ALog = uni.requireNativePlugin("AndroidLog")
 	var location = uni.requireNativePlugin("Location")
 	var speak = uni.requireNativePlugin("SpeechPlug")
 	var device = uni.requireNativePlugin("DeviceInfo")
+	//#endif
 	export default {
 		data() {
 			return {
@@ -143,22 +145,15 @@
 				
 			},
 			getLocation(){
-				ALog.info({msg:'请求定位'})
 				uni.getLocation({
 					type:"gcj02",
 					success : function (res) {
-						// console.log("定位返回信息:", res)
-						// alert(res.longitude + "," + res.latitude )
-						ALog.info({msg:res})
 						var dst = '26.58751,106.78329';
 						var src = res.latitude + ',' + res.longitude;
 						var locRet = location.distance(src, dst)
-						ALog.info({msg:locRet.distance})
-						
 					},
 					fail: function(res){
-					
-						ALog.info({msg:'请求错误',err:res})
+
 					}
 				})
 			},

pages/login/login.vue

@@ -23,7 +23,9 @@
 </template>
 
 <script>
+	//#ifdef APP-PLUS
 	var device = uni.requireNativePlugin("DeviceInfo")
+	//#endif
 	export default {
 		data() {
 			return {
@@ -69,8 +71,13 @@
 		methods: {
 
 			handleLogin(){
-				this.form.deviceNo = '123456789';
-				// this.form.deviceNo = device?.getDeviceInfo()?.deviceId;
+				
+				//#ifdef APP-PLUS
+				this.form.deviceNo = device?.getDeviceInfo()?.deviceId;
+				//#endif
+				//#ifdef H5
+				 this.form.deviceNo = '123456789';
+				//#endif
 				this.$u.api.login(this.form)
 				.then(res=>{
 					this.$refs.uToast.show({

pages/setting/setting.vue

@@ -27,7 +27,9 @@
 </template>
 
 <script>
+	//#ifdef APP-PLUS
 	var device = uni.requireNativePlugin("DeviceInfo")
+	//#endif
 	export default{
 		data(){
 			return{
@@ -54,7 +56,15 @@
 				});
 			},
 			onPrintFeed(){
+				//#ifdef APP-PLUS
 				device.printFeed(10);
+				//#endif
+				//#ifdef H5
+				uni.showToast({
+					title: '非APP环境',
+					duration: 2000
+				});
+				//#endif
 			},
 			onLoginOut(){
 				uni.showModal({