diff --git a/src/components/gift/index.less b/src/components/gift/index.less index 11da959..e718ef6 100644 --- a/src/components/gift/index.less +++ b/src/components/gift/index.less @@ -3,4 +3,5 @@ bottom: 5rem; right: 2rem; width: 4rem; + background-color: transparent; } diff --git a/src/pages/Customer/index.less b/src/pages/Customer/index.less index a8801bf..059368b 100644 --- a/src/pages/Customer/index.less +++ b/src/pages/Customer/index.less @@ -4,4 +4,7 @@ page { .pic { width: 100vw; height: 100vh; + + // width: 300rpx; + // height: 300rpx; } diff --git a/src/pages/Customer/index.tsx b/src/pages/Customer/index.tsx index 2353432..2e34698 100644 --- a/src/pages/Customer/index.tsx +++ b/src/pages/Customer/index.tsx @@ -1,10 +1,11 @@ import { Image } from '@tarojs/components' import Taro, { useShareAppMessage, useShareTimeline } from '@tarojs/taro' import './index.less' +// import pic from '../../assets/images/1.png' export default function Customer() { - useShareAppMessage((res) => { + useShareAppMessage(() => { return { title: '五色花', path: '/pages/Home/index' @@ -21,6 +22,7 @@ export default function Customer() { return ( { + const handleDisplay = (item: DetailProps['Resources']) => { if(!Taro.getStorageSync('UserToken')){ setisLoginOpen(true) }else{ console.log('IsSubscribed=>', memberInfo) - if (memberInfo?.SubscribedState !== 1) { + if (!detailData.IsFree && memberInfo?.SubscribedState !== 1) { // 付费专辑 && 无会员 //没有会员,跳转商城 setisToStoreOpen(true) }else{ Taro.navigateTo({ - url: '/pages/ListenDisplay/index?prdtId=' + prdtId + '&resId=' + resId + url: '/pages/ListenDisplay/index?prdtId=' + detailData.Product.PrdtId + '&resId=' + item.ResId }) } } @@ -219,7 +219,7 @@ export default function ListenDetail() { {handleDisplay( detailData.Product.PrdtId ,item.ResId)}} + onClick={() => {handleDisplay(item)}} > {item.ResTitle} diff --git a/src/pages/UserHome/index.less b/src/pages/UserHome/index.less index 1eeb856..25deecc 100644 --- a/src/pages/UserHome/index.less +++ b/src/pages/UserHome/index.less @@ -92,8 +92,10 @@ .user_home_content_item_des { display: flex; justify-content: center; - min-width: 1rem; - padding: .2rem .3rem; + min-width: .8rem; + padding: .25rem .2rem; + font-size: .7rem; + line-height: 1; color: #fff; background-color: #ea2b2b; border-radius: 50%;