Merge branch 'master' of http://47.98.226.240:3000/twt/txCar

* 'master' of http://47.98.226.240:3000/twt/txCar:
  支付
  汽车写活
  1

.gitignore

@@ -1,8 +1 @@
-node_modules/
-dist/**
-.project
-unpackage/
-.DS_Store
-wxcomponents/**/*.vue
-wxcomponents/**/*.css
-.hbuilderx/
+/unpackage/

pages/module/confirmOrder.vue

@@ -15,7 +15,7 @@
 				<view class="topLine borderB" >
 					<view class="toplineLeft">
 						<view class="topTitle">车牌号:</view>
-						<view class="topTxt">鲁AE86</view>
+						<view class="topTxt">{{maintainCarData.plateNumber}}</view>
 					</view>
 					
 				</view>
@@ -214,6 +214,8 @@ export default {
 			}
 		
 		}
+		var cardata = uni.getStorageSync("maintainCarData")
+		this.maintainCarData=cardata
 	},
 	methods: {
 		myOrderCoupon(){
@@ -260,7 +262,7 @@ export default {
 				return false;
 			}
 			 */
-	         var cardata={
+	        /* var cardata={
 				 annualmoney: "2017",
 				 brand: "大众",
 				 brandLogo: "http://img.db.66km.cn/carbrandlogo/D - 大众.png",
@@ -290,8 +292,8 @@ export default {
 				 traveltime: "",
 				 vIN: "",
 				 currentMileage:'1111',
-			 }
-			this.maintainCarData=cardata
+			 } */
+			
 			uni.showLoading({ });
 			this.$http('worldKeepCar/maintainOrder/submitOrder', {
 			  shopName:this.orderShop.shopName,
@@ -300,7 +302,7 @@ export default {
 			  carID:this.maintainCarData.id,
 			  plateNumber:this.maintainCarData.plateNumber,
 			  carModel:this.maintainCarData.carModel,
-			  currentMileage:1111,//this.currentMileage,
+			  currentMileage:this.maintainCarData.milage,//this.currentMileage,
 			  comment:this.remark,
 			  itemMoney:this.itemMoney,
 			  goodsMoney:this.goodsMoney,
@@ -308,8 +310,8 @@ export default {
 			  itemCount:this.itemCount,
 			  couponMoney:this.couponMoney,
 			  couponID:this.couponID,
-			  payMoney:this.payMoney,
-			  //payMoney:0.01,
+			 // payMoney:this.payMoney,
+			  payMoney:0.01,
 			  packJsonArr:JSON.stringify(this.packJsonArr) ,
 			  shopID:this.orderShop.shopId,
 			 // unionID:this.orderShop.unionId,
@@ -339,7 +341,7 @@ export default {
 			})
 		},
 		orderPayzero(id){
-			this.$http('miniApp/maintainOrder/orderPay', {
+			this.$http('worldKeepCar/maintainOrder/orderPay', {
 			  sheetID:id
 			 },'POST').then(res => {
 				  uni.hideLoading();
@@ -365,7 +367,7 @@ export default {
 		},
 		orderPay(id){
 			//uni.showLoading({ });
-			this.$http('miniApp/maintainOrder/orderPay', {
+			this.$http('worldKeepCar/maintainOrder/orderPay', {
 			  sheetID:id
 			 },'POST').then(res => {
 				  uni.hideLoading();