From 01349cd38a175e3eaf0e1b9b193b9517c0d167f0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 七月 2025 19:13:19 +0800
Subject: [PATCH] 前端

---
 small-program/pages/employment-certification/employment-certification.vue |   23 +++++------------------
 1 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/small-program/pages/employment-certification/employment-certification.vue b/small-program/pages/employment-certification/employment-certification.vue
index 61d1915..4995923 100644
--- a/small-program/pages/employment-certification/employment-certification.vue
+++ b/small-program/pages/employment-certification/employment-certification.vue
@@ -208,14 +208,10 @@
 				bgImg: require('@/static/image/bg_renzheng_yonggong@2x.png'),
 				title: '鐢ㄦ埛璁よ瘉',
 				flag: null,
-<<<<<<< HEAD
-				isCompany: false,
-				loading: false,
-=======
+ 
 				isCompany:false,
 				loading:false,
-				info: {},
->>>>>>> 66fcf61061d6d275c1848df5d3f8e0082f6b02ba
+				info: {}, 
 				form: {
 					"companyName": "",
 					authType: 0,
@@ -246,12 +242,8 @@
 			var flag = options.flag
 			this.flag = flag
 			this.initFormData()
-<<<<<<< HEAD
-			switch (flag) {
-=======
 			this.getApplyData()
-			switch(flag){
->>>>>>> 66fcf61061d6d275c1848df5d3f8e0082f6b02ba
+			switch(flag){ 
 				case '1':
 					this.title = '璐ц繍璁よ瘉'
 					this.bgImg = require('@/static/image/bg_renzheng_huoyun@2x.png')
@@ -441,11 +433,7 @@
 						})
 					}
 				})
-			},
-<<<<<<< HEAD
-			uploadImg(index) {
-				var that = this
-=======
+			}, 
 			getApplyData(){
 				var that = this 
 				var param ={ type:that.flag}
@@ -477,8 +465,7 @@
 				 }) 
 			},
 			uploadImg(index){
-				var that =this
->>>>>>> 66fcf61061d6d275c1848df5d3f8e0082f6b02ba
+				var that =this 
 				uni.chooseImage({
 					count: 1, // 榛樿9
 					sizeType: ['original', 'compressed'],

--
Gitblit v1.9.3