Etusivu Tutki Apua
Rekisteröidy Kirjaudu sisään
xiuli.gao
/
playlet
Tarkkaile 1
Äänestä 0
Fork 0
Koodi Ongelmat 0 Pull-pyynnöt 0 Commitit 1777 Julkaisut 0 Wiki
Selaa lähdekoodia

Merge branch 'master' into feature/231008

zhengxy 1 vuosi sitten
vanhempi
795cdaafa9 dfe62939b2
commit
5bb159619e
23 muutettua tiedostoa jossa 19 lisäystä ja 19 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 1 1
      index.html
  2. 1 1
      project/src/components/customOperate/massMsgDetail/userDetail.vue
  3. 1 1
      project/src/components/customerWarn/list.vue
  4. 1 1
      project/src/components/smartPush/massMsgDetail/userDetail.vue
  5. 1 1
      project/src/components/smartPushV2/massMsgDetail/userDetail.vue
  6. 1 1
      project/src/components/smartPushV3/massMsgDetail/userDetail.vue
  7. 1 1
      static/css/app.fe712f5f260cfc5bca7425d98c8d8b8c.css
  8. 0 1
      static/js/30.1f02ff647aa651d5985b.js
  9. 1 1
      static/js/31.df2602ccafa2cd2aeee0.js
  10. 1 0
      static/js/31.d7ef3395080190edd6ea.js
  11. 1 1
      static/js/44.d5ee6a6315c02dc385dc.js
  12. 0 1
      static/js/43.db949bce672bcfd5374c.js
  13. 1 1
      static/js/45.f886aef5db3fbc370b81.js
  14. 1 1
      static/js/46.01c358656a044f0432d3.js
  15. 1 0
      static/js/46.6a579a964304568f5cb6.js
  16. 1 1
      static/js/48.daf78ecbd075ee6c9eb7.js
  17. 0 1
      static/js/47.f4a1517ec181bbe9a1bc.js
  18. 1 0
      static/js/48.50f3a606dd2a13c54439.js
  19. 0 1
      static/js/49.352e835545d4310f5224.js
  20. 1 0
      static/js/49.8df486c6524bc12c8376.js
  21. 1 1
      static/js/61.db2af6014aaef9bdf827.js
  22. 1 1
      static/js/app.ca77b10ace885a1d9039.js
  23. 1 1
      static/js/manifest.7a9ec958d6dc885c2a6a.js

+ 1 - 1
index.html
Näytä tiedosto 

@@ -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.fe712f5f260cfc5bca7425d98c8d8b8c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.7a9ec958d6dc885c2a6a.js></script><script type=text/javascript src=./static/js/app.ca77b10ace885a1d9039.js></script></body></html>
10 
+      })();</script><link href=./static/css/app.4f2092fe90ad38671ac5c4c15ef4be03.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.4c5fde28a545c53f6872.js></script><script type=text/javascript src=./static/js/app.c1258480915d00f9564e.js></script></body></html>

+ 1 - 1
project/src/components/customOperate/massMsgDetail/userDetail.vue
Näytä tiedosto 

@@ -13,7 +13,7 @@
13 13 
         <self-input label_name='成员昵称' :hasLabel='false' @inputChange='(val)=>{input_keyword = val;sender_list_change()}'></self-input>
14 14 
       </div>
15 15 
       <div class="userListBox self-scrollbar-3 senderSccrollBox">
16 
-        <div class="userItem" v-for="(item) in senderList" :key="item.user_id+'sender'">
16 
+        <div class="userItem" v-for="(item,idx) in senderList" :key="item.corpid+item.user_id+'sender'+idx">
17 17 
           <div class="time">群发时间：{{item.send_time?item.send_time:'-'}}</div>
18 18 
           <div class="userBox">
19 19 
             <img :src="item.avatar" alt="" class="userImg">

+ 1 - 1
project/src/components/customerWarn/list.vue
Näytä tiedosto 

@@ -124,7 +124,7 @@ export default {
124 124
125 125 
     onClickEditBtn({ threshold, corp_list }) {
126 126 
       this.currentThreshold.threshold = threshold
127 
-      this.currentThreshold.corp_list = corp_list
127 
+      this.currentThreshold.corp_list = [...corp_list]
128 128 
       this.thresholdDrawerVisible = true
129 129 
     },
130 130 
     onConfirmThreshold() {

+ 1 - 1
project/src/components/smartPush/massMsgDetail/userDetail.vue
Näytä tiedosto 

@@ -13,7 +13,7 @@
13 13 
         <self-input label_name='成员昵称' :hasLabel='false' @inputChange='(val)=>{input_keyword = val;sender_list_change()}'></self-input>
14 14 
       </div>
15 15 
       <div class="userListBox self-scrollbar-3 senderSccrollBox">
16 
-        <div class="userItem" v-for="(item) in senderList" :key="item.user_id+'sender'">
16 
+        <div class="userItem" v-for="(item,idx) in senderList" :key="item.user_id+'sender'+idx">
17 17 
           <div class="time">群发时间：{{item.send_time?item.send_time:'-'}}</div>
18 18 
           <div class="userBox">
19 19 
             <img :src="item.avatar" alt="" class="userImg">

+ 1 - 1
project/src/components/smartPushV2/massMsgDetail/userDetail.vue
Näytä tiedosto 

@@ -13,7 +13,7 @@
13 13 
         <self-input label_name='成员昵称' :hasLabel='false' @inputChange='(val)=>{input_keyword = val;sender_list_change()}'></self-input>
14 14 
       </div>
15 15 
       <div class="userListBox self-scrollbar-3 senderSccrollBox">
16 
-        <div class="userItem" v-for="(item) in senderList" :key="item.user_id+'sender'">
16 
+        <div class="userItem" v-for="(item,idx) in senderList" :key="item.user_id+'sender'+idx">
17 17 
           <div class="time">群发时间：{{item.send_time?item.send_time:'-'}}</div>
18 18 
           <div class="userBox">
19 19 
             <img :src="item.avatar" alt="" class="userImg">

+ 1 - 1
project/src/components/smartPushV3/massMsgDetail/userDetail.vue
Näytä tiedosto 

@@ -13,7 +13,7 @@
13 13 
         <self-input label_name='成员昵称' :hasLabel='false' @inputChange='(val)=>{input_keyword = val;sender_list_change()}'></self-input>
14 14 
       </div>
15 15 
       <div class="userListBox self-scrollbar-3 senderSccrollBox">
16 
-        <div class="userItem" v-for="(item) in senderList" :key="item.user_id+'sender'">
16 
+        <div class="userItem" v-for="(item,idx) in senderList" :key="item.user_id+'sender'+idx">
17 17 
           <div class="time">群发时间：{{item.send_time?item.send_time:'-'}}</div>
18 18 
           <div class="userBox">
19 19 
             <img :src="item.avatar" alt="" class="userImg">

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


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


File diff suppressed because it is too large
+ 1 - 1
static/js/31.df2602ccafa2cd2aeee0.js


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


File diff suppressed because it is too large
+ 1 - 1
static/js/44.d5ee6a6315c02dc385dc.js


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


File diff suppressed because it is too large
+ 1 - 1
static/js/45.f886aef5db3fbc370b81.js


File diff suppressed because it is too large
+ 1 - 1
static/js/46.01c358656a044f0432d3.js


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


File diff suppressed because it is too large
+ 1 - 1
static/js/48.daf78ecbd075ee6c9eb7.js


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


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


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


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


File diff suppressed because it is too large
+ 1 - 1
static/js/61.db2af6014aaef9bdf827.js


File diff suppressed because it is too large
+ 1 - 1
static/js/app.ca77b10ace885a1d9039.js


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