Home Explore Help
Register Sign In
xiuli.gao
/
playlet
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Commits 1777 Releases 0 Wiki
Browse Source

Merge branch 'master' into develop

zhengxy 2 years ago
parent
8c0b7645b3 b2372764a8
commit
3b3a6c93fc
16 changed files with 24 additions and 22 deletions
Unified View Show Diff Stats
  1. 1 1
      index.html
  2. 2 0
      project/src/components/assembly/editCon.vue
  3. 2 2
      project/src/components/channelCode/createChannelCode.vue
  4. 2 2
      project/src/components/customOperate/welcom_message.vue
  5. 1 1
      static/css/app.05c771e1e9176120f86d146bb8967b3c.css
  6. 9 0
      static/js/0.3fc836776c570e1af50a.js
  7. 0 9
      static/js/0.bc09d11b5c9d2da9ffe7.js
  8. 0 1
      static/js/12.527ec3dafe98cf96f4b8.js
  9. 1 0
      static/js/12.f5b3b30bb8efd6b90976.js
  10. 1 0
      static/js/50.ff14f56a122c9bf2d42a.js
  11. 1 1
      static/js/50.3a770043ac709e97129c.js
  12. 1 1
      static/js/51.62fced3b8597644657e7.js
  13. 0 1
      static/js/52.b6b2bb1ec0ca0d278234.js
  14. 2 2
      static/js/app.70cdd8e5d35d719e6abe.js
  15. 1 0
      static/js/manifest.144545c3b26aa17d60e2.js
  16. 0 1
      static/js/manifest.7d3deaf51e9ac72a4bda.js

+ 1 - 1
index.html
View File

7 
         hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
 7 
         hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
8 
         var s = document.getElementsByTagName("script")[0];
 8 
         var s = document.getElementsByTagName("script")[0];
9 
         s.parentNode.insertBefore(hm, s);
 9 
         s.parentNode.insertBefore(hm, s);
10 
-      })();</script><link href=./static/css/app.05c771e1e9176120f86d146bb8967b3c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.7d3deaf51e9ac72a4bda.js></script><script type=text/javascript src=./static/js/app.70cdd8e5d35d719e6abe.js></script></body></html>
10 
+      })();</script><link href=./static/css/app.2f5698bccccc24eb5565eb6a01c0f788.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.144545c3b26aa17d60e2.js></script><script type=text/javascript src=./static/js/app.0373fb95379246d8f881.js></script></body></html>

+ 2 - 0
project/src/components/assembly/editCon.vue
View File

380 
       } else {
 380 
       } else {
381 
         this.content += myValue
 381 
         this.content += myValue
382 
       }
 382 
       }
383 
+      // 子组件更新后 => 触发父组件更新content内容
384 
+      this.$emit('editContent', this.content)
383 
     },
 385 
     },
384 
     radarDefine (val) { //雷达确定
 386 
     radarDefine (val) { //雷达确定
385 
       let now_rew = this.attachments
 387 
       let now_rew = this.attachments

+ 2 - 2
project/src/components/channelCode/createChannelCode.vue
View File

445
445
446 
           let msg_list = dataInfo.welcomeMsg;
 446 
           let msg_list = dataInfo.welcomeMsg;
447 
           msg_list.forEach((item) => {
 447 
           msg_list.forEach((item) => {
448 
-            item.content = item.content ? item.content.replace('%NICKNAME%', '「客户昵称」') : '';
448 
+            item.content = item.content ? item.content.replaceAll('%NICKNAME%', '「客户昵称」') : '';
449 
             item.attachments = item.attachments && item.attachments != '' ? JSON.parse(item.attachments) : [];
 449 
             item.attachments = item.attachments && item.attachments != '' ? JSON.parse(item.attachments) : [];
450 
             if(item.weeks){
 450 
             if(item.weeks){
451 
               item.weeks = item.weeks.split(',')
 451 
               item.weeks = item.weeks.split(',')
643 
         }else{
 643 
         }else{
644 
           item.weeks = ''
 644 
           item.weeks = ''
645 
         }
 645 
         }
646 
-        item.content = item.content.replace('「客户昵称」', '%NICKNAME%')
646 
+        item.content = item.content.replaceAll('「客户昵称」', '%NICKNAME%')
647 
         item.attachments = item.attachments == '' || item.attachments&&item.attachments.length == 0 ? '' : JSON.stringify(item.attachments)
 647 
         item.attachments = item.attachments == '' || item.attachments&&item.attachments.length == 0 ? '' : JSON.stringify(item.attachments)
648 
       })
 648 
       })
649 
       this.$loading(this.$loadingConfig)
 649 
       this.$loading(this.$loadingConfig)

+ 2 - 2
project/src/components/customOperate/welcom_message.vue
View File

136 
           this.name = res.rst.name;
 136 
           this.name = res.rst.name;
137 
           let msg_list = res.rst.msg_list;
 137 
           let msg_list = res.rst.msg_list;
138 
           msg_list.forEach((item) => {
 138 
           msg_list.forEach((item) => {
139 
-            item.content = item.content ? item.content.replace('%NICKNAME%', '「客户昵称」') : '';
139 
+            item.content = item.content ? item.content.replaceAll('%NICKNAME%', '「客户昵称」') : '';
140 
             item.attachments = item.attachments && item.attachments != '' ? JSON.parse(item.attachments) : [];
 140 
             item.attachments = item.attachments && item.attachments != '' ? JSON.parse(item.attachments) : [];
141 
             if(item.weeks){
 141 
             if(item.weeks){
142 
               item.weeks = item.weeks.split(',')
 142 
               item.weeks = item.weeks.split(',')
295 
           item.weeks = ''
 295 
           item.weeks = ''
296 
         }
 296 
         }
297 
         // item.weeks = item.weeks.join(',');
 297 
         // item.weeks = item.weeks.join(',');
298 
-        item.content = item.content.replace('「客户昵称」', '%NICKNAME%')
298 
+        item.content = item.content.replaceAll('「客户昵称」', '%NICKNAME%')
299 
         item.attachments = item.attachments == '' || item.attachments&&item.attachments.length == 0 ? '' : JSON.stringify(item.attachments)
 299 
         item.attachments = item.attachments == '' || item.attachments&&item.attachments.length == 0 ? '' : JSON.stringify(item.attachments)
300 
       })
 300 
       })
301
301

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


File diff suppressed because it is too large
+ 9 - 0
static/js/0.3fc836776c570e1af50a.js


File diff suppressed because it is too large
+ 0 - 9
static/js/0.bc09d11b5c9d2da9ffe7.js


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


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


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


File diff suppressed because it is too large
+ 1 - 1
static/js/50.3a770043ac709e97129c.js


File diff suppressed because it is too large
+ 1 - 1
static/js/51.62fced3b8597644657e7.js


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


File diff suppressed because it is too large
+ 2 - 2
static/js/app.70cdd8e5d35d719e6abe.js


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


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