冲突代码修改

manifest.json

@@ -1,10 +1,6 @@
 {
     "name" : "ETC申办",
-<<<<<<< HEAD
     "appid" : "__UNI__FDD000D",
-=======
-    "appid" : "__UNI__AA89C92",
->>>>>>> 58ca76737b1f687ce89de41521078a2bc6ee709c
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

pages/userInfoUploading/userInfoUploading.vue

@@ -128,19 +128,11 @@
 		}
 	}
 	function handleAgentTel(data) {
-<<<<<<< HEAD
 			const itemData = formData.value[Index('经办人电话', formData.value)]
 			if (data.order.customerTel) {
 				itemData[itemData.value] = data.order.customerTel || ''
 				itemData.disabled = true
 			}
-=======
-		const itemData = formData.value[Index('经办人电话', formData.value)]
-		if (data.order.customerTel) {
-			itemData[itemData.value] = data.order.customerTel || ''
-			itemData.disabled = true
-		}
->>>>>>> 58ca76737b1f687ce89de41521078a2bc6ee709c
 	}
 	//初始判断单位办理还是个人办理
 	function danChange(key) {