Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB into master

src/assets/styles/mixin.less

@@ -586,6 +586,9 @@
 .ml10 {
     margin-left: 10px;
 }
+.ml9 {
+    margin-left: 9px;
+}
 .ml5{
     margin-left: 5px;
 }

src/services/request/serviceURL.ts

@@ -73,10 +73,10 @@ export const commonSearchUrl = (url: string): string => {
 export const setServiceURL = (config: URL): void => {
     // console.log('URL', config);
     // 外网环境（175），外包同事使用
-    if (process.env.NODE_ENV === 'development') {
+    // if (process.env.NODE_ENV === 'development') {
         serviceURL.goCommonSearchUrl = 'http://218.17.158.45:21001/api';
         serviceURL.quoteUrl = 'ws://218.17.158.45:21004';
         serviceURL.tradeUrl = 'ws://218.17.158.45:21005';
-    }
-    serviceURL = config;
+    // }
+    // serviceURL = config;
 };

src/views/information/spot-contract/components/modify/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 修改现货合同-->
-  <a-modal class="modify-custom"
+  <a-modal class="commonModal modify-custom"
            title="修改现货合同"
            v-model:visible="visible"
            @cancel="cancel"
@@ -327,7 +327,7 @@
           <a-col :span="24">
             <a-form-item label="备注">
               <a-input class="dialogInput"
-                      style="width: 620px"
+                      style="width: 608px"
                       placeholder="请输入备注" />
             </a-form-item>
           </a-col>

src/views/information/warehouse-info/compoments/add/index.vue

@@ -77,7 +77,7 @@
                 湖南省
               </a-select-option>
             </a-select>
-            <a-select class="inlineFormSelect"
+            <a-select class="inlineFormSelect ml9"
                       style="width: 205px"
                       placeholder="请选择市">
               <a-select-option value="1">
@@ -87,7 +87,7 @@
                 岳阳市
               </a-select-option>
             </a-select>
-            <a-select class="inlineFormSelect"
+            <a-select class="inlineFormSelect ml9"
                       style="width: 205px"
                       placeholder="请选择县(区)">
               <a-select-option value="1">

src/views/information/warehouse-info/compoments/modify/index.vue

@@ -77,7 +77,7 @@
                 湖南省
               </a-select-option>
             </a-select>
-            <a-select class="inlineFormSelect"
+            <a-select class="inlineFormSelect ml9"
                       style="width: 205px"
                       placeholder="请选择市">
               <a-select-option value="1">
@@ -87,7 +87,7 @@
                 岳阳市
               </a-select-option>
             </a-select>
-            <a-select class="inlineFormSelect"
+            <a-select class="inlineFormSelect ml9"
                       style="width: 205px"
                       placeholder="请选择县(区)">
               <a-select-option value="1">