Merge branch 'iteration-20240613-temp' into online

src/views/student-register/index-apply.module.less

@@ -814,8 +814,11 @@
 .vipGiftContainer {
   display: flex;
   align-items: center;
+
   margin: 7px 13px 12px;
-  background: url('./images/new/vip_gift_bg.png') no-repeat center;
+  background-image: url('./images/new/vip_gift_suffix.png'), url('./images/new/vip_gift_bg.png');
+  background-position: center right, center;
+  background-repeat: no-repeat;
   background-size: contain;
   height: 47px;
 
@@ -831,21 +834,35 @@
   color: #801D09;
   line-height: 21px;
 
-  .vipGiftNum {
-    font-weight: bold;
-    font-size: 26px;
-    color: #FF113F;
-    line-height: 36px;
-    padding: 0 3px;
-    margin-top: -6px;
-  }
+
 
   p {
     display: flex;
     align-items: center;
+    justify-content: space-between;
+    flex: 1;
+
+    &>div {
+      color: #FFFFFF;
+      min-width: 84px;
+      // text-align: center;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+  }
+
+  .vipGiftNum {
+    font-weight: bold;
+    font-size: 30px;
+    line-height: 36px;
+    padding-right: 2px;
   }
 
   .vipGiftPreviod {
-    color: #FF113F;
+    vertical-align: text-bottom;
+    font-weight: 600;
+    font-size: 16px;
+    margin-top: 6px;
   }
 }

src/views/student-register/index-apply.tsx

@@ -1716,12 +1716,14 @@ export default defineComponent({
               <img src={vipGiftTIps} class={styles.iconGift} />
               <p>
                 现在购买额外赠送有效期
-                <span class={styles.vipGiftNum}>
-                  {forms.detailVip.membershipDays || 0}
-                </span>
-                <span class={styles.vipGiftPreviod}>
-                  {vipGiftPeriodType[forms.detailVip.giftPeriod]}
-                </span>
+                <div>
+                  <span class={styles.vipGiftNum}>
+                    {forms.detailVip.membershipDays || 0}
+                  </span>
+                  <span class={styles.vipGiftPreviod}>
+                    {vipGiftPeriodType[forms.detailVip.giftPeriod]}
+                  </span>
+                </div>
               </p>
             </div>
           ) : (

src/views/student-register/index.module.less

@@ -850,8 +850,11 @@
 .vipGiftContainer {
   display: flex;
   align-items: center;
+
   margin: 7px 13px 12px;
-  background: url('./images/new/vip_gift_bg.png') no-repeat center;
+  background-image: url('./images/new/vip_gift_suffix.png'), url('./images/new/vip_gift_bg.png');
+  background-position: center right, center;
+  background-repeat: no-repeat;
   background-size: contain;
   height: 47px;
 
@@ -867,21 +870,35 @@
   color: #801D09;
   line-height: 21px;
 
-  .vipGiftNum {
-    font-weight: bold;
-    font-size: 26px;
-    color: #FF113F;
-    line-height: 36px;
-    padding: 0 3px;
-    margin-top: -6px;
-  }
+
 
   p {
     display: flex;
     align-items: center;
+    justify-content: space-between;
+    flex: 1;
+
+    &>div {
+      color: #FFFFFF;
+      min-width: 84px;
+      // text-align: center;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+  }
+
+  .vipGiftNum {
+    font-weight: bold;
+    font-size: 30px;
+    line-height: 36px;
+    padding-right: 2px;
   }
 
   .vipGiftPreviod {
-    color: #FF113F;
+    vertical-align: text-bottom;
+    font-weight: 600;
+    font-size: 16px;
+    margin-top: 6px;
   }
 }

src/views/student-register/index.tsx

@@ -1973,12 +1973,14 @@ export default defineComponent({
               <img src={vipGiftTIps} class={styles.iconGift} />
               <p>
                 现在购买额外赠送有效期
-                <span class={styles.vipGiftNum}>
-                  {forms.detailVip.membershipDays || 0}
-                </span>
-                <span class={styles.vipGiftPreviod}>
-                  {vipGiftPeriodType[forms.detailVip.giftPeriod]}
-                </span>
+                <div>
+                  <span class={styles.vipGiftNum}>
+                    {forms.detailVip.membershipDays || 0}
+                  </span>
+                  <span class={styles.vipGiftPreviod}>
+                    {vipGiftPeriodType[forms.detailVip.giftPeriod]}
+                  </span>
+                </div>
               </p>
             </div>
           ) : (

vite.config.ts

@@ -16,7 +16,7 @@ function resolve(dir: string) {
 // const proxyUrl = 'https://test.lexiaoya.cn/';
 // const proxyUrl = 'https://kt.colexiu.com/';
 // const proxyUrl = 'http://192.168.3.143:7093/';
-const proxyUrl = 'https://dev.kt.colexiu.com/';
+const proxyUrl = 'https://test.kt.colexiu.com/';
 export default defineConfig({
   base: './',
   plugins: [