'修复bug'

components/active/active-item.vue

@@ -14,7 +14,7 @@
 						<view class="address">{{item.address}}</view>
 					</view>
 					<view class="price">
-						<view class="num-box">{{item.num}}/{{item.sum}}</view>
+						<view class="num-box">{{item.num || 0}}/{{item.sum || 0}}</view>
 						<view class="btn-box" v-if="item.state == 0">立即报名</view>
 						<view class="btn-box btn-box2"  v-if="item.state == 1">已结束</view>
 					</view>
@@ -212,4 +212,4 @@
 	.active {
 		color: $uni-color-primary !important;
 	}
-</style>
+</style>

components/travel/travelList.vue

@@ -14,7 +14,7 @@
 		        </view>
 		        <view class="data">
 		            <text>¥{{item.price}}</text>
-		            <text>{{item.num}}/{{item.sum}}</text>
+		            <text>{{item.num || 0}}/{{item.sum || 0}}</text>
 		            <text class="btn" v-if="item.state == 0">报名中</text>
 					<text class="btn-2" v-if="item.state == 1">已结束</text>
 		        </view>

pages/index/center.vue

@@ -13,7 +13,7 @@
 						{{isLogin ? userInfo.nickName : '请点击登录'}}
 					</view>
 					<view class="tips">
-						{{isLogin ? userInfo.phone : ''}}
+						{{ userInfo.phone || '' }}
 					</view>
 				</view>
 				<view class="setting" @click="toInfo">

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) => {

pages_login/wxLogin.vue

@@ -23,7 +23,8 @@
 		<view class="privacy">
 			<uv-radio-group>
 				<uv-checkbox-group v-model="consent">
-					<uv-checkbox :size="30" shape="circle" active-color="#05C160" :name="privacy"></uv-checkbox>
+					<uv-checkbox size="30rpx" 
+                    shape="circle" active-color="#05C160" :name="privacy"></uv-checkbox>
 				</uv-checkbox-group>
 				已同意<text class="privacy-title" @click="jump(1)">《隐私政策》</text>
 				<text class="privacy-title" @click="jump(2)">《用户协议》</text>
@@ -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 @@
 			}
 		}
 	}
-</style>
+</style>

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;
 		}
 	}
-</style>
+</style>