diff --git a/app.json b/app.json index a83f194..96f81b0 100644 --- a/app.json +++ b/app.json @@ -3,13 +3,15 @@ "pages/index/index", "pages/logs/logs", "pages/commemorate/commemorate", - "pages/recommend/recommend" + "pages/recommend/recommend", + "pages/wc/wc" ], "window": { "backgroundTextStyle": "light", "navigationBarBackgroundColor": "#ddd", "navigationBarTitleText": "银幕之旅", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "enablePullDownRefresh": true }, "tabBar": { "selectedColor": "#CD5C5C", diff --git a/app.wxss b/app.wxss index 06c6fc9..d51ac97 100644 --- a/app.wxss +++ b/app.wxss @@ -6,5 +6,6 @@ align-items: center; justify-content: space-between; padding: 200rpx 0; + /**满屏幕是750rpx**/ box-sizing: border-box; } 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/pages/recommend/recommend.js b/pages/recommend/recommend.js index 768b074..838f405 100644 --- a/pages/recommend/recommend.js +++ b/pages/recommend/recommend.js @@ -6,6 +6,8 @@ Page({ */ data: { + + }, /** diff --git a/pages/recommend/recommend.wxml b/pages/recommend/recommend.wxml index b00e0bc..420cbab 100644 --- a/pages/recommend/recommend.wxml +++ b/pages/recommend/recommend.wxml @@ -1,39 +1,34 @@ -可能喜欢(๑•̀ㅂ•́)و✧ - - - - 阿斌 - - - - 阿斌 - - - - 阿斌 - - - - 阿斌 - - - - 阿斌 - - - - 阿斌 - - - - 阿斌 - - - - 阿斌 - - - - 阿斌 - +可能喜欢(๑•̀ㅂ•́)و✧ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pages/recommend/recommend.wxss b/pages/recommend/recommend.wxss index 5ff64c0..90aa4fa 100644 --- a/pages/recommend/recommend.wxss +++ b/pages/recommend/recommend.wxss @@ -1 +1,29 @@ -/* pages/recommend/recommend.wxss */ \ No newline at end of file +/* pages/recommend/recommend.wxss */ +image{ + width: 500rpx; + height:500rpx; +} +.zhiyin{ + height: 500rpx; + border: 1rpx solid #ddd; +/**flex布局**/ + display:flex; +/**主轴方向布局，行排列row或者列排列column**/ + flex-direction: row; +/**控制孩子布局，flex-start,center,space-around,space-between**/ + justify-content: space-around; +/**副轴方向布局**/ + align-items: center; +} +.meme{ + height: 500rpx; + border: 1rpx solid #ddd; +/**flex布局**/ + display:flex; +/**主轴方向布局，行排列row或者列排列column**/ + flex-direction: row; +/**控制孩子布局，flex-start,center,space-around,space-between**/ + justify-content: space-around; +/**副轴方向布局**/ + align-items: center; +} \ No newline at end of file diff --git a/pages/wc/wc.js b/pages/wc/wc.js new file mode 100644 index 0000000..cecb1c3 --- /dev/null +++ b/pages/wc/wc.js @@ -0,0 +1,66 @@ +// pages/wc/wc.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/wc/wc.json b/pages/wc/wc.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/wc/wc.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/wc/wc.wxml b/pages/wc/wc.wxml new file mode 100644 index 0000000..ec17616 --- /dev/null +++ b/pages/wc/wc.wxml @@ -0,0 +1,3 @@ + +pages/wc/wc.wxml +dshdhsi diff --git a/pages/wc/wc.wxss b/pages/wc/wc.wxss new file mode 100644 index 0000000..f8d5683 --- /dev/null +++ b/pages/wc/wc.wxss @@ -0,0 +1 @@ +/* pages/wc/wc.wxss */ \ No newline at end of file diff --git a/project.config.json b/project.config.json deleted file mode 100644 index 5a0f86f..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": "" - }, - "condition": false - }, - "compileType": "miniprogram", - "libVersion": "2.19.4", - "appid": "wx7f67447c72994c39", - "projectname": "miniprogram-92", - "condition": {}, - "editorSetting": { - "tabIndent": "insertSpaces", - "tabSize": 2 - } -} \ No newline at end of file