diff --git a/components/active/active-item.vue b/components/active/active-item.vue
index c6d7fa6..c570e2e 100644
--- a/components/active/active-item.vue
+++ b/components/active/active-item.vue
@@ -14,7 +14,7 @@
{{item.address}}
- {{item.num}}/{{item.sum}}
+ {{item.num || 0}}/{{item.sum || 0}}
立即报名
已结束
@@ -212,4 +212,4 @@
.active {
color: $uni-color-primary !important;
}
-
\ No newline at end of file
+
diff --git a/components/travel/travelList.vue b/components/travel/travelList.vue
index ae7c00c..8e68d9c 100644
--- a/components/travel/travelList.vue
+++ b/components/travel/travelList.vue
@@ -14,7 +14,7 @@
¥{{item.price}}
- {{item.num}}/{{item.sum}}
+ {{item.num || 0}}/{{item.sum || 0}}
报名中
已结束
diff --git a/pages/index/center.vue b/pages/index/center.vue
index 78c01a6..180c761 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -13,7 +13,7 @@
{{isLogin ? userInfo.nickName : '请点击登录'}}
- {{isLogin ? userInfo.phone : ''}}
+ {{ userInfo.phone || '' }}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 24a37c2..cdc1482 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -265,6 +265,8 @@
// }
// })
+ let state = this.params.state
+
let list1 = await this.getApi('activityPageList')
let list2 = await this.getApi('travelPageList')
@@ -286,9 +288,15 @@
this.cardListData = [...this.cardListData, ...list1, ...list2]
- this.cardListData.sort((a, b) => {
- return this.$dayjs(a.startTime).valueOf() - this.$dayjs(b.startTime).valueOf()
- })
+ if(state == 0){
+ this.cardListData.sort((a, b) => {
+ return this.$dayjs(a.startTime).valueOf() - this.$dayjs(b.startTime).valueOf()
+ })
+ }else{
+ this.cardListData.sort((a, b) => {
+ return this.$dayjs(b.startTime).valueOf() - this.$dayjs(a.startTime).valueOf()
+ })
+ }
},
getApi(api){
return new Promise((success, error) => {
diff --git a/pages_login/wxLogin.vue b/pages_login/wxLogin.vue
index 675a61c..be20a38 100644
--- a/pages_login/wxLogin.vue
+++ b/pages_login/wxLogin.vue
@@ -23,7 +23,8 @@
-
+
已同意《隐私政策》
《用户协议》
@@ -99,6 +100,7 @@
.login-title {
font-size: 40rpx;
font-weight: bold;
+ line-height: 56rpx;
margin: 20rpx 0rpx;
}
@@ -133,6 +135,8 @@
display: flex;
align-items: center;
margin-top: 20rpx;
+ font-size: 28rpx;
+ line-height: 56rpx;
&::v-deep .uv-checkbox-group {
align-items: center !important;
@@ -145,4 +149,4 @@
}
}
}
-
\ No newline at end of file
+
diff --git a/pages_login/wxUserInfo.vue b/pages_login/wxUserInfo.vue
index b4eb4d6..9caf406 100644
--- a/pages_login/wxUserInfo.vue
+++ b/pages_login/wxUserInfo.vue
@@ -187,8 +187,9 @@
}
.title {
- line-height: 45rpx;
+ line-height: 56rpx;
font-weight: 900;
+ font-size: 40rpx;
}
.line {
@@ -199,6 +200,7 @@
border-bottom: 1px solid #00000023;
padding: 30rpx 0;
margin: 0 auto;
+ font-size: 30rpx;
}
.chooseAvatar {
@@ -210,8 +212,7 @@
}
.btn {
- // background: $uni-linear-gradient-btn-color;
- background: $uni-color;
+ background: $uni--bg-color-btn;
color: #fff;
width: 80%;
padding: 20rpx 0;
@@ -220,17 +221,15 @@
margin-top: 10vh;
}
.getPhoneNumber{
- // all: unset;
display: flex;
justify-content: center;
align-items: center;
- // background: $uni-linear-gradient-btn-color;
- background: $uni-color;
+ background: $uni--bg-color-btn;
color: #fff;
- width: 200rpx;
+ width: 220rpx;
height: 60rpx;
border-radius: 30rpx;
- font-size: 24rpx;
+ font-size: 28rpx;
}
}
-
\ No newline at end of file
+