Merge branch 'chelantuDev'

* chelantuDev:
  1.编辑车辆,

pages/index/addCar.vue

@@ -153,11 +153,13 @@
 					carModelInfo.carModelInfo.carSeries = res.data.series;
 					carModelInfo.carModelInfo.displacement = res.data.displacement;
 					carModelInfo.carModelInfo.transmissionType = res.data.transmissionType;
-					carModelInfo.carModelInfo.modelYear = res.data.annualmoney;
+					carModelInfo.carModelInfo.productionYear = res.data.annualmoney;
 					carModelInfo.carModelInfo.carModel = res.data.carModel;
 					carModelInfo.carModelInfo.guidePrice = res.data.guidePrice;
+					carModelInfo.carModelInfo.engineModel = res.data.engineType;
+					carModelInfo.carModelInfo.nLevelID = res.data.nLevelID;
+					carModelInfo.carModelInfo.salesName = res.data.saleName;
 					
-
 					
 					// 展示时
 					this.plateNo = res.data.plateNumber;
@@ -280,7 +282,7 @@
 					series: this.carModelInfo.carModelInfo.carSeries,
 					annualmoney: this.carModelInfo.carModelInfo.productionYear,
 					carModel: this.carModelInfo.value,
-					salesName: this.carModelInfo.carModelInfo.salesName,
+					saleName: this.carModelInfo.carModelInfo.salesName,
 					transmissionType: this.carModelInfo.carModelInfo.transmissionType,
 					model: this.carModelInfo.carModelInfo.carModel,
 					nLevelID: this.carModelInfo.carModelInfo.nLevelID,
@@ -323,7 +325,7 @@
 					series: this.carModelInfo.carModelInfo.carSeries,
 					annualmoney: this.carModelInfo.carModelInfo.productionYear,
 					carModel: this.carModelInfo.value,
-					salesName: this.carModelInfo.carModelInfo.salesName,
+					saleName: this.carModelInfo.carModelInfo.salesName,
 					transmissionType: this.carModelInfo.carModelInfo.transmissionType,
 					model: this.carModelInfo.carModelInfo.carModel,
 					nLevelID: this.carModelInfo.carModelInfo.nLevelID,