Yansen před 2 roky
rodič
revize
11329d18ed

+ 1
- 1
index.html Zobrazit soubor

@@ -9,7 +9,7 @@
9 9
     <script src="./turn.min.js"></script>
10 10
     <script src="./config.js"></script>
11 11
     <!-- <script src="./slidePage/slidePage.min.js"></script> -->
12
-    <script src="https://api.map.baidu.com/api?v=3.0&ak=IDixtryGuZAFPZLh4r8XCAM054r8LCRs"></script>
12
+    <!-- <script src="https://api.map.baidu.com/api?v=3.0&ak=IDixtryGuZAFPZLh4r8XCAM054r8LCRs"></script> -->
13 13
 
14 14
     <!-- <link rel="stylesheet" href="./slidePage/slidePage.min.css"> -->
15 15
 

+ 1
- 0
public/MP_verify_2kbV0iqhuQ2vvjtU.txt Zobrazit soubor

@@ -0,0 +1 @@
1
+2kbV0iqhuQ2vvjtU

binární
public/images/close.png Zobrazit soubor


binární
public/images/paper-bg.png Zobrazit soubor


binární
public/images/pg1/2014.png Zobrazit soubor


binární
public/images/pg1/md1-1.jpg Zobrazit soubor


+ 4
- 4
src/components/Modal.vue Zobrazit soubor

@@ -67,13 +67,13 @@
67 67
 
68 68
     .modal-close {
69 69
       position: absolute;
70
-      width: 40px;
71
-      height: 40px;
70
+      width: 24px;
71
+      height: 37.86px;
72 72
       background-image: url(/images/close.png);
73 73
       background-size: 100% 100%;
74 74
       background-repeat: no-repeat;
75
-      right: -16px;
76
-      top: -16px;
75
+      right: 0;
76
+      top: -37.86px;
77 77
     }
78 78
   }
79 79
 }

+ 54
- 0
src/pages/pg1/Md1.vue Zobrazit soubor

@@ -0,0 +1,54 @@
1
+<template>
2
+  <Modal>
3
+    <div class="md1-box md-bg">
4
+      <img class="md1-bg" src="/images/pg1/2014.png" alt="">
5
+      <div class="md1-header">
6
+        <img src="/images/pg1/logo.png" alt="">
7
+      </div>
8
+      <div class="md1-context">
9
+        <p class="txt">
10
+          南京广电集团以“紫金草”为原型,<br />
11
+          制作紫金草徽章发放给市民。<br />
12
+          9年来,20万人加入“紫金草行动”,<br />
13
+          把紫金草徽章佩戴在离心脏最近的地方。
14
+        </p>
15
+        <img src="/images/pg1/md1-1.jpg" alt="">
16
+        <p class="txt" style="text-align: right">
17
+          在2亿人心中,和平的愿景被播撒。
18
+        </p>
19
+      </div>
20
+    </div>
21
+  </Modal>
22
+</template>
23
+
24
+<script setup>
25
+  import Modal from '@/components/Modal.vue';
26
+</script>
27
+
28
+<style lang="less" scoped>
29
+.md1-box {
30
+  width: 80vw;
31
+  position: relative;
32
+  box-sizing: border-box;
33
+  padding: 16px;
34
+
35
+  .md1-bg {
36
+    position: absolute;
37
+    top: 10px;
38
+    right: 5px;
39
+    width: 50px;
40
+    z-index: 0;
41
+  }
42
+
43
+  .md1-header {
44
+    box-sizing: border-box;
45
+    width: 32vw;
46
+  }
47
+
48
+  .md1-context {
49
+    box-sizing: border-box;
50
+    padding-top: 60px;
51
+    font-size: 12px;
52
+  }
53
+}
54
+</style>

+ 14
- 3
src/pages/pg1/index.vue Zobrazit soubor

@@ -18,6 +18,9 @@
18 18
     <div class="footer abs animate__animated animate__fadeInUp">
19 19
       <img src="/images/pg1/bg2.png" alt="" parallax-offset='-200'>
20 20
     </div>
21
+    <Md1 v-if="mdActive == 1" @cancel="onCancel(1)" />
22
+    <Md1 v-if="mdActive == 2" @cancel="onCancel(2)" />
23
+    <Md1 v-if="mdActive == 3" @cancel="onCancel(3)" />
21 24
   </div>
22 25
 </template>
23 26
 
@@ -29,14 +32,22 @@
29 32
   import Part1 from './P1.vue';
30 33
   import Part2 from './P2.vue';
31 34
   import Part3 from './P3.vue';
35
+  import Md1 from './Md1.vue';
32 36
 
33 37
   const router = useRouter();
38
+  const active = ref(1);
39
+  const mdActive = ref(0);
34 40
 
35
-  const onClick = (page) => {
36
-    router.push(`/bk1?page=${page}`);
41
+  const onClick = (inx) => {
42
+    mdActive.value = inx;
43
+  }
44
+
45
+  const onCancel = (inx) => {
46
+    mdActive.value = 0;
47
+    const next = inx + 1 > 3 ? 1 : inx + 1;
48
+    active.value = next;
37 49
   }
38 50
 
39
-  const active = ref(1);
40 51
 
41 52
 </script>
42 53
 

+ 7
- 0
src/style.less Zobrazit soubor

@@ -46,6 +46,13 @@ img {
46 46
   // background-repeat: repeat-y;
47 47
 }
48 48
 
49
+.md-bg {
50
+  background-color: #F2F2F2;
51
+  background-image: url('/images/paper-bg.png');
52
+  background-size: 100% 100%;
53
+  background-repeat: repeat-y;
54
+}
55
+
49 56
 .abs {
50 57
   position: absolute;
51 58
 }

+ 6
- 1
src/utils/wx.js Zobrazit soubor

@@ -5,6 +5,8 @@ function wxsdk() {
5 5
   // API_BASE 来源 public/config.js
6 6
   const apiBase = API_BASE // import.meta.env.VITE_APP_API_BASE
7 7
 
8
+  let APPID = '';
9
+
8 10
   // 分享接口
9 11
   const shareAPIs = [
10 12
     // 自定义“分享给朋友”及“分享到QQ”按钮的分享内容(1.4.0)
@@ -32,6 +34,8 @@ function wxsdk() {
32 34
       if (res.code === 1000) {
33 35
         const data = res.data;
34 36
 
37
+        APPID = data.appId;
38
+
35 39
         wx.config({
36 40
           debug: isDev, // 开启调试模式,调用的所有 api 的返回值会在客户端 alert 出来,若要查看传入的参数,可以在 pc 端打开,参数信息会通过 log 打出,仅在 pc 端时才会打印。
37 41
           appId: data.appId, // 必填,公众号的唯一标识
@@ -84,8 +88,9 @@ function wxsdk() {
84 88
   function redirect () {
85 89
     if (isDev) return;
86 90
 
91
+    const appid = APPID || 'wx5d0c5a7f210d872f';
87 92
     const local = encodeURIComponent(location.origin + location.pathname)
88
-    const url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxd3bab568bc42d1de&redirect_uri=${local}&response_type=code&scope=snsapi_base&state=123#wechat_redirect`
93
+    const url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${local}&response_type=code&scope=snsapi_base&state=123#wechat_redirect`
89 94
     window.location.href = url;
90 95
   }
91 96