倒计时，活动图

pages/index/index.vue

@@ -801,9 +801,12 @@
 					for (let i = 0; i < list.length; i++) {
 						if(list[i].endTime != null) {
 							this.activityListShow = true;
-							this.activityDate = list[i].endTime.replaceAll('-' ,'/');
+							
+							var reg=new RegExp('-','gi');
+							this.activityDate = list[i].endTime.replace(reg,'/');
+							console.log(this.activityDate)
+							
 							this.activityDateList = list[i];
-							console.log(this.activityDate);
 							list.splice(i, 1);
 							
 							this.getDescriptionTime();

pages/login/login.vue

@@ -19,7 +19,7 @@
 					<view class="title">验证码</view>
 					<view class="input">
 						<u-input :customStyle="customStyle" :placeholderStyle="placeholderStyle" v-model="form.verifyCode" type="number" placeholder="请输入验证码" placeholder-style="font-size:16px;color:#ccc;"/>
-						<view class="code" @click="getCode">{{codeTips}}</view>
+						<view class="code" :style="isCodeTipsColor ? 'color: #999999;' : ''" @click="getCode">{{codeTips}}</view>
 					</view>
 					<view style="width: 350px;">
 						<u-checkbox-group>
@@ -74,6 +74,7 @@
 				},
 				activityInfo:null,
 				isSendMsgIng: false,
+				isCodeTipsColor: false,
 				sendMsgSecond: 60,
 				codeTips: '',
 				value: false,
@@ -222,6 +223,7 @@
 			end() {
 				this.sendMsgSecond = 60;
 				this.isSendMsgIng = false;
+				this.isCodeTipsColor = false;
 			},
 			// 获取验证码
 			getCode() {
@@ -242,6 +244,7 @@
 					return;
 				}
 				this.$refs.uCode.start();
+				this.isCodeTipsColor = true;
 			},
 			checkboxChange() {
 				this.value = !this.value;