Merge remote-tracking branch 'origin/wx0604' into wx0604

1f2b58f3 · hujun · 8c23baae · bb5fa2b3 · 1f2b58f3 · 1f2b58f3
Commit 1f2b58f3 authored Jun 21, 2018 by hujun
22 changed files
--- a/public/app/dist/index.html
+++ b/public/app/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>同联商业</title><script type=text/javascript src=./static/js/vconsole.min.js></script><script type=text/javascript>if(~location.origin.indexOf('api.tonglianjituan.com')){console.log('正式服')}else{var vConsole=new VConsole()};</script><link href=./static/css/app.33f238917fc813b45f4cf9d1450ba68f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.94d51f6620cb57f6116c.js></script><script type=text/javascript src=./static/js/app.ce726b7129b5ddaf08eb.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>同联商业</title><script type=text/javascript src=./vconsole.min.js></script><script type=text/javascript>if(~location.origin.indexOf('api.tonglianjituan.com')){console.log('正式服')}else{var vConsole=new VConsole()};</script><link href=./static/css/app.32769812f4333e70049b1824f32be8bc.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.94d51f6620cb57f6116c.js></script><script type=text/javascript src=./static/js/app.9bc169c9e5196c1dad63.js></script></body></html>
\ No newline at end of file
--- a/public/app/dist/static/css/app.33f238917fc813b45f4cf9d1450ba68f.css
+++ b/public/app/dist/static/css/app.33f238917fc813b45f4cf9d1450ba68f.css
--- a/public/app/dist/static/css/app.32769812f4333e70049b1824f32be8bc.css.map
+++ b/public/app/dist/static/css/app.32769812f4333e70049b1824f32be8bc.css.map
--- a/public/app/dist/static/css/app.33f238917fc813b45f4cf9d1450ba68f.css.map
+++ b/public/app/dist/static/css/app.33f238917fc813b45f4cf9d1450ba68f.css.map
--- a/public/app/dist/static/js/app.9bc169c9e5196c1dad63.js
+++ b/public/app/dist/static/js/app.9bc169c9e5196c1dad63.js
--- a/public/app/dist/static/js/app.9bc169c9e5196c1dad63.js.map
+++ b/public/app/dist/static/js/app.9bc169c9e5196c1dad63.js.map
--- a/public/app/dist/static/js/app.ce726b7129b5ddaf08eb.js
+++ b/public/app/dist/static/js/app.ce726b7129b5ddaf08eb.js
--- a/public/app/dist/static/js/app.ce726b7129b5ddaf08eb.js.map
+++ b/public/app/dist/static/js/app.ce726b7129b5ddaf08eb.js.map
--- a/public/app/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
+++ b/public/app/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
--- a/public/app/dist/test_code.txt
+++ b/public/app/dist/test_code.txt
--- a/public/appnew/src/components/achieveMain/achieveRegion.vue
+++ b/public/appnew/src/components/achieveMain/achieveRegion.vue
--- a/public/appnew/src/components/achieveMain/agentResourceLi.vue
+++ b/public/appnew/src/components/achieveMain/agentResourceLi.vue
--- a/public/appnew/src/components/achieveMain/images/time_nor_ic@2x.png
+++ b/public/appnew/src/components/achieveMain/images/time_nor_ic@2x.png
--- a/public/appnew/src/components/achieveMain/images/time_sel_ic@2x.png
+++ b/public/appnew/src/components/achieveMain/images/time_sel_ic@2x.png
--- a/public/appnew/src/components/achieveMain/images/weizhi_icon@2x.png
+++ b/public/appnew/src/components/achieveMain/images/weizhi_icon@2x.png
--- a/public/appnew/src/components/achieveMain/superviseResource.vue
+++ b/public/appnew/src/components/achieveMain/superviseResource.vue
--- a/public/appnew/src/components/achieveMain/superviseResourceLi.vue
+++ b/public/appnew/src/components/achieveMain/superviseResourceLi.vue
--- a/public/appnew/src/router/index.js
+++ b/public/appnew/src/router/index.js
--- a/public/resource/js/carryOut.js
+++ b/public/resource/js/carryOut.js
--- a/public/resource/js/commission.js
+++ b/public/resource/js/commission.js
--- a/public/resource/js/tax.js
+++ b/public/resource/js/tax.js
--- a/public/resource/template/reportList_shuiFee2_template_tpl.html
+++ b/public/resource/template/reportList_shuiFee2_template_tpl.html