Merge pull request '更新' (#14) from master into wc_branch

pull/16/head
pnfwtvqce 2 years ago
commit cf7362d0e1

@ -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",

@ -6,5 +6,6 @@
align-items: center;
justify-content: space-between;
padding: 200rpx 0;
/**满屏幕是750rpx**/
box-sizing: border-box;
}

@ -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
});
}
})

@ -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>

@ -1 +1,23 @@
/* 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);
}

@ -6,6 +6,8 @@ Page({
*/
data: {
},
/**

@ -1,39 +1,34 @@
<text>可能喜欢(๑•̀ㅂ•́)و✧</text>
<view class="menu">
<view class="item">
<image src="/static/tabbar/movie.png"></image>
<text>阿斌</text>
</view>
<view class="item">
<image src="/static/tabbar/movie.png"></image>
<text>阿斌</text>
</view>
<view class="item">
<image src="/static/tabbar/movie.png"></image>
<text>阿斌</text>
</view>
<view class="item">
<image src="/static/tabbar/movie.png"></image>
<text>阿斌</text>
</view>
<view class="item">
<image src="/static/tabbar/movie.png"></image>
<text>阿斌</text>
</view>
<view class="item">
<image src="/static/tabbar/movie.png"></image>
<text>阿斌</text>
</view>
<view class="item">
<image src="/static/tabbar/movie.png"></image>
<text>阿斌</text>
</view>
<view class="item">
<image src="/static/tabbar/movie.png"></image>
<text>阿斌</text>
</view>
<view class="item">
<image src="/static/tabbar/movie.png"></image>
<text>阿斌</text>
</view>
<view>可能喜欢(๑•̀ㅂ•́)و✧</view>
<view class="zhu">
<view class="zhiyin">
<navigator url="/pages/wc/wc">
<image src="/static/tabbar/home.png"></image>
</navigator>
</view>
<view class="zhiyin">
<navigator url="/pages/wc/wc">
<image src="/static/tabbar/home.png"></image>
</navigator>
</view>
<view class="zhiyin">
<navigator url="/pages/wc/wc">
<image src="/static/tabbar/home.png"></image>
</navigator>
</view>
<view class="meme">
<navigator url="/pages/wc/wc">
<image src="/static/tabbar/commemorate.png"></image>
</navigator>
</view>
<view class="meme">
<navigator url="/pages/wc/wc">
<image src="/static/tabbar/commemorate.png"></image>
</navigator>
</view>
<view class="meme">
<navigator url="/pages/wc/wc">
<image src="/static/tabbar/commemorate.png"></image>
</navigator>
</view>
</view>

@ -1 +1,29 @@
/* 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;
}

@ -0,0 +1,66 @@
// pages/wc/wc.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
})

@ -0,0 +1,3 @@
{
"usingComponents": {}
}

@ -0,0 +1,3 @@
<!--pages/wc/wc.wxml-->
<text>pages/wc/wc.wxml</text>
<view>dshdhsi</view>

@ -0,0 +1 @@
/* pages/wc/wc.wxss */

@ -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
}
}
Loading…
Cancel
Save