From 92ef829497b0b463bc0ecf827390b2d9bccc591b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E9=AA=8F?= <1076960098@qq.com>
Date: Sun, 15 Oct 2023 18:01:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8B=89=E5=89=8D=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project.config.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/project.config.json b/project.config.json
index 5a0f86f..ee899e0 100644
--- a/project.config.json
+++ b/project.config.json
@@ -38,7 +38,8 @@
       "disablePlugins": [],
       "outputPath": ""
     },
-    "condition": false
+    "condition": false,
+    "ignoreUploadUnusedFiles": true
   },
   "compileType": "miniprogram",
   "libVersion": "2.19.4",

From 4dee21bf63dadfd359e094a18b49e55dc31f107f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E9=AA=8F?= <1076960098@qq.com>
Date: Mon, 16 Oct 2023 00:40:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BA=AA=E5=BF=B5=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=92=8C=E8=83=8C=E6=99=AF=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/commemorate/commemorate.js   | 15 ++++++++++++++-
 pages/commemorate/commemorate.wxml | 13 ++++++++++++-
 pages/commemorate/commemorate.wxss | 24 +++++++++++++++++++++++-
 3 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/pages/commemorate/commemorate.js b/pages/commemorate/commemorate.js
index 0bc814c..61a08ed 100644
--- a/pages/commemorate/commemorate.js
+++ b/pages/commemorate/commemorate.js
@@ -5,7 +5,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    currentPage: '' // 初始值为空
   },
 
   /**
@@ -62,5 +62,18 @@ Page({
    */
   onShareAppMessage() {
 
+  },
+
+  showPage1: function() {
+    this.setData({
+      currentPage: 'page1',// 显示页面1
+    });
+  },
+
+  showPage2: function() {
+    this.setData({
+      currentPage: 'page2', // 显示页面2
+    });
   }
+
 })
\ No newline at end of file
diff --git a/pages/commemorate/commemorate.wxml b/pages/commemorate/commemorate.wxml
index dfc92bb..fcc341e 100644
--- a/pages/commemorate/commemorate.wxml
+++ b/pages/commemorate/commemorate.wxml
@@ -1 +1,12 @@
-<text>纪念哦</text>
+<view class="button-container">
+  <button bindtap="showPage1" class="b1">纪念票</button>
+  <button bindtap="showPage2" class="b2">纪念册</button>
+</view>
+
+<view wx:if="{{currentPage === 'page1'}}" class="v1" style="width:max-width; height:1000rpx;">
+    <text>1</text>>
+  </view>
+
+  <view wx:if="{{currentPage === 'page2'}}" class="v2" style="width:max-width; height:1000rpx;">
+    <text>2</text>>
+  </view>
\ No newline at end of file
diff --git a/pages/commemorate/commemorate.wxss b/pages/commemorate/commemorate.wxss
index e79c65b..b835796 100644
--- a/pages/commemorate/commemorate.wxss
+++ b/pages/commemorate/commemorate.wxss
@@ -1 +1,23 @@
-/* pages/commemorate/commemorate.wxss */
\ No newline at end of file
+/* pages/commemorate/commemorate.wxss */
+.button-container {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  background-color:rgb(99, 195, 240)
+}
+
+.b1 {
+  background-color: rgb(171, 238, 16);
+}
+
+.b2 {
+  background-color: rgb(221, 218, 55);
+}
+
+.v1 {
+  background-color: rgb(99, 195, 240);
+}
+
+.v2 {
+  background-color: rgb(99, 195, 240);
+}
\ No newline at end of file