Merge branch 'iteration-20240715'

src/styles/index.less

@@ -186,4 +186,9 @@ body {
   --music-list-item-free-color: #ff4700;
   --music-list-item-charge-bg: #e1f0ff;
   --music-list-item-charge-color: #0086ff;
-}
+}
+
+.van-toast {
+  --van-animation-duration-fast: 0.1s !important;
+  transition: none !important;
+}

src/teacher/share-page/share.ts

@@ -65,16 +65,17 @@ export const initJumpNativePage = (url: string) => {
       if (browser().ios) {
         window.location.replace(url)
       } else {
-        postMessage({
-          api: 'openWebView',
-          content: {
-            url,
-            orientation: 1,
-            isHideTitle: false
-          }
-        })
+        // postMessage({
+        //   api: 'openWebView',
+        //   content: {
+        //     url,
+        //     orientation: 1,
+        //     isHideTitle: false
+        //   }
+        // })
 
-        postMessage({ api: 'back' })
+        // postMessage({ api: 'back' })
+        window.location.replace(url)
       }
       return
     } else if (state.platformType === 'TEACHER') {

src/tenant/music/music-detail/new-index.tsx

@@ -1172,6 +1172,7 @@ export default defineComponent({
                         musicBuy(musicDetail.value, () => {}, {
                           'part-index': item?.xmlValue || 0,
                           sett: staff.radio,
+                          albumId: route.query.tenantAlbumId || '', // 专辑编号
                           // 1：忽略系统节拍器
                           ignoreSysMetronome:
                             route.query.subjectType === 'MUSIC' ? 1 : 0

src/views/member-center/index.module.less

@@ -336,6 +336,8 @@
     background: transparent;
     font-size: 14px;
     color: #6B4429;
+    padding-top: 1px;
+    line-height: 1.2;
 
     span {
       color: #FF491A;

src/views/order-detail/index.module.less

@@ -72,6 +72,7 @@
     :global {
       .van-button {
         padding: 0 18px;
+        flex-shrink: 0;
       }
     }
 
@@ -153,4 +154,4 @@
     color: #FFFFFF;
     line-height: 22px;
   }
-}
+}

src/views/order-detail/index.tsx

@@ -303,7 +303,7 @@ export default defineComponent({
             }
           })
           const result = res.data || {}
-          if (res.code === 998) {
+          if (res.code === 998 || res.code === 999) {
             this.dialogVisiable = true
             this.dialogContent = res.msg
             this.dialogBtnText = '刷新'
@@ -343,20 +343,13 @@ export default defineComponent({
           })
           const result = res.data || {}
           // 支付成功
-          if (res.code === 999) {
+          if (res.code === 999 || res.code === 998) {
             this.dialogVisiable = true
             this.dialogContent = res.msg
             this.dialogBtnText = '确定'
             this.dialogType = 'back'
             return
           }
-          if (res.code === 998) {
-            this.dialogVisiable = true
-            this.dialogContent = res.msg
-            this.dialogBtnText = '刷新'
-            this.dialogType = 'back'
-            return
-          }
           if (result.status == 'PAID') {
             this.$router.replace({
               path: '/tradeDetail',
@@ -589,7 +582,7 @@ export default defineComponent({
               <div class={styles.btnGroup}>
                 <div class={styles.priceSection}>
                   <span class={styles.goodsNum}>共{this.goodsNum || 1}件</span>
-                  支付金额：
+                  合计：
                   <div class={styles.price}>
                     <span class={styles.priceUnit}>￥</span>
                     <span class={styles.priceNum}>