Merge branch 'iteration-new-apply' into jenkins-test

src/components/m-search/index.module.less

@@ -72,4 +72,15 @@
     background: linear-gradient(to right, #5BECFF, #259CFE);
     border: none;
   }
-}
+
+  .leftIcon {
+    width: 14px;
+    height: 14px;
+    margin-top: -2px;
+
+    img {
+      width: 100%;
+      height: 100%;
+    }
+  }
+}

src/views/download/index.module.less

@@ -3,7 +3,7 @@
   background: url('./images/download_bg.png') no-repeat top center;
   background-size: cover;
   min-height: 100vh;
-  padding: 25px 23px 0 23px;
+  padding: 22px 35px 0 34px;
   text-align: center;
 
   :global {
@@ -15,7 +15,7 @@
 
 .buttonGroup {
   text-align: center;
-  margin: 15px 0;
+  margin: 23px 0 15px;
 }
 
 .btn {
@@ -43,5 +43,5 @@
 }
 
 .downImg {
-  width: 275px;
+  // width: 275px;
 }

src/views/payment-result/index.module.less

@@ -54,6 +54,7 @@
     span {
       font-size: 14px;
       color: #777;
+      line-height: 20px;
 
       i {
         font-style: normal;
@@ -172,6 +173,10 @@
   padding: 20px 0 15px 25px;
 }
 
+.goodsTitle {
+  font-weight: 600;
+}
+
 .refundContent {
   padding: 0 20px 25px;
 

src/views/payment-result/index.tsx

@@ -134,7 +134,7 @@ export default defineComponent({
                 {state.orders.status === 'PAID' ||
                 state.orders.status === 'REFUNDING' ? (
                   <div class={styles.orderPrice}>
-                    实付金额：￥ {moneyFormat(state.orders.paymentCashAmount)}
+                    实付金额：￥{moneyFormat(state.orders.paymentCashAmount)}
                   </div>
                 ) : (
                   ''
@@ -142,7 +142,7 @@ export default defineComponent({
 
                 {state.orders.status === 'REFUNDED' && (
                   <div class={styles.orderPrice}>
-                    退款金额：￥ {moneyFormat(state.orders.paymentCashAmount)}
+                    退款金额：￥{moneyFormat(state.orders.paymentCashAmount)}
                   </div>
                 )}
               </div>
@@ -214,7 +214,7 @@ export default defineComponent({
                     </Tag>
                   </div>
                 ),
-                value: () => <span>x {goods.goodsNum}</span>
+                value: () => <span>x{goods.goodsNum}</span>
               }}
             </Cell>
           ))}

src/views/student-register/index.tsx

@@ -500,11 +500,6 @@ export default defineComponent({
         );
         const vipList = studentRegisterStore.getVip;
 
-        if (schoolInfo.data.hasBuyCourse && vipList.length > 0) {
-          forms.dialogConfirmStatus = true;
-          return;
-        }
-
         // 传统方式
         if (forms.joinType === 'tradition') {
           setTimeout(() => {
@@ -514,6 +509,11 @@ export default defineComponent({
           return;
         }
 
+        if (schoolInfo.data.hasBuyCourse && vipList.length > 0) {
+          forms.dialogConfirmStatus = true;
+          return;
+        }
+
         await paymentContinue();
       } catch {
         //

src/views/tenantAllData/index.module.less

@@ -216,7 +216,8 @@
         font-size: 24px;
         color: #FF5A56;
         line-height: 28px;
-        font-family: DINAlternate, DINAlternate;
+        font-family: DINAlternate-Bold,
+          DINAlternate;
 
         img {
           width: 30px;
@@ -410,7 +411,8 @@
 
   .downloadBtn {
     margin-top: 29px;
-    background: linear-gradient(90deg, #4CFFDD 0%, #2AA4FF 100%);
+    background: linear-gradient(73deg, #5BECFF 0%, #259CFE 100%);
+    border: none;
     border-radius: 10px;
     height: 47px;
     max-width: 264px;