2 years ago · 84b9effca6
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,6 +3,8 @@
 
				   <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/dialogPublic.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/dialogPublic.vue" 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$/qwh5/src/views/HomeView.vue" beforeDir="false" afterPath="$PROJECT_DIR$/qwh5/src/views/HomeView.vue" afterDir="false" />
			
 
				     </list>
			
 
				     <option name="SHOW_DIALOG" value="false" />
			
@@ -54,7 +56,7 @@
 
				       <workItem from="1654573024055" duration="23176000" />
			
 
				       <workItem from="1654653264438" duration="30604000" />
			
 
				       <workItem from="1654739102819" duration="11048000" />
			
 
				-      <workItem from="1654756255993" duration="10808000" />
			
 
				+      <workItem from="1654756255993" duration="12675000" />
			
 
				     </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.1bded63050ac0ba774c590abfe9d6c54.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.201f644de95796068836.js></script><script type=text/javascript src=./static/js/app.45403076c99d3dc6e810.js></script></body></html>
			
 
				+      })();</script><link href=./static/css/app.ca0bb2ce5da7c6112059c43a66539fe9.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.7d3582531b7ed57472bc.js></script><script type=text/javascript src=./static/js/app.45403076c99d3dc6e810.js></script></body></html>
			
--- a/project/src/components/marketingGuest/batchAddFriend/addFriend/dialogPublic.vue
+++ b/project/src/components/marketingGuest/batchAddFriend/addFriend/dialogPublic.vue
@@ -58,6 +58,8 @@ export default {
 
				         this.$parent.dialogPublic_allot_multiple()
			
 
				       }else if(this.type == 'importconfirm'){
			
 
				         this.batchAddCustomerImportConfirm(num)
			
 
				+      }else{
			
 
				+        this.dialogVisible = false
			
 
				       }
			
 
				     },
			
 
				     addCustomer_notice(){
			
--- a/project/src/components/marketingGuest/batchAddFriend/addFriend/importCustomer.vue
+++ b/project/src/components/marketingGuest/batchAddFriend/addFriend/importCustomer.vue
@@ -131,13 +131,18 @@ export default {
 
				           this.pranentInit()
			
 
				           console.log(this.user_id_list);
			
 
				         }else{
			
 
				-          if(!res&&res.rst&&res.rst.count){
			
 
				+          if(res&&res.rst&&!res.rst.count){
			
 
				+            let msg = ''
			
 
				             res.rst.forEach((item)=>{
			
 
				-              this.$message({
			
 
				-                message: `系统检测到表格第${item.row}行${item.error[0]}`,
			
 
				-                type: "warning"
			
 
				-              })
			
 
				+              msg+=`系统检测到表格第${item.row}行${item.error[0]}。 `
			
 
				             })
			
 
				+            this.$nextTick(()=>{
			
 
				+              this.dialogType = ''
			
 
				+              this.$refs.dialogPublic.dialogVisible = true
			
 
				+              this.dialogTitle = '提醒'
			
 
				+              this.dialogMsg = msg
			
 
				+            })
			
 
				+
			
 
				           }else{
			
 
				             this.$nextTick(()=>{
			
 
				               this.$refs.dialogPublic.dialogVisible = true
			
--- a/qwh5/dist/css/app.2b55d8b6.css
+++ b/qwh5/dist/css/app.2b55d8b6.css
--- a/qwh5/dist/css/app.e155fb38.css
+++ b/qwh5/dist/css/app.e155fb38.css
--- a/qwh5/dist/index.html
+++ b/qwh5/dist/index.html
--- a/qwh5/dist/js/app.512c73e3.js
+++ b/qwh5/dist/js/app.512c73e3.js
--- a/qwh5/dist/js/app.512c73e3.js.map
+++ b/qwh5/dist/js/app.512c73e3.js.map
--- a/qwh5/dist/js/app.94e42e6b.js
+++ b/qwh5/dist/js/app.94e42e6b.js
--- a/qwh5/dist/js/app.94e42e6b.js.map
+++ b/qwh5/dist/js/app.94e42e6b.js.map
--- a/qwh5/src/views/HomeView.vue
+++ b/qwh5/src/views/HomeView.vue
@@ -119,6 +119,19 @@ export default class HomeView extends Vue {
 
				     }
			
 
				   }
			
 
				 
			
 
				+  copyDomText (id) { //复制到粘贴板
			
 
				+    const node = document.getElementById(id)
			
 
				+    if (node) {
			
 
				+      let createRange = document.createRange()
			
 
				+      createRange.selectNodeContents(document.getElementById(id))
			
 
				+      const selection = document.getSelection()
			
 
				+      selection.removeAllRanges()
			
 
				+      selection.addRange(createRange)
			
 
				+      document.execCommand('Copy')
			
 
				+      selection.removeAllRanges()
			
 
				+    }
			
 
				+  }
			
 
				+
			
 
				   loadMore () {
			
 
				     if (this.noMore) {
			
 
				       return
			
@@ -170,16 +183,17 @@ export default class HomeView extends Vue {
 
				   }
			
 
				 
			
 
				   async goAddCustomer (item) { // 复制
			
 
				-    if(item.add_status == 3){
			
 
				-      ElMessage({
			
 
				-        showClose:true,
			
 
				-        message: '本客户已添加！',
			
 
				-        type: 'info',
			
 
				-        duration:3000
			
 
				-      })
			
 
				-      return
			
 
				-    }
			
 
				+    // if(item.add_status == 3){
			
 
				+    //   ElMessage({
			
 
				+    //     showClose:true,
			
 
				+    //     message: '本客户已添加！',
			
 
				+    //     type: 'info',
			
 
				+    //     duration:3000
			
 
				+    //   })
			
 
				+    //   return
			
 
				+    // }
			
 
				     this.loading = true
			
 
				+    this.copyDomText(item.phone)
			
 
				     await this.getAuthInfo(item)
			
 
				   }
			
 
				 
			
@@ -249,7 +263,7 @@ export default class HomeView extends Vue {
 
				     const _this = this
			
 
				     wx.config({
			
 
				       beta: true, // 必须这么写，否则wx.invoke调用形式的jsapi会有问题
			
 
				-      debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
			
 
				+      debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
			
 
				       appId: this.authInfo.corpid, // 必填，企业微信的corpID
			
 
				       timestamp: this.authInfo.timestamp, // 必填，生成签名的时间戳
			
 
				       nonceStr: this.authInfo.nonce_str, // 必填，生成签名的随机串
			
@@ -277,7 +291,7 @@ export default class HomeView extends Vue {
 
				       success: function (res) {
			
 
				         // 回调
			
 
				         wx.invoke('navigateToAddCustomer', {}, function (res) {
			
 
				-          console.log(res, 'wx.invoke,navigateToAddCustomer')
			
 
				+          // console.log(res, 'wx.invoke,navigateToAddCustomer')
			
 
				         })
			
 
				         _this.loading = false
			
 
				       },
			
--- a/static/css/app.1bded63050ac0ba774c590abfe9d6c54.css
+++ b/static/css/app.1bded63050ac0ba774c590abfe9d6c54.css
--- a/static/js/0.dec6f981c3ca1aeb0c7f.js
+++ b/static/js/0.dec6f981c3ca1aeb0c7f.js
--- a/static/js/0.e20210ac85e77109c7fa.js
+++ b/static/js/0.e20210ac85e77109c7fa.js
--- a/static/js/7.7bbddf84b92e31ba9666.js
+++ b/static/js/7.7bbddf84b92e31ba9666.js
--- a/static/js/7.eaa21a0a6bf804bea81b.js
+++ b/static/js/7.eaa21a0a6bf804bea81b.js
--- a/static/js/manifest.201f644de95796068836.js
+++ b/static/js/manifest.201f644de95796068836.js