Home Verkennen Help
Registreren Inloggen
xiuli.gao
/
playlet
Volgen 1
Ster 0
Vork 0
Code Kwesties 0 Pull-aanvragen 0 Commits 1777 Publicaties 0 Wiki
Bladeren bron

;

xiuli.gao 2 jaren geleden
bovenliggende
0b13b249a1
commit
b189587ebe
28 gewijzigde bestanden met toevoegingen van 93 en 42 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 1 1
      index.html
  2. 2 2
      project/config/index.js
  3. BIN
      project/src/assets/img/dkfyysmsq.png
  4. 48 0
      project/src/components/Index/header.vue
  5. 13 12
      project/src/components/assembly/screen/customerService.vue
  6. 8 6
      project/src/components/assembly/screen/serviceSingle.vue
  7. 2 2
      project/src/components/customManage/lostCustomer.vue
  8. 4 4
      project/src/components/manage/memberManage.vue
  9. 1 0
      static/css/app.8534185c1f39d15e623ae44d6d3592b6.css
  10. 0 1
      static/css/app.e0724c9ebd6ebf6e8c24ec58d9199ee5.css
  11. 0 1
      static/js/0.110b8414ab9f439701fd.js
  12. 1 0
      static/js/0.7d686632206aff3dc0f4.js
  13. 1 0
      static/js/11.87914a1733b908314783.js
  14. 0 1
      static/js/11.b25d3d8d7cdbbf4fb525.js
  15. 1 0
      static/js/13.588b7035bbaccd5d00d0.js
  16. 0 1
      static/js/13.cf77eb4d989d4d18d3fd.js
  17. 0 1
      static/js/16.633af90e93e0fc39cace.js
  18. 1 1
      static/js/17.d55887ee2e57ab8881c7.js
  19. 1 1
      static/js/18.d8c52b4e28e7d9ac2eec.js
  20. 1 0
      static/js/18.678ee0e72988b4f75099.js
  21. 1 0
      static/js/3.31b645dfdde78b867aea.js
  22. 0 1
      static/js/3.b3342b06dba5a9f6c14e.js
  23. 3 3
      static/js/8.c14f3a22625d68ee04d8.js
  24. 1 1
      static/js/6.eefbb8a8f391c2c7a808.js
  25. 1 1
      static/js/7.7dbcdf7e135416a77fd6.js
  26. 1 1
      static/js/app.ef848addbe5d12d63805.js
  27. 1 0
      static/js/manifest.4237f00725894b8a05ee.js
  28. 0 1
      static/js/manifest.7cd997b062d5a2b203bf.js

+ 1 - 1
index.html
Bestand weergeven 

@@ -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.e0724c9ebd6ebf6e8c24ec58d9199ee5.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.7cd997b062d5a2b203bf.js></script><script type=text/javascript src=./static/js/app.ef848addbe5d12d63805.js></script></body></html>
10 
+      })();</script><link href=./static/css/app.8534185c1f39d15e623ae44d6d3592b6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.4237f00725894b8a05ee.js></script><script type=text/javascript src=./static/js/app.6656be05e39b5543d90d.js></script></body></html>

+ 2 - 2
project/config/index.js
Bestand weergeven 

@@ -19,10 +19,10 @@ module.exports = {
19 19 
         }
20 20 
       },
21 21 
       '/ceshi/': {
22 
-        target: 'http://dj.wenxingshuju.com',
22 
+        target: 'http://duanju.wenxingshuju.com',
23 23 
         changeOrigin: true, //改变源
24 24 
         pathRewrite: {
25 
-          '^/ceshi': 'http://dj.wenxingshuju.com'
25 
+          '^/ceshi': 'http://duanju.wenxingshuju.com'
26 26 
         }
27 27 
       },
28 28 
       '/zy/': {

BIN
project/src/assets/img/dkfyysmsq.png
Bestand weergeven


+ 48 - 0
project/src/components/Index/header.vue
Bestand weergeven 

@@ -20,6 +20,17 @@
20 20 
       </div>
21 21 
     </div>
22 22 
     <div class="right">
23 
+      <el-popover placement="bottom" trigger="hover">
24 
+        <div class="smallFun" slot="reference">
25 
+          <img src="@/assets/img/dkfyysmsq.png" alt="" class="funImg">
26 
+          代开发应用扫码授权
27 
+        </div>
28 
+        <div class="codeScanningAuthorization">
29 
+          <img class="codeImg" src="@/assets/img/dkfyysmsq.png" alt="">
30 
+          <div class="codeHint">用于获取员工和客户的昵称、头像、性别等信息</div>
31 
+          <div class="codeHint">扫码成功后联系<a href="https://open.work.weixin.qq.com/wwopen/userQRCode?vcode=vca215566e85b0ac81" target="_brank"><i class="el-icon-thumb"></i> 客服人员</a></div>
32 
+        </div>
33 
+      </el-popover>
23 34 
       <div class="rightLogin" v-if="$cookie.getCookie('isLogin')">
24 35 
         <img src="@/assets/img/userDefault.png" />
25 36 
         <span class="userName">{{$cookie.getCookie('username')?$cookie.getCookie('username'):''}}</span>
 
@@ -345,6 +356,43 @@ export default {
345 356 
         }
346 357 
       }
347 358 
     }
359 
+    .smallFun {
360 
+      color: #fff;
361 
+      font-size: 14px;
362 
+      cursor: pointer;
363 
+      padding: 8px 21px;
364 
+      background: rgba(255, 255, 255, 0.2);
365 
+      border-radius: 18px;
366 
+      .funImg {
367 
+        display: inline-block;
368 
+        width: 18px;
369 
+        margin-right: 3px;
370 
+        border-radius: 2px;
371 
+      }
372 
+    }
373 
+  }
374 
+}
375 
+.codeScanningAuthorization {
376 
+  text-align: center;
377 
+  padding: 20px;
378 
+  .codeImg {
379 
+    width: 160px;
380 
+    margin: auto;
381 
+    margin-bottom: 15px;
382 
+  }
383 
+  .codeHint {
384 
+    font-size: 14px;
385 
+    color: #555;
386 
+    line-height: 20px;
387 
+    margin-top: 3px;
388 
+    a {
389 
+      color: #00b38a;
390 
+      font-weight: bold;
391 
+      margin-left: 2px;
392 
+      i {
393 
+        transform: rotate(90deg);
394 
+      }
395 
+    }
348 396 
   }
349 397 
 }
350 398 
 </style>

+ 13 - 12
project/src/components/assembly/screen/customerService.vue
Bestand weergeven 

@@ -20,24 +20,24 @@
20 20 
         <div class="propoverItem">
21 21 
           <!-- <self-input :hasLabel="false" width="270px" style="margin-top:0"></self-input> -->
22 22 
           <div class="allMember">全部成员({{userTotal}}):</div>
23 
-          <div class="memberBoxBig">
23 
+          <div class="memberBoxBig self-scrollbar-3">
24 24 
             <template v-for="(item,index) in userList">
25 
-              <div class="memberBox self-scrollbar-3" :key="index + 'userList' + item.department_id">
25 
+              <div class="memberBox" :key="index + 'userList' + item.department_id">
26 26 
                 <i :class="['el-icon-caret-bottom',item.is_open?'reversalAnimation':'']" @click="openEvent(index)"></i>
27 27 
                 <div class="meberList">
28 28 
                   <div class="department" @click="selectUserEvent('all',index)">
29 
-                    <div class="flex">
30 
-                      <i class="el-icon-s-cooperation"></i>
29 
+                    <div class="flex" style="align-items: flex-start;">
30 
+                      <i class="el-icon-s-cooperation" style="margin-top:3px"></i>
31 31 
                       <span>{{item.department_name?item.department_name:'部门'+(index+1)}}</span>
32 32 
                     </div>
33 33 
                     <div :class="['checkbox',item.is_select?'checkbox_active':'']"><i class="el-icon-check"></i></div>
34 34 
                   </div>
35 35 
                   <div class="memberItem" :style="item.is_open?'display:none':''" v-for="(item1,user_index) in item.user_list" :key="item1.user_id" @click="selectUserEvent('user',index,user_index)">
36 
-                    <div class="flex">
36 
+                    <div class="flex" style="flex:1">
37 37 
                       <img class="memberImg" :src="item1.avatar" alt="">
38 38 
                       <div class="memberInfo">
39 39 
                         <div class="name">{{item1.name}}</div>
40 
-                        <div class="other">部门：{{item1.department}}</div>
40 
+                        <div class="other">部门：{{item1.department_list&&item1.department_list.join(',')}}</div>
41 41 
                       </div>
42 42 
                     </div>
43 43 
                     <div :class="['checkbox',item1.is_select?'checkbox_active':'']"><i class="el-icon-check"></i></div>
 
@@ -56,14 +56,14 @@
56 56 
           </div>
57 57 
           <div class="member_result self-scrollbar-3">
58 58 
             <div class="memberItem" v-for="(item,index) in selectUser" :key="index">
59 
-              <div class="flex">
59 
+              <div class="flex" style="flex:1">
60 60 
                 <img class="memberImg" :src="item.avatar" alt="">
61 61 
                 <div class="memberInfo">
62 62 
                   <div class="name">{{item.name}}</div>
63 
-                  <div class="other">部门：{{item.department}}</div>
63 
+                  <div class="other">部门：{{item.department_list&&item.department_list.join(',')}}</div>
64 64 
                 </div>
65 65 
               </div>
66 
-              <i class="el-icon-close" @click="closeUser(index)"></i>
66 
+              <i class="el-icon-close" style="margin-left:10px" @click="closeUser(index)"></i>
67 67 
             </div>
68 68 
           </div>
69 69 
           <div class="buttons">
 
@@ -316,7 +316,7 @@ export default {
316 316 
   .member_result {
317 317 
     height: 380px;
318 318 
     overflow-y: auto;
319 
-    padding-right: 25px;
319 
+    padding-right: 15px;
320 320 
   }
321 321 
 }
322 322 
 .line {
 
@@ -346,7 +346,7 @@ export default {
346 346 
   }
347 347 
   .meberList {
348 348 
     flex: 1;
349 
-    margin-right: 29px;
349 
+    margin-right: 15px;
350 350 
     .department {
351 351 
       i {
352 352 
         color: #46a7ff;
 
@@ -369,6 +369,7 @@ export default {
369 369 
       align-items: center;
370 370 
       justify-content: center;
371 371 
       font-size: 12px;
372 
+      margin-left: 10px;
372 373 
       i {
373 374 
         color: transparent;
374 375 
       }
 
@@ -405,7 +406,7 @@ export default {
405 406 
     }
406 407 
     .other {
407 408 
       color: #898d92;
408 
-      font-size: 13px;
409 
+      font-size: 12px;
409 410 
       line-height: 18px;
410 411 
     }
411 412 
   }

+ 8 - 6
project/src/components/assembly/screen/serviceSingle.vue
Bestand weergeven 

@@ -20,9 +20,9 @@
20 20 
         <div class="propoverItem">
21 21 
           <!-- <self-input :hasLabel="false" width="270px" style="margin-top:0"></self-input> -->
22 22 
           <div class="allMember">全部成员({{userTotal}}):</div>
23 
-          <div class="memberBoxBig">
23 
+          <div class="memberBoxBig self-scrollbar-3">
24 24 
             <template v-for="(item,index) in userList">
25 
-              <div class="memberBox self-scrollbar-3" :key="index + 'userList' + item.department_id">
25 
+              <div class="memberBox" :key="index + 'userList' + item.department_id">
26 26 
                 <i :class="['el-icon-caret-bottom',item.is_open?'reversalAnimation':'']" @click="openEvent(index)"></i>
27 27 
                 <div class="meberList">
28 28 
                   <div class="department">
 
@@ -32,11 +32,11 @@
32 32 
                     </div>
33 33 
                   </div>
34 34 
                   <div class="memberItem" :style="item.is_open?'display:none':''" v-for="(item1) in item.user_list" :key="item1.user_id" @click="selectUserEvent('user',item1.user_id)">
35 
-                    <div class="flex">
35 
+                    <div class="flex" style="flex:1">
36 36 
                       <img class="memberImg" :src="item1.avatar" alt="">
37 37 
                       <div class="memberInfo">
38 38 
                         <div class="name">{{item1.name}}</div>
39 
-                        <div class="other">部门：{{item1.department}}</div>
39 
+                        <div class="other">部门：{{item1.department_list&&item1.department_list.join(',')}}</div>
40 40 
                       </div>
41 41 
                     </div>
42 42 
                     <div :class="['checkbox',selectUserId==item1.user_id?'checkbox_active':'']"><i class="el-icon-check"></i></div>
 
@@ -207,7 +207,7 @@ export default {
207 207 
   .member_result {
208 208 
     height: 380px;
209 209 
     overflow-y: auto;
210 
-    padding-right: 25px;
210 
+    padding-right: 15px;
211 211 
   }
212 212 
 }
213 213 
 .line {
 
@@ -260,6 +260,7 @@ export default {
260 260 
       align-items: center;
261 261 
       justify-content: center;
262 262 
       font-size: 12px;
263 
+      margin-left: 10px;
263 264 
       i {
264 265 
         color: transparent;
265 266 
       }
 
@@ -289,6 +290,7 @@ export default {
289 290 
   }
290 291 
   .memberInfo {
291 292 
     margin-left: 7px;
293 
+    flex: 1;
292 294 
     .name {
293 295 
       color: #333333;
294 296 
       font-size: 13px;
 
@@ -296,7 +298,7 @@ export default {
296 298 
     }
297 299 
     .other {
298 300 
       color: #898d92;
299 
-      font-size: 13px;
301 
+      font-size: 12px;
300 302 
       line-height: 18px;
301 303 
     }
302 304 
   }

+ 2 - 2
project/src/components/customManage/lostCustomer.vue
Bestand weergeven 

@@ -69,9 +69,9 @@
69 69 
           </div>
70 70 
         </template>
71 71 
       </el-table-column>
72 
-      <el-table-column label="客服所属部门" width="130" show-overflow-tooltip align="center">
72 
+      <el-table-column label="所属部门" width="130" show-overflow-tooltip align="center">
73 73 
         <template slot-scope="scope">
74 
-          <span>{{scope.row.user_list.department}}</span>
74 
+          <div>{{scope.row.department_list&&scope.row.department_list.join(',')}}</div>
75 75 
         </template>
76 76 
       </el-table-column>
77 77 
       <el-table-column min-width="160" label="标签" align="center">

+ 4 - 4
project/src/components/manage/memberManage.vue
Bestand weergeven 

@@ -17,10 +17,10 @@
17 17 
           部门信息
18 18 
         </div>
19 19 
         <div>
20 
-          <div v-for="c in depart_List" :key="c.department_id" class="tMar20 flex-align-center pointer" @click="checkDepartId(c.department_id)">
20 
+          <div v-for="c in depart_List" :key="c.department_id" class="tMar20 flex-align-center pointer f15" @click="checkDepartId(c.department_id)">
21 21 
             <i class="el-icon-success c-00B38A f16 rMar7" v-if="checkVals.indexOf(c.department_id)>-1"></i>
22 22 
             <i class="el-icon-circle rMar7" v-else></i>
23 
-            {{c.department_id}}
23 
+            {{c.department_name}}
24 24 
           </div>
25 25 
         </div>
26 26 
       </div>
 
@@ -30,7 +30,7 @@
30 30 
             <template slot-scope="scope">
31 31 
               <div class="flex-align-center">
32 32 
                 <div>
33 
-                  <img :src="scope.row.avatar" alt="" style="width: 40px;margin-right: 10px">
33 
+                  <img :src="scope.row.avatar" alt="" style="width: 40px;margin-right: 10px;border-radius:3px">
34 34 
                 </div>
35 35 
                 <div>
36 36 
                   <div>{{scope.row.name}}</div>
 
@@ -42,7 +42,7 @@
42 42 
           <el-table-column label="所属部门" align="center">
43 43 
             <template slot-scope="scope">
44 44 
               <div>
45 
-                <span v-for="d in scope.row.department" class="rMar7">{{d}}</span>
45 
+                <span class="rMar7">{{scope.row.department_list&&scope.row.department_list.join('，')}}</span>
46 46 
               </div>
47 47 
             </template>
48 48 
           </el-table-column>

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


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


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


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


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


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


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


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


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


File diff suppressed because it is too large
+ 1 - 1
static/js/17.d55887ee2e57ab8881c7.js


File diff suppressed because it is too large
+ 1 - 1
static/js/18.d8c52b4e28e7d9ac2eec.js


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


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


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


File diff suppressed because it is too large
+ 3 - 3
static/js/8.c14f3a22625d68ee04d8.js


File diff suppressed because it is too large
+ 1 - 1
static/js/6.eefbb8a8f391c2c7a808.js


File diff suppressed because it is too large
+ 1 - 1
static/js/7.7dbcdf7e135416a77fd6.js


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


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


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