From 6cb2164dbee223e4376c728415d5e2c4f1fc684c Mon Sep 17 00:00:00 2001
From: menxipeng <menxipeng@zilot.cn>
Date: Sun, 19 Oct 2025 13:41:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/pages/MerchantsPage.tsx | 100 +++++++++++++------------
 1 file changed, 52 insertions(+), 48 deletions(-)

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