From 1d064aa5ec2556155bbf116cef1d6d0ac5007acc Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 29 九月 2025 10:23:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
h5/pages/notice/notice.vue | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/h5/pages/notice/notice.vue b/h5/pages/notice/notice.vue
index f108547..ea0c8d5 100644
--- a/h5/pages/notice/notice.vue
+++ b/h5/pages/notice/notice.vue
@@ -1,8 +1,5 @@
<template>
<view 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">
<view>
<view v-html="content"></view>
@@ -19,6 +16,7 @@
<script>
let timer
import { getSystemDictData } from "@/api"
+import { getCode } from "@/utils/getCode.js";
export default {
name: 'Index',
data() {
@@ -30,9 +28,12 @@
},
onLoad() {
this.getInfo()
- if (!this.$store.state.openId) {
- this.initToken()
- }
+ getCode(code => {
+ console.log('code', code)
+ });
+ // if (!this.$store.state.openId) {
+ // this.initToken()
+ // }
},
methods: {
initToken() {
@@ -102,13 +103,8 @@
box-sizing: border-box;
display: flex;
flex-direction: column;
- video {
- width: 690rpx;
- height: 388rpx;
- margin-bottom: 10rpx;
- }
.content {
- height: calc(100% - 170rpx);
+ height: calc(100% - 130rpx);
.title {
color: #333333;
font-weight: 600;
--
Gitblit v1.9.3