diff --git a/app.json b/app.json index 9f94b2b..7e6dcb9 100644 --- a/app.json +++ b/app.json @@ -54,6 +54,7 @@ "pages/order/editInsImg/index", "pages/order/editOtherImg/index", "pages/order/editImg/index", + "pages/order/editBillImg/index", "pages/order/editInvoiceImg/index", "pages/storeData/index", "pages/storeData/customerData/index", diff --git a/commons/css/base/imgSize.wxss b/commons/css/base/imgSize.wxss index c8a1eb7..0b9b9fa 100644 --- a/commons/css/base/imgSize.wxss +++ b/commons/css/base/imgSize.wxss @@ -33,6 +33,7 @@ .img-750x422{width:100%;height:422rpx;box-sizing:border-box;} .img-h-200{height:200rpx;box-sizing:border-box;} +.img-h-300{height:300rpx;box-sizing:border-box;} .img-w-260{width:260rpx;box-sizing:border-box;} .img-w-280{width:280rpx;box-sizing:border-box;} .img-h-400{height:400rpx;box-sizing:border-box;} \ No newline at end of file diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index 2b5f410..33bb2f4 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -682,9 +682,6 @@ Page({ if(that.data.frontUrl.url){ params['cardidA'] = that.data.frontUrl.url; } - if(that.data.backUrl.url){ - params['cardidB'] = that.data.backUrl.url; - } if(that.data.businessUrl.url){ params['business_licence'] = that.data.businessUrl.url; } @@ -728,9 +725,6 @@ Page({ if(that.data.frontUrl.url){ params['cardidA'] = that.data.frontUrl.url; } - if(that.data.backUrl.url){ - params['cardidB'] = that.data.backUrl.url; - } if(that.data.businessUrl.url){ params['business_licence'] = that.data.businessUrl.url; } diff --git a/pages/order/detail/index2.js b/pages/order/detail/index2.js index 05f34f2..dcfcefe 100644 --- a/pages/order/detail/index2.js +++ b/pages/order/detail/index2.js @@ -21,7 +21,6 @@ Page({ delivery_ck_img: {}, //交车确认图片 cardida: {}, //身份证正面照片 - cardidb: {}, //身份证反面照片 business_licence: {}, //营业执照照片 car_img: {}, //行驶证照片 isShowCK: false, @@ -94,7 +93,6 @@ Page({ }) this.setData({ cardida: res.data.imgs.cardida.length == 0 ? {} : res.data.imgs.cardida, - cardidb: res.data.imgs.cardidb.length == 0 ? {} : res.data.imgs.cardidb, business_licence: res.data.imgs.business_licence.length == 0 ? {} : res.data.imgs.business_licence, car_img: res.data.imgs.car_img.length == 0 ? {} : res.data.imgs.car_img, pay_img: res.data.imgs.pay_img.length == 0 ? [] : res.data.imgs.pay_img, @@ -217,59 +215,6 @@ Page({ }) } - //上传身份证背面 - if (e.currentTarget.dataset.type == 'cardidb') { - wx.chooseImage({ - count: 1, // 默认9 - sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有 - sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有 - success(res) { - wx.showLoading({ - title: '上传中', - }) - wx.uploadFile({ - url: _.config.api.upImg, - filePath: res.tempFilePaths[0], - name: 'img', - formData: { - 'app': 'liche' - }, - success: (resp) => { - resp.data = JSON.parse(resp.data); - wx.hideLoading(); - if (resp.data.code == 200) { - that.setData({ - 'cardidb.value': resp.data.data.url, - 'cardidb.img': resp.data.data.full_url, - }) - - let params = {}; - params['id'] = that.data.id; - params['cardidb'] = resp.data.data.url; - _.apiQuery.putAppCusorderdata(params).then(res2 => { - - }).catch(res2 => { - if (res2.code == 418) { - that.setData({ - 'cardidb.err': !res2.data[1].caridB, - 'cardidb.errmsg': res2.data[1].errmsg, - }) - } - }); - } - }, - }) - }, - fail: res => { - wx.showToast({ - title: '文件选择失败', - icon: 'none', - duration: 2000 - }) - } - }) - } - //上传营业执照 if (e.currentTarget.dataset.type == 'business_licence') { wx.chooseImage({ @@ -601,12 +546,7 @@ Page({ current: this.data.imgInfo.imgs.cardida.img, urls: [this.data.imgInfo.imgs.cardida.img], }) - } else if (e.currentTarget.dataset.type == 'cardidb') { - wx.previewImage({ - current: this.data.imgInfo.imgs.cardidb.img, - urls: [this.data.imgInfo.imgs.cardidb.img], - }) - } else if (e.currentTarget.dataset.type == 'business_licence') { + }else if (e.currentTarget.dataset.type == 'business_licence') { wx.previewImage({ current: this.data.imgInfo.imgs.business_licence.img, urls: [this.data.imgInfo.imgs.business_licence.img], diff --git a/pages/order/detail/index2.wxml b/pages/order/detail/index2.wxml index bdcebe5..0047e58 100644 --- a/pages/order/detail/index2.wxml +++ b/pages/order/detail/index2.wxml @@ -85,7 +85,7 @@ 身份证 - {{info.status>0?'已审核':cardida.value||cardidb.value?'更新':'上传'}} + {{info.status>0?'已审核':cardida.value?'更新':'上传'}} @@ -120,7 +120,7 @@ - + 发票 {{info.status>1?'已审核':bill_img.value?'更新':'上传'}} @@ -139,12 +139,8 @@ 保险单 - - 已审核 - - - {{imgInfo.imgs.accident_img.value||imgInfo.imgs.insurance_img.value||imgInfo.imgs.business_img.value?'更新':'上传'}} - + 已审核 + {{imgInfo.imgs.accident_img.value||imgInfo.imgs.insurance_img.value||imgInfo.imgs.business_img.value?'更新':'上传'}} @@ -169,7 +165,7 @@ - + 身份证 @@ -177,11 +173,6 @@ - - - - - diff --git a/pages/order/editBillImg/index.js b/pages/order/editBillImg/index.js new file mode 100644 index 0000000..1c83607 --- /dev/null +++ b/pages/order/editBillImg/index.js @@ -0,0 +1,351 @@ +import _ from '../../../commons/js/commons' +const app = getApp() +Page({ + data: { + cardida:{},//身份证正面照片 + business_licence:{},//营业执照照片 + bill_img:{},//发票照片 + ins_img:[],//保险照片 + other_img:[],//交车合照 + }, + onLoad: function (options) { + for (let key in options) { + this.setData({ + [key]: options[key] + }) + } + + this.getAppCusorderdata() + + }, + onShow: function () { + + }, + + //获取订单图片 + getAppCusorderdata(){ + let params = {}; + params['id'] = this.data.id; + _.apiQuery.getAppCusorderdata(params).then(res=>{ + this.setData({ + imgInfo:res.data, + }) + if(res.data.img_status == 1){ + this.setData({ + cardida:res.data.imgs.cardida.length==0?{}:res.data.imgs.cardida, + business_licence:res.data.imgs.business_licence.length==0?{}:res.data.imgs.business_licence, + bill_img:res.data.imgs.bill_img.length==0?{}:res.data.imgs.bill_img, + ins_img:res.data.imgs.ins_img.length==0?[]:res.data.imgs.ins_img, + other_img:res.data.imgs.other_img.length==0?[]:res.data.imgs.other_img, + }) + } + wx.stopPullDownRefresh() + }) + }, + + //选择图片 + chooseImg(e) { + let that = this + //上传身份证正面 + if(e.currentTarget.dataset.type=='cardida'){ + wx.chooseImage({ + count: 1, // 默认9 + sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有 + sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有 + success(res) { + wx.showLoading({ + title: '上传中', + }) + wx.uploadFile({ + url:_.config.api.upImg, + filePath:res.tempFilePaths[0], + name: 'img', + formData: { + 'app': 'liche' + }, + success: (resp) => { + resp.data = JSON.parse(resp.data); + if (resp.data.code == 200) { + let params = {}; + params['id'] = that.data.id; + params['cardida'] = resp.data.data.url; + _.apiQuery.putAppCusorderdata(params).then(res2 => { + wx.hideLoading(); + that.setData({ + 'cardida.value':resp.data.data.url, + 'cardida.img':resp.data.data.full_url, + }) + }).catch(res2=>{ + wx.hideLoading(); + if(res2.code==418){ + that.setData({ + 'cardida.value':resp.data.data.url, + 'cardida.img':resp.data.data.full_url, + 'cardida.err':!res2.data[0].caridA, + 'cardida.errmsg':res2.data[0].errmsg, + }) + } + }); + }else{ + wx.hideLoading(); + wx.showToast({ + title: '上传失败', + icon: 'none', + duration: 2000 + }) + } + }, + }) + }, + fail: res => { + wx.showToast({ + title: '文件选择失败', + icon: 'none', + duration: 2000 + }) + } + }) + } + //上传营业执照 + if(e.currentTarget.dataset.type=='business_licence'){ + wx.chooseImage({ + count: 1, // 默认9 + sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有 + sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有 + success(res) { + wx.showLoading({ + title: '上传中', + }) + wx.uploadFile({ + url:_.config.api.upImg, + filePath:res.tempFilePaths[0], + name: 'img', + formData: { + 'app': 'liche' + }, + success: (resp) => { + resp.data = JSON.parse(resp.data); + if (resp.data.code == 200) { + let params = {}; + params['id'] = that.data.id; + params['business_licence'] = resp.data.data.url; + _.apiQuery.putAppCusorderdata(params).then(res2 => { + wx.hideLoading(); + that.setData({ + 'business_licence.value':resp.data.data.url, + 'business_licence.img':resp.data.data.full_url, + }) + }).catch(res2=>{ + wx.hideLoading(); + if(res2.code==418){ + that.setData({ + 'business_licence.value':resp.data.data.url, + 'business_licence.img':resp.data.data.full_url, + 'business_licence.err':!res2.data[0].business_licence, + 'business_licence.errmsg':res2.data[0].errmsg, + }) + } + }); + }else{ + wx.hideLoading(); + wx.showToast({ + title: '上传失败', + icon: 'none', + duration: 2000 + }) + } + }, + }) + }, + fail: res => { + wx.showToast({ + title: '文件选择失败', + icon: 'none', + duration: 2000 + }) + } + }) + } + + //上传发票 + if(e.currentTarget.dataset.type=='bill_img'){ + wx.chooseImage({ + count: 1, // 默认9 + sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有 + sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有 + success(res) { + wx.showLoading({ + title: '上传中', + }) + wx.uploadFile({ + url:_.config.api.upImg, + filePath:res.tempFilePaths[0], + name: 'img', + formData: { + 'app': 'liche' + }, + success: (resp) => { + resp.data = JSON.parse(resp.data); + if (resp.data.code == 200) { + let params = {}; + params['id'] = that.data.id; + params['bill_img'] = resp.data.data.url; + _.apiQuery.putAppCusorderdata(params).then(res2 => { + wx.hideLoading(); + that.setData({ + 'bill_img.value':resp.data.data.url, + 'bill_img.img':resp.data.data.full_url, + }) + }).catch(res2=>{ + wx.hideLoading(); + if (res2.code == 418) { + that.setData({ + 'bill_img.value': resp.data.data.url, + 'bill_img.img': resp.data.data.full_url, + 'bill_img.err': !res2.data[0].bill_img, + 'bill_img.errmsg': res2.data[0].errmsg, + }) + } + }); + }else{ + wx.hideLoading(); + wx.showToast({ + title: '上传失败', + icon: 'none', + duration: 2000 + }) + } + }, + }) + }, + fail: res => { + wx.showToast({ + title: '文件选择失败', + icon: 'none', + duration: 2000 + }) + } + }) + } + + //上传保单 + if(e.currentTarget.dataset.type=='ins_img'){ + wx.chooseImage({ + count: 10 - that.data.ins_img.length, // + sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有 + sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有 + success(res1) { + wx.showLoading({ + title: '上传中', + }) + let ins_img=that.data.ins_img + let k = 0 + for (let i = 0; i < res1.tempFilePaths.length; i++) { + //上传图片 + wx.uploadFile({ + url:_.config.api.upImg, + filePath:res1.tempFilePaths[i], + name: 'img', + formData: { + 'app': 'liche' + }, + success: (resp) => { + k = k + 1 + resp.data = JSON.parse(resp.data); + if (resp.data.code == 200) { + let imgdata = resp.data + let list = [] + list.push({ + value:imgdata.data.url, + img:imgdata.data.full_url, + }) + ins_img=ins_img.concat(list) + if(k == res1.tempFilePaths.length){ + let params = {}; + params['id'] = that.data.id; + let img = [] + ins_img.forEach(item => { + img.push(item.value) + }) + params['ins_imgs'] = img; + _.apiQuery.putAppCusorderdata(params).then(res2 => { + wx.hideLoading(); + that.setData({ + ins_img, + }) + }).catch(res2=>{ + wx.hideLoading(); + }); + } + }else{ + wx.hideLoading(); + } + }, + + }) + } + + }, + fail: res => { + wx.showToast({ + title: '文件选择失败', + icon: 'none', + duration: 2000 + }) + } + }) + } + }, + + // 编辑页面删除图片 + delImg(e){ + if(e.currentTarget.dataset.type=='ins_img'){ + let ins_img = this.data.ins_img + ins_img.splice(e.currentTarget.dataset.index, 1) + let params = {}; + params['id'] = this.data.id; + let img = [] + ins_img.forEach(item => { + img.push(item.value) + }) + params['ins_imgs'] = img; + _.apiQuery.putAppCusorderdata(params).then(res => { + this.setData({ + ins_img, + }) + }) + }else if(e.currentTarget.dataset.type=='other_img'){ + let other_img = this.data.other_img + other_img.splice(e.currentTarget.dataset.index, 1) + let params = {}; + params['id'] = this.data.id; + let img = [] + other_img.forEach(item => { + img.push(item.value) + }) + params['other_imgs'] = img; + _.apiQuery.putAppCusorderdata(params).then(res => { + this.setData({ + other_img, + }) + }) + } + }, + + //查看图片 + previewImage: function (e) { + if(e.currentTarget.dataset.type=='register_img'){ + wx.previewImage({ + current:this.data.imgInfo.imgs.register_img.img, + urls:[this.data.imgInfo.imgs.register_img.img], + }) + } + else if(e.currentTarget.dataset.type=='bill_img'){ + wx.previewImage({ + current:this.data.imgInfo.imgs.bill_img.img, + urls:[this.data.imgInfo.imgs.bill_img.img], + }) + } + }, + +}) \ No newline at end of file diff --git a/pages/order/editBillImg/index.json b/pages/order/editBillImg/index.json new file mode 100644 index 0000000..8174365 --- /dev/null +++ b/pages/order/editBillImg/index.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "发票信息", + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/order/editBillImg/index.wxml b/pages/order/editBillImg/index.wxml new file mode 100644 index 0000000..da1c948 --- /dev/null +++ b/pages/order/editBillImg/index.wxml @@ -0,0 +1,27 @@ + + + + + + + + + + + {{bill_img.errmsg}} + + + + + + + + + 上传发票 + + + + + + + \ No newline at end of file diff --git a/pages/order/editBillImg/index.wxss b/pages/order/editBillImg/index.wxss new file mode 100644 index 0000000..cba0d8c --- /dev/null +++ b/pages/order/editBillImg/index.wxss @@ -0,0 +1 @@ +/* pages/order/editBillImg/index.wxss */ \ No newline at end of file diff --git a/pages/order/editBusinessBicence/index.js b/pages/order/editBusinessBicence/index.js index 9271eee..aa00853 100644 --- a/pages/order/editBusinessBicence/index.js +++ b/pages/order/editBusinessBicence/index.js @@ -3,7 +3,6 @@ const app = getApp() Page({ data: { cardida: {}, //身份证正面照片 - cardidb: {}, //身份证反面照片 business_licence: {}, //营业执照照片 car_img: {}, //行驶证照片 register_img: {}, //登记证照片 @@ -43,128 +42,6 @@ Page({ //选择图片 chooseImg(e) { let that = this - //上传身份证正面 - if (e.currentTarget.dataset.type == 'cardida') { - wx.chooseImage({ - count: 1, // 默认9 - sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有 - sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有 - success(res) { - wx.showLoading({ - title: '上传中', - }) - wx.uploadFile({ - url: _.config.api.upImg, - filePath: res.tempFilePaths[0], - name: 'img', - formData: { - 'app': 'liche' - }, - success: (resp) => { - resp.data = JSON.parse(resp.data); - if (resp.data.code == 200) { - let params = {}; - params['id'] = that.data.id; - params['cardida'] = resp.data.data.url; - _.apiQuery.putAppCusorderdata(params).then(res2 => { - wx.hideLoading(); - that.setData({ - 'cardida.value': resp.data.data.url, - 'cardida.img': resp.data.data.full_url, - }) - }).catch(res2 => { - wx.hideLoading(); - if (res2.code == 418) { - that.setData({ - 'cardida.value': resp.data.data.url, - 'cardida.img': resp.data.data.full_url, - 'cardida.err': !res2.data[0].caridA, - 'cardida.errmsg': res2.data[0].errmsg, - }) - } - }); - } else { - wx.hideLoading(); - wx.showToast({ - title: '上传失败', - icon: 'none', - duration: 2000 - }) - } - }, - }) - }, - fail: res => { - wx.showToast({ - title: '文件选择失败', - icon: 'none', - duration: 2000 - }) - } - }) - } - - //上传身份证背面 - if (e.currentTarget.dataset.type == 'cardidb') { - wx.chooseImage({ - count: 1, // 默认9 - sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有 - sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有 - success(res) { - wx.showLoading({ - title: '上传中', - }) - wx.uploadFile({ - url: _.config.api.upImg, - filePath: res.tempFilePaths[0], - name: 'img', - formData: { - 'app': 'liche' - }, - success: (resp) => { - resp.data = JSON.parse(resp.data); - if (resp.data.code == 200) { - let params = {}; - params['id'] = that.data.id; - params['cardidb'] = resp.data.data.url; - _.apiQuery.putAppCusorderdata(params).then(res2 => { - wx.hideLoading(); - that.setData({ - 'cardidb.value': resp.data.data.url, - 'cardidb.img': resp.data.data.full_url, - }) - }).catch(res2 => { - wx.hideLoading(); - if (res2.code == 418) { - that.setData({ - 'cardidb.value': resp.data.data.url, - 'cardidb.img': resp.data.data.full_url, - 'cardidb.err': !res2.data[1].caridB, - 'cardidb.errmsg': res2.data[1].errmsg, - }) - } - }); - } else { - wx.hideLoading(); - wx.showToast({ - title: '上传失败', - icon: 'none', - duration: 2000 - }) - } - }, - }) - }, - fail: res => { - wx.showToast({ - title: '文件选择失败', - icon: 'none', - duration: 2000 - }) - } - }) - } - //上传营业执照 if (e.currentTarget.dataset.type == 'business_licence') { wx.chooseImage({ diff --git a/pages/order/editCardid/index.js b/pages/order/editCardid/index.js index a6f6416..bbe54ec 100644 --- a/pages/order/editCardid/index.js +++ b/pages/order/editCardid/index.js @@ -3,7 +3,6 @@ const app = getApp() Page({ data: { cardida: {}, //身份证正面照片 - cardidb: {}, //身份证反面照片 business_licence: {}, //营业执照照片 car_img: {}, //行驶证照片 register_img: {}, //登记证照片 @@ -35,7 +34,6 @@ Page({ }) this.setData({ cardida: res.data.imgs.cardida.length == 0 ? {} : res.data.imgs.cardida, - cardidb: res.data.imgs.cardidb.length == 0 ? {} : res.data.imgs.cardidb, business_licence: res.data.imgs.business_licence.length == 0 ? {} : res.data.imgs.business_licence, car_img: res.data.imgs.car_img.length == 0 ? {} : res.data.imgs.car_img, ins_img: res.data.imgs.ins_img.length == 0 ? [] : res.data.imgs.ins_img, @@ -110,67 +108,6 @@ Page({ }) } - //上传身份证背面 - if (e.currentTarget.dataset.type == 'cardidb') { - wx.chooseImage({ - count: 1, // 默认9 - sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有 - sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有 - success(res) { - wx.showLoading({ - title: '上传中', - }) - wx.uploadFile({ - url: _.config.api.upImg, - filePath: res.tempFilePaths[0], - name: 'img', - formData: { - 'app': 'liche' - }, - success: (resp) => { - resp.data = JSON.parse(resp.data); - if (resp.data.code == 200) { - let params = {}; - params['id'] = that.data.id; - params['cardidb'] = resp.data.data.url; - _.apiQuery.putAppCusorderdata(params).then(res2 => { - wx.hideLoading(); - that.setData({ - 'cardidb.value': resp.data.data.url, - 'cardidb.img': resp.data.data.full_url, - }) - }).catch(res2 => { - wx.hideLoading(); - if (res2.code == 418) { - that.setData({ - 'cardidb.value': resp.data.data.url, - 'cardidb.img': resp.data.data.full_url, - 'cardidb.err': !res2.data[1].caridB, - 'cardidb.errmsg': res2.data[1].errmsg, - }) - } - }); - } else { - wx.hideLoading(); - wx.showToast({ - title: '上传失败', - icon: 'none', - duration: 2000 - }) - } - }, - }) - }, - fail: res => { - wx.showToast({ - title: '文件选择失败', - icon: 'none', - duration: 2000 - }) - } - }) - } - //上传营业执照 if (e.currentTarget.dataset.type == 'business_licence') { wx.chooseImage({ @@ -510,11 +447,6 @@ Page({ current: this.data.imgInfo.imgs.cardida.img, urls: [this.data.imgInfo.imgs.cardida.img], }) - } else if (e.currentTarget.dataset.type == 'cardidb') { - wx.previewImage({ - current: this.data.imgInfo.imgs.cardidb.img, - urls: [this.data.imgInfo.imgs.cardidb.img], - }) } }, diff --git a/pages/order/editCardid/index.wxml b/pages/order/editCardid/index.wxml index 3dd0262..885fc16 100644 --- a/pages/order/editCardid/index.wxml +++ b/pages/order/editCardid/index.wxml @@ -1,20 +1,19 @@ - - + - + {{cardida.errmsg}} - + - + 上传身份证正面 @@ -22,25 +21,6 @@ - - - - - - {{cardidb.errmsg}} - - - - - - - - - 上传身份证背面 - - - - \ No newline at end of file diff --git a/pages/order/editImg/index.wxml b/pages/order/editImg/index.wxml index cbcc7fc..3815fa8 100644 --- a/pages/order/editImg/index.wxml +++ b/pages/order/editImg/index.wxml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/pages/order/editInsImg/index.js b/pages/order/editInsImg/index.js index 85c384d..c36be19 100644 --- a/pages/order/editInsImg/index.js +++ b/pages/order/editInsImg/index.js @@ -3,7 +3,6 @@ const app = getApp() Page({ data: { cardida:{},//身份证正面照片 - cardidb:{},//身份证反面照片 business_licence:{},//营业执照照片 car_img:{},//行驶证照片 register_img:{},//登记证照片 @@ -75,33 +74,6 @@ Page({ business_img:res.data.imgs.business_img.length==0?{}:res.data.imgs.business_img, accident_img:res.data.imgs.accident_img.length==0?{}:res.data.imgs.accident_img, }) - if(res.data.imgs.insurance_img.length!=0&&res.data.imgs.insurance_img.value){ - this.setData({ - insurance_product:res.data.imgs.insurance_img.product, - insurance_date:res.data.imgs.insurance_img.date, - insurance_price:res.data.imgs.insurance_img.price, - insurance_rebate:res.data.imgs.insurance_img.rebate, - insurance_rebate_am:res.data.imgs.insurance_img.rebate>0?Math.floor(res.data.imgs.insurance_img.price*res.data.imgs.insurance_img.rebate)/100:0, - }) - } - if(res.data.imgs.business_img.length!=0&&res.data.imgs.business_img.value){ - this.setData({ - business_product:res.data.imgs.business_img.product, - business_date:res.data.imgs.business_img.date, - business_price:res.data.imgs.business_img.price, - business_rebate:res.data.imgs.business_img.rebate, - business_rebate_am:res.data.imgs.business_img.rebate>0?Math.floor(res.data.imgs.business_img.price*res.data.imgs.business_img.rebate)/100:0, - }) - } - if(res.data.imgs.accident_img.length!=0&&res.data.imgs.accident_img.value){ - this.setData({ - accident_product:res.data.imgs.accident_img.product, - accident_date:res.data.imgs.accident_img.date, - accident_price:res.data.imgs.accident_img.price, - accident_rebate:res.data.imgs.accident_img.rebate, - accident_rebate_am:res.data.imgs.accident_img.rebate>0?Math.floor(res.data.imgs.accident_img.price*res.data.imgs.accident_img.rebate)/100:0, - }) - } } wx.stopPullDownRefresh() }) diff --git a/pages/order/editInsImg/index.wxml b/pages/order/editInsImg/index.wxml index e55c8d7..4dab95b 100644 --- a/pages/order/editInsImg/index.wxml +++ b/pages/order/editInsImg/index.wxml @@ -1,19 +1,16 @@ - - - 交强险 - + - + - + - + 上传交强险 @@ -22,79 +19,17 @@ - - - - 商业险 - + - + - + - + 上传商业险 @@ -103,168 +38,5 @@ - - - - - \ No newline at end of file diff --git a/pages/order/editInvoiceImg/index.js b/pages/order/editInvoiceImg/index.js index 038cd02..0c9112d 100644 --- a/pages/order/editInvoiceImg/index.js +++ b/pages/order/editInvoiceImg/index.js @@ -3,7 +3,6 @@ const app = getApp() Page({ data: { cardida:{},//身份证正面照片 - cardidb:{},//身份证反面照片 business_licence:{},//营业执照照片 car_img:{},//行驶证照片 register_img:{},//登记证照片 @@ -35,7 +34,6 @@ Page({ if(res.data.img_status == 1){ this.setData({ cardida:res.data.imgs.cardida.length==0?{}:res.data.imgs.cardida, - cardidb:res.data.imgs.cardidb.length==0?{}:res.data.imgs.cardidb, business_licence:res.data.imgs.business_licence.length==0?{}:res.data.imgs.business_licence, car_img:res.data.imgs.car_img.length==0?{}:res.data.imgs.car_img, register_img:res.data.imgs.register_img.length==0?{}:res.data.imgs.register_img, @@ -112,67 +110,6 @@ Page({ }) } - //上传身份证背面 - if(e.currentTarget.dataset.type=='cardidb'){ - wx.chooseImage({ - count: 1, // 默认9 - sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有 - sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有 - success(res) { - wx.showLoading({ - title: '上传中', - }) - wx.uploadFile({ - url:_.config.api.upImg, - filePath:res.tempFilePaths[0], - name: 'img', - formData: { - 'app': 'liche' - }, - success: (resp) => { - resp.data = JSON.parse(resp.data); - if (resp.data.code == 200) { - let params = {}; - params['id'] = that.data.id; - params['cardidb'] = resp.data.data.url; - _.apiQuery.putAppCusorderdata(params).then(res2 => { - wx.hideLoading(); - that.setData({ - 'cardidb.value':resp.data.data.url, - 'cardidb.img':resp.data.data.full_url, - }) - }).catch(res2=>{ - wx.hideLoading(); - if(res2.code==418){ - that.setData({ - 'cardidb.value':resp.data.data.url, - 'cardidb.img':resp.data.data.full_url, - 'cardidb.err':!res2.data[1].caridB, - 'cardidb.errmsg':res2.data[1].errmsg, - }) - } - }); - }else{ - wx.hideLoading(); - wx.showToast({ - title: '上传失败', - icon: 'none', - duration: 2000 - }) - } - }, - }) - }, - fail: res => { - wx.showToast({ - title: '文件选择失败', - icon: 'none', - duration: 2000 - }) - } - }) - } - //上传营业执照 if(e.currentTarget.dataset.type=='business_licence'){ wx.chooseImage({ diff --git a/pages/order/editLicenseImg/index.js b/pages/order/editLicenseImg/index.js index 724b4dc..c93b896 100644 --- a/pages/order/editLicenseImg/index.js +++ b/pages/order/editLicenseImg/index.js @@ -3,7 +3,6 @@ const app = getApp() Page({ data: { cardida:{},//身份证正面照片 - cardidb:{},//身份证反面照片 business_licence:{},//营业执照照片 car_img:{},//行驶证照片 ins_img:[],//保险照片 @@ -34,7 +33,6 @@ Page({ if(res.data.img_status == 1){ this.setData({ cardida:res.data.imgs.cardida.length==0?{}:res.data.imgs.cardida, - cardidb:res.data.imgs.cardidb.length==0?{}:res.data.imgs.cardidb, business_licence:res.data.imgs.business_licence.length==0?{}:res.data.imgs.business_licence, car_img:res.data.imgs.car_img.length==0?{}:res.data.imgs.car_img, ins_img:res.data.imgs.ins_img.length==0?[]:res.data.imgs.ins_img, @@ -108,68 +106,6 @@ Page({ } }) } - - //上传身份证背面 - if(e.currentTarget.dataset.type=='cardidb'){ - wx.chooseImage({ - count: 1, // 默认9 - sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有 - sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有 - success(res) { - wx.showLoading({ - title: '上传中', - }) - wx.uploadFile({ - url:_.config.api.upImg, - filePath:res.tempFilePaths[0], - name: 'img', - formData: { - 'app': 'liche' - }, - success: (resp) => { - resp.data = JSON.parse(resp.data); - if (resp.data.code == 200) { - let params = {}; - params['id'] = that.data.id; - params['cardidb'] = resp.data.data.url; - _.apiQuery.putAppCusorderdata(params).then(res2 => { - wx.hideLoading(); - that.setData({ - 'cardidb.value':resp.data.data.url, - 'cardidb.img':resp.data.data.full_url, - }) - }).catch(res2=>{ - wx.hideLoading(); - if(res2.code==418){ - that.setData({ - 'cardidb.value':resp.data.data.url, - 'cardidb.img':resp.data.data.full_url, - 'cardidb.err':!res2.data[1].caridB, - 'cardidb.errmsg':res2.data[1].errmsg, - }) - } - }); - }else{ - wx.hideLoading(); - wx.showToast({ - title: '上传失败', - icon: 'none', - duration: 2000 - }) - } - }, - }) - }, - fail: res => { - wx.showToast({ - title: '文件选择失败', - icon: 'none', - duration: 2000 - }) - } - }) - } - //上传营业执照 if(e.currentTarget.dataset.type=='business_licence'){ wx.chooseImage({ diff --git a/pages/order/editLicenseImg/index.wxml b/pages/order/editLicenseImg/index.wxml index e1bb6ce..5eb5eb8 100644 --- a/pages/order/editLicenseImg/index.wxml +++ b/pages/order/editLicenseImg/index.wxml @@ -6,11 +6,11 @@ - + {{car_img.errmsg}} - + diff --git a/pages/order/editOtherImg/index.js b/pages/order/editOtherImg/index.js index be5db3a..8741885 100644 --- a/pages/order/editOtherImg/index.js +++ b/pages/order/editOtherImg/index.js @@ -3,7 +3,6 @@ const app = getApp() Page({ data: { cardida:{},//身份证正面照片 - cardidb:{},//身份证反面照片 business_licence:{},//营业执照照片 car_img:{},//行驶证照片 register_img:{},//登记证照片 @@ -35,7 +34,6 @@ Page({ if(res.data.img_status == 1){ this.setData({ cardida:res.data.imgs.cardida.length==0?{}:res.data.imgs.cardida, - cardidb:res.data.imgs.cardidb.length==0?{}:res.data.imgs.cardidb, business_licence:res.data.imgs.business_licence.length==0?{}:res.data.imgs.business_licence, car_img:res.data.imgs.car_img.length==0?{}:res.data.imgs.car_img, register_img:res.data.imgs.register_img.length==0?{}:res.data.imgs.register_img, @@ -112,67 +110,6 @@ Page({ }) } - //上传身份证背面 - if(e.currentTarget.dataset.type=='cardidb'){ - wx.chooseImage({ - count: 1, // 默认9 - sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有 - sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有 - success(res) { - wx.showLoading({ - title: '上传中', - }) - wx.uploadFile({ - url:_.config.api.upImg, - filePath:res.tempFilePaths[0], - name: 'img', - formData: { - 'app': 'liche' - }, - success: (resp) => { - resp.data = JSON.parse(resp.data); - if (resp.data.code == 200) { - let params = {}; - params['id'] = that.data.id; - params['cardidb'] = resp.data.data.url; - _.apiQuery.putAppCusorderdata(params).then(res2 => { - wx.hideLoading(); - that.setData({ - 'cardidb.value':resp.data.data.url, - 'cardidb.img':resp.data.data.full_url, - }) - }).catch(res2=>{ - wx.hideLoading(); - if(res2.code==418){ - that.setData({ - 'cardidb.value':resp.data.data.url, - 'cardidb.img':resp.data.data.full_url, - 'cardidb.err':!res2.data[1].caridB, - 'cardidb.errmsg':res2.data[1].errmsg, - }) - } - }); - }else{ - wx.hideLoading(); - wx.showToast({ - title: '上传失败', - icon: 'none', - duration: 2000 - }) - } - }, - }) - }, - fail: res => { - wx.showToast({ - title: '文件选择失败', - icon: 'none', - duration: 2000 - }) - } - }) - } - //上传营业执照 if(e.currentTarget.dataset.type=='business_licence'){ wx.chooseImage({