merge upstream

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');
 			})
 		}
 	};