.

.idea/workspace.xml

@@ -3,9 +3,27 @@
   <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$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/importRecordDetial.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/importRecordDetial.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/dist/css/app.e155fb38.css" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/css/chunk-vendors.01b3e040.css" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/favicon.ico" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/index.html" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/about.0c77b459.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/about.0c77b459.js.map" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/app.94e42e6b.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/app.94e42e6b.js.map" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/chunk-vendors.f252284d.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/chunk-vendors.f252284d.js.map" beforeDir="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$/static/css/app.ca0bb2ce5da7c6112059c43a66539fe9.css" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/js/32.ed17950db5aa1c8331df.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/js/33.d8551f260ee729e34453.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/js/34.99b920e67caecb79c65f.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/js/7.eaa21a0a6bf804bea81b.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/js/app.45403076c99d3dc6e810.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/js/manifest.7d3582531b7ed57472bc.js" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -56,7 +74,7 @@
       <workItem from="1654573024055" duration="23176000" />
       <workItem from="1654653264438" duration="30604000" />
       <workItem from="1654739102819" duration="11048000" />
-      <workItem from="1654756255993" duration="12675000" />
+      <workItem from="1654756255993" duration="14418000" />
     </task>
     <servers />
   </component>

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.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>
+      })();</script><link href=./static/css/app.06f1c5b70abb97f295ba1f5285f77c7b.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.ba131a074f7ecad8ec91.js></script><script type=text/javascript src=./static/js/app.6f405954ea664523bc98.js></script></body></html>

project/src/components/marketingGuest/batchAddFriend/addFriend/importRecordDetial.vue

@@ -68,7 +68,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
-            <div :class="scope.row.add_status==3 ? 'c-999 pointer-drop' : 'c-00B38A pointer' " @click="scope.row.add_status!=3&&remindCustomer(scope.row.id)">提醒添加</div>
+            <div :class="scope.row.add_status==3 ? 'c-999 pointer-drop' : 'c-00B38A pointer' " @click="scope.row.add_status!=3&&remindCustomer(scope.row.user_id,scope.row.add_status)">提醒添加</div>
           </template>
         </el-table-column>
       </el-table>
@@ -77,7 +77,7 @@
         </el-pagination>
       </div>
 
-      <dialogPublic ref="dialogPublic" :dialogTitle="dialogTitle" :dialogMsg="dialogMsg"></dialogPublic>
+      <dialogPublic ref="dialogPublic" :dialogTitle="dialogTitle" :dialogMsg="dialogMsg"  :type="dialogType" :user_ids="user_ids"></dialogPublic>
 
     </div>
   </div>
@@ -92,6 +92,7 @@ export default {
   components:{dialogPublic,selfInput,selfChannel},
   data(){
     return{
+      dialogType:'',
       loading:false,
       tableData:[],
       height:'',
@@ -104,7 +105,8 @@ export default {
       input_keyword:'',
       addStatus:'',
       allNum:'',
-      addedNum:''
+      addedNum:'',
+      user_ids:[]
     }
   },
   created () {
@@ -115,14 +117,19 @@ export default {
     handleCurrentChange (val) {
       this.init(val)
     },
-    remindCustomer(id,status){
+    remindCustomer(user_id,status){
       this.$nextTick(()=>{
         this.$refs.dialogPublic.dialogVisible = true
+        this.dialogType = 'remindSingle'
         this.dialogTitle = '提醒'
         this.dialogMsg = '将通过企微提醒给该成员添加该手机号为好友，是否确认发送？'
+        this.user_ids = []
+        this.user_ids.push(user_id)
       })
     },
-
+    clearuser_ids(){//dialogPublic在用
+      this.user_ids = []
+    },
     init (page, type) {
       this.page = page ? page : this.page;
       this.loading = true

project/src/components/marketingGuest/batchAddFriend/addFriend/setting.vue

@@ -155,9 +155,9 @@ export default {
       this.loading=true
       // this.$loading(this.$loadingConfig)
       let config_list_finally=[]
-      this.config_list.assigned.threshold = this.config_list.assigned.threshold*60
-      this.config_list.charged.threshold = this.config_list.charged.threshold*60
-      this.config_list.auto_recycle.threshold = this.config_list.auto_recycle.threshold*60
+      this.config_list.assigned.threshold = this.config_list.assigned.threshold*1440
+      this.config_list.charged.threshold = this.config_list.charged.threshold*1440
+      this.config_list.auto_recycle.threshold = this.config_list.auto_recycle.threshold*1440
       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, {
         config_list:config_list_finally
@@ -190,7 +190,7 @@ export default {
             configData.assigned = res.rst.assigned
 
             configData.assigned.enable = true
-            configData.assigned.threshold = res.rst.assigned.threshold/60
+            configData.assigned.threshold = res.rst.assigned.threshold/1440
             let users = configData.assigned.notice_users
             if(users.split(',')){
               this.user_id_list = users.split(',')
@@ -203,7 +203,7 @@ export default {
               configData.assigned.config_id = res.rst.assigned.config_id
             }
             if(res.rst.assigned.threshold){
-              configData.assigned.threshold = res.rst.assigned.threshold/60
+              configData.assigned.threshold = res.rst.assigned.threshold/1440
             }
           }
 
@@ -211,7 +211,7 @@ export default {
             configData.charged = res.rst.charged
 
             configData.charged.enable = true
-            configData.charged.threshold = res.rst.charged.threshold/60
+            configData.charged.threshold = res.rst.charged.threshold/1440
           }else{
             configData.charged.enable = false
 
@@ -220,7 +220,7 @@ export default {
             }
 
             if(res.rst.charged.threshold){
-              configData.charged.threshold = res.rst.charged.threshold/60
+              configData.charged.threshold = res.rst.charged.threshold/1440
             }
           }
 
@@ -228,7 +228,7 @@ export default {
             configData.auto_recycle = res.rst.auto_recycle
 
             configData.auto_recycle.enable = true
-            configData.auto_recycle.threshold = res.rst.auto_recycle.threshold/60
+            configData.auto_recycle.threshold = res.rst.auto_recycle.threshold/1440
           }else{
             configData.auto_recycle.enable = false
 
@@ -236,7 +236,7 @@ export default {
               configData.auto_recycle.config_id = res.rst.auto_recycle.config_id
             }
             if(res.rst.auto_recycle.threshold){
-              configData.auto_recycle.threshold = res.rst.auto_recycle.threshold/60
+              configData.auto_recycle.threshold = res.rst.auto_recycle.threshold/1440
             }
           }
 

qwh5/src/views/HomeView.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="home" v-loading="loading">
-    <div class="tipsBox">管理员给你分配了{{ customer_total ? customer_total : '-' }}个客户还未添加，快去复制电话号码添加客户吧，管理员在微伴后台可查看添加状态哦～</div>
+    <div class="tipsBox">管理员给你分配了{{ customer_total ? customer_total : '-' }}个客户还未添加，快去复制电话号码添加客户吧，管理员在企微后台可查看添加状态哦～</div>
     <div class="operateArea">
       <div>
         <el-select v-model="addStatus_val" :popper-append-to-body="false" placeholder="请选择添加状态" @change="statusChange">
@@ -119,17 +119,24 @@ 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()
-    }
+  copyDomText (data) { //复制到粘贴板
+    // 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()
+    // }
+
+    var input = document.createElement("input");// 创建input
+    input.value = data; // 赋值
+    document.body.appendChild(input); // 添加dom
+    input.select(); // 选中input
+    document.execCommand("Copy"); // 复制到剪贴板
+    document.body.removeChild(input); // 清除input
   }
 
   loadMore () {
@@ -174,9 +181,7 @@ export default class HomeView extends Vue {
     }).then((res) => {
       const resNew = res.data
       this.authInfo = resNew.rst
-      if(item.add_status == 1){
-        this.get_dataReporting(item)
-      }
+      this.get_dataReporting(item)
     }).catch((err) => {
       console.log(err)
     })
@@ -253,7 +258,9 @@ export default class HomeView extends Vue {
       }
     }).then((res) => {
       const resNew = res.data
-      this.initQYConfig()
+      if(item.add_status == 1 || item.add_status == 2){
+        this.initQYConfig()
+      }
     }).catch((err) => {
       console.log(err)
     })