Browse Source

冲突代码修改

ms
贺自立 6 months ago
parent
commit
fe515aaa5a
2 changed files with 0 additions and 12 deletions
  1. 0
    4
      manifest.json
  2. 0
    8
      pages/userInfoUploading/userInfoUploading.vue

+ 0
- 4
manifest.json View File

{ {
"name" : "ETC申办", "name" : "ETC申办",
<<<<<<< HEAD
"appid" : "__UNI__FDD000D", "appid" : "__UNI__FDD000D",
=======
"appid" : "__UNI__AA89C92",
>>>>>>> 58ca76737b1f687ce89de41521078a2bc6ee709c
"description" : "", "description" : "",
"versionName" : "1.0.0", "versionName" : "1.0.0",
"versionCode" : "100", "versionCode" : "100",

+ 0
- 8
pages/userInfoUploading/userInfoUploading.vue View File

} }
} }
function handleAgentTel(data) { function handleAgentTel(data) {
<<<<<<< HEAD
const itemData = formData.value[Index('经办人电话', formData.value)] const itemData = formData.value[Index('经办人电话', formData.value)]
if (data.order.customerTel) { if (data.order.customerTel) {
itemData[itemData.value] = data.order.customerTel || '' itemData[itemData.value] = data.order.customerTel || ''
itemData.disabled = true 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) { function danChange(key) {

Loading…
Cancel
Save