Merge branch 'iteration-20240820' into jenkins-test

src/views/activation-code/instrument-registration/new-index.module.less

@@ -219,41 +219,36 @@
 }
 
 .popupContainer {
-  width: 295px;
+  width: 313px;
+  height: 259px;
 
   border-radius: 20px;
-  padding: 13px 20px 20px;
-  background: url('./images/top_bg.png') no-repeat top;
+  // padding: 13px 20px 20px;
+  background: url('./images/popup-bg.png') no-repeat top;
   background-size: contain;
-  background-color: #FFFFFF;
 
-  .title {
-    width: 215px;
-    height: 65px;
-    display: block;
-    margin: 0 auto;
-  }
 
   .content {
     font-weight: 400;
     font-size: 15px;
     color: #666666;
     line-height: 23px;
-    padding: 10px 0 20px;
+    padding: 97px 0 12px;
 
     span {
       font-weight: 600;
-      color: #2B85FF;
+      color: #1189FF;
     }
   }
 
   .pBtnGroup {
-    padding: 0 50px;
 
-    :global {
-      .van-button {
-        font-size: 16px;
-      }
+    .btnSubmit {
+      margin: 0 auto;
+      background: url('./images/btn-submit.png') no-repeat center;
+      background-size: contain;
+      width: 139px;
+      height: 37px;
     }
   }
 }

src/views/activation-code/instrument-registration/new-index.tsx

@@ -721,24 +721,24 @@ export default defineComponent({
             overflow: 'visible !important'
           }}>
           <div class={styles.popupContainer}>
-            <img class={styles.title} src={loginSuccess} />
+            {/* <img class={styles.title} src={loginSuccess} /> */}
 
             <div class={styles.content} style={{ textAlign: 'center' }}>
-              乐器的实际发放将以最终的
-              <br />
-              审核结果为准。
+              乐器的实际发放将以
+              <span>
+                最终的
+                <br />
+                审核结果
+              </span>
+              为准。
             </div>
             <div class={styles.pBtnGroup}>
-              <Button
-                round
-                block
+              <div
+                class={styles.btnSubmit}
                 onClick={() => {
                   forms.registerFlag = true;
                   forms.statusShow = false;
-                }}
-                color="linear-gradient( 305deg, #007AFE 0%, #31C7FF 100%)">
-                我知道了
-              </Button>
+                }}></div>
             </div>
           </div>
         </Popup>

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: [