From 23e4f9f409251fe756c192466cd1bd555c3875bd Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Tue, 7 Jan 2025 09:44:59 +0800
Subject: [PATCH] 1

---
 manifest.json               |  4 ++--
 pages/leave/application.vue |  2 +-
 pages/login/login.vue       | 35 ++++++++++++++++++-----------------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/manifest.json b/manifest.json
index 046d47c..57ec6a8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "数智产销",
     "appid" : "__UNI__9F097F0",
     "description" : "",
-    "versionName" : "1.1.0",
-    "versionCode" : 20241222,
+    "versionName" : "1.1.1",
+    "versionCode" : 20250106,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/leave/application.vue b/pages/leave/application.vue
index f9caced..f4475a1 100644
--- a/pages/leave/application.vue
+++ b/pages/leave/application.vue
@@ -25,7 +25,7 @@
 				</view>
 				<tree-select :dataSource="dataSource" v-model="type" dataValue="name" />
 			</view>
-			<picker mode="date" fields="day" @change="chooseStart" :value="beginTime">
+			<picker mode="date" fields="day" @change="chooseStart" :value="beginTime" :end="endTime">
 				<view class="f-row aic jcb box">
 					<view class="title">
 						开始时间：
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 0f982c2..8648a8f 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -32,11 +32,10 @@
 			</view>
 		</view>
 		<view class="login f-col aic">
-			
-			<text style="font-size: 10px;">Copyright (c) 2024 天然气产销厂 信息化支持中心</text>
-			<text style="font-size: 10px;">版本号：1.0.3</text>
+			<text style="font-size: 10px;">Copyright (c) 2024 天然气产销厂</text>
+			<text style="font-size: 10px;">版本号:{{systemInfo.appWgtVersion}}</text>
 		</view>
-		
+
 	</view>
 </template>
 
@@ -65,7 +64,9 @@
 	const {
 		proxy
 	} = getCurrentInstance()
-
+	
+	/** 系统信息 */
+	const systemInfo = uni.getSystemInfoSync()
 	/**是否明文显示密码*/
 	const showpwd = ref(false)
 	/**用于用户缓存账号和密码*/
@@ -97,20 +98,19 @@
 		});
 
 		/*生产环境 begin */
-		// loginApi({
-		// 	username: un,
-		// 	password: pw,
-		// 	ip: getDeviceIp()
-			/*生产环境 end */
+		loginApi({
+			username: un,
+			password: pw,
+			ip: getDeviceIp()
+		/*生产环境 end */
 
-			/*开发环境 begin */
-			localLoginApi({
-				username: username.value,
-				password: password.value,
-				captcha: 'app'
+		/*开发环境 begin */
+		// localLoginApi({
+		// 	username: username.value,
+		// 	password: password.value,
+		// 	captcha: 'app'
 			/*开发环境 end */
 		}).then((loginres) => {
-			// console.log("===============",loginres)
 			if (loginres.success) {
 				uni.setStorageSync('token', loginres.result.token)
 				store.setToken(loginres.result.token)
@@ -130,7 +130,7 @@
 					store.setUserInfo(loginres.result.userInfo)
 					//获取任务列表角标
 					loadBadge()
-					
+
 					// 跳转首页
 					uni.switchTab({
 						url: '/pages/tab/index'
@@ -174,6 +174,7 @@
 	}
 
 
+
 	function getDeviceIp() {
 		// #ifdef APP-PLUS