2 years ago · 802172bd6a
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,13 +3,11 @@
 
				   <component name="ChangeListManager">
			
 
				     <list default="true" id="f876064f-ad38-46e7-bf7d-9df623a9178f" name="Changes" comment="">
			
 
				       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
			
 
				-      <change beforePath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/index.vue" afterDir="false" />
			
 
				-      <change beforePath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/dataPreview/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/dataPreview/index.vue" afterDir="false" />
			
 
				-      <change beforePath="$PROJECT_DIR$/qwh5/.eslintrc.js" beforeDir="false" afterPath="$PROJECT_DIR$/qwh5/.eslintrc.js" afterDir="false" />
			
 
				-      <change beforePath="$PROJECT_DIR$/qwh5/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/qwh5/package-lock.json" afterDir="false" />
			
 
				-      <change beforePath="$PROJECT_DIR$/qwh5/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/qwh5/package.json" afterDir="false" />
			
 
				+      <change beforePath="$PROJECT_DIR$/project/src/assets/config/config.js" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/assets/config/config.js" afterDir="false" />
			
 
				+      <change beforePath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/importCustomer.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/importCustomer.vue" afterDir="false" />
			
 
				+      <change beforePath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/setting.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/setting.vue" afterDir="false" />
			
 
				+      <change beforePath="$PROJECT_DIR$/qwh5/public/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/qwh5/public/index.html" afterDir="false" />
			
 
				       <change beforePath="$PROJECT_DIR$/qwh5/src/views/HomeView.vue" beforeDir="false" afterPath="$PROJECT_DIR$/qwh5/src/views/HomeView.vue" afterDir="false" />
			
 
				-      <change beforePath="$PROJECT_DIR$/qwh5/vue.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/qwh5/vue.config.js" afterDir="false" />
			
 
				     </list>
			
 
				     <option name="SHOW_DIALOG" value="false" />
			
 
				     <option name="HIGHLIGHT_CONFLICTS" value="true" />
			
@@ -60,6 +58,7 @@
 
				       <workItem from="1654573024055" duration="23176000" />
			
 
				       <workItem from="1654653264438" duration="30604000" />
			
 
				       <workItem from="1654739102819" duration="11048000" />
			
 
				+      <workItem from="1654756255993" duration="2262000" />
			
 
				     </task>
			
 
				     <servers />
			
 
				   </component>
			
--- a/index.html
+++ b/index.html
@@ -7,4 +7,4 @@
 
				         hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
			
 
				         var s = document.getElementsByTagName("script")[0];
			
 
				         s.parentNode.insertBefore(hm, s);
			
 
				-      })();</script><link href=./static/css/app.0e1a7868bcebb591c382bf3e5a0505e8.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.d2aa7b633e741b5868eb.js></script><script type=text/javascript src=./static/js/app.f6ebbc768d7c27d1a698.js></script></body></html>
			
 
				+      })();</script><link href=./static/css/app.5186fd78a1f3ec7d3f421b0c2fb5e1f4.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3a196b4230b9149f39dc.js></script><script type=text/javascript src=./static/js/app.fb66a0ee18e70da63477.js></script></body></html>
			
--- a/project/src/assets/config/config.js
+++ b/project/src/assets/config/config.js
@@ -30,7 +30,8 @@ axios.interceptors.request.use(
 
				       admin_id: getCookie("admin_id"),
			
 
				       ttl: Number(getCookie("ttl")),
			
 
				       sign: getCookie("sign"),
			
 
				-      view_type: store.state.isData ? 'data' : 'helper'
			
 
				+      view_type: store.state.isData ? 'data' : 'helper',
			
 
				+      sys_group_id:getCookie('isSuperManage') == 1 ? sessionStorage.getItem('company_session_defaultCorp_level_1').toString() : '',
			
 
				     }
			
 
				     //sessionStorage 解决打开不同窗口，不能公司的问题
			
 
				     if (sessionStorage.getItem('company_session_defaultCorp') && sessionStorage.getItem('company_session_defaultCorp') != 'undefined') {
			
--- a/project/src/components/marketingGuest/batchAddFriend/addFriend/importCustomer.vue
+++ b/project/src/components/marketingGuest/batchAddFriend/addFriend/importCustomer.vue
@@ -6,7 +6,11 @@
 
				       width="36%">
			
 
				       <div class="f14">
			
 
				         <div class="tipsBox"> <i class="el-icon-message-solid f14 rMar7 c-00B38A"></i> 请下载模板后输入手机号上传，可批量复制手机号至模板内，若输入内容有重复手机号或空行将会自动过滤</div>
			
 
				-        <div class="downExcle">点击下载 <span class="pointer c-00B38A">Excle模板</span> </div>
			
 
				+        <div class="downExcle">点击下载
			
 
				+          <span class="pointer c-00B38A" @click="downExcle">
			
 
				+            <a :href="URL.BASEURL+'/playlet/Excel批量添加好友模板 .xlsx#/'"> Excle模板</a>
			
 
				+          </span>
			
 
				+        </div>
			
 
				         <div class="formTable">
			
 
				           <div class="itemBox">
			
 
				             <div class="lable"><em>*</em> 选择表格 : </div>
			
@@ -82,6 +86,9 @@ export default {
 
				     }
			
 
				   },
			
 
				   methods:{
			
 
				+    downExcle(){
			
 
				+
			
 
				+    },
			
 
				     pranentInit(){//dialogPublic在用
			
 
				       this.afferent_tag_obj.tag_id_list = []
			
 
				       this.user_id_list = []
			
--- a/project/src/components/marketingGuest/batchAddFriend/addFriend/setting.vue
+++ b/project/src/components/marketingGuest/batchAddFriend/addFriend/setting.vue
@@ -160,7 +160,6 @@ export default {
 
				       this.config_list.auto_recycle.threshold = this.config_list.auto_recycle.threshold*60
			
 
				       config_list_finally.push(this.config_list.assigned,this.config_list.charged,this.config_list.auto_recycle)
			
 
				       this.$axios.post(this.URL.BASEURL + this.URL.editConfig, {
			
 
				-        sys_group_id:this.$cookie.getCookie('isSuperManage') == 1 ? sessionStorage.getItem('company_session_defaultCorp_level_1').toString() : '',
			
 
				         config_list:config_list_finally
			
 
				       }).then((res) => {
			
 
				         var res = res.data
			
@@ -181,11 +180,7 @@ export default {
 
				     },
			
 
				     rebackInfo(){
			
 
				       this.loading = true
			
 
				-      this.$axios.get(this.URL.BASEURL + this.URL.setting_rebackInfo, {
			
 
				-        params:{
			
 
				-          sys_group_id:this.$cookie.getCookie('isSuperManage') == 1 ? Number(sessionStorage.getItem('company_session_defaultCorp_level_1')) : '',
			
 
				-        }
			
 
				-      }).then((res) => {
			
 
				+      this.$axios.get(this.URL.BASEURL + this.URL.setting_rebackInfo).then((res) => {
			
 
				         var res = res.data
			
 
				         if(res&&res.errno==0){
			
 
				           let configData = this.config_list
			
--- a/qwh5/dist/css/app.22324e9d.css
+++ b/qwh5/dist/css/app.22324e9d.css
--- a/qwh5/dist/css/app.7055aacf.css
+++ b/qwh5/dist/css/app.7055aacf.css
--- a/qwh5/dist/index.html
+++ b/qwh5/dist/index.html
--- a/qwh5/dist/js/about.3af429e9.js
+++ b/qwh5/dist/js/about.3af429e9.js
@@ -1,2 +1,2 @@
 
				 "use strict";(self["webpackChunkqwh5"]=self["webpackChunkqwh5"]||[]).push([[443],{4335:function(n,u,t){t.r(u),t.d(u,{default:function(){return f}});var a=t(3396);const e={class:"about"},r=(0,a._)("h1",null,"This is an about page",-1),s=[r];function c(n,u){return(0,a.wg)(),(0,a.iD)("div",e,s)}var i=t(89);const h={},o=(0,i.Z)(h,[["render",c]]);var f=o}}]);
			
 
				-//# sourceMappingURL=about.3af429e9.js.map
			
 
				+//# sourceMappingURL=about.0c77b459.js.map
			
--- a/qwh5/dist/js/about.3af429e9.js.map
+++ b/qwh5/dist/js/about.3af429e9.js.map
--- a/qwh5/dist/js/app.1c4ff2fa.js
+++ b/qwh5/dist/js/app.1c4ff2fa.js
--- a/qwh5/dist/js/app.1c4ff2fa.js.map
+++ b/qwh5/dist/js/app.1c4ff2fa.js.map
--- a/qwh5/dist/js/app.5dfbb118.js
+++ b/qwh5/dist/js/app.5dfbb118.js
--- a/qwh5/dist/js/app.5dfbb118.js.map
+++ b/qwh5/dist/js/app.5dfbb118.js.map
--- a/qwh5/dist/js/chunk-vendors.f252284d.js
+++ b/qwh5/dist/js/chunk-vendors.f252284d.js
--- a/qwh5/dist/js/chunk-vendors.7e7f30bd.js.map
+++ b/qwh5/dist/js/chunk-vendors.7e7f30bd.js.map
--- a/qwh5/dist/js/chunk-vendors.f252284d.js.map
+++ b/qwh5/dist/js/chunk-vendors.f252284d.js.map
--- a/qwh5/public/index.html
+++ b/qwh5/public/index.html
@@ -7,7 +7,8 @@
 
				       <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>
			
 
				     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
			
 
				-    <title><%= htmlWebpackPlugin.options.title %></title>
			
 
				+<!--    <title><%= htmlWebpackPlugin.options.title %></title>-->
			
 
				+    <title>客户列表</title>
			
 
				   </head>
			
 
				   <body>
			
 
				     <noscript>
			
--- a/qwh5/src/views/HomeView.vue
+++ b/qwh5/src/views/HomeView.vue
@@ -190,14 +190,29 @@ export default class HomeView extends Vue {
 
				       this.tableLoading = false
			
 
				       this.loading = false
			
 
				       const resNew = res.data
			
 
				-      if (resNew.rst.data.length < 20) {
			
 
				-        this.noMore = true
			
 
				+      if(resNew&&resNew.errno==0){
			
 
				+        if (resNew.rst.data.length < 20) {
			
 
				+          this.noMore = true
			
 
				+        }
			
 
				+        this.tableData = [...this.tableData, ...resNew.rst.data]
			
 
				+        this.load_loading = false
			
 
				+      }else{
			
 
				+        ElMessage({
			
 
				+          showClose:true,
			
 
				+          message: '没有获取到链接参数，请联系管理员',
			
 
				+          type: 'warning',
			
 
				+          duration:5000
			
 
				+        })
			
 
				       }
			
 
				-      this.tableData = [...this.tableData, ...resNew.rst.data]
			
 
				-      this.load_loading = false
			
 
				     }).catch((err) => {
			
 
				       this.tableLoading = false
			
 
				       console.log(err)
			
 
				+      ElMessage({
			
 
				+        showClose:true,
			
 
				+        message: err,
			
 
				+        type: 'warning',
			
 
				+        duration:5000
			
 
				+      })
			
 
				     })
			
 
				   }
			
 
				 
			
--- a/static/css/app.0e1a7868bcebb591c382bf3e5a0505e8.css
+++ b/static/css/app.0e1a7868bcebb591c382bf3e5a0505e8.css
--- a/static/js/7.7ddb71882cfa4c322f0b.js
+++ b/static/js/7.7ddb71882cfa4c322f0b.js
--- a/static/js/7.d6c4964385f0b6e12cc7.js
+++ b/static/js/7.d6c4964385f0b6e12cc7.js
--- a/static/js/app.f6ebbc768d7c27d1a698.js
+++ b/static/js/app.f6ebbc768d7c27d1a698.js
--- a/static/js/manifest.d2aa7b633e741b5868eb.js
+++ b/static/js/manifest.d2aa7b633e741b5868eb.js