Merge branch 'iteration-20241115' into jenkins-test

src/views/activation-code/activation-register/index.tsx

@@ -1533,16 +1533,16 @@ export default defineComponent({
             }}>
             {forms.reslutPopupType === 'ACTIVATING' && (
               <p>
-                您已成功登记激活码，下载
+                您已成功激活，下载
                 <span style={{ color: '#2B85FF' }}>【音乐数字课堂】</span>
-                App并登录后正式激活
+                APP畅享音乐之旅
               </p>
             )}
             {forms.reslutPopupType === 'ACTIVATING-TWO' && (
               <p>
-                您已使用该激活码，请勿重复提交，请下载
+                您已成功激活码，请勿重复提交，下载
                 <span style={{ color: '#2B85FF' }}>【音乐数字课堂】</span>
-                App并登录后正式激活
+                APP畅享音乐之旅
               </p>
             )}
 

src/views/activation-code/modal/code-dialog/index.tsx

@@ -61,7 +61,7 @@ export default defineComponent({
         props.type === 'ACTIVATING' ||
         props.type === 'ACTIVATING-TWO'
       ) {
-        title = getAssetsHomeFile('title2.png');
+        title = getAssetsHomeFile('title4.png');
         icon = getAssetsHomeFile('brid1.png');
       } else if (props.type === 'EXPIRED') {
         title = getAssetsHomeFile('title1.png');