修改样式与回调

package-lock.json

@@ -1214,9 +1214,9 @@
       "dev": true
     },
     "@vant/icons": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npm.taobao.org/@vant/icons/download/@vant/icons-1.2.1.tgz",
-      "integrity": "sha1-MJ/suXpJiYZvBFzmdrVFxFRwHI8="
+      "version": "1.2.3",
+      "resolved": "https://registry.npm.taobao.org/@vant/icons/download/@vant/icons-1.2.3.tgz",
+      "integrity": "sha1-xGt93TI2P3kJRMOvl0tzvagN96E="
     },
     "@vue/babel-helper-vue-jsx-merge-props": {
       "version": "1.0.0",
@@ -11915,12 +11915,12 @@
       }
     },
     "vant": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npm.taobao.org/vant/download/vant-2.8.4.tgz?cache=0&sync_timestamp=1590634174359&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvant%2Fdownload%2Fvant-2.8.4.tgz",
-      "integrity": "sha1-nkUT6PdQZWJnX23n1INn6g6Hkr0=",
+      "version": "2.9.2",
+      "resolved": "https://registry.npm.taobao.org/vant/download/vant-2.9.2.tgz?cache=0&sync_timestamp=1594730642645&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvant%2Fdownload%2Fvant-2.9.2.tgz",
+      "integrity": "sha1-33udbT2CdMQHZZ7Ij+tfoaOjo/A=",
       "requires": {
         "@babel/runtime": "7.x",
-        "@vant/icons": "1.2.1",
+        "@vant/icons": "1.2.3",
         "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
         "vue-lazyload": "1.2.3"
       }

package.json

@@ -19,7 +19,7 @@
     "numeral": "^2.0.6",
     "qrcodejs2": "0.0.2",
     "qs": "^6.8.0",
-    "vant": "^2.8.4",
+    "vant": "^2.9.2",
     "vconsole": "^3.3.4",
     "vue": "^2.6.10",
     "vue-awesome-swiper": "^3.1.3",

src/components/MPayment.vue

@@ -144,6 +144,10 @@ export default {
 /deep/.van-hairline--bottom::after {
     border-bottom-color: #F0F0F0;
 }
+/deep/.van-radio__icon--checked .van-icon {
+    background-color: var(--main-color);
+    border-color: var(--main-color);
+}
 .title {
     background-color: #ffffff;
     font-size: .16rem;
@@ -208,12 +212,12 @@ export default {
 }
 
 /deep/.van-button--primary {
-    background-color: #14928A;
+    background-color: var(--main-color);
     color: #ffffff;
     font-size: .16rem;
     height: .52rem;
     line-height: .50rem;
     border-radius: 0;
-    border-color: #14928A;
+    border-color: var(--main-color);
 }
 </style>

src/views/adapay/PayDefine.vue

@@ -195,9 +195,9 @@ export default {
 					if(res.err_msg == "get_brand_wcpay_request:cancel" || res.err_msg == "get_brand_wcpay_request:fail") {
 						// 用户取消支付
 						this.$router.replace({
-							path: '/levelMusic',
+							path: '/paymentResult',
 							query: {
-								type: "error",
+								type: "FAILED",
 								orderNo: orderNo,
 								isBack: "off"
 							}
@@ -206,7 +206,7 @@ export default {
 						// 使用以上方式判断前端返回,微信团队郑重提示：
 						//res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
 						this.$router.replace({
-							path: '/levelMusic',
+							path: '/paymentResult',
 							query: {
 								orderNo: this.orderNo,
 								isBack: "off"

src/views/adapay/PayResult.vue

@@ -198,7 +198,7 @@ export default {
 					if(res.err_msg == "get_brand_wcpay_request:cancel" || res.err_msg == "get_brand_wcpay_request:fail") {
 						// 用户取消支付
 						this.$router.replace({
-							path: '/levelMusic',
+							path: '/paymentResult',
 							query: {
 								type: "error",
 								orderNo: orderNo,
@@ -209,7 +209,7 @@ export default {
 						// 使用以上方式判断前端返回,微信团队郑重提示：
 						//res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
 						this.$router.replace({
-							path: '/levelMusic',
+							path: '/paymentResult',
 							query: {
 								orderNo: orderNo,
 								isBack: "off"

src/views/signup/SignUp.vue

@@ -3,7 +3,20 @@
         <!-- <m-header /> -->
 		<div v-show="show" class="container" :style="backgroundImg">
 			<h2>{{ baseInfo.posterTitle }}</h2>
-			<div class="section">
+			<div class="section" v-if="baseInfo.transStatus === 'APPLIED'" key="status">
+				<div class="sectionStatus">
+					<img src="../../assets/images/level/sign_over.png" alt="">
+					<h3>您来迟啦，报名已结束～</h3>
+				</div>
+			</div>
+			<div class="section" v-else-if="baseInfo.transStatus === 'NOT_START'" key="status">
+				<div class="sectionStatus">
+					<img src="../../assets/images/level/sign_not_start.png" alt="">
+					<h3>您来早啦，报名还未开始～</h3>
+					<p>报名时间：{{ baseInfo.enrollTime2 }}</p>
+				</div>
+			</div>
+			<div class="section" v-else key="status">
 				<div class="title" style="margin-top: 0">考试类型</div>
 				<div class="content">{{ baseInfo.examMode === "OFFLINE" ? "线下" : "线上" }}</div>
 
@@ -83,11 +96,13 @@ export default {
 						posterTitle: tempData.posterTitle,
 						examMode: tempData.examMode,
 						enrollTime: dayjs(tempData.enrollStartTime).format("YYYY-MM-DD HH:mm") + "～" + dayjs(tempData.enrollEndTime).format("YYYY-MM-DD HH:mm"),
+						enrollTime2: dayjs(tempData.enrollStartTime).format("YYYY-MM-DD HH:mm") + "～" + dayjs(tempData.enrollEndTime).format("HH:mm"),
 						examLocationIdList: tempData.examLocationIdList,
 						expectExamTime: dayjs(tempData.expectExamStartTime).format("YYYY-MM-DD") + "～" + dayjs(tempData.expectExamEndTime).format("YYYY-MM-DD"),
 						status: tempStatus,
 						examLocations: tempData.examLocations, // 地址
-						posterProfile: tempData.posterProfile
+						posterProfile: tempData.posterProfile,
+						transStatus: tempData.status
 					}
 					let poster = tempData.posterBackgroundImg ? JSON.parse(tempData.posterBackgroundImg) : ""
 					if(poster) {
@@ -146,13 +161,14 @@ export default {
 	}
 	.section {
 		background: #ffffff;
-		margin: 2rem .16rem .15rem;
+		margin: 1.87rem .16rem .15rem;
 		border-radius: .1rem;
 		padding: .22rem;
 		.title {
 			margin-top: .28rem;
 			font-size: .18rem;
 			color: #1A1A1A;
+			font-weight: 500;
 		}
 		.content {
 			padding-top: .05rem;
@@ -162,6 +178,24 @@ export default {
 		}
 	}
 
+	.sectionStatus {
+		text-align: center;
+		padding: 1rem 0 .5rem;
+		img {
+			width: 1.2rem;
+		}
+		h3 {
+			padding-top: .3rem;
+			font-size: .18rem;
+			color: #1A1A1A;
+		}
+		p {
+			padding-top: .05rem;
+			font-size: .14rem;
+			color: #999999;
+		}
+	}
+
 	.protocol {
 		font-size: .14rem;
 		margin-bottom: .3rem;
@@ -170,7 +204,7 @@ export default {
 		color: #0091FF;
 	}
 	.van-button--primary {
-		margin: .35rem 0 .1rem;
+		margin: .36rem 0 .18rem;
 		background-color: var(--main-color);
 		border: 1px solid var(--main-color);
 		color: #FFFFFF;

src/views/signup/SignUpAccount.vue

@@ -236,7 +236,7 @@
 
 			/deep/.van-checkbox__icon .van-icon {
 				// border-color: #14928A;
-				background: #fff;
+				background: #F4F4F4;
 			}
 
 			/deep/.van-checkbox__icon--checked .van-icon {

src/views/signup/SignUpBaseInfo.vue

@@ -312,11 +312,24 @@ export default {
         color: var(--main-color);
     }
 }
-
 .upload-img {
     background: #ffffff;
     text-align: center;
     padding: .3rem 0 .2rem;
+    .van-uploader__wrapper {
+        &:active {
+            .icon-upload-add {
+                display: inline-block;
+                width: .55rem;
+                height: .55rem;
+                background: url('../../assets/images/level/icon_upload_add_active.png') no-repeat center;
+                background-size: contain;
+            }
+            // p {
+
+            // }
+        }
+    }
     .upload-container {
         width: 1rem;
         height: 1.4rem;
@@ -359,7 +372,9 @@ export default {
     padding-top: .03rem;
     padding-bottom: .15rem;
 }
-
+/deep/.van-radio__icon--disabled .van-icon {
+    background-color: #F5F5F5;
+}
 /deep/.van-radio__icon--disabled.van-radio__icon--checked .van-icon {
     background-color: var(--main-color);
     border-color: var(--main-color);

src/views/signup/SignUpLevel.vue

@@ -63,7 +63,7 @@
         <van-field name="adviserName" v-model="form.adviserName" label="老师姓名" placeholder="请输入老师姓名" />
         <van-field name="adviserPhone" maxlength="11" v-model="form.adviserPhone" label="联系方式" placeholder="请输入联系方式" />
         <div class="m-btn-group">
-            <van-button round color="var(--main-color)" @click="onBack" style="background-color: transparent" plain>上一步</van-button>
+            <van-button class="btn_prev" round color="var(--main-color)" @click="onBack" style="background-color: transparent" plain>上一步</van-button>
             <van-button round color="var(--main-color)" @click="onSubmit">确认报名</van-button>
         </div>
 
@@ -313,7 +313,6 @@ export default {
                     if(item.type == "PERFORM") {
                         tempPerformArr.push(item)
                         tempPerformStr.push(str)
-						console.log(item)
                         this.performNumSelectIds.push(item.id)
                     } else if(item.type == "PRACTICE") {
                         tempPracticeArr.push(item)
@@ -860,11 +859,6 @@ export default {
                 return false
             }
             // 有值说明是列表
-			console.log({
-				practiceSongIdList: this.practiceSongIdList,
-				practiceUpload: this.practiceUpload,
-				practiceSelectIds: this.practiceSelectIds
-			})
             if(this.practiceSongIdList) {
                 if(this.practiceSelectIds.length != this.practiceNum) {
                     this.$toast('请选择练习曲')
@@ -876,11 +870,6 @@ export default {
                     return false
                 }
             }
-			console.log({
-				performSongIdList: this.performSongIdList,
-				performNumUpload: this.performNumUpload,
-				performNumSelectIds: this.performNumSelectIds
-			})
             if(this.performSongIdList) {
                 if(this.performNumSelectIds.length != this.performNum) {
                     this.$toast('请选择演奏曲')
@@ -1069,5 +1058,14 @@ export default {
         height: .5rem;
         width: 48%;
     }
+    .btn_prev:active {
+        color: var(--main-color) !important;
+        background-color: #F5FFFD !important;
+    }
+    .btn_prev:active::before {
+        // background-color: #F5FFFD !important;
+        // border-color: var(--main-color) !important;
+        opacity: 0;
+    }
 }
 </style>