Merge branch 'ft-dev' into 'main'

fix：app端tabbar配置图片

See merge request huang/thingskit-app!58

 .alarm-detail-page {
 .alarm-detail-page {
 	padding: 30rpx;
 	padding: 30rpx;
-	background: #f8f9fa;
+	height: 100vh;
+	background-color: #f8f9fa;
 }
 }
 .alarm-detail-column {
 .alarm-detail-column {
 	border-radius: 10px;
 	border-radius: 10px;

@@ -81,6 +81,7 @@ export default {
 			systemInfo: base.systemInfo,
 			systemInfo: base.systemInfo,
 			tabIndex: 0,
 			tabIndex: 0,
 			path: '', //当前路径
 			path: '', //当前路径
+			//#ifdef MP
 			list: [
 			list: [
 				{
 				{
 					name: '首页',
 					name: '首页',
@@ -107,7 +108,37 @@ export default {
 					icon: '../../../static/my-un.png',
 					icon: '../../../static/my-un.png',
 					iconFill: '../../../static/my-yes.png'
 					iconFill: '../../../static/my-yes.png'
 				}
 				}
+			],
+			//#endif
+			//#ifdef APP-PLUS
+			list: [
+				{
+					name: '首页',
+					url: 'pages/index/index',
+					icon: '/static/home-un.png',
+					iconFill: '/static/home-yes.png'
+				},
+				{
+					name: '设备',
+					url: 'pages/device/device',
+					icon: '/static/device-un.png',
+					iconFill: '/static/device-yes.png'
+				},
+				{
+					name: '告警',
+					url: 'pages/alarm/alarm',
+					icon: '/static/alert-un.png',
+					iconFill: '/static/alert-yes.png',
+					badge: this.$store.state.badgeInfo
+				},
+				{
+					name: '我的',
+					url: 'pages/personal/personal',
+					icon: '/static/my-un.png',
+					iconFill: '/static/my-yes.png'
+				}
 			]
 			]
+			//#endif
 		};
 		};
 	},
 	},
 	created() {
 	created() {
@@ -125,7 +156,7 @@ export default {
 	},
 	},
 	methods: {
 	methods: {
 		onTabbar(index) {
 		onTabbar(index) {
-			this.list[2].badge =this.$store.state.badgeInfo
+			this.list[2].badge = this.$store.state.badgeInfo;
 
 
 			if (this.list[index].url) {
 			if (this.list[index].url) {
 				if (this.path !== this.list[index].url) {
 				if (this.path !== this.list[index].url) {
@@ -147,4 +178,4 @@ export default {
 	right: 0;
 	right: 0;
 	z-index: 1000;
 	z-index: 1000;
 }
 }
-</style>
+</style>

@@ -10,6 +10,7 @@ if (process.env.NODE_ENV === 'development') {
 } else if (process.env.NODE_ENV === 'production') {
 } else if (process.env.NODE_ENV === 'production') {
 	// 生产环境
 	// 生产环境
 	// baseUrl = 'http://47.99.141.212:8080/api'
 	// baseUrl = 'http://47.99.141.212:8080/api'
+	baseUrl = 'https://dev.thingskit.com/api'
 }
 }
 
 
 let systemInfo = {
 let systemInfo = {

@@ -84,6 +84,8 @@ export default {
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 .command-detail {
 .command-detail {
 	padding: 0 30rpx;
 	padding: 0 30rpx;
+	height: 100vh;
+	background-color: #f8f9fa;
 	.detail-top {
 	.detail-top {
 		height: 118rpx;
 		height: 118rpx;
 		width: 690rpx;
 		width: 690rpx;

 {
 {
 	"name": "yun-teng-app",
 	"name": "yun-teng-app",
-	"appid": "__UNI__C873643",
-	"description": "thingskit小程序",
+	"appid": "__UNI__AD0D64F",
+	"description": "thingskit",
 	"versionName": "1.0.0",
 	"versionName": "1.0.0",
 	"versionCode": 100,
 	"versionCode": 100,
 	"transformPx": false,
 	"transformPx": false,
@@ -15,7 +15,13 @@
 			"autoclose": true,
 			"autoclose": true,
 			"delay": 0
 			"delay": 0
 		},
 		},
-		"modules": {},
+		"modules": {
+			"VideoPlayer": {},
+			"Contacts": {},
+			"OAuth": {},
+			"Messaging": {},
+			"FaceID": {}
+		},
 		"distribute": {
 		"distribute": {
 			"android": {
 			"android": {
 				"permissions": [
 				"permissions": [
@@ -29,13 +35,19 @@
 					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
 					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
 					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
 					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
 					"<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
 					"<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
+					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
 					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
 					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
 					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
 					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
 					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
 					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.READ_SMS\"/>",
 					"<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
 					"<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
+					"<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
 					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
 					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
 					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
 					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+					"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SMS\"/>"
 				]
 				]
 			},
 			},
 			"ios": {},
 			"ios": {},
@@ -51,7 +63,16 @@
 						"appkey_android": ""
 						"appkey_android": ""
 					}
 					}
 				},
 				},
-				"maps": {}
+				"maps": {},
+				"oauth": {}
+			},
+			"splashscreen": {
+				"androidStyle": "default",
+				"android": {
+					"hdpi": "C:/Users/YunTeng/Pictures/logo.png",
+					"xhdpi": "C:/Users/YunTeng/Pictures/logo.png",
+					"xxhdpi": "C:/Users/YunTeng/Pictures/logo.png"
+				}
 			}
 			}
 		}
 		}
 	},
 	},

@@ -152,34 +152,34 @@
 		"backgroundColorTop": "#FFFFFF"
 		"backgroundColorTop": "#FFFFFF"
 	},
 	},
 	"tabBar": {
 	"tabBar": {
-		"color": "#ffffff",
-		"selectedColor": "#ffffff",
+		"color": "#000000",
+		"selectedColor": "#377dff",
 		"borderStyle": "black",
 		"borderStyle": "black",
-		"backgroundColor": "#ffffff",
+		"backgroundColor": "#606266",
 		"list": [{
 		"list": [{
 				"pagePath": "pages/index/index",
 				"pagePath": "pages/index/index",
-				"iconPath": "static/basics.png",
-				"selectedIconPath": "static/basics.png",
+				"iconPath": "static/home-un.png",
+				"selectedIconPath": "static/home-yes.png",
 				"text": "首页"
 				"text": "首页"
 			},
 			},
 			{
 			{
 				"pagePath": "pages/device/device",
 				"pagePath": "pages/device/device",
-				"iconPath": "static/basics.png",
-				"selectedIconPath": "static/basics.png",
+				"iconPath": "static/device-un.png",
+				"selectedIconPath": "static/device-yes.png",
 				"text": "设备"
 				"text": "设备"
 			},
 			},
 			{
 			{
 				"pagePath": "pages/alarm/alarm",
 				"pagePath": "pages/alarm/alarm",
-				"iconPath": "static/basics.png",
-				"selectedIconPath": "static/basics.png",
+				"iconPath": "static/alert-un.png",
+				"selectedIconPath": "static/alert-yes.png",
 				"text": "告警"
 				"text": "告警"
 			},
 			},
 			{
 			{
 				"pagePath": "pages/personal/personal",
 				"pagePath": "pages/personal/personal",
-				"iconPath": "static/basics.png",
-				"selectedIconPath": "static/basics.png",
+				"iconPath": "static/my-un.png",
+				"selectedIconPath": "static/my-yes.png",
 				"text": "我的"
 				"text": "我的"
 			}
 			}
 		]
 		]
 	}
 	}
-}
+}

@@ -14,13 +14,14 @@
 						<image src="../../static/shaixuan.png" />
 						<image src="../../static/shaixuan.png" />
 					</view>
 					</view>
 				</view>
 				</view>
+				<u-line />
 				<view class="org">
 				<view class="org">
 					<u-cell @click="openOrg" isLink title="组织关系" :border="false">
 					<u-cell @click="openOrg" isLink title="组织关系" :border="false">
 						<view slot="label" class="label" style="display: flex; align-items: center;margin-top: 20rpx;">
 						<view slot="label" class="label" style="display: flex; align-items: center;margin-top: 20rpx;">
-							<image src="../../static/org.png" style="width: 24rpx;height: 28rpx;top: -30rpx;"></image>
+							<image src="../../static/org.png" style="width: 24rpx;height: 28rpx;"></image>
 							<view style="margin-left: 10rpx; color: #666;">
 							<view style="margin-left: 10rpx; color: #666;">
 								告警数:
 								告警数:
-								<text class="text-org-total" style="margin-left: 20rpx;">{{ alertTotal }}</text>
+								<text style="margin-left: 20rpx;">{{ alertTotal }}</text>
 							</view>
 							</view>
 						</view>
 						</view>
 					</u-cell>
 					</u-cell>
@@ -523,4 +524,30 @@ export default {
 	height: 100%;
 	height: 100%;
 	width: 100%;
 	width: 100%;
 }
 }
+.device-top {
+	padding: 10rpx 30rpx;
+	background-color: #fff;
+	.search {
+		display: flex;
+		justify-content: space-between;
+		padding-bottom: 10rpx;
+		.search-left {
+			width: 580rpx;
+			background-color: #f8f9fa;
+			border-radius: 200rpx;
+		}
+		.search-right {
+			display: flex;
+			align-items: center;
+			text {
+				color: #333;
+				font-size: 14px;
+			}
+			image {
+				width: 40rpx;
+				height: 40rpx;
+			}
+		}
+	}
+}
 </style>
 </style>

 .set-page {
 .set-page {
 	padding: 0rpx 30rpx;
 	padding: 0rpx 30rpx;
-	background: #f8f9fa;
+	height: 100vh;
+	background-color: #f8f9fa;
 	.submit {
 	.submit {
 		margin-top: 60rpx;
 		margin-top: 60rpx;
 		color: #fff;
 		color: #fff;

@@ -127,11 +127,12 @@ export default {
 									uni.showToast({
 									uni.showToast({
 										title: '第三方账号登录成功~',
 										title: '第三方账号登录成功~',
 										icon: 'none'
 										icon: 'none'
-									});
-									this.saveUserInfo();
-									this.getAlarmTotalData();
-									uni.reLaunch({
-										url: '../../pages/personal/personal'
+									}).then(async res => {
+										this.saveUserInfo();
+										await this.getAlarmTotalData();
+										uni.reLaunch({
+											url: '/pages/personal/personal'
+										});
 									});
 									});
 								}
 								}
 							})
 							})