Browse Source

feat: 客服群发 - 客服许可过期提醒样式

zhengxy 1 year ago
parent
commit
5f1c6f4e38

+ 23 - 7
project/src/components/assembly/screen/customerService.vue

@@ -61,10 +61,13 @@
61 61
                     <div class="flex" style="flex:1">
62 62
                       <img class="memberImg" :src="item1.avatar" alt="">
63 63
                       <div class="memberInfo">
64
-                        <div class="name">{{ item1.name }}</div>
64
+                        <div class="name">
65
+                          {{ item1.name }}
66
+                          <span :class="['status-tag', item1.is_active == 0 ? 'disabled' : '']">{{ item1.is_active == 1 ? '已激活' : '未激活' }}</span>
67
+                        </div>
65 68
                         <div class="other">部门:{{ item1.department_list && item1.department_list.join(',') }}</div>
66
-                        <div v-if="item1.active_desc" class="other">
67
-                          <span>状态:{{ item1.active_desc }}</span>
69
+                        <div v-if="item1.active_desc === '即将过期'" class="other">
70
+                          <span>{{ item1.active_desc }}</span>
68 71
                           <span v-if="item1.expire_time">({{ item1.expire_time.slice(0, 10) }})</span>
69 72
                         </div>
70 73
                       </div>
@@ -88,10 +91,13 @@
88 91
               <div class="flex" style="flex:1">
89 92
                 <img class="memberImg" :src="item.avatar" alt="">
90 93
                 <div class="memberInfo">
91
-                  <div class="name">{{ item.name }}</div>
94
+                  <div class="name">
95
+                    {{ item.name }}
96
+                    <span :class="['status-tag', item.is_active == 0 ? 'disabled' : '']">{{ item.is_active == 1 ? '已激活' : '未激活' }}</span>
97
+                  </div>
92 98
                   <div class="other">部门:{{ item.department_list && item.department_list.join(',') }}</div>
93
-                  <div v-if="item.active_desc" class="other">
94
-                    <span>状态:{{ item.active_desc }}</span>
99
+                  <div v-if="item.active_desc === '即将过期'" class="other">
100
+                    <span>{{ item.active_desc }}</span>
95 101
                     <span v-if="item.expire_time">({{ item.expire_time.slice(0, 10) }})</span>
96 102
                   </div>
97 103
                 </div>
@@ -399,7 +405,7 @@ export default {
399 405
 </script>
400 406
 <style lang="scss" scoped>
401 407
 .propoverItem {
402
-  width: 310px;
408
+  width: 330px;
403 409
   flex: 1;
404 410
   height: 100%;
405 411
 
@@ -549,6 +555,16 @@ export default {
549 555
       color: #333333;
550 556
       font-size: 13px;
551 557
       line-height: 18px;
558
+      .status-tag {
559
+        background-color: #00B38A;
560
+        color: #fff;
561
+        border-radius: 4px;
562
+        font-size: 12px;
563
+        padding: 0 1px;
564
+        &.disabled {
565
+          background-color: #B3B2B2;
566
+        }
567
+      }
552 568
     }
553 569
 
554 570
     .other {

+ 24 - 8
project/src/components/assembly/screen/customerServiceCorpV2.vue

@@ -40,10 +40,13 @@
40 40
                     <div class="flex" style="flex:1">
41 41
                       <img class="memberImg" :src="item1.avatar" alt="">
42 42
                       <div class="memberInfo">
43
-                        <div class="name">{{item1.name}}</div>
43
+                        <div class="name">
44
+                          {{item1.name}}
45
+                          <span :class="['status-tag', item1.is_active == 0 ? 'disabled' : '']">{{ item1.is_active == 1 ? '已激活' : '未激活' }}</span>
46
+                        </div>
44 47
                         <div class="other">部门:{{ item1.corp_name }}</div>
45
-                        <div v-if="item1.active_desc" class="other">
46
-                          <span>状态:{{ item1.active_desc }}</span>
48
+                        <div v-if="item1.active_desc === '即将过期'" class="other">
49
+                          <span>{{ item1.active_desc }}</span>
47 50
                           <span v-if="item1.expire_time">({{ item1.expire_time.slice(0, 10) }})</span>
48 51
                         </div>
49 52
                       </div>
@@ -77,10 +80,13 @@
77 80
                 <div class="flex" style="flex:1">
78 81
                   <img class="memberImg" :src="item.avatar" alt="">
79 82
                   <div class="memberInfo">
80
-                    <div class="name">{{item.user_name}}</div>
83
+                    <div class="name">
84
+                      {{item.user_name}}
85
+                      <span :class="['status-tag', item.is_active == 0 ? 'disabled' : '']">{{ item.is_active == 1 ? '已激活' : '未激活' }}</span>
86
+                    </div>
81 87
                     <div class="other">部门:{{item.corp_name}}</div>
82
-                    <div v-if="item.active_desc" class="other">
83
-                      <span>状态:{{ item.active_desc }}</span>
88
+                    <div v-if="item.active_desc === '即将过期'" class="other">
89
+                      <span>{{ item.active_desc }}</span>
84 90
                       <span v-if="item.expire_time">({{ item.expire_time.slice(0, 10) }})</span>
85 91
                     </div>
86 92
                   </div>
@@ -167,7 +173,6 @@ export default {
167 173
       let res = []
168 174
       if (this.selectUser && this.selectUser.length) {
169 175
         this.selectUser.forEach(currentUser => {
170
-          console.log('currentUser => ', currentUser)
171 176
           const userInfo = {
172 177
             user_id: currentUser.user_id,
173 178
             user_name: currentUser.name,
@@ -176,6 +181,7 @@ export default {
176 181
             corpid: currentUser.corpid,
177 182
             active_desc: currentUser.active_desc,
178 183
             expire_time: currentUser.expire_time,
184
+            is_active: currentUser.is_active,
179 185
           }
180 186
           if (res && !res.length) { // 构造第一条数据 => 插入res中
181 187
             res.push({
@@ -448,7 +454,7 @@ export default {
448 454
 </script>
449 455
 <style lang="scss" scoped>
450 456
 .propoverItem {
451
-  width: 310px;
457
+  width: 330px;
452 458
   flex: 1;
453 459
   height: 100%;
454 460
   .allMember {
@@ -576,6 +582,16 @@ export default {
576 582
       color: #333333;
577 583
       font-size: 13px;
578 584
       line-height: 18px;
585
+      .status-tag {
586
+        background-color: #00B38A;
587
+        color: #fff;
588
+        border-radius: 4px;
589
+        font-size: 12px;
590
+        padding: 0 1px;
591
+        &.disabled {
592
+          background-color: #B3B2B2;
593
+        }
594
+      }
579 595
     }
580 596
     .other {
581 597
       color: #898d92;