瀏覽代碼

Merge branch 'master' into feature/0310

zhengxy 2 年之前
父節點
當前提交
5c75f750ee

+ 1 - 1
index.html

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.4e67fc8a34beea6a46e2061056b9eb5f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.d93507874433ba9ca89c.js></script><script type=text/javascript src=./static/js/app.7f7877f618b05f492eb2.js></script></body></html>
10
+      })();</script><link href=./static/css/app.fd199a494cd05756b02aa60e8a1ae914.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.9b3d3bb90f9e41174107.js></script><script type=text/javascript src=./static/js/app.7f7877f618b05f492eb2.js></script></body></html>

+ 1 - 1
project/src/components/assembly/screen/serviceSingle.vue

34
                   <div
34
                   <div
35
                     v-for="(item1) in item.user_list"
35
                     v-for="(item1) in item.user_list"
36
                     :key="item1.user_id"
36
                     :key="item1.user_id"
37
-                    :class="['memberItem', item1.is_active == 1 ? 'disabled' : '']"
37
+                    :class="['memberItem', source === 'memberTransfer' && item1.is_active == 1 ? 'disabled' : '']"
38
                     :style="item.is_open?'display:none':''"
38
                     :style="item.is_open?'display:none':''"
39
                     @click="selectUserEvent('user',item1.user_id,item1)"
39
                     @click="selectUserEvent('user',item1.user_id,item1)"
40
                   >
40
                   >

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


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


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


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