标书

src/views/bidingDocument/issueTender/detailsPageEdit.vue

@@ -287,7 +287,6 @@ export default {
             this.findObject(this.optionAgent.column, "status").disabled = true
           }
         }
-<<<<<<< HEAD
     },
     data() {
         return {
@@ -1258,9 +1257,7 @@ export default {
                 this.fullscreenLoading = false
             })
         },
-=======
       }
->>>>>>> 98ca32bc20041f0f4fb46a8e3e94175ffa6ff9b7
     }
   },
   data() {

vue.config.js

@@ -32,13 +32,9 @@ module.exports = {
       '/api': {
         //本地服务接口地址
         // target: 'http://192.168.3.64:1080',
-<<<<<<< HEAD
-        target: 'http://192.168.8.108:1080',
-=======
-        target: 'http://192.168.0.106:1080',
->>>>>>> 98ca32bc20041f0f4fb46a8e3e94175ffa6ff9b7
+        // target: 'http://192.168.0.106:1080',
         // 打包地址
-        // target: 'http://121.37.83.47:10004',//服务器ip
+        target: 'http://121.37.83.47:10004',//服务器ip
         // target: 'http://trade.tubaosoft.com:10004',//服务器域名
         ws: true,
         pathRewrite: {