4个tab页添加发送服务通知动作

src/components/getPhoneModal/index.tsx

@@ -40,23 +40,6 @@ export default function GetPhoneNumber({ onClose, scene = null, modalVisible, on
     }, 0)
   };
 
-  // 消息推送授权
-  const publicNotice = () => {
-    Taro.requestSubscribeMessage({
-      tmplIds: ['F5kG9ryTuf3U09liOVIqqZDDEwNwiuWbLPPdoVpKPWI', 'cnMggWGwr0_cVw7Hf_fg3u74EDJdA0b4e56Ioy-Vr_Q'],
-      success (res) {
-
-      },
-      fail (err) {
-        Taro.showToast({
-          title: err,
-          duration: 2000,
-          icon: 'error'
-        });
-      }
-    })
-  }
-
   const handleGetUserPhone = (e: any) => {
     console.log('注册接口：',e.detail, Taro.getStorageSync('othersInviteCode'))
 
@@ -80,8 +63,6 @@ export default function GetPhoneNumber({ onClose, scene = null, modalVisible, on
           Taro.setStorageSync('UserToken', res.data.token)
           Taro.removeStorageSync('othersInviteCode')
 
-          publicNotice()
-
           if(scene){
             Taro.request({
               url: 'https://interapi.jm-kid.com/api/product/exchange',

src/pages/Home/index.tsx

@@ -235,11 +235,28 @@ export default function Home() {
     }
   }, [isGetUsePhone])
 
+			// 消息推送授权
+	const publicNotice = (callback) => {
+    Taro.requestSubscribeMessage({
+      tmplIds: ['F5kG9ryTuf3U09liOVIqqZDDEwNwiuWbLPPdoVpKPWI', 'cnMggWGwr0_cVw7Hf_fg3u74EDJdA0b4e56Ioy-Vr_Q'],
+      success() {
+        callback && callback()
+      },
+      fail(err) {
+        Taro.showToast({
+          title: err,
+          duration: 2000,
+          icon: 'error'
+        })
+      },
+    })
+  }
+
   const toDetail = (item: FreeItemProps, child: FreeItemProps | undefined) => {
     const { IsSubscribed, PrdtId, MallLink } = item
-    if(IsSubscribed === 0){
+    if (IsSubscribed === 0) {
       //提醒用户登录
-      setisLoginOpen(true)
+      publicNotice(() => setisLoginOpen(true))
     }else if(!child){
       Taro.navigateTo({
         url: `/pages/CollectionDetail/index?id=${PrdtId}`
@@ -256,50 +273,16 @@ export default function Home() {
     }
   }
 
-  const handleBannerClick = (item: any, index: number) => {
-    // Taro.playBackgroundAudio({
-    //   dataUrl: 'https://alivod.jimeikid.com/sv/3e516a3e-191bb3c3cd6/3e516a3e-191bb3c3cd6.mp3',
-    //   title: '儿童古诗',
-    //   coverImgUrl: 'https://files.jimeikid.com/commodity/b92a701ad285416189e16a6dd406efb1.png'
-    // })
-
-//     const backgroundAudioManager = Taro.getBackgroundAudioManager()
-// backgroundAudioManager.title = '此时此刻'
-// backgroundAudioManager.epname = '此时此刻'
-// backgroundAudioManager.singer = '许巍'
-// backgroundAudioManager.coverImgUrl = 'https://y.gtimg.cn/music/photo_new/T002R300x300M000003rsKF44GyaSk.jpg?max_age=2592000'
-// backgroundAudioManager.src = 'https://alivod.jimeikid.com/sv/3e516a3e-191bb3c3cd6/3e516a3e-191bb3c3cd6.mp3'
-
-//     const innerAudioContext = Taro.createInnerAudioContext()
-// innerAudioContext.autoplay = true
-// innerAudioContext.src = 'https://storage.360buyimg.com/jdrd-blog/27.mp3'
-// innerAudioContext.onPlay(() => {
-//   console.log('开始播放')
-// })
-// innerAudioContext.onError((res) => {
-//   console.log(res.errMsg)
-//   console.log(res.errCode)
-// })
-
-    // return
+  const handleBannerClick = (item: any) => {
     if(item.is_subscribed === 0){
       //提醒用户登录
-      setisLoginOpen(true)
-    }
-    // else if(item.is_subscribed === -1 || item.is_subscribed === 2){
-    //   //未订阅，跳转商城
-    //   setprdtMallLink(item.mall_link)
-    //   setisToStoreOpen(true)
-    // }else if(item.is_subscribed === 1){
-    //   //已订阅，跳转详情页
-    //   Taro.navigateTo({
-    //     url: '/pages/CollectionDetail/index?id=' + item.prdt_id
-    //   })
-    // }
-    else{
+      publicNotice(() => setisLoginOpen(true))
+    } else {
       //已订阅，跳转详情页
-      Taro.navigateTo({
-        url: '/pages/Share/index'
+      publicNotice(() => {
+        Taro.navigateTo({
+          url: '/pages/Share/index'
+        })
       })
     }
   }
@@ -324,7 +307,7 @@ export default function Home() {
               <SwiperItem
                 className='swiper_item'
                 key={index}
-                onClick={()=>handleBannerClick(item, index)}
+                onClick={()=>handleBannerClick(item)}
               >
                 <Image className='swiper_item_img' src={item.url}></Image>
               </SwiperItem>

src/pages/Listen/index.tsx

@@ -229,11 +229,28 @@ export default function Listen() {
     })
   }
 
+	// 消息推送授权
+	const publicNotice = (callback) => {
+    Taro.requestSubscribeMessage({
+      tmplIds: ['F5kG9ryTuf3U09liOVIqqZDDEwNwiuWbLPPdoVpKPWI', 'cnMggWGwr0_cVw7Hf_fg3u74EDJdA0b4e56Ioy-Vr_Q'],
+      success() {
+        callback && callback()
+      },
+      fail(err) {
+        Taro.showToast({
+          title: err,
+          duration: 2000,
+          icon: 'error'
+        })
+      },
+    })
+  }
+
   const handleBannerClick = (item: any, index: number) => {
     if (!index) {
       if(!Taro.getStorageSync('UserToken')){
         //提醒用户登录
-        setisLoginOpen(true)
+        publicNotice(() => setisLoginOpen(true))
       } else {
         // 跳转到熏听会员
         Taro.navigateToMiniProgram({

src/pages/ListenDetail/index.tsx

@@ -100,9 +100,26 @@ export default function ListenDetail() {
     return `${formattedMinutes}:${formattedSeconds}`;
   }
 
+	// 消息推送授权
+	const publicNotice = (callback) => {
+    Taro.requestSubscribeMessage({
+      tmplIds: ['F5kG9ryTuf3U09liOVIqqZDDEwNwiuWbLPPdoVpKPWI', 'cnMggWGwr0_cVw7Hf_fg3u74EDJdA0b4e56Ioy-Vr_Q'],
+      success() {
+        callback && callback()
+      },
+      fail(err) {
+        Taro.showToast({
+          title: err,
+          duration: 2000,
+          icon: 'error'
+        })
+      },
+    })
+  }
+
   const handleDisplay = (item: DetailProps['Resources']) => {
-    if(!Taro.getStorageSync('UserToken')){
-      setisLoginOpen(true)
+    if (!Taro.getStorageSync('UserToken')) {
+      publicNotice(() => setisLoginOpen(true))
     }else{
       console.log('IsSubscribed=>', memberInfo)
       if (!detailData.IsFree && memberInfo?.SubscribedState !== 1) { // 付费专辑 && 无会员

src/pages/Subscribe/index.tsx

@@ -222,16 +222,35 @@ export default function Subscribe() {
     }
   }, [isFilter])
 
+	// 消息推送授权
+	const publicNotice = (callback) => {
+    Taro.requestSubscribeMessage({
+      tmplIds: ['F5kG9ryTuf3U09liOVIqqZDDEwNwiuWbLPPdoVpKPWI', 'cnMggWGwr0_cVw7Hf_fg3u74EDJdA0b4e56Ioy-Vr_Q'],
+      success() {
+        callback && callback()
+      },
+      fail(err) {
+        Taro.showToast({
+          title: err,
+          duration: 2000,
+          icon: 'error'
+        })
+      },
+    })
+  }
+
   const requestUserSubscribe = () => {
     if (!Taro.getStorageSync('UserToken')) {
-      setuserSubscribeSingleList([])
-      setuserSubscribeCollectionList([])
-      setuserSubscribeSingleFreeCount(0)
-      setuserSubscribeSinglePaidCount(0)
-      setuserSubscribeCollectionFreeCount(0)
-      setuserSubscribeCollectionPaidCount(0)
-
-      setisLoginOpen(true)
+      publicNotice(() => {
+        setuserSubscribeSingleList([])
+        setuserSubscribeCollectionList([])
+        setuserSubscribeSingleFreeCount(0)
+        setuserSubscribeSinglePaidCount(0)
+        setuserSubscribeCollectionFreeCount(0)
+        setuserSubscribeCollectionPaidCount(0)
+
+        setisLoginOpen(true)
+      })
     }else{
       //查询用户订阅信息
       Taro.request({
@@ -541,7 +560,7 @@ export default function Subscribe() {
 
   //搜索栏点击跳转搜索页
   const handleSearchToDetail = () => {
-    if(!Taro.getStorageSync('UserToken')){
+    if (!Taro.getStorageSync('UserToken')) {
       setisLoginOpen(true)
     }else{
       Taro.navigateTo({

src/pages/UserHome/index.tsx

@@ -132,12 +132,14 @@ export default function UserHome() {
         },
       })
     } else {
-      const list = operationList
-      list[0].des = ''
-      list[1].des = ''
-      list[6].des = ''
-      setOperationList([...list])
-      setisLoginOpen(true)
+      publicNotice(() => {
+        const list = operationList
+        list[0].des = ''
+        list[1].des = ''
+        list[6].des = ''
+        setOperationList([...list])
+        setisLoginOpen(true)
+      })
     }
   }, [])
 
@@ -168,27 +170,25 @@ export default function UserHome() {
   // }
   // })
 
-			// 消息推送授权
-	const publicNotice = (url) => {
+	// 消息推送授权
+	const publicNotice = (callback) => {
     Taro.requestSubscribeMessage({
       tmplIds: ['F5kG9ryTuf3U09liOVIqqZDDEwNwiuWbLPPdoVpKPWI', 'cnMggWGwr0_cVw7Hf_fg3u74EDJdA0b4e56Ioy-Vr_Q'],
-      success (res) {
-        Taro.navigateTo({
-          url: url,
-        })
+      success() {
+        callback && callback()
       },
-      fail (err) {
+      fail(err) {
         Taro.showToast({
           title: err,
           duration: 2000,
           icon: 'error'
-        });
-      }
+        })
+      },
     })
   }
 
   const handlePush = (index: number,url: string) => {
-    if(!Taro.getStorageSync('UserToken')){
+    if (!Taro.getStorageSync('UserToken')) {
       setisLoginOpen(true)
     }else{
       if (index === 3) {
@@ -199,7 +199,11 @@ export default function UserHome() {
         setisUserExchangeModalOpen(true)
       } else if (index === 4) {
         // 联系客服
-        publicNotice(url)
+        publicNotice(() => {
+          Taro.navigateTo({
+            url: url,
+          })
+        })
       } else {
         Taro.navigateTo({
           url: url,