diff --git a/commons/js/config.js b/commons/js/config.js index ed4cca6..80ccb8e 100644 --- a/commons/js/config.js +++ b/commons/js/config.js @@ -41,6 +41,7 @@ api = { appIdcard: "app/idcard", //创建申请开票信息 appUserCal: "app/user/cal", //获取用户统计 appCusorderCkcar: "app/cusorder/ckcar", //确认交付 + appCusorderStatus: "app/cusorder/status", //修改订单状态 appCustomersAdmins: "app/customers/admins", //分配客户 appXz: "app/xz", //获取虚拟电话 appCustomerlogs: "app/customerlogs", //新增日志 diff --git a/commons/js/utils/apiQuery.js b/commons/js/utils/apiQuery.js index beaca71..d38a3dd 100644 --- a/commons/js/utils/apiQuery.js +++ b/commons/js/utils/apiQuery.js @@ -1034,4 +1034,10 @@ apiQuery.postAppSign = function (params) { }) } +//修改订单状态 +apiQuery.putAppCusorderStatus = function (params) { + return new Promise(function (resolve, reject) { + HttpRequest(true, Config.api.appCusorderStatus, 2, params, "PUT", resolve, reject) + }) +} export default apiQuery; \ No newline at end of file diff --git a/pages/customer/detail/index.wxml b/pages/customer/detail/index.wxml index f9d2f6a..017c771 100644 --- a/pages/customer/detail/index.wxml +++ b/pages/customer/detail/index.wxml @@ -21,7 +21,9 @@ + @@ -479,7 +481,7 @@ - + {{item.name}} {{item.mobile}} {{item.car_name}} diff --git a/pages/mine/index.js b/pages/mine/index.js index b73ece4..9dac3e2 100644 --- a/pages/mine/index.js +++ b/pages/mine/index.js @@ -2,15 +2,14 @@ import _ from '../../commons/js/commons' const app = getApp() Page({ data: { - imgUrl:_.config.imgUrl, - isShowAddStaff:false, - name:'', - mobile:'', - isShowProfile:true,//是否显示授权用户信息按钮 - isShowSwitchingRoles:false, + imgUrl: _.config.imgUrl, + isShowAddStaff: false, + name: '', + mobile: '', + isShowProfile: true, //是否显示授权用户信息按钮 + isShowSwitchingRoles: false, }, onLoad: function (options) { - console.log(options) for (let key in options) { this.setData({ [key]: options[key] @@ -18,7 +17,7 @@ Page({ } let list = [] - if(this.data.source=='channel'){ + if (this.data.source == 'channel') { list = [ // { // icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-zichan2.png', @@ -26,27 +25,27 @@ Page({ // url:'', // }, { - icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-sezhi2.png', - title:'账户设置', - url:'/pages/mine/install/index', + icon: 'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-sezhi2.png', + title: '账户设置', + url: '/pages/mine/install/index', }, ] - }else if(this.data.source=='shop'){ + } else if (this.data.source == 'shop') { list = [ // { // icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-zichan2.png', // title:'我的资产', // url:'', // }, + // { + // icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-sucai2.png', + // title:'签到码', + // url:'/pages/signup/code', + // }, { - icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-sucai2.png', - title:'签到码', - url:'/pages/signup/code', - }, - { - icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-sezhi2.png', - title:'账户设置', - url:'/pages/mine/install/index', + icon: 'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-sezhi2.png', + title: '账户设置', + url: '/pages/mine/install/index', }, // { // icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-siyutong2.png', @@ -54,25 +53,25 @@ Page({ // url:'/pages/siyutong/index', // }, ] - }else{ + } else { list = [ - { - icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-sucai2.png', - title:'签到码', - url:'/pages/signup/code', - } + // { + // icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-sucai2.png', + // title:'签到码', + // url:'/pages/signup/code', + // } ] } this.setData({ - list:list, + list: list, }) this.getUserInfo() - + console.log(this.data) wx.getSystemInfo({ - success (res) { - if(res.system.indexOf('Android')>-1){ + success(res) { + if (res.system.indexOf('Android') > -1) { wx.setBackgroundColor({ backgroundColor: '#34ac9f', }) @@ -81,9 +80,9 @@ Page({ }) //消息通讯 是否显示授权用户信息按钮 - _.eventBus.on("isShowProfile", this, function(res){ + _.eventBus.on("isShowProfile", this, function (res) { this.setData({ - isShowProfile:res, + isShowProfile: res, }) }) @@ -91,35 +90,35 @@ Page({ onShow: function () { }, - + //生命周期函数--监听页面卸载 onUnload: function () { //卸载消息通讯 是否显示授权用户信息 - _.eventBus.remove('isShowProfile',this); + _.eventBus.remove('isShowProfile', this); }, //获取用户信息 - getUserInfo(){ + getUserInfo() { _.apiQuery.getUserInfo().then(res => { this.setData({ userInfo: res }) - // if(res.group_id==2||res.group_id==3){ - // let list = this.data.list - // list.push({ - // icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-jieshao2.png', - // title:'转介绍', - // url:'/pages/recommend/index', - // }) - // this.setData({ - // list, - // }) - // } + if (res.group_id != 4) { + let list = this.data.list + list.push({ + icon: 'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-sucai2.png', + title: '签到码', + url: '/pages/signup/code', + }) + this.setData({ + list, + }) + } }); }, //退出登录 - logout(){ + logout() { wx.clearStorage() wx.reLaunch({ url: '/pages/login/index' @@ -128,7 +127,7 @@ Page({ //推送链接 pushLink(e) { - if(e.currentTarget.dataset.url){ + if (e.currentTarget.dataset.url) { _.$router.openUrlScheme(e.currentTarget.dataset.url) } }, @@ -137,30 +136,30 @@ Page({ pushLinkMsg(e) { if (e.currentTarget.dataset.url) { _.$router.openUrlScheme(e.currentTarget.dataset.url) - }else{ + } else { wx.showToast({ - title:'开发中，敬请期待！', + title: '开发中，敬请期待！', icon: "none" }); } }, //切换角色 - putAppResetgroupid(e){ + putAppResetgroupid(e) { let params = {}; params['group_id'] = e.currentTarget.dataset.key; - _.apiQuery.putAppResetgroupid(params).then(res=>{ + _.apiQuery.putAppResetgroupid(params).then(res => { _.apiQuery.getUserInfo().then(res => { // if(res.biz_type==4){ // wx.reLaunch({ // url: '/pages/allot/index', // }) // }else - if(res.group_id==4){ + if (res.group_id == 4) { wx.reLaunch({ url: '/pages/channel/index', }) - }else{ + } else { wx.reLaunch({ url: '/pages/index/index', }) @@ -170,9 +169,9 @@ Page({ }, //显示切换角色 - switchingRoles(){ + switchingRoles() { this.setData({ - isShowSwitchingRoles:!this.data.isShowSwitchingRoles, + isShowSwitchingRoles: !this.data.isShowSwitchingRoles, }) }, diff --git a/pages/order/detail/index2.js b/pages/order/detail/index2.js index dd4caec..7b55101 100644 --- a/pages/order/detail/index2.js +++ b/pages/order/detail/index2.js @@ -4,28 +4,28 @@ var wxTimer = null const app = getApp() Page({ data: { - imgUrl:_.config.imgUrl, - submitFlag:false, - isShowOrderCode:false, - remark:'',//补充说明 - carInfoList:[],//随车资料选项 - ckcarInfo:[],//随车资料选中内容 - carToolList:[],//随车随车工具选项 - ckcarTool:[],//随车工具选中内容 - - pay_img:{},//支付凭证照片 - contract_img:{},//合同图片照片 - equity_ck_img:{},//权益确认书照片 - bill_img:{},//发票照片 - car_auth_img:{},//车机实名认证 - delivery_ck_img:{},//交车确认图片 + imgUrl: _.config.imgUrl, + submitFlag: false, + isShowOrderCode: false, + remark: '', //补充说明 + carInfoList: [], //随车资料选项 + ckcarInfo: [], //随车资料选中内容 + carToolList: [], //随车随车工具选项 + ckcarTool: [], //随车工具选中内容 - cardida:{},//身份证正面照片 - cardidb:{},//身份证反面照片 - business_licence:{},//营业执照照片 - car_img:{},//行驶证照片 - isShowCK:false, - isShowBill:false, + pay_img: {}, //支付凭证照片 + contract_img: {}, //合同图片照片 + equity_ck_img: {}, //权益确认书照片 + bill_img: {}, //发票照片 + car_auth_img: {}, //车机实名认证 + delivery_ck_img: {}, //交车确认图片 + + cardida: {}, //身份证正面照片 + cardidb: {}, //身份证反面照片 + business_licence: {}, //营业执照照片 + car_img: {}, //行驶证照片 + isShowCK: false, + isShowBill: false, isShowConfirm: false, //是否显示确认窗口 confirm_count_down: 3, wxTimerList: {}, @@ -40,8 +40,8 @@ Page({ this.getAppCusorderV2() this.getUserInfo() - - + + }, onShow: function () { this.getAppCusorderdata() @@ -62,7 +62,7 @@ Page({ }, //获取用户信息 - getUserInfo(){ + getUserInfo() { _.apiQuery.getUserInfo().then(res => { this.setData({ userInfo: res @@ -71,12 +71,12 @@ Page({ }, //获取订单详情 - getAppCusorderV2(){ + getAppCusorderV2() { let params = {}; params['id'] = this.data.id; - _.apiQuery.getAppCusorderDetails(params).then(res=>{ + _.apiQuery.getAppCusorderDetails(params).then(res => { this.setData({ - info:res.data, + info: res.data, }) wx.stopPullDownRefresh() @@ -85,25 +85,25 @@ Page({ }, //获取订单图片 - getAppCusorderdata(){ + getAppCusorderdata() { let params = {}; params['id'] = this.data.id; - _.apiQuery.getAppCusorderdata(params).then(res=>{ + _.apiQuery.getAppCusorderdata(params).then(res => { this.setData({ - imgInfo:res.data, + imgInfo: res.data, }) - if(res.data.img_status == 1){ + 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, - pay_img:res.data.imgs.pay_img.length==0?[]:res.data.imgs.pay_img, - contract_img:res.data.imgs.contract_img.length==0?[]:res.data.imgs.contract_img, - equity_ck_img:res.data.imgs.equity_ck_img.length==0?[]:res.data.imgs.equity_ck_img, - bill_img:res.data.imgs.bill_img.length==0?[]:res.data.imgs.bill_img, - car_auth_img:res.data.imgs.car_auth_img.length==0?[]:res.data.imgs.car_auth_img, - delivery_ck_img:res.data.imgs.delivery_ck_img.length==0?[]:res.data.imgs.delivery_ck_img, + 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, + contract_img: res.data.imgs.contract_img.length == 0 ? [] : res.data.imgs.contract_img, + equity_ck_img: res.data.imgs.equity_ck_img.length == 0 ? [] : res.data.imgs.equity_ck_img, + bill_img: res.data.imgs.bill_img.length == 0 ? [] : res.data.imgs.bill_img, + car_auth_img: res.data.imgs.car_auth_img.length == 0 ? [] : res.data.imgs.car_auth_img, + delivery_ck_img: res.data.imgs.delivery_ck_img.length == 0 ? [] : res.data.imgs.delivery_ck_img, }) } @@ -112,17 +112,17 @@ Page({ }, //显示短信弹框 - showMessage(e){ + showMessage(e) { this.setData({ - isShowMessage:true, - content:'', + isShowMessage: true, + content: '', }) }, //关闭短信弹框 - hideMessage(e){ + hideMessage(e) { this.setData({ - isShowMessage:false, + isShowMessage: false, }) }, @@ -134,7 +134,7 @@ Page({ }, //发短信 - postAppSmsCusorder(){ + postAppSmsCusorder() { if (this.data.submitFlag) return; if (this.data.content == '') { wx.showToast({ @@ -148,11 +148,11 @@ Page({ let params = {}; params['id'] = this.data.id; params['content'] = this.data.content; - _.apiQuery.postAppSmsCusorder(params).then(res=>{ + _.apiQuery.postAppSmsCusorder(params).then(res => { this.setData({ - isShowMessage:false, - submitFlag:false, - content:'', + isShowMessage: false, + submitFlag: false, + content: '', }) wx.showToast({ title: res.msg, @@ -167,7 +167,7 @@ Page({ chooseImg(e) { let that = this //上传身份证正面 - if(e.currentTarget.dataset.type=='cardida'){ + if (e.currentTarget.dataset.type == 'cardida') { wx.chooseImage({ count: 1, // 默认9 sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有 @@ -177,8 +177,8 @@ Page({ title: '上传中', }) wx.uploadFile({ - url:_.config.api.upImg, - filePath:res.tempFilePaths[0], + url: _.config.api.upImg, + filePath: res.tempFilePaths[0], name: 'img', formData: { 'app': 'liche' @@ -188,8 +188,8 @@ Page({ wx.hideLoading(); if (resp.data.code == 200) { that.setData({ - 'cardida.value':resp.data.data.url, - 'cardida.img':resp.data.data.full_url, + 'cardida.value': resp.data.data.url, + 'cardida.img': resp.data.data.full_url, }) let params = {}; @@ -197,11 +197,11 @@ Page({ params['cardida'] = resp.data.data.url; _.apiQuery.putAppCusorderdata(params).then(res2 => { - }).catch(res2=>{ - if(res2.code==418){ + }).catch(res2 => { + if (res2.code == 418) { that.setData({ - 'cardida.err':!res2.data[0].caridA, - 'cardida.errmsg':res2.data[0].errmsg, + 'cardida.err': !res2.data[0].caridA, + 'cardida.errmsg': res2.data[0].errmsg, }) } }); @@ -220,7 +220,7 @@ Page({ } //上传身份证背面 - if(e.currentTarget.dataset.type=='cardidb'){ + if (e.currentTarget.dataset.type == 'cardidb') { wx.chooseImage({ count: 1, // 默认9 sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有 @@ -230,8 +230,8 @@ Page({ title: '上传中', }) wx.uploadFile({ - url:_.config.api.upImg, - filePath:res.tempFilePaths[0], + url: _.config.api.upImg, + filePath: res.tempFilePaths[0], name: 'img', formData: { 'app': 'liche' @@ -241,8 +241,8 @@ Page({ wx.hideLoading(); if (resp.data.code == 200) { that.setData({ - 'cardidb.value':resp.data.data.url, - 'cardidb.img':resp.data.data.full_url, + 'cardidb.value': resp.data.data.url, + 'cardidb.img': resp.data.data.full_url, }) let params = {}; @@ -250,11 +250,11 @@ Page({ params['cardidb'] = resp.data.data.url; _.apiQuery.putAppCusorderdata(params).then(res2 => { - }).catch(res2=>{ - if(res2.code==418){ + }).catch(res2 => { + if (res2.code == 418) { that.setData({ - 'cardidb.err':!res2.data[1].caridB, - 'cardidb.errmsg':res2.data[1].errmsg, + 'cardidb.err': !res2.data[1].caridB, + 'cardidb.errmsg': res2.data[1].errmsg, }) } }); @@ -273,7 +273,7 @@ Page({ } //上传营业执照 - if(e.currentTarget.dataset.type=='business_licence'){ + if (e.currentTarget.dataset.type == 'business_licence') { wx.chooseImage({ count: 1, // 默认9 sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有 @@ -283,8 +283,8 @@ Page({ title: '上传中', }) wx.uploadFile({ - url:_.config.api.upImg, - filePath:res.tempFilePaths[0], + url: _.config.api.upImg, + filePath: res.tempFilePaths[0], name: 'img', formData: { 'app': 'liche' @@ -294,8 +294,8 @@ Page({ wx.hideLoading(); if (resp.data.code == 200) { that.setData({ - 'business_licence.value':resp.data.data.url, - 'business_licence.img':resp.data.data.full_url, + 'business_licence.value': resp.data.data.url, + 'business_licence.img': resp.data.data.full_url, }) let params = {}; @@ -303,11 +303,11 @@ Page({ params['business_licence'] = resp.data.data.url; _.apiQuery.putAppCusorderdata(params).then(res2 => { - }).catch(res2=>{ - if(res2.code==418){ + }).catch(res2 => { + if (res2.code == 418) { that.setData({ - 'business_licence.err':!res2.data[0].business_licence, - 'business_licence.errmsg':res2.data[0].errmsg, + 'business_licence.err': !res2.data[0].business_licence, + 'business_licence.errmsg': res2.data[0].errmsg, }) } }); @@ -326,7 +326,7 @@ Page({ } //上传行驶证 - if(e.currentTarget.dataset.type=='car_img'){ + if (e.currentTarget.dataset.type == 'car_img') { wx.chooseImage({ count: 1, // 默认9 sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有 @@ -336,8 +336,8 @@ Page({ title: '上传中', }) wx.uploadFile({ - url:_.config.api.upImg, - filePath:res.tempFilePaths[0], + url: _.config.api.upImg, + filePath: res.tempFilePaths[0], name: 'img', formData: { 'app': 'liche' @@ -351,8 +351,8 @@ Page({ params['car_img'] = resp.data.data.url; _.apiQuery.putAppCusorderdata(params).then(res2 => { that.setData({ - 'car_img.value':resp.data.data.url, - 'car_img.img':resp.data.data.full_url, + 'car_img.value': resp.data.data.url, + 'car_img.img': resp.data.data.full_url, }) }) } @@ -370,7 +370,7 @@ Page({ } //上传保单 - if(e.currentTarget.dataset.type=='ins_img'){ + if (e.currentTarget.dataset.type == 'ins_img') { wx.chooseImage({ count: 10 - that.data.ins_img.length, // sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有 @@ -379,13 +379,13 @@ Page({ wx.showLoading({ title: '上传中', }) - let ins_img=that.data.ins_img + 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], + url: _.config.api.upImg, + filePath: res1.tempFilePaths[i], name: 'img', formData: { 'app': 'liche' @@ -397,11 +397,11 @@ Page({ let imgdata = resp.data let list = [] list.push({ - value:imgdata.data.url, - img:imgdata.data.full_url, + value: imgdata.data.url, + img: imgdata.data.full_url, }) - ins_img=ins_img.concat(list) - if(k == res1.tempFilePaths.length){ + ins_img = ins_img.concat(list) + if (k == res1.tempFilePaths.length) { wx.hideLoading(); let params = {}; params['id'] = that.data.id; @@ -418,7 +418,7 @@ Page({ } } }, - + }) } @@ -434,7 +434,7 @@ Page({ } //上传交车合照 - if(e.currentTarget.dataset.type=='other_img'){ + if (e.currentTarget.dataset.type == 'other_img') { wx.chooseImage({ count: 1, // sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有 @@ -443,13 +443,13 @@ Page({ wx.showLoading({ title: '上传中', }) - let other_img=that.data.other_img + let other_img = that.data.other_img let k = 0 for (let i = 0; i < res1.tempFilePaths.length; i++) { //上传图片 wx.uploadFile({ - url:_.config.api.upImg, - filePath:res1.tempFilePaths[i], + url: _.config.api.upImg, + filePath: res1.tempFilePaths[i], name: 'img', formData: { 'app': 'liche' @@ -461,11 +461,11 @@ Page({ let imgdata = resp.data let list = [] list.push({ - value:imgdata.data.url, - img:imgdata.data.full_url, + value: imgdata.data.url, + img: imgdata.data.full_url, }) - other_img=other_img.concat(list) - if(k == res1.tempFilePaths.length){ + other_img = other_img.concat(list) + if (k == res1.tempFilePaths.length) { wx.hideLoading(); let params = {}; params['id'] = that.data.id; @@ -482,7 +482,7 @@ Page({ } } }, - + }) } @@ -499,8 +499,8 @@ Page({ }, // 编辑页面删除图片 - delImg(e){ - if(e.currentTarget.dataset.type=='ins_img'){ + 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 = {}; @@ -515,7 +515,7 @@ Page({ ins_img, }) }) - }else if(e.currentTarget.dataset.type=='other_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 = {}; @@ -534,25 +534,23 @@ Page({ }, //确认交付 - putAppCusorderCkcar(){ - - if(this.data.ckcarInfo.length == 0){ + putAppCusorderCkcar() { + + if (this.data.ckcarInfo.length == 0) { wx.showToast({ title: '请选择随车资料', icon: 'none' }) - } - else if(this.data.ckcarTool.length == 0){ + } else if (this.data.ckcarTool.length == 0) { wx.showToast({ title: '请选择随车工具', icon: 'none' }) - } - else{ + } else { let that = this wx.showModal({ - title:'确认交付车辆？', - content:'', + title: '确认交付车辆？', + content: '', success: function (res) { if (res.confirm) { that.setData({ @@ -568,13 +566,13 @@ Page({ submitFlag: false, }) that.getAppCusorderV2() - + wx.showToast({ title: '确认交付车辆成功', icon: 'success' }) - - }).catch(res=>{ + + }).catch(res => { that.setData({ submitFlag: false, }) @@ -588,129 +586,126 @@ Page({ //订单支付码 optShowOrderCode() { this.setData({ - isShowOrderCode:!this.data.isShowOrderCode, + isShowOrderCode: !this.data.isShowOrderCode, }) }, //查看图片 previewImage: function (e) { - if(e.currentTarget.dataset.type=='bill_img'){ + if (e.currentTarget.dataset.type == 'bill_img') { let urls = [this.data.info.bill_img] wx.previewImage({ - current:e.currentTarget.dataset.current, + current: e.currentTarget.dataset.current, urls, }) - } - else if(e.currentTarget.dataset.type=='cardida'){ + } else if (e.currentTarget.dataset.type == 'cardida') { wx.previewImage({ - current:this.data.imgInfo.imgs.cardida.img, - urls:[this.data.imgInfo.imgs.cardida.img], + current: this.data.imgInfo.imgs.cardida.img, + urls: [this.data.imgInfo.imgs.cardida.img], }) - } - else if(e.currentTarget.dataset.type=='cardidb'){ + } else if (e.currentTarget.dataset.type == 'cardidb') { wx.previewImage({ - current:this.data.imgInfo.imgs.cardidb.img, - urls:[this.data.imgInfo.imgs.cardidb.img], + 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], + current: this.data.imgInfo.imgs.business_licence.img, + urls: [this.data.imgInfo.imgs.business_licence.img], }) - } - else if(e.currentTarget.dataset.type=='car_img'){ + } else if (e.currentTarget.dataset.type == 'car_img') { wx.previewImage({ - current:this.data.imgInfo.imgs.car_img.img, - urls:[this.data.imgInfo.imgs.car_img.img], + current: this.data.imgInfo.imgs.car_img.img, + urls: [this.data.imgInfo.imgs.car_img.img], }) - } - else if(e.currentTarget.dataset.type=='insurance_img'){ + } else if (e.currentTarget.dataset.type == 'insurance_img') { wx.previewImage({ - current:this.data.imgInfo.imgs.insurance_img.img, - urls:[this.data.imgInfo.imgs.insurance_img.img], + current: this.data.imgInfo.imgs.insurance_img.img, + urls: [this.data.imgInfo.imgs.insurance_img.img], }) - } - else if(e.currentTarget.dataset.type=='business_img'){ + } else if (e.currentTarget.dataset.type == 'business_img') { wx.previewImage({ - current:this.data.imgInfo.imgs.business_img.img, - urls:[this.data.imgInfo.imgs.business_img.img], + current: this.data.imgInfo.imgs.business_img.img, + urls: [this.data.imgInfo.imgs.business_img.img], }) - } - else if(e.currentTarget.dataset.type=='accident_img'){ + } else if (e.currentTarget.dataset.type == 'accident_img') { wx.previewImage({ - current:this.data.imgInfo.imgs.accident_img.img, - urls:[this.data.imgInfo.imgs.accident_img.img], + current: this.data.imgInfo.imgs.accident_img.img, + urls: [this.data.imgInfo.imgs.accident_img.img], }) - } - else if(e.currentTarget.dataset.type=='other_img'){ + } else if (e.currentTarget.dataset.type == 'other_img') { let img = [] this.data.imgInfo.imgs.other_img.forEach(item => { img.push(item.img) }) wx.previewImage({ - current:this.data.imgInfo.imgs.other_img[0].img, - urls:img, + current: this.data.imgInfo.imgs.other_img[0].img, + urls: img, }) - } - else if(e.currentTarget.dataset.type=='wx_img'){ + } else if (e.currentTarget.dataset.type == 'wx_img') { wx.previewImage({ - current:this.data.imgInfo.imgs.wx_img.img, - urls:[this.data.imgInfo.imgs.wx_img.img], + current: this.data.imgInfo.imgs.wx_img.img, + urls: [this.data.imgInfo.imgs.wx_img.img], }) - } - else if(e.currentTarget.dataset.type=='mut_wx_img'){ + } else if (e.currentTarget.dataset.type == 'mut_wx_img') { wx.previewImage({ - current:this.data.imgInfo.imgs.mut_wx_img.img, - urls:[this.data.imgInfo.imgs.mut_wx_img.img], + current: this.data.imgInfo.imgs.mut_wx_img.img, + urls: [this.data.imgInfo.imgs.mut_wx_img.img], }) - } - else if(e.currentTarget.dataset.type=='notify'){ + } else if (e.currentTarget.dataset.type == 'notify') { let img = [] this.data.info.notify_file.forEach(item => { img.push(item.src) }) wx.previewImage({ - current:e.currentTarget.dataset.current, - urls:img, + current: e.currentTarget.dataset.current, + urls: img, }) - } - else if(e.currentTarget.dataset.type=='lend'){ + } else if (e.currentTarget.dataset.type == 'lend') { wx.previewImage({ - current:this.data.info.lend_file.src, - urls:[this.data.info.lend_file.src], + current: this.data.info.lend_file.src, + urls: [this.data.info.lend_file.src], }) } }, //推送链接 - pushLink(e){ - if(e.currentTarget.dataset.url){ + pushLink(e) { + if (e.currentTarget.dataset.url) { _.$router.openUrlScheme(e.currentTarget.dataset.url) } }, //20240526 确认弹窗 - bindShowConfirm(){ + bindShowConfirm() { this.setData({ - isShowConfirm:true, + isShowConfirm: true, submitFlag: true - },()=>{ + }, () => { this.getTimes(this.data.confirm_count_down) }) }, //关闭短信弹框 - hideConfirm(e){ + hideConfirm(e) { this.setData({ - isShowConfirm:false, + isShowConfirm: false, }) }, //20240526 确定无误接口 - postConfirmOrder(){ - console.log('postConfirmOrder') + postConfirmOrder() { + let params = { + 'id': this.data.id, + 'status': parseInt(this.data.info.status) + 1, + } + _.apiQuery.putAppCusorderStatus(params).then(res => { + _.utils.$toast(res.msg).then(res => { + this.getAppCusorderV2() + this.hideConfirm() + }) + }) }, /** @@ -741,7 +736,7 @@ Page({ }, //页面相关事件处理函数--监听用户下拉动作 - onPullDownRefresh(){ + onPullDownRefresh() { this.getAppCusorderdata() this.getAppCusorderV2() this.setData({ diff --git a/pages/order/detail/index2.wxml b/pages/order/detail/index2.wxml index e17bc98..8602a40 100644 --- a/pages/order/detail/index2.wxml +++ b/pages/order/detail/index2.wxml @@ -338,7 +338,7 @@ - + @@ -373,7 +373,8 @@ 温馨提示 - 确认提交订单信息至汽车之家系统?提交后将不可撤回。 + 确认提交订单信息至汽车之家系统?提交后将不可撤回。 + diff --git a/pages/order/filterList/index2.js b/pages/order/filterList/index2.js index 33d4d6f..88d277c 100644 --- a/pages/order/filterList/index2.js +++ b/pages/order/filterList/index2.js @@ -81,7 +81,7 @@ Page({ if(this.data.visit_tab_id != ''){ params['visit_tab_id'] = this.data.visit_tab_id; } - _.apiQuery.getAppCusorderV2List(params).then(res => { + _.apiQuery.getAppCusorderList(params).then(res => { this.setData({ pageNo: this.data.pageNo + 1, list: this.data.list.concat(res.data.list), diff --git a/pages/order/filterList/index2.wxml b/pages/order/filterList/index2.wxml index f95c959..13801c9 100644 --- a/pages/order/filterList/index2.wxml +++ b/pages/order/filterList/index2.wxml @@ -12,7 +12,7 @@ - + {{item.name}} @@ -23,77 +23,43 @@ - - + + - - {{item.name}}({{item.mobile}}) - - - - 车主姓名 - {{item.owner_name}} - - - 车主电话 - {{item.owner_mobile}} - - - 企业名称 - {{item.company}} - + + {{item.name}}({{item.mobile}}) + + + + 企业名称 + {{item.company}} + - - - {{key}} - - - {{pin.value}} - 移交 - - - - - - {{lable.value}} - - - - {{pin.value}} - {{pin.value}} - + + + {{key}} + + + {{pin.value}} + 移交 - - - 注：{{item.remark}} - - - - - - {{item.status_name}} - - {{item.name}}({{item.mobile}}) - - - - - - {{key}} - - - {{value}} - 移交 - + + + + + {{lable.value}} + + + + {{pin.value}} + {{pin.value}} - {{value}} - + + + 注：{{item.remark}} - 注：{{item.remark}} - - - + @@ -103,20 +69,20 @@ - - + +