Init: 初始化最新版本
This commit is contained in:
commit
73e60f08d6
|
|
@ -0,0 +1,24 @@
|
|||
# Logs
|
||||
logs
|
||||
*.log
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
pnpm-debug.log*
|
||||
lerna-debug.log*
|
||||
|
||||
node_modules
|
||||
dist
|
||||
dist-ssr
|
||||
*.local
|
||||
|
||||
# Editor directories and files
|
||||
.vscode/*
|
||||
!.vscode/extensions.json
|
||||
.idea
|
||||
.DS_Store
|
||||
*.suo
|
||||
*.ntvs*
|
||||
*.njsproj
|
||||
*.sln
|
||||
*.sw?
|
||||
|
|
@ -0,0 +1,73 @@
|
|||
# React + TypeScript + Vite
|
||||
|
||||
This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
|
||||
|
||||
Currently, two official plugins are available:
|
||||
|
||||
- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react) uses [Babel](https://babeljs.io/) (or [oxc](https://oxc.rs) when used in [rolldown-vite](https://vite.dev/guide/rolldown)) for Fast Refresh
|
||||
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
|
||||
|
||||
## React Compiler
|
||||
|
||||
The React Compiler is not enabled on this template because of its impact on dev & build performances. To add it, see [this documentation](https://react.dev/learn/react-compiler/installation).
|
||||
|
||||
## Expanding the ESLint configuration
|
||||
|
||||
If you are developing a production application, we recommend updating the configuration to enable type-aware lint rules:
|
||||
|
||||
```js
|
||||
export default defineConfig([
|
||||
globalIgnores(['dist']),
|
||||
{
|
||||
files: ['**/*.{ts,tsx}'],
|
||||
extends: [
|
||||
// Other configs...
|
||||
|
||||
// Remove tseslint.configs.recommended and replace with this
|
||||
tseslint.configs.recommendedTypeChecked,
|
||||
// Alternatively, use this for stricter rules
|
||||
tseslint.configs.strictTypeChecked,
|
||||
// Optionally, add this for stylistic rules
|
||||
tseslint.configs.stylisticTypeChecked,
|
||||
|
||||
// Other configs...
|
||||
],
|
||||
languageOptions: {
|
||||
parserOptions: {
|
||||
project: ['./tsconfig.node.json', './tsconfig.app.json'],
|
||||
tsconfigRootDir: import.meta.dirname,
|
||||
},
|
||||
// other options...
|
||||
},
|
||||
},
|
||||
])
|
||||
```
|
||||
|
||||
You can also install [eslint-plugin-react-x](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-x) and [eslint-plugin-react-dom](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-dom) for React-specific lint rules:
|
||||
|
||||
```js
|
||||
// eslint.config.js
|
||||
import reactX from 'eslint-plugin-react-x'
|
||||
import reactDom from 'eslint-plugin-react-dom'
|
||||
|
||||
export default defineConfig([
|
||||
globalIgnores(['dist']),
|
||||
{
|
||||
files: ['**/*.{ts,tsx}'],
|
||||
extends: [
|
||||
// Other configs...
|
||||
// Enable lint rules for React
|
||||
reactX.configs['recommended-typescript'],
|
||||
// Enable lint rules for React DOM
|
||||
reactDom.configs.recommended,
|
||||
],
|
||||
languageOptions: {
|
||||
parserOptions: {
|
||||
project: ['./tsconfig.node.json', './tsconfig.app.json'],
|
||||
tsconfigRootDir: import.meta.dirname,
|
||||
},
|
||||
// other options...
|
||||
},
|
||||
},
|
||||
])
|
||||
```
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
import js from '@eslint/js'
|
||||
import globals from 'globals'
|
||||
import reactHooks from 'eslint-plugin-react-hooks'
|
||||
import reactRefresh from 'eslint-plugin-react-refresh'
|
||||
import tseslint from 'typescript-eslint'
|
||||
import { defineConfig, globalIgnores } from 'eslint/config'
|
||||
|
||||
export default defineConfig([
|
||||
globalIgnores(['dist']),
|
||||
{
|
||||
files: ['**/*.{ts,tsx}'],
|
||||
extends: [
|
||||
js.configs.recommended,
|
||||
tseslint.configs.recommended,
|
||||
reactHooks.configs.flat.recommended,
|
||||
reactRefresh.configs.vite,
|
||||
],
|
||||
languageOptions: {
|
||||
ecmaVersion: 2020,
|
||||
globals: globals.browser,
|
||||
},
|
||||
},
|
||||
])
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>价格计算器</title>
|
||||
</head>
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
<script type="module" src="/src/main.tsx"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
{
|
||||
"name": "my-vue-app",
|
||||
"private": true,
|
||||
"version": "0.0.0",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "tsc -b && vite build",
|
||||
"lint": "eslint .",
|
||||
"preview": "vite preview"
|
||||
},
|
||||
"dependencies": {
|
||||
"react": "^19.2.0",
|
||||
"react-dom": "^19.2.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/js": "^9.39.1",
|
||||
"@types/node": "^24.10.1",
|
||||
"@types/react": "^19.2.5",
|
||||
"@types/react-dom": "^19.2.3",
|
||||
"@vitejs/plugin-react": "^5.1.1",
|
||||
"eslint": "^9.39.1",
|
||||
"eslint-plugin-react-hooks": "^7.0.1",
|
||||
"eslint-plugin-react-refresh": "^0.4.24",
|
||||
"globals": "^16.5.0",
|
||||
"typescript": "~5.9.3",
|
||||
"typescript-eslint": "^8.46.4",
|
||||
"vite": "^7.2.4"
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
|
||||
|
After Width: | Height: | Size: 1.5 KiB |
|
|
@ -0,0 +1,473 @@
|
|||
/* ===== App Layout ===== */
|
||||
.app {
|
||||
max-width: 720px;
|
||||
margin: 0 auto;
|
||||
padding: 0 1rem 2rem;
|
||||
min-height: 100vh;
|
||||
}
|
||||
|
||||
/* ===== Header ===== */
|
||||
.header {
|
||||
text-align: center;
|
||||
padding: 2rem 0 1.5rem;
|
||||
}
|
||||
|
||||
.header-icon {
|
||||
font-size: 2.5rem;
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
|
||||
.header h1 {
|
||||
font-size: 1.6rem;
|
||||
font-weight: 700;
|
||||
margin: 0 0 0.6rem;
|
||||
color: #1a1a2e;
|
||||
letter-spacing: 0.02em;
|
||||
}
|
||||
|
||||
.header-sub {
|
||||
font-size: 0.85rem;
|
||||
color: #666;
|
||||
margin: 0;
|
||||
line-height: 1.5;
|
||||
max-width: 28em;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
}
|
||||
|
||||
/* ===== Sections ===== */
|
||||
.section {
|
||||
background: #fff;
|
||||
border-radius: 16px;
|
||||
padding: 1.25rem;
|
||||
margin-bottom: 1rem;
|
||||
box-shadow: 0 2px 12px rgba(0, 0, 0, 0.06);
|
||||
}
|
||||
|
||||
.section-title {
|
||||
font-size: 1.1rem;
|
||||
font-weight: 700;
|
||||
color: #1a1a2e;
|
||||
margin: 0 0 1rem;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.4rem;
|
||||
}
|
||||
|
||||
.section-icon {
|
||||
font-size: 1.2rem;
|
||||
}
|
||||
|
||||
.photo-count-badge {
|
||||
margin-left: auto;
|
||||
background: #e8f4f8;
|
||||
color: #2980b9;
|
||||
font-size: 0.78rem;
|
||||
font-weight: 600;
|
||||
padding: 0.2rem 0.7rem;
|
||||
border-radius: 12px;
|
||||
}
|
||||
|
||||
/* ===== Package Group ===== */
|
||||
.package-group {
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
|
||||
.package-group:last-child {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.group-label {
|
||||
font-size: 0.9rem;
|
||||
font-weight: 600;
|
||||
color: #555;
|
||||
margin: 0 0 0.6rem;
|
||||
}
|
||||
|
||||
.package-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fill, minmax(140px, 1fr));
|
||||
gap: 0.6rem;
|
||||
}
|
||||
|
||||
/* ===== Package Card ===== */
|
||||
.package-card {
|
||||
position: relative;
|
||||
background: #f8f9fa;
|
||||
border: 2px solid transparent;
|
||||
border-radius: 12px;
|
||||
padding: 0.8rem 0.6rem;
|
||||
text-align: center;
|
||||
transition: all 0.2s ease;
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.package-card:hover:not(.disabled) {
|
||||
border-color: #ddd;
|
||||
background: #f0f4f8;
|
||||
}
|
||||
|
||||
.package-card.active {
|
||||
border-color: #667eea;
|
||||
background: #eef2ff;
|
||||
box-shadow: 0 2px 8px rgba(102, 126, 234, 0.15);
|
||||
}
|
||||
|
||||
.package-card.disabled {
|
||||
opacity: 0.45;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
.addon-badge {
|
||||
position: absolute;
|
||||
top: -6px;
|
||||
right: -6px;
|
||||
background: #f39c12;
|
||||
color: #fff;
|
||||
font-size: 0.65rem;
|
||||
font-weight: 600;
|
||||
padding: 0.15rem 0.5rem;
|
||||
border-radius: 8px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.unavailable-badge {
|
||||
position: absolute;
|
||||
top: -6px;
|
||||
right: -6px;
|
||||
background: #95a5a6;
|
||||
color: #fff;
|
||||
font-size: 0.65rem;
|
||||
font-weight: 600;
|
||||
padding: 0.15rem 0.5rem;
|
||||
border-radius: 8px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.card-title {
|
||||
font-size: 0.9rem;
|
||||
font-weight: 700;
|
||||
color: #2c3e50;
|
||||
margin-bottom: 0.3rem;
|
||||
}
|
||||
|
||||
.card-price {
|
||||
font-size: 1.15rem;
|
||||
font-weight: 800;
|
||||
color: #e74c3c;
|
||||
margin-bottom: 0.15rem;
|
||||
}
|
||||
|
||||
.card-detail {
|
||||
font-size: 0.72rem;
|
||||
color: #888;
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
|
||||
.card-unavailable {
|
||||
font-size: 0.85rem;
|
||||
color: #999;
|
||||
padding: 0.5rem 0;
|
||||
}
|
||||
|
||||
/* ===== Quantity Control ===== */
|
||||
.qty-control {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 0;
|
||||
margin-top: 0.3rem;
|
||||
}
|
||||
|
||||
.qty-btn {
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
border-radius: 8px;
|
||||
border: 1.5px solid #ddd;
|
||||
background: #fff;
|
||||
color: #333;
|
||||
font-size: 1rem;
|
||||
font-weight: 600;
|
||||
cursor: pointer;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
transition: all 0.15s ease;
|
||||
padding: 0;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
.qty-btn:hover:not(:disabled) {
|
||||
background: #667eea;
|
||||
border-color: #667eea;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.qty-btn:disabled {
|
||||
opacity: 0.3;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
.qty-btn.minus {
|
||||
border-radius: 8px 0 0 8px;
|
||||
}
|
||||
|
||||
.qty-btn.plus {
|
||||
border-radius: 0 8px 8px 0;
|
||||
}
|
||||
|
||||
.qty-value {
|
||||
width: 36px;
|
||||
height: 30px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: 0.95rem;
|
||||
font-weight: 700;
|
||||
color: #2c3e50;
|
||||
background: #f8f9fa;
|
||||
border-top: 1.5px solid #ddd;
|
||||
border-bottom: 1.5px solid #ddd;
|
||||
}
|
||||
|
||||
/* ===== Selected Items ===== */
|
||||
.empty-state {
|
||||
text-align: center;
|
||||
padding: 1.5rem 0;
|
||||
color: #aaa;
|
||||
}
|
||||
|
||||
.empty-icon {
|
||||
font-size: 2rem;
|
||||
margin-bottom: 0.4rem;
|
||||
}
|
||||
|
||||
.empty-state p {
|
||||
margin: 0;
|
||||
font-size: 0.88rem;
|
||||
}
|
||||
|
||||
.selected-grid {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr auto 1fr;
|
||||
gap: 0;
|
||||
}
|
||||
|
||||
.selected-column {
|
||||
padding: 0 0.5rem;
|
||||
}
|
||||
|
||||
.selected-divider {
|
||||
width: 1px;
|
||||
background: #e8e8e8;
|
||||
margin: 0 0.25rem;
|
||||
}
|
||||
|
||||
.column-title {
|
||||
font-size: 0.88rem;
|
||||
font-weight: 600;
|
||||
color: #555;
|
||||
margin: 0 0 0.6rem;
|
||||
padding-bottom: 0.4rem;
|
||||
border-bottom: 2px solid #f0f0f0;
|
||||
}
|
||||
|
||||
.column-empty {
|
||||
font-size: 0.82rem;
|
||||
color: #bbb;
|
||||
text-align: center;
|
||||
padding: 1rem 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.selected-item {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 0.35rem 0;
|
||||
font-size: 0.85rem;
|
||||
}
|
||||
|
||||
.item-name {
|
||||
color: #444;
|
||||
}
|
||||
|
||||
.item-price {
|
||||
font-weight: 700;
|
||||
color: #e74c3c;
|
||||
}
|
||||
|
||||
.column-subtotal {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding-top: 0.5rem;
|
||||
margin-top: 0.3rem;
|
||||
border-top: 1.5px dashed #ddd;
|
||||
font-size: 0.85rem;
|
||||
font-weight: 600;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
/* ===== Price Calculation ===== */
|
||||
.price-section {
|
||||
background: linear-gradient(135deg, #fefefe, #fdf6f0);
|
||||
}
|
||||
|
||||
.price-breakdown {
|
||||
background: #fff;
|
||||
border-radius: 12px;
|
||||
padding: 0.8rem 1rem;
|
||||
margin-bottom: 0.8rem;
|
||||
border: 1px solid #f0e6da;
|
||||
}
|
||||
|
||||
.price-row {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 0.45rem 0;
|
||||
font-size: 0.9rem;
|
||||
color: #444;
|
||||
}
|
||||
|
||||
.price-row + .price-row {
|
||||
border-top: 1px solid #f5f5f5;
|
||||
}
|
||||
|
||||
.discount-row {
|
||||
color: #27ae60;
|
||||
}
|
||||
|
||||
.discount-amount {
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.total-row {
|
||||
padding-top: 0.6rem;
|
||||
margin-top: 0.2rem;
|
||||
border-top: 2px solid #eee !important;
|
||||
font-weight: 700;
|
||||
font-size: 1rem;
|
||||
color: #1a1a2e;
|
||||
}
|
||||
|
||||
.final-price {
|
||||
font-size: 1.3rem;
|
||||
font-weight: 800;
|
||||
color: #e74c3c;
|
||||
}
|
||||
|
||||
.deposit-hint {
|
||||
display: block;
|
||||
font-size: 0.68rem;
|
||||
font-weight: 400;
|
||||
color: #888;
|
||||
margin-top: 0.2rem;
|
||||
line-height: 1.4;
|
||||
max-width: 15rem;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.deposit-row {
|
||||
color: #888;
|
||||
font-size: 0.85rem;
|
||||
align-items: flex-start;
|
||||
}
|
||||
|
||||
.deposit-row > span:first-child {
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.remaining-row {
|
||||
color: #666;
|
||||
font-size: 0.88rem;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.combo-tip {
|
||||
background: linear-gradient(135deg, #fef9e7, #fdebd0);
|
||||
border: 1px solid #f9e4b7;
|
||||
border-radius: 10px;
|
||||
padding: 0.6rem 0.8rem;
|
||||
font-size: 0.82rem;
|
||||
color: #b7791f;
|
||||
font-weight: 500;
|
||||
margin-bottom: 0.8rem;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.formula {
|
||||
background: #f8f9fa;
|
||||
border-radius: 10px;
|
||||
padding: 0.6rem 0.8rem;
|
||||
font-size: 0.82rem;
|
||||
color: #666;
|
||||
}
|
||||
|
||||
.formula-line {
|
||||
margin: 0 0 0.45rem;
|
||||
line-height: 1.45;
|
||||
}
|
||||
|
||||
.formula-line:last-child {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.formula-label {
|
||||
font-weight: 600;
|
||||
color: #555;
|
||||
}
|
||||
|
||||
.formula strong {
|
||||
color: #e74c3c;
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
||||
/* ===== Footer ===== */
|
||||
.footer {
|
||||
text-align: center;
|
||||
padding: 0.5rem 0 1rem;
|
||||
}
|
||||
|
||||
.footer p {
|
||||
margin: 0.25rem 0;
|
||||
font-size: 0.78rem;
|
||||
color: #999;
|
||||
}
|
||||
|
||||
/* ===== Responsive ===== */
|
||||
@media (max-width: 480px) {
|
||||
.app {
|
||||
padding: 0 0.5rem 1.5rem;
|
||||
}
|
||||
|
||||
.section {
|
||||
padding: 1rem;
|
||||
border-radius: 12px;
|
||||
}
|
||||
|
||||
.header h1 {
|
||||
font-size: 1.3rem;
|
||||
}
|
||||
|
||||
.package-grid {
|
||||
grid-template-columns: repeat(2, 1fr);
|
||||
gap: 0.5rem;
|
||||
}
|
||||
|
||||
.selected-grid {
|
||||
grid-template-columns: 1fr;
|
||||
gap: 0;
|
||||
}
|
||||
|
||||
.selected-divider {
|
||||
width: 100%;
|
||||
height: 1px;
|
||||
margin: 0.6rem 0;
|
||||
}
|
||||
|
||||
.selected-column {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,328 @@
|
|||
import { useState, useMemo } from "react";
|
||||
import "./App.css";
|
||||
|
||||
interface Package {
|
||||
id: string;
|
||||
type: "single" | "dual";
|
||||
photos: number;
|
||||
price: number;
|
||||
postProcessing: string;
|
||||
note: string;
|
||||
available: boolean;
|
||||
isAddon: boolean;
|
||||
}
|
||||
|
||||
const packages: Package[] = [
|
||||
{ id: "s1", type: "single", photos: 1, price: 10, postProcessing: "调色简修", note: "一张不接，附加项", available: true, isAddon: true },
|
||||
{ id: "s4", type: "single", photos: 4, price: 40, postProcessing: "调色简修", note: "", available: true, isAddon: false },
|
||||
{ id: "s6", type: "single", photos: 6, price: 55, postProcessing: "调色简修", note: "", available: true, isAddon: false },
|
||||
{ id: "s9", type: "single", photos: 9, price: 0, postProcessing: "", note: "暂不接", available: false, isAddon: false },
|
||||
{ id: "d1", type: "dual", photos: 1, price: 15, postProcessing: "调色简修", note: "一张不接，附加项", available: true, isAddon: true },
|
||||
{ id: "d2", type: "dual", photos: 2, price: 30, postProcessing: "调色简修", note: "", available: true, isAddon: false },
|
||||
{ id: "d4", type: "dual", photos: 4, price: 65, postProcessing: "调色简修", note: "", available: true, isAddon: false },
|
||||
{ id: "d6", type: "dual", photos: 6, price: 0, postProcessing: "", note: "暂不接", available: false, isAddon: false },
|
||||
];
|
||||
|
||||
const COMBO_DISCOUNT = 5;
|
||||
|
||||
const DEPOSIT_RATE = 0.5;
|
||||
/** 当「订单金额 ×50%」低于该值，且订单金额超过该值时，定金取该值 */
|
||||
const DEPOSIT_FLOOR = 50;
|
||||
|
||||
function formatMoney(n: number): string {
|
||||
return n % 1 === 0 ? String(n) : n.toFixed(1);
|
||||
}
|
||||
|
||||
/** 定金：默认 50%；若 50% 不足 50 元且订单超过 50 元，则定金为 50 元（且不超过订单总额） */
|
||||
function computeDeposit(finalPrice: number): { amount: number; isFloor50: boolean; half: number } {
|
||||
if (finalPrice <= 0) return { amount: 0, isFloor50: false, half: 0 };
|
||||
const half = finalPrice * DEPOSIT_RATE;
|
||||
if (finalPrice > DEPOSIT_FLOOR && half < DEPOSIT_FLOOR) {
|
||||
return { amount: Math.min(DEPOSIT_FLOOR, finalPrice), isFloor50: true, half };
|
||||
}
|
||||
return { amount: half, isFloor50: false, half };
|
||||
}
|
||||
|
||||
function App() {
|
||||
const [quantities, setQuantities] = useState<Record<string, number>>({});
|
||||
|
||||
const getQty = (id: string) => quantities[id] || 0;
|
||||
|
||||
const setQty = (id: string, val: number) => {
|
||||
setQuantities((prev) => ({ ...prev, [id]: Math.max(0, val) }));
|
||||
};
|
||||
|
||||
const selectedSingle = useMemo(
|
||||
() => packages.filter((p) => p.type === "single" && getQty(p.id) > 0),
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
[quantities]
|
||||
);
|
||||
|
||||
const selectedDual = useMemo(
|
||||
() => packages.filter((p) => p.type === "dual" && getQty(p.id) > 0),
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
[quantities]
|
||||
);
|
||||
|
||||
const singleSubtotal = selectedSingle.reduce((sum, p) => sum + p.price * getQty(p.id), 0);
|
||||
const dualSubtotal = selectedDual.reduce((sum, p) => sum + p.price * getQty(p.id), 0);
|
||||
const originalTotal = singleSubtotal + dualSubtotal;
|
||||
|
||||
const hasCombo = selectedSingle.length > 0 && selectedDual.length > 0;
|
||||
const finalPrice = hasCombo ? originalTotal - COMBO_DISCOUNT : originalTotal;
|
||||
const { amount: deposit, isFloor50, half: depositHalf } = computeDeposit(finalPrice);
|
||||
const balance = finalPrice - deposit;
|
||||
|
||||
const totalSinglePhotos = selectedSingle.reduce((sum, p) => sum + p.photos * getQty(p.id), 0);
|
||||
const totalDualPhotos = selectedDual.reduce((sum, p) => sum + p.photos * getQty(p.id), 0);
|
||||
const totalPhotos = totalSinglePhotos + totalDualPhotos;
|
||||
|
||||
const hasSelection = originalTotal > 0;
|
||||
|
||||
const singlePackages = packages.filter((p) => p.type === "single");
|
||||
const dualPackages = packages.filter((p) => p.type === "dual");
|
||||
|
||||
return (
|
||||
<div className="app">
|
||||
{/* Header */}
|
||||
<header className="header">
|
||||
<div className="header-icon">📷</div>
|
||||
<h1>摄影套餐价格计算器</h1>
|
||||
<p className="header-sub">按价目表原价；同时选单人与双人可再减 5 元</p>
|
||||
</header>
|
||||
|
||||
{/* Package Selection */}
|
||||
<section className="section">
|
||||
<h2 className="section-title">
|
||||
<span className="section-icon">🎨</span>
|
||||
套餐自选
|
||||
</h2>
|
||||
|
||||
<div className="package-group">
|
||||
<h3 className="group-label">👤 单人套餐</h3>
|
||||
<div className="package-grid">
|
||||
{singlePackages.map((pkg) => (
|
||||
<PackageCard
|
||||
key={pkg.id}
|
||||
pkg={pkg}
|
||||
qty={getQty(pkg.id)}
|
||||
onQtyChange={(val) => setQty(pkg.id, val)}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="package-group">
|
||||
<h3 className="group-label">👥 双人套餐</h3>
|
||||
<div className="package-grid">
|
||||
{dualPackages.map((pkg) => (
|
||||
<PackageCard
|
||||
key={pkg.id}
|
||||
pkg={pkg}
|
||||
qty={getQty(pkg.id)}
|
||||
onQtyChange={(val) => setQty(pkg.id, val)}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{/* Selected Items Summary */}
|
||||
<section className="section">
|
||||
<h2 className="section-title">
|
||||
<span className="section-icon">📋</span>
|
||||
已选套餐
|
||||
{totalPhotos > 0 && <span className="photo-count-badge">共 {totalPhotos} 张</span>}
|
||||
</h2>
|
||||
|
||||
{!hasSelection ? (
|
||||
<div className="empty-state">
|
||||
<div className="empty-icon">🛒</div>
|
||||
<p>还没有选择任何套餐，请在上方添加</p>
|
||||
</div>
|
||||
) : (
|
||||
<div className="selected-grid">
|
||||
<div className="selected-column">
|
||||
<h3 className="column-title">👤 单人套餐</h3>
|
||||
{selectedSingle.length === 0 ? (
|
||||
<p className="column-empty">未选择</p>
|
||||
) : (
|
||||
<>
|
||||
{selectedSingle.map((pkg) => (
|
||||
<div key={pkg.id} className="selected-item">
|
||||
<span className="item-name">
|
||||
单人 {pkg.photos} 张 × {getQty(pkg.id)}
|
||||
</span>
|
||||
<span className="item-price">¥{pkg.price * getQty(pkg.id)}</span>
|
||||
</div>
|
||||
))}
|
||||
<div className="column-subtotal">
|
||||
<span>小计 ({totalSinglePhotos} 张)</span>
|
||||
<span>¥{singleSubtotal}</span>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="selected-divider" />
|
||||
|
||||
<div className="selected-column">
|
||||
<h3 className="column-title">👥 双人套餐</h3>
|
||||
{selectedDual.length === 0 ? (
|
||||
<p className="column-empty">未选择</p>
|
||||
) : (
|
||||
<>
|
||||
{selectedDual.map((pkg) => (
|
||||
<div key={pkg.id} className="selected-item">
|
||||
<span className="item-name">
|
||||
双人 {pkg.photos} 张 × {getQty(pkg.id)}
|
||||
</span>
|
||||
<span className="item-price">¥{pkg.price * getQty(pkg.id)}</span>
|
||||
</div>
|
||||
))}
|
||||
<div className="column-subtotal">
|
||||
<span>小计 ({totalDualPhotos} 张)</span>
|
||||
<span>¥{dualSubtotal}</span>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</section>
|
||||
|
||||
{/* Price Calculation */}
|
||||
{hasSelection && (
|
||||
<section className="section price-section">
|
||||
<h2 className="section-title">
|
||||
<span className="section-icon">💰</span>
|
||||
价格计算
|
||||
</h2>
|
||||
|
||||
<div className="price-breakdown">
|
||||
<div className="price-row">
|
||||
<span>套餐小计</span>
|
||||
<span>¥{formatMoney(originalTotal)}</span>
|
||||
</div>
|
||||
{hasCombo && (
|
||||
<div className="price-row discount-row">
|
||||
<span>组合套餐优惠</span>
|
||||
<span className="discount-amount">-¥{formatMoney(COMBO_DISCOUNT)}</span>
|
||||
</div>
|
||||
)}
|
||||
<div className="price-row total-row">
|
||||
<span>应付金额</span>
|
||||
<span className="final-price">¥{formatMoney(finalPrice)}</span>
|
||||
</div>
|
||||
<div className="price-row deposit-row">
|
||||
<span>
|
||||
定金
|
||||
{isFloor50 ? (
|
||||
<span className="deposit-hint">
|
||||
（{DEPOSIT_RATE * 100}% 为 {formatMoney(depositHalf)} 元，不足 ¥{DEPOSIT_FLOOR}；订单 ＞ ¥{DEPOSIT_FLOOR} 时收 ¥{DEPOSIT_FLOOR} 定金）
|
||||
</span>
|
||||
) : (
|
||||
<span className="deposit-hint">（应付×{DEPOSIT_RATE * 100}%）</span>
|
||||
)}
|
||||
</span>
|
||||
<span>¥{formatMoney(deposit)}</span>
|
||||
</div>
|
||||
<div className="price-row remaining-row">
|
||||
<span>尾款</span>
|
||||
<span>¥{formatMoney(balance)}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{hasCombo && (
|
||||
<div className="combo-tip">已选单人 + 双人，减免 ¥{formatMoney(COMBO_DISCOUNT)}</div>
|
||||
)}
|
||||
|
||||
<div className="formula">
|
||||
<p className="formula-line">
|
||||
<span className="formula-label">订单：</span>
|
||||
{hasCombo ? (
|
||||
<span>
|
||||
{formatMoney(originalTotal)} − {formatMoney(COMBO_DISCOUNT)} = <strong>{formatMoney(finalPrice)}</strong>
|
||||
</span>
|
||||
) : (
|
||||
<span>
|
||||
<strong>{formatMoney(finalPrice)}</strong>
|
||||
</span>
|
||||
)}
|
||||
</p>
|
||||
<p className="formula-line">
|
||||
<span className="formula-label">定金：</span>
|
||||
{isFloor50 ? (
|
||||
<span>
|
||||
应付 {formatMoney(finalPrice)} × {DEPOSIT_RATE} = {formatMoney(depositHalf)} 元 ＜ ¥{DEPOSIT_FLOOR}，且应付 ＞ ¥{DEPOSIT_FLOOR}，收{" "}
|
||||
<strong>¥{formatMoney(deposit)}</strong>；尾款 <strong>¥{formatMoney(balance)}</strong>
|
||||
</span>
|
||||
) : finalPrice > 0 ? (
|
||||
<span>
|
||||
应付 {formatMoney(finalPrice)} × {DEPOSIT_RATE} = <strong>¥{formatMoney(deposit)}</strong>；尾款 <strong>¥{formatMoney(balance)}</strong>
|
||||
</span>
|
||||
) : null}
|
||||
</p>
|
||||
</div>
|
||||
</section>
|
||||
)}
|
||||
|
||||
{/* Footer */}
|
||||
<footer className="footer">
|
||||
<p>💡 单人 1 张 / 双人 1 张 为附加项，不单独接单</p>
|
||||
<p>💡 同时选择单人 + 双人套餐可享组合优惠 ¥{formatMoney(COMBO_DISCOUNT)}</p>
|
||||
<p>💡 定金默认应付的 {DEPOSIT_RATE * 100}%；当 {DEPOSIT_RATE * 100}% 不足 ¥{DEPOSIT_FLOOR} 且订单 ＞ ¥{DEPOSIT_FLOOR} 时，定金为 ¥{DEPOSIT_FLOOR}</p>
|
||||
</footer>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function PackageCard({
|
||||
pkg,
|
||||
qty,
|
||||
onQtyChange,
|
||||
}: {
|
||||
pkg: Package;
|
||||
qty: number;
|
||||
onQtyChange: (val: number) => void;
|
||||
}) {
|
||||
const typeLabel = pkg.type === "single" ? "单人" : "双人";
|
||||
|
||||
return (
|
||||
<div className={`package-card ${!pkg.available ? "disabled" : ""} ${qty > 0 ? "active" : ""}`}>
|
||||
{pkg.isAddon && <div className="addon-badge">附加项</div>}
|
||||
{!pkg.available && <div className="unavailable-badge">暂不接</div>}
|
||||
|
||||
<div className="card-title">
|
||||
{typeLabel} {pkg.photos} 张
|
||||
</div>
|
||||
|
||||
{pkg.available ? (
|
||||
<>
|
||||
<div className="card-price">¥{pkg.price}</div>
|
||||
<div className="card-detail">{pkg.postProcessing}</div>
|
||||
</>
|
||||
) : (
|
||||
<div className="card-unavailable">暂不接单</div>
|
||||
)}
|
||||
|
||||
{pkg.available && (
|
||||
<div className="qty-control">
|
||||
<button
|
||||
className="qty-btn minus"
|
||||
onClick={() => onQtyChange(qty - 1)}
|
||||
disabled={qty === 0}
|
||||
>
|
||||
−
|
||||
</button>
|
||||
<span className="qty-value">{qty}</span>
|
||||
<button className="qty-btn plus" onClick={() => onQtyChange(qty + 1)}>
|
||||
+
|
||||
</button>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default App;
|
||||
|
|
@ -0,0 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
|
||||
|
After Width: | Height: | Size: 4.0 KiB |
|
|
@ -0,0 +1,28 @@
|
|||
:root {
|
||||
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial,
|
||||
"PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", sans-serif;
|
||||
line-height: 1.5;
|
||||
font-weight: 400;
|
||||
color: #333;
|
||||
background-color: #f5f5f7;
|
||||
font-synthesis: none;
|
||||
text-rendering: optimizeLegibility;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
}
|
||||
|
||||
*,
|
||||
*::before,
|
||||
*::after {
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
min-width: 320px;
|
||||
min-height: 100vh;
|
||||
}
|
||||
|
||||
#root {
|
||||
width: 100%;
|
||||
}
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
import { StrictMode } from 'react'
|
||||
import { createRoot } from 'react-dom/client'
|
||||
import './index.css'
|
||||
import App from './App.tsx'
|
||||
|
||||
createRoot(document.getElementById('root')!).render(
|
||||
<StrictMode>
|
||||
<App />
|
||||
</StrictMode>,
|
||||
)
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
{
|
||||
"compilerOptions": {
|
||||
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
|
||||
"target": "ES2022",
|
||||
"useDefineForClassFields": true,
|
||||
"lib": ["ES2022", "DOM", "DOM.Iterable"],
|
||||
"module": "ESNext",
|
||||
"types": ["vite/client"],
|
||||
"skipLibCheck": true,
|
||||
|
||||
/* Bundler mode */
|
||||
"moduleResolution": "bundler",
|
||||
"allowImportingTsExtensions": true,
|
||||
"verbatimModuleSyntax": true,
|
||||
"moduleDetection": "force",
|
||||
"noEmit": true,
|
||||
"jsx": "react-jsx",
|
||||
|
||||
/* Linting */
|
||||
"strict": true,
|
||||
"noUnusedLocals": true,
|
||||
"noUnusedParameters": true,
|
||||
"erasableSyntaxOnly": true,
|
||||
"noFallthroughCasesInSwitch": true,
|
||||
"noUncheckedSideEffectImports": true
|
||||
},
|
||||
"include": ["src"]
|
||||
}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"files": [],
|
||||
"references": [
|
||||
{ "path": "./tsconfig.app.json" },
|
||||
{ "path": "./tsconfig.node.json" }
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
{
|
||||
"compilerOptions": {
|
||||
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
|
||||
"target": "ES2023",
|
||||
"lib": ["ES2023"],
|
||||
"module": "ESNext",
|
||||
"types": ["node"],
|
||||
"skipLibCheck": true,
|
||||
|
||||
/* Bundler mode */
|
||||
"moduleResolution": "bundler",
|
||||
"allowImportingTsExtensions": true,
|
||||
"verbatimModuleSyntax": true,
|
||||
"moduleDetection": "force",
|
||||
"noEmit": true,
|
||||
|
||||
/* Linting */
|
||||
"strict": true,
|
||||
"noUnusedLocals": true,
|
||||
"noUnusedParameters": true,
|
||||
"erasableSyntaxOnly": true,
|
||||
"noFallthroughCasesInSwitch": true,
|
||||
"noUncheckedSideEffectImports": true
|
||||
},
|
||||
"include": ["vite.config.ts"]
|
||||
}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
import { defineConfig } from 'vite'
|
||||
import react from '@vitejs/plugin-react'
|
||||
|
||||
// https://vite.dev/config/
|
||||
export default defineConfig({
|
||||
plugins: [react()],
|
||||
})
|
||||
Loading…
Reference in New Issue