样式调整

src/services/request/serviceURL.ts

@@ -77,10 +77,10 @@ export const getUplodaUrl = (): 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/account_info/compoments/detail-business/index.vue

@@ -27,13 +27,8 @@
             </a-col>
           </a-row>
         </a-checkbox-group>
-<<<<<<< HEAD
-      </Des>
-      <!-- <a-row :gutter="24">
-=======
       </Des> -->
-      <a-row :gutter="24">
->>>>>>> e29e164b2d8593fdcda06ef0111c8f6d22d2cec9
+      <!-- <a-row :gutter="24">
         <a-col :span="12">
           <a-form-item label="登录账号"
                        name="">