Merge branch '0731-v3.3.6' into test

e93e329e · clone · 98fba4c1 · a25ca259 · e93e329e · e93e329e
Commit e93e329e authored Aug 12, 2019 by clone
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.55755464f6625584e0e88681def052a7.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.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.bcc4cff6ef8812895ee5.js></script></body></html>
+			})(document, window);</script><link href=./static/css/app.07a55a3ee019b3fda5fca852a2390817.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.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.97df7e5e67e3c9d37f22.js></script></body></html>
\ No newline at end of file
--- a/public/app/dist/static/css/app.07a55a3ee019b3fda5fca852a2390817.css
+++ b/public/app/dist/static/css/app.07a55a3ee019b3fda5fca852a2390817.css
--- a/public/app/dist/static/js/app.97df7e5e67e3c9d37f22.js
+++ b/public/app/dist/static/js/app.97df7e5e67e3c9d37f22.js
--- a/public/appnew/src/components/achieveMain/achieveFork.vue
+++ b/public/appnew/src/components/achieveMain/achieveFork.vue
@@ -5,6 +5,7 @@
 		<!--站点选择-->
 		<div class="top-city-select-area flex-center">
 			<city-select :datasiteid="datasiteid" @changeCity="changeCity"></city-select>
+			<img :src="cityDown" style="width:.2rem;margin-left:.1rem;">
 		</div>
 		<!--时间搜索区域-->
 		<nav>
@@ -61,6 +62,7 @@
 </template>
 <script>
+	import cityDown from '@/components/achieveMain/images/cityDown.png';
 	import citySelect from '@/components/achieveMain/citySelect';
 	import achieveForkLi from '@/components/achieveMain/achieveForkLi';
 	import '@/assets/js/layer041002.js';
@@ -75,6 +77,7 @@
 				'noborder': true,
 				'isBack': false
 			},
+			cityDown,
 			datasiteid: '',//默认站点id,因为需要出发citySelect.vue里的watch事件，所以不能有正确的默认值
 			startDate: '',
 			endDate: '',

--- a/public/appnew/src/components/achieveMain/images/cityDown.png
+++ b/public/appnew/src/components/achieveMain/images/cityDown.png