Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuanFront

public/index.html

@@ -95,7 +95,7 @@
     <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %>
     <link rel="stylesheet" href="<%= htmlWebpackPlugin.options.cdn.css[i] %>" />
     <% } %>
-    <link rel="stylesheet" href="//at.alicdn.com/t/c/font_3756681_h38tucwhmn.css" />
+    <link rel="stylesheet" href="//at.alicdn.com/t/c/font_3756681_qbc103sjo2g.css" />
     <!-- 1.8K仔百度收录 -->
     <meta name="baidu-site-verification" content="code-QVfBYJ5laQ" />
   </head>

src/components/GlobalHeader/GlobalHeader.vue

@@ -147,7 +147,9 @@ export default {
 
 <style lang="less">
 @import '../index.less';
-
+.header ul{
+  color: black;
+}
 .header-animat{
   position: relative;
   z-index: @ant-global-header-zindex;

src/components/global.less

@@ -382,6 +382,9 @@ body {
 }
 
 // 菜单样式
+.ant-layout-sider-children ul li span {
+  color: black;
+}
 .sider {
   box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35);
   position: relative;

src/views/main/BookingLedger/detail/style/basicInfo.less

@@ -2,7 +2,9 @@
     margin-bottom: 0;
     overflow: hidden;
   }
-  
+  /deep/ .from-label label{
+    color: black;
+  }
   .from-box {
     border-bottom: 1px dashed #ccc;
     margin-bottom: 2px;

src/views/main/BookingLedger/detail/style/billInfo.less

@@ -88,6 +88,9 @@
   .bill-info{
     padding-bottom: 10px;
   }
+  .bill-info /deep/ label{
+    color: black;
+  }
   .bill-info-box{
     /deep/ .ant-row{
       margin-bottom: 0 !important;

src/views/main/BookingLedger/detail/style/mailingInfo.less

@@ -2,6 +2,7 @@
     margin-bottom: 2px;
     background: #fff;
   }
+
   .base-tit {
     font-size: 14px;
     font-weight: 600;
@@ -312,7 +313,9 @@
   /deep/ .right-content .ant-form-explain {
     display: none !important;
   }
-  
+  /deep/ .right-content label{
+    color: black;
+  }
   @media (max-width: 1800px) {
     // .feeself {
     //   right: -75px !important;

src/views/main/BookingLedger/detail/style/operationArea.less

@@ -65,6 +65,7 @@
         font-size: 14px;
         color: #666;
         cursor: pointer;
+        color: black;
         background: #fff;
         .iconfont {
           font-size: 16px;

src/views/main/SendCar/addForm.vue

@@ -482,19 +482,41 @@
           </a-col>
         </a-row>
         <a-row :style="{ marginTop: '20px' }">
-          <a-col :span="8">
-            <a-form-item label="注意事项:" :labelCol="labelCol8" :wrapperCol="wrapperCol8" has-feedback>
+          <a-col :span="12">
+            <a-form-item
+              label="注意事项:"
+              :labelCol="{
+                xs: { span: 24 },
+                sm: { span: 3 }
+              }"
+              :wrapperCol="{
+                xs: { span: 25 },
+                sm: { span: 21 }
+              }"
+              has-feedback
+            >
               <a-textarea
-                :auto-size="{ minRows: 3, maxRows: 5 }"
+                :auto-size="{ minRows: 7, maxRows: 10 }"
                 v-decorator="['attention']"
                 :style="{ lineHeight: 'initial' }"
               />
             </a-form-item>
           </a-col>
-          <a-col :span="8">
-            <a-form-item label="备注:" :labelCol="labelCol8" :wrapperCol="wrapperCol8" has-feedback>
+          <a-col :span="12">
+            <a-form-item
+              label="备注:"
+              :labelCol="{
+                xs: { span: 24 },
+                sm: { span: 3 }
+              }"
+              :wrapperCol="{
+                xs: { span: 25 },
+                sm: { span: 21 }
+              }"
+              has-feedback
+            >
               <a-textarea
-                :auto-size="{ minRows: 3, maxRows: 5 }"
+                :auto-size="{ minRows: 7, maxRows: 10 }"
                 v-decorator="['remark']"
                 :style="{ lineHeight: 'initial' }"
               />
@@ -887,7 +909,7 @@ export default {
     },
     FnRtruckId(data) {
       // console.log('FnRtruckId', data, this.AlltruckIdData)
-      let Rdata = {}
+      let Rdata = ''
       this.AlltruckIdData.forEach(item => {
         if (item.id == data) {
           Rdata = item.shortName