diff --git a/commons/js/config.js b/commons/js/config.js
index 80ccb8e..5cf35fe 100644
--- a/commons/js/config.js
+++ b/commons/js/config.js
@@ -44,6 +44,7 @@ api = {
appCusorderStatus: "app/cusorder/status", //修改订单状态
appCustomersAdmins: "app/customers/admins", //分配客户
appXz: "app/xz", //获取虚拟电话
+ appYx: "app/yx", //获取云信虚拟电话
appCustomerlogs: "app/customerlogs", //新增日志
appCustomerData: "app/customers/data", //修改客户基本信息
appServicesPackage: "app/services/package", //获取代办包
diff --git a/commons/js/utils/apiQuery.js b/commons/js/utils/apiQuery.js
index d38a3dd..834a71c 100644
--- a/commons/js/utils/apiQuery.js
+++ b/commons/js/utils/apiQuery.js
@@ -257,6 +257,12 @@ apiQuery.getAppXz = function (params) {
HttpRequest(false, Config.api.appXz, 2, params, "GET", resolve, reject)
})
}
+//获取云信电话
+apiQuery.getAppYx = function (params) {
+ return new Promise(function (resolve, reject) {
+ HttpRequest(false, Config.api.appYx, 2, params, "GET", resolve, reject)
+ })
+}
//新增日志 /作废
apiQuery.postAppCustomerlogs = function (params) {
diff --git a/pages/customer/detail/index.js b/pages/customer/detail/index.js
index 6da2532..afbdd4f 100644
--- a/pages/customer/detail/index.js
+++ b/pages/customer/detail/index.js
@@ -594,7 +594,7 @@ Page({
let params = {};
params['id'] = e.currentTarget.dataset.id;
params['type'] = 0;
- _.apiQuery.getAppXz(params).then(res=>{
+ _.apiQuery.getAppYx(params).then(res=>{
this.setData({
isShowCall:true,
phoneNumber:res.data.mobile,
diff --git a/pages/customer/index.js b/pages/customer/index.js
index ba24b85..cd2fff8 100644
--- a/pages/customer/index.js
+++ b/pages/customer/index.js
@@ -394,7 +394,7 @@ Page({
let params = {};
params['id'] = e.currentTarget.dataset.id;
params['type'] = 0;
- _.apiQuery.getAppXz(params).then(res=>{
+ _.apiQuery.getAppYx(params).then(res=>{
this.setData({
isShowCall:true,
phoneNumber:res.data.mobile,
diff --git a/pages/login/index.wxml b/pages/login/index.wxml
index 3a75c9f..4f8945e 100644
--- a/pages/login/index.wxml
+++ b/pages/login/index.wxml
@@ -19,7 +19,7 @@
{{text}}
-
+
《理车宝用户注册协议》
diff --git a/pages/order/detail/index2.wxml b/pages/order/detail/index2.wxml
index 8602a40..157f1f4 100644
--- a/pages/order/detail/index2.wxml
+++ b/pages/order/detail/index2.wxml
@@ -62,7 +62,7 @@
{{key}}
{{value}}
-
+
@@ -337,7 +337,7 @@
-
+
diff --git a/pages/order/edit/index2.js b/pages/order/edit/index2.js
index 68174e4..6dd49d2 100644
--- a/pages/order/edit/index2.js
+++ b/pages/order/edit/index2.js
@@ -260,13 +260,7 @@ Page({
title: '请选择付款方式',
icon: 'none'
})
- } else if (this.data.delry_time == '') {
- wx.showToast({
- title: '请选择交付时间',
- icon: 'none'
- })
} else {
-
let that = this
that.setData({
isPreview: true,
diff --git a/pages/order/edit/index2.wxml b/pages/order/edit/index2.wxml
index f359786..831ad01 100644
--- a/pages/order/edit/index2.wxml
+++ b/pages/order/edit/index2.wxml
@@ -64,7 +64,7 @@
- 期望交付时间*
+ 期望交付时间
请选择
@@ -85,6 +85,7 @@
+
是否店内投保
-
+
+
是否店内上牌
@@ -132,7 +135,6 @@
-
@@ -175,10 +177,11 @@
付款方式
{{payment[paymentIndex]}}
-
+
期望交付时间
{{delry_time}}
+
定金
{{confirm_amount}}元
@@ -221,6 +209,22 @@
车身优惠
{{discount_amount}}元
+
+
+ 是否店内投保
+ {{is_get_insure?'是':'否'}}
+
+
+
+
+ 是否店内上牌
+ {{is_get_brand?'是':'否'}}
+
+
+
+ 上牌费
+ {{register_amount}}元
+
diff --git a/pages/order/editFinance/index.js b/pages/order/editFinance/index.js
index 900e66a..174f2be 100644
--- a/pages/order/editFinance/index.js
+++ b/pages/order/editFinance/index.js
@@ -2,35 +2,13 @@ import _ from '../../../commons/js/commons'
const app = getApp()
Page({
data: {
- o_id:'',//订单id
- finance_id:'',//金融机构id
- financeArray:[],//金融机构
- financeIndex:-1,//金融机构索引
-
- price_loan:'',//贷款金额
- submitFlag:false,
-
- isShowConfirm:false,//是否显示确认弹框
- nums:[],//金融分期期数列表
- numIndex:-1,//分期期数索引
- num:'',//分期期数
-
- notify_file_obj:[],
-
- is_tiexi:0,//是否贴息
- tab:[
- {
- title:'首付按揭',
- value:1,
- },
- {
- title:'车辆按揭',
- value:0,
- },
- ],
- tabkey:1,
- loan_rebate:0,
- userInfo:'',
+ o_id: '', //订单id
+ firstPayArr: ['现金', '0首付', '按揭', ], //首付类型
+ firstPayIndex: 0, //首付类型
+ loan_amount: '',
+ loan_periods: '',
+ monthly_payment: '',
+ userInfo: '',
},
onLoad: function (options) {
for (let key in options) {
@@ -41,14 +19,14 @@ Page({
this.getAppCusorderV2()
this.getUserInfo()
-
+
},
onShow: function () {
},
//获取用户信息
- getUserInfo(){
+ getUserInfo() {
_.apiQuery.getUserInfo().then(res => {
this.setData({
userInfo: res,
@@ -57,436 +35,45 @@ Page({
},
//获取订单详情
- getAppCusorderV2(){
+ getAppCusorderV2() {
let params = {};
params['id'] = this.data.id;
- _.apiQuery.getAppCusorderV2(params).then(res=>{
+ _.apiQuery.getAppCusorderDetails(params).then(res => {
this.setData({
- info:res.data,
+ info: res.data,
+ loan_amount: res.data.money_json.loan_amount ?? '', //贷款额度
+ loan_periods: res.data.money_json.loan_periods ?? '', //贷款期数
+ monthly_payment: res.data.money_json.monthly_payment ?? '', //月供
+ firstPayIndex: res.data.downpayment_type - 1,
})
-
- if(this.data.tabkey==1&&res.data.price_loan0>0){
- this.setData({
- notify_file_obj:res.data.price_loan0_data.notify_file,
- lend_file_obj:res.data.price_loan0_data.lend_file,
- price_loan:res.data.price_loan0_data.price_loan?res.data.price_loan0_data.price_loan:'',
- is_tiexi:res.data.price_loan0_data.is_tiexi,
- loan_rebate:res.data.price_loan0_data.loan_rebate,
- })
- //匹配融机构
- if(res.data.price_loan0_data.finance_id>0){
- let finanparams = {};
- finanparams['page'] = 1;
- finanparams['size'] = 100;
- _.apiQuery.getAppFinance(finanparams).then(res6 => {
- if(res6.data.list.length>0){
- let financeArray = []
- res6.data.list.forEach((item,index) => {
- if(item.id == res.data.price_loan0_data.finance_id){
- this.setData({
- financeIndex:index,
- })
- }
- financeArray.push(item.title)
- })
- this.setData({
- finance_id:res.data.price_loan0_data.finance_id,
- financeArray:financeArray,
- financeList:res6.data.list,
- })
- }
- });
- }else{
- this.getAppFinance()
- }
-
- //匹配分期期数
- if(res.data.price_loan0_data.num>0){
- _.apiQuery.getAppFinanceNums().then(res1 => {
- if(res1.data.list.length>0){
- res1.data.list.forEach((item,index) => {
- if(item == res.data.price_loan0_data.num){
- this.setData({
- numIndex:index,
- })
- }
- })
- this.setData({
- num:res.data.price_loan0_data.num,
- nums:res1.data.list,
- })
- }
- })
- }else{
- this.getAppFinanceNums()
- }
- }else{
- this.setData({
- notify_file_obj:res.data.notify_file,
- lend_file_obj:res.data.lend_file,
- price_loan:res.data.price_loan?res.data.price_loan:'',
- is_tiexi:res.data.is_tiexi,
- loan_rebate:res.data.loan_rebate,
- })
- //匹配融机构
- if(res.data.finance_id>0){
- let finanparams = {};
- finanparams['page'] = 1;
- finanparams['size'] = 100;
- _.apiQuery.getAppFinance(finanparams).then(res6 => {
- if(res6.data.list.length>0){
- let financeArray = []
- res6.data.list.forEach((item,index) => {
- if(item.id == res.data.finance_id){
- this.setData({
- financeIndex:index,
- })
- }
- financeArray.push(item.title)
- })
- this.setData({
- finance_id:res.data.finance_id,
- financeArray:financeArray,
- financeList:res6.data.list,
- })
- }
- });
- }else{
- this.getAppFinance()
- }
-
- //匹配分期期数
- if(res.data.num>0){
- _.apiQuery.getAppFinanceNums().then(res1 => {
- if(res1.data.list.length>0){
- res1.data.list.forEach((item,index) => {
- if(item == res.data.num){
- this.setData({
- numIndex:index,
- })
- }
- })
- this.setData({
- num:res.data.num,
- nums:res1.data.list,
- })
- }
- })
- }else{
- this.getAppFinanceNums()
- }
- }
-
wx.stopPullDownRefresh()
-
})
},
- //获取金融机构列表
- getAppFinance(){
- let params = {};
- params['page'] = 1;
- params['size'] = 100;
- _.apiQuery.getAppFinance(params).then(res => {
- if(res.data.list.length>0){
- let financeArray = []
- res.data.list.forEach(item => {
- financeArray.push(item.title)
- })
- this.setData({
- financeArray:financeArray,
- financeList:res.data.list,
- finance_id:'',
- financeIndex:-1,
- })
- }
- });
- },
-
- //获取金融机构列表
- changeFinance(e) {
- if(this.data.financeIndex != e.detail.value && e.detail.value >= 0){
- let finance_id = ''
- if(e.detail.value >= 0){
- finance_id = this.data.financeList[e.detail.value].id
- }
- this.setData({
- finance_id:finance_id,
- financeIndex:e.detail.value,
- })
- }
- },
-
- //上传按揭通知函
- chooseImg(e) {
- let that = this
-
- //上传保单
- if(e.currentTarget.dataset.type=='notify'){
- wx.chooseImage({
- count: 10 - that.data.notify_file_obj.length, //
- sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
- sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
- success(res1) {
- wx.showLoading({
- title: '上传中',
- })
- let notify_file_obj=that.data.notify_file_obj
- 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,
- src:imgdata.data.full_url,
- })
- notify_file_obj=notify_file_obj.concat(list)
- if(k == res1.tempFilePaths.length){
- wx.hideLoading();
- that.setData({
- notify_file_obj,
- })
- }
- }else{
- wx.hideLoading();
- }
- },
-
- })
- }
-
- },
- fail: res => {
- wx.showToast({
- title: '文件选择失败',
- icon: 'none',
- duration: 2000
- })
- }
- })
- }
-
- // if(e.currentTarget.dataset.type=='notify'){
- // 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({
- // 'notify_file_obj.value':resp.data.data.url,
- // 'notify_file_obj.src':resp.data.data.full_url,
- // })
- // }
- // },
- // })
- // },
- // fail: res => {
- // wx.showToast({
- // title: '文件选择失败',
- // icon: 'none',
- // duration: 2000
- // })
- // }
- // })
- // }
-
- if(e.currentTarget.dataset.type=='lend'){
- 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({
- 'lend_file_obj.value':resp.data.data.url,
- 'lend_file_obj.src':resp.data.data.full_url,
- })
- }
- },
- })
- },
- fail: res => {
- wx.showToast({
- title: '文件选择失败',
- icon: 'none',
- duration: 2000
- })
- }
- })
- }
- },
//修改贷款信息
putAppLoan1() {
- if(this.data.finance_id == ''){
- wx.showToast({
- title: '请选择金融机构',
- icon: 'none'
- })
- }
- else if(!this.data.price_loan||this.data.price_loan == ''){
- wx.showToast({
- title: '请填写贷款金额',
- icon: 'none'
- })
- }
- else if(!this.data.notify_file_obj.length>0){
- wx.showToast({
- title: '请上传按揭通知函',
- icon: 'none'
- })
- }
- else{
- if(this.data.info.edit_status==1){
- this.setData({
- isShowConfirm:true,
- })
- }else{
- let notify_file = []
- this.data.notify_file_obj.forEach(item => {
- notify_file.push(item.value)
- })
-
- let that = this
- that.setData({
- submitFlag: true,
- })
- let params = {};
- params['o_id'] = that.data.id;
- params['finance_id'] = that.data.finance_id;
- params['notify_file'] = notify_file;
- params['price_loan'] = that.data.price_loan;
- if(that.data.lend_file_obj.value){
- params['lend_file'] = that.data.lend_file_obj.value;
- }
- if(that.data.num){
- params['num'] = that.data.num;
- }
- if(!(that.data.tabkey==1&&that.data.info.price_loan0>0)){
- params['is_tiexi'] = that.data.is_tiexi;
- }
- if(that.data.tabkey==1&&that.data.info.price_loan0>0){
- params['if_loan0'] = 1;
- }
- if(that.data.userInfo.biz_type==1){
- params['loan_rebate'] = that.data.loan_rebate;
- }
- _.apiQuery.putAppLoan(params).then(res => {
-
- that.setData({
- submitFlag: false,
- })
- //刷新详情页
- let pages = getCurrentPages();
- let prevPage = null; //上一个页面
- if (pages.length >= 2) {
- prevPage = pages[pages.length - 2]; //上一个页面
- if(prevPage.route == 'pages/order/detail/index2'){
- prevPage.onPullDownRefresh()
- }
- }
- wx.showToast({
- title: '编辑成功',
- icon: 'success',
- duration: 2000
- })
- setTimeout(function () {
- wx.navigateBack({
- delta: 1
- })
- }, 500)
-
- }).catch(res=>{
- that.setData({
- submitFlag: false,
- })
- });
- }
- }
- },
-
- //修改贷款信息
- putAppLoan2() {
- let notify_file = []
- this.data.notify_file_obj.forEach(item => {
- notify_file.push(item.value)
- })
let that = this
that.setData({
submitFlag: true,
})
let params = {};
params['o_id'] = that.data.id;
- params['finance_id'] = that.data.finance_id;
- params['notify_file'] = notify_file;
- params['price_loan'] = that.data.price_loan;
- if(that.data.lend_file_obj.value){
- params['lend_file'] = that.data.lend_file_obj.value;
- }
- if(that.data.num){
- params['num'] = that.data.num;
- }
- if(!(that.data.tabkey==1&&that.data.info.price_loan0>0)){
- params['is_tiexi'] = that.data.is_tiexi;
- }
- if(that.data.tabkey==1&&that.data.info.price_loan0>0){
- params['if_loan0'] = 1;
- }
- if(that.data.userInfo.biz_type==1){
- params['loan_rebate'] = that.data.loan_rebate;
- }
+ params['downpayment_type'] = parseInt(that.data.firstPayIndex) + 1;
+ params['loan_amount'] = that.data.loan_amount;
+ params['loan_periods'] = that.data.loan_periods;
+ params['monthly_payment'] = that.data.monthly_payment;
_.apiQuery.putAppLoan(params).then(res => {
-
+
that.setData({
- isShowConfirm: false,
submitFlag: false,
})
-
//刷新详情页
let pages = getCurrentPages();
let prevPage = null; //上一个页面
if (pages.length >= 2) {
prevPage = pages[pages.length - 2]; //上一个页面
- if(prevPage.route == 'pages/order/detail/index2'){
+ if (prevPage.route == 'pages/order/detail/index2') {
prevPage.onPullDownRefresh()
}
}
@@ -500,180 +87,20 @@ Page({
delta: 1
})
}, 500)
-
- }).catch(res=>{
+
+ }).catch(res => {
that.setData({
submitFlag: false,
})
});
},
- //获取金融分期期数
- getAppFinanceNums(){
- _.apiQuery.getAppFinanceNums().then(res => {
- if(res.data.list.length>0){
- this.setData({
- nums:res.data.list,
- })
- }
- });
- },
-
- //选择金融分期期数
- changeNum(e) {
- if(this.data.numIndex != e.detail.value && e.detail.value >= 0){
- let num = ''
- if(e.detail.value >= 0){
- num = this.data.nums[e.detail.value]
- }
+ //选择首付类型
+ changeFirstPay(e) {
+ if (this.data.firstPayIndex != e.detail.value && e.detail.value >= 0) {
this.setData({
- num,
- numIndex:e.detail.value,
+ firstPayIndex: e.detail.value,
})
}
},
-
- //显示隐藏意向金弹框
- optConfirm(){
- this.setData({
- isShowConfirm:!this.data.isShowConfirm,
- })
- },
-
- //查看图片
- previewImage: function (e) {
- if(e.currentTarget.dataset.type=='notify'){
- let img = []
- this.data.notify_file_obj.forEach(item => {
- img.push(item.src)
- })
- wx.previewImage({
- current:e.currentTarget.dataset.current,
- urls:img,
- })
- }
- else if(e.currentTarget.dataset.type=='lend'){
- wx.previewImage({
- current:this.data.lend_file_obj.src,
- urls:[this.data.lend_file_obj.src],
- })
- }
- },
-
- // 编辑页面删除图片
- delImg(e){
- if(e.currentTarget.dataset.type=='notify'){
- let notify_file_obj = this.data.notify_file_obj
- notify_file_obj.splice(e.currentTarget.dataset.index, 1)
- this.setData({
- notify_file_obj,
- })
- }
- },
-
- //是否贴息
- switchTiexi:function(e){
- this.setData({
- is_tiexi:e.detail.value ? 1 :0
- })
- },
-
- //切换tab
- changeTab(e){
- this.setData({
- tabkey: e.currentTarget.dataset.value,
- })
- if(this.data.tabkey==1){
- this.setData({
- notify_file_obj:this.data.info.price_loan0_data.notify_file,
- lend_file_obj:this.data.info.price_loan0_data.lend_file,
- price_loan:this.data.info.price_loan0_data.price_loan?this.data.info.price_loan0_data.price_loan:'',
- is_tiexi:this.data.info.price_loan0_data.is_tiexi,
- loan_rebate:this.data.info.price_loan0_data.loan_rebate?this.data.info.price_loan0_data.loan_rebate:0,
- })
- //匹配融机构
- if(this.data.info.price_loan0_data.finance_id>0&&this.data.financeList.length>0){
- this.data.financeList.forEach((item,index) => {
- if(item.id == this.data.info.price_loan0_data.finance_id){
- this.setData({
- financeIndex:index,
- })
- }
- })
- this.setData({
- finance_id:this.data.info.price_loan0_data.finance_id,
- })
- }else{
- this.setData({
- financeIndex:-1,//金融机构索引
- finance_id:'',//金融机构id
- })
- }
-
- //匹配分期期数
- if(this.data.info.price_loan0_data.num&&this.data.nums.length>0){
- this.data.nums.forEach((item,index) => {
- if(item == this.data.info.price_loan0_data.num){
- this.setData({
- numIndex:index,
- })
- }
- })
- this.setData({
- num:this.data.info.price_loan0_data.num,
- })
- }else{
- this.setData({
- numIndex:-1,//分期期数索引
- num:'',//分期期数
- })
- }
- }else{
- this.setData({
- notify_file_obj:this.data.info.notify_file,
- lend_file_obj:this.data.info.lend_file,
- price_loan:this.data.info.price_loan?this.data.info.price_loan:'',
- is_tiexi:this.data.info.is_tiexi,
- loan_rebate:this.data.info.loan_rebate?this.data.info.loan_rebate:0,
- })
- //匹配融机构
- if(this.data.info.finance_id>0&&this.data.financeList.length>0){
- this.data.financeList.forEach((item,index) => {
- if(item.id == this.data.info.finance_id){
- this.setData({
- financeIndex:index,
- })
- }
- })
- this.setData({
- finance_id:this.data.info.finance_id,
- })
- }else{
- this.setData({
- financeIndex:-1,//金融机构索引
- finance_id:'',//金融机构id
- })
- }
-
- //匹配分期期数
- if(this.data.info.num>0&&this.data.nums.length>0){
- this.data.nums.forEach((item,index) => {
- if(item == this.data.info.num){
- this.setData({
- numIndex:index,
- })
- }
- })
- this.setData({
- num:this.data.info.num,
- })
- }else{
- this.setData({
- numIndex:-1,//分期期数索引
- num:'',//分期期数
- })
- }
- }
- },
-
})
\ No newline at end of file
diff --git a/pages/order/editFinance/index.wxml b/pages/order/editFinance/index.wxml
index b91c263..f3ac9cd 100644
--- a/pages/order/editFinance/index.wxml
+++ b/pages/order/editFinance/index.wxml
@@ -7,176 +7,37 @@
-
-
-
- 金融机构*
-
-
- 请选择
- {{financeArray[financeIndex]}}
-
-
-
+
+ 首付类型
+
+
+ 请选择
+ {{firstPayArr[firstPayIndex]}}
+
+
-
- 贷款金额*
-
-
-
+
+
+ 贷款额度
+
+
-
- 分期期数*
-
-
- 请选择
- {{nums[numIndex]}}
-
-
-
+
+
+ 贷款期数
+
+
-
-
- 月供*
-
-
-
-
-
- 是否贴息
-
-
-
-
-
-
- 按揭返点
-
-
-
- %
-
-
-
- 按揭通知函*
-
-
-
-
-
-
-
-
-
-
-
-
- 上传按揭通知函
-
-
-
-
-
-
-
-
-
- 金融机构
- {{financeArray[financeIndex]}}
-
-
- 贷款金额
- {{price_loan}}
-
-
- 分期期数
- {{nums[numIndex]}}
-
-
- 月供
- {{(price_loan/nums[numIndex])}}
-
-
- 是否贴息
- {{is_tiexi==1?'是':'否'}}
-
-
-
- 按揭返点
- {{loan_rebate}}%
-
-
-
- 按揭通知函
-
-
-
-
-
-
-
-
-
-
-
- 没有上传按揭通知函
-
-
-
-
-
-
-
-
- 放款通知函
-
-
-
-
-
-
-
-
-
-
-
-
- 上传放款通知函
-
-
-
-
+
+
+ ⽉供
+
+
-
+
-
-
-
-
-
-
- 确定修改按揭信息？
-
- 金融机构：{{financeArray[financeIndex]}}
- 贷款金额：{{price_loan}}
- 分期期数：{{num}}
- 是否贴息：{{is_tiexi==1?'是':'否'}}
-
- 按揭返点：{{loan_rebate}}%
-
-
-
-
-
- 取消
-
-
- 确认
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/pages/order/filterList/index2.wxml b/pages/order/filterList/index2.wxml
index 13801c9..0646eba 100644
--- a/pages/order/filterList/index2.wxml
+++ b/pages/order/filterList/index2.wxml
@@ -24,41 +24,95 @@
-
-
-
- {{item.name}}({{item.mobile}})
-
+
+
+ {{item.status_name}}
+
+ {{item.name}}({{item.mobile}})
+
+
-
- 企业名称
- {{item.company}}
-
-
-
-
- {{key}}
-
-
- {{pin.value}}
- 移交
+
+
+
+
+ {{key}}
+
+
+
+ {{lable.value}}
+
+
+
+ {{pin.value}}
+ {{pin.value}}
+
+
+
+
+
+
+
+
+
+
+ {{key}}
+
+
+
+ {{lable.value}}
+
+
+
+ {{pin.value}}
+ {{pin.value}}
+
+
+
+
+
+
+
+
+
+
+ {{key}}
+
+
+
+ {{lable.value}}
+
+
+
+ {{pin.value}}
+ {{pin.value}}
+
+
+
+
+
+
+
+
+
+
+ {{key}}
+
+
+
+ {{lable.value}}
+
+
+
+ {{pin.value}}
+ {{pin.value}}
+
+
-
-
-
- {{lable.value}}
-
-
-
- {{pin.value}}
- {{pin.value}}
-
-
注：{{item.remark}}
-
diff --git a/pages/order/index.wxml b/pages/order/index.wxml
index 13dc8f0..25378dd 100644
--- a/pages/order/index.wxml
+++ b/pages/order/index.wxml
@@ -53,39 +53,93 @@
-
-
- {{item.status_name}}
-
- {{item.mobile}}
-
+
+
+ {{item.status_name}}
+
+ {{item.name}}({{item.mobile}})
+
+
-
-
-
-
-
- {{key}}
-
-
- {{pin.value}}
- 移交
-
-
-
-
-
- {{lable.value}}
+
+
+
+
+ {{key}}
+
+
+
+ {{lable.value}}
+
-
-
- {{pin.value}}
- {{pin.value}}
-
+
+ {{pin.value}}
+ {{pin.value}}
+
+
-
-
-
+
+
+
+
+
+
+
+ {{key}}
+
+
+
+ {{lable.value}}
+
+
+
+ {{pin.value}}
+ {{pin.value}}
+
+
+
+
+
+
+
+
+
+
+ {{key}}
+
+
+
+ {{lable.value}}
+
+
+
+ {{pin.value}}
+ {{pin.value}}
+
+
+
+
+
+
+
+
+
+
+ {{key}}
+
+
+
+ {{lable.value}}
+
+
+
+ {{pin.value}}
+ {{pin.value}}
+
+
+
+
+
注：{{item.remark}}
diff --git a/pages/order/register/index.js b/pages/order/register/index.js
index 06f2b23..7b7ae03 100644
--- a/pages/order/register/index.js
+++ b/pages/order/register/index.js
@@ -152,11 +152,6 @@ Page({
title: '请选择付款方式',
icon: 'none'
})
- } else if (this.data.delry_time == '') {
- wx.showToast({
- title: '请选择交付时间',
- icon: 'none'
- })
} else {
let that = this
that.setData({
diff --git a/pages/order/register/index.wxml b/pages/order/register/index.wxml
index babe174..fad05c7 100644
--- a/pages/order/register/index.wxml
+++ b/pages/order/register/index.wxml
@@ -126,7 +126,7 @@
- 期望交付时间*
+ 期望交付时间
请选择
@@ -135,6 +135,7 @@
+
定⾦
@@ -195,6 +179,25 @@
+
+ 是否店内投保
+
+
+
+
+
+ 是否店内上牌
+
+
+
+
+
+ 上牌费
+
+
+
+
+
@@ -259,10 +262,11 @@
付款方式
{{payment[paymentIndex]}}
-
+
期望交付时间
{{delry_time}}
+
定金
{{confirm_amount}}元
@@ -305,6 +294,23 @@
车身优惠
{{discount_amount}}元
+
+
+ 是否店内投保
+ {{is_get_insure?'是':'否'}}
+
+
+
+
+ 是否店内上牌
+ {{is_get_brand?'是':'否'}}
+
+
+
+ 上牌费
+ {{register_amount}}元
+
+