zhengkaixin преди 2 години
родител
ревизия
d527586d84
променени са 2 файла, в които са добавени 10 реда и са изтрити 7 реда
  1. 2 2
      components/UmessageInput.vue
  2. 8 5
      pages/monthlyCardActivity/monthlyCardBuy.vue

+ 2 - 2
components/UmessageInput.vue

@@ -15,7 +15,7 @@
 					width: width + 'rpx',
 					height: width + 'rpx',
 					color: inactiveColor,
-					borderColor:((selectIndex==-1)&& charArrLength === index && mode == 'box')||selectIndex==index ? activeColor : inactiveColor
+					borderColor:((selectIndex==-1)&& charArrLength === index && mode == 'box')||selectIndex==index ? activeColor : '#D2D2D2'
 				}">
 					<view class="u-placeholder-line" :style="{
 							display: (selectIndex==-1)&&charArrLength === index ? 'block' : 'none',
@@ -262,7 +262,7 @@
 	.u-box {
 		box-sizing: border-box;
 		border: 2rpx solid #cccccc;
-		border-radius: 6rpx;
+		border-radius: 8rpx;
 	}
 
 	.u-box-active {

+ 8 - 5
pages/monthlyCardActivity/monthlyCardBuy.vue

@@ -9,6 +9,7 @@
 						充电服务费包月卡
 					</view>
 					<view class="title-2">
+						到期时间:{{ispay?userCard.endTime:'未购买'}}<br/>
 						有效期内,合约充电站使用度数无上限
 					</view>
 				</view>
@@ -150,8 +151,9 @@
 				show2:false,
 				show1:false,
 				infoSet:false,
-				infoSet1:false,
-				endTime:"2022-08-08"
+				infoSet1:false,
+				userCard:null,
+				
 			}
 		},
 		onLoad() {
@@ -167,9 +169,9 @@
 			 this.checkSubscribe();
 		 },
 		 computed:{
-			 endCardBool(){
+			 endCardBool(){
 			 	var date=new Date().getTime()
-			 	var date2=new Date(this.endTime).getTime();
+			 	var date2=new Date(this.detail.endTime).getTime();
 			 
 			 	if(date<date2){
 			 		return true;
@@ -245,7 +247,8 @@
 								this.infoSet1=true;
 							}
 							
-							var userCard=res.data.userCard;
+							var userCard=res.data.userCard;
+							this.userCard=userCard
 							this.ispay=	this.userCardBool(userCard)
 							
 						}else{