3.0 准备发版

src/Activity/Activity.service.ts

@@ -246,7 +246,6 @@ export interface IActivitySignupRes {
   IsResearchSpecial: boolean // 是否属于特殊的研选
 }
 export interface IActivityCheckRes {
-  IsShowWxPaySet: boolean //是否是付费的开关
   IsPayActivity: boolean //是否是付费活动
   IsNeedBusinessCard: boolean //已有归属机构
   CheckSiginUpNum: boolean //人数是否通过校验

src/Activity/components/ActivityBtn.component.tsx

@@ -364,21 +364,15 @@ const ActivityBtnComponent: React.FC<IActivityBtnComponent> = props => {
     return { title: title[type] }
   }
   // 权限判断
-  const handleCheckPower = (
-    HasPermission: INewPermissionType,
-    isResearch: boolean,
-    isResearchSpecial: boolean,
-    activityPay = true
-  ) => {
+  const handleCheckPower = (HasPermission: INewPermissionType, isResearch: boolean, isResearchSpecial: boolean) => {
     // 如果接口没返回权限则跳过
     if (!HasPermission) return true
 
     // 1.先判断权限，无权限则弹框
     if (HasPermission !== INewPermissionType.OK) {
       // 列表的按钮点击，无权限时，需要进入详情页
-      console.log(activityPay)
 
-      if (btnGrous !== 'detail' && activityPay) {
+      if (btnGrous !== 'detail' && login2p.userInfo?.IsShowWxPaySet) {
         isSpecial
           ? window.open(`/activity/info/${(item as IActivitySpecialListItem).ActivityId}`)
           : window.open(`/activity/detail/${(item as IActivityTypeListItem).ActivityId}`)
@@ -425,8 +419,7 @@ const ActivityBtnComponent: React.FC<IActivityBtnComponent> = props => {
     const powerCheck = handleCheckPower(
       item?.AuthInfo?.HasPermission,
       item?.IsResearch,
-      (item as IActivityTypeListItem)?.IsResearchSpecial,
-      (item as IActivityTypeListItem)?.IsShowWxPay
+      (item as IActivityTypeListItem)?.IsResearchSpecial
     )
 
     if (!powerCheck) return
@@ -716,7 +709,7 @@ const ActivityBtnComponent: React.FC<IActivityBtnComponent> = props => {
   const handleReturnGoOn = (res: IActivityCheckRes) => {
     // 1.权限
     if (!res.CheckPermission) {
-      handleCheckPower(res.HasPermission, res.IsResearch, res?.IsResearchSpecial, res.IsShowWxPaySet)
+      handleCheckPower(res.HasPermission, res.IsResearch, res?.IsResearchSpecial)
       return
     }
     // 1.1.人数

src/Login2p/Login2p.service.ts

@@ -23,6 +23,7 @@ export interface IPrivateEquityUser {
   SpecialColumnId: number // 专栏ID
   IsImproveInformation: boolean // 专栏信息是否需要完善  为false的时候进行编辑
   InviteShareCode: string // 邀请码
+  IsShowWxPaySet: boolean //是否开启了支付
 }
 export interface ILoginWechartRes {
   CompanyName: string