Prechádzať zdrojové kódy

Merge remote-tracking branch 'origin/dev' into zhaosm

yanj 10 hodín pred
rodič
commit
4381a660c2
6 zmenil súbory, kde vykonal 102 pridanie a 36 odobranie
  1. 2 2
      package.json
  2. 1 0
      pages.json
  3. 64 0
      pages/disclaimer/privacy.vue
  4. 30 29
      pages/index/webview.vue
  5. 4 4
      pages/user/login.vue
  6. 1 1
      store/getters.js

+ 2 - 2
package.json

@@ -17,7 +17,7 @@
 					"ENV_TYPE": "dev",
 					"UNI_PLATFORM": "mp-weixin",
 					"NAME": "dev",
-					"VERSION": "0.01",
+					"VERSION": "0.02",
 					"TOKEN_KEY": "token",
 					"BASE_API": "https://mp-test-onlinecatelogue.matchexpo.cn",
 					"WEBSITE": "https://mp-website-test-munich.matchexpo.cn",
@@ -33,7 +33,7 @@
 					"ENV_TYPE": "test",
 					"UNI_PLATFORM": "mp-weixin",
 					"NAME": "test",
-					"VERSION": "0.01",
+					"VERSION": "0.02",
 					"TOKEN_KEY": "token",
 					"BASE_API": "https://mp-test-miniprogapi.matchexpo.cn",
 					"WEBSITE": "https://mp-website-test-munich.matchexpo.cn",

+ 1 - 0
pages.json

@@ -27,6 +27,7 @@
 		{ "path": "pages/user/vote", "style": { "navigationBarTitleText": "我的投票" }},
 		//APP协议模块
 		{ "path": "pages/disclaimer/index", "style": { "navigationBarTitleText": "免责声明" }},
+		{ "path": "pages/disclaimer/privacy", "style": { "navigationBarTitleText": "隐私政策" }},
 		// 组件页面
 		{ "path": "pages/index/search",  "style": { "navigationBarTitleText": "搜索" }},
 		// WEBVIEW

+ 64 - 0
pages/disclaimer/privacy.vue

@@ -0,0 +1,64 @@
+<template>
+	<view class="container">
+		<nav-bar title=" " transparent></nav-bar>
+		<view class="body">
+			<text class="title">
+        隐私政策
+			</text>
+			<text class="content">
+				本系统内容由展商提供,慕尼黑展览(上海)有限公司(以下简称“MM-SH”)不对内容的正确性、完整性和最新状态承担任何责任。
+				本系统中包含第三方外部网站的链接,我们无法控制这些网站的内容。在任何情况下,相关网站提供者或运营者须对链接网站的内容负责,MM-SH不对此承担任何责任。
+				MM-SH特别保留权利更改或扩展本系统所提供内容,恕不另行通知。您基于由本系统或经本系统提供的信息作出决定,须自行承担风险。MM-SH不对因使用由本系统或经本系统提供的信息造成的任何直接或间接损失承担赔偿责任。
+				对任何因直接或间接使用本系统内容而造成的任何损失,包括但不限于因有关内容有错误、遗漏、病毒等而导致的损失,MM-SH不对此承担任何法律责任。
+				本系统中有关展商的信息、图片、logo等均由相应展商提供,不得擅自下载或使用。如您有异议,请联系慕尼黑展览(上海)有限公司。
+			</text>
+			<text class="title">
+        法律信息
+      </text>
+			<text class="content">
+        The content of this System has been provided by the exhibitors and Messe Muenchen Shanghai Co., Ltd. (hereinafter referred to as “MM-SH”) will not assume any liability for the correctness, completeness and up-to-date status of the content.
+        This System includes links to external websites of third parties, MM-SH have no influence on the contents of these websites. In all cases, the respective site provider or operator shall be responsible for the content of the sites linked. MM-SH do not bear any legal liability therefrom.
+        In particular, MM-SH reserves the right to make changes or extensions to the information provided without prior notification. Decisions based on the information provided on or via this System are for your own account and risk. MM-SH shall not be liable for any direct or indirect damages caused by use of information provided on or via this System.
+        MM-SH do not bear any legal liability for any loss arising from any direct or indirect use of contents of this System, including without limitation the losses resulted from error, omission or virus, etc.
+        The information, photos, and logos, etc. in relation to the exhibitors in this System are all provided by exhibitors and any download or use of the content for commercial purpose without authorization is prohibited. If you have any objection, please contact MM-SH.
+      </text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/layout/nav-bar'
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		components: {
+			NavBar
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+.body {
+	padding: 50rpx;
+}
+.title {
+	font-size: $fontSize4;
+	color: $fontTitleColor;
+	display: block;
+	font-weight: bold;
+}
+.content {
+	font-size: $fontSize2;
+	color: $fontColor;
+	line-height: 1.9;
+	display: block;
+	margin-top: 32rpx;
+	margin-bottom: 42rpx;
+}
+</style>

+ 30 - 29
pages/index/webview.vue

@@ -1,36 +1,37 @@
 <template>
-	<view class="webview-container">
-		<web-view class="webview" :src="url"></web-view>
-	</view>
+  <view class="webview-container">
+    <web-view class="webview" :src="url" @bindmessage="message"></web-view>
+  </view>
 </template>
 
 <script>
-	
-	export default {
-		components: {
-		},
-		data() {
-			return {
-				url: ''
-			}
-		},
-		onLoad(options) {
-			this.url = decodeURIComponent(options.url)
-			console.log(options.url)
-		},
-		created() {
-		},
-		methods: {
-		}
-	}
+
+export default {
+  components: {},
+  data() {
+    return {
+      url: ''
+    }
+  },
+  onLoad(options) {
+    this.url = decodeURIComponent(options.url)
+    console.log(options.url)
+  },
+  methods: {
+    message(e,h,z) {
+      console.log(e,h,z)
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
-	.webview-container{
-		display: flex;
-		flex-direction: column;
-	}
-	.webview{
-		flex: 1;
-	}
-</style>
+.webview-container {
+  display: flex;
+  flex-direction: column;
+}
+
+.webview {
+  flex: 1;
+}
+</style>

+ 4 - 4
pages/user/login.vue

@@ -15,9 +15,9 @@
 						<van-checkbox :value="protocolChecked" shape="square" @change="onCheckChange">
 							<view class="user-login-protocol-text">
 								<text>我已仔细阅读主办方的</text>
-								<text class="link-text" @click="navigateTo('https://www.productronicachina.com.cn/%E9%9A%90%E7%A7%81%E6%9D%A1%E6%AC%BE')">《隐私政策》</text>
+								<text class="link-text" @click="navigateTo('/pages/disclaimer/privacy')">《隐私政策》</text>
 								<text>和</text>
-								<text class="link-text" @click="navigateTo('https://www.productronicachina.com.cn/%E6%B3%95%E5%BE%8B%E4%BF%A1%E6%81%AF')">《法律条款》</text>
+								<text class="link-text" @click="navigateTo('/pages/disclaimer/privacy')">《法律条款》</text>
 								<text>的全部内容并同意尊守</text>
 							</view>
 						</van-checkbox>
@@ -48,9 +48,9 @@
 							<van-checkbox :value="protocolChecked" shape="square" @change="onCheckChange">
 								<view class="user-login-protocol-text">
 									<text>我已仔细阅读主办方的</text>
-									<text class="link-text" @click="navigateTo('https://www.productronicachina.com.cn/%E9%9A%90%E7%A7%81%E6%9D%A1%E6%AC%BE')">《隐私政策》</text>
+									<text class="link-text" @click="navigateTo('/pages/disclaimer/privacy')">《隐私政策》</text>
 									<text>和</text>
-									<text class="link-text" @click="navigateTo('https://www.productronicachina.com.cn/%E6%B3%95%E5%BE%8B%E4%BF%A1%E6%81%AF')">《法律条款》</text>
+									<text class="link-text" @click="navigateTo('/pages/disclaimer/privacy')">《法律条款》</text>
 									<text>的全部内容并同意尊守</text>
 								</view>
 							</van-checkbox>

+ 1 - 1
store/getters.js

@@ -6,7 +6,7 @@ const getters = {
   loading: state => state.app.loading,
   ossDomain: state => state.app.ossDomain,
   locale: state => state.app.locale,
-  version: state => process.env.VERSION ?? '0.01',
+  version: state => process.env.VERSION ?? '0.02',
   website_url: state => 'https://mp-test-onlinecatelogue.matchexpo.cn'
 }
 export default getters