From 814573aa62cc6c44d193f8b7899890208d00c5fd Mon Sep 17 00:00:00 2001
From: yunkexin <760754045@qq.com>
Date: Mon, 19 Aug 2024 09:27:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E9=BE=84=E4=B8=8D=E5=BF=85=E5=A1=AB?=
 =?UTF-8?q?=E3=80=81=E5=85=A5=E8=81=8C=E6=97=A5=E6=9C=9F=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=BD=93=E5=A4=A9=E3=80=81=E5=AE=8C=E6=88=90=E5=90=8E=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC9100?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/common.js         |  7 +++++--
 pages.json               |  3 ++-
 pages/apply/complete.vue |  9 +++++++--
 pages/apply/index.vue    | 37 +++++++++++--------------------------
 utils/common.js          | 10 ++++++++++
 5 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/config/common.js b/config/common.js
index 5fd2e59..2e35faf 100644
--- a/config/common.js
+++ b/config/common.js
@@ -101,6 +101,7 @@ if (process.env.CUSTOM_PLATFORM === "dev") {
 		uni_app_web_api_url: "http://localhost", // 请求接口的地址
 		uni_app_web_source_url: "http://localhost:3199", // 资源地址
 		uni_app_web_local_api_url: "http://localhost", // 请求接口的地址
+		uni_app_url: "http://47.122.43.22:9100"
 	}
 } else if (process.env.CUSTOM_PLATFORM === "test") {
 	//测试环境
@@ -114,6 +115,7 @@ if (process.env.CUSTOM_PLATFORM === "dev") {
 		uni_app_web_api_url: "http://47.122.43.22", // 请求接口的地址
 		uni_app_web_source_url: "http://47.122.43.22:3199", // 资源地址
 		uni_app_web_local_api_url: "http://47.122.43.22", // 请求接口的地址
+		uni_app_url: "http://47.122.43.22:9100"
 	}
 } else
 	//生产环境 发布等
@@ -126,8 +128,9 @@ if (process.env.CUSTOM_PLATFORM === "dev") {
 		uni_app_web_url: "",
 		uni_app_web_api_url: APP_ENV === 'release' ? "http://xmmhe.com" : "http://47.122.43.22",
 		uni_app_web_source_url: APP_ENV === 'release' ? "http://xmmhe.com:3199" : "http://47.122.43.22:3199",
-		uni_app_web_local_api_url: APP_ENV === 'release' ? "http://xmmhe.com" : "http://47.122.43.22" //打包测试： 47.122.43.22  开发可  localhost
+		uni_app_web_local_api_url: APP_ENV === 'release' ? "http://xmmhe.com" : "http://47.122.43.22", //打包测试： 47.122.43.22  开发可  localhost
+		uni_app_url: APP_ENV === 'release' ? "http://xmmhe.com:9100" : "http://47.122.43.22:9100"
 
 	}
 
-export default configURL
+export default configURL
\ No newline at end of file
diff --git a/pages.json b/pages.json
index c64863c..2c62ee5 100644
--- a/pages.json
+++ b/pages.json
@@ -48,7 +48,8 @@
 			"path": "pages/webview/webview",
 			"style": {
 				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#fff"
 			}
 		}
 		
diff --git a/pages/apply/complete.vue b/pages/apply/complete.vue
index 097148c..ff4a575 100644
--- a/pages/apply/complete.vue
+++ b/pages/apply/complete.vue
@@ -23,12 +23,14 @@
 </template>
 
 <script>
+	import config from '../../config/common.js'
 	export default {
 		data() {
 			return {
 				showSex: false,
 				type: 'success',
 				titleFailes: '提交失败，请稍后重新提交',
+				appurl:config.uni_app_url
 
 			}
 		},
@@ -49,9 +51,12 @@
 				// uni.navigateBack({
 				// 	delta:2
 				// })
-				const Company = uni.getStorageSync('Company') 
+				// const Company = uni.getStorageSync('Company') 
+				// uni.reLaunch({
+				// 	url: '/pages/index/index?Company='+Company
+				// })
 				uni.reLaunch({
-					url: '/pages/index/index?Company='+Company
+					url: '/pages/webview/webview?url=' + this.appurl
 				})
 			},
 
diff --git a/pages/apply/index.vue b/pages/apply/index.vue
index 4d03300..7dc98b5 100644
--- a/pages/apply/index.vue
+++ b/pages/apply/index.vue
@@ -60,6 +60,7 @@
 	import {
 		isChinaMobilePhone,
 		easyCheckID,
+		getNowFormatDate
 	} from '../../utils/common.js'
 	export default {
 		data() {
@@ -75,17 +76,7 @@
 						Sex: '',
 						Phone: '',
 						ID_CARD: '',
-						InTime: '',
-						WORKINGYEAR: '',
-					},
-				},
-				model2: {
-					userInfo: {
-						Name: '',
-						Sex: '',
-						Phone: '',
-						ID_CARD: '',
-						InTime: '',
+						InTime: getNowFormatDate(),
 						WORKINGYEAR: '',
 					},
 				},
@@ -133,12 +124,6 @@
 						message: '请选择入职时间',
 						trigger: ['blur', 'change']
 					},
-					'userInfo.WORKINGYEAR': {
-						type: 'string',
-						required: true,
-						message: '请选择工龄',
-						trigger: ['blur', 'change']
-					},
 				},
 				radio: '',
 				switchVal: false
@@ -192,8 +177,7 @@
 					this.model1.userInfo.Sex == '' ||
 					this.model1.userInfo.Phone == '' ||
 					this.model1.userInfo.ID_CARD == '' ||
-					this.model1.userInfo.InTime == '' ||
-					this.model1.userInfo.WORKINGYEAR == '') {
+					this.model1.userInfo.InTime == '') {
 					uni.showToast({
 						icon: 'error',
 						title: '信息不能为空'
@@ -215,13 +199,14 @@
 					return
 				}
 				this.loading = true
-				this.model2.userInfo = this.model1.userInfo
-				if (this.model1.userInfo.Sex == '男') {
-					this.model2.userInfo.Sex = '1'
-				} else {
-					this.model2.userInfo.Sex = '0'
-				}
-				const json = this.model2.userInfo
+				const json = {
+						Name: this.model1.userInfo.Name,
+						Sex: this.model1.userInfo.Sex == '男'?'1':'0',
+						Phone: this.model1.userInfo.Phone,
+						ID_CARD: this.model1.userInfo.ID_CARD,
+						InTime: this.model1.userInfo.InTime,
+						WORKINGYEAR: this.model1.userInfo.WORKINGYEAR,
+					}
 				// const json = {
 				// 	Name: '云',
 				// 	Sex: '0',
diff --git a/utils/common.js b/utils/common.js
index f5d1315..8f653d5 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -1368,4 +1368,14 @@ export function checkIDCard(code) {
 
 	}
 	return matches
+}
+export function getNowFormatDate() {
+  let date = new Date(),
+    year = date.getFullYear(), //获取完整的年份(4位)
+    month = date.getMonth() + 1, //获取当前月份(0-11,0代表1月)
+    strDate = date.getDate() // 获取当前日(1-31)
+  if (month < 10) month = `0${month}` // 如果月份是个位数，在前面补0
+  if (strDate < 10) strDate = `0${strDate}` // 如果日是个位数，在前面补0
+ 
+  return `${year}-${month}-${strDate}`
 }
\ No newline at end of file