样式修改

src/services/request/serviceURL.ts

@@ -73,22 +73,10 @@ export const commonSearchUrl = (url: string): string => {
 export const setServiceURL = (config: URL): void => {
     // console.log('URL', config);
     // 外网环境（175），外包同事使用
-<<<<<<< HEAD
-    // 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.goCommonSearchUrl = 'http://218.17.158.45:21001/api';
-    serviceURL.quoteUrl = 'ws://218.17.158.45:21004';
-    serviceURL.tradeUrl = 'ws://218.17.158.45:21005';
-=======
     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;
->>>>>>> 8342b930e1b0ec81127da97e63ddb4b1d8afa6d2
 };

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

@@ -416,13 +416,8 @@
           <a-col :span="24">
             <a-form-item label="备注">
               <a-input class="dialogInput"
-<<<<<<< HEAD
-                      style="width: 608px"
-                      placeholder="请输入备注" />
-=======
-                       style="width: 620px"
+                       style="width: 608px"
                        placeholder="请输入备注" />
->>>>>>> 8342b930e1b0ec81127da97e63ddb4b1d8afa6d2
             </a-form-item>
           </a-col>
         </a-row>