Merge branch 'eta1.7.8'

pages.json

@@ -109,6 +109,12 @@
 		},
 		{
 			"path":"pages/transitionPage"
+		},
+		{
+			"path":"pages/forexCalendar/index",
+			"style":{
+				"navigationBarTitleText":"外汇日历表"
+			}
 		}
 	],
 	"subPackages":[

pages/forexCalendar/index.vue

@@ -0,0 +1,31 @@
+<template>
+    <div class="forex-calendar-wrap">
+        <web-view :src="url" @message="handleGetMessage"></web-view>
+    </div>
+</template>
+
+<script>
+import {h5BaseUrl} from '@/utils/config'
+export default {
+    data() {
+        return {
+            url:''
+        };
+    },
+    onLoad(options){
+        const token=this.$store.state.user.token
+        this.url = `${h5BaseUrl}/hzyb/forex/transindex?token=${token}#wechat_redirect`
+    },
+    methods: {
+        handleGetMessage(e){
+            console.log('test,test')
+            const data=e.detail.data[e.detail.data.length-1]
+            console.log('h5传来的数据',data);
+        }
+    },
+};
+</script>
+
+<style scoped lang="scss">
+
+</style>

pages/report/report.vue

@@ -135,7 +135,8 @@ export default {
         ['activity','/pages/activity/activity'],
         ['pricedriven','/pages/pricedriven/pricedriven'],
         ['video','/pages/video/videoList'],
-        ['position_analysis','/pages/positionAnalysis/index']
+        ['position_analysis','/pages/positionAnalysis/index'],
+        ['calendar_matter','/pages/forexCalendar/index']
       ]),
       tabCards: [],
       bannerDataList:[]

utils/request.js

@@ -97,7 +97,7 @@ const http=(url,params,method)=>{
 			method:method,
 			header:{
 				Authorization:store.state.user.token,
-				version:'yb11.8'
+				version:'yb11.9'
 			},
 			success(e) {
 				// 接口404