diff --git a/pages/order/edit/index2.js b/pages/order/edit/index2.js
index 853c257..2a07ac4 100644
--- a/pages/order/edit/index2.js
+++ b/pages/order/edit/index2.js
@@ -64,7 +64,7 @@ Page({
agencyList:[],//代办数组
fine_total:0,//精品费用
- if_fine:false,//精品尊享包
+ //if_fine:false,//精品尊享包
fines:[
{
@@ -97,7 +97,7 @@ Page({
this.setData({
info:res.data,
delry_time:res.data.delry_time?res.data.delry_time:'',
- if_fine:res.data.if_fine==1?true:false,
+ //if_fine:res.data.if_fine==1?true:false,
})
/*匹配车辆信息*/
@@ -212,6 +212,7 @@ Page({
//获取车辆价格
let priceparams = {};
+ priceparams['sversion'] = '2';
priceparams['car_id'] = res.data.car_id;
priceparams['v_id'] = res.data.v_id;
priceparams['color_id'] = res.data.color_id;
@@ -772,6 +773,7 @@ Page({
getAppSeriesInfo(){
if(this.data.car_id != ''&&this.data.v_id != ''&&this.data.color_id != ''&&this.data.incolor_id != ''){
let params = {};
+ params['sversion'] = '2';
params['car_id'] = this.data.car_id;
params['v_id'] = this.data.v_id;
params['color_id'] = this.data.color_id;
@@ -881,12 +883,12 @@ Page({
if(fines.length>0){
params['fines'] = fines;
}
- if(that.data.priceinfo.fine_money){
- params['if_fine'] = that.data.if_fine?'1':'0';
- if(that.data.if_fine&&!!that.data.priceinfo.sdisc_fine_money&&that.data.priceinfo.sdisc_fine_money!= ''){
- params['disc_fine_money'] = that.data.priceinfo.sdisc_fine_money;
- }
- }
+ // if(that.data.priceinfo.fine_money){
+ // params['if_fine'] = that.data.if_fine?'1':'0';
+ // if(that.data.if_fine&&!!that.data.priceinfo.sdisc_fine_money&&that.data.priceinfo.sdisc_fine_money!= ''){
+ // params['disc_fine_money'] = that.data.priceinfo.sdisc_fine_money;
+ // }
+ // }
_.apiQuery.putAppCusorderV2(params).then(res => {
//刷新列表页
diff --git a/pages/order/edit/index2.wxml b/pages/order/edit/index2.wxml
index 14e3d59..e3e3ab9 100644
--- a/pages/order/edit/index2.wxml
+++ b/pages/order/edit/index2.wxml
@@ -145,109 +145,111 @@
-
-
- 精品尊享包{{priceinfo.fine_money}}元
- {{priceinfo.fine_money-(priceinfo.sdisc_fine_money>0?priceinfo.sdisc_fine_money:0)}}元
-
-
- 优惠
- {{priceinfo.sdisc_fine_money}}元
-
-
- 委托代办
- {{srv_total}}元
-
-
-
- {{item.title}}
-
- {{item.sprice}}元
- {{item.text}}
+
+
+
+
+ 委托代办
+ {{srv_total}}元
+
+
+
+ {{item.title}}
+
+ {{item.sprice}}元
+ {{item.text}}
+
+
+
+
+ 精品选装
+ {{fine_total}}元
+
+
+
+ {{item.txt}}
+
+ {{item.price}}元
+
+
+
+
+
+
+
+
+ 委托代办*
+
+ 总计:{{srv_total}}元
+
+
+
+
+
+
+
+
+
+ {{price_list}}
+
+
+
+ {{item.text}}
+
+
+
+
+
+
+
+ 精品选装
+
+ 总计:{{fine_total}}元
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加
-
- 精品选装
- {{fine_total}}元
-
-
-
- {{item.txt}}
-
- {{item.price}}元
-
-
-
-
-
-
- 精品尊享包{{priceinfo.fine_money}}元
-
-
-
-
-
- 精品优惠
-
-
-
-
- {{item}}
-
-
-
-
-
-
-
-
- 委托代办*
-
- 总计:{{srv_total}}元
-
-
-
-
-
-
-
-
-
- {{price_list}}
-
-
-
- {{item.text}}
-
-
-
-
-
-
-
- 精品选装
-
- 总计:{{fine_total}}元
-
-
-
-
-
-
-
-
-
-
-
-
-
- 添加
-
-
@@ -312,38 +314,40 @@
优惠
{{priceinfo.sdisc_money}}元
-
+
+
+
+ 委托代办
+ {{srv_total}}元
-
-
- 精品选装
- {{fine_total}}元
-
-
-
- {{item.txt}}
-
- {{item.price}}元
+
+
+ {{item.title}}
+
+ {{item.sprice}}元
+ {{item.text}}
+
+
+
+ 精品选装
+ {{fine_total}}元
+
+
+ {{item.txt}}
+
+ {{item.price}}元
+
+
+
diff --git a/pages/order/register/index.js b/pages/order/register/index.js
index 51be217..773c4ae 100644
--- a/pages/order/register/index.js
+++ b/pages/order/register/index.js
@@ -86,7 +86,7 @@ Page({
isShowSuccess:false,//是否显示成功提示
isShowContract:false,//是否显示生成合同
- if_fine:false,//精品尊享包
+ //if_fine:false,//精品尊享包
fines:[
{
@@ -564,6 +564,7 @@ Page({
getAppSeriesInfo(){
if(this.data.car_id != ''&&this.data.v_id != ''&&this.data.color_id != ''&&this.data.incolor_id != ''){
let params = {};
+ params['sversion'] = '2';
params['car_id'] = this.data.car_id;
params['v_id'] = this.data.v_id;
params['color_id'] = this.data.color_id;
@@ -708,12 +709,12 @@ Page({
if(fines.length>0){
params['fines'] = fines;
}
- if(that.data.priceinfo.fine_money){
- params['if_fine'] = that.data.if_fine?'1':'0';
- if(that.data.if_fine&&that.data.priceinfo.sdisc_fine_money&&that.data.priceinfo.sdisc_fine_money!= ''){
- params['disc_fine_money'] = that.data.priceinfo.sdisc_fine_money;
- }
- }
+ // if(that.data.priceinfo.fine_money){
+ // params['if_fine'] = that.data.if_fine?'1':'0';
+ // if(that.data.if_fine&&that.data.priceinfo.sdisc_fine_money&&that.data.priceinfo.sdisc_fine_money!= ''){
+ // params['disc_fine_money'] = that.data.priceinfo.sdisc_fine_money;
+ // }
+ // }
_.apiQuery.postAppCusorderV2(params).then(res => {
//刷新列表页
diff --git a/pages/order/register/index.wxml b/pages/order/register/index.wxml
index 356a6f3..5574f56 100644
--- a/pages/order/register/index.wxml
+++ b/pages/order/register/index.wxml
@@ -229,7 +229,7 @@
-
+
+
+
+
+ 委托代办*
+
+ 总计:{{srv_total}}元
+
+
+
+
+
+
+
+
+
+ {{price_list}}
+
+
+
+ {{item.text}}
+
+
+
-
-
-
-
-
-
-
- {{price_list}}
-
-
+
+
+ 精品选装
+
+ 总计:{{fine_total}}元
+
+
+
+
+
+
+
+
+
+
+
- {{item.text}}
-
-
-
-
-
-
-
- 精品选装
-
- 总计:{{fine_total}}元
+
+ 添加
-
-
-
-
-
-
-
-
-
-
-
- 添加
-
-
+
@@ -425,38 +427,40 @@
优惠
{{priceinfo.sdisc_money}}元
-
+
+
+
+ 委托代办
+ {{srv_total}}元
-
-
- 精品选装
- {{fine_total}}元
-
-
-
- {{item.txt}}
-
- {{item.price}}元
+
+
+ {{item.title}}
+
+ {{item.sprice}}元
+ {{item.text}}
+
+
+
+ 精品选装
+ {{fine_total}}元
+
+
+ {{item.txt}}
+
+ {{item.price}}元
+
+
+