From 3b65e8b44bf7261f46cfa2989da19f91367439ac Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Fri, 8 May 2020 17:56:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/nodata/nodata.js | 9 +++ components/nodata/nodata.json | 4 ++ components/nodata/nodata.wxml | 5 ++ components/nodata/nodata.wxss | 19 ++++++ images/nodata.png | Bin 0 -> 32434 bytes pages/mine/mine.js | 63 +++++++++++------- pages/mine/mine.wxml | 58 +++++----------- pages/mine/mine.wxss | 15 +++++ subpages/integralCentre/pages/index/index.js | 7 +- .../integralCentre/pages/index/index.json | 3 +- .../integralCentre/pages/index/index.wxml | 9 ++- utils/api.js | 6 +- 12 files changed, 126 insertions(+), 72 deletions(-) create mode 100644 components/nodata/nodata.js create mode 100644 components/nodata/nodata.json create mode 100644 components/nodata/nodata.wxml create mode 100644 components/nodata/nodata.wxss create mode 100644 images/nodata.png diff --git a/components/nodata/nodata.js b/components/nodata/nodata.js new file mode 100644 index 0000000..e64ee38 --- /dev/null +++ b/components/nodata/nodata.js @@ -0,0 +1,9 @@ +Component({ + properties: { + isShow: { + type: Boolean + } + }, + data: {}, + methods: {} +}); diff --git a/components/nodata/nodata.json b/components/nodata/nodata.json new file mode 100644 index 0000000..e8cfaaf --- /dev/null +++ b/components/nodata/nodata.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/components/nodata/nodata.wxml b/components/nodata/nodata.wxml new file mode 100644 index 0000000..2c2f61c --- /dev/null +++ b/components/nodata/nodata.wxml @@ -0,0 +1,5 @@ + + + + 暂无数据~ + diff --git a/components/nodata/nodata.wxss b/components/nodata/nodata.wxss new file mode 100644 index 0000000..0a74b93 --- /dev/null +++ b/components/nodata/nodata.wxss @@ -0,0 +1,19 @@ +/* components/nodata/nodata.wxss */ +.box{ + width: 100%; + height: auto; + box-sizing: border-box; + text-align: center; + margin-top: 100rpx; +} +.image{ + width: 450rpx; + height: 240rpx; +} +.text{ + width: 100%; + height: auto; + font-size: 28rpx; + color: #BCBCBC; + display: block; +} \ No newline at end of file diff --git a/images/nodata.png b/images/nodata.png new file mode 100644 index 0000000000000000000000000000000000000000..782f95e39f1dfed942132966692b80405f0d1fc4 GIT binary patch literal 32434 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 literal 0 HcmV?d00001 diff --git a/pages/mine/mine.js b/pages/mine/mine.js index 23e8d9d..9070c65 100644 --- a/pages/mine/mine.js +++ b/pages/mine/mine.js @@ -1,5 +1,7 @@ const api = require('../../utils/api') -import { getTimestamp } from '../../utils/common' +import { + getTimestamp +} from '../../utils/common' const app = getApp() Page({ @@ -22,13 +24,13 @@ Page({ completeInfoDialogVisible: false, infoCompleted: 0 }, - onLoad () { + onLoad() { this.getUserInfo() this.setData({ infoCompleted: app.globalData.infoCompleted }) }, - onShow () { + onShow() { if (!app.globalData.previewImage) { this.data.pageNo = 1 this.data.pageSize = 10 @@ -41,7 +43,7 @@ Page({ this.getIssueList() } else if (this.data.selectedTabBar === 'project') { this.getProjectList() - } else if (this.data.selectedTabBar === 'topic') { + } else if (this.data.selectedTabBar === 'topic') { this.getTopicList() } } @@ -74,7 +76,7 @@ Page({ } }, // tab 切换 - chooseTabBar (e) { + chooseTabBar(e) { this.setData({ nomoreVisible: false, nomoreStatus: 'loading', @@ -90,13 +92,13 @@ Page({ this.getProjectList() } else if (e.currentTarget.dataset.type === 'topic') { this.getTopicList() - } + } this.setData({ selectedTabBar: e.currentTarget.dataset.type }) }, // 获取 我的话题列表 - getTopicList () { + getTopicList() { this.setData({ topicList: [] }) @@ -121,7 +123,7 @@ Page({ }) }, // 获取 我的话题列表 上拉加载 - loadMoreTopicList () { + loadMoreTopicList() { const para = { pageIndex: this.data.pageNo, pageSize: this.data.pageSize @@ -144,7 +146,7 @@ Page({ }) }, // 获取 我的议题列表 - getIssueList () { + getIssueList() { this.setData({ issueList: [] }) @@ -165,7 +167,7 @@ Page({ }) }, // 获取 我的项目列表 - getProjectList () { + getProjectList() { this.setData({ projectList: [] }) @@ -192,7 +194,7 @@ Page({ }) }, // 获取 我的项目列表 上拉加载 - loadMoreProjectList () { + loadMoreProjectList() { const para = { pageIndex: this.data.pageNo, pageSize: this.data.pageSize, @@ -200,7 +202,7 @@ Page({ } api.getMyProjectList(para).then(res => { console.log('我的项目列表', res) - const projectList = [...this.data.projectList,...res.data] + const projectList = [...this.data.projectList, ...res.data] this.setData({ nomoreStatus: res.data.length === 10 ? 'loading' : 'none', preloadVisible: false, @@ -216,11 +218,11 @@ Page({ }) }, // 获取用户信息 - getUserInfo () { + getUserInfo() { api.getUserInfo().then(res => { console.log('用户信息', res) const userInfo = {} - for(const key in this.data.userInfo) { + for (const key in this.data.userInfo) { userInfo[key] = res.data[key] } this.setData({ @@ -238,14 +240,17 @@ Page({ }) }, // 完善信息 - navigateToComplete () { + navigateToComplete() { wx.navigateTo({ url: '/pages/complete/complete' }) }, // 议题列表 跳转详情 - toIssueDetail (e) { - const { issueId, state } = e.detail + toIssueDetail(e) { + const { + issueId, + state + } = e.detail if (state !== '待审核' && state !== '未通过') { wx.navigateTo({ url: `/subpages/discussion/pages/discussionDetail/discussionDetail?type=issue&detailId=${issueId}` @@ -257,21 +262,25 @@ Page({ } }, // 项目列表 跳转详情 - toProjectDetail (e) { - const { itemId } = e.detail + toProjectDetail(e) { + const { + itemId + } = e.detail wx.navigateTo({ url: `/subpages/discussion/pages/discussionDetail/discussionDetail?type=project&detailId=${itemId}` }) }, // 话题列表 跳转详情 - toTopicDetail (e) { - const { topicId } = e.detail + toTopicDetail(e) { + const { + topicId + } = e.detail wx.navigateTo({ url: `/subpages/association/pages/topicDetail/topicDetail?detailId=${topicId}` }) }, // 我有事说 - addIssue () { + addIssue() { if (this.data.infoCompleted == 0) { this.setData({ completeInfoDialogVisible: !this.data.completeInfoDialogVisible @@ -283,15 +292,21 @@ Page({ }) }, // 跳转到 邀请记录 - navigateToInviteRecord () { + navigateToInviteRecord() { wx.navigateTo({ url: '/subpages/mine/pages/inviteRecord/inviteRecord' }) }, // 跳转到 网格管理 - navigateToGridManage () { + navigateToGridManage() { wx.navigateTo({ url: '/subpages/mine/pages/gridManage/gridManage' }) + }, + //跳转到积分中心 + navigateToIntegralCentre(e) { + wx.navigateTo({ + url: `/subpages/integralCentre/pages/index/index?points = ` + e.currentTarget.dataset.points + }) } }) \ No newline at end of file diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml index e4074f3..d99cd67 100644 --- a/pages/mine/mine.wxml +++ b/pages/mine/mine.wxml @@ -25,6 +25,13 @@ + + 等级:{{userInfo.grade}} + 等级:0 + 积分:{{userInfo.points}} + 积分:0 + 积分兑换 + @@ -24,6 +24,9 @@ +{{item.points}} {{item.operationTime}} + + + @@ -47,6 +50,10 @@ {{item.points}} + + + + diff --git a/utils/api.js b/utils/api.js index e0f1fc6..bf36579 100644 --- a/utils/api.js +++ b/utils/api.js @@ -160,10 +160,12 @@ function getProjectList(params) { * 获取用户信息 * @param {*} param0 */ +// function getUserInfo() { +// return fly.get('/app-user/user/getInfoById') +// } function getUserInfo() { - return fly.get('/app-user/user/getInfoById') + return fly.get('app-user/user/getInfoById') } - /** * 我的群列表 */