From 95510a7c53fcb67cb60a31ebf873adb6ae978473 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Fri, 24 Jul 2020 13:38:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84-=E7=AD=BE=E5=88=B0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/activity/activity.wxss | 10 +++--- dist/popup/index.wxss | 2 +- images/mine/signedup.png | Bin 0 -> 5402 bytes images/mine/signup.png | Bin 0 -> 5775 bytes .../mine/components/issueItem/issueItem.wxml | 2 +- pages/mine/mine.js | 34 +++++++++++++++++- pages/mine/mine.json | 3 +- pages/mine/mine.wxml | 33 ++++++++++++----- pages/mine/mine.wxss | 28 +++++++++------ project.config.json | 2 +- utils/api.js | 11 +++++- 11 files changed, 95 insertions(+), 30 deletions(-) create mode 100644 images/mine/signedup.png create mode 100644 images/mine/signup.png diff --git a/components/activity/activity.wxss b/components/activity/activity.wxss index 2945ddb..845edfb 100644 --- a/components/activity/activity.wxss +++ b/components/activity/activity.wxss @@ -1,10 +1,10 @@ .layout { display: table; - width: calc(100% - 40rpx); + /* width: calc(100% - 40rpx); */ height: 276rpx; - border-radius: 10rpx; + /* border-radius: 10rpx; */ background: #fff; - margin: 20rpx 20rpx 0rpx 20rpx; + margin: 20rpx 0rpx 0rpx 0rpx; /* flex-direction: column; justify-content: space-between; box-sizing: border-box; */ @@ -52,7 +52,7 @@ line-height: 37rpx; text-align: center; border-radius: 16rpx 0; - background: #d1d1d1; + background: rgba(0, 0, 0, 0.3); } .signed-logo { @@ -152,7 +152,7 @@ .total, .signed { display: block; font-size: 28rpx; - padding: 0px 20rpx 0px 20rpx; + padding: 0px 20rpx 0px 0rpx; height: 40rpx; line-height: 40rpx; border-radius: 20rpx; diff --git a/dist/popup/index.wxss b/dist/popup/index.wxss index 6a2d316..64dc4e5 100644 --- a/dist/popup/index.wxss +++ b/dist/popup/index.wxss @@ -12,7 +12,7 @@ } .wux-popup-position.wux-popup-position--center .wux-popup__content { - border-radius: 6rpx + border-radius: 16rpx } .wux-popup-position.wux-popup-position--center .wux-popup__hd { diff --git a/images/mine/signedup.png b/images/mine/signedup.png new file mode 100644 index 0000000000000000000000000000000000000000..ebb01288a4bb1088899c6a0cb77aad8836960c06 GIT binary patch literal 5402 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 N002ovPDHLkV1n+B8t4E3 literal 0 HcmV?d00001 diff --git a/pages/mine/components/issueItem/issueItem.wxml b/pages/mine/components/issueItem/issueItem.wxml index 1b738bf..daceb6c 100644 --- a/pages/mine/components/issueItem/issueItem.wxml +++ b/pages/mine/components/issueItem/issueItem.wxml @@ -7,7 +7,7 @@ catchtap="previewImage" data-src="{{item}}" wx:for="{{issueObj.images}}" - wx:key="{{index}}" + wx:key="index" wx:for-item="item" wx:for-index="index" src="{{item}}" /> diff --git a/pages/mine/mine.js b/pages/mine/mine.js index b015d27..5aa4d8d 100644 --- a/pages/mine/mine.js +++ b/pages/mine/mine.js @@ -20,12 +20,16 @@ Page({ faceImg: "", nickname: "", partyFlag: "", + isSignUp: 0, points: 0, grade: 0 }, completeInfoDialogVisible: false, infoCompleted: 0, - changeName:false + changeName:false, + visible: false, + signMsg: '', + signCode: 0 }, onLoad () { if(app.globalData.infoCompleted == 0 || app.globalData.infoCompleted == 4){//当状态为0 或者 4 的时候 显示完善个人信息其余状态为更改个人信息 @@ -328,5 +332,33 @@ Page({ icon: "none", duration: 1000 }) + }, + + //签到 2020.07.24 + toSignUp () { + api.userInfoSignUp().then(res => { + console.log(res.data) + if (res.code === 0) { + // 显示提醒 + this.setData({ + signCode: res.code, + signMsg: res.data, + visible: true + }); + } else { + this.setData({ + signCode: res.code, + signMsg: res.msg, + visible: true + }); + } + }) + }, + // 关闭签到提醒 + onClose() { + this.getUserInfo() + this.setData({ + visible: false + }); } }) \ No newline at end of file diff --git a/pages/mine/mine.json b/pages/mine/mine.json index 4aa93e3..83f080f 100644 --- a/pages/mine/mine.json +++ b/pages/mine/mine.json @@ -8,6 +8,7 @@ "topic-item": "./components/topicItemNew/topicItemNew", "preload-topic-item": "./components/preloadTopicItem/preloadTopicItem", "load-more": "../../components/loadMore/loadMore", - "completeInfo-dialog": "../../components/completeInfoDialog/completeInfoDialog" + "completeInfo-dialog": "../../components/completeInfoDialog/completeInfoDialog", + "wux-popup": "../../dist/popup/index" } } \ No newline at end of file diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml index 413660d..b93fac6 100644 --- a/pages/mine/mine.wxml +++ b/pages/mine/mine.wxml @@ -17,12 +17,23 @@ - - - - 完善信息 - 更改信息 - + + + + + 完善信息 + 更改信息 + + + + + + + @@ -31,7 +42,8 @@ 积分：{{userInfo.points}} - 积分兑换 + + + + 确定 + \ No newline at end of file diff --git a/pages/mine/mine.wxss b/pages/mine/mine.wxss index 3a2ac28..e9e4cd8 100644 --- a/pages/mine/mine.wxss +++ b/pages/mine/mine.wxss @@ -36,26 +36,27 @@ page { overflow: hidden; } .personal-info .box .content .bottom { - margin-top: 50rpx !important; + margin-top: 10rpx; box-sizing: border-box; - padding-left: 30rpx; width: 100%; height: 30rpx; display: flex; align-items: center; - justify-content: space-between; + justify-content: space-around; } .personal-info .box .content .bottom text{ color: #fff; font-size: 30rpx; line-height: 30rpx; + flex: 1; + text-align: center; } .personal-info .box .content .top { margin-top: 30rpx; box-sizing: border-box; - padding-left: 40rpx; + padding-left: 50rpx; width: 100%; - height: 100rpx; + height: 140rpx; display: flex; align-items: center; justify-content: space-between; @@ -84,6 +85,9 @@ page { display: flex; flex-direction: column; justify-content: center; +} +.personal-info .box .content .top .right-enter { + } .personal-info .box .content .top .right .nickname { font-size: 30rpx; @@ -116,6 +120,7 @@ page { height: 46rpx; position: relative; margin-right: 14rpx; + margin-top: 22rpx; } .personal-info .box .content .top .complete-info .complete-image { position: absolute; @@ -146,12 +151,6 @@ page { object-fit: cover; margin-left: 8rpx; } -.personal-info .box .content .bottom { - margin-top: 30rpx; - display: flex; - align-items: center; - justify-content: space-around; -} .personal-info .box .content .bottom .operation { flex: 1; display: flex; @@ -380,4 +379,11 @@ page { align-items: center; color: #999; font-size: 26rpx; +} + +.popup__button { + width: 100%; + text-align: center; + font-size: 36rpx; + color: #04BCA0; } \ No newline at end of file diff --git a/project.config.json b/project.config.json index 4351ed7..04c5824 100644 --- a/project.config.json +++ b/project.config.json @@ -22,7 +22,7 @@ "disablePlugins": [], "outputPath": "" }, - "useCompilerModule": false, + "useCompilerModule": true, "userConfirmedUseCompilerModuleSwitch": false, "compileHotReLoad": false, "useIsolateContext": true diff --git a/utils/api.js b/utils/api.js index 49aa293..a7e143c 100644 --- a/utils/api.js +++ b/utils/api.js @@ -55,7 +55,8 @@ module.exports = { getResidentConfig:getResidentConfig, getScrip:getScrip, getHomePhone:getHomePhone, - gradeRankinglist:gradeRankinglist + gradeRankinglist:gradeRankinglist, + userInfoSignUp:userInfoSignUp } function getToken (wxCode) { @@ -516,4 +517,12 @@ function gradeRankinglist ({ pageIndex, pageSize }) +} + +/** + * 用户签到 2020.07.24 + */ + +function userInfoSignUp () { + return fly.get("app-user/user/sign") } \ No newline at end of file