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 0000000..ebb0128
Binary files /dev/null and b/images/mine/signedup.png differ
diff --git a/images/mine/signup.png b/images/mine/signup.png
new file mode 100644
index 0000000..c3eebfb
Binary files /dev/null and b/images/mine/signup.png differ
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/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index 28e8c99..497f2f5 100644
--- a/pages/toRegister/toRegister.js
+++ b/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
// }
// })
let that = this
- const versionNum = "1.4.17"
+ const versionNum = "1.4.18"
api.getScanSwitch(versionNum).then(function (res) {
console.log(res.data)
let state = res.data.scanFlag
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