From 91f39356c0425f1d7f078c511d91d14d5e19f313 Mon Sep 17 00:00:00 2001 From: 396316021 <396316021@qq.com> Date: Tue, 5 Dec 2023 18:12:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98,=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 2 +- pages/logs/logs.js | 6 +- .../pages/finalJudgment/finalJudgment.js | 307 ++++++++---------- .../pages/finalJudgment/finalJudgment.wxml | 133 +------- 4 files changed, 157 insertions(+), 291 deletions(-) diff --git a/app.js b/app.js index 5f88c37..394dc7f 100644 --- a/app.js +++ b/app.js @@ -5,7 +5,7 @@ App({ onLaunch: function() { // wx.setStorageSync("serverurl", "http://192.168.2.92:8088/"); // wx.setStorageSync("serverurl", "https://adm.tsphjt.com/"); - wx.setStorageSync("serverurl", "http://tsph.scyp.ink/"); + wx.setStorageSync("serverurl", "https://tsph.scyp.ink/"); // 获取用户信息 wx.getSetting({ diff --git a/pages/logs/logs.js b/pages/logs/logs.js index 7d967fe..de365eb 100644 --- a/pages/logs/logs.js +++ b/pages/logs/logs.js @@ -47,8 +47,11 @@ Page({ // 草稿 draft(e) { let item = e.currentTarget.dataset.item - let obj = JSON.stringify(item.data_value) + item.data_value = JSON.parse(item.data_value); + // item.data_value = Object.assign(item.data_value,item.data_value.detail) + let obj = JSON.stringify(item.data_value); let type = item.type + console.log('item',item) if (type == 1) { wx.navigateTo({ url: `../../pages/toExamine/pages/first/first?id=${item.data_value.id}&title=${item.data_value.name}&type=${item.data_value.type}&det_type=5&obj=${obj}&number=${item.number}&form_type=${type}`, @@ -65,6 +68,7 @@ Page({ }, // 初审详情 firstDetails(e) { + console.log(e,e) let det_type let index = e.currentTarget.dataset.index let id = e.currentTarget.dataset.id; diff --git a/pages/toExamine/pages/finalJudgment/finalJudgment.js b/pages/toExamine/pages/finalJudgment/finalJudgment.js index 0254a1e..b340f6f 100644 --- a/pages/toExamine/pages/finalJudgment/finalJudgment.js +++ b/pages/toExamine/pages/finalJudgment/finalJudgment.js @@ -136,8 +136,10 @@ Page({ this.setData({ order_id: res.data.information_acquisition.id }) - res.data.information_acquisition.r_other = '' - res.data.information_acquisition.r_remark = '' + res.data.image_data.r_other = res.data.image_data.other + res.data.image_data.r_remark = res.data.image_data.remark + // res.data.image_data.remark + // res.data.image_data.other let obj = Object.assign(res.data.image_data, res.data.information_acquisition); this.assignment(obj) } @@ -351,30 +353,7 @@ Page({ } } - // 银行APP合同 - if (Data.r_bank_one.option == '0') { - if (Data.r_bank_one.require == 1) { - if (Data.r_bank_one.img_arr.length <= 0 || !Data.r_bank_one.img_arr) { - wx.showToast({ - title: `请上传${Data.r_bank_one.title}！`, - icon: 'none', - duration: 1500 - }) - return false; - } - } - } else { - if (Data.r_bank_one.require == 1) { - if (Data.r_bank_one.img_arr.length < 2 || !Data.r_bank_one.img_arr) { - wx.showToast({ - title: `请上传${Data.r_bank_one.title}！`, - icon: 'none', - duration: 1500 - }) - return false; - } - } - } + // 关系1 if (Data.urgent_relation_one.require == 1) { @@ -769,7 +748,6 @@ Page({ work_age: this.data.information?.work_age?.text_center ? this.data.information?.work_age?.text_center : '', monthly_income: this.data.information?.monthly_income?.text_center ? this.data.information?.monthly_income?.text_center : '', r_bank_photo: this.data.information?.r_bank_photo.img_arr.length > 0 ? this.data.information?.r_bank_photo.up_img_arr.join(',') : '', - r_bank_one: this.data.information?.r_bank_one.img_arr.length > 0 ? this.data.information?.r_bank_one.up_img_arr.join(',') : '', r_bank_number: this.data.information?.r_bank_number?.text_center ? this.data.information?.r_bank_number?.text_center : '', r_bank: this.data.information?.r_bank?.text_center ? this.data.information?.r_bank?.text_center : '', t_bank_type: this.data.information?.t_bank_type.option || this.data.information?.t_bank_type.option === 0 ? this.data.bankcardtype[this.data.information?.t_bank_type.option].name : '', @@ -886,18 +864,6 @@ Page({ } }) } - console.log(data.r_bank_one) - if (data.r_bank_one?.split(",").length > 0) { - data.r_bank_one?.split(",").forEach((liem, index) => { - if (liem) { - information.r_bank_one.img_arr.push(wx.getStorageSync("serverurl") + liem) - information.r_bank_one.up_img_arr.push(liem) - } else { - information.r_bank_one.img_arr.push('') - information.r_bank_one.up_img_arr.push('') - } - }) - } // console.log(information.r_bank_photo.img_arr) information.r_bank_number.text_center = data.r_bank_number ? data.r_bank_number : ''; information.r_bank.text_center = data.r_bank ? data.r_bank : ''; @@ -977,125 +943,125 @@ Page({ } // // 影像资料 - // if (data.car_register_cert?.split(",").length > 0) { - // data.car_register_cert?.split(",").forEach((liem, index) => { - // if (liem) { - // form_image.car_register_cert.img_arr.push(wx.getStorageSync("serverurl") + liem) - // form_image.car_register_cert.up_img_arr.push(liem) - // } else { - // form_image.car_register_cert.img_arr.push('') - // form_image.car_register_cert.up_img_arr.push('') - // } - // }) - // } - // if (data.car_insurance?.split(",").length > 0) { - // data.car_insurance?.split(",").forEach((liem, index) => { - // if (liem) { - // form_image.car_insurance.img_arr.push(wx.getStorageSync("serverurl") + liem) - // form_image.car_insurance.up_img_arr.push(liem) - // } else { - // form_image.car_insurance.img_arr.push('') - // form_image.car_insurance.up_img_arr.push('') - // } - // }) - // } - // if (data.car_insure?.split(",").length > 0) { - // data.car_insure?.split(",").forEach((liem, index) => { - // if (liem) { - // form_image.car_insure.img_arr.push(wx.getStorageSync("serverurl") + liem) - // form_image.car_insure.up_img_arr.push(liem) - // } else { - // form_image.car_insure.img_arr.push('') - // form_image.car_insure.up_img_arr.push('') - // } - // }) - // } - // if (data.car_image?.split(",").length > 0) { - // data.car_image?.split(",").forEach((liem, index) => { - // if (liem) { - // form_image.car_image.img_arr.push(wx.getStorageSync("serverurl") + liem) - // form_image.car_image.up_img_arr.push(liem) - // } else { - // form_image.car_image.img_arr.push('') - // form_image.car_image.up_img_arr.push('') - // } - // }) - // } - // if (data.verify_car_video?.split(",").length > 0) { - // data.verify_car_video?.split(",").forEach((liem, index) => { - // if (liem) { - // form_image.verify_car_video.img_arr.push(wx.getStorageSync("serverurl") + liem) - // form_image.verify_car_video.up_img_arr.push(liem) - // } else { - // form_image.verify_car_video.img_arr.push('') - // form_image.verify_car_video.up_img_arr.push('') - // } - // }) - // } - // if (data.promise_book?.split(",").length > 0) { - // data.promise_book?.split(",").forEach((liem, index) => { - // if (liem) { - // form_image.promise_book.img_arr.push(wx.getStorageSync("serverurl") + liem) - // form_image.promise_book.up_img_arr.push(liem) - // } else { - // form_image.promise_book.img_arr.push('') - // form_image.promise_book.up_img_arr.push('') - // } - // }) - // } - // if (data.marriage?.split(",").length > 0) { - // data.marriage?.split(",").forEach((liem, index) => { - // if (liem) { - // form_image.marriage.img_arr.push(wx.getStorageSync("serverurl") + liem) - // form_image.marriage.up_img_arr.push(liem) - // } else { - // form_image.marriage.img_arr.push('') - // form_image.marriage.up_img_arr.push('') - // } - // }) - // } - // if (data.registered_residence_book?.split(",").length > 0) { - // data.registered_residence_book?.split(",").forEach((liem, index) => { - // if (liem) { - // form_image.registered_residence_book.img_arr.push(wx.getStorageSync("serverurl") + liem) - // form_image.registered_residence_book.up_img_arr.push(liem) - // } else { - // form_image.registered_residence_book.img_arr.push('') - // form_image.registered_residence_book.up_img_arr.push('') - // } - // }) - // } - // if (data.running_account?.split(",").length > 0) { - // data.running_account?.split(",").forEach((liem, index) => { - // if (liem) { - // form_image.running_account.img_arr.push(wx.getStorageSync("serverurl") + liem) - // form_image.running_account.up_img_arr.push(liem) - // } else { - // form_image.running_account.img_arr.push('') - // form_image.running_account.up_img_arr.push('') - // } - // }) - // } - // if (data.house_property?.split(",").length > 0) { - // data.house_property?.split(",").forEach((liem, index) => { - // if (liem) { - // form_image.house_property.img_arr.push(wx.getStorageSync("serverurl") + liem) - // form_image.house_property.up_img_arr.push(liem) - // } else { - // form_image.house_property.img_arr.push('') - // form_image.house_property.up_img_arr.push('') - // } - // }) - // } - // form_image.remark.text_center = data.r_remark ? data.r_remark : ''; - // if (data.r_other?.split(",").length > 0) { - // data.r_other?.split(",").forEach((liem, index) => { - // if (liem) { - // form_image.other.img_arr.push(wx.getStorageSync("serverurl") + liem) - // form_image.other.up_img_arr.push(liem) - // } - // }) - // } + if (data.car_register_cert?.split(",").length > 0) { + data.car_register_cert?.split(",").forEach((liem, index) => { + if (liem) { + form_image.car_register_cert.img_arr.push(wx.getStorageSync("serverurl") + liem) + form_image.car_register_cert.up_img_arr.push(liem) + } else { + form_image.car_register_cert.img_arr.push('') + form_image.car_register_cert.up_img_arr.push('') + } + }) + } + if (data.car_insurance?.split(",").length > 0) { + data.car_insurance?.split(",").forEach((liem, index) => { + if (liem) { + form_image.car_insurance.img_arr.push(wx.getStorageSync("serverurl") + liem) + form_image.car_insurance.up_img_arr.push(liem) + } else { + form_image.car_insurance.img_arr.push('') + form_image.car_insurance.up_img_arr.push('') + } + }) + } + if (data.car_insure?.split(",").length > 0) { + data.car_insure?.split(",").forEach((liem, index) => { + if (liem) { + form_image.car_insure.img_arr.push(wx.getStorageSync("serverurl") + liem) + form_image.car_insure.up_img_arr.push(liem) + } else { + form_image.car_insure.img_arr.push('') + form_image.car_insure.up_img_arr.push('') + } + }) + } + if (data.car_image?.split(",").length > 0) { + data.car_image?.split(",").forEach((liem, index) => { + if (liem) { + form_image.car_image.img_arr.push(wx.getStorageSync("serverurl") + liem) + form_image.car_image.up_img_arr.push(liem) + } else { + form_image.car_image.img_arr.push('') + form_image.car_image.up_img_arr.push('') + } + }) + } + if (data.verify_car_video?.split(",").length > 0) { + data.verify_car_video?.split(",").forEach((liem, index) => { + if (liem) { + form_image.verify_car_video.img_arr.push(wx.getStorageSync("serverurl") + liem) + form_image.verify_car_video.up_img_arr.push(liem) + } else { + form_image.verify_car_video.img_arr.push('') + form_image.verify_car_video.up_img_arr.push('') + } + }) + } + if (data.promise_book?.split(",").length > 0) { + data.promise_book?.split(",").forEach((liem, index) => { + if (liem) { + form_image.promise_book.img_arr.push(wx.getStorageSync("serverurl") + liem) + form_image.promise_book.up_img_arr.push(liem) + } else { + form_image.promise_book.img_arr.push('') + form_image.promise_book.up_img_arr.push('') + } + }) + } + if (data.marriage?.split(",").length > 0) { + data.marriage?.split(",").forEach((liem, index) => { + if (liem) { + form_image.marriage.img_arr.push(wx.getStorageSync("serverurl") + liem) + form_image.marriage.up_img_arr.push(liem) + } else { + form_image.marriage.img_arr.push('') + form_image.marriage.up_img_arr.push('') + } + }) + } + if (data.registered_residence_book?.split(",").length > 0) { + data.registered_residence_book?.split(",").forEach((liem, index) => { + if (liem) { + form_image.registered_residence_book.img_arr.push(wx.getStorageSync("serverurl") + liem) + form_image.registered_residence_book.up_img_arr.push(liem) + } else { + form_image.registered_residence_book.img_arr.push('') + form_image.registered_residence_book.up_img_arr.push('') + } + }) + } + if (data.running_account?.split(",").length > 0) { + data.running_account?.split(",").forEach((liem, index) => { + if (liem) { + form_image.running_account.img_arr.push(wx.getStorageSync("serverurl") + liem) + form_image.running_account.up_img_arr.push(liem) + } else { + form_image.running_account.img_arr.push('') + form_image.running_account.up_img_arr.push('') + } + }) + } + if (data.house_property?.split(",").length > 0) { + data.house_property?.split(",").forEach((liem, index) => { + if (liem) { + form_image.house_property.img_arr.push(wx.getStorageSync("serverurl") + liem) + form_image.house_property.up_img_arr.push(liem) + } else { + form_image.house_property.img_arr.push('') + form_image.house_property.up_img_arr.push('') + } + }) + } + form_image.remark.text_center = data.r_remark ? data.r_remark : ''; + if (data.r_other?.split(",").length > 0) { + data.r_other?.split(",").forEach((liem, index) => { + if (liem) { + form_image.other.img_arr.push(wx.getStorageSync("serverurl") + liem) + form_image.other.up_img_arr.push(liem) + } + }) + } this.setData({ information: information, form_image: form_image, @@ -1156,7 +1122,6 @@ Page({ work_age: this.data.information?.work_age?.text_center ? this.data.information?.work_age?.text_center : '', monthly_income: this.data.information?.monthly_income?.text_center ? this.data.information?.monthly_income?.text_center : '', r_bank_photo: this.data.information?.r_bank_photo?.img_arr?.length > 0 ? this.data.information?.r_bank_photo.up_img_arr.join(',') : '', - r_bank_one: this.data.information?.r_bank_one?.img_arr?.length > 0 ? this.data.information?.r_bank_one.up_img_arr.join(',') : '', r_bank_number: this.data.information?.r_bank_number?.text_center ? this.data.information?.r_bank_number?.text_center : '', r_bank: this.data.information?.r_bank?.text_center ? this.data.information?.r_bank?.text_center : '', t_bank_type: this.data.information?.t_bank_type.option || this.data.information?.t_bank_type.option === 0 ? this.data.bankcardtype[this.data.information?.t_bank_type.option].name : '', @@ -1176,18 +1141,18 @@ Page({ remark: this.data.information?.remark?.text_center ? this.data.information?.remark?.text_center : '', other: this.data.information?.other?.img_arr?.length > 0 ? this.data.information?.other.up_img_arr.join(',') : '', // 影像资料form_image - // car_register_cert: this.data.form_image.car_register_cert?.img_arr?.length > 0 ? this.data.form_image.car_register_cert.up_img_arr.join(',') : '', - // car_insurance: this.data.form_image.car_insurance?.img_arr?.length > 0 ? this.data.form_image.car_insurance.up_img_arr.join(',') : '', - // car_insure: this.data.form_image.car_insure?.img_arr?.length > 0 ? this.data.form_image.car_insure.up_img_arr.join(',') : '', - // car_image: this.data.form_image.car_image?.img_arr?.length > 0 ? this.data.form_image.car_image.up_img_arr.join(',') : '', - // verify_car_video: this.data.form_image.verify_car_video?.img_arr?.length > 0 ? this.data.form_image.verify_car_video.up_img_arr.join(',') : '', - // promise_book: this.data.form_image.promise_book?.img_arr?.length > 0 ? this.data.form_image.promise_book.up_img_arr.join(',') : '', - // marriage: this.data.form_image.marriage?.img_arr?.length > 0 ? this.data.form_image.marriage.up_img_arr.join(',') : '', - // registered_residence_book: this.data.form_image.registered_residence_book?.img_arr?.length > 0 ? this.data.form_image.registered_residence_book.up_img_arr.join(',') : '', - // running_account: this.data.form_image.running_account?.img_arr?.length > 0 ? this.data.form_image.running_account.up_img_arr.join(',') : '', - // house_property: this.data.form_image.house_property?.img_arr?.length > 0 ? this.data.form_image.house_property.up_img_arr.join(',') : '', - // r_remark: this.data.form_image.remark?.text_center ? this.data.form_image.remark?.text_center : '', - // r_other: this.data.form_image.other?.img_arr?.length > 0 ? this.data.form_image.other.up_img_arr.join(',') : '', + car_register_cert: this.data.form_image.car_register_cert?.img_arr?.length > 0 ? this.data.form_image.car_register_cert.up_img_arr.join(',') : '', + car_insurance: this.data.form_image.car_insurance?.img_arr?.length > 0 ? this.data.form_image.car_insurance.up_img_arr.join(',') : '', + car_insure: this.data.form_image.car_insure?.img_arr?.length > 0 ? this.data.form_image.car_insure.up_img_arr.join(',') : '', + car_image: this.data.form_image.car_image?.img_arr?.length > 0 ? this.data.form_image.car_image.up_img_arr.join(',') : '', + verify_car_video: this.data.form_image.verify_car_video?.img_arr?.length > 0 ? this.data.form_image.verify_car_video.up_img_arr.join(',') : '', + promise_book: this.data.form_image.promise_book?.img_arr?.length > 0 ? this.data.form_image.promise_book.up_img_arr.join(',') : '', + marriage: this.data.form_image.marriage?.img_arr?.length > 0 ? this.data.form_image.marriage.up_img_arr.join(',') : '', + registered_residence_book: this.data.form_image.registered_residence_book?.img_arr?.length > 0 ? this.data.form_image.registered_residence_book.up_img_arr.join(',') : '', + running_account: this.data.form_image.running_account?.img_arr?.length > 0 ? this.data.form_image.running_account.up_img_arr.join(',') : '', + house_property: this.data.form_image.house_property?.img_arr?.length > 0 ? this.data.form_image.house_property.up_img_arr.join(',') : '', + r_remark: this.data.form_image.remark?.text_center ? this.data.form_image.remark?.text_center : '', + r_other: this.data.form_image.other?.img_arr?.length > 0 ? this.data.form_image.other.up_img_arr.join(',') : '', } let data = { salesman_id: wx.getStorageSync("userInfo").id, diff --git a/pages/toExamine/pages/finalJudgment/finalJudgment.wxml b/pages/toExamine/pages/finalJudgment/finalJudgment.wxml index 8c59f5a..abe60c2 100644 --- a/pages/toExamine/pages/finalJudgment/finalJudgment.wxml +++ b/pages/toExamine/pages/finalJudgment/finalJudgment.wxml @@ -143,109 +143,6 @@ - 配偶信息（已婚必填，未婚或离异不用填) - - - - 提示：{{information.spouse_name.tip}} - - - - *{{information.spouse_name.title}} - - - - - - - - 提示：{{information.spouse_id_card.tip}} - - - - *{{information.spouse_id_card.title}} - - - - - - - - 提示：{{information.spouse_phone.tip}} - - - - *{{information.spouse_phone.title}} - - - - - - - - 提示：{{information.spouse_phone.tip}} - - - - *{{information.spouse_address.title}} - - - - - - - - 提示：{{information.spouse_work.tip}} - - - - *{{information.spouse_work.title}} - - - - - - - - - 提示：{{information.spouse_work_address.tip}} - - - - *{{information.spouse_work_address.title}} - - - - - - - - - 提示：{{information.spouse_monthly_income.tip}} - - - - *{{information.spouse_monthly_income.title}} - - - 元 - - - - - - 提示：{{information.spouse_work_age.tip}} - - - - * {{information.spouse_work_age.title}} - - - 年 - - - - 融资租赁还款账户 @@ -364,20 +261,20 @@ - - - *{{information.r_bank_one.title}} - - - - - - - - 图片 - - - + + + + + + + + + + + + + + @@ -503,7 +400,7 @@ {{information.remark.title}} -