修改订单详情

pages/guidecar/components/njzz-calendar/njzz-calendar.vue

@@ -56,11 +56,11 @@
 			},
 			curryear:{
 				type:String,
-				default:"2020"    //初始年份
+				default:""    //初始年份
 			},
 			currmonth:{
 				type:String,
-				default:"1"    //初始月份
+				default:""    //初始月份
 			}
 		},
 		data(){
@@ -79,8 +79,8 @@
 			this.nowMonth = {
 				// year:this.today.getFullYear(),
 				// month:(this.today.getMonth()+1<10)?"0"+(this.today.getMonth()+1) : this.today.getMonth()+1,
-				year:this.curryear,
-				month:this.currmonth
+				year:this.curryear!=''?this.curryear:this.today.getFullYear(),
+				month:this.currmonth!=''?this.currmonth:((this.today.getMonth()+1<10)?"0"+(this.today.getMonth()+1) : this.today.getMonth()+1)
 			}
 			this.setMonthList()
 		},

pages/guidecar/orderDetail.vue

@@ -157,7 +157,13 @@
 						</image>
 					</view>
 					<view style="width:55%">
-						<view class="order_big">{{dataList.DetailList[0].CarName}}</view>
+						<view class="order_big" style="overflow: hidden;
+							white-space: nowrap;
+							text-overflow: ellipsis;
+							font-weight: bold;
+							width: 100%;">
+							{{dataList.DetailList[0].GoodsName}}
+						</view>
 						<view class="order_small" style="margin-top:5px;">
 							{{dataList.DetailList[0].UseDay==0.5?'半':dataList.DetailList[0].UseDay}}天,
 							{{dataList.DetailList[0].GoodsName}},
@@ -208,6 +214,14 @@
 					<text class="order_small">优惠</text>
 					<text class="order_big">¥ {{dataList.CouponMoney}}</text>
 				</view>
+				<view class="order_dList order_Tprice">
+					<text class="order_small">保险费用</text>
+					<text class="order_big">¥ {{dataList.DetailList[0].InsuranceMoney}}</text>
+				</view>
+				<view class="order_dList order_Tprice">
+					<text class="order_small">积分使用/抵扣</text>
+					<text class="order_big">{{dataList.DetailList[0].IntegralNumber!=null?dataList.DetailList[0].IntegralNumber:'0'}}/-¥{{dataList.DetailList[0].IntegralMoney!=null?dataList.DetailList[0].IntegralMoney:'0'}} </text>
+				</view>
 				<view class="order_dList" style="text-align: right" :class="{'order_nonBtm':dataList.OrderStatus!=3}">
 					<text class="order_big">实付款：</text>
 					<text class="order_redPrice">¥ {{dataList.Income}}</text>
@@ -337,7 +351,7 @@
 					var price = 0;
 					var p1 = this.dataList.DetailList[0].Final_Price;
 					var number = this.dataList.DetailList[0].Number;
-					price = p1 / number;
+					price = (p1 / number).toFixed(2);
 					return price;
 				}
 			},

pages/guidecar/rili.vue

@@ -238,6 +238,9 @@
 					if(obj.month<10){
 						obj.month = ('0' + obj.month)
 					}
+					if(obj.day<10){
+						obj.day = ('0' + obj.day)
+					}
 					this.defaultSelect = obj.year+'-'+obj.month+'-'+obj.day;
 					this.qutime=obj.hour+':'+obj.minute//初始取车时间
 				}else if(type==2){