From 2e6f381d09669635473faf5dd4a3f01b5797d97e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 27 五月 2024 16:25:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 h5/pages/notice/notice.vue |  236 ++++++++++++++++++++++++----------------------------------
 1 files changed, 98 insertions(+), 138 deletions(-)

diff --git a/h5/pages/notice/notice.vue b/h5/pages/notice/notice.vue
index fefdc0d..ddd051b 100644
--- a/h5/pages/notice/notice.vue
+++ b/h5/pages/notice/notice.vue
@@ -1,146 +1,106 @@
 <template>
-	<div class="container">
-		<video src="https://vdept3.bdstatic.com/mda-nj7gwfue9kdnbtsh/sc/cae_h264/1665488517815949255/mda-nj7gwfue9kdnbtsh.mp4?v_from_s=hkapp-haokan-hbe&auth_key=1715141591-0-0-6dfdf4d4c3d94b60b9adeb53368a72f3&bcevod_channel=searchbox_feed&pd=1&cr=2&cd=0&pt=3&logid=0791905773&vid=13790089500387859718&klogid=0791905773&abtest="></video>
-		<scroll-view scroll-y class="content">
-			<div class="title">瀹夋嘲鐗╂祦鍘傚鏉ヤ汉鍛樺畨鍏ㄥ憡鐭�</div>
-			<div class="text">
-				<div>{{ content }}</div>
-			</div>
-			<div class="empty"></div>
-		</scroll-view>
-		<div class="button" @click="toapply">纭浜嗚В</div>
-	</div>
+  <div class="container">
+    <!-- <video
+      src="https://vdept3.bdstatic.com/mda-nj7gwfue9kdnbtsh/sc/cae_h264/1665488517815949255/mda-nj7gwfue9kdnbtsh.mp4?v_from_s=hkapp-haokan-hbe&auth_key=1715141591-0-0-6dfdf4d4c3d94b60b9adeb53368a72f3&bcevod_channel=searchbox_feed&pd=1&cr=2&cd=0&pt=3&logid=0791905773&vid=13790089500387859718&klogid=0791905773&abtest="
+    ></video> -->
+    <scroll-view scroll-y class="content">
+      <div>
+        <div v-html="content"></div>
+      </div>
+      <div class="empty"></div>
+    </scroll-view>
+    <div class="button" @click="toapply">纭浜嗚В</div>
+  </div>
 </template>
 
 <script>
-	export default {
-		name: 'Index',
-		data() {
-			return {
-				content: `
-				1纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В纭浜嗚В
-				`,
-				answer: ''
-			}
-		},
-		onLoad() {
-			// this.getInfo()
-		},
-		methods: {
-			getInfo() {
-				// 鍏ュ満椤荤煡璇︽儏
-				this.$u.api.getSystemDictData({
-					dictCode: 'SYSTEM',
-					label: 'VISIT_NOTICE'
-				}).then(res => {
-					if (res.code === 200) {
-						this.content = res.data.code
-					}
-				})
-				// 鏄惁闇�瑕佺瓟棰�
-				this.$u.api.getSystemDictData({
-					dictCode: 'SYSTEM',
-					label: 'PROBLEM_VISIT_REQUIRED'
-				}).then(res => {
-					if (res.code === 200) {
-						this.answer = res.data.code
-					}
-				})
-			},
-			toapply() {
-				if (this.answer === '0') {
-					uni.navigateTo({
-						url: '/pages/userinfo/userinfo'
-					})
-				} else {
-					uni.navigateTo({
-						url: '/pages/answer/answer'
-					})
-				}
-			}
-		}
-	}
+import { getSystemDictData } from "@/api"
+export default {
+  name: 'Index',
+  data() {
+    return {
+      content: ``,
+      answer: ''
+    }
+  },
+  onLoad() {
+    this.getInfo()
+  },
+  methods: {
+    getInfo() {
+      // 鍏ュ満椤荤煡璇︽儏
+      getSystemDictData({
+        dictCode: 'SYSTEM',
+        label: 'VISIT_NOTICE'
+      }).then(res => {
+        if (res.code === 200) {
+          this.content = res.data.code
+        }
+      })
+      // 鏄惁闇�瑕佺瓟棰�
+      getSystemDictData({
+        dictCode: 'SYSTEM',
+        label: 'PROBLEM_VISIT_REQUIRED'
+      }).then(res => {
+        if (res.code === 200) {
+          this.answer = res.data.code
+        }
+      })
+    },
+    toapply() {
+      if (this.answer === '0') {
+        uni.navigateTo({
+          url: '/pages/userinfo/userinfo'
+        })
+      } else {
+        uni.navigateTo({
+          url: '/pages/answer/answer'
+        })
+      }
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
-	.container {
-		width: 100%;
-		height: 100vh;
-		padding: 10rpx 30rpx 0;
-		box-sizing: border-box;
-		display: flex;
-		flex-direction: column;
-		video{
-			width: 690rpx;
-			height: 388rpx;
-			margin-bottom: 10rpx;
-		}
-		.content {
-			height: calc( 100% - 400rpx );
-			.title{
-				color: #333333;
-				font-weight: 500;
-				margin-bottom: 16rpx;
-			}
-			.text{
-				font-weight: 350;
-			}
-			.empty{
-				height: 160rpx;
-			}
-		}
-		.button {
-			width: 690rpx;
-			height: 88rpx;
-			line-height: 88rpx;
-			text-align: center;
-			background: #4d99a8;
-			border-radius: 44rpx;
-			font-size: 32rpx;
-			color: #FFFFFF;
-			position: absolute;
-			bottom: 42rpx;
-			left: 30rpx;
-		}
-	}
+.container {
+  width: 100%;
+  height: 100vh;
+  padding: 10rpx 30rpx 0;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  video {
+    width: 690rpx;
+    height: 388rpx;
+    margin-bottom: 10rpx;
+  }
+  .content {
+    height: calc(100% - 170rpx);
+    .title {
+      color: #333333;
+      font-weight: 500;
+      margin-bottom: 16rpx;
+    }
+    .text {
+      font-weight: 350;
+    }
+    .empty {
+      height: 160rpx;
+    }
+  }
+  .button {
+    width: 690rpx;
+    height: 88rpx;
+    line-height: 88rpx;
+    text-align: center;
+    background: #4d99a8;
+    border-radius: 44rpx;
+    font-size: 32rpx;
+    color: #ffffff;
+    position: absolute;
+    bottom: 42rpx;
+    left: 30rpx;
+  }
+}
 </style>
\ No newline at end of file

--
Gitblit v1.9.3