diff --git a/.env.blue b/.env.blue deleted file mode 100644 index b7f66c6..0000000 --- a/.env.blue +++ /dev/null @@ -1,15 +0,0 @@ -VITE_HOST=192.168.0.15 -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.115:8081 -VITE_WEBSOCKET_BASE_URL=ws://${VITE_HOST}:7025/copyright -# 18634604067 -VITE_USERID=80d3365e-0597-4988-979e-18ef1c3ec671 -VITE_CURRENT_THEME=blue - -VITE_NAME=河北雄安珐著科技有限公司 -VITE_SUBNAME=河北雄安珐著科技有限公司 -VITE_ADRESS=中国（河北）雄安新区雄县雄州路681号1-149 -VITE_PHONE=18647109157 \ No newline at end of file diff --git a/.env.bluenopay b/.env.bluenopay deleted file mode 100644 index 33546e7..0000000 --- a/.env.bluenopay +++ /dev/null @@ -1,16 +0,0 @@ -VITE_HOST=192.168.0.15 -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.115:8081 -VITE_WEBSOCKET_BASE_URL=ws://${VITE_HOST}:7025/copyright -# 18634604067 -VITE_USERID=80d3365e-0597-4988-979e-18ef1c3ec671 -VITE_CURRENT_THEME=blue -VITE_PAY=0 - -VITE_NAME=河北雄安珐著科技有限公司 -VITE_SUBNAME=河北雄安珐著科技有限公司 -VITE_ADRESS=中国（河北）雄安新区雄县雄州路681号1-149 -VITE_PHONE=18647109157 \ No newline at end of file diff --git a/.env.development b/.env.dev similarity index 80% rename from .env.development rename to .env.dev index d68d771..ad7f5c1 100644 --- a/.env.development +++ b/.env.dev @@ -6,4 +6,5 @@ VITE_OPERATOR_PLUGIN_BASE_URL=${VITE_BASE_URL}:8099 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 \ No newline at end of file +VITE_USERID=80d3365e-0597-4988-979e-18ef1c3ec671 +VITE_CURRENT_THEME=fzkj \ No newline at end of file diff --git a/.env.production b/.env.fzkj similarity index 70% rename from .env.production rename to .env.fzkj index 6c2a975..cf253b9 100644 --- a/.env.production +++ b/.env.fzkj @@ -1,8 +1,8 @@ -VITE_BASE_URL=https://www.aimzhu.com +VITE_BASE_URL=http://101.200.88.219:8081/ VITE_COPY_BASE_URL=${VITE_BASE_URL} VITE_OPERATOR_BASE_URL=${VITE_BASE_URL} VITE_OPERATOR_PLUGIN_BASE_URL=${VITE_BASE_URL} VITE_AI_SHOP_BASE_URL=${VITE_BASE_URL} VITE_WEBSOCKET_BASE_URL=/copyright -# VITE_CURRENT_THEME=blue -VITE_USERID='' \ No newline at end of file +VITE_USERID='' +VITE_CURRENT_THEME=fzkj diff --git a/.env.mzw b/.env.mzw index 7472f7a..5bafbf3 100644 --- a/.env.mzw +++ b/.env.mzw @@ -1,15 +1,8 @@ -VITE_HOST=192.168.0.15 -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.115:8081 -VITE_WEBSOCKET_BASE_URL=ws://${VITE_HOST}:7025/copyright -# 18634604067 -VITE_USERID=80d3365e-0597-4988-979e-18ef1c3ec671 +VITE_BASE_URL=https://www.aimzhu.com +VITE_COPY_BASE_URL=${VITE_BASE_URL} +VITE_OPERATOR_BASE_URL=${VITE_BASE_URL} +VITE_OPERATOR_PLUGIN_BASE_URL=${VITE_BASE_URL} +VITE_AI_SHOP_BASE_URL=${VITE_BASE_URL} +VITE_WEBSOCKET_BASE_URL=/copyright +VITE_USERID='' VITE_CURRENT_THEME=mzw - -VITE_NAME=河北雄安秒著科技有限公司（以下简称“AI喵著网”） -VITE_SUBNAME=河北雄安秒著科技有限公司 -VITE_ADRESS=中国（河北）自由贸易试验区雄安片区容东明朗南街131号 -VITE_PHONE=400-086-1633 \ No newline at end of file diff --git a/.env.mzwnopay b/.env.mzwnopay deleted file mode 100644 index f830533..0000000 --- a/.env.mzwnopay +++ /dev/null @@ -1,16 +0,0 @@ -VITE_HOST=192.168.0.15 -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.115:8081 -VITE_WEBSOCKET_BASE_URL=ws://${VITE_HOST}:7025/copyright -# 18634604067 -VITE_USERID=80d3365e-0597-4988-979e-18ef1c3ec671 -VITE_CURRENT_THEME=mzw -VITE_PAY=0 - -VITE_NAME=河北雄安秒著科技有限公司（以下简称“AI喵著网”） -VITE_SUBNAME=河北雄安秒著科技有限公司 -VITE_ADRESS=中国（河北）自由贸易试验区雄安片区容东明朗南街131号 -VITE_PHONE=400-086-1633 \ No newline at end of file diff --git a/package.json b/package.json index 49076dc..360b560 100644 --- a/package.json +++ b/package.json @@ -4,16 +4,12 @@ "version": "0.0.0", "type": "module", "scripts": { - "dev": "vite", - "dev:blue": "vite --mode blue", - "dev:blue-nopay": "vite --mode bluenopay", + "dev": "vite --mode dev", + "dev:fzkj": "vite --mode fzkj", "dev:mzw": "vite --mode mzw", - "dev:mzw-nopay": "vite --mode mzwnopay", "build": "tsc && vite build", - "build:blue": "tsc && vite build --mode blue", - "build:blue-nopay": "tsc && vite build --mode bluenopay", + "build:fzkj": "tsc && vite build --mode fzkj", "build:mzw": "tsc && vite build --mode mzw", - "build:mzw-nopay": "tsc && vite build --mode mzwnopay", "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0", "preview": "vite preview" }, diff --git a/src/components/payment/Payment.tsx b/src/components/payment/Payment.tsx index 1cbccb4..8148b65 100644 --- a/src/components/payment/Payment.tsx +++ b/src/components/payment/Payment.tsx @@ -20,7 +20,7 @@ import { import { ReloadOutlined } from '@ant-design/icons' -import { useEffect, useRef, useState } from "react"; +import { useEffect, useRef, useState ,useContext} from "react"; import locale from 'antd/locale/zh_CN'; import dayjs from 'dayjs'; import 'dayjs/locale/zh-cn'; @@ -89,9 +89,9 @@ interface IPaymentProps { handleCancel(): void; show: boolean; } - +import { GlobalContext } from "../../context/GlobalContext.ts"; export default function Payment(props: IPaymentProps) { - const pay = import.meta.env.VITE_PAY?import.meta.env.VITE_PAY:'1'; + const globalContext = useContext(GlobalContext); const token = sessionStorage.getItem('token') // 服务包相关 const [packPage, setPackPage] = useState(1); //服务包数据分页页码 @@ -137,6 +137,8 @@ export default function Payment(props: IPaymentProps) { useEffect(() => { getPackageList(value, packPage); console.log(import.meta.env.VITE_PAY); + console.log(globalContext); + }, []) const packColumns: TableColumnsType = [ { @@ -952,14 +954,13 @@ export default function Payment(props: IPaymentProps) { // setSelectedRowKeys([]); }}> - + 微信 - + + 支付宝 diff --git a/src/context/GlobalContext.ts b/src/context/GlobalContext.ts index 272f033..752bbba 100644 --- a/src/context/GlobalContext.ts +++ b/src/context/GlobalContext.ts @@ -38,7 +38,7 @@ export function reloadUser(messageApi: MessageInstance, globalDispatchContext: D // if (currentToken!== data.accessToken) { // sessionStorage.setItem('token', data.accessToken); // } - // console.log('用户信息',data); + console.log('用户信息',data); resolve(data); } diff --git a/src/layout/head/Head.tsx b/src/layout/head/Head.tsx index b3beceb..87a0f28 100644 --- a/src/layout/head/Head.tsx +++ b/src/layout/head/Head.tsx @@ -1273,7 +1273,7 @@ export default function Head() { 软件著作权一站式服务平台 */} {/*
*/} diff --git a/src/static/fzkj/css/index.css b/src/static/fzkj/css/index.css new file mode 100644 index 0000000..3b2961f --- /dev/null +++ b/src/static/fzkj/css/index.css @@ -0,0 +1,171 @@ +:root { + --color-border: rgba(206, 206, 206, 0.4); + --color-box-shadow: rgba(206, 206, 206, 0.4); + --color-red: #ff5722; + + /* ai页面窗口被选中状态颜色 */ + --color-primary: rgb(81, 150, 177); + + + + --color-green: rgba(129, 179, 55, 1); + --color-blue: rgba(64, 149, 229, 1); + --color-purple: #a233c6; + --color-dark: rgba(68, 72, 88, 1); + --color-light: #fafafa; + --color-hover: #eeeeee; + --color-text-disabled: rgba(68, 72, 88, 0.5); + --color-text-header-left: #FFBF6B; + --color-text-header-right: #101010; + --color-note: rgba(68, 72, 88, 0.5); + --color-disabled: #D9D9D9; + --font-size-head: 14px; + /* --width-workspace: 1280px; */ + --width-workspace: 100vw; + --height-head: 60px; + --height-foot: 30px; + /* head中在线客服字体颜色 */ + --color-kefu: white; + /* head中套餐包背景色 */ + --color-pickback: rgba(222, 222, 222, 0.3); + /* head中套餐包、邀请码 字体颜色 系统流程 消息提示颜色 */ + --color-pickfont: rgb(255, 255, 255); + /* heda中套餐包数字字体颜色 */ + --color-picknum: #FF6508; + /* head中充值按钮背景色 */ + --color-recharge: linear-gradient(52deg, #12FFF1 0%, #0129BC 100%); + /* head消息提示有消息的背景颜色 */ + --color-noticeback: #3FD4FF; + + + + /* left中选中菜单背景色 顶部创建按钮背景色*/ + --color-menuactive: #3FD4FF; + /* left中创建按钮背景色 */ + --color-menucreate: #3FD4FF; + /* left中顶部菜单字体颜色 */ + --color-menuhead: #1A2F66; + /* left中顶部菜单背景颜色 */ + --color-menuback: #EFFCFF; + /* left中顶部菜单边框颜色 */ + --color-menuborder: rgba(99, 155, 177, 0.3); + /* left中的选项字体颜色 */ + --color-menuoption: #1A2F66; + + + + /* 项目卡标签被选中后背景色 边框颜色 */ + --color-tagactive: #3FD4FF; + /* 项目卡金额背景色 */ + --color-tagmoney: #E6FBFF ; + /* 项目卡金额字体颜色 */ + --color-tagmoneyfont: #13374C; + /* 项目卡金额右边小字体颜色 */ + --color-tagmoneyright: #13374C; + /* 项目卡编辑预览 产权所属者 颜色 */ + --color-tagedit: #13374C; + + /* 顶部搜索栏特殊按钮颜色 */ + --color-searchbtn: #3FD4FF; + + /* 特殊竖条小块颜色 */ + --color-block: skyblue; + + + /* ai窗口被选中菜单颜色 */ + --color-aimenuactive: skyblue; + + + /* 创建项目顶部标题颜色 */ + --color-createfont: #275257; + /* 创建项目顶部标题背景色 */ + --color-createback: #F7F7F7; + /* 创建项目顶部标题字体颜色 */ + --color-createfont: #275257; + /* 创建项目使用流程序号背景色 */ + --color-createflow: #F38F1E; + + /* 创建所属者特殊字体颜色 */ + --color-ownfont: skyblue; + + /* 选择优惠券时候的可使用优惠券背景色 */ + --color-couponback: #FFF7EF; + /* 被选择优惠券边框 */ + --color-couponactive: #FF9D11; + + + /* 补正页补正类背景色 */ + --color-correctiontype: rgba(255, 189, 146, 0.32); + +} + +html, +body { + margin: 0; + padding: 0; + font-size: 14px; + background-color: #EEEEEE; + /* 禁止滚动条占位 隐藏浏览器默认的滚动条样式 */ + scrollbar-width: none; +} + +a { + color: var(--color-blue); + text-decoration-line: none; +} + +ul { + list-style: none; + margin: 0; + padding: 0; +} + +.text-btn { + cursor: pointer; +} + +.btn { + border: none; + border-radius: 3px; + padding: 10px; + cursor: pointer; +} + +.btn:active { + opacity: 0.95; +} + +.btn-red { + background-color: var(--color-red); + color: var(--color-light); +} + +.btn-orange { + background-color: var(--color-primary); + color: var(--color-light); +} + +.btn-green { + background-color: var(--color-green); + color: var(--color-light); +} + +.btn-blue { + background-color: var(--color-blue); + color: var(--color-light); +} + +.btn-purple { + background-color: var(--color-purple); + color: var(--color-light); +} + +.btn-dark { + background-color: var(--color-dark); + color: var(--color-light); +} + +.btn-light { + background-color: var(--color-light); + color: var(--color-dark); +} \ No newline at end of file diff --git a/src/static/fzkj/img/ai.gif b/src/static/fzkj/img/ai.gif new file mode 100644 index 0000000..ac15460 Binary files /dev/null and b/src/static/fzkj/img/ai.gif differ diff --git a/src/static/fzkj/img/buyback.png b/src/static/fzkj/img/buyback.png new file mode 100644 index 0000000..d9de89e Binary files /dev/null and b/src/static/fzkj/img/buyback.png differ diff --git a/src/static/fzkj/img/head/background.png b/src/static/fzkj/img/head/background.png new file mode 100644 index 0000000..82ae643 Binary files /dev/null and b/src/static/fzkj/img/head/background.png differ diff --git a/src/static/fzkj/img/head/kf.png b/src/static/fzkj/img/head/kf.png new file mode 100644 index 0000000..2782f48 Binary files /dev/null and b/src/static/fzkj/img/head/kf.png differ diff --git a/src/static/fzkj/img/head/kfImg.png b/src/static/fzkj/img/head/kfImg.png new file mode 100644 index 0000000..b7b7eac Binary files /dev/null and b/src/static/fzkj/img/head/kfImg.png differ diff --git a/src/static/fzkj/img/head/logo.png b/src/static/fzkj/img/head/logo.png new file mode 100644 index 0000000..1ad67cb Binary files /dev/null and b/src/static/fzkj/img/head/logo.png differ diff --git a/src/static/fzkj/img/head/logoT.png b/src/static/fzkj/img/head/logoT.png new file mode 100644 index 0000000..a2c1d10 Binary files /dev/null and b/src/static/fzkj/img/head/logoT.png differ diff --git a/src/static/fzkj/img/head/money.png b/src/static/fzkj/img/head/money.png new file mode 100644 index 0000000..f81e06c Binary files /dev/null and b/src/static/fzkj/img/head/money.png differ diff --git a/src/static/fzkj/img/head/moneytwo.png b/src/static/fzkj/img/head/moneytwo.png new file mode 100644 index 0000000..7bb91e4 Binary files /dev/null and b/src/static/fzkj/img/head/moneytwo.png differ diff --git a/src/static/fzkj/img/left/obj.png b/src/static/fzkj/img/left/obj.png new file mode 100644 index 0000000..12b66ef Binary files /dev/null and b/src/static/fzkj/img/left/obj.png differ diff --git a/src/static/fzkj/img/pack.png b/src/static/fzkj/img/pack.png new file mode 100644 index 0000000..20030c4 Binary files /dev/null and b/src/static/fzkj/img/pack.png differ diff --git a/src/static/fzkj/img/projBox/background.png b/src/static/fzkj/img/projBox/background.png new file mode 100644 index 0000000..8f9f57f Binary files /dev/null and b/src/static/fzkj/img/projBox/background.png differ diff --git a/src/static/fzkj/img/projBox/black.png b/src/static/fzkj/img/projBox/black.png new file mode 100644 index 0000000..0028365 Binary files /dev/null and b/src/static/fzkj/img/projBox/black.png differ diff --git a/src/static/fzkj/img/projBox/blue.png b/src/static/fzkj/img/projBox/blue.png new file mode 100644 index 0000000..dbc526c Binary files /dev/null and b/src/static/fzkj/img/projBox/blue.png differ diff --git a/src/static/fzkj/img/projBox/green.png b/src/static/fzkj/img/projBox/green.png new file mode 100644 index 0000000..0a78f53 Binary files /dev/null and b/src/static/fzkj/img/projBox/green.png differ diff --git a/src/static/fzkj/img/projBox/logo.png b/src/static/fzkj/img/projBox/logo.png new file mode 100644 index 0000000..11ddf11 Binary files /dev/null and b/src/static/fzkj/img/projBox/logo.png differ diff --git a/src/static/fzkj/img/projBox/num.png b/src/static/fzkj/img/projBox/num.png new file mode 100644 index 0000000..b3f3601 Binary files /dev/null and b/src/static/fzkj/img/projBox/num.png differ diff --git a/src/static/fzkj/img/projBox/red.png b/src/static/fzkj/img/projBox/red.png new file mode 100644 index 0000000..5b33e6c Binary files /dev/null and b/src/static/fzkj/img/projBox/red.png differ diff --git a/src/static/fzkj/img/projBox/reson.png b/src/static/fzkj/img/projBox/reson.png new file mode 100644 index 0000000..c2792d2 Binary files /dev/null and b/src/static/fzkj/img/projBox/reson.png differ diff --git a/src/static/fzkj/img/projBox/timeback.png b/src/static/fzkj/img/projBox/timeback.png new file mode 100644 index 0000000..afbf9b7 Binary files /dev/null and b/src/static/fzkj/img/projBox/timeback.png differ diff --git a/src/static/fzkj/img/right/back.png b/src/static/fzkj/img/right/back.png new file mode 100644 index 0000000..2b15e33 Binary files /dev/null and b/src/static/fzkj/img/right/back.png differ diff --git a/src/static/fzkj/img/right/del.png b/src/static/fzkj/img/right/del.png new file mode 100644 index 0000000..f0c2686 Binary files /dev/null and b/src/static/fzkj/img/right/del.png differ diff --git a/src/static/fzkj/img/right/gps.png b/src/static/fzkj/img/right/gps.png new file mode 100644 index 0000000..539a691 Binary files /dev/null and b/src/static/fzkj/img/right/gps.png differ diff --git a/src/static/fzkj/img/right/menu.png b/src/static/fzkj/img/right/menu.png new file mode 100644 index 0000000..7818b44 Binary files /dev/null and b/src/static/fzkj/img/right/menu.png differ diff --git a/src/static/fzkj/img/right/order.png b/src/static/fzkj/img/right/order.png new file mode 100644 index 0000000..365606f Binary files /dev/null and b/src/static/fzkj/img/right/order.png differ diff --git a/src/static/fzkj/img/right/set.png b/src/static/fzkj/img/right/set.png new file mode 100644 index 0000000..103d379 Binary files /dev/null and b/src/static/fzkj/img/right/set.png differ diff --git a/src/static/fzkj/img/serve.png b/src/static/fzkj/img/serve.png new file mode 100644 index 0000000..47aac06 Binary files /dev/null and b/src/static/fzkj/img/serve.png differ diff --git a/src/static/fzkj/img/use.png b/src/static/fzkj/img/use.png new file mode 100644 index 0000000..cedaaa6 Binary files /dev/null and b/src/static/fzkj/img/use.png differ diff --git a/src/util/AjaxUtils.ts b/src/util/AjaxUtils.ts index 25b790b..1ca3c6e 100644 --- a/src/util/AjaxUtils.ts +++ b/src/util/AjaxUtils.ts @@ -30,8 +30,8 @@ axios.defaults.baseURL = `${copyBaseUrl}/copyright`; // export const DevUserId: string = '80d3365e-0597-4988-979e-18ef1c3ec671'; // 18634604067 // export const DevUserId: string = 'e3e40f95-7a3f-4b53-a1a0-51dd4e881d74'; // 15042810561 密码88888888 // export const DevUserId: string = 'c2438eb8-2685-49a9-bf02-5111a5192d96'; // 18647109157 -export const DevUserId: string = import.meta.env.VITE_USERID; -console.log(DevUserId); +export const DevUserId: string = import.meta.env.VITE_USERID ; +// console.log(DevUserId); type Req = { messageApi: MessageInstance;