From 5eee6422379eced925f56195daf0866a56e3f535 Mon Sep 17 00:00:00 2001 From: lqq Date: Thu, 10 Oct 2019 14:27:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 11 ++-- pages/user/common/header/index.js | 23 ------- pages/user/common/header/index.json | 4 -- pages/user/common/header/index.wxml | 2 - pages/user/common/header/index.wxss | 1 - pages/user/common/myActivity/index.json | 3 - pages/user/common/myFavorite/index.json | 3 - pages/user/common/myIdea/index.json | 3 - pages/user/common/myMessage/index.json | 3 - pages/user/common/myTopics/index.json | 3 - pages/user/index.js | 12 +++- pages/user/index.json | 7 +- pages/user/index.wxml | 55 +++++++++++++--- pages/user/index.wxss | 57 +++++++++++++--- pages/user/{common => }/myActivity/index.js | 0 pages/user/myActivity/index.json | 4 ++ pages/user/{common => }/myActivity/index.wxml | 0 pages/user/{common => }/myActivity/index.wxss | 0 pages/user/{common => }/myFavorite/index.js | 0 pages/user/myFavorite/index.json | 4 ++ pages/user/{common => }/myFavorite/index.wxml | 0 pages/user/{common => }/myFavorite/index.wxss | 0 pages/user/{common => }/myIdea/index.js | 0 pages/user/myIdea/index.json | 4 ++ pages/user/{common => }/myIdea/index.wxml | 0 pages/user/{common => }/myIdea/index.wxss | 0 pages/user/myInfo/index.js | 66 +++++++++++++++++++ pages/user/myInfo/index.json | 4 ++ pages/user/myInfo/index.wxml | 2 + pages/user/myInfo/index.wxss | 1 + pages/user/{common => }/myMessage/index.js | 0 pages/user/myMessage/index.json | 4 ++ pages/user/{common => }/myMessage/index.wxml | 0 pages/user/{common => }/myMessage/index.wxss | 0 pages/user/{common => }/myTopics/index.js | 0 pages/user/myTopics/index.json | 4 ++ pages/user/{common => }/myTopics/index.wxml | 0 pages/user/{common => }/myTopics/index.wxss | 0 project.config.json | 9 ++- 39 files changed, 210 insertions(+), 79 deletions(-) delete mode 100644 pages/user/common/header/index.js delete mode 100644 pages/user/common/header/index.json delete mode 100644 pages/user/common/header/index.wxml delete mode 100644 pages/user/common/header/index.wxss delete mode 100644 pages/user/common/myActivity/index.json delete mode 100644 pages/user/common/myFavorite/index.json delete mode 100644 pages/user/common/myIdea/index.json delete mode 100644 pages/user/common/myMessage/index.json delete mode 100644 pages/user/common/myTopics/index.json rename pages/user/{common => }/myActivity/index.js (100%) create mode 100644 pages/user/myActivity/index.json rename pages/user/{common => }/myActivity/index.wxml (100%) rename pages/user/{common => }/myActivity/index.wxss (100%) rename pages/user/{common => }/myFavorite/index.js (100%) create mode 100644 pages/user/myFavorite/index.json rename pages/user/{common => }/myFavorite/index.wxml (100%) rename pages/user/{common => }/myFavorite/index.wxss (100%) rename pages/user/{common => }/myIdea/index.js (100%) create mode 100644 pages/user/myIdea/index.json rename pages/user/{common => }/myIdea/index.wxml (100%) rename pages/user/{common => }/myIdea/index.wxss (100%) create mode 100644 pages/user/myInfo/index.js create mode 100644 pages/user/myInfo/index.json create mode 100644 pages/user/myInfo/index.wxml create mode 100644 pages/user/myInfo/index.wxss rename pages/user/{common => }/myMessage/index.js (100%) create mode 100644 pages/user/myMessage/index.json rename pages/user/{common => }/myMessage/index.wxml (100%) rename pages/user/{common => }/myMessage/index.wxss (100%) rename pages/user/{common => }/myTopics/index.js (100%) create mode 100644 pages/user/myTopics/index.json rename pages/user/{common => }/myTopics/index.wxml (100%) rename pages/user/{common => }/myTopics/index.wxss (100%) diff --git a/app.json b/app.json index 9941a5f..118cedb 100644 --- a/app.json +++ b/app.json @@ -13,11 +13,12 @@ "pages/topics/common/goodIdea/index", "pages/article/index", "pages/register/index", - "pages/user/common/myActivity/index", - "pages/user/common/myFavorite/index", - "pages/user/common/myIdea/index", - "pages/user/common/myMessage/index", - "pages/user/common/myTopics/index" + "pages/user/myActivity/index", + "pages/user/myFavorite/index", + "pages/user/myIdea/index", + "pages/user/myMessage/index", + "pages/user/myTopics/index", + "pages/user/myInfo/index" ], "window": { "backgroundTextStyle": "light", diff --git a/pages/user/common/header/index.js b/pages/user/common/header/index.js deleted file mode 100644 index 9286b52..0000000 --- a/pages/user/common/header/index.js +++ /dev/null @@ -1,23 +0,0 @@ -// pages/user/common/header/index.js -Component({ - /** - * 组件的属性列表 - */ - properties: { - - }, - - /** - * 组件的初始数据 - */ - data: { - - }, - - /** - * 组件的方法列表 - */ - methods: { - - } -}) diff --git a/pages/user/common/header/index.json b/pages/user/common/header/index.json deleted file mode 100644 index e8cfaaf..0000000 --- a/pages/user/common/header/index.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "component": true, - "usingComponents": {} -} \ No newline at end of file diff --git a/pages/user/common/header/index.wxml b/pages/user/common/header/index.wxml deleted file mode 100644 index 4409247..0000000 --- a/pages/user/common/header/index.wxml +++ /dev/null @@ -1,2 +0,0 @@ - -pages/user/common/header/index.wxml diff --git a/pages/user/common/header/index.wxss b/pages/user/common/header/index.wxss deleted file mode 100644 index b2ebd8e..0000000 --- a/pages/user/common/header/index.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/user/common/header/index.wxss */ \ No newline at end of file diff --git a/pages/user/common/myActivity/index.json b/pages/user/common/myActivity/index.json deleted file mode 100644 index 8835af0..0000000 --- a/pages/user/common/myActivity/index.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "usingComponents": {} -} \ No newline at end of file diff --git a/pages/user/common/myFavorite/index.json b/pages/user/common/myFavorite/index.json deleted file mode 100644 index 8835af0..0000000 --- a/pages/user/common/myFavorite/index.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "usingComponents": {} -} \ No newline at end of file diff --git a/pages/user/common/myIdea/index.json b/pages/user/common/myIdea/index.json deleted file mode 100644 index 8835af0..0000000 --- a/pages/user/common/myIdea/index.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "usingComponents": {} -} \ No newline at end of file diff --git a/pages/user/common/myMessage/index.json b/pages/user/common/myMessage/index.json deleted file mode 100644 index 8835af0..0000000 --- a/pages/user/common/myMessage/index.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "usingComponents": {} -} \ No newline at end of file diff --git a/pages/user/common/myTopics/index.json b/pages/user/common/myTopics/index.json deleted file mode 100644 index 8835af0..0000000 --- a/pages/user/common/myTopics/index.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "usingComponents": {} -} \ No newline at end of file diff --git a/pages/user/index.js b/pages/user/index.js index 329741b..8866310 100644 --- a/pages/user/index.js +++ b/pages/user/index.js @@ -4,8 +4,8 @@ Page({ /** * 页面的初始数据 */ - data: { - list: ['我的消息', '我的议题', '我的收藏', '我的金点子', '我的活动'] + data: { + }, /** @@ -14,7 +14,13 @@ Page({ onLoad: function (options) { }, - + onTapItem (e) { + const {type} = e.currentTarget.dataset + console.log(type) + wx.navigateTo({ + url: `/pages/user/${type}/index`, + }) + }, /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/pages/user/index.json b/pages/user/index.json index 2686328..e55e9d7 100644 --- a/pages/user/index.json +++ b/pages/user/index.json @@ -1,11 +1,6 @@ { + "navigationBarTitleText": "个人中心", "usingComponents": { - "Header": "./common/header/index", - "MyMessage": "./common/myMessage/index", - "MyTopics": "./common/myTopics/index", - "MyFavorite": "./common/myFavorite/index", - "MyIdea": "./common/myIdea/index", - "MyActivity": "./common/myActivity/index", "mp-cells":"/components/weui/cells/cells", "mp-cell":"/components/weui/cell/cell" } diff --git a/pages/user/index.wxml b/pages/user/index.wxml index b118002..1dbd621 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -1,13 +1,50 @@ - -
- - - - - - 我的消息 - + + + + + + 啦啦啦拉两岸啦啦啦啦啦靓阿拉啦啦啦 + + + + + + + 你有5条消息 + + + + + + + + diff --git a/pages/user/index.wxss b/pages/user/index.wxss index ff0444d..3d7dd49 100644 --- a/pages/user/index.wxss +++ b/pages/user/index.wxss @@ -1,17 +1,54 @@ /* pages/user/index.wxss */ -.my-cell{ +.container { + background-color: #FAFAFA; + height: 100vh; +} +.page_hd { + border-bottom: 7px solid #f7f7f7; +} +.page_hd .weui-cells:before { + border-top: 0px solid white; +} +.page_hd .weui-cells:after { + border-bottom: 0px solid white; +} +.user_hd { display: flex; flex-direction: row; + align-items: center; + overflow: hidden; } -.cell-icon{ - width: 15px; - height: 15px; +.user_logo { + width: 80px; + height: 80px; + border-radius: 40px; + background-color: red; +} +.user_name { + width: 400rpx; + color: #292E3E; + padding-left: 10px; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; +} +/* 页面body */ +.page_bd .weui-cell__hd { + display: flex; + align-items: center; } -.cell-title{ - color: #3B3B3B; - font-size: 14px; +.page_bd .weui-cell__icon { + width: 19px; + height: 16px; + padding: 0 10px 0 0; } -.cell-subTitle{ - color: #AAAAAA; - font-size: 12px; +.msg_footer:after { + content: ""; + top: calc(50% - 5px); + left: -20px; + width: 8px; + height: 8px; + border-radius: 4px; + position: absolute; + background-color: red; } \ No newline at end of file diff --git a/pages/user/common/myActivity/index.js b/pages/user/myActivity/index.js similarity index 100% rename from pages/user/common/myActivity/index.js rename to pages/user/myActivity/index.js diff --git a/pages/user/myActivity/index.json b/pages/user/myActivity/index.json new file mode 100644 index 0000000..8a76df5 --- /dev/null +++ b/pages/user/myActivity/index.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "我的活动", + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/user/common/myActivity/index.wxml b/pages/user/myActivity/index.wxml similarity index 100% rename from pages/user/common/myActivity/index.wxml rename to pages/user/myActivity/index.wxml diff --git a/pages/user/common/myActivity/index.wxss b/pages/user/myActivity/index.wxss similarity index 100% rename from pages/user/common/myActivity/index.wxss rename to pages/user/myActivity/index.wxss diff --git a/pages/user/common/myFavorite/index.js b/pages/user/myFavorite/index.js similarity index 100% rename from pages/user/common/myFavorite/index.js rename to pages/user/myFavorite/index.js diff --git a/pages/user/myFavorite/index.json b/pages/user/myFavorite/index.json new file mode 100644 index 0000000..c1b3d78 --- /dev/null +++ b/pages/user/myFavorite/index.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "我的收藏", + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/user/common/myFavorite/index.wxml b/pages/user/myFavorite/index.wxml similarity index 100% rename from pages/user/common/myFavorite/index.wxml rename to pages/user/myFavorite/index.wxml diff --git a/pages/user/common/myFavorite/index.wxss b/pages/user/myFavorite/index.wxss similarity index 100% rename from pages/user/common/myFavorite/index.wxss rename to pages/user/myFavorite/index.wxss diff --git a/pages/user/common/myIdea/index.js b/pages/user/myIdea/index.js similarity index 100% rename from pages/user/common/myIdea/index.js rename to pages/user/myIdea/index.js diff --git a/pages/user/myIdea/index.json b/pages/user/myIdea/index.json new file mode 100644 index 0000000..05966b3 --- /dev/null +++ b/pages/user/myIdea/index.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "我的金点子", + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/user/common/myIdea/index.wxml b/pages/user/myIdea/index.wxml similarity index 100% rename from pages/user/common/myIdea/index.wxml rename to pages/user/myIdea/index.wxml diff --git a/pages/user/common/myIdea/index.wxss b/pages/user/myIdea/index.wxss similarity index 100% rename from pages/user/common/myIdea/index.wxss rename to pages/user/myIdea/index.wxss diff --git a/pages/user/myInfo/index.js b/pages/user/myInfo/index.js new file mode 100644 index 0000000..6b43400 --- /dev/null +++ b/pages/user/myInfo/index.js @@ -0,0 +1,66 @@ +// pages/user/myInfo/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/user/myInfo/index.json b/pages/user/myInfo/index.json new file mode 100644 index 0000000..47e544f --- /dev/null +++ b/pages/user/myInfo/index.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "个人资料", + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/user/myInfo/index.wxml b/pages/user/myInfo/index.wxml new file mode 100644 index 0000000..52a6fe1 --- /dev/null +++ b/pages/user/myInfo/index.wxml @@ -0,0 +1,2 @@ + +pages/user/myInfo/index.wxml diff --git a/pages/user/myInfo/index.wxss b/pages/user/myInfo/index.wxss new file mode 100644 index 0000000..617704e --- /dev/null +++ b/pages/user/myInfo/index.wxss @@ -0,0 +1 @@ +/* pages/user/myInfo/index.wxss */ \ No newline at end of file diff --git a/pages/user/common/myMessage/index.js b/pages/user/myMessage/index.js similarity index 100% rename from pages/user/common/myMessage/index.js rename to pages/user/myMessage/index.js diff --git a/pages/user/myMessage/index.json b/pages/user/myMessage/index.json new file mode 100644 index 0000000..211820b --- /dev/null +++ b/pages/user/myMessage/index.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "我的消息", + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/user/common/myMessage/index.wxml b/pages/user/myMessage/index.wxml similarity index 100% rename from pages/user/common/myMessage/index.wxml rename to pages/user/myMessage/index.wxml diff --git a/pages/user/common/myMessage/index.wxss b/pages/user/myMessage/index.wxss similarity index 100% rename from pages/user/common/myMessage/index.wxss rename to pages/user/myMessage/index.wxss diff --git a/pages/user/common/myTopics/index.js b/pages/user/myTopics/index.js similarity index 100% rename from pages/user/common/myTopics/index.js rename to pages/user/myTopics/index.js diff --git a/pages/user/myTopics/index.json b/pages/user/myTopics/index.json new file mode 100644 index 0000000..2e71a09 --- /dev/null +++ b/pages/user/myTopics/index.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "我的议题", + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/user/common/myTopics/index.wxml b/pages/user/myTopics/index.wxml similarity index 100% rename from pages/user/common/myTopics/index.wxml rename to pages/user/myTopics/index.wxml diff --git a/pages/user/common/myTopics/index.wxss b/pages/user/myTopics/index.wxss similarity index 100% rename from pages/user/common/myTopics/index.wxss rename to pages/user/myTopics/index.wxss diff --git a/project.config.json b/project.config.json index 213eff5..4eea4f9 100644 --- a/project.config.json +++ b/project.config.json @@ -50,7 +50,7 @@ "list": [] }, "miniprogram": { - "current": 5, + "current": 6, "list": [ { "id": -1, @@ -91,6 +91,13 @@ "id": -1, "name": "Register", "pathName": "pages/register/index", + "query": "", + "scene": null + }, + { + "id": -1, + "name": "User", + "pathName": "pages/user/index", "scene": null } ]