rainbowfast/chefsafe-admin-react
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

商户修复

Browse Source
This commit is contained in:
menxipeng
2025-10-19 13:41:14 +08:00
parent e6255148a4
commit 6cb2164dbe
1 changed files with 52 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
src/components/pages/MerchantsPage.tsx
View File

@@ -804,30 +804,32 @@ export default function MerchantsPage() {
placeholder="请输入联系电话" placeholder="请输入联系电话"
/> />
</div> </div>
<div className="space-y-2"> {userRole === "admin" && (
<Label htmlFor="totalMerchant">选择总商户（可选）</Label> <div className="space-y-2">
<Select <Label htmlFor="totalMerchant">选择总商户（可选）</Label>
value={newMerchant.totalMerchant} <Select
onValueChange={(value) => setNewMerchant({ ...newMerchant, totalMerchant: value })} value={newMerchant.totalMerchant}
disabled={loadingTotalMerchants} onValueChange={(value) => setNewMerchant({ ...newMerchant, totalMerchant: value })}
onOpenChange={(open) => { disabled={loadingTotalMerchants}
if (open && totalMerchants.length === 0 && !loadingTotalMerchants) { onOpenChange={(open) => {
fetchTotalMerchants() if (open && totalMerchants.length === 0 && !loadingTotalMerchants) {
} fetchTotalMerchants()
}} }
> }}
<SelectTrigger> >
<SelectValue placeholder={loadingTotalMerchants ? "加载中..." : "选择总商户（可选）"} /> <SelectTrigger>
</SelectTrigger> <SelectValue placeholder={loadingTotalMerchants ? "加载中..." : "选择总商户（可选）"} />
<SelectContent> </SelectTrigger>
{totalMerchants.map((merchant) => ( <SelectContent>
<SelectItem key={merchant.userId} value={merchant.userId}> {totalMerchants.map((merchant) => (
{merchant.nickName} <SelectItem key={merchant.userId} value={merchant.userId}>
</SelectItem> {merchant.nickName}
))} </SelectItem>
</SelectContent> ))}
</Select> </SelectContent>
</div> </Select>
</div>
)}
<div className="col-span-2 space-y-2"> <div className="col-span-2 space-y-2">
<Label htmlFor="detailedAddress">详细地址</Label> <Label htmlFor="detailedAddress">详细地址</Label>
<Textarea <Textarea
@@ -1033,30 +1035,32 @@ export default function MerchantsPage() {
placeholder="请输入联系电话" placeholder="请输入联系电话"
/> />
</div> </div>
<div className="space-y-2"> {userRole === "admin" && (
<Label htmlFor="edit-totalMerchant">选择总商户（可选）</Label> <div className="space-y-2">
<Select <Label htmlFor="edit-totalMerchant">选择总商户（可选）</Label>
value={editMerchant.totalMerchant} <Select
onValueChange={(value) => setEditMerchant({ ...editMerchant, totalMerchant: value })} value={editMerchant.totalMerchant}
disabled={loadingTotalMerchants} onValueChange={(value) => setEditMerchant({ ...editMerchant, totalMerchant: value })}
onOpenChange={(open) => { disabled={loadingTotalMerchants}
if (open && totalMerchants.length === 0 && !loadingTotalMerchants) { onOpenChange={(open) => {
fetchTotalMerchants() if (open && totalMerchants.length === 0 && !loadingTotalMerchants) {
} fetchTotalMerchants()
}} }
> }}
<SelectTrigger> >
<SelectValue placeholder={loadingTotalMerchants ? "加载中..." : "选择总商户（可选）"} /> <SelectTrigger>
</SelectTrigger> <SelectValue placeholder={loadingTotalMerchants ? "加载中..." : "选择总商户（可选）"} />
<SelectContent> </SelectTrigger>
{totalMerchants.map((merchant) => ( <SelectContent>
<SelectItem key={merchant.userId} value={merchant.userId}> {totalMerchants.map((merchant) => (
{merchant.nickName} <SelectItem key={merchant.userId} value={merchant.userId}>
</SelectItem> {merchant.nickName}
))} </SelectItem>
</SelectContent> ))}
</Select> </SelectContent>
</div> </Select>
</div>
)}
<div className="col-span-2 space-y-2"> <div className="col-span-2 space-y-2">
<Label htmlFor="edit-detailedAddress">详细地址</Label> <Label htmlFor="edit-detailedAddress">详细地址</Label>
<Textarea <Textarea