更新

src/tenant/exercise-record/exercis-detail.module.less

@@ -111,7 +111,7 @@
   align-items: center;
   justify-content: space-around;
   text-align: center;
-  background-color: transparent;
+  background-color: #fff;
   border-radius: 10px;
   padding: 20px 0;
 

src/tenant/music/train-tool/index.tsx

@@ -13,6 +13,7 @@ import { useRouter } from 'vue-router'
 import ColResult from '@/components/col-result'
 import { moneyFormat } from '@/helpers/utils'
 import { orderStatus } from '@/views/order-detail/orderStatus'
+import { postMessage } from '@/helpers/native-message'
 
 export default defineComponent({
   name: 'train-tool',
@@ -176,37 +177,37 @@ export default defineComponent({
         }
       ]
 
-      const res = await request.post('/api-student/userOrder/getPendingOrder', {
-        data: {
-          goodType: 'TENANT_ALBUM',
-          bizId: details.id
-        }
-      })
+      // const res = await request.post('/api-student/userOrder/getPendingOrder', {
+      //   data: {
+      //     goodType: 'TENANT_ALBUM',
+      //     bizId: details.id
+      //   }
+      // })
 
-      const result = res.data
-      if (result) {
-        state.popupStatus = false
-        Dialog.confirm({
-          title: '提示',
-          message: '您有一个未支付的订单，是否继续支付？',
-          confirmButtonColor: '#269a93',
-          cancelButtonText: '取消订单',
-          confirmButtonText: '继续支付'
-        })
-          .then(async () => {
-            orderStatus.orderObject.orderNo = result.orderNo
-            orderStatus.orderObject.actualPrice = result.actualPrice
-            orderStatus.orderObject.discountPrice = result.discountPrice
-            routerTo()
-          })
-          .catch(() => {
-            Dialog.close()
-            // 只用取消订单，不用做其它处理
-            cancelPayment(result.orderNo)
-          })
-      } else {
-        routerTo()
-      }
+      // const result = res.data
+      // if (result) {
+      //   state.popupStatus = false
+      //   Dialog.confirm({
+      //     title: '提示',
+      //     message: '您有一个未支付的订单，是否继续支付？',
+      //     confirmButtonColor: '#269a93',
+      //     cancelButtonText: '取消订单',
+      //     confirmButtonText: '继续支付'
+      //   })
+      //     .then(async () => {
+      //       orderStatus.orderObject.orderNo = result.orderNo
+      //       orderStatus.orderObject.actualPrice = result.actualPrice
+      //       orderStatus.orderObject.discountPrice = result.discountPrice
+      //       routerTo()
+      //     })
+      //     .catch(() => {
+      //       Dialog.close()
+      //       // 只用取消订单，不用做其它处理
+      //       cancelPayment(result.orderNo)
+      //     })
+      // } else {
+      routerTo()
+      // }
     }
     const routerTo = () => {
       const album = state.details

src/views/trade/trade-detail.module.less

@@ -18,6 +18,10 @@
     }
   }
 
+  .orderTypeTenant {
+    background: #FF5461;
+  }
+
   .orderImg {
     width: 42px;
     height: 47px;

src/views/trade/trade-detail.tsx

@@ -146,13 +146,10 @@ export default defineComponent({
             />
 
             <div
-              class={styles.orderType}
-              style={{
-                backgroundColor:
-                  state.projectType === 'tenant'
-                    ? '#FF5461'
-                    : 'var(--van-primary)'
-              }}
+              class={[
+                styles.orderType,
+                state.projectType === 'tenant' && styles.orderTypeTenant
+              ]}
             >
               <p>
                 <Image