shenwu hace 1 semana
padre
commit
6c077368fb

+ 1 - 1
config/proxy.ts

@@ -15,7 +15,7 @@ export default {
     // localhost:8000/api/** -> https://preview.pro.ant.design/api/**
     '/api/': {
       // 要代理的地址
-      target: 'https://test-distribution-api.zanxiangnet.com',
+      target: 'https://api.zanxiangnet.com/bookDistribution',
       // 配置了这个可以从 http 代理到 https
       // 依赖 origin 的功能可能需要这个,比如 cookie
       pathRewrite: { '^/api/': '' },

+ 0 - 1
package.json

@@ -89,7 +89,6 @@
     "eslint": "^8.56.0",
     "express": "^4.18.2",
     "gh-pages": "^3.2.3",
-    "husky": "^7.0.4",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "lint-staged": "^10.5.4",

+ 43 - 4
src/pages/MiniApp/BookManage/Short/index.tsx

@@ -2,12 +2,12 @@ import { ActionType, BetaSchemaForm, PageContainer, ProFormInstance } from "@ant
 import { columns } from "./tableConfig"
 import { useAjax } from "@/Hook/useAjax"
 import { useModel } from "@umijs/max"
-import { shortBookInfoList, shortBookInfoParagraphList, shortBookInfoBookConfig, shortBookInfoConfig, shortBookInfoParagraphAllList, sysRechargeGetInfo, sysRechargeAddOrEdit, shortBookInfoShelve } from "@/services/miniApp/bookManage"
+import { shortBookInfoList, shortBookInfoParagraphList, shortBookInfoBookConfig, shortBookInfoConfig, shortBookInfoParagraphAllList, sysRechargeGetInfo, sysRechargeAddOrEdit, shortBookInfoShelve, apiSubmitToTencent, apiRefreshSubmitResult } from "@/services/miniApp/bookManage"
 import { useCallback, useEffect, useMemo, useRef, useState } from "react"
 import { Button, Card, Drawer, message, Popconfirm, Space, Tag } from "antd"
 import ReadText from "../components/readText"
 import formConfig from "./formConfig"
-import { ColumnHeightOutlined, EditFilled } from "@ant-design/icons"
+import { ColumnHeightOutlined, EditFilled, SendOutlined } from "@ant-design/icons"
 import MyProTable from "@/components/MyProTable"
 const wordCountRanges: any = {
     "": { start: null, end: null }, // 全部
@@ -55,6 +55,9 @@ const Page: React.FC = (props: Props) => {
     let globaleConfig = useAjax((params) => sysRechargeGetInfo(params))//获取全局配置信息
     let globaleAddOrEdit = useAjax((params) => sysRechargeAddOrEdit(params))//全局配置信息修改
     let ShortBookInfoShelve = useAjax((params) => shortBookInfoShelve(params))//短篇小说批量上下架
+    //批量提审到腾讯
+    let submitToTencent = useAjax((params) => apiSubmitToTencent(params));
+    let refreshSubmitResult =useAjax((params) => apiRefreshSubmitResult(params))
     const formRef = useRef<ProFormInstance>();
     const actionRef = useRef<ActionType>();
 
@@ -164,7 +167,7 @@ const Page: React.FC = (props: Props) => {
     }
     // 批量上下架
     const shelveAll = (ids: any[], shelve: 0 | 1) => {
-        ShortBookInfoShelve.run({ ...publicData, ids, shelve}).then((res) => {
+        ShortBookInfoShelve.run({ ...publicData, ids, shelve }).then((res) => {
             if (res.code === 200) {
                 actionRef?.current?.reload();
                 message.success('批量' + (shelve === 0 ? '上架成功' : '下架成功'));
@@ -172,6 +175,28 @@ const Page: React.FC = (props: Props) => {
             }
         });
     };
+    // 批量提审到腾讯
+    const submitToTencentFn = () => {
+        let bookIds = editSelectedRow?.map(item => item.bookId)
+        let { appId, appType } = publicData
+        submitToTencent.run({ bookIds, appId, appType }).then(res => {
+            if (res.code === 200) {
+                actionRef?.current?.reload();
+                message.success('已提交到腾讯等待审核结果');
+                setEditSelectedRow([])
+            }
+        })
+    }
+    //刷新腾讯审核结果
+    const refreshSubmitResultFn = (bookIds: any) => {
+        let { appId, appType } = publicData
+        refreshSubmitResult.run({ bookIds, appId, appType }).then(res => {
+            if (res.code === 200) {
+                actionRef?.current?.reload();
+                message.success('已刷新');
+            }
+        })
+    }
     return <PageContainer title={false}
         tabProps={{ type: 'card' }}
         loading={globaleConfig?.loading}
@@ -286,6 +311,20 @@ const Page: React.FC = (props: Props) => {
                                 批量上下架
                             </Button>
                         </Popconfirm>
+                        <Popconfirm
+                            title={null}
+                            icon={null}
+                            onConfirm={() => {
+                                submitToTencentFn()
+                            }}
+                            okText="全部审核"
+                            cancelText="取消"
+                        >
+                            <Button type="primary" disabled={selectedRowKeys.length === 0}>
+                                <SendOutlined />
+                                提交到腾讯审核
+                            </Button>
+                        </Popconfirm>
                     </Space>
                 );
             }}
@@ -322,7 +361,7 @@ const Page: React.FC = (props: Props) => {
                     return res
                 })
             }}
-            columns={columns({ authList: state?.authList, labelList: state.labelList, categoryList: state.categoryList, enumList: state?.enumList, lookBook, closeForm, setWorkDirection, isModal: !!props?.onChange })}
+            columns={columns({ authList: state?.authList, labelList: state.labelList, categoryList: state.categoryList, enumList: state?.enumList, lookBook, closeForm, setWorkDirection, isModal: !!props?.onChange ,refreshSubmitResultFn})}
         />
         {/* 付费配置 */}
         <BetaSchemaForm<DataItem>

+ 8 - 3
src/pages/MiniApp/BookManage/Short/tableConfig.tsx

@@ -1,7 +1,7 @@
 import { MyIcon } from "@/global";
 import { getDescriptions } from "@/utils";
 import { ProColumns } from "@ant-design/pro-components";
-import { Badge, Col, Image, Row, Space, Tag } from "antd";
+import { Badge, Button, Col, Image, Row, Space, Tag, Tooltip } from "antd";
 import { createStyles } from "antd-style";
 import BookExtend from "../components/extend";
 const useStyles = createStyles(({ token }) => {
@@ -30,8 +30,8 @@ const brightColors = [
     "#FF69B4", // 热粉红色
     "#FF1493"  // 深粉红色
 ];
-export const columns = (props: { authList?: any[], labelList?: any[], enumList?: { [key: string]: any }, categoryList?: any[], lookBook: (data: any) => void, closeForm: (b: boolean, d: any) => void, setWorkDirection: (w: any) => void, isModal: boolean }): ProColumns<any>[] => {
-    let { authList, labelList, categoryList, enumList, lookBook, closeForm, setWorkDirection, isModal } = props
+export const columns = (props: { authList?: any[], labelList?: any[], enumList?: { [key: string]: any }, categoryList?: any[], lookBook: (data: any) => void, closeForm: (b: boolean, d: any) => void, setWorkDirection: (w: any) => void, isModal: boolean ,refreshSubmitResultFn:(bookIds:any)=>void}): ProColumns<any>[] => {
+    let { authList, labelList, categoryList, enumList, lookBook, closeForm, setWorkDirection, isModal ,refreshSubmitResultFn} = props
     let { styles } = useStyles()
     return enumList?.BOOK_STATUS ? [
         {
@@ -231,6 +231,11 @@ export const columns = (props: { authList?: any[], labelList?: any[], enumList?:
                 return <Space>
                     {b?.allowDistributorConfig && <a onClick={() => { closeForm(true, b) }}>付费配置</a>}
                     <BookExtend shortBookId={b?.bookId} bookName={b?.shortBookInfoVO?.bookName} />
+                    <Tooltip title={"刷新提交到腾讯的审核结果"}>
+                        <Button type="link" onClick={() => {
+                            refreshSubmitResultFn([b?.bookId])
+                        }}>刷新</Button>
+                    </Tooltip>
                 </Space>
             }
         },

+ 1 - 1
src/services/api.ts

@@ -1 +1 @@
-export let api: any = process.env.NODE_ENV === 'development' ? '/api' : 'https://test-distribution-api.zanxiangnet.com'
+export let api: any = process.env.NODE_ENV === 'development' ? '/api' : 'https://api.zanxiangnet.com/bookDistribution'

+ 20 - 0
src/services/miniApp/bookManage/index.tsx

@@ -161,3 +161,23 @@ export async function sysRechargeAddOrEdit(data: any) {
     data
   });
 }
+
+// ======================================腾讯审核书籍================================
+/**
+ * 批量提审到腾讯
+ * */ 
+export async function apiSubmitToTencent(params:any){
+  return request(api+`/admin/shortBookInfo/publishToWechatMiniapp`,{
+    method: 'POST',
+    data:params
+  })
+}
+/**
+ * 刷新提审结果
+ * */ 
+export async function apiRefreshSubmitResult(params:any){
+  return request(api+`/admin/shortBookInfo/refreshWechatminiappAuditResult`,{
+    method: 'POST',
+    data:params
+  })
+}