pref：优化mp端登录背景，名称

@@ -81,7 +81,7 @@
 		"appid": "wx99c411dc3c5571ef",
 		"appid": "wx99c411dc3c5571ef",
 		"setting": {
 		"setting": {
 			"urlCheck": false,
 			"urlCheck": false,
-			"minified": false,
+			"minified": true,
 			"es6": true,
 			"es6": true,
 			"postcss": true
 			"postcss": true
 		},
 		},
@@ -91,9 +91,7 @@
 				"desc": "如果没有位置信息则使用当前定位"
 				"desc": "如果没有位置信息则使用当前定位"
 			}
 			}
 		},
 		},
-		"requiredPrivateInfos": [
-			"getLocation"
-		],
+		"requiredPrivateInfos": ["getLocation"],
 		"lazyCodeLoading": "requiredComponents",
 		"lazyCodeLoading": "requiredComponents",
 		//开启分包优化
 		//开启分包优化
 		"optimization": {
 		"optimization": {

@@ -8,12 +8,12 @@
 			<view class="u-flex u-p-l-30 u-p-r-20 u-p-t-75 u-p-b-30">
 			<view class="u-flex u-p-l-30 u-p-r-20 u-p-t-75 u-p-b-30">
 				<block v-if="userInfo.isToken || userInfo.isThirdLogin">
 				<block v-if="userInfo.isToken || userInfo.isThirdLogin">
 					<view @click.top="openPersonalInfo" class="u-m-r-20">
 					<view @click.top="openPersonalInfo" class="u-m-r-20">
-						<image class="avatar" mode="aspectFill" :src="plateInfo.logo || userInfo.avatar || thirdObj.avatarUrl||'../../static/logo.png'"></image>
+						<image class="avatar" mode="aspectFill" :src="mpOwnConfig.logo || userInfo.avatar || thirdObj.avatarUrl || '../../static/logo.png'"></image>
 					</view>
 					</view>
 					<view class="u-flex-1" @click.top="openPersonalInfo">
 					<view class="u-flex-1" @click.top="openPersonalInfo">
 						<view class="nickName u-flex">
 						<view class="nickName u-flex">
-							<view class="name u-m-r-10" v-if="userInfo.realName || userInfo.nickName">
-								<text style="#FFFFFF;font-size: 18px;">{{ userInfo.realName || userInfo.nickName }}</text>
+							<view class="name u-m-r-10" v-if="mpOwnConfig.name || userInfo.realName || userInfo.nickName">
+								<text style="#FFFFFF;font-size: 18px;">{{ mpOwnConfig.name || userInfo.realName || userInfo.nickName }}</text>
 							</view>
 							</view>
 							<view v-if="userInfo.isThirdLogin" @click.stop="clickAccountFunc" class="detail"><text class="text">绑定账号</text></view>
 							<view v-if="userInfo.isThirdLogin" @click.stop="clickAccountFunc" class="detail"><text class="text">绑定账号</text></view>
 						</view>
 						</view>
@@ -154,9 +154,13 @@ export default {
 				appUserSecret: ''
 				appUserSecret: ''
 			},
 			},
 			thirdObj: {},
 			thirdObj: {},
-			getOpenId: ''
+			getOpenId: '',
+			mpOwnConfig: {}
 		};
 		};
 	},
 	},
+	mounted() {
+		this.getPlateForm();
+	},
 	onLoad(e) {
 	onLoad(e) {
 		// 隐藏原生的tabbar
 		// 隐藏原生的tabbar
 		uni.hideTabBar();
 		uni.hideTabBar();
@@ -171,6 +175,18 @@ export default {
 		...mapState(['userInfo', 'plateInfo'])
 		...mapState(['userInfo', 'plateInfo'])
 	},
 	},
 	methods: {
 	methods: {
+		//获取平台定制信息
+		getPlateForm() {
+			uni.$u.http.get('/yt/app_design/get').then(res => {
+				if (res) {
+					this.mpOwnConfig = {
+						bg: res.background,
+						logo: res.logo,
+						name: res.name
+					};
+				}
+			});
+		},
 		handlePhoneFunc(e) {
 		handlePhoneFunc(e) {
 			//前三后四位显示
 			//前三后四位显示
 			const result = /^(\d{3})\d{4}(\d{4})$/;
 			const result = /^(\d{3})\d{4}(\d{4})$/;
@@ -268,7 +284,11 @@ export default {
 						}
 						}
 					})
 					})
 					.catch(e => {
 					.catch(e => {
-						uni.$u.toast(e.data?.msg);
+						let msg = e.data?.msg;
+						if (msg == undefined) {
+							msg = '';
+						}
+						uni.$u.toast(msg);
 						this.show = true;
 						this.show = true;
 					});
 					});
 			} else {
 			} else {
@@ -330,7 +350,11 @@ export default {
 						this.saveUserInfo();
 						this.saveUserInfo();
 					})
 					})
 					.catch(e => {
 					.catch(e => {
-						uni.$u.toast(e.data?.msg);
+						let msg = e.data?.msg;
+						if (msg == undefined) {
+							msg = '';
+						}
+						uni.$u.toast(msg);
 						this.show = true;
 						this.show = true;
 					});
 					});
 			}
 			}

@@ -153,10 +153,11 @@ export default {
 				});
 				});
 				return;
 				return;
 			} else if (!passReg.test(this.password) && !passReg.test(this.rePassword)) {
 			} else if (!passReg.test(this.password) && !passReg.test(this.rePassword)) {
-				uni.showToast({
-					title: '密码格式不正确（至少一个大写英文字母、至少一个小写英文字母、至少一位数字、至少一个特殊字符、最少八个字符）~',
-					icon: 'none',
-					duration: 3000
+				//uni.showToast，字数过长，会造成手机上显示不完全，官方bug，采用uni.showModal
+				uni.showModal({
+					title: '提示',
+					content: '密码格式不正确（至少一个大写英文字母、至少一个小写英文字母、至少一位数字、至少一个特殊字符、最少八个字符）~',
+					showCancel: false
 				});
 				});
 				return;
 				return;
 			}
 			}

 <template>
 <template>
-	<view class="login-page">
+	<view
+		class="login-page"
+		style="background-size: 750rpx 1400rpx;	min-height: 100vh;"
+		:style="{ backgroundImage: 'url(' + (mpOwnConfig.bg !== undefined ? mpOwnConfig.bg : `${defaultLogo}`) + ')' }"
+	>
 		<!-- 公共组件-每个页面必须引入 -->
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<public-module></public-module>
 		<view class="u-flex login-main">
 		<view class="u-flex login-main">
 			<view class="content">
 			<view class="content">
 				<view class="hello login-text-muted">您好,</view>
 				<view class="hello login-text-muted">您好,</view>
 				<!-- <view class="hello-welcome login-text-muted">欢迎来到ThingsKit!</view> -->
 				<!-- <view class="hello-welcome login-text-muted">欢迎来到ThingsKit!</view> -->
-				<view style="width:587rpx" class="text-clip  hello-welcome login-text-muted">欢迎来到{{ plateInfo.name !== undefined ? plateInfo.name : 'ThingsKit' }}!</view>
+				<view style="width:587rpx" class="text-clip  hello-welcome login-text-muted">欢迎来到{{ mpOwnConfig.name !== undefined ? mpOwnConfig.name : 'ThingsKit' }}!</view>
 			</view>
 			</view>
 		</view>
 		</view>
 
 
@@ -60,7 +64,9 @@ export default {
 			},
 			},
 			showPassword: true,
 			showPassword: true,
 			code: '',
 			code: '',
-			openid: ''
+			openid: '',
+			mpOwnConfig: {},
+			defaultLogo: '/static/login.png'
 		};
 		};
 	},
 	},
 	onLoad() {
 	onLoad() {
@@ -78,7 +84,22 @@ export default {
 	computed: {
 	computed: {
 		...mapState(['plateInfo'])
 		...mapState(['plateInfo'])
 	},
 	},
+	mounted() {
+		this.getPlateForm();
+	},
 	methods: {
 	methods: {
+		//获取平台定制信息
+		getPlateForm() {
+			uni.$u.http.get('/yt/app_design/get').then(res => {
+				if (res) {
+					this.mpOwnConfig = {
+						bg: res.background,
+						logo: res.logo,
+						name: res.name
+					};
+				}
+			});
+		},
 		...mapMutations(['setUserInfo', 'setPlateInfo']),
 		...mapMutations(['setUserInfo', 'setPlateInfo']),
 		...mapActions(['updateBadgeTotal']),
 		...mapActions(['updateBadgeTotal']),
 		//微信授权登录
 		//微信授权登录

@@ -4,7 +4,7 @@ export const state = {
 	//存储告警徽标数据
 	//存储告警徽标数据
 	badgeInfo: 0,
 	badgeInfo: 0,
 	//平台信息
 	//平台信息
-	plateInfo:{}
+	plateInfo: {}
 };
 };
 export const mutations = {
 export const mutations = {
 	//储存用户信息
 	//储存用户信息