Tenlion/system-copyright-react
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into devbra

Browse Source
This commit is contained in:
lyp 2025-06-04 09:52:19 +08:00
commit 4a1478d831
4 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.env.dev
View File

@ -3,11 +3,12 @@ VITE_BASE_URL=http://${VITE_HOST}
VITE_COPY_BASE_URL=${VITE_BASE_URL}:7025
VITE_OPERATOR_BASE_URL=${VITE_BASE_URL}:8091
VITE_OPERATOR_PLUGIN_BASE_URL=${VITE_BASE_URL}:8099
VITE_AI_SHOP_BASE_URL=http://192.168.0.15:8081
VITE_AI_SHOP_BASE_URL=http://192.168.0.115:8081
VITE_WEBSOCKET_BASE_URL=ws://${VITE_HOST}:7025/copyright
# 18634604067
VITE_USERID=80d3365e-0597-4988-979e-18ef1c3ec671
# VITE_USERID=e3e40f95-7a3f-4b53-a1a0-51dd4e881d74
# VITE_USERID=5cc90b84-905e-4027-9f6c-ab47e9c320a1
# VITE_CURRENT_THEME=fzkj
VITE_CURRENT_THEME=mzw
# VITE_HOST=121.36.71.250:58038

6
src/route/Correction/Correction.tsx
View File

@ -1254,15 +1254,15 @@ export default function Correction() {
}}
style={{ display: item.applyStatus == 'PENDING' ? 'block' : 'none' }}
>撤销补正</div>
<div style={{
display: item.projStatus== 'CLOSE' && item.type == 'CORRECTION1'? 'block' : 'none',
<div style={{
display: item.projStatus == 'CLOSE' && item.type == 'CORRECTION1' ? 'block' : 'none',
fontSize: 16,
color: '#5a5a5a',
fontWeight: 700,
}}>
项目已关闭
</div>
<div style={{ display: item.applyStatus == 'APPROVED' && item.projStatus !== 'CLOSE' || item.applyStatus == 'APPROVED' && item.type == 'CORRECTION2' ? 'block' : 'none' }}>
<div style={{ display: item.applyStatus == 'APPROVED' && item.projStatus !== 'CLOSE' || item.applyStatus == 'APPROVED' && item.type == 'CORRECTION2' ? 'block' : 'none' }}>
<div className='correctDownBox'>
<div className='correctDownBtn' style={{ display: item.correctionType == 'CODE' || item.correctionType == 'ALL' ? 'block' : 'none' }}>
<Dropdown menu={{

9
src/route/ProductRelease/ProductRelease.tsx
View File

@ -594,14 +594,19 @@ export default function ProductRelease() {
<Button className='goodsBtn' type="primary" style={{
width: '80px',
background:'rgb(248, 97, 97)',
display: item.goodsStatus == '0' || item.goodsOrderStatus == '1' ? 'none' : 'unset'
display: item.goodsStatus == '0' || item.goodsOrderStatus == '3' ? 'none' : 'unset'
}}
onClick={() => off(item)}>下架</Button>
<div className='goodsBtnIng' style={{
display: item.goodsOrderStatus == '1' ? 'unset' : 'none'
display: item.goodsOrderStatus == '3' ? 'unset' : 'none'
}}>
正在交易中...
</div>
<div className='goodsBtnIng' style={{
display: item.goodsOrderStatus == '4' ? 'unset' : 'none'
}}>
已完成
</div>
</div>
</div>
</div>

51
src/route/index/Index.tsx
View File

@ -57,7 +57,8 @@ import {
} from '../../util/AjaxUtils.ts'
import {
// getLanguageList, getSoftTypeList
appGoodsList, buyAppGoods, appOrderList
// appGoodsList,
buyAppGoods, appOrderList
} from '../../request/api'
import {
setMenuActive,
@ -91,8 +92,8 @@ import appnew from '../../static/left/appnew.png'
import tra from '../../static/left/tra.png'
import tranew from '../../static/left/tranew.png'
import topblack from '../../static/appimgs/topblack.png'
import topblue from '../../static/appimgs/topblue.png'
// import topblack from '../../static/appimgs/topblack.png'
// import topblue from '../../static/appimgs/topblue.png'
import right from '../../static/trademark/right.png'
import yes from '../../static/trademark/yes.png'
@ -983,7 +984,7 @@ export default function Index() {
const [showAppkeyWords, setShowAppkeyWords] = useState('') // 电子软著搜索关键字显示
const [appModal, setAppModal] = useState(false) // 申请电子软著弹窗
const [toEditsModal, setToEditsModal] = useState(false) // 电子软著编辑弹窗
const [appGoodsArray, setAppGoodsArray] = useState<any>([]) // 电子软著可选商品列表
// const [appGoodsArray, setAppGoodsArray] = useState<any>([]) // 电子软著可选商品列表
const [buyLoading, setBuyLoading] = useState(false) // 购买loading
const [appOrderId, setAppOrderId] = useState<any>() // 电子软著订单id
const [appExamineStatus, setAppExamineStatus] = useState<string | null>(null) // 电子软著审核状态
@ -1050,24 +1051,24 @@ export default function Index() {
}, [appKeyWords, appExamineStatus, appApplyStatus])
// 获取电子软著可选商品列表
const getAppGoodsList = async () => {
try {
const res = await appGoodsList()
// console.log('电子软著可选商品列表', res);
setAppGoodsArray(res)
} catch (error: any) {
// const getAppGoodsList = async () => {
// try {
// const res = await appGoodsList()
// // console.log('电子软著可选商品列表', res);
// setAppGoodsArray(res)
// } catch (error: any) {
if (error.response) {
const data = error.response.data;
messageApi.open({
type: 'error',
content: data.msg ? data.msg : `${data.path}(${data.status})`,
});
} else {
console.error(error)
}
}
}
// if (error.response) {
// const data = error.response.data;
// messageApi.open({
// type: 'error',
// content: data.msg ? data.msg : `${data.path}(${data.status})`,
// });
// } else {
// console.error(error)
// }
// }
// }
// -----------------------------------------------------------------------------------------------
@ -1800,7 +1801,7 @@ export default function Index() {
// getLanguageListDate()
// getSoftTypeListDate()
getAppGoodsList()
// getAppGoodsList()
}, []);
useEffect(() => {
// loactionStorage里的activeMenu
@ -2138,7 +2139,7 @@ export default function Index() {
</>
) : (
<></>
)}
)} */}
{THEME == 'mzw' ? (
<MenuWithBottomButtom
button={sellMenu.button}
@ -4097,7 +4098,7 @@ export default function Index() {
justifyContent: 'space-between',
alignItems: 'center',
}}>
{appGoodsArray.map((item: any, index: number) => {
{/* {appGoodsArray.map((item: any, index: number) => {
return (
<div className='appGoodsBox'
key={item.id}
@ -4140,7 +4141,7 @@ export default function Index() {
</div>
)
})}
})} */}
</div>
<div className='appGoodsBtnBox'>