合并master冲突

.idea/workspace.xml

@@ -2,108 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="f876064f-ad38-46e7-bf7d-9df623a9178f" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/project/src/assets/img/icon/liushi.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/project/src/assets/img/icon/zongfufei.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/project/src/components/assembly/phonePreview.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/project/src/components/customOperate/massMsgDetail/dataTranslate.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/project/src/components/customOperate/massMsgDetail/index.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/project/src/components/customOperate/massMsgDetail/userDetail.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/project/src/components/manage/userDetail/customList.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/project/src/components/manage/userDetail/index.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/css/app.da979a5f8209e58673b615e87a6530a3.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/js/0.6894e822be0039065bf6.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/js/10.497f32075b997acaa21a.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/js/11.c632b2fd3461ce476f40.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/js/14.297ef3b79e68986e5365.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/js/15.8a26d184f2d55ffc2f20.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/js/16.b0bd323f73d03540318c.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/js/18.ac572a8186e6824c6795.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/js/2.ffd279c211497b88757d.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/js/20.a46a05908e4dc7be66ce.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/js/21.aac066f3f8bbdc6348da.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/js/23.7eee9fdc68fdb11a9a91.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/js/25.b57106d85346fb2260c9.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/js/27.90c48bf56a19fc7628a1.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/js/28.e617f5a9baa2bcaee56e.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/js/3.ee46146b4fe72d2800c2.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/js/34.203c69e40ca20347b5f1.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/js/36.66e6b13ac6765ab3c14c.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/js/4.190eb80b9e2668d2bdd0.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/js/5.9274d7b76144d9845812.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/js/8.ceb415a6e0e89fc5bf43.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/js/9.50fb0b2ad8f8ec2fa957.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/js/manifest.686ebaafe93465e14e16.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/project/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/project/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/assets/config/interface_api.js" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/assets/config/interface_api.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/H5/customerDetails.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/H5/customerDetails.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/HomeData.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/HomeData.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/Index/header.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/Index/header.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/assembly/conTwo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/assembly/conTwo.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/assembly/editCon.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/assembly/editCon.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/assembly/screen/channel.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/assembly/screen/channel.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/assembly/screen/customerService.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/assembly/screen/customerService.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/assembly/screen/customerServiceFC.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/assembly/screen/customerServiceFC.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/assembly/screen/datePicker.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/assembly/screen/datePicker.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/assembly/screen/enterpriseTag.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/assembly/screen/enterpriseTag.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/components/H5/customerDetails.vue" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/project/src/components/assembly/screen/enterpriseTagFC.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/assembly/screen/enterpriseTagFC.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/customManage/manage.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customManage/manage.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/customOperate/create.scss" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/create.scss" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/customOperate/createFriendsCircle.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/createFriendsCircle.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/customOperate/createMassMsg.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/createMassMsg.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/customOperate/employee_bulk_messaging_log.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/employee_bulk_messaging_log.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/customOperate/friendsCircle/QWfc.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/friendsCircle/QWfc.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/demo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/demo.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/manage/memberManage.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/manage/memberManage.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/project/src/router/allRouter.js" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/router/allRouter.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/style/common.scss" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/style/common.scss" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/style/self.scss" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/style/self.scss" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/css/app.4da301d9e2ae3d5ddebaccc0ed67728a.css" beforeDir="false" afterPath="$PROJECT_DIR$/static/css/app.4da301d9e2ae3d5ddebaccc0ed67728a.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/img/homeBigImg.f886d52.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/0.e5d5b0079709e3faab6a.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/0.e5d5b0079709e3faab6a.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/10.4dffe093881d5ee07e46.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/11.7887334ef6b7f135aa7d.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/12.4c2bfd64423ae024fb6a.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/12.e20f528c16bc04b3bcce.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/13.554aa65974005d288d88.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/13.43f3523d3b42ec9e7dfd.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/14.ed7c2a63c4e0af1e2d4c.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/15.dc5d646f531729882c20.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/16.cf3c99347e97968dd54f.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/17.57496167af61671bba1f.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/17.b154c87f9b790d54f3e5.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/18.691d8ccc01cf236bc891.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/19.3502414ce4daea7a3c11.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/19.eeba1a08e7fff2e2064e.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/2.b9862eab66265a974ec8.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/20.ba037b2c5b027958d973.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/22.107eb411f347f27bb8b2.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/21.f2c31eb868645cc64930.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/21.f2c31eb868645cc64930.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/22.a526a17196a35b5b1983.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/22.a526a17196a35b5b1983.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/23.08cc48b0736aebeaceac.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/24.84820019698092aa392c.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/25.b920389b9b4cd8b97d1c.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/26.42c52f97866b0b798edf.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/26.9e6959e3ce82072ed195.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/27.eb56cb17d40633b8800a.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/28.ab926ac5ddf58f315181.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/24.b66892beca015735715b.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/29.ca297061d26d7636515f.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/3.d6bd47e5430e4a83f46d.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/30.61c2b490ec9b609c6b6d.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/32.05272cc1a00667b3f6a7.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/31.61292738bd3dd5485177.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/32.3b38f25500e074648cda.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/30.22dc6238743d13819392.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/33.d8551f260ee729e34453.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/29.33842dcf4fca81c00f75.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/34.a7ff10675e56fdc18487.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/35.0fde5b3adbcf096e6276.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/36.912daf3793b4a3beb16a.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/33.513b523c3c877db0b31e.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/37.d8bbddb76bcb6110530c.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/35.673245c973f528bb0c56.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/38.b2b63196c948f67a3732.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/31.b4589a363fb662e2a86a.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/39.77a7a5de6f8e36711cdd.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/4.8f498e8c351fdc4d7221.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/40.d5442514fca224f2c24e.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/37.6374299aa81d20d3b7ca.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/5.63279d17afd80e68acf0.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/6.b81768577c2479b00525.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/6.6ca12151a13cf3e28e5e.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/7.ab8dadb73e13f227dbb4.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/7.31ea730853ee73dae576.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/8.22fb3059ffcabde39be4.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/9.665586d0f737b7473f90.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/app.7e17fcfda146a3adecb6.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/app.7e17fcfda146a3adecb6.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/app.8d5ea739ce8ef8fd6056.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/app.8d5ea739ce8ef8fd6056.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/app.d0df7301d49daa1ebe9c.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/app.d0df7301d49daa1ebe9c.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/manifest.e6712c6d9b689ffe9384.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/manifest.e6712c6d9b689ffe9384.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -153,7 +56,7 @@
       <workItem from="1654070934388" duration="14000" />
       <workItem from="1654573024055" duration="23176000" />
       <workItem from="1654653264438" duration="30604000" />
-      <workItem from="1654739102819" duration="5435000" />
+      <workItem from="1654739102819" duration="5695000" />
     </task>
     <servers />
   </component>

project/index.html

@@ -4,12 +4,6 @@
     <meta charset="utf-8">
     <link rel="shortcut icon" type="image/x-icon" href="./favicon.ico">
     <title>企微助手</title>
-<<<<<<< HEAD
-    <script src="http://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
-    <script src="https://open.work.weixin.qq.com/wwopen/js/jwxwork-1.0.0.js"></script>
-    <script src="http://files.cnblogs.com/mofish/sha1.js"></script>
-=======
->>>>>>> master
     <script>
       document.documentElement.style.fontSize = 100 * (document.documentElement.clientWidth/1920) + "px";
       window.onresize = function(){

project/src/components/H5/customerDetails.vue

@@ -1,128 +0,0 @@
-<template>
-  <div>
-    <div>点击复制去添加客户</div>
-  </div>
-</template>
-
-<script>
-import sha1 from 'js-sha1'
-
-const _charStr = 'abacdefghjklmnopqrstuvwxyzABCDEFGHJKLMNOPQRSTUVWXYZ0123456789';
-export default {
-  name: "customerDetails",
-
-  data(){
-    return {
-    }
-  },
-  created() {
-    this.init()
-  },
-  methods:{
-
-
-    RandomIndex(min, max, i){
-        let index = Math.floor(Math.random()*(max-min+1)+min),
-          numStart = _charStr.length - 10;
-        //如果字符串第一位是数字，则递归重新获取
-        if(i==0&&index>=numStart){
-          index = this.RandomIndex(min, max, i);
-        }
-        //返回最终索引值
-        return index;
-    },
-    getRandomString(len){
-      let min = 0, max = _charStr.length-1, _str = '';
-      //判断是否指定长度，否则默认长度为15
-      len = len || 15;
-      //循环生成字符串
-      for(var i = 0, index; i < len; i++){
-        index = this.RandomIndex(min, max, i);
-        _str += _charStr[index];
-      }
-      return _str;
-    },
-
-    init(){
-
-      var timestamp = Date.parse(new Date()) / 1000
-
-      var nonceStr = this.getRandomString(16)
-
-      var url = location.href.split('#')[0]
-
-      var jsapi_ticket = 'sM4AOVdWfPE4DxkXGEs8VNBqkcBvp2Ye73miTjyrm1Zok1vMJHNRCCxtLBQjSrXHOkrqOKeG19MLBb5CtC_w5Q' //企业
-      var jsapi_ticket_ying = 'bTBtAiHbS6I6qQZM2tSdTw==' //应用
-
-      var string1 = 'jsapi_ticket=' + jsapi_ticket + '&noncestr=' + nonceStr + '&timestamp=' + timestamp + '&url=' + url
-      var string2 = 'jsapi_ticket=' + jsapi_ticket_ying + '&noncestr=' + nonceStr + '&timestamp=' + timestamp + '&url=' + url
-      // var signature = sha1(string1)
-      console.log(jsapi_ticket,nonceStr,timestamp,url,sha1(string1),sha1(string2));
-
-      wx.config({
-        beta: true,// 必须这么写，否则wx.invoke调用形式的jsapi会有问题
-        debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
-        appId: 'ww27940915d8fbfbe6', // 必填，企业微信的corpID
-        timestamp: timestamp, // 必填，生成签名的时间戳
-        nonceStr: nonceStr, // 必填，生成签名的随机串
-        signature: sha1(string1),// 必填，签名，见 附录-JS-SDK使用权限签名算法 企业签名
-        jsApiList: ['navigateToAddCustomer'] // 必填，需要使用的JS接口列表，凡是要调用的接口都需要传进来
-      });
-
-      wx.ready(function(){
-        console.log('进到ready');
-        // config信息验证后会执行ready方法，所有接口调用都必须在config接口获得结果之后，config是一个客户端的异步操作，所以如果需要在页面加载时就调用相关接口，则须把相关接口放在ready函数中调用来确保正确执行。对于用户触发时才调用的接口，则可以直接调用，不需要放在ready函数中。
-
-        wx.agentConfig({
-          corpid: 'ww27940915d8fbfbe6', // 必填，企业微信的corpid，必须与当前登录的企业一致
-          agentid: '1000017', // 必填，企业微信的应用id （e.g. 1000247）
-          timestamp: timestamp, // 必填，生成签名的时间戳
-          nonceStr: nonceStr, // 必填，生成签名的随机串
-          signature: sha1(string2),// 必填，签名，见附录-JS-SDK使用权限签名算法  应用签名
-          jsApiList: ['navigateToAddCustomer'], //必填，传入需要使用的接口名称
-          success: function(res) {
-            console.log('进到agentConfig,success');
-            console.log(res,'agentConfig,success');
-            // 回调
-            wx.invoke('navigateToAddCustomer',{},function(res) {
-              console.log(res,'wx.invoke,navigateToAddCustomer');
-            });
-          },
-          fail: function(res) {
-            console.log(res,'agentConfig,fail');
-            if(res.errMsg.indexOf('function not exist') > -1){
-              alert('版本过低请升级')
-            }
-          }
-        });
-
-        // wx.checkJsApi({
-        //   jsApiList: ['navigateToAddCustomer'], // 需要检测的JS接口列表
-        //   success: function(res) {
-        //     // 以键值对的形式返回，可用的api值true，不可用为false
-        //     // 如：{"checkResult":{"chooseImage":true},"errMsg":"checkJsApi:ok"}
-        //     console.log(res,'checkJsApi');
-        //     console.log('进到checkJsApi,success');
-        //
-        //
-        //
-        //   }
-        // });
-
-      });
-
-      wx.error(function(res){
-        // config信息验证失败会执行error函数，如签名过期导致验证失败，具体错误信息可以打开config的debug模式查看，也可以在返回的res参数中查看，对于SPA可以在这里更新签名。
-        console.log(res,'error');
-
-        console.log('进到error');
-      });
-
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

project/src/components/assembly/screen/enterpriseTagFC.vue

@@ -14,11 +14,7 @@
       </div>
     </div>
 
-<<<<<<< HEAD
     <el-dialog title="选择标签" :visible.sync="visible" width="600px" center top="15vh" :append-to-body="true">
-=======
-    <el-dialog append-to-body title="选择标签" :visible.sync="visible" width="600px" center top="15vh">
->>>>>>> master
       <div class="popover_con" v-loading="loading">
         <template>
           <div class="self-input">

project/src/router/allRouter.js

@@ -33,13 +33,9 @@ const charge = () => import(/* webpackChunkName: 'charge' */ '@/components/order
 const wxAccountList = () => import(/* webpackChunkName: 'wxAccountList' */ '@/components/dataBoard/wxAccount/list.vue')
 const thePublicTrend = () => import(/* webpackChunkName: 'thePublicTrend' */ '@/components/dataBoard/thePublicTrend.vue')
 const playletFansActTrend = () => import(/* webpackChunkName: 'playletFansActTrend' */ '@/components/dataBoard/playletFansActTrend.vue')
-<<<<<<< HEAD
-const H5Detial = () => import(/* webpackChunkName: 'H5Detial' */ '@/components/H5/customerDetails.vue')
 const batchAddFriend = () => import(/* webpackChunkName: 'batchAddFriend' */ '@/components/marketingGuest/batchAddFriend/index.vue')
 const importRecord = () => import(/* webpackChunkName: 'importRecord' */ '@/components/marketingGuest/batchAddFriend/addFriend/importRecord.vue')
 const importRecordDetial = () => import(/* webpackChunkName: 'importRecordDetial' */ '@/components/marketingGuest/batchAddFriend/addFriend/importRecordDetial.vue')
-=======
->>>>>>> master
 // const putOnwarning = () => import(/* webpackChunkName: 'putOnwarning' */ '@/components/dataBoard/putOnwarning/warningManage.vue')
 // const massMsgDetail = () => import(/* webpackChunkName: 'massMsgDetail' */ '@/components/customOperate/massMsgDetail/index.vue')