diff --git a/config/routes.ts b/config/routes.ts
index 638e0ba..a3257e0 100644
--- a/config/routes.ts
+++ b/config/routes.ts
@@ -104,7 +104,7 @@ export default [
name: 'LibraryTypeManager',
component: './travelMember/LibraryTypeManager/index'
},
- // 图库信息管理
+ // 图库信息管理 图库内容管理
{
path: 'LibraryInformationManager',
name: 'LibraryInformationManager',
diff --git a/dist.zip b/dist.zip
index 42da0a0..8e797d7 100644
Binary files a/dist.zip and b/dist.zip differ
diff --git a/package.json b/package.json
index 18707ca..a874e63 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "ant-design-pro",
- "version": "4.5.79",
+ "version": "4.5.80",
"private": true,
"description": "An out-of-box UI solution for enterprise applications",
"scripts": {
diff --git a/src/pages/Setting/Users/components/edit.tsx b/src/pages/Setting/Users/components/edit.tsx
index 2113da8..9414695 100644
--- a/src/pages/Setting/Users/components/edit.tsx
+++ b/src/pages/Setting/Users/components/edit.tsx
@@ -122,9 +122,6 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
// 查询可配置的服务区
const { data: serverpartTree } = useRequest(async () => {
const data = await getServerpartTree({ ProvinceCode: '530000' })
- console.log('all', data);
-
-
return data.map(n => n.children ? n : { ...n, children: [] })
})
// 查询可选商家
@@ -135,8 +132,6 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
// 查询可选商家
const { run: handleGetMerchantTree, data: merchantTree } = useRequest(async () => {
const data = await getMerchantTreeNosessoin()
- console.log('3213123123213123213123', data);
-
return data
}, { manual: true })
@@ -152,7 +147,6 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
PageSize: 999999,
}
const data = await handeGetMERCHANTSList(req);
- console.log('datadatadatadatadata', data);
let list: any = []
if (data.List && data.List.length > 0) {
data.List.forEach((item: any) => {
@@ -171,7 +165,6 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
// 根据商家id查询门店列表
const { run: getShopTree, data: shopTree } = useRequest(async (businessManId?: number) => {
const data = await getMerchantShopTree({ BusinessManId: businessManId ? `${businessManId}` : detail?.BUSINESSMAN_ID })
- console.log('shopTreeshopTreeshopTreeshopTree', data);
return data
}, { manual: !detail?.BUSINESSMAN_ID })
@@ -236,8 +229,6 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
SystemRolePattern: 2000
}
const data = await getRoleList(req)
- console.log('data222', data);
-
setRoleTree(data)
}
@@ -265,8 +256,6 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
const req: any = {
USERId: initialDetail?.USER_ID
}
- console.log('req', req);
-
const data = await handleDeleteUSER(req)
if (data.Result_Code === 100) {
message.success(data.Result_Desc)
@@ -279,7 +268,6 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
const systemInfo = session.get('systemBasin')
handleGetSynchroBEHAVIORRECORD(1002)
-
}
const handleGetSynchroBEHAVIORRECORD = async (type: number) => {
@@ -322,7 +310,6 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
request={async () => {
if (detail) {
const initDetail = await getUserDetail(detail.USER_ID, true)
-
// 格式转化
// let haveList = initDetail.ServerpartList ? initDetail.ServerpartList.map(Number) : [] // 业主账号有服务区 有权限的全部服务区
const haveList = initDetail.ServerpartList || [] // 业主账号有服务区 有权限的全部服务区
@@ -364,7 +351,6 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
initDetail.USERTYPE_ID = initDetail.USERTYPE_ID || ''
setCheckedRole(initDetail.SystemRoleList)
setCheckedServerpart(serverpartList)
- console.log('serverpartShopListserverpartShopListserverpartShopListserverpartShopList', serverpartShopList);
setCheckedShop(serverpartShopList)
if (tableTab === '1000') {
@@ -375,9 +361,6 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
// setSelectDetail(initDetail.USER_PROVINCE)
setSelectDetail('530000')
- console.log('initDetail', initDetail);
-
-
if (initDetail.PushList && initDetail.PushList.length > 0) {
if (initDetail.PushList[0].key) {
const keyList: any = []
@@ -387,7 +370,6 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
})
res.ServerpartIds = keyList
}
- console.log('res', res);
// res.ServerpartIds = initDetail.PushList[0].key?Number(initDetail.PushList[0].key):null
res.UserTypeIds = initDetail.PushList[0].type
@@ -419,8 +401,6 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
// , USER_PATTERN: currentUser?.UserPattern
if (pageType === 'merchantManagement') {
- console.log('BUSINESSMAN_ID', BUSINESSMAN_ID);
-
detailForm.current?.setFieldsValue({ USERTYPE_ID: '' })
setInitialDetail({ ...initialDetail, BUSINESSMAN_NAME: BUSINESSMAN_ID?.label, BUSINESSMAN_ID: Number(BUSINESSMAN_ID?.value) })
console.log('{ ...initialDetail, BUSINESSMAN_NAME: BUSINESSMAN_ID?.label }', { ...initialDetail, BUSINESSMAN_NAME: BUSINESSMAN_ID?.label || '' });
@@ -437,9 +417,6 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
if (initialDetail) { // 编辑数据
newValue = { ...initialDetail, ...value }
}
- console.log('newValue1', newValue);
- console.log('checkedServerpart', checkedServerpart);
-
newValue.USER_STATUS = newValue.USER_STATUS ? 1 : 0
newValue.USER_REPEATLOGON = newValue.USER_REPEATLOGON ? 1 : 0
newValue.SUPER_ADMIN = newValue.SUPER_ADMIN ? 1 : 0
@@ -465,16 +442,7 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
})
}
-
-
- console.log('newValuenewValuenewValue', newValue);
const success = await handleAddUpdate(newValue, false);
- console.log('tableTab', tableTab);
-
- console.log('newData', newData);
- console.log('copyData', copyData);
-
-
if (success) {
// 比较开始数据 如果和开始数据不一样 就调用接口
diff --git a/src/pages/travelMember/LibraryInformationManager/index.tsx b/src/pages/travelMember/LibraryInformationManager/index.tsx
index 6f614b5..35ea118 100644
--- a/src/pages/travelMember/LibraryInformationManager/index.tsx
+++ b/src/pages/travelMember/LibraryInformationManager/index.tsx
@@ -255,11 +255,10 @@ const LibraryInformationManager: React.FC<{ currentUser: CurrentUser }> = (props
expandable={{
expandRowByClick: true
}}
- scroll={{ x: "100%", y: "calc(100vh - 410px)" }}
+ scroll={{ x: "100%", y: "calc(100vh - 420px)" }}
headerTitle={