Merge branch 'iteration-20240715' into dev

src/views/adapay/payment/index.tsx

@@ -121,7 +121,13 @@ export default defineComponent({
       // 不管接口是否报错,都返回
       emit('update:modelValue', false)
 
-      !noBack && router.go(-1)
+      if (!noBack) {
+        if (browser().isApp) {
+          postMessage({ api: 'goBack' })
+        } else {
+          router.go(-1)
+        }
+      }
       emit('backOut')
     }
     const onSubmit = async () => {

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

@@ -417,12 +417,13 @@
 
 
   .discountTag {
-    background: linear-gradient(180deg, #FF491A 0%, #FF9F7E 100%);
-    border-radius: 8px;
-    font-weight: 500;
-    font-size: 12px;
-    color: #FFFFFF;
-    padding: 2px 4px;
+    // background: linear-gradient(180deg, #FF491A 0%, #FF9F7E 100%);
+    // color: #FFFFFF;
+    display: inline-block;
+    width: 48px;
+    height: 16px;
+    background: url('./new-images/icon_discount-round.png') no-repeat center;
+    background-size: contain;
     margin-top: 1px;
   }
 

src/views/member-center/index.tsx

@@ -188,6 +188,8 @@ export default defineComponent({
 
     const onSubmit = async () => {
       try {
+        // 永久会员
+        if (isPermanent.value) return
         const { data } = await request.post(
           `${state.apiSuffix}/memberPriceSettings/list`,
           {
@@ -559,7 +561,7 @@ export default defineComponent({
 
                         <p class={styles.s_title}>{member.title}</p>
                         {member.discount === 1 && (
-                          <span class={styles.discountTag}>专属优惠</span>
+                          <span class={styles.discountTag}></span>
                         )}
                         <p class={styles.price}>
                           <span>￥</span>

src/views/order-detail/index.tsx

@@ -300,6 +300,13 @@ export default defineComponent({
             }
           })
           const result = res.data || {}
+          if (res.code === 998) {
+            this.dialogVisiable = true
+            this.dialogContent = '您当前VIP天数更新，请刷新后尝试'
+            this.dialogBtnText = '刷新'
+            this.dialogType = 'refresh'
+            return
+          }
           // 支付成功
           if (result.status == 'PAID') {
             this.$router.replace({

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

@@ -71,6 +71,8 @@
     padding-top: 7px;
     display: flex;
     align-items: center;
+    flex-wrap: wrap;
+    gap: 5px;
     --van-tag-default-color: #FFEAF2;
     --van-tag-text-color: #FE2451;
 

src/views/order-detail/payment/index.tsx

@@ -25,6 +25,7 @@ import inactiveButtonIcon from '@common/images/icon_checkbox_default.png'
 import activeButtonIconTenant from '@common/images/icon_checkbox-tenant.png'
 import iconWechat from '@common/images/icon-wechat.png'
 import iconAlipay from '@common/images/icon-alipay.png'
+import { browser } from '@/helpers/utils'
 
 interface IOrderInfo {
   orderNo: string | number
@@ -108,7 +109,13 @@ export default defineComponent({
       //   return
       // }
 
-      !noBack && this.$router.go(-1)
+      if (!noBack) {
+        if (browser().isApp) {
+          postMessage({ api: 'goBack' })
+        } else {
+          this.$router.go(-1)
+        }
+      }
       this.onBackOut && this.onBackOut()
     },
     async onSubmit() {