diff --git a/pages/customer/detail/index.wxml b/pages/customer/detail/index.wxml
index 5b1c125..04a16bd 100644
--- a/pages/customer/detail/index.wxml
+++ b/pages/customer/detail/index.wxml
@@ -48,7 +48,7 @@
分期信息
-->
-
+
diff --git a/pages/customer/editCard/index.wxml b/pages/customer/editCard/index.wxml
index e80387b..3d1db4e 100644
--- a/pages/customer/editCard/index.wxml
+++ b/pages/customer/editCard/index.wxml
@@ -103,7 +103,7 @@
-
+
diff --git a/pages/order/detail/index2.wxml b/pages/order/detail/index2.wxml
index fc399d7..f11a193 100644
--- a/pages/order/detail/index2.wxml
+++ b/pages/order/detail/index2.wxml
@@ -20,7 +20,7 @@
{{info.main_type==0?'车主信息':'企业信息'}}
-
+
@@ -54,7 +54,7 @@
订单信息
-
+
@@ -87,9 +87,9 @@
{{key}}
-
+
{{value}}
-
+
{{value}}
diff --git a/pages/order/edit/index.wxml b/pages/order/edit/index.wxml
index 4043816..4d68363 100644
--- a/pages/order/edit/index.wxml
+++ b/pages/order/edit/index.wxml
@@ -254,7 +254,7 @@
-
+
diff --git a/pages/order/edit/index2.js b/pages/order/edit/index2.js
index 0f7e6c4..edfe201 100644
--- a/pages/order/edit/index2.js
+++ b/pages/order/edit/index2.js
@@ -35,7 +35,6 @@ Page({
color_id:'',//车身颜色id
incolor_id:'',//内饰颜色id
b_s_id:'',//备选车型id
- finance_id:'',//金融机构id
spareIndex:-1,//备选车型索引
colorArray:[],//车身颜色列表
@@ -44,8 +43,6 @@ Page({
colorIndex:-1,//车身颜色索引
levelIndex:-1,//车辆版本索引
interiorIndex:-1,//内饰颜色索引
- financeArray:[],//金融机构
- financeIndex:-1,//金融机构索引
priceinfo:'',//车辆价格
delry_time:'',//期望交付时间
submitFlag:false,
@@ -265,30 +262,6 @@ Page({
paymentIndex:paymentIndex,
})
}
- //匹配融机构
- if(!!res.data.finance_id){
- 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,
- })
- }
- });
- }
//匹配代办
if(res.data.srv_arr&&res.data.srv_arr.length>0){
@@ -474,12 +447,6 @@ Page({
icon: 'none'
})
}
- else if(this.data.paymentIndex == 1 && this.data.finance_id == ''){
- wx.showToast({
- title: '请选择金融机构',
- icon: 'none'
- })
- }
else if(this.data.delry_time == ''){
wx.showToast({
title: '请输入期望交付时间',
@@ -748,35 +715,11 @@ Page({
this.setData({
paymentIndex:e.detail.value,
})
- if(e.detail.value==1){
- this.getAppFinance()
- }else{
- this.setData({
- financeArray:[],
- financeList:[],
- finance_id:'',
- financeIndex:-1,
- })
- }
//代办列表
this.getAppServices()
}
},
- //获取金融机构列表
- 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,
- })
- }
- },
-
//购车主体
changeMain(e) {
this.setData({
@@ -839,27 +782,6 @@ Page({
})
},
- //获取金融机构列表
- 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,
- })
- }
- });
- },
-
//修改订单信息
putAppCusorderV2() {
let that = this
@@ -885,9 +807,6 @@ Page({
params['payway'] = that.data.paymentIndex==0?'1':'0';
params['delry_time'] = that.data.delry_time;
params['business_id'] = that.data.priceinfo.id;
- if(that.data.finance_id!= ''){
- params['finance_id'] = that.data.finance_id;
- }
if(!!that.data.priceinfo.sdisc_money && that.data.priceinfo.sdisc_money != '' ){
params['disc_money'] = that.data.priceinfo.sdisc_money;
}
diff --git a/pages/order/edit/index2.wxml b/pages/order/edit/index2.wxml
index 6fbdf14..d4028ff 100644
--- a/pages/order/edit/index2.wxml
+++ b/pages/order/edit/index2.wxml
@@ -75,16 +75,6 @@
-
- 金融机构*
-
-
- 请选择
- {{financeArray[financeIndex]}}
-
-
-
-
期望交付时间*
@@ -303,10 +293,6 @@
付款方式
{{payment[paymentIndex]}}
-
- 金融机构
- {{financeArray[financeIndex]}}
-
期望交付时间
{{delry_time}}
@@ -372,7 +358,7 @@
-
+
diff --git a/pages/order/editFinance/index.js b/pages/order/editFinance/index.js
index e9ec7d4..e6901e4 100644
--- a/pages/order/editFinance/index.js
+++ b/pages/order/editFinance/index.js
@@ -161,41 +161,50 @@ Page({
}
else{
let that = this
- that.setData({
- submitFlag: true,
- })
- let params = {};
- params['o_id'] = this.data.id;
- params['finance_id'] = that.data.finance_id;
- params['notify_file'] = that.data.notify_file_obj.value;
- params['price_loan'] = that.data.price_loan;
- _.apiQuery.putAppLoan(params).then(res => {
-
- //刷新详情页
- 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.showModal({
+ title: '确定修改按揭信息？',
+ content: '金融机构：'+that.data.financeArray[that.data.financeIndex]+'\r\n贷款金额：'+that.data.price_loan+' ',
+ confirmColor: "#36afa2",
+ success(resW) {
+ if (resW.confirm) {
+ that.setData({
+ submitFlag: true,
+ })
+ let params = {};
+ params['o_id'] = that.data.id;
+ params['finance_id'] = that.data.finance_id;
+ params['notify_file'] = that.data.notify_file_obj.value;
+ params['price_loan'] = that.data.price_loan;
+ _.apiQuery.putAppLoan(params).then(res => {
+
+ //刷新详情页
+ 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,
+ })
+ });
}
}
- wx.showToast({
- title: '编辑成功',
- icon: 'success',
- duration: 2000
- })
- setTimeout(function () {
- wx.navigateBack({
- delta: 1
- })
- }, 500)
-
- }).catch(res=>{
- that.setData({
- submitFlag: false,
- })
- });
+ })
}
},
diff --git a/pages/order/editFinance/index.json b/pages/order/editFinance/index.json
index 91032d1..44fe59d 100644
--- a/pages/order/editFinance/index.json
+++ b/pages/order/editFinance/index.json
@@ -1,4 +1,4 @@
{
- "navigationBarTitleText": "金融产品",
+ "navigationBarTitleText": "按揭信息",
"usingComponents": {}
}
\ No newline at end of file
diff --git a/pages/order/editFinance/index.wxml b/pages/order/editFinance/index.wxml
index c0e00be..bae2c1b 100644
--- a/pages/order/editFinance/index.wxml
+++ b/pages/order/editFinance/index.wxml
@@ -13,7 +13,7 @@
贷款金额*
-
+
@@ -42,5 +42,5 @@
-
+
\ No newline at end of file
diff --git a/pages/order/editOwner/index.wxml b/pages/order/editOwner/index.wxml
index 52ed5ee..d999291 100644
--- a/pages/order/editOwner/index.wxml
+++ b/pages/order/editOwner/index.wxml
@@ -46,5 +46,5 @@
-
+
\ No newline at end of file
diff --git a/pages/order/register/index.js b/pages/order/register/index.js
index 1b719fa..2aa731f 100644
--- a/pages/order/register/index.js
+++ b/pages/order/register/index.js
@@ -32,7 +32,6 @@ Page({
color_id:'',//车身颜色id
incolor_id:'',//内饰颜色id
b_s_id:'',//备选车型id
- finance_id:'',//金融机构id
buy_time:'',//预计购车时间
brandIndex:-1,//车辆品牌索引
modelIndex:-1,//车系车型索引
@@ -43,8 +42,6 @@ Page({
colorIndex:-1,//车身颜色索引
levelIndex:-1,//车辆版本索引
interiorIndex:-1,//内饰颜色索引
- financeArray:[],//金融机构
- financeIndex:-1,//金融机构索引
priceinfo:'',//车辆价格
delry_time:'',//期望交付时间
inten_money:'',//意向金
@@ -221,12 +218,6 @@ Page({
icon: 'none'
})
}
- else if(this.data.paymentIndex == 1 && this.data.finance_id == ''){
- wx.showToast({
- title: '请选择金融机构',
- icon: 'none'
- })
- }
else if(this.data.delry_time == ''){
wx.showToast({
title: '请输入期望交付时间',
@@ -525,35 +516,11 @@ Page({
this.setData({
paymentIndex:e.detail.value,
})
- if(e.detail.value==1){
- this.getAppFinance()
- }else{
- this.setData({
- financeArray:[],
- financeList:[],
- finance_id:'',
- financeIndex:-1,
- })
- }
//代办列表
this.getAppServices()
}
},
- //获取金融机构列表
- 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,
- })
- }
- },
-
//购车主体
changeMain(e) {
this.setData({
@@ -630,27 +597,6 @@ Page({
})
},
- //获取金融机构列表
- 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,
- })
- }
- });
- },
-
//新建订单
postAppCusorderV2() {
let that = this
@@ -685,9 +631,6 @@ Page({
params['payway'] = that.data.paymentIndex==0?'1':'0';
params['delry_time'] = that.data.delry_time;
params['business_id'] = that.data.priceinfo.id;
- if(that.data.finance_id!= ''){
- params['finance_id'] = that.data.finance_id;
- }
if(that.data.inten_money != ''){
params['inten_money'] = that.data.inten_money;
}
diff --git a/pages/order/register/index.wxml b/pages/order/register/index.wxml
index 4191b9d..957072d 100644
--- a/pages/order/register/index.wxml
+++ b/pages/order/register/index.wxml
@@ -179,16 +179,6 @@
-
- 金融机构*
-
-
- 请选择
- {{financeArray[financeIndex]}}
-
-
-
-
期望交付时间*
@@ -427,10 +417,6 @@
付款方式
{{payment[paymentIndex]}}
-
- 金融机构
- {{financeArray[financeIndex]}}
-
期望交付时间
{{delry_time}}