Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

src/App.vue

@@ -25,8 +25,8 @@
     border-bottom: 1px solid #ccc;
   }
   .main-container{
-    padding: 0 10px;
-    margin-top: 61px;
+    // padding: 0 10px;
+    // margin-top: 10px;
   }
   .header-title{
     margin: 0 88px;

src/api/order/rentVehicle.js

@@ -60,3 +60,14 @@ export function saveOrderViolation(params) {
     data: params
   });
 }
+
+/**
+ * 获取押金退款进度
+ * @param query
+ */
+export function getStep(orderNo) {
+  return fetch({
+    url: 'api/order/orderVehicle/getByOrderId?orderNo=' + orderNo,
+    method: 'get'
+  });
+}

src/views/layout/Navbar.vue

 <template>
 
 <el-menu class="navbar" mode="horizontal">
-  
   <hamburger class="hamburger-container" :toggleClick="toggleSideBar" :isActive="sidebar.opened"></hamburger>
   <levelbar></levelbar>
   <tabs-view></tabs-view>
@@ -66,6 +65,12 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+.el-menu{
+  background-color: #fff;
+  height: 70px;
+  line-height: 70px;
+  -moz-box-shadow:1px 1px 3px #ccc; -webkit-box-shadow:1px 1px 3px #ccc; box-shadow:1px 1px 3px #ccc;
+}
 .navbar {
     height: 50px;
     line-height: 50px;

src/views/vehicle/vehicleInfo/index.vue

@@ -1239,12 +1239,12 @@
         },
         set: function ([startDate, endDate]) {
           if (this.$utils.isDate(startDate)) {
-            this.form4Apply.bookStartDate = formatDate(startDate, 'yyyy-MM-dd');
+            this.form4Apply.bookStartDate = formatDate(startDate, 'yyyy-MM-dd hh:mm:ss');
           } else {
             this.form4Apply.bookStartDate = undefined;
           }
           if (this.$utils.isDate(endDate)) {
-            this.form4Apply.bookEndDate = formatDate(endDate, 'yyyy-MM-dd');
+            this.form4Apply.bookEndDate = formatDate(endDate, 'yyyy-MM-dd hh:mm:ss');
           } else {
             this.form4Apply.bookEndDate = undefined;
           }