Merge branch 'dev-ft' into 'main'

fix:修改告警分页和绑定账号

See merge request huang/thingskit-app!39

 <script>
-    import base from "@/config/baseUrl";
-    import store from "@/store";
-    // #ifdef APP-PLUS
-    import APPUpdate from '@/uni_modules/zhouWei-APPUpdate/js_sdk/appUpdate';
-    // #endif
-	
-    import { mpUpData,scene } from '@/config/common';
-	export default {
-		onLaunch(e) {
-			//取出缓存数据
-			store.commit('setCacheData');
-            //获取二维码信息
-            scene(e) 
-            // #ifdef APP-PLUS
-            APPUpdate() //检测app更新
-            // #endif
-		},
-		onShow(e) {
-			// #ifdef MP
-			mpUpData() //检测小程序更新
-			// #endif
-		},
-		onHide() {
-			console.log('App Hide')
-		}
+import base from '@/config/baseUrl';
+import store from '@/store';
+// #ifdef APP-PLUS
+import APPUpdate from '@/uni_modules/zhouWei-APPUpdate/js_sdk/appUpdate';
+// #endif
+
+import { mpUpData, scene } from '@/config/common';
+export default {
+	//设置全局变量，解绑时从这里取
+	globalData: {
+		openId: ''
+	},
+	onLaunch(e) {
+		//取出缓存数据
+		store.commit('setCacheData');
+		//获取二维码信息
+		scene(e);
+		// #ifdef APP-PLUS
+		APPUpdate(); //检测app更新
+		// #endif
+	},
+	onShow(e) {
+		// #ifdef MP
+		mpUpData(); //检测小程序更新
+		// #endif
+	},
+	onHide() {
+		console.log('App Hide');
 	}
+};
 </script>
 
 <style lang="scss">
 /* #ifndef APP-NVUE */
-@import "@/uni_modules/uview-ui/index.scss";
+@import '@/uni_modules/uview-ui/index.scss';
 @import './style/iconfont.scss';
-@import "./style/common.scss";
+@import './style/common.scss';
 page {
-    background-color: #f5f5f5;
+	background-color: #f5f5f5;
 }
 // 隐藏滚动条
 ::-webkit-scrollbar {
-    width: 0;
-    height: 0;
-    color: transparent;
+	width: 0;
+	height: 0;
+	color: transparent;
 }
 /* #endif */
 </style>

@@ -85,6 +85,8 @@ uni.$u.http.interceptors.response.use(
 			uni.reLaunch({
 				url: "/publicLoginSubPage/public/login",
 			});
+			// 清空登录信息
+			store.commit("emptyUserInfo");
 			show = false;
 		} else {
 			errorData = message || "";

@@ -229,10 +229,17 @@ export default {
 			timeArea,
 			ordId: '',
 			detailStatus: false,
-			alertTotal: 0
+			alertTotal: 0,
+			searchAlarmText: '',
+			startTimeVa: '',
+			endTimeVa: '',
+			startTimeArea: '',
+			endTimeArea: '',
+			type: null
 		};
 	},
 	onShow() {
+		this.page.num = 1;
 		if (this.detailStatus) {
 			this.loadData(1, null, null, null, null, null, null);
 		}
@@ -243,6 +250,7 @@ export default {
 	onHide() {
 		this.ordId = '';
 		this.detailStatus = false;
+		this.type = null;
 	},
 	onLoad(e) {
 		// 隐藏原生的tabbar
@@ -251,13 +259,12 @@ export default {
 			this.loadData(1, null, null, null, null, null, null);
 		} else {
 			let params = JSON.parse(e.type);
-			let type;
 			if (Array.isArray(params)) {
-				type = params.join(',');
+				this.type = params.join(',');
 			} else {
-				type = params;
+				this.type = params;
 			}
-			this.loadData(1, type, null, null, null, null, null);
+			this.loadData(1, this.type, null, null, null, null, null);
 		}
 	},
 	watch: {
@@ -267,6 +274,10 @@ export default {
 	},
 	methods: {
 		inputChanged(e) {
+			this.resetData();
+			this.topBack();
+			this.searchAlarmText = e;
+			this.page.num = 1;
 			this.loadData(1, null, null, null, null, null, null, e);
 		},
 		getAlertStatus(e, i) {
@@ -285,44 +296,39 @@ export default {
 			this.current4 = i;
 			this.selectTimeVal = e.value;
 			let curTime = new Date();
-			const formatS = curTime
-				.getTime()
-				.toString()
-				.substring(0, 10);
+			const formatS = curTime.getTime();
 			let addMinute = new Date(curTime.setMinutes(curTime.getMinutes() + this.selectTimeVal));
-			const formatE = addMinute
-				.getTime()
-				.toString()
-				.substring(0, 10);
+			const formatE = addMinute.getTime();
 			this.timeData.getTimeGapS = formatS;
 			this.timeData.getTimeGapE = formatE;
 		},
 		queryData() {
+			this.topBack();
+			this.page.num = 1;
 			let date1 = new Date(this.timeData.selectTime[0]);
 			let date2 = new Date(this.timeData.selectTime[1]);
-			let startTimeVa, endTimeVa;
 			if (this.timeData.selectTime.length == 0) {
-				startTimeVa = '';
-				endTimeVa = '';
+				this.startTimeVa = '';
+				this.endTimeVa = '';
 			} else {
-				startTimeVa = date1
-					.getTime()
-					.toString()
-					.substring(0, 10);
-				endTimeVa = date2
-					.getTime()
-					.toString()
-					.substring(0, 10);
+				this.startTimeVa = date1.getTime();
+				this.endTimeVa = date2.getTime();
 			}
-			let startTimeArea, endTimeArea;
 			if (this.timeData.getTimeGapS == '') {
-				startTimeArea = '';
-				endTimeArea = '';
+				this.startTimeArea = '';
+				this.endTimeArea = '';
 			} else {
-				startTimeArea = this.timeData.getTimeGapS;
-				endTimeArea = this.timeData.getTimeGapE;
+				this.startTimeArea = this.timeData.getTimeGapS;
+				this.endTimeArea = this.timeData.getTimeGapE;
 			}
-			this.loadData(1, this.alertStatusVal, startTimeVa ? startTimeVa : startTimeArea, endTimeVa ? endTimeVa : endTimeArea, this.alertLevelVal, this.deviceTypeVal);
+			this.loadData(
+				1,
+				this.alertStatusVal,
+				this.startTimeVa ? this.startTimeVa : this.startTimeArea,
+				this.endTimeVa ? this.endTimeVa : this.endTimeArea,
+				this.alertLevelVal,
+				this.deviceTypeVal
+			);
 			this.show = false;
 		},
 		resetData() {
@@ -338,6 +344,13 @@ export default {
 			this.timeDatagetTimeGapS = '';
 			this.timeDatagetTimeGapE = '';
 			this.range = [];
+			this.searchAlarmText = '';
+			this.startTimeVa = '';
+			this.endTimeVa = '';
+			this.startTimeArea = '';
+			this.endTimeArea = '';
+			this.ordId = '';
+			this.type = null;
 		},
 		bindImageUrl(e) {
 			switch (e) {
@@ -361,18 +374,50 @@ export default {
 					break;
 			}
 		},
+		//筛选数据让它回到顶部
+		topBack() {
+			uni.pageScrollTo({
+				scrollTop: 0, // 滚动到页面的目标位置  这个是滚动到顶部, 0
+				duration: 300 // 滚动动画的时长
+			});
+		},
 		/*下拉刷新的回调 */
 		downCallback() {
 			//联网加载数据
 			this.list.length = 0;
 			this.page.num = 1;
-			this.loadData(1);
+			this.loadData(this.page.num, null, null, null, null, null, null, null);
+			this.resetData();
 		},
 		/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
 		upCallback() {
-			//联网加载数据
-			this.page.num += 1;
-			this.loadData(this.page.num);
+			if (
+				this.type != null ||
+				this.alertStatusVal != '' ||
+				this.searchAlarmText != '' ||
+				this.deviceTypeVal != '' ||
+				this.alertLevelVal != '' ||
+				this.startTimeVa != '' ||
+				this.startTimeArea != '' ||
+				this.ordId != ''
+			) {
+				//联网加载数据
+				this.page.num += 1;
+				this.loadData(
+					this.page.num,
+					this.alertStatusVal ? this.alertStatusVal : this.type,
+					this.startTimeVa,
+					this.endTimeVa,
+					this.alertLevelVal,
+					this.deviceTypeVal,
+					this.ordId,
+					this.searchAlarmText
+				);
+			} else {
+				//联网加载数据
+				this.page.num += 1;
+				this.loadData(this.page.num);
+			}
 		},
 		loadData(pageNo, statusV, startTimeV, endTimeV, severityV, deviceTypeV, organizationV, alarmName) {
 			let that = this;
@@ -463,6 +508,6 @@ export default {
 	margin-top: -55rpx !important;
 }
 /deep/ .uni-calendar--fixed {
-	bottom: 72rpx !important;
+	bottom: 172rpx !important;
 }
 </style>

@@ -6,15 +6,16 @@
 			<!-- #ifdef MP || APP-PLUS -->
 			<!-- 登录 -->
 			<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">
+				<block v-if="userInfo.isToken || userInfo.isThirdLogin">
 					<view @click="openPersonalInfo" class="u-m-r-20">
 						<image class="avatar" mode="aspectFill" :src="userInfo.avatar == '' ? '/static/logo.png' : userInfo.avatar"></image>
 					</view>
 					<view class="u-flex-1">
-						<view @click="openPersonalInfo" class="nickName u-flex">
-							<view class="name u-m-r-10" v-if="userInfo.realName || userInfo.nickName">
+						<view class="nickName u-flex">
+							<view @click="openPersonalInfo" class="name u-m-r-10" v-if="userInfo.realName || userInfo.nickName">
 								<text style="#FFFFFF;font-size: 18px;">{{ userInfo.realName || userInfo.nickName }}</text>
 							</view>
+							<view v-if="userInfo.isThirdLogin" @click="clickAccountFunc" class="detail"><text class="text">绑定账号</text></view>
 						</view>
 						<view @click="openPersonalInfo" style="color:#FFFFFF;font-size: 14px;" v-if="userInfo.phoneNumber">{{ userInfo.phoneNumber | phone }}</view>
 					</view>
@@ -23,10 +24,7 @@
 					<view class="u-m-r-20" @click="openLoginFunc">
 						<view class="avatar u-flex"><image class="avatar" mode="aspectFill" src="../../static/logo.png"></image></view>
 					</view>
-					<view class="u-flex-1">
-						<view @click="openLoginFunc" class="u-font-lg click-login login-btn ">请点击登录</view>
-						<view v-if="!userInfo.isToken" @click="clickAccountFunc" class="detail"><text class="text">绑定账号</text></view>
-					</view>
+					<view class="u-flex-1"><view @click="openLoginFunc" class="u-font-lg click-login login-btn ">请点击登录</view></view>
 				</block>
 				<view v-if="userInfo.isToken" @click="openPersonalInfo"><u-icon name="arrow-right" color="white" size="13"></u-icon></view>
 			</view>
@@ -166,6 +164,7 @@ export default {
 			const params = JSON.parse(decodeURIComponent(e.obj));
 			this.thirdObj = params;
 		}
+		console.log('UserInfo', this.userInfo);
 	},
 	computed: {
 		...mapState(['userInfo'])
@@ -247,7 +246,8 @@ export default {
 							};
 							let userInfo = {
 								...resObj,
-								token: true //token用于判断是否登录
+								token: true, //token用于判断是否登录
+								isThirdLogin: false
 							};
 							if (userInfo.token) {
 								this.setUserInfo(userInfo);
@@ -308,7 +308,8 @@ export default {
 						};
 						let userInfo = {
 							...resObj,
-							token: true //token用于判断是否登录
+							token: true, //token用于判断是否登录
+							isThirdLogin: false
 						};
 						if (userInfo.token) {
 							this.setUserInfo(userInfo);

-/**
- * 本模块封装了Android、iOS的应用权限判断、打开应用权限设置界面、以及位置系统服务是否开启
- */
-
-var isIos
-// #ifdef APP-PLUS
-isIos = (plus.os.name == "iOS")
-// #endif
-
-// 判断推送权限是否开启
-function judgeIosPermissionPush() {
-	var result = 0;
-	var UIApplication = plus.ios.import("UIApplication");
-	var app = UIApplication.sharedApplication();
-	var enabledTypes = 0;
-	if (app.currentUserNotificationSettings) {
-		var settings = app.currentUserNotificationSettings();
-		enabledTypes = settings.plusGetAttribute("types");
-		if (enabledTypes == 0) {
-			console.log("推送权限没有开启");
-		} else {
-			result = 1;
-			console.log("已经开启推送功能!")
-		}
-		plus.ios.deleteObject(settings);
-	} else {
-		enabledTypes = app.enabledRemoteNotificationTypes();
-		if (enabledTypes == 0) {
-			console.log("推送权限没有开启!");
-		} else {
-			result = 1;
-			console.log("已经开启推送功能!")
-		}
-		console.log("enabledTypes2:" + enabledTypes);
-	}
-	plus.ios.deleteObject(app);
-	plus.ios.deleteObject(UIApplication);
-	return result;
-}
-
-// 判断定位权限是否开启
-function judgeIosPermissionLocation() {
-	var result = 0;
-	var cllocationManger = plus.ios.import("CLLocationManager");
-	var status = cllocationManger.authorizationStatus();
-	result = (status != 2) ? 1 : 0;
-	console.log("定位权限开启：" + result);
-	// 以下代码判断了手机设备的定位是否关闭，推荐另行使用方法 checkSystemEnableLocation
-	/* var enable = cllocationManger.locationServicesEnabled();
-	var status = cllocationManger.authorizationStatus();
-	console.log("enable:" + enable);
-	console.log("status:" + status);
-	if (enable && status != 2) {
-		result = true;
-		console.log("手机定位服务已开启且已授予定位权限");
-	} else {
-		console.log("手机系统的定位没有打开或未给予定位权限");
-	} */
-	plus.ios.deleteObject(cllocationManger);
-	return {
-		result: result,
-		permissionName: "定位"
-	};
-}
-
-// 判断麦克风权限是否开启
-function judgeIosPermissionRecord() {
-	var result = 0;
-	var avaudiosession = plus.ios.import("AVAudioSession");
-	var avaudio = avaudiosession.sharedInstance();
-	var permissionStatus = avaudio.recordPermission();
-	console.log("permissionStatus:" + permissionStatus);
-	if (permissionStatus == 1684369017 || permissionStatus == 1970168948) {
-		console.log("麦克风权限没有开启");
-	} else {
-		result = 1;
-		console.log("麦克风权限已经开启");
-	}
-	plus.ios.deleteObject(avaudiosession);
-	return {
-		result: result,
-		permissionName: "麦克风"
-	};
-}
-
-// 判断相机权限是否开启
-function judgeIosPermissionCamera() {
-	var result = 0;
-	var AVCaptureDevice = plus.ios.import("AVCaptureDevice");
-	var authStatus = AVCaptureDevice.authorizationStatusForMediaType('vide');
-	console.log("authStatus:" + authStatus);
-	if (authStatus == 3) {
-		result = 1;
-		console.log("相机权限已经开启");
-	} else {
-		console.log("相机权限没有开启");
-	}
-	plus.ios.deleteObject(AVCaptureDevice);
-	return {
-		result: result,
-		permissionName: "相机"
-	};
-}
-
-// 判断相册权限是否开启
-function judgeIosPermissionPhotoLibrary() {
-	var result = 0;
-	var PHPhotoLibrary = plus.ios.import("PHPhotoLibrary");
-	var authStatus = PHPhotoLibrary.authorizationStatus();
-	console.log("authStatus:" + authStatus);
-	if (authStatus == 3) {
-		result = 1;
-		console.log("相册权限已经开启");
-	} else {
-		console.log("相册权限没有开启");
-	}
-	plus.ios.deleteObject(PHPhotoLibrary);
-	return {
-		result: result,
-		permissionName: "相册"
-	};
-}
-
-// 判断通讯录权限是否开启
-function judgeIosPermissionContact() {
-	var result = 0;
-	var CNContactStore = plus.ios.import("CNContactStore");
-	var cnAuthStatus = CNContactStore.authorizationStatusForEntityType(0);
-	if (cnAuthStatus == 3) {
-		result = 1;
-		console.log("通讯录权限已经开启");
-	} else {
-		console.log("通讯录权限没有开启");
-	}
-	plus.ios.deleteObject(CNContactStore);
-	return {
-		result: result,
-		permissionName: "通讯录"
-	};
-}
-
-// 判断日历权限是否开启
-function judgeIosPermissionCalendar() {
-	var result = 0;
-	var EKEventStore = plus.ios.import("EKEventStore");
-	var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(0);
-	if (ekAuthStatus == 3) {
-		result = 1;
-		console.log("日历权限已经开启");
-	} else {
-		console.log("日历权限没有开启");
-	}
-	plus.ios.deleteObject(EKEventStore);
-	return {
-		result: result,
-		permissionName: "日历"
-	};
-}
-
-// 判断备忘录权限是否开启
-function judgeIosPermissionMemo() {
-	var result = 0;
-	var EKEventStore = plus.ios.import("EKEventStore");
-	var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(1);
-	if (ekAuthStatus == 3) {
-		result = 1;
-		console.log("备忘录权限已经开启");
-	} else {
-		console.log("备忘录权限没有开启");
-	}
-	plus.ios.deleteObject(EKEventStore);
-	return {
-		result: result,
-		permissionName: "备忘录"
-	};
-}
-
-// Android权限查询
-function requestAndroidPermission(permissionID, permissionName) {
-	return new Promise((resolve, reject) => {
-		plus.android.requestPermissions(
-			[permissionID], // 理论上支持多个权限同时查询，但实际上本函数封装只处理了一个权限的情况。有需要的可自行扩展封装
-			function (resultObj) {
-				var result = 0;
-				for (var i = 0; i < resultObj.granted.length; i++) {
-					var grantedPermission = resultObj.granted[i];
-					console.log('已获取的权限：' + grantedPermission);
-					result = 1
-				}
-				for (var i = 0; i < resultObj.deniedPresent.length; i++) {
-					var deniedPresentPermission = resultObj.deniedPresent[i];
-					console.log('拒绝本次申请的权限：' + deniedPresentPermission);
-					result = 0
-				}
-				for (var i = 0; i < resultObj.deniedAlways.length; i++) {
-					var deniedAlwaysPermission = resultObj.deniedAlways[i];
-					console.log('永久拒绝申请的权限：' + deniedAlwaysPermission);
-					result = -1
-				}
-				resolve({
-					result: result,
-					permissionName: permissionName
-				});
-				// 若所需权限被拒绝,则打开APP设置界面,可以在APP设置界面打开相应权限
-				// if (result != 1) {
-				// gotoAppPermissionSetting()
-				// }
-			},
-			function (error) {
-				console.log('申请权限错误：' + error.code + " = " + error.message);
-				resolve({
-					code: error.code,
-					message: error.message
-				});
-			}
-		);
-	});
-}
-
-// 使用一个方法，根据参数判断权限
-function judgePermission(permissionID, callback) {
-	function handle(res) {
-		callback && callback(res.result);
-		if (res.result === -1) {
-			uni.showModal({
-				title: "提示",
-				content: "您还未开通" + res.permissionName + "权限,是否去应用设置里开通~",
-				confirmText: "去开通",
-				cancelText: "再逛会",
-				success: (data) => {
-					if (data.confirm) {
-						gotoAppPermissionSetting();
-					}
-				}
-			});
-		}
-	}
-	if (permissionID == "location") { // 位置
-		if (isIos) {
-			handle(judgeIosPermissionLocation());
-		} else {
-			requestAndroidPermission("android.permission.ACCESS_FINE_LOCATION", "位置").then(handle);
-		}
-	} else if (permissionID == "camera") { // 摄像头
-		if (isIos) {
-			handle(judgeIosPermissionCamera());
-		} else {
-			requestAndroidPermission("android.permission.CAMERA", "摄像头").then(handle);
-		}
-	} else if (permissionID == "photoLibrary") { // 相册
-		if (isIos) {
-			handle(judgeIosPermissionPhotoLibrary());
-		} else {
-			requestAndroidPermission("android.permission.READ_EXTERNAL_STORAGE", "相册读取").then(handle);
-		}
-	} else if (permissionID == "record") { // 麦克风
-		if (isIos) {
-			handle(judgeIosPermissionRecord());
-		} else {
-			requestAndroidPermission("android.permission.RECORD_AUDIO", "麦克风").then(handle);
-		}
-	} else if (permissionID == "push") { // 推送
-		if (isIos) {
-			handle(judgeIosPermissionPush());
-		} else {
-			handle(1);
-		}
-	} else if (permissionID == "contact") { // 通讯录
-		if (isIos) {
-			handle(judgeIosPermissionContact());
-		} else {
-			requestAndroidPermission("android.permission.READ_CONTACTS", "通讯录读取").then(handle);
-		}
-	} else if (permissionID == "calendar") { // 日历
-		if (isIos) {
-			handle(judgeIosPermissionCalendar());
-		} else {
-			requestAndroidPermission("android.permission.READ_CALENDAR", "日历读取").then(handle);
-		}
-	} else if (permissionID == "memo") { // 备忘录
-		if (isIos) {
-			handle(judgeIosPermissionMemo());
-		} else {
-			handle(1);
-		}
-	} else if (permissionID == "call_phone") { // 拨打电话
-		if (isIos) {
-			handle(1);
-		} else {
-			requestAndroidPermission("android.permission.CALL_PHONE", "拨打电话").then(handle);
-		}
-	}
-}
-
-// 跳转到**应用**的权限页面
-function gotoAppPermissionSetting() {
-	if (isIos) {
-		var UIApplication = plus.ios.import("UIApplication");
-		var application2 = UIApplication.sharedApplication();
-		var NSURL2 = plus.ios.import("NSURL");
-		// var setting2 = NSURL2.URLWithString("prefs:root=LOCATION_SERVICES");		
-		var setting2 = NSURL2.URLWithString("app-settings:");
-		application2.openURL(setting2);
-
-		plus.ios.deleteObject(setting2);
-		plus.ios.deleteObject(NSURL2);
-		plus.ios.deleteObject(application2);
-	} else {
-		// console.log(plus.device.vendor);
-		var Intent = plus.android.importClass("android.content.Intent");
-		var Settings = plus.android.importClass("android.provider.Settings");
-		var Uri = plus.android.importClass("android.net.Uri");
-		var mainActivity = plus.android.runtimeMainActivity();
-		var intent = new Intent();
-		intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-		var uri = Uri.fromParts("package", mainActivity.getPackageName(), null);
-		intent.setData(uri);
-		mainActivity.startActivity(intent);
-	}
-}
-
-// 检查系统的设备服务是否开启
-// var checkSystemEnableLocation = async function () {
-function checkSystemEnableLocation() {
-	if (isIos) {
-		var result = false;
-		var cllocationManger = plus.ios.import("CLLocationManager");
-		var result = cllocationManger.locationServicesEnabled();
-		console.log("系统定位开启:" + result);
-		plus.ios.deleteObject(cllocationManger);
-		return result;
-	} else {
-		var context = plus.android.importClass("android.content.Context");
-		var locationManager = plus.android.importClass("android.location.LocationManager");
-		var main = plus.android.runtimeMainActivity();
-		var mainSvr = main.getSystemService(context.LOCATION_SERVICE);
-		var result = mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER);
-		console.log("系统定位开启:" + result);
-		return result
-	}
-}
-
-module.exports = {
-	judgePermission: judgePermission,
-	requestAndroidPermission: requestAndroidPermission,
-	checkSystemEnableLocation: checkSystemEnableLocation,
-	gotoAppPermissionSetting: gotoAppPermissionSetting
-}

@@ -131,7 +131,8 @@
 						};
 						let userInfo = {
 							...resObj,
-							token: true //token用于判断是否登录
+							token: true ,//token用于判断是否登录
+							isThirdLogin: false
 						};
 						if (userInfo.token) {
 							this.setUserInfo(userInfo);

@@ -56,9 +56,9 @@
 		<view>
 			<u-popup bgColor="transparent" :overlay="true" :show="showBind" mode="bottom">
 				<view class="u-flex logout-main">
-					<view class="main"><text style="color: #999999">是否需要解绑？</text></view>
+					<view class="main"><text style="color: #999999">是否需要解除绑定的账号？</text></view>
 					<view @click="confrimBind(info)" class="main"><text style="color: #f95e5a">是</text></view>
-					<view class="main1"><text @click="showBind = false" style="color: #3478f7">否</text></view>
+					<view @click="showBind = false" class="main1"><text style="color: #3478f7">否</text></view>
 				</view>
 			</u-popup>
 		</view>
@@ -134,7 +134,8 @@ export default {
 					}
 				]
 			},
-			info: {}
+			info: {},
+			openIds: ''
 		};
 	},
 	onLoad(e) {
@@ -150,13 +151,21 @@ export default {
 			this.id = params.data.userId;
 		}
 	},
+	onShow() {
+		let getOpenId = getApp().globalData.openId;
+		console.log('获取全局openId', getOpenId);
+		if (getOpenId) {
+			this.openIds = getOpenId;
+		}
+	},
 	methods: {
 		confrimBind(e) {
 			if (e) {
+				console.log('Bind', e.third?.thirdUserId);
 				//解绑
 				let httpData = {
 					appUserId: e.data?.userId,
-					thirdUserId: e.third?.thirdUserId
+					thirdUserId: e.third?.thirdUserId == null ? this.openIds : e.third?.thirdUserId
 				};
 				uni.$u.http.delete('/yt/third', httpData).then(res => {
 					if (res) {

@@ -69,6 +69,8 @@ export default {
 							if (res.statusCode == 200) {
 								this.openid = res.data.openid;
 								this.session_key = res.data.session_key;
+								//设置全局变量openId
+								getApp().globalData.openId = res.data.openid;
 							}
 						},
 						complete: e => {
@@ -88,8 +90,8 @@ export default {
 		...mapMutations(['setUserInfo']),
 		...mapActions(['updateBadgeTotal']),
 		//微信授权登录
-		//#ifdef MP
-		onAuthorization(e) {
+		//#ifdef MP-WEIXIN
+		onAuthorization() {
 			/**
 			 * 注意：通过wx.getUserProfile并不能获取用户的openid，openid是唯一识别用户的标识，
 			 * 所以最好在用户授权登录时就获取。调用wx.login()获取
@@ -113,8 +115,12 @@ export default {
 								if (res.token == '' || res.token == null) {
 									//需要绑定，跳转我的页面进行绑定,显示绑定按钮
 									uni.reLaunch({
-										url: '/pages/personal/personal'
+										url: '../../pages/personal/personal'
 									});
+									let userInfo = {
+										isThirdLogin: true //token用于判断是否登录
+									};
+									this.setUserInfo(userInfo);
 								} else {
 									// 不需要绑定
 									// 储存登录信息
@@ -135,6 +141,9 @@ export default {
 									});
 									this.saveUserInfo();
 									this.getAlarmTotalData();
+									uni.reLaunch({
+										url: '../../pages/personal/personal'
+									});
 								}
 							})
 							.catch(e => {
@@ -147,7 +156,7 @@ export default {
 						// #ifdef MP
 						setTimeout(() => {
 							uni.reLaunch({
-								url: '/pages/personal/personal?obj=' + encodeURIComponent(JSON.stringify(obj))
+								url: '../../pages/personal/personal?obj=' + encodeURIComponent(JSON.stringify(obj))
 							});
 						}, 500);
 						// #endif
@@ -202,7 +211,8 @@ export default {
 						};
 						let userInfo = {
 							...resObj,
-							token: true //token用于判断是否登录
+							token: true, //token用于判断是否登录
+							isThirdLogin: false
 						};
 						if (userInfo.token) {
 							this.setUserInfo(userInfo);

@@ -18,9 +18,9 @@
 								<text class="text-bottom">{{ item.sysNotice.createTime }}</text>
 							</view>
 						</view>
-						<view class="item-right u-flex" style="justify-content: space-between;margin-right: ;">
+						<view class="item-right u-flex" style="justify-content: space-between;">
 							<text class="text">{{ formatType(item.sysNotice) }}</text>
-							<u-badge v-if="item.readStatus == '0'" numberType="overflow" isDot />
+							<u-badge style="margin-right: 10rpx;" v-if="item.readStatus == '0'" numberType="overflow" isDot />
 						</view>
 					</view>
 				</view>
@@ -69,7 +69,8 @@ export default {
 				auto: false //是否在初始化后,自动执行downCallback; 默认true
 			},
 			list: [],
-			pre: false
+			pre: false,
+			isJudgeNextPage: ''
 		};
 	},
 	onLoad(e) {
@@ -96,9 +97,18 @@ export default {
 			uni.hideKeyboard();
 		},
 		typeSelect(e) {
-			this.page.num = 0;
+			this.topBack();
+			this.isJudgeNextPage = e.value;
+			this.page.num = 1;
 			this.model1.userInfo.type = e.name;
-			this.loadData(1, e.value == '' ? null : e.value);
+			this.loadData(1, this.isJudgeNextPage == '' ? null : this.isJudgeNextPage);
+		},
+		//筛选数据让它回到顶部
+		topBack() {
+			uni.pageScrollTo({
+				scrollTop: 0, // 滚动到页面的目标位置  这个是滚动到顶部, 0
+				duration: 300 // 滚动动画的时长
+			});
 		},
 		/*下拉刷新的回调 */
 		downCallback() {
@@ -109,9 +119,15 @@ export default {
 		},
 		/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
 		upCallback() {
-			//联网加载数据
-			this.page.num += 1;
-			this.loadData(this.page.num);
+			if (this.isJudgeNextPage != '') {
+				//联网加载数据
+				this.page.num += 1;
+				this.loadData(this.page.num, this.isJudgeNextPage);
+			} else {
+				//联网加载数据
+				this.page.num += 1;
+				this.loadData(this.page.num);
+			}
 		},
 
 		loadData(pageNo, t) {
@@ -153,4 +169,8 @@ export default {
 
 <style lang="scss" scoped>
 @import './static/systemNotify.scss';
+/deep/ .u-badge--error {
+	position: relative;
+	right: 11rpx;
+}
 </style>

-## 3.0.1（2021-05-13）
-1. 跳转颜色和图标配置
-2. 新增静默更新
-## 3.0.0（2021-05-12）
-1. 支持uni_modules

-// #ifdef APP-PLUS 
-import componentConfig from "@/config/componentConfig"
-const platform = uni.getSystemInfoSync().platform;
-// 主颜色
-const $mainColor = componentConfig.appUpdateColor ? componentConfig.appUpdateColor : "FF5B78";
-// 弹窗图标url
-const $iconUrl = componentConfig.appUpdateIcon ? componentConfig.appUpdateIcon : "/uni_modules/zhouWei-APPUpdate/static/ic_ar.png";
-
-// 获取当前应用的版本号
-export const getCurrentNo = function(callback) {
-	// 获取本地应用资源版本号
-	plus.runtime.getProperty(plus.runtime.appid, function(inf) {
-		callback && callback({
-			versionCode: inf.versionCode,
-			versionName: inf.version
-		});
-	});
-}
-// 从服务器下载应用资源包（wgt文件）
-const getDownload = function(data) {
-	let dtask;
-	if(data.updateType == 'forcibly' || data.updateType == 'solicit'){
-		let popupData = {
-			progress: true,
-			buttonNum: 2
-		};
-		if(data.updateType == 'forcibly'){
-			popupData.buttonNum = 0;
-		}
-		let lastProgressValue = 0;
-		let popupObj = downloadPopup(popupData);
-		dtask = plus.downloader.createDownload(data.downloadUrl, {
-			filename: "_doc/update/"
-		}, function(download, status) {
-			if (status == 200) {
-				popupObj.change({
-					progressValue: 100,
-					progressTip:"正在安装文件...",
-					progress: true,
-					buttonNum: 0
-				});
-				plus.runtime.install(download.filename, {}, function() {
-					popupObj.change({
-						contentText: "应用资源更新完成！",
-						buttonNum: 1,
-						progress: false
-					});
-				}, function(e) {
-					popupObj.cancel();
-					plus.nativeUI.alert("安装文件失败[" + e.code + "]：" + e.message);
-				});
-			} else {
-				popupObj.change({
-					contentText: "文件下载失败...",
-					buttonNum: 1,
-					progress: false
-				});
-			}
-		});
-		dtask.start();
-		dtask.addEventListener("statechanged", function(task, status) {
-			switch (task.state) {
-				case 1: // 开始
-					popupObj.change({
-						progressValue:0,
-						progressTip:"准备下载...",
-						progress: true
-					});
-					break;
-				case 2: // 已连接到服务器  
-					popupObj.change({
-						progressValue:0,
-						progressTip:"开始下载...",
-						progress: true
-					});
-					break;
-				case 3:
-					const progress = parseInt(task.downloadedSize / task.totalSize * 100);
-					if(progress - lastProgressValue >= 2){
-						lastProgressValue = progress;
-						popupObj.change({
-							progressValue:progress,
-							progressTip: "已下载" + progress + "%",
-							progress: true
-						});
-					}
-					break;
-			}
-		});
-		// 取消下载
-		popupObj.cancelDownload = function(){
-			dtask && dtask.abort();
-			uni.showToast({
-				title: "已取消下载",
-				icon:"none"
-			});
-		}
-		// 重启APP
-		popupObj.reboot = function(){
-			plus.runtime.restart();
-		}
-	} else if(data.updateType == "silent"){
-		dtask = plus.downloader.createDownload(data.downloadUrl, {
-			filename: "_doc/update/"
-		}, function(download, status) {
-			if (status == 200) {
-				plus.runtime.install(download.filename, {}, function() {
-					console.log("应用资源更新完成");
-				}, function(e) {
-					plus.nativeUI.alert("安装文件失败[" + e.code + "]：" + e.message);
-				});
-			} else {
-				plus.nativeUI.alert("文件下载失败...");
-			}
-		});
-		dtask.start();
-	}
-}
-// 文字换行
-function drawtext(text, maxWidth) {
-	let textArr = text.split("");
-	let len = textArr.length;
-	// 上个节点
-	let previousNode = 0;
-	// 记录节点宽度
-	let nodeWidth = 0;
-	// 文本换行数组
-	let rowText = [];
-	// 如果是字母，侧保存长度
-	let letterWidth = 0;
-	// 汉字宽度
-	let chineseWidth = 14;
-	// otherFont宽度
-	let otherWidth = 7;
-	for (let i = 0; i < len; i++) {
-		if (/[\u4e00-\u9fa5]|[\uFE30-\uFFA0]/g.test(textArr[i])) {
-			if(letterWidth > 0){
-				if(nodeWidth + chineseWidth + letterWidth * otherWidth > maxWidth){
-					rowText.push({
-						type: "text",
-						content: text.substring(previousNode, i)
-					});
-					previousNode = i;
-					nodeWidth = chineseWidth;
-					letterWidth = 0;
-				} else {
-					nodeWidth += chineseWidth + letterWidth * otherWidth;
-					letterWidth = 0;
-				}
-			} else {
-				if(nodeWidth + chineseWidth > maxWidth){
-					rowText.push({
-						type: "text",
-						content: text.substring(previousNode, i)
-					});
-					previousNode = i;
-					nodeWidth = chineseWidth;
-				}else{
-					nodeWidth += chineseWidth;
-				}
-			}
-		} else {
-			if(/\n/g.test(textArr[i])){
-				rowText.push({
-					type: "break",
-					content: text.substring(previousNode, i)
-				});
-				previousNode = i + 1;
-				nodeWidth = 0;
-				letterWidth = 0;
-			}else if(textArr[i] == "\\" && textArr[i + 1] == "n"){
-				rowText.push({
-					type: "break",
-					content: text.substring(previousNode, i)
-				});
-				previousNode = i + 2;
-				nodeWidth = 0;
-				letterWidth = 0;
-			}else if(/[a-zA-Z0-9]/g.test(textArr[i])){
-				letterWidth += 1;
-				if(nodeWidth + letterWidth * otherWidth > maxWidth){
-					rowText.push({
-						type: "text",
-						content: text.substring(previousNode, i + 1 - letterWidth)
-					});
-					previousNode = i + 1 - letterWidth;
-					nodeWidth = letterWidth * otherWidth;
-					letterWidth = 0;
-				}
-			} else{
-				if(nodeWidth + otherWidth > maxWidth){
-					rowText.push({
-						type: "text",
-						content: text.substring(previousNode, i)
-					});
-					previousNode = i;
-					nodeWidth = otherWidth;
-				}else{
-					nodeWidth += otherWidth;
-				}
-			}
-		}
-	}
-	if (previousNode < len) {
-		rowText.push({
-			type: "text",
-			content: text.substring(previousNode, len)
-		});
-	}
-	return rowText;
-}
-// 是否更新弹窗
-function updatePopup(data, callback) {
-	// 弹窗遮罩层
-	let maskLayer = new plus.nativeObj.View("maskLayer", { //先创建遮罩层
-		top: '0px',
-		left: '0px',
-		height: '100%',
-		width: '100%',
-		backgroundColor: 'rgba(0,0,0,0.5)'
-	});
-
-	// 以下为计算菜单的nview绘制布局，为固定算法，使用者无关关心
-	const screenWidth = plus.screen.resolutionWidth;
-	const screenHeight = plus.screen.resolutionHeight;
-	//弹窗容器宽度
-	const popupViewWidth = screenWidth * 0.7;
-	// 弹窗容器的Padding
-	const viewContentPadding = 20;
-	// 弹窗容器的宽度
-	const viewContentWidth = parseInt(popupViewWidth - (viewContentPadding * 2));
-	// 描述的列表
-	const descriptionList = drawtext(data.versionInfo, viewContentWidth);
-	// 弹窗容器高度
-	let popupViewHeight = 80 + 20 + 20 + 90 + 10;
-	
-	let popupViewContentList = [{
-			src: $iconUrl,
-			id: "logo", 
-			tag: "img",
-			position: {
-				top: "0px",
-				left: (popupViewWidth - 124) / 2 + "px",
-				width: "124px",
-				height: "80px",
-			}
-		},
-		{
-			tag: 'font',
-			id: 'title',
-			text: "发现新版本" + data.versionName,
-			textStyles: {
-				size: '18px',
-				color: "#333",
-				weight: "bold",
-				whiteSpace: "normal"
-			},
-			position: {
-				top: '90px',
-				left: viewContentPadding + "px",
-				width: viewContentWidth + "px",
-				height: "30px",
-			}
-		}];
-	const textHeight = 18;
-	let contentTop = 130;
-	descriptionList.forEach((item,index) => {
-		if(index > 0){
-			popupViewHeight += textHeight;
-			contentTop += textHeight;
-		}
-		popupViewContentList.push({
-			tag: 'font',
-			id: 'content' + index + 1,
-			text: item.content,
-			textStyles: {
-				size: '14px',
-				color: "#666",
-				lineSpacing: "50%",
-				align: "left"
-			},
-			position: {
-				top: contentTop + "px",
-				left: viewContentPadding + "px",
-				width: viewContentWidth + "px",
-				height: textHeight + "px",
-			}
-		});
-		if(item.type == "break"){
-			contentTop += 10;
-			popupViewHeight += 10;
-		}
-	});
-	
-	if(data.updateType == "forcibly"){
-		popupViewContentList.push({
-			tag: 'rect', //绘制底边按钮
-			rectStyles:{
-				radius: "6px",
-				color: $mainColor
-			},
-			position:{
-				bottom: viewContentPadding + 'px',
-				left: viewContentPadding + "px",
-				width: viewContentWidth + "px",
-				height: "30px"
-			}
-		});
-		popupViewContentList.push({
-			tag: 'font',
-			id: 'confirmText',
-			text: "立即升级",
-			textStyles: {
-				size: '14px',
-				color: "#FFF",
-				lineSpacing: "0%",
-			},
-			position: {
-				bottom: viewContentPadding + 'px',
-				left: viewContentPadding + "px",
-				width: viewContentWidth + "px",
-				height: "30px"
-			}
-		});
-	} else {
-		// 绘制底边按钮
-		popupViewContentList.push({
-			tag: 'rect',
-			id: 'cancelBox',
-			rectStyles: {
-				radius: "3px",
-				borderColor: "#f1f1f1",
-				borderWidth: "1px",
-			},
-			position: {
-				bottom: viewContentPadding + 'px',
-				left: viewContentPadding + "px",
-				width: (viewContentWidth - viewContentPadding) / 2 + "px",
-				height: "30px",
-			}
-		});
-		popupViewContentList.push({
-			tag: 'rect',
-			id: 'confirmBox',
-			rectStyles: {
-				radius: "3px",
-				color: $mainColor,
-			},
-			position: {
-				bottom: viewContentPadding + 'px',
-				left: ((viewContentWidth - viewContentPadding) / 2 + viewContentPadding * 2) + "px",
-				width: (viewContentWidth - viewContentPadding) / 2 + "px",
-				height: "30px",
-			}
-		});
-		popupViewContentList.push({
-			tag: 'font',
-			id: 'cancelText',
-			text: "暂不升级",
-			textStyles: {
-				size: '14px',
-				color: "#666",
-				lineSpacing: "0%",
-				whiteSpace: "normal"
-			},
-			position: {
-				bottom: viewContentPadding + 'px',
-				left: viewContentPadding + "px",
-				width: (viewContentWidth - viewContentPadding) / 2 + "px",
-				height: "30px",
-			}
-		});
-		popupViewContentList.push({
-			tag: 'font',
-			id: 'confirmText',
-			text: "立即升级",
-			textStyles: {
-				size: '14px',
-				color: "#FFF",
-				lineSpacing: "0%",
-				whiteSpace: "normal"
-			},
-			position: {
-				bottom: viewContentPadding + 'px',
-				left: ((viewContentWidth - viewContentPadding) / 2 + viewContentPadding * 2) + "px",
-				width: (viewContentWidth - viewContentPadding) / 2 + "px",
-				height: "30px",
-			}
-		});
-	}
-	// 弹窗内容
-	let popupView = new plus.nativeObj.View("popupView", { //创建底部图标菜单
-		tag: "rect",
-		top: (screenHeight - popupViewHeight) / 2 + "px",
-		left: '15%',
-		height: popupViewHeight + "px",
-		width: "70%"
-	});
-	// 绘制白色背景
-	popupView.drawRect({
-		color: "#FFFFFF",
-		radius: "8px"
-	}, {
-		top: "40px",
-		height: popupViewHeight - 40 + "px",
-	});
-	
-	popupView.draw(popupViewContentList);
-	popupView.addEventListener("click", function(e) {
-		let maxTop = popupViewHeight - viewContentPadding;
-		let maxLeft = popupViewWidth - viewContentPadding;
-		let buttonWidth = (viewContentWidth - viewContentPadding) / 2;
-		if (e.clientY > maxTop - 30 && e.clientY < maxTop) {
-			if(data.updateType == "forcibly"){
-				if(e.clientX > viewContentPadding && e.clientX < maxLeft){
-					// 立即升级
-					maskLayer.hide();
-					popupView.hide();
-					callback && callback();
-				}
-			} else {
-				// 暂不升级
-				if (e.clientX > viewContentPadding && e.clientX < maxLeft - buttonWidth - viewContentPadding) {
-					maskLayer.hide();
-					popupView.hide();
-				} else if (e.clientX > maxLeft - buttonWidth && e.clientX < maxLeft) {
-					// 立即升级
-					maskLayer.hide();
-					popupView.hide();
-					callback && callback();
-				}
-			}
-			
-		}
-	});
-	if(data.updateType == "solicit"){
-		// 点击遮罩层
-		maskLayer.addEventListener("click", function() { //处理遮罩层点击
-			maskLayer.hide();
-			popupView.hide();
-		});
-	}
-	// 显示弹窗
-	maskLayer.show();
-	popupView.show();
-}
-// 文件下载的弹窗绘图
-function downloadPopupDrawing(data){
-	// 以下为计算菜单的nview绘制布局，为固定算法，使用者无关关心
-	const screenWidth = plus.screen.resolutionWidth;
-	const screenHeight = plus.screen.resolutionHeight;
-	//弹窗容器宽度
-	const popupViewWidth = screenWidth * 0.7;
-	// 弹窗容器的Padding
-	const viewContentPadding = 20;
-	// 弹窗容器的宽度
-	const viewContentWidth = popupViewWidth - (viewContentPadding * 2);
-	// 弹窗容器高度
-	let popupViewHeight = viewContentPadding * 3 + 60;
-	let progressTip = data.progressTip || "准备下载...";
-	let contentText = data.contentText || "正在为您更新，请耐心等待";
-	let elementList = [
-		{
-			tag: 'rect', //背景色
-			color: '#FFFFFF',
-			rectStyles:{
-				radius: "8px"
-			}
-		},
-		{
-			tag: 'font',
-			id: 'title',
-			text: "升级APP",
-			textStyles: {
-				size: '16px',
-				color: "#333",
-				weight: "bold",
-				verticalAlign: "middle",
-				whiteSpace: "normal"
-			},
-			position: {
-				top: viewContentPadding + 'px',
-				height: "30px",
-			}
-		},
-		{
-			tag: 'font',
-			id: 'content',
-			text: contentText,
-			textStyles: {
-				size: '14px',
-				color: "#333",
-				verticalAlign: "middle",
-				whiteSpace: "normal"
-			},
-			position: {
-				top: viewContentPadding * 2 + 30 + 'px',
-				height: "20px",
-			}
-		}
-	];
-	// 是否有进度条
-	if(data.progress){
-		popupViewHeight += viewContentPadding + 40;
-		elementList = elementList.concat([
-			{
-				tag: 'font',
-				id: 'progressValue',
-				text: progressTip,
-				textStyles: {
-					size: '14px',
-					color: $mainColor,
-					whiteSpace: "normal"
-				},
-				position: {
-					top: viewContentPadding * 4 + 20 + 'px',
-					height: "30px"
-				}
-			},
-			{
-				tag: 'rect', //绘制进度条背景
-				id: 'progressBg',
-				rectStyles:{
-					radius: "4px",
-					borderColor: "#f1f1f1",
-					borderWidth: "1px",
-				},
-				position:{
-					top: viewContentPadding * 4 + 60 + 'px',
-					left: viewContentPadding + "px",
-					width: viewContentWidth + "px",
-					height: "8px"
-				}
-			},
-		]);
-	}
-	if (data.buttonNum == 2) {
-		popupViewHeight += viewContentPadding + 30;
-		elementList = elementList.concat([
-			{
-				tag: 'rect', //绘制底边按钮
-				rectStyles:{
-					radius: "3px",
-					borderColor: "#f1f1f1",
-					borderWidth: "1px",
-				},
-				position:{
-					bottom: viewContentPadding + 'px',
-					left: viewContentPadding + "px",
-					width: (viewContentWidth - viewContentPadding) / 2 + "px",
-					height: "30px"
-				}
-			},
-			{
-				tag: 'rect', //绘制底边按钮
-				rectStyles:{
-					radius: "3px",
-					color: $mainColor
-				},
-				position:{
-					bottom: viewContentPadding + 'px',
-					left: ((viewContentWidth - viewContentPadding) / 2 + viewContentPadding * 2) + "px",
-					width: (viewContentWidth - viewContentPadding) / 2 + "px",
-					height: "30px"
-				}
-			},
-			{
-				tag: 'font',
-				id: 'cancelText',
-				text: "取消下载",
-				textStyles: {
-					size: '14px',
-					color: "#666",
-					lineSpacing: "0%",
-					whiteSpace: "normal"
-				},
-				position: {
-					bottom: viewContentPadding + 'px',
-					left: viewContentPadding + "px",
-					width: (viewContentWidth - viewContentPadding) / 2 + "px",
-					height: "30px",
-				}
-			},
-			{
-				tag: 'font',
-				id: 'confirmText',
-				text: "后台下载",
-				textStyles: {
-					size: '14px',
-					color: "#FFF",
-					lineSpacing: "0%",
-					whiteSpace: "normal"
-				},
-				position: {
-					bottom: viewContentPadding + 'px',
-					left: ((viewContentWidth - viewContentPadding) / 2 + viewContentPadding * 2) + "px",
-					width: (viewContentWidth - viewContentPadding) / 2 + "px",
-					height: "30px",
-				}
-			}
-		]);
-	}
-	if (data.buttonNum == 1) {
-		popupViewHeight += viewContentPadding + 40;
-		elementList = elementList.concat([
-			{
-				tag: 'rect', //绘制底边按钮
-				rectStyles:{
-					radius: "6px",
-					color: $mainColor
-				},
-				position:{
-					bottom: viewContentPadding + 'px',
-					left: viewContentPadding + "px",
-					width: viewContentWidth + "px",
-					height: "40px"
-				}
-			},
-			{
-				tag: 'font',
-				id: 'confirmText',
-				text: "关闭",
-				textStyles: {
-					size: '14px',
-					color: "#FFF",
-					lineSpacing: "0%",
-				},
-				position: {
-					bottom: viewContentPadding + 'px',
-					left: viewContentPadding + "px",
-					width: viewContentWidth + "px",
-					height: "40px"
-				}
-			}
-		]);
-	}
-	return {
-		popupViewHeight:popupViewHeight,
-		popupViewWidth:popupViewWidth,
-		screenHeight:screenHeight,
-		viewContentWidth:viewContentWidth,
-		viewContentPadding:viewContentPadding,
-		elementList: elementList
-	};
-}
-// 文件下载的弹窗
-function downloadPopup(data) {
-	// 弹窗遮罩层
-	let maskLayer = new plus.nativeObj.View("maskLayer", { //先创建遮罩层
-		top: '0px',
-		left: '0px',
-		height: '100%',
-		width: '100%',
-		backgroundColor: 'rgba(0,0,0,0.5)'
-	});
-	let popupViewData = downloadPopupDrawing(data);
-	// 弹窗内容
-	let popupView = new plus.nativeObj.View("popupView", { //创建底部图标菜单
-		tag: "rect",
-		top: (popupViewData.screenHeight - popupViewData.popupViewHeight) / 2 + "px",
-		left: '15%',
-		height: popupViewData.popupViewHeight + "px",
-		width: "70%",
-	});
-	let progressValue = 0;
-	let progressTip = 0;
-	let contentText = 0;
-	let buttonNum = 2;
-	if(data.buttonNum >= 0){
-		buttonNum = data.buttonNum;
-	}
-	popupView.draw(popupViewData.elementList);
-    let callbackData = {
-		change: function(res) {
-			let progressElement = [];
-			if(res.progressValue){
-				progressValue = res.progressValue;
-				// 绘制进度条
-				progressElement.push({
-					tag: 'rect', //绘制进度条背景
-					id: 'progressValueBg',
-					rectStyles:{
-						radius: "4px",
-						color: $mainColor
-					},
-					position:{
-						top: popupViewData.viewContentPadding * 4 + 60 + 'px',
-						left: popupViewData.viewContentPadding + "px",
-						width: popupViewData.viewContentWidth * (res.progressValue / 100) + "px",
-						height: "8px"
-					}
-				});
-			}
-			if(res.progressTip){
-				progressTip = res.progressTip;
-				progressElement.push({
-					tag: 'font',
-					id: 'progressValue',
-					text: res.progressTip,
-					textStyles: {
-						size: '14px',
-						color: $mainColor,
-						whiteSpace: "normal"
-					},
-					position: {
-						top: popupViewData.viewContentPadding * 4 + 20 + 'px',
-						height: "30px"
-					}
-				});
-			}
-			if(res.contentText){
-				contentText = res.contentText;
-				progressElement.push({
-					tag: 'font',
-					id: 'content',
-					text: res.contentText,
-					textStyles: {
-						size: '16px',
-						color: "#333",
-						whiteSpace: "normal"
-					},
-					position: {
-						top: popupViewData.viewContentPadding * 2 + 30 + 'px',
-						height: "30px",
-					}
-				});
-			}
-			if(res.buttonNum >= 0 && buttonNum != res.buttonNum){
-				buttonNum = res.buttonNum;
-				popupView.reset();
-				popupViewData = downloadPopupDrawing(Object.assign({
-					progressValue:progressValue,
-					progressTip:progressTip,
-					contentText:contentText,
-				},res));
-				let newElement = [];
-				popupViewData.elementList.map((item,index) => {
-					let have = false;
-					progressElement.forEach((childItem,childIndex) => {
-						if(item.id == childItem.id){
-							have = true;
-						}
-					});
-					if(!have){
-						newElement.push(item);
-					}
-				});
-				progressElement = newElement.concat(progressElement);
-				popupView.setStyle({
-					tag: "rect",
-					top: (popupViewData.screenHeight - popupViewData.popupViewHeight) / 2 + "px",
-					left: '15%',
-					height: popupViewData.popupViewHeight + "px",
-					width: "70%",
-				});
-				popupView.draw(progressElement); 
-			}else{
-				popupView.draw(progressElement);
-			}
-		},
-		cancel: function() { 
-			maskLayer.hide();
-			popupView.hide();
-		}
-	}
-	popupView.addEventListener("click", function(e) {
-		let maxTop = popupViewData.popupViewHeight - popupViewData.viewContentPadding;
-		let maxLeft = popupViewData.popupViewWidth - popupViewData.viewContentPadding;
-		if (e.clientY > maxTop - 40 && e.clientY < maxTop) {
-			if(buttonNum == 1){
-				// 单按钮
-				if (e.clientX > popupViewData.viewContentPadding && e.clientX < maxLeft) {
-					maskLayer.hide();
-					popupView.hide();
-                    callbackData.reboot();
-				}
-			}else if(buttonNum == 2){
-				// 双按钮
-				let buttonWidth = (popupViewData.viewContentWidth - popupViewData.viewContentPadding) / 2;
-				if (e.clientX > popupViewData.viewContentPadding && e.clientX < maxLeft - buttonWidth - popupViewData.viewContentPadding) {
-					maskLayer.hide();
-					popupView.hide();
-                    callbackData.cancelDownload();
-				} else if (e.clientX > maxLeft - buttonWidth && e.clientX < maxLeft) {
-					maskLayer.hide();
-					popupView.hide();
-				}
-			}
-		}
-	});
-	// 显示弹窗
-	maskLayer.show();
-	popupView.show();
-	// 改变进度条
-	return callbackData;
-}
-export default function(isPrompt = false) {
-	getCurrentNo(versionInfo => {
-		componentConfig.getServerNo(versionInfo, isPrompt, res => {
-			if (res.updateType == "forcibly" || res.updateType == "silent") {
-				if (/\.wgt$/i.test(res.downloadUrl)) {
-					getDownload(res);
-				} else if(/\.html$/i.test(res.downloadUrl)){
-					plus.runtime.openURL(res.downloadUrl);
-				} else {
-					if (platform == "android") {
-						getDownload(res);
-					} else {
-						plus.runtime.openURL(res.downloadUrl);
-					}
-				}
-			} else if(res.updateType == "solicit"){
-				updatePopup(res, function() {
-					if (/\.wgt$/i.test(res.downloadUrl)) {
-						getDownload(res);
-					} else if(/\.html$/i.test(res.downloadUrl)){
-						plus.runtime.openURL(res.downloadUrl);
-					} else {
-						if (platform == "android") {
-							getDownload(res);
-						} else {
-							plus.runtime.openURL(res.downloadUrl);
-						}
-					}
-				});
-			}
-		});
-	});
-}
-// #endif
\ No newline at end of file

-{
-  "id": "zhouWei-APPUpdate",
-  "displayName": "APP版本更新、强制更新、静默更新、下载进度（wgt更新）",
-  "version": "3.0.1",
-  "description": "APP版本更新、强制更新、静默更新、漂亮弹窗、下载进度（wgt更新）",
-  "keywords": [
-    "APP版本更新",
-    "强制更新",
-    "版本更新",
-    "静默更新"
-],
-  "repository": "https://github.com/zhouwei1994/uni-app-demo",
-  "engines": {
-    "HBuilderX": "^3.1.0"
-  },
-  "dcloudext": {
-    "category": [
-        "JS SDK",
-        "通用 SDK"
-    ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": "465081029"
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "<uses-permission android:name=\\\"android.permission.INSTALL_PACKAGES\\\"/>  \n<uses-permission android:name=\\\"android.permission.REQUEST_INSTALL_PACKAGES\\\"/>"
-    },
-    "npmurl": ""
-  },
-  "uni_modules": {
-    "dependencies": [],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "y"
-        },
-        "H5-mobile": {
-          "Safari": "n",
-          "Android Browser": "n",
-          "微信浏览器(Android)": "n",
-          "QQ浏览器(Android)": "n"
-        },
-        "H5-pc": {
-          "Chrome": "n",
-          "IE": "n",
-          "Edge": "n",
-          "Firefox": "n",
-          "Safari": "n"
-        },
-        "小程序": {
-          "微信": "n",
-          "阿里": "n",
-          "百度": "n",
-          "字节跳动": "n",
-          "QQ": "n"
-        },
-        "快应用": {
-          "华为": "n",
-          "联盟": "n"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file

-### 常见问题
-1.安卓apk下载完成后没有更新APP?
-
-答：问题是因为没有添加APP安装应用的权限，解决方法在`manifest.json`文件里面`APP模块权限配置`的`Android打包权限配置`勾选以下权限
-```
-<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>  
-<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>
-```
-若还有问题请看[安装apk无法执行的解决方案](https://ask.dcloud.net.cn/article/35703 "安装apk无法执行的解决方案")
-
-2.APP更新后版本号没变，还是之前的版本号？
-
-答：可能是更新的安装包没有升级版本号，`manifest.json`文件里面基本设置`应用版本号`和`应用版本名称`需要升高（保持一直减少问题）
-
-3.APP更新后没有覆盖之前的APP？
-
-答：可能是更新的安装包`包名`和APP的`包名`不一样
-
-4.弹窗的图标不显示？
-
-答：检查图片是不是放项目资源文件`static`，然后重新运行项目
-
-5.版本号是在前端对比还是在后端接口对比？
-
-答：当前案例是本地的版本号通过接口传递给后台，是后台对比的，若需要前端对比，请在接口返回数据的地方修改，不更新就不要调用`callback`方法
-
-6.本地的版本号比接口的版本号高还弹窗升级窗口？
-
-答：当前案例是本地的版本号通过接口传递给后台，后台对比是否需要升级，不需要升级就不要返回数据（特别是需要wgt更新的，建议这种方式）
-
-### 第一步`关键`配置APP更新接口（可以参考上面的示例）
-在项目目录下`config/componentConfig.js`里面如下配置
-```
-// 此方法是接口请求方法
-import $http from '@/config/requestConfig'
-export default {
-	// 发起ajax请求获取服务端版本号
-	getServerNo: (version, isPrompt = false, callback) => {
-		let httpData = {
-			version: version.versionCode,
-			// 版本名称
-		    versionName: version.versionName,
-			// setupPage参数说明（判断用户是不是从设置页面点击的更新，如果是设置页面点击的更新，有不要用静默更新了，不然用户点击没反应很奇怪的）
-			setupPage: isPrompt   
-		};
-		if (platform == "android") {
-			httpData.type = 1101;
-		} else {
-			httpData.type = 1102;
-		}
-		/* 接口入参说明
-		 * version: 应用当前版本号（已自动获取）
-		 * versionName: 应用当前版本名称（已自动获取）
-		 * type：平台（1101是安卓，1102是IOS）
-		 */
-		/****************以下是示例*******************/
-		// 可以用自己项目的请求方法（接口自己找后台要，插件不提供）
-		$http.get("api/common/v1/app_version", httpData,{
-			isPrompt: isPrompt
-		}).then(res => {
-			/* res的数据说明
-			 * | 参数名称	     | 一定返回 	| 类型	    | 描述
-			 * | -------------|--------- | --------- | ------------- |
-			 * | versionCode	 | y	    | int	    | 版本号        |
-			 * | versionName	 | y	    | String	| 版本名称      |
-			 * | versionInfo	 | y	    | String	| 版本信息      |
-			 * | updateType	     | y	    | String	| forcibly = 强制更新, solicit = 弹窗确认更新, silent = 静默更新 |
-			 * | downloadUrl	 | y	    | String	| 版本下载链接（IOS安装包更新请放跳转store应用商店链接,安卓apk和wgt文件放文件下载链接）  |
-			 */
-			if (res && res.downloadUrl) {
-				// 兼容之前的版本（updateType是新版才有的参数）
-				if(res.updateType){
-					callback && callback(res);
-				} else {
-					if(res.forceUpdate){
-						res.updateType = "forcibly";
-					} else {
-						res.updateType = "solicit";
-					}
-					callback && callback(res);
-				}
-			} else if (isPrompt) {
-				uni.showToast({
-					title: "暂无新版本",
-					icon: "none"
-				});
-			}
-		});
-		/****************以上是示例*******************/
-	},
-	// 弹窗主颜色（不填默认粉色）
-	appUpdateColor: "f00",
-	// 弹窗图标（不填显示默认图标，链接配置示例如： '/static/demo/ic_attention.png'）
-	appUpdateIcon: ''
-}
-```
-
-### 第二步 使用方法
-``` 
-// App.vue页面
-
-// #ifdef APP-PLUS
-import APPUpdate from '@/uni_modules/zhouWei-APPUpdate/js_sdk/appUpdate';
-// #endif
-
-onLaunch: function(e) {
-	// #ifdef APP-PLUS
-	APPUpdate();
-	// #endif
-}
-```
-
-### 第三步 添加APP安装应用的权限
-在`manifest.json`文件里面`APP模块权限配置`的`Android打包权限配置`勾选以下权限
-```
-<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>  
-<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>
-```
-
-### 修改弹窗的主题色或弹窗图标
-在`APPUpdate/index.js`里面上面`$mainColor`常量中定义主题颜色，`$iconUrl`常量中定义图标地址
-
-### 检查APP是否有新版本（一般在设置页面使用）
-```
-// #ifdef APP-PLUS
-import APPUpdate, { getCurrentNo } from '@/uni_modules/zhouWei-APPUpdate/js_sdk/appUpdate';
-// #endif
-export default {
-	data() {
-		return {
-			version: "" // 版本号
-		};
-	},
-	//第一次加载
-	onLoad(e) {
-		// #ifdef APP-PLUS
-		getCurrentNo(res => {
-			// 进页面获取当前APP版本号（用于页面显示）
-			this.version = res.version;
-		});
-		// #endif
-	},
-	//方法
-	methods: {
-		// 检查APP是否有新版本
-		onAPPUpdate() {
-			// true 没有新版本的时候有提示，默认：false
-			APPUpdate(true);
-		}
-	}
-}
-```
\ No newline at end of file