Merge branch 'test' of https://gitee.com/zwyjjc/tl_estate into test

6ba55b47 · zw · 793c1803 · 9e1f1a6b · 6ba55b47 · 6ba55b47
Commit 6ba55b47 authored Dec 20, 2018 by zw
5 changed files
--- a/public/app/dist/index.html
+++ b/public/app/dist/index.html
@@ -23,4 +23,4 @@
 				if(!doc.addEventListener) return;
 				win.addEventListener(resizeEvt, recalc, false);
 				doc.addEventListener('DOMContentLoaded', recalc, false);
-			})(document, window);</script><link href=./static/css/app.3f6b1b9db4ea70d044232fdcc1b59e01.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.74698e64579a16bcf167.js></script><script type=text/javascript src=./static/js/app.57e8463a995274bef52b.js></script></body></html>
\ No newline at end of file
+			})(document, window);</script><link href=./static/css/app.891cded50eeb78df458a3072c9285360.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.74698e64579a16bcf167.js></script><script type=text/javascript src=./static/js/app.6986b1a45df68c0be473.js></script></body></html>
\ No newline at end of file
--- a/public/app/dist/static/css/app.3f6b1b9db4ea70d044232fdcc1b59e01.css
+++ b/public/app/dist/static/css/app.3f6b1b9db4ea70d044232fdcc1b59e01.css
--- a/public/app/dist/static/js/app.57e8463a995274bef52b.js
+++ b/public/app/dist/static/js/app.57e8463a995274bef52b.js
--- a/public/appnew/src/components/download/download.vue
+++ b/public/appnew/src/components/download/download.vue
@@ -25,7 +25,7 @@
 					url: '/api/getVersionNo',
 					responseType: 'json',
 					data: {
-						'type': 1
+						'type': 0
 					}
 				})
 				.then(function(response) {

--- a/public/resource/template/notice_template_tpl.html
+++ b/public/resource/template/notice_template_tpl.html
@@ -8,13 +8,16 @@
            [% } %]
        </td>
        <td>
-        	[% if(it[item]["auth_group_id"] == 2) { %]
-        		 人事+行政
-        	[% }else if((it[item]["auth_group_id"] == 22) || (it[item]["auth_group_id"] == 23) || (it[item]["auth_group_id"] == 25) || (it[item]["auth_group_id"] == 26)) { %]
-        		 财务
-        	[% }else{%]
-        		其它
-        	[%} %]
+        	[% if(it[item]["from_type"] == 1) { %]
+        		 人事
+        	[% }else if(it[item]["from_type"] == 2) { %]
+        		 行政
+        	[% }else if(it[item]["from_type"] == 3) { %]
+        		财务
+        	[%} else{%]
+        		其他
+        	[%}%]
+        		
        </td>
        <td>[%= it[item]["title"] %]</td>
        <td>