3.6 合并3.4

src/Activity/ActivityTypeDetail.tsx

@@ -447,6 +447,7 @@ const ActivityTypeDetail: React.FC<IActivityTypeDetail> = props => {
                     login2p.jwt &&
                     data?.HasPermission !== INewPermissionType.OK &&
                     data?.IsShowWxPay &&
+                    data?.Detail.ActiveState !== '3' &&
                     !media.isSmallMax ? (
                       <div className="activity-paynopermission-wrapper">
                         <div className="white-wrapper" />

src/Material/components/ApplyResult.tsx

@@ -55,7 +55,7 @@ const ApplyResult: React.FC<IApplyPermissionProps> = props => {
             </div>
           </>
         )}
-        {(info.Source === 'activity' || info.Source === 'activityvoice' || info.Source === 'AskserieVideo') && (
+        {(info.Source === 'activity' || info.Source === 'activityvoice' || info.Source === 'activityvideo') && (
           <>
             <div className="paymodel-title">
               {info.OrderStatus === EOrderStatus.Payed ? (