Browse Source

jiejuechongtu

liuxiaona 2 years ago
parent
commit
0bcdf83fd3

+ 1 - 1
index.html

@@ -7,4 +7,4 @@
7 7
         hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
8 8
         var s = document.getElementsByTagName("script")[0];
9 9
         s.parentNode.insertBefore(hm, s);
10
-      })();</script><link href=./static/css/app.33c3ee670a51e7a2cf7c2bfd88ee4277.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.617e4c9d5d9fb903dc57.js></script><script type=text/javascript src=./static/js/app.f30813c1ab8a13c4f23b.js></script></body></html>
10
+      })();</script><link href=./static/css/app.4c55c2fa33e7eb8277f439ba4c16ec4e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.9823c046ef254aa1fe26.js></script><script type=text/javascript src=./static/js/app.a588f6ceb13214d347b1.js></script></body></html>

+ 2 - 1
project/src/components/channelCode/channelAnalyse.vue

@@ -130,7 +130,8 @@ export default {
130 130
             this.scan_code_Data.push(item.scan_num)
131 131
             this.scan_code_keep_Data.push(item.keep_num)
132 132
           })
133
-          this.tableData = res.rst
133
+          this.tableData = res.rst.reverse()
134
+          console.log(this.tableData)
134 135
           this.$nextTick(() => {
135 136
             this.trendEvent()
136 137
           })

+ 44 - 15
project/src/components/channelCode/createChannelCode.vue

@@ -97,7 +97,7 @@
97 97
         <label>客服添加上限</label>
98 98
         <div @click="tipsClick" class="limitBox">
99 99
           <el-switch v-model="add_limit"
100
-                     :disabled="user_id_list&&(user_id_list.length==0 || user_id_list.length>=4)"
100
+                     :disabled="user_id_list&&user_id_list.length==0"
101 101
                      @change="switchLimit" active-color="#13ce66"
102 102
                      inactive-color="#ddd"></el-switch>
103 103
         </div>
@@ -267,7 +267,7 @@ export default {
267 267
     user_id_list:{
268 268
       immediate:false,
269 269
       handler(newVal,oldVal){
270
-        if(this.user_id_list&&(this.user_id_list.length==0 || this.user_id_list.length>=4)){
270
+        if(this.user_id_list&&this.user_id_list.length==0){
271 271
           this.add_limit=false
272 272
         }else{
273 273
           // this.add_limit=true
@@ -430,11 +430,16 @@ export default {
430 430
             })
431 431
           }
432 432
 
433
-        if(JSON.parse(dataInfo.warn_user)&&JSON.parse(dataInfo.warn_user).length>0){
434
-          this.add_limit = true
435
-          this.warn_user = JSON.parse(dataInfo.warn_user)
436
-          this.get_djuser_list = JSON.parse(dataInfo.warn_user)
437
-        }
433
+          if(dataInfo.up_toplimit==1){
434
+            this.add_limit = true
435
+            if(JSON.parse(dataInfo.warn_user)&&JSON.parse(dataInfo.warn_user).length>0){
436
+              this.warn_user = JSON.parse(dataInfo.warn_user)
437
+              this.get_djuser_list = JSON.parse(dataInfo.warn_user)
438
+            }
439
+          }else{
440
+            this.add_limit = false
441
+          }
442
+
438 443
           this.afferent_tag_obj.tag_id_list = JSON.parse(dataInfo.tag_list)
439 444
           this.tag_info = JSON.parse(dataInfo.tag_list)
440 445
 
@@ -442,7 +447,12 @@ export default {
442 447
           msg_list.forEach((item) => {
443 448
             item.content = item.content ? item.content.replace('%NICKNAME%', '「客户昵称」') : '';
444 449
             item.attachments = item.attachments && item.attachments != '' ? JSON.parse(item.attachments) : [];
445
-            item.weeks = item.weeks ? item.weeks.split(',') : []
450
+            if(item.weeks){
451
+              item.weeks = item.weeks.split(',')
452
+            }else{
453
+              item.weeks = []
454
+            }
455
+            // item.weeks = item.weeks ? item.weeks.split(',') : []
446 456
           })
447 457
           let main_msg_data = msg_list.filter((v) => {//特定有一个主欢迎语内容
448 458
             return v.is_day_parting == 0
@@ -475,11 +485,6 @@ export default {
475 485
           type: 'error',
476 486
           message: '请先选择使用客服!'
477 487
         })
478
-      }else if(this.user_id_list&&this.user_id_list.length>=4){
479
-        this.$message({
480
-          type: 'error',
481
-          message: '最多可选3个客服!'
482
-        })
483 488
       }
484 489
     },
485 490
     newCode_click(){//新建活码
@@ -598,6 +603,13 @@ export default {
598 603
             return
599 604
           }
600 605
         }
606
+        if(this.$route.query.type =='copy'){ //复制的时候,清空id
607
+          this.timeIntervalList.forEach(timeItem=>{
608
+            timeItem.id=''
609
+            timeItem.msg_id=''
610
+            timeItem.sq_id=''
611
+          })
612
+        }
601 613
         msg_data = msg_data.concat(this.timeIntervalList)
602 614
       } else {//关闭分段欢迎语
603 615
 
@@ -612,9 +624,25 @@ export default {
612 624
       }
613 625
       msg_data = msg_data.concat(this.deleteTimeIntervalList);//删除的分时段内容
614 626
 
627
+      if(this.$route.query.type =='copy'){//复制的时候,清空id
628
+        this.main_msg_data.id=''
629
+        this.main_msg_data.msg_id=''
630
+        this.main_msg_data.sq_id=''
631
+      }
615 632
       msg_data.push(this.main_msg_data)
616 633
       msg_data.forEach((item) => {
617
-        item.weeks = item.weeks.join(',');
634
+        if(item.weeks&&item.weeks.length>0){
635
+          if(typeof item.weeks == 'string'){
636
+            item.weeks = item.weeks.split(',')
637
+          }
638
+          let now_weeks=''
639
+          item.weeks.forEach(n=>{
640
+            now_weeks += n +','
641
+          })
642
+          item.weeks = now_weeks.slice(0,now_weeks.length-1)
643
+        }else{
644
+          item.weeks = ''
645
+        }
618 646
         item.content = item.content.replace('「客户昵称」', '%NICKNAME%')
619 647
         item.attachments = item.attachments == '' || item.attachments.length == 0 ? '' : JSON.stringify(item.attachments)
620 648
       })
@@ -636,7 +664,8 @@ export default {
636 664
         customer_prefix:this.customerNote_val,
637 665
         customer_prefix_type:this.customer_prefix_type,
638 666
         msg_data: msg_data,
639
-        warn_user:JSON.stringify(warn_user_json)
667
+        warn_user:JSON.stringify(warn_user_json),
668
+        up_toplimit:this.add_limit ? 1 : 0
640 669
       }).then((res) => {
641 670
         var res = res.data
642 671
         this.$loading(this.$loadingConfig).close()

+ 1 - 1
project/src/components/channelCode/publicTable.vue

@@ -47,7 +47,7 @@
47 47
                 <el-popconfirm @confirm="forbiddenCode(scope.row.id)" :disabled="scope.row.status!==1" :title="`禁用【${scope.row.name}】渠道活码后,将无法启用,是否还要继续?`">
48 48
                   <div slot="reference" :class="scope.row.status==1 ? 'c-00B38A pointer' : 'c-999 pointer-drop'">禁用</div>
49 49
                 </el-popconfirm>
50
-                <div class="lMar8" :class="scope.row.status==1 ? 'c-00B38A pointer' : 'c-999 pointer-drop'" @click="editCode(scope.row.id)">编辑</div>
50
+                <div class="lMar8" :class="scope.row.status==1 ? 'c-00B38A pointer' : 'c-999 pointer-drop'" @click="scope.row.status==1&&editCode(scope.row.id)">编辑</div>
51 51
                 <el-popconfirm @confirm="copyCode(scope.row.id)" :title="`确定复制【${scope.row.name}】渠道活码?`">
52 52
                   <div slot="reference" class="c-00B38A pointer lMar8">复制</div>
53 53
                 </el-popconfirm>

+ 6 - 10
project/src/components/customOperate/welcom_message.vue

@@ -52,12 +52,12 @@
52 52
             <p>2、分时段之外的时间将发送欢迎语。</p>
53 53
           </div>
54 54
         </div>
55
-        <div class="regulations regulations2" v-for="(item,index) in timeIntervalList" :key="item.msg_id">
55
+        <div class="regulations regulations2" v-for="(item,index) in timeIntervalList" :key="index + 'shiduan'">
56 56
           <label style="margin-top:30px;text-align:right">时段{{index+1}}:</label>
57 57
           <welcom-edit :deleteFlag='timeIntervalList.length==1?false:true'
58 58
                        :editInfo="item"
59 59
                        @welcomEditCon='(val)=>{getWelcomEdit(val,index)}'
60
-                       @deleteWelcomCon='deleteWelcomCon(item)'></welcom-edit>
60
+                       @deleteWelcomCon='deleteWelcomCon(index)'></welcom-edit>
61 61
         </div>
62 62
         <div class="add_welcom_hint" @click="addWelcom">
63 63
           <i class="el-icon-circle-plus-outline"></i>
@@ -167,17 +167,13 @@ export default {
167 167
     getWelcomEdit (val, index) {//分时段编辑
168 168
       this.$set(this.timeIntervalList, index, val)
169 169
     },
170
-    deleteWelcomCon (itemParams) {//删除分时段
171
-      if (this.$route.params.rule_id && itemParams.msg_id) {//删除的分时段内容
172
-        let obj = JSON.parse(JSON.stringify(itemParams))
170
+    deleteWelcomCon (index) {//删除分时段
171
+      if (this.$route.params.rule_id && this.timeIntervalList[index].msg_id) {//删除的分时段内容
172
+        let obj = JSON.parse(JSON.stringify(this.timeIntervalList[index]))
173 173
         obj.operate = 'del';
174 174
         this.deleteTimeIntervalList.push(obj)
175 175
       }
176
-      this.timeIntervalList.forEach((item,index)=>{
177
-        if(item.msg_id == itemParams.msg_id){
178
-          this.timeIntervalList.splice(index, 1)
179
-        }
180
-      })
176
+      this.timeIntervalList.splice(index, 1)
181 177
     },
182 178
     addWelcom () {//添加分时段
183 179
       this.timeIntervalList.push(this.init_welcom_con)

+ 16 - 0
project/src/components/h5test.vue

@@ -0,0 +1,16 @@
1
+<template>
2
+
3
+</template>
4
+
5
+<script>
6
+export default {
7
+  name: "h5test",
8
+  created(){
9
+    window.location.href = 'weixin://dl/business/?t=9eYl4vhrfXt'
10
+  }
11
+}
12
+</script>
13
+
14
+<style scoped>
15
+
16
+</style>

+ 10 - 1
project/src/router/allRouter.js

@@ -44,7 +44,6 @@ const createChannelCode = () => import(/* webpackChunkName: 'createChannelCode'
44 44
 const codeIndex_radar = () => import(/* webpackChunkName: 'codeIndex_radar' */ '@/components/smartRadar/index.vue')
45 45
 const radar_dataAnalyse = () => import(/* webpackChunkName: 'radar_dataAnalyse' */ '@/components/smartRadar/dataAnalyse.vue')
46 46
 const createRadar = () => import(/* webpackChunkName: 'createRadar' */ '@/components/smartRadar/createRadar.vue')
47
-//
48 47
 
49 48
 // name与菜单配置的页面路由一致
50 49
 // meta下isData:true为数据看板,否则为助手
@@ -65,6 +64,16 @@ export var allRouter = [
65 64
         }
66 65
       },
67 66
       {
67
+        path: 'h5test',
68
+        name: 'h5test',
69
+        component: h5test,
70
+        meta: {
71
+          keepAlive: false,
72
+          isLogin: false,
73
+          title: 'h5test'
74
+        }
75
+      },
76
+      {
68 77
         path: 'homeData',
69 78
         name: 'homeData',
70 79
         component: homeData,

File diff suppressed because it is too large
+ 1 - 1
static/css/app.33c3ee670a51e7a2cf7c2bfd88ee4277.css


File diff suppressed because it is too large
+ 1 - 1
static/js/0.42cc293ba71c56d67164.js


File diff suppressed because it is too large
+ 1 - 0
static/js/13.247e59572685a57d41ed.js


File diff suppressed because it is too large
+ 0 - 1
static/js/13.9a4a4b8d3f7368976214.js


File diff suppressed because it is too large
+ 1 - 1
static/js/18.774a88fa05e847dc6456.js


File diff suppressed because it is too large
+ 1 - 0
static/js/26.3a523b11f44cf2c6d87f.js


File diff suppressed because it is too large
+ 0 - 1
static/js/26.4cda00aecaf422bad7b4.js


+ 1 - 0
static/js/39.b1f8841f9776a6ae5d05.js

@@ -0,0 +1 @@
1
+webpackJsonp([39],{VSoe:function(e,t){},wudK:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var i={name:"h5test",created:function(){window.location.href="weixin://dl/business/?t=9eYl4vhrfXt"}},r={render:function(){var e=this.$createElement;return(this._self._c||e)("div")},staticRenderFns:[]};var o=n("VU/8")(i,r,!1,function(e){n("VSoe")},"data-v-477124de",null);t.default=o.exports}});

File diff suppressed because it is too large
+ 0 - 1
static/js/40.4b2275091f6a65f6adc7.js


File diff suppressed because it is too large
+ 1 - 1
static/js/39.38d4aa45f12c26f09357.js


File diff suppressed because it is too large
+ 1 - 0
static/js/42.f4c9d7805102ef33a2b6.js


File diff suppressed because it is too large
+ 1 - 1
static/js/42.7e739c751d4623a37d96.js


File diff suppressed because it is too large
+ 1 - 1
static/js/43.fb7489bb2cd48f3996e8.js


File diff suppressed because it is too large
+ 3 - 3
static/js/app.f30813c1ab8a13c4f23b.js


File diff suppressed because it is too large
+ 0 - 1
static/js/manifest.617e4c9d5d9fb903dc57.js


File diff suppressed because it is too large
+ 1 - 0
static/js/manifest.9823c046ef254aa1fe26.js