代码冲突

src/components/areaSelect.vue

@@ -48,10 +48,7 @@ export default {
           initals:[ 'A','B','C','F','G','H','J','L','N','Q','S','T','X','Y','Z'],
           newArea:null,
           input:'',
-          citys:{
-            "安徽省":["合肥市","芜湖市"],
-            "北京市":[],
-          },
+          citys:{},
           isCountry:false,
       }
     },

src/views/bus/components/subMage.vue

@@ -122,7 +122,7 @@
 </template>
 
 <script>
-import { scribeData, subdis, updateArea, updateBuyerclass, updateInfotype, pushset, updatePush, projectUpdate } from '@/api/api';
+import { scribeData, subdis, updateArea, updateBuyerclass, updateInfotype, pushset, updatePush, projectUpdate,areaGetdata } from '@/api/api';
 import vKey from './antistop.vue';
 import vDistri from './distribute.vue';
 import vWarn from './warnBox.vue';

vue.config.js

@@ -17,16 +17,10 @@ module.exports = {
     proxy: {
       "/entbase": {
         // target: "https://app2-jytest.jianyu360.cn",
-<<<<<<< HEAD
         // target: "http://127.0.0.1:812",
         // target: "http://127.0.0.1:812",
         target:'http://192.168.20.214:815',//任
         // target:'http://192.168.20.241:815',
-=======
-        // target: "http://127.0.0.1:815",
-        // target:'http://192.168.20.51:815',
-        target:'http://192.168.20.241:815',
->>>>>>> e0198c5278e17bf2465e176c3879e9288e94470a
         changeOrigin: true,
         ws: true,
         pathRewrite: {
@@ -35,15 +29,9 @@ module.exports = {
       },
       "/entniche": {
         // target: "https://app2-jytest.jianyu360.cn",
-<<<<<<< HEAD
         // target: "http://192.168.20.241:812",
         // target: "http://127.0.0.1:812",
         target:'http://192.168.20.214:812',//任
-=======
-        target: "http://192.168.20.241:812",
-        // target: "http://127.0.0.1:812",
-        // target:'http://192.168.20.214:813',
->>>>>>> e0198c5278e17bf2465e176c3879e9288e94470a
         changeOrigin: true,
         ws: true,
         pathRewrite: {