diff --git a/app.json b/app.json index 465d87b..ba9be0a 100644 --- a/app.json +++ b/app.json @@ -1,6 +1,5 @@ { "pages":[ - "pages/logs/logs", "pages/login/index", "pages/index/index" ], diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 087cb93..04df161 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -1,18 +1,6 @@ - + - - - - - - {{userInfo.nickName}} - - - - {{motto}} - - 按钮 按钮 按钮 diff --git a/pages/login/index.js b/pages/login/index.js index 9181094..8c41ddb 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -1,66 +1,33 @@ -// pages/login/index.js +// refresh.js Page({ /** * 页面的初始数据 */ data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - + refresherState: false }, - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - + onRefresh(e) { + console.log('onRefresh>>>>') + this.setData({ + refresherState: true + }) + setTimeout(() => { + this.setData({ + refresherState: false + }) + }, 3000) }, - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - + onLoad() { + setTimeout(() => { + this.setData({ + refresherState: true + }) + }, 3000) }, - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - + onPulling(e) { } }) \ No newline at end of file diff --git a/pages/login/index.json b/pages/login/index.json index 8835af0..55859b2 100644 --- a/pages/login/index.json +++ b/pages/login/index.json @@ -1,3 +1,7 @@ { - "usingComponents": {} + "usingComponents": { + "van-nav-bar": "/components/nav-bar/index", + "van-button": "/components/button/index", + "refresh-view": "/components/refresher/index" + } } \ No newline at end of file diff --git a/pages/login/index.wxml b/pages/login/index.wxml index 6166f01..248dccd 100644 --- a/pages/login/index.wxml +++ b/pages/login/index.wxml @@ -1,2 +1,10 @@ -pages/login/index.wxml + + + + + + + + + diff --git a/pages/login/index.wxss b/pages/login/index.wxss index 0681818..4bc8fba 100644 --- a/pages/login/index.wxss +++ b/pages/login/index.wxss @@ -1 +1,11 @@ -/* pages/login/index.wxss */ \ No newline at end of file +/* pages/login/index.wxss */ +.test-block { + width: 100vw; + height: 500px; + background: pink; +} + +.yoo { + width: 100vw; + height: 400px; +} diff --git a/pages/logs/logs.js b/pages/logs/logs.js deleted file mode 100644 index 8c41ddb..0000000 --- a/pages/logs/logs.js +++ /dev/null @@ -1,33 +0,0 @@ -// refresh.js -Page({ - - /** - * 页面的初始数据 - */ - data: { - refresherState: false - }, - - onRefresh(e) { - console.log('onRefresh>>>>') - this.setData({ - refresherState: true - }) - setTimeout(() => { - this.setData({ - refresherState: false - }) - }, 3000) - }, - - onLoad() { - setTimeout(() => { - this.setData({ - refresherState: true - }) - }, 3000) - }, - - onPulling(e) { - } -}) \ No newline at end of file diff --git a/pages/logs/logs.json b/pages/logs/logs.json deleted file mode 100644 index 1f9960a..0000000 --- a/pages/logs/logs.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "navigationBarTitleText": "查看启动日志", - "usingComponents": { - "refresh-view": "/components/refresher/index" - } -} \ No newline at end of file diff --git a/pages/logs/logs.wxml b/pages/logs/logs.wxml deleted file mode 100644 index c070f6f..0000000 --- a/pages/logs/logs.wxml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/pages/logs/logs.wxss b/pages/logs/logs.wxss deleted file mode 100644 index d2b6cce..0000000 --- a/pages/logs/logs.wxss +++ /dev/null @@ -1,10 +0,0 @@ -.test-block { - width: 100vw; - height: 500px; - background: pink; -} - -.yoo { - width: 100vw; - height: 400px; -}