From 76a82ea333fc3de8176b0a9cdc3f3916cb6210fc Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 15 Oct 2024 17:00:36 +0800
Subject: [PATCH] fix

---
 src/components/goToStoreModal/index.tsx |  2 +-
 src/pages/CollectionDetail/index.tsx    |  2 +-
 src/pages/DisplayVideo/index.tsx        | 58 +++++++++++++------------
 src/pages/Home/index.tsx                |  2 +-
 src/pages/ListenDetail/index.tsx        |  2 +-
 5 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/src/components/goToStoreModal/index.tsx b/src/components/goToStoreModal/index.tsx
index cdab4fa..e2b3040 100644
--- a/src/components/goToStoreModal/index.tsx
+++ b/src/components/goToStoreModal/index.tsx
@@ -25,7 +25,7 @@ export default function GoToStoreModal({ visible, onClose, type, mallLink = 'pag
   const handleNavigateToMiniProgram = () => {
     Taro.navigateToMiniProgram({
       appId: 'wxbd3d383851fea776',
-      path: mallLink,
+      path: mallLink || '',
       success: (res) => {
         console.log('打开成功=>',res)
       },
diff --git a/src/pages/CollectionDetail/index.tsx b/src/pages/CollectionDetail/index.tsx
index 94a2a1f..b17550c 100644
--- a/src/pages/CollectionDetail/index.tsx
+++ b/src/pages/CollectionDetail/index.tsx
@@ -116,7 +116,7 @@ export default function CollectionDetail() {
     } else
     if(productDetail?.IsSubscribed === -1 || productDetail?.IsSubscribed === 2){
       //未订阅，跳转商城
-      setprdtMallLink(productDetail.MallLink)
+      setprdtMallLink(productDetail.MallLink || '')
       setisToStoreOpen(true)
     }
     // Taro.navigateTo({
diff --git a/src/pages/DisplayVideo/index.tsx b/src/pages/DisplayVideo/index.tsx
index 6ecd2d8..ef11161 100644
--- a/src/pages/DisplayVideo/index.tsx
+++ b/src/pages/DisplayVideo/index.tsx
@@ -352,36 +352,38 @@ export default function Index() {
       <View className='sixteen-to-nine-container'>
         <View className='content'>
           {
-            !isFree &&
-            <Video
-              className='jimeiVideo'
-              src={displayindex['src']}
-              poster={displayindex['poster']}
-              initialTime={0}
-              controls
-              autoplay
-              loop={false}
-              muted={false}
-              onEnded={() => continuePlay()}
-              onPlay={() => provingCdKey()}
-              direction={90}
-              id='topvideo'
-              objectFit='contain'
-            ></Video>
+            !isFree ?
+              <Video
+                className='jimeiVideo'
+                src={displayindex['src']}
+                poster={displayindex['poster']}
+                initialTime={0}
+                controls
+                autoplay
+                loop={false}
+                muted={false}
+                onEnded={() => continuePlay()}
+                onPlay={() => provingCdKey()}
+                direction={90}
+                id='topvideo'
+                objectFit='contain'
+              ></Video> :
+              null
           }
           {
-            isFree &&
-            //@ts-ignore
-            <player-component
-              className='jimeiVideo'
-              title={displayindex.title}
-              id='tvp-id'
-              playerid='tvp'
-              vid={displayindex.src}
-              onEnded={() => continuePlay()}
-              onPlay={() => provingCdKey()}
-              autoplay
-            />
+            isFree ?
+              //@ts-ignore
+              <player-component
+                className='jimeiVideo'
+                title={displayindex.title}
+                id='tvp-id'
+                playerid='tvp'
+                vid={displayindex.src}
+                onEnded={() => continuePlay()}
+                onPlay={() => provingCdKey()}
+                autoplay
+              /> :
+              null
           }
         </View>
       </View>
diff --git a/src/pages/Home/index.tsx b/src/pages/Home/index.tsx
index 13cc029..be4a54f 100644
--- a/src/pages/Home/index.tsx
+++ b/src/pages/Home/index.tsx
@@ -240,7 +240,7 @@ export default function Home() {
       })
     }else if (IsSubscribed === -1 || IsSubscribed === 2) {
       //未订阅，跳转商城
-      setprdtMallLink(MallLink)
+      setprdtMallLink(MallLink || '')
       setisToStoreOpen(true)
     }else if(IsSubscribed === 1){
       //已订阅，跳转详情页
diff --git a/src/pages/ListenDetail/index.tsx b/src/pages/ListenDetail/index.tsx
index b8e52a9..c808b47 100644
--- a/src/pages/ListenDetail/index.tsx
+++ b/src/pages/ListenDetail/index.tsx
@@ -107,7 +107,7 @@ export default function ListenDetail() {
       console.log('IsSubscribed=>', IsSubscribed)
       if (IsSubscribed === -1) {
         //未订阅，跳转商城
-        detailData.MallLink && setprdtMallLink(detailData.MallLink)
+        setprdtMallLink(detailData.MallLink || '')
         setisToStoreOpen(true)
       }else{
         Taro.navigateTo({