From 9dc6ed5d78810acb5f7302aa6c0757ea6ef6a6f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=BF=83=E5=AE=87?= Date: Thu, 15 Jun 2023 10:28:34 +0800 Subject: [PATCH] bug fix --- src/common/UrlTool.js | 8 +++ src/common/educoder.js | 2 +- .../Information/Component/memberApply.jsx | 14 ++--- src/forge/Information/Pages/zoneVIP.jsx | 7 +-- src/forge/Information/img/nodata.png | Bin 0 -> 48502 bytes src/forge/Information/index.scss | 48 ++++++++++++++---- src/forge/Information/indexZone1.scss | 8 --- src/forge/Information/theme.scss | 2 + src/forge/Nodata.js | 4 +- src/forge/Team/Component/UploadImage.jsx | 10 ++-- 10 files changed, 68 insertions(+), 35 deletions(-) create mode 100644 src/forge/Information/img/nodata.png diff --git a/src/common/UrlTool.js b/src/common/UrlTool.js index f1654f0d1..78a105fd5 100644 --- a/src/common/UrlTool.js +++ b/src/common/UrlTool.js @@ -132,6 +132,14 @@ export function getUrl(path, goTest) { return `${path ? path: ''}`; } +export function getZoneUrl(path) { + const local = 'https://testgetway.trustie.net' + if (isDev) { + return `${local}${path?path:''}` + } + return `${path ? path: ''}`; +} + export function getUrlmys(path, goTest) { // https://www.educoder.net // https://testbdweb.trustie.net diff --git a/src/common/educoder.js b/src/common/educoder.js index ef585ed45..5b90e804d 100644 --- a/src/common/educoder.js +++ b/src/common/educoder.js @@ -4,7 +4,7 @@ export { getUploadLogoActionUrl as getUploadLogoActionUrl,numFormat as numFormat, - getImageUrl as getImageUrl,getImageUrlAbsolute as getImageUrlAbsolute,getImage as getImage, getmyUrl as getmyUrl, getRandomNumber as getRandomNumber, getUrl as getUrl, publicSearchs as publicSearchs, getRandomcode as getRandomcode, getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl + getImageUrl as getImageUrl,getImageUrlAbsolute as getImageUrlAbsolute,getImage as getImage, getmyUrl as getmyUrl, getRandomNumber as getRandomNumber, getUrl as getUrl, getZoneUrl as getZoneUrl, publicSearchs as publicSearchs, getRandomcode as getRandomcode, getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl , getUploadActionUrl as getUploadActionUrl, getUploadActionUrltwo as getUploadActionUrltwo, getUploadActionUrlthree as getUploadActionUrlthree, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth , getTaskUrlById as getTaskUrlById, TEST_HOST, htmlEncode as htmlEncode, getupload_git_file as getupload_git_file, getcdnImageUrl as getcdnImageUrl, turnbar,returnbar,setSeoMeta as setSeoMeta diff --git a/src/forge/Information/Component/memberApply.jsx b/src/forge/Information/Component/memberApply.jsx index c5002398a..24abcaf77 100644 --- a/src/forge/Information/Component/memberApply.jsx +++ b/src/forge/Information/Component/memberApply.jsx @@ -1,7 +1,7 @@ import React , {forwardRef, useEffect, useState} from 'react'; import { Modal , Form , Input , Button, Icon } from 'antd'; import UploadImage from '../../Team/Component/UploadImage'; -import { getImageUrl } from 'educoder'; +import { getImageUrl, getZoneUrl } from 'educoder'; const { TextArea } = Input; @@ -12,7 +12,7 @@ function MemberApply(props){ useEffect(()=>{ if (current_user) { - setImageUrl(current_user.image_url); + setImageUrl(getImageUrl(`/${current_user.image_url}`)); } },[current_user]) @@ -24,11 +24,7 @@ function MemberApply(props){ } }) } - - function getImageId(id){ - setImageUrl(`/api/attachments/${id}`) - } - + const layout = { labelCol: { span: 5 }, wrapperCol: { span: 18 }, @@ -59,7 +55,7 @@ function MemberApply(props){ )} - + setImageUrl(url) } url={ getImageUrl(`/${current_user.image_url}`)} action={ getZoneUrl(`/api/cms/common/upload`) } /> {getFieldDecorator("introduction",{ @@ -72,7 +68,7 @@ function MemberApply(props){ {getFieldDecorator("remark",{ rules:[{ required:true,message:"请输入申请原因" }] })( -