diff --git a/pages/order/edit/index2.js b/pages/order/edit/index2.js
index f943144..221e1e9 100644
--- a/pages/order/edit/index2.js
+++ b/pages/order/edit/index2.js
@@ -74,6 +74,10 @@ Page({
fineArr:[],//精品选装
finedIndex:-1,//精品选装索引
+ packageList:[],//车辆选装包
+ options_ids:[],//选装包id数组
+ options_total:0,//选装包费用
+
},
//生命周期函数--监听页面加载
onLoad: function (options) {
@@ -102,6 +106,8 @@ Page({
sa:res.data.sa?res.data.sa:'',
//if_fine:res.data.if_fine==1?true:false,
if_local_bill:res.data.if_local_bill==1?1:0,
+ brand_id:res.data.brand_id,
+ car_id:res.data.car_id,
})
/*匹配车辆信息*/
@@ -340,6 +346,38 @@ Page({
}
/*end匹配精品赠送*/
+ //匹配车辆选装包
+ if(res.data.option_ids&&res.data.option_ids.length>0){
+ let optionparams = {};
+ optionparams['id'] = res.data.car_id;
+ _.apiQuery.getAppOptions(optionparams).then(res11 => {
+ if(res11.data.list.length>0){
+ let packageList = res11.data.list
+ let options_ids = res.data.option_ids
+ let options_total = 0
+ packageList.forEach(itemA => {
+ itemA.checked = false
+ options_ids.forEach(itemB => {
+ if(itemA.id === itemB){
+ itemA.checked = true
+ if(parseFloat(itemA.price)>0){
+ options_total = options_total + parseFloat(itemA.price)
+ }
+ }
+ })
+ })
+ this.setData({
+ packageList,
+ options_ids,
+ options_total,
+ })
+ }
+ });
+ }else{
+ //获取车辆选装包
+ this.getAppOptions()
+ }
+
})
},
@@ -628,6 +666,9 @@ Page({
brand_id:this.data.brandList[e.detail.value].id,
brandIndex:e.detail.value,
car_id:'',//车系id
+ packageList:[],//车辆选装包
+ options_ids:[],//选装包id数组
+ options_total:0,//选装包费用
v_id:'',//车辆版本id
color_id:'',//车身颜色id
incolor_id:'',//内饰颜色id
@@ -666,8 +707,12 @@ Page({
interiorIndex:-1,//内饰颜色索引
priceinfo:'',
business_type:0,
+ options_ids:[],//选装包id数组
+ options_total:0,//选装包费用
})
this.getAppSeriesAttrslevel()
+ //获取车辆选装包
+ this.getAppOptions()
}
},
@@ -829,6 +874,9 @@ Page({
params['v_id'] = that.data.v_id;
params['color_id'] = that.data.color_id;
params['incolor_id'] = that.data.incolor_id;
+ if(that.data.options_ids.length>0){
+ params['options_ids'] = that.data.options_ids;
+ }
params['price'] = that.data.priceinfo.price;
params['deposit'] = that.data.priceinfo.sdeposit;
params['payway'] = that.data.paymentIndex==0?'1':'0';
@@ -1277,4 +1325,45 @@ Page({
}
},
+ //获取车辆选装包
+ getAppOptions(){
+ let params = {};
+ params['id'] = this.data.car_id;
+ _.apiQuery.getAppOptions(params).then(res => {
+ if(res.data.list.length>0){
+ let packageList = res.data.list
+ packageList.forEach(item => {
+ item.checked = false
+ })
+ this.setData({
+ packageList,
+ })
+ }
+ });
+ },
+
+ //选择车辆选装包
+ choosePackage(e) {
+ let packageList = this.data.packageList
+ let options_ids = e.detail.value
+ let options_total = 0
+ packageList.forEach(itemA => {
+ itemA.checked = false
+ options_ids.forEach(itemB => {
+ if(itemA.id === itemB){
+ itemA.checked = true
+ if(parseFloat(itemA.price)>0){
+ options_total = options_total + parseFloat(itemA.price)
+ }
+ }
+ })
+ })
+
+ this.setData({
+ packageList,
+ options_ids,
+ options_total,
+ })
+ },
+
})
\ No newline at end of file
diff --git a/pages/order/edit/index2.wxml b/pages/order/edit/index2.wxml
index b674334..8018546 100644
--- a/pages/order/edit/index2.wxml
+++ b/pages/order/edit/index2.wxml
@@ -62,6 +62,26 @@
+
+
+
+ 选装包
+
+
+
+
+
+
+
@@ -104,7 +124,7 @@
最终售价
- {{priceinfo.price+priceinfo.price_color+priceinfo.price_coplus-(priceinfo.sdisc_money>0?priceinfo.sdisc_money:0)}}元
+ {{options_total+priceinfo.price+priceinfo.price_color+priceinfo.price_coplus-(priceinfo.sdisc_money>0?priceinfo.sdisc_money:0)}}元
@@ -308,6 +328,20 @@
内饰颜色
{{interiorArray[interiorIndex]}}
+
+
+ 选装包
+ {{options_total}}元
+
+
+
+ {{item.title}}
+
+ {{item.price}}元
+
+
+
+
其他信息
付款方式
@@ -335,7 +369,7 @@
最终售价
- {{priceinfo.price+priceinfo.price_color+priceinfo.price_coplus-(priceinfo.sdisc_money>0?priceinfo.sdisc_money:0)}}元
+ {{options_total+priceinfo.price+priceinfo.price_color+priceinfo.price_coplus-(priceinfo.sdisc_money>0?priceinfo.sdisc_money:0)}}元
优惠
diff --git a/pages/order/register/index.wxml b/pages/order/register/index.wxml
index b7806cf..ebef49c 100644
--- a/pages/order/register/index.wxml
+++ b/pages/order/register/index.wxml
@@ -503,7 +503,7 @@
最终售价
- {{priceinfo.price+priceinfo.price_color+priceinfo.price_coplus-(priceinfo.sdisc_money>0?priceinfo.sdisc_money:0)}}元
+ {{options_total+priceinfo.price+priceinfo.price_color+priceinfo.price_coplus-(priceinfo.sdisc_money>0?priceinfo.sdisc_money:0)}}元
优惠