From d5d27b5eb2fbda13565db0a0e2921d4d6b4b1f3b Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 22 Feb 2024 10:56:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0app=20=E6=9B=B4=E6=96=B0,?=
 =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=A3=80=E6=9F=A5=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |   9 ++
 src/api/request2.js                           |  13 ++
 src/common/appUpdate.js                       | 116 +++++++++++++++++
 src/pages/login/index.vue                     |   6 +-
 src/pages/setter/index.vue                    | 122 +++++++++---------
 .../components/u-cell-item/u-cell-item.vue    |   2 +-
 6 files changed, 201 insertions(+), 67 deletions(-)
 create mode 100644 src/common/appUpdate.js

diff --git a/src/App.vue b/src/App.vue
index 3621db48..9128a34d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,13 @@
 <script>
+	// #ifdef APP-PLUS
+	import {
+		appUpdate
+	} from "@/common/appUpdate.js"
+	// #endif
+
 	export default {
 		onLaunch: function() {
+
 			console.log('App Launch')
 			// 隐藏顶部电池,时间等信息 
 			// #ifdef APP-PLUS
@@ -11,7 +18,9 @@
 			// plus.screen.lockOrientation('landscape-primary');
 			// // app 强制竖屏
 			// plus.screen.lockOrientation('portrait-primary'); 
+			appUpdate();
 			// #endif
+
 		},
 		onShow: function() {
 			console.log('App Show')
diff --git a/src/api/request2.js b/src/api/request2.js
index d6445a01..56e24930 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -3634,4 +3634,17 @@ export function getMainMessage() {
 		method: "get",
 		data: {},
 	});
+}
+
+/**
+ * app检查更新 
+ * @param {*} 
+ * 
+ */
+export function appCheckUpdate() {
+	return uni.request({
+		url:"http://192.168.0.119:9527/appUpdate.json",
+		method:"GET",
+		data:{}
+	})
 }
\ No newline at end of file
diff --git a/src/common/appUpdate.js b/src/common/appUpdate.js
new file mode 100644
index 00000000..03af4c39
--- /dev/null
+++ b/src/common/appUpdate.js
@@ -0,0 +1,116 @@
+import {
+	appCheckUpdate
+} from '../api/request2.js';
+export function appUpdate() {
+	let curversion = 0;
+	plus.runtime.getProperty(plus.runtime.appid, function(widgetInfo) {
+		const data = {
+			action: 'checkVersion',
+			appid: plus.runtime.appid,
+			appVersion: plus.runtime.version,
+			wgtVersion: widgetInfo.version,
+			versionCode: widgetInfo.versionCode
+		}
+		curversion=data.versionCode
+	appCheckUpdate().then(res => {
+		console.log("当前版本提示",curversion)
+		if (res.data) {
+			if (res.data.versionCode > Number(curversion)) {
+				var downUrl = res.data.downUrl;
+				var content = res.data.content;
+				var version =res.data.version
+				console.log("新版本提示")
+				uni.showModal({
+					title: "发现新版本:("+version+")",
+					content: content,
+					confirmText: "更新",
+					cancelText: "取消",
+					success: (res) => {
+						if (res.confirm) {
+							confirm(downUrl);
+							console.log('comfirm') //点击确定之后执行的代码
+						} else {
+							console.log('cancel') //点击取消之后执行的代码
+						}
+					}
+				})
+			} else {
+				uni.showToast({
+					title:"当前是最新版本"
+				})
+				console.log("没有新版本")
+			}
+		}
+	}).catch(error => {
+		console.log("版本错误", error)
+	})
+	
+	})
+	
+	
+
+}
+
+export function confirm(downUrl) {
+	var downloadApkUrl = downUrl
+	var dtask = plus.downloader.createDownload(downloadApkUrl, {},
+		function(d, status) {
+
+			// 下载完成  
+			if (status == 200) {
+
+				plus.runtime.install(plus.io.convertLocalFileSystemURL(
+					d.filename), {}, {}, function(error) {
+					uni.showToast({
+						title: '安装失败',
+						duration: 1500
+					});
+				})
+			} else {
+				uni.showToast({
+					title: '更新失败',
+					duration: 1500
+				});
+			}
+		});
+	try {
+		dtask.start(); // 开启下载的任务
+		var prg = 0;
+		var showLoading = plus.nativeUI.showWaiting(
+			"正在下载"); //创建一个showWaiting对象 
+		dtask.addEventListener('statechanged', function(
+			task,
+			status
+		) {
+			// 给下载任务设置一个监听 并根据状态  做操作
+			switch (task.state) {
+				case 1:
+					showLoading.setTitle("正在下载");
+					break;
+				case 2:
+					showLoading.setTitle("已连接到服务器");
+					break;
+				case 3:
+					prg = parseInt(
+						(parseFloat(task.downloadedSize) /
+							parseFloat(task.totalSize)) *
+						100
+					);
+					showLoading.setTitle("  正在下载" + prg + "%  ");
+					break;
+				case 4:
+					plus.nativeUI.closeWaiting();
+					//下载完成
+					break;
+			}
+		});
+	} catch (err) {
+		plus.nativeUI.closeWaiting();
+		uni.showToast({
+			title: '更新失败-03',
+			mask: false,
+			duration: 1500
+		});
+	}
+
+}
\ No newline at end of file
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 4a9ffd22..d3e76f5f 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -36,7 +36,7 @@
 								用户名
 							</view>
 							<view>
-								<input class="uni-input" placeholder="请输入用户名" v-model="username" />
+								<input class="uni-input" style="padding:25rpx" placeholder="请输入用户名" v-model="username" />
 							</view>
 						</view>
 						<view class="conone">
@@ -44,8 +44,8 @@
 								<image class="icon_normal" src="../../static/icons_ui/icon_login_password.svg"></image>
 								密码
 							</view>
-							<view class="uni-input-wrapper">
-								<input class="uni-input" placeholder="请输入密码" :password="showPassword"
+							<view class="uni-input-wrapper" >
+								<input class="uni-input" style="padding:25rpx" placeholder="请输入密码" :password="showPassword"
 									v-model="password" />
 								<text class="uni-icon" :class="[!showPassword ? 'uni-eye-active' : '']"
 									@click="changePassword">&#xe568;</text>
diff --git a/src/pages/setter/index.vue b/src/pages/setter/index.vue
index ab483ee5..9b616cfc 100644
--- a/src/pages/setter/index.vue
+++ b/src/pages/setter/index.vue
@@ -4,30 +4,22 @@
 			<image src="/static/avatar.png" class="tx"></image>
 			<!-- 	<view class="text">admin</view> -->
 		</view>
-		<view>
-			<uni-list>
-				<!-- <uni-list-item title="工号" clickable @click="onClick" :rightText="usermsg.phoneNumber"></uni-list-item> -->
-				<uni-list-item title="姓名" clickable :rightText="userName" thumb="/static/icon_personal_name.png">
-				</uni-list-item>
-
-				<uni-list-item v-if="userInfo!=null" title="部门" :rightText="userInfo.dept.name"
-					thumb="/static/icon_personal_password.png"></uni-list-item>
-				<uni-list-item v-if="userInfo!=null" title="岗位"
-					:rightText="(userInfo.posts || []).map(post => post.name).join(',')"
-					thumb="/static/icon_personal_password.png"></uni-list-item>
-				<uni-list-item v-if="userInfo!=null" title="角色"
-					:rightText="(userInfo.roles || []).map(role => role.name).join(',')"
-					thumb="/static/icon_personal_password.png"></uni-list-item>
-				<uni-list-item title="" clickable rightText="清除缓存" thumb="/static/icon_personal_name.png"
-					@click="clear"></uni-list-item>
-				<uni-list-item rightText="修改密码" link to="/pages/setter/passwordpage"
-					thumb="/static/icon_personal_password.png"></uni-list-item>
-				<!-- <uni-list-item title="服务器地址" 
-					thumb="/static/icon_personal_password.png"></uni-list-item> -->
-				<!-- 	<uni-list-item title="参数设置" link to="/pages/setter/setterDetail"
-					thumb="/static/icon_personal_setting.png"></uni-list-item> -->
-			</uni-list>
+		<view class="">
+			<u-cell-group >
+				<u-cell-item  icon="account-fill" title="姓名" :arrow="false">{{userName}}</u-cell-item>
+				<u-cell-item v-if="userInfo!=null" icon="file-text" title="部门" :arrow="false">{{userInfo.dept.name}}</u-cell-item>
+				<u-cell-item v-if="userInfo!=null" icon="photo" title="岗位" :arrow="false">{{(userInfo.posts || []).map(post => post.name).join(',')}}</u-cell-item>
+				<u-cell-item icon="level" v-if="userInfo!=null" title="角色" :arrow="false">{{(userInfo.roles || []).map(role => role.name).join(',')}}</u-cell-item>
+				<u-cell-item icon="trash" title="清除缓存" @click="clear()" ></u-cell-item>
+				<u-cell-item icon="edit-pen" title="修改密码" @click="modifiedPassWord()" ></u-cell-item>
+				<u-cell-item icon="order" title="版本号" :arrow="false">{{version}}</u-cell-item>
+				<!-- #ifdef APP -->
+				<u-cell-item icon="reload" title="检查更新" @click="update">{{version}}</u-cell-item>
+				<!-- #endif -->
+				
+			</u-cell-group>
 		</view>
+		
 		<view>
 			<button class="footbtn" @click="handlerlogout">退出登录</button>
 		</view>
@@ -47,20 +39,31 @@
 	import {
 		removeToken
 	} from '@/common/utils/auth'
+	
+	// #ifdef APP-PLUS
+	import {
+		appUpdate
+	} from "@/common/appUpdate.js"
+	// #endif
 	import {
 		ref,
 		reactive,
-		nextTick
+		nextTick,
+		createApp
 	} from "vue";
 	import {
 		onLoad
 	} from "@dcloudio/uni-app";
-	
+	const app = createApp({});
+	// app.component({
+	// });
 
 	const userName = ref(store.state.user.name);
 	let test = ref("123");
+	let version = ref();
 	let userInfo = ref(null);
 	onLoad(() => {
+		getAppVersion()
 		getUserProfile().then(res => {
 			userInfo.value = res.data
 			// nextTick(()=>{
@@ -75,15 +78,23 @@
 	function handlerlogout() {
 		store.dispatch('LogOut', {}).then(() => {
 			clearStorage();
+			// #ifdef H5
 			uni.reLaunch({
 				url: '../login/index'
 			})
+			// #endif
+			
+			// #ifdef APP
+			 plus.runtime.quit()
+			// #endif
+			
 		})
 	};
 
 	function clearStorage() {
 		uni.clearStorageSync()
 		removeToken();
+
 	};
 
 	function clear() {
@@ -93,44 +104,29 @@
 		})
 	}
 
+	function getAppVersion() {
+		const systemInfo = uni.getSystemInfoSync();
+		// #ifdef H5
+		version.value = systemInfo.appVersion;
+		console.log(systemInfo.appVersion, '版本号');
+		// #endif
+
+		// #ifdef APP
+		version.value = systemInfo.appWgtVersion;
+		// #endif
+
+	}
+
+	function update() {
+		console.log("update");
+		appUpdate()
+	}
+	function modifiedPassWord() {
+		uni.navigateTo({
+			url:"./passwordpage"
+		})
+	}
 
-	// export default {
-	// 	data() {
-	// 		return {
-	// 			userName: '',
-	// 			usermsg: {}
-	// 		}
-	// 	},
-	// 	onLoad() {
-	// 	},
-	// 	created() {
-	// 		this.userName = this.$store.getters.name
-	// 	},
-	// 	methods: {
-	// 		handlerlogout() {
-	// 			this.$store.dispatch('LogOut', params).then(() => {
-	// 				uni.reLaunch({
-	// 					url: '../login/index'
-	// 				})
-	// 				this.clearStorage();
-	// 			})
-	// 		},
-	// 		clearStorage() {
-	// 			uni.clearStorageSync()
-	// 			localStorage.clear();
-	// 			sessionStorage.clear();
-	// 			removeToken();
-	// 		},
-
-	// 		clear(){
-	// 			clearCacheData()
-	// 			uni.showToast({
-	// 				title:"清理缓存成功"
-	// 			})
-	// 		}
-
-	// 	}
-	// }
 </script>
 
 <style>
@@ -167,4 +163,4 @@
 		color: #333;
 		line-height: 90rpx;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/uni_modules/vk-uview-ui/components/u-cell-item/u-cell-item.vue b/src/uni_modules/vk-uview-ui/components/u-cell-item/u-cell-item.vue
index eb9661bd..b512d803 100644
--- a/src/uni_modules/vk-uview-ui/components/u-cell-item/u-cell-item.vue
+++ b/src/uni_modules/vk-uview-ui/components/u-cell-item/u-cell-item.vue
@@ -221,7 +221,7 @@ export default {
 	width: 100%;
 	padding: 10rpx 10rpx 10rpx 10rpx ;
 	font-size: 30rpx;
-	line-height: 40rpx;
+	line-height: 60rpx;
 	color: $u-content-color;
 	background-color: #fff;
 	text-align: left;