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 @@
-纪念哦
+
+
+
+
+
+
+ 1>
+
+
+
+ 2>
+
\ 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
diff --git a/project.config.json b/project.config.json
deleted file mode 100644
index 9787187..0000000
--- a/project.config.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
- "description": "项目配置文件",
- "packOptions": {
- "ignore": [],
- "include": []
- },
- "setting": {
- "bundle": false,
- "userConfirmedBundleSwitch": false,
- "urlCheck": true,
- "scopeDataCheck": false,
- "coverView": true,
- "es6": true,
- "postcss": true,
- "compileHotReLoad": false,
- "lazyloadPlaceholderEnable": false,
- "preloadBackgroundData": false,
- "minified": true,
- "autoAudits": false,
- "newFeature": false,
- "uglifyFileName": false,
- "uploadWithSourceMap": true,
- "useIsolateContext": true,
- "nodeModules": false,
- "enhance": true,
- "useMultiFrameRuntime": true,
- "useApiHook": true,
- "useApiHostProcess": true,
- "showShadowRootInWxmlPanel": true,
- "packNpmManually": false,
- "enableEngineNative": false,
- "packNpmRelationList": [],
- "minifyWXSS": true,
- "showES6CompileOption": false,
- "minifyWXML": true,
- "babelSetting": {
- "ignore": [],
- "disablePlugins": [],
- "outputPath": ""
- },
- "ignoreUploadUnusedFiles": true
- },
- "compileType": "miniprogram",
- "libVersion": "2.19.4",
- "appid": "wx7f67447c72994c39",
- "projectname": "miniprogram-92",
- "condition": {},
- "editorSetting": {
- "tabIndent": "insertSpaces",
- "tabSize": 2
- }
-}
\ No newline at end of file