需求

ruoyi-ui/src/api/agri/merchantEntryApply.js

@@ -42,3 +42,11 @@ export function rejectMerchantEntryApply(data) {
     data: data
   })
 }
+
+// 完成公示（公示期满后建档商户/店铺）
+export function completeMerchantEntryPublicity(applyId) {
+  return request({
+    url: '/agri/merchantEntryApply/completePublicity/' + applyId,
+    method: 'put'
+  })
+}

ruoyi-ui/src/views/agri/org/merchant/detail.vue

@@ -14,6 +14,7 @@
         <el-descriptions-item label="商户类型">{{ merchantTypeLabel(detail.merchantType) }}</el-descriptions-item>
         <el-descriptions-item label="商户所属单位">{{ detail.unitName || '—' }}</el-descriptions-item>
         <el-descriptions-item label="商户名称">{{ detail.merchantName || '待完善' }}</el-descriptions-item>
+        <el-descriptions-item label="商户管理员">{{ detail.adminName || '—' }}</el-descriptions-item>
         <el-descriptions-item label="认证状态">
           <el-tag size="small" :type="certStatusTag(detail.certStatus)">{{ certStatusLabel(detail.certStatus) }}</el-tag>
         </el-descriptions-item>
@@ -204,7 +205,7 @@ export default {
     /** 跳转店铺列表 */
     goShopList() {
       const name = this.detail.merchantName || this.detail.unitName
-      this.$router.push({ path: "/org/shop", query: { merchantName: name } })
+      this.$router.push({ path: "/agri/org/shop", query: { merchantName: name } })
     },
     /** 修改认证状态（两步确认） */
     handleCertChange(item) {

ruoyi-ui/src/views/agri/org/merchant/index.vue

@@ -41,6 +41,11 @@
             <span>{{ scope.row.merchantName || '待完善' }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="商户管理员" align="center" prop="adminName" min-width="110" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{ scope.row.adminName || '—' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="联系人" align="center" prop="contactName" width="100">
           <template slot-scope="scope"><span>{{ scope.row.contactName || '—' }}</span></template>
         </el-table-column>
@@ -100,7 +105,7 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="证件号码" prop="idCardNo">
-                    <el-input v-model="form.idCardNo" maxlength="18" :disabled="!!form.merchantId" placeholder="选填" />
+                    <el-input v-model="form.idCardNo" maxlength="18" :disabled="!!form.merchantId" :placeholder="form.merchantId ? '' : '必填'" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -206,7 +211,7 @@
                 <el-col :span="12"><el-form-item label="企业名称" prop="companyName"><el-input v-model="form.companyName" maxlength="128" /></el-form-item></el-col>
                 <el-col :span="12">
                   <el-form-item label="统一社会信用代码" prop="creditCode">
-                    <el-input v-model="form.creditCode" maxlength="18" :disabled="!!form.merchantId" placeholder="选填" />
+                    <el-input v-model="form.creditCode" maxlength="18" :disabled="!!form.merchantId" :placeholder="form.merchantId ? '' : '必填'" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
@@ -247,8 +252,8 @@
             </template>
           </el-tab-pane>
 
-          <!-- 经营信息（仅编辑） -->
-          <el-tab-pane v-if="form.merchantId" label="商户经营信息" name="biz">
+          <!-- 商户经营信息（新增/编辑均须填写完整） -->
+          <el-tab-pane label="商户经营信息" name="biz">
             <el-row :gutter="16">
               <el-col :span="12"><el-form-item label="商户名称" prop="merchantName"><el-input v-model="form.merchantName" maxlength="128" /></el-form-item></el-col>
               <el-col :span="12"><el-form-item label="客服电话" prop="servicePhone"><el-input v-model="form.servicePhone" maxlength="20" /></el-form-item></el-col>
@@ -372,7 +377,7 @@ export default {
     }
   },
   computed: {
-    /** 表单校验：新增个人仅姓名必填；新增企业仅法人姓名+企业名称必填；绑定仅新增时校验 */
+    /** 表单校验：v1.8 新增须主体+经营完整；编辑须经营字段校验 */
     formRules() {
       const rules = {
         merchantType: [{ required: true, message: "请选择主体类型", trigger: "change" }]
@@ -380,9 +385,46 @@ export default {
       const isAdd = !this.form.merchantId
       if (this.form.merchantType === "1") {
         rules.personName = [{ required: true, message: "请输入姓名", trigger: "blur" }]
+        if (isAdd) {
+          rules.idCardNo = [{ required: true, message: "请输入证件号码", trigger: "blur" }]
+        }
       } else {
         rules.legalName = [{ required: true, message: "请输入法人姓名", trigger: "blur" }]
         rules.companyName = [{ required: true, message: "请输入企业名称", trigger: "blur" }]
+        if (isAdd) {
+          rules.creditCode = [{ required: true, message: "请输入统一社会信用代码", trigger: "blur" }]
+        }
+      }
+      // 商户经营信息（§6.6 完整判定字段）
+      rules.merchantName = [{ required: true, message: "请输入商户名称", trigger: "blur" }]
+      rules.servicePhone = [{ required: true, message: "请输入客服电话", trigger: "blur" }]
+      rules.bizRegionCascader = [{
+        validator: (rule, value, callback) => {
+          if (this.form.bizRegionCode && this.form.bizRegionName) {
+            callback()
+            return
+          }
+          if (value && value.length >= 3) {
+            callback()
+            return
+          }
+          callback(new Error("请选择经营地区"))
+        },
+        trigger: "change"
+      }]
+      rules.bizDetailAddress = [{ required: true, message: "请输入经营详细地址", trigger: "blur" }]
+      rules.contactName = [{ required: true, message: "请输入联系人姓名", trigger: "blur" }]
+      rules.contactPhone = [{ required: true, message: "请输入联系人手机", trigger: "blur" }]
+      rules.contactEmail = [
+        { required: true, message: "请输入联系人邮箱", trigger: "blur" },
+        { type: "email", message: "邮箱格式不正确", trigger: "blur" }
+      ]
+      rules.bankName = [{ required: true, message: "请输入开户银行", trigger: "blur" }]
+      rules.bankBranch = [{ required: true, message: "请输入支行名称", trigger: "blur" }]
+      rules.bankAccount = [{ required: true, message: "请输入银行账号", trigger: "blur" }]
+      if (this.form.merchantType === "2") {
+        rules.businessLicense = [{ required: true, message: "请上传营业执照电子版", trigger: "change" }]
+        rules.accountPermit = [{ required: true, message: "请上传开户许可证", trigger: "change" }]
       }
       if (isAdd) {
         rules.bindType = [{ required: true, message: "请选择绑定类型", trigger: "change" }]
@@ -465,6 +507,19 @@ export default {
         bindType: "SYS_USER",
         bindUserId: undefined,
         bindMemberId: undefined,
+        merchantName: undefined,
+        servicePhone: undefined,
+        bizRegionCode: undefined,
+        bizRegionName: undefined,
+        bizDetailAddress: undefined,
+        contactName: undefined,
+        contactPhone: undefined,
+        contactEmail: undefined,
+        bankName: undefined,
+        bankBranch: undefined,
+        bankAccount: undefined,
+        businessLicense: undefined,
+        accountPermit: undefined,
         bizRegionCascader: []
       }
       this.activeTab = "subject"
@@ -621,12 +676,11 @@ export default {
         const payload = this.buildSubmitPayload()
         const submitFn = payload.merchantId ? updateMerchant : addMerchant
         submitFn(payload).then(response => {
-          let msg = payload.merchantId ? "修改成功" : "新增成功"
-          if (response.data && response.data.bizCompleteChanged) {
-            msg = "保存成功，已可开设店铺"
-          }
+          let msg = "修改成功"
           if (!payload.merchantId) {
-            msg = "请尽快在编辑中完善商户经营信息后再开设店铺"
+            msg = "保存成功，已可开设店铺"
+          } else if (response.data && response.data.bizCompleteChanged) {
+            msg = "保存成功，已可开设店铺"
           }
           if (response.data && response.data.warnExpired) {
             this.$modal.msgWarning("证件或营业期限已过期，请注意风险")

ruoyi-ui/src/views/agri/org/merchantEntryApply/detail.vue

@@ -9,6 +9,16 @@
     custom-class="detail-drawer"
   >
     <div v-loading="loading" class="drawer-content">
+      <!-- 仅开店铺模式提示 -->
+      <el-alert
+        v-if="detail.shopOnlyMode"
+        title="本申请为「仅开店铺」模式：主体资质与商户经营信息取自已有商户快照；公示完成后将复用已有商户并新建店铺。"
+        type="info"
+        :closable="false"
+        show-icon
+        class="mb16"
+      />
+
       <!-- 基础信息 -->
       <h4 class="section-header">基础信息</h4>
       <el-descriptions :column="2" border size="small" class="mb16">
@@ -18,9 +28,15 @@
         </el-descriptions-item>
         <el-descriptions-item label="主体类型">{{ merchantTypeLabel(detail.merchantType) }}</el-descriptions-item>
         <el-descriptions-item label="申请会员名称">{{ detail.memberCode || '—' }}</el-descriptions-item>
+        <el-descriptions-item v-if="detail.shopOnlyMode" label="复用商户ID">{{ detail.existingMerchantId || '—' }}</el-descriptions-item>
         <el-descriptions-item label="申请时间">{{ parseTime(detail.applyTime) || '—' }}</el-descriptions-item>
         <el-descriptions-item label="审核人">{{ detail.auditBy || '—' }}</el-descriptions-item>
         <el-descriptions-item label="审核时间">{{ parseTime(detail.auditTime) || '—' }}</el-descriptions-item>
+        <el-descriptions-item v-if="detail.applyStatus === '3' || detail.applyStatus === '1'" label="公示时间" :span="2">
+          {{ formatPublicityPeriod(detail) }}
+        </el-descriptions-item>
+        <el-descriptions-item v-if="detail.applyStatus === '1' && detail.merchantId" label="商户ID">{{ detail.merchantId }}</el-descriptions-item>
+        <el-descriptions-item v-if="detail.applyStatus === '1' && detail.shopId" label="店铺ID">{{ detail.shopId }}</el-descriptions-item>
         <el-descriptions-item v-if="detail.applyStatus === '2'" label="拒绝原因" :span="2">
           <span class="reject-reason">{{ detail.rejectReason || '—' }}</span>
         </el-descriptions-item>
@@ -83,7 +99,7 @@
       </el-descriptions>
 
       <!-- 店铺信息 -->
-      <h4 class="section-header">首家店铺信息</h4>
+      <h4 class="section-header">{{ detail.shopOnlyMode ? '拟开设店铺信息' : '首家店铺信息' }}</h4>
       <el-descriptions :column="2" border size="small" class="mb16">
         <el-descriptions-item label="店铺名称">{{ shop.shopName || '—' }}</el-descriptions-item>
         <el-descriptions-item label="商家电话">{{ shop.shopPhone || '—' }}</el-descriptions-item>
@@ -94,10 +110,11 @@
         <el-descriptions-item label="店铺描述">{{ shop.shopDesc || '—' }}</el-descriptions-item>
       </el-descriptions>
 
-      <!-- 审核操作区（仅待审核） -->
-      <div v-if="detail.canApprove || detail.canReject" class="action-bar">
-        <el-button type="success" @click="handleApprove" v-hasPermi="['agri:merchantEntryApply:audit']">审核通过</el-button>
-        <el-button type="danger" plain @click="rejectOpen = true" v-hasPermi="['agri:merchantEntryApply:audit']">审核驳回</el-button>
+      <!-- 审核操作区 -->
+      <div v-if="detail.canApprove || detail.canReject || detail.canCompletePublicity" class="action-bar">
+        <el-button v-if="detail.canApprove" type="success" @click="handleApprove" v-hasPermi="['agri:merchantEntryApply:audit']">审核通过</el-button>
+        <el-button v-if="detail.canReject" type="danger" plain @click="rejectOpen = true" v-hasPermi="['agri:merchantEntryApply:audit']">审核驳回</el-button>
+        <el-button v-if="detail.canCompletePublicity" type="primary" @click="handleCompletePublicity" v-hasPermi="['agri:merchantEntryApply:audit']">完成公示</el-button>
       </div>
     </div>
 
@@ -117,7 +134,12 @@
 </template>
 
 <script>
-import { getMerchantEntryApply, approveMerchantEntryApply, rejectMerchantEntryApply } from "@/api/agri/merchantEntryApply"
+import {
+  getMerchantEntryApply,
+  approveMerchantEntryApply,
+  rejectMerchantEntryApply,
+  completeMerchantEntryPublicity
+} from "@/api/agri/merchantEntryApply"
 
 export default {
   name: "MerchantEntryApplyDetail",
@@ -168,25 +190,53 @@ export default {
       this.loading = true
       getMerchantEntryApply(this.applyId).then(response => {
         const data = response.data || {}
+        const formJson = data.formJson || {}
+        // shopOnlyMode 可能在 VO 顶层或 form_json 内
+        if (data.shopOnlyMode === undefined) {
+          data.shopOnlyMode = formJson.shopOnlyMode
+        }
+        if (data.existingMerchantId === undefined) {
+          data.existingMerchantId = formJson.existingMerchantId
+        }
         this.detail = data
-        this.subject = data.subject || data.formJson?.subject || {}
-        this.biz = data.biz || data.formJson?.biz || {}
-        this.shop = data.shop || data.formJson?.shop || {}
+        this.subject = data.subject || formJson.subject || {}
+        this.biz = data.biz || formJson.biz || {}
+        this.shop = data.shop || formJson.shop || {}
         this.loading = false
       }).catch(() => {
         this.loading = false
       })
     },
-    /** 申请状态文案 */
+    /** 申请状态文案（0待审 1已完成 2未通过 3公示中） */
     applyStatusLabel(status) {
-      const map = { "0": "待审核", "1": "审核通过", "2": "审核未通过" }
+      const map = {
+        "0": "待审核",
+        "1": "已完成入驻",
+        "2": "审核未通过",
+        "3": "公示中"
+      }
       return map[status] || "—"
     },
     /** 申请状态标签颜色 */
     applyStatusTag(status) {
-      const map = { "0": "warning", "1": "success", "2": "danger" }
+      const map = { "0": "warning", "1": "success", "2": "danger", "3": "primary" }
       return map[status] || "info"
     },
+    /** 公示时间展示 */
+    formatPublicityPeriod(row) {
+      if (!row || (row.applyStatus !== "3" && row.applyStatus !== "1")) {
+        return "—"
+      }
+      const start = this.parseTime(row.publicityStartTime)
+      const end = this.parseTime(row.publicityEndTime)
+      if (!start && !end) {
+        return "—"
+      }
+      if (start && end) {
+        return start + " 至 " + end
+      }
+      return start || end || "—"
+    },
     /** 商户类型文案 */
     merchantTypeLabel(type) {
       return type === "2" ? "企业" : type === "1" ? "个人" : "—"
@@ -210,14 +260,32 @@ export default {
     handleClose(done) {
       done()
     },
-    /** 审核通过（两步确认） */
+    /** 审核通过（进入公示，不立即建档） */
     handleApprove() {
-      this.$modal.confirm("确认审核通过？通过后将自动创建商户与首家店铺。").then(() => {
+      this.$modal.confirm("确认审核通过？通过后将进入公示期，公示完成后再创建商户与店铺。").then(() => {
         return approveMerchantEntryApply(this.applyId, { confirmed: true })
+      }).then(() => {
+        this.$modal.msgSuccess("已进入公示")
+        this.loadDetail()
+        this.$emit("success")
+      }).catch(() => {})
+    },
+    /** 完成公示（公示期满后建档） */
+    handleCompletePublicity() {
+      const tip = this.detail.shopOnlyMode
+        ? "确认完成公示？将复用已有商户并创建申请中的店铺。"
+        : "确认完成公示？将创建商户与首家店铺，并绑定申请会员经营账号。"
+      this.$modal.confirm(tip).then(() => {
+        return completeMerchantEntryPublicity(this.applyId)
       }).then(response => {
-        this.$modal.msgSuccess("审核通过")
+        const data = response.data || {}
+        let msg = "入驻已完成"
+        if (data.merchantId || data.shopId) {
+          msg += "（商户ID：" + (data.merchantId || "—") + "，店铺ID：" + (data.shopId || "—") + "）"
+        }
+        this.$modal.msgSuccess(msg)
         this.localVisible = false
-        this.$emit("success", response.data)
+        this.$emit("success", data)
       }).catch(() => {})
     },
     /** 提交驳回 */

ruoyi-ui/src/views/agri/org/merchantEntryApply/index.vue

@@ -7,9 +7,10 @@
           <el-input v-model="queryParams.keyword" placeholder="申请会员名称" clearable style="width: 200px" @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="申请状态" prop="applyStatus">
-          <el-select v-model="queryParams.applyStatus" placeholder="全部" clearable style="width: 140px">
+          <el-select v-model="queryParams.applyStatus" placeholder="全部" clearable style="width: 150px">
             <el-option label="待审核" value="0" />
-            <el-option label="审核通过" value="1" />
+            <el-option label="公示中" value="3" />
+            <el-option label="已完成入驻" value="1" />
             <el-option label="审核未通过" value="2" />
           </el-select>
         </el-form-item>
@@ -27,14 +28,18 @@
         <el-tab-pane name="0">
           <span slot="label">待审核<el-badge v-if="pendingCount > 0" :value="pendingCount" class="tab-badge" /></span>
         </el-tab-pane>
-        <el-tab-pane label="审核通过" name="1" />
+        <el-tab-pane label="公示中" name="3" />
+        <el-tab-pane label="已完成入驻" name="1" />
         <el-tab-pane label="审核未通过" name="2" />
       </el-tabs>
 
       <el-table border v-loading="loading" :data="applyList">
         <el-table-column label="申请信息" align="center" min-width="160" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            <span>{{ scope.row.merchantType === '2' ? '企业' : '个人' }} · {{ scope.row.subjectLabel || '—' }}</span>
+            <span>
+              {{ scope.row.merchantType === '2' ? '企业' : '个人' }} · {{ scope.row.subjectLabel || '—' }}
+              <el-tag v-if="scope.row.shopOnlyMode" size="mini" type="info" class="shop-only-tag">仅开店铺</el-tag>
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="申请会员名称" align="center" prop="memberCode" min-width="120" :show-overflow-tooltip="true">
@@ -49,6 +54,11 @@
             <el-tag size="small" :type="applyStatusTag(scope.row.applyStatus)">{{ applyStatusLabel(scope.row.applyStatus) }}</el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="公示时间" align="center" min-width="180" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{ formatPublicityPeriod(scope.row) }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="申请时间" align="center" prop="applyTime" width="160">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.applyTime) }}</span>
@@ -61,6 +71,8 @@
         </el-table-column>
       </el-table>
 
+      <el-empty v-if="!loading && !applyList.length" :description="emptyDescription" />
+
       <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
     </el-card>
 
@@ -94,6 +106,15 @@ export default {
       }
     }
   },
+  computed: {
+    /** 空列表提示文案 */
+    emptyDescription() {
+      if (this.statusTab === "0" || this.queryParams.applyStatus === "0") {
+        return "暂无待审核入驻申请"
+      }
+      return "暂无入驻申请"
+    }
+  },
   created() {
     this.loadPendingCount()
     this.getList()
@@ -116,16 +137,36 @@ export default {
         this.loading = false
       })
     },
-    /** 申请状态文案 */
+    /** 申请状态文案（0待审 1已完成 2未通过 3公示中） */
     applyStatusLabel(status) {
-      const map = { "0": "待审核", "1": "审核通过", "2": "审核未通过" }
+      const map = {
+        "0": "待审核",
+        "1": "已完成入驻",
+        "2": "审核未通过",
+        "3": "公示中"
+      }
       return map[status] || "—"
     },
     /** 申请状态标签颜色 */
     applyStatusTag(status) {
-      const map = { "0": "warning", "1": "success", "2": "danger" }
+      const map = { "0": "warning", "1": "success", "2": "danger", "3": "primary" }
       return map[status] || "info"
     },
+    /** 公示时间展示 */
+    formatPublicityPeriod(row) {
+      if (!row || (row.applyStatus !== "3" && row.applyStatus !== "1")) {
+        return "—"
+      }
+      const start = this.parseTime(row.publicityStartTime)
+      const end = this.parseTime(row.publicityEndTime)
+      if (!start && !end) {
+        return "—"
+      }
+      if (start && end) {
+        return start + " 至 " + end
+      }
+      return start || end || "—"
+    },
     /** Tab 切换 */
     handleTabClick() {
       this.queryParams.applyStatus = this.statusTab === "all" ? undefined : this.statusTab
@@ -165,4 +206,8 @@ export default {
 .tab-badge {
   margin-left: 4px;
 }
+.shop-only-tag {
+  margin-left: 6px;
+  vertical-align: middle;
+}
 </style>

ruoyi-ui/src/views/agri/org/shop/index.vue

@@ -4,7 +4,7 @@
     <el-card shadow="never" class="search-card">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
         <el-form-item label="关键词" prop="keyword">
-          <el-input v-model="queryParams.keyword" placeholder="店铺/商户/经营账号" clearable style="width: 220px" @keyup.enter.native="handleQuery" />
+          <el-input v-model="queryParams.keyword" placeholder="店铺/商户/主账号" clearable style="width: 220px" @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="店铺状态" prop="shopStatus">
           <el-select v-model="queryParams.shopStatus" placeholder="全部" clearable style="width: 120px">
@@ -47,15 +47,20 @@
             <el-tag v-else type="info" size="small">停业</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="经营账号" align="center" min-width="160">
+        <el-table-column label="评分" align="center" prop="rating" width="80">
+          <template slot-scope="scope">
+            <span>{{ formatRating(scope.row.rating) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="主账号" align="center" min-width="160">
           <template slot-scope="scope">
             <span>{{ scope.row.accountAdminName || '—' }} / {{ scope.row.accountLoginName || '—' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="220" fixed="right">
+        <el-table-column label="操作" align="center" width="240" fixed="right">
           <template slot-scope="scope">
             <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['agri:shop:edit']">编辑</el-button>
-            <el-button size="mini" type="text" icon="el-icon-user" @click="handleAccount(scope.row)" v-hasPermi="['agri:shop:account']">账号管理</el-button>
+            <el-button size="mini" type="text" icon="el-icon-user" @click="handleAccount(scope.row)" v-hasPermi="['agri:shop:account']">更换主账号</el-button>
             <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['agri:shop:remove']">删除</el-button>
           </template>
         </el-table-column>
@@ -84,16 +89,16 @@
             <el-option v-for="item in merchantOptions" :key="item.merchantId" :label="item.merchantName || item.unitName" :value="item.merchantId" />
           </el-select>
         </el-form-item>
-        <el-form-item v-if="!form.shopId && merchantAccountHint" label="经营账号">
+        <el-form-item v-if="!form.shopId && merchantAccountHint" label="主账号">
           <span class="readonly-text">{{ merchantAccountHint }}</span>
-          <div class="form-tip">经营账号由商户入驻时绑定，开店沿用该账号</div>
+          <div class="form-tip">主账号由商户入驻时绑定，开店沿用该账号</div>
         </el-form-item>
         <el-form-item v-else-if="form.shopId" label="所属商户">
           <span class="readonly-text">{{ form.merchantName || '—' }}</span>
         </el-form-item>
-        <el-form-item v-if="form.shopId" label="经营账号">
+        <el-form-item v-if="form.shopId" label="主账号">
           <span class="readonly-text">{{ form.accountAdminName || '—' }} / {{ form.accountLoginName || '—' }}</span>
-          <div class="form-tip">如需修改请使用「账号管理」</div>
+          <div class="form-tip">如需修改请使用「更换主账号」</div>
         </el-form-item>
         <el-form-item v-if="!form.shopId" label="店铺状态" prop="shopStatus">
           <el-radio-group v-model="form.shopStatus">
@@ -116,34 +121,63 @@
       </div>
     </el-dialog>
 
-    <!-- 店铺账号管理弹窗 -->
-    <el-dialog title="店铺账号管理" :visible.sync="accountOpen" width="560px" append-to-body>
-      <el-form ref="accountForm" :model="accountForm" :rules="accountRules" label-width="100px">
-        <el-alert v-if="accountForm.shops && accountForm.shops.length" type="info" :closable="false" class="mb12">
-          修改后将同步至该商户下全部店铺（共 {{ accountForm.shops.length }} 家）
-        </el-alert>
-        <div v-if="accountForm.shops && accountForm.shops.length" class="shop-tags mb12">
-          <el-tag v-for="item in accountForm.shops" :key="item.shopId" size="small" class="shop-tag" :type="item.shopStatus === '0' ? 'success' : 'info'">
-            {{ item.shopName }}
-          </el-tag>
-        </div>
-        <el-form-item label="登录名" prop="loginNameRaw">
-          <el-input
-            v-model="accountForm.loginNameRaw"
-            :placeholder="accountForm.loginNameMasked ? ('当前 ' + accountForm.loginNameMasked + '，修改请填完整手机号') : '11位手机号'"
-            maxlength="11"
-          />
-          <div class="form-tip">登录名须为 11 位手机号，修改后将同步至该商户下全部店铺</div>
+    <!-- 更换主账号弹窗（v1.4：换绑管理员/会员，不改登录名密码） -->
+    <el-dialog title="更换主账号" :visible.sync="accountOpen" width="600px" append-to-body @close="resetAccountForm">
+      <el-form ref="accountForm" :model="accountForm" :rules="accountRules" label-width="110px">
+        <el-alert type="warning" :closable="false" class="mb12" title="更换后将同步至该商户下全部店铺" />
+        <el-form-item label="当前主账号">
+          <span class="readonly-text">{{ accountForm.adminName || '—' }} / {{ accountForm.loginName || '—' }}</span>
+        </el-form-item>
+        <el-form-item v-if="accountForm.shops && accountForm.shops.length" label="下属店铺">
+          <div class="shop-tags">
+            <el-tag
+              v-for="item in accountForm.shops"
+              :key="item.shopId"
+              size="small"
+              class="shop-tag"
+              :type="item.shopStatus === '0' ? 'success' : 'info'"
+            >
+              {{ item.shopName }}（{{ item.shopStatus === '0' ? '开业' : '停业' }}）
+            </el-tag>
+          </div>
+        </el-form-item>
+        <el-form-item label="绑定方式" prop="bindType">
+          <el-radio-group v-model="accountForm.bindType" @change="handleAccountBindTypeChange">
+            <el-radio label="SYS_USER">平台管理员</el-radio>
+            <el-radio label="MEMBER">会员</el-radio>
+          </el-radio-group>
         </el-form-item>
-        <el-form-item label="管理员姓名" prop="adminName">
-          <el-input v-model="accountForm.adminName" placeholder="管理员姓名" maxlength="64" />
+        <el-form-item v-if="accountForm.bindType === 'SYS_USER'" label="选择管理员" prop="bindUserId">
+          <el-select
+            v-model="accountForm.bindUserId"
+            filterable
+            remote
+            reserve-keyword
+            placeholder="输入用户名/手机号搜索"
+            :remote-method="searchAdminUser"
+            :loading="bindSearchLoading"
+            style="width: 100%"
+          >
+            <el-option v-for="item in adminUserList" :key="item.userId" :label="formatAdminOption(item)" :value="item.userId" />
+          </el-select>
         </el-form-item>
-        <el-form-item label="重置密码" prop="password">
-          <el-input v-model="accountForm.password" type="password" placeholder="留空则不修改" maxlength="20" show-password />
+        <el-form-item v-if="accountForm.bindType === 'MEMBER'" label="选择会员" prop="bindMemberId">
+          <el-select
+            v-model="accountForm.bindMemberId"
+            filterable
+            remote
+            reserve-keyword
+            placeholder="输入会员名称/手机号搜索"
+            :remote-method="searchMember"
+            :loading="bindSearchLoading"
+            style="width: 100%"
+          >
+            <el-option v-for="item in memberList" :key="item.memberId" :label="formatMemberOption(item)" :value="item.memberId" />
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer">
-        <el-button type="primary" @click="submitAccount">保 存</el-button>
+        <el-button type="primary" @click="submitAccount">确 定</el-button>
         <el-button @click="accountOpen = false">取 消</el-button>
       </div>
     </el-dialog>
@@ -152,7 +186,7 @@
 
 <script>
 import { listShop, getShop, addShop, updateShop, delShop, deleteShopCheck, getShopAccount, updateShopAccount } from "@/api/agri/shop"
-import { selectMerchantList, openShopCheck } from "@/api/agri/merchant"
+import { selectMerchantList, openShopCheck, adminUserOptions, memberOptions } from "@/api/agri/merchant"
 
 export default {
   name: "AgriShop",
@@ -169,18 +203,6 @@ export default {
       }
       callback()
     }
-    /** 经营账号登录名：11 位手机号（v1.3） */
-    const validateLoginName = (rule, value, callback) => {
-      if (!value) {
-        callback(new Error("请输入登录名"))
-        return
-      }
-      if (!/^1[3-9]\d{9}$/.test(value)) {
-        callback(new Error("登录名须为11位手机号"))
-        return
-      }
-      callback()
-    }
     return {
       loading: true,
       showSearch: true,
@@ -194,7 +216,9 @@ export default {
       merchantAccountOk: false,
       currentMerchantId: null,
       originalShopStatus: "0",
-      originalLoginName: "",
+      bindSearchLoading: false,
+      adminUserList: [],
+      memberList: [],
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -204,18 +228,34 @@ export default {
       },
       form: {},
       accountForm: {},
+      accountRules: {
+        bindType: [{ required: true, message: "请选择绑定方式", trigger: "change" }],
+        bindUserId: [{
+          validator: (rule, value, callback) => {
+            if (this.accountForm.bindType === "SYS_USER" && !value) {
+              callback(new Error("请选择平台管理员"))
+              return
+            }
+            callback()
+          },
+          trigger: "change"
+        }],
+        bindMemberId: [{
+          validator: (rule, value, callback) => {
+            if (this.accountForm.bindType === "MEMBER" && !value) {
+              callback(new Error("请选择会员"))
+              return
+            }
+            callback()
+          },
+          trigger: "change"
+        }]
+      },
       rules: {
         shopName: [{ required: true, message: "请输入店铺名称", trigger: "blur" }],
         shopAvatar: [{ required: true, message: "请上传店铺头像", trigger: "change" }],
         shopPhone: [{ validator: validateShopPhone, trigger: "blur" }],
         merchantId: [{ required: true, message: "请选择商户", trigger: "change" }]
-      },
-      accountRules: {
-        loginNameRaw: [
-          { required: true, message: "请输入登录名", trigger: "blur" },
-          { validator: validateLoginName, trigger: "blur" }
-        ],
-        adminName: [{ required: true, message: "请输入管理员姓名", trigger: "blur" }]
       }
     }
   },
@@ -228,6 +268,17 @@ export default {
     this.loadMerchantOptions()
   },
   methods: {
+    /** 评分展示：无评价 —，有评价保留两位小数 */
+    formatRating(rating) {
+      if (rating == null || rating === "") {
+        return "—"
+      }
+      const num = Number(rating)
+      if (Number.isNaN(num)) {
+        return "—"
+      }
+      return num.toFixed(2)
+    },
     /** 查询店铺列表 */
     getList() {
       this.loading = true
@@ -311,7 +362,7 @@ export default {
         getShopAccount(merchantId).then(res => {
           const data = res.data || {}
           if (!data.loginName && !data.adminName) {
-            this.$modal.msgWarning("该商户尚未配置经营账号，请先在商户管理中完成入驻绑定")
+            this.$modal.msgWarning("该商户尚未配置主账号，请先在商户管理中完成入驻绑定")
             this.form.merchantId = undefined
             return
           }
@@ -370,7 +421,7 @@ export default {
           this.doUpdateShop()
         } else {
           if (!this.merchantAccountOk) {
-            this.$modal.msgWarning("请先选择已绑定经营账号的商户")
+            this.$modal.msgWarning("请先选择已绑定主账号的商户")
             return
           }
           addShop(this.buildAddPayload()).then(() => {
@@ -395,49 +446,113 @@ export default {
         this.getList()
       })
     },
-    /** 打开账号管理 */
+    /** 重置更换主账号表单 */
+    resetAccountForm() {
+      this.accountForm = {}
+      this.adminUserList = []
+      this.memberList = []
+      if (this.$refs.accountForm) {
+        this.$refs.accountForm.clearValidate()
+      }
+    },
+    /** 打开更换主账号 */
     handleAccount(row) {
       this.currentMerchantId = row.merchantId
       getShopAccount(row.merchantId).then(response => {
         const data = response.data || {}
-        const loginRaw = data.loginNameRaw || ""
-        this.originalLoginName = loginRaw
         this.accountForm = {
-          loginNameRaw: loginRaw,
-          loginNameMasked: data.loginName || "",
+          accountId: data.accountId,
           adminName: data.adminName,
-          password: undefined,
-          shops: data.shops || []
+          loginName: data.loginName,
+          shops: data.shops || [],
+          bindType: "SYS_USER",
+          bindUserId: undefined,
+          bindMemberId: undefined
         }
+        this.adminUserList = []
+        this.memberList = []
         this.accountOpen = true
       })
     },
-    /** 保存账号（改登录名需 confirm） */
-    submitAccount(confirm) {
+    /** 切换绑定方式时清空已选账号 */
+    handleAccountBindTypeChange() {
+      this.accountForm.bindUserId = undefined
+      this.accountForm.bindMemberId = undefined
+      this.adminUserList = []
+      this.memberList = []
+      this.$nextTick(() => {
+        if (this.$refs.accountForm) {
+          this.$refs.accountForm.clearValidate(["bindUserId", "bindMemberId"])
+        }
+      })
+    },
+    /** 管理员下拉展示 */
+    formatAdminOption(item) {
+      const parts = [item.userName, item.nickName].filter(Boolean)
+      if (item.phonenumber) {
+        parts.push(item.phonenumber)
+      }
+      return parts.join(" / ")
+    },
+    /** 会员下拉展示 */
+    formatMemberOption(item) {
+      const parts = [item.memberCode, item.nickName].filter(Boolean)
+      if (item.mobile) {
+        parts.push(item.mobile)
+      }
+      return parts.join(" / ")
+    },
+    /** 远程搜索平台管理员 */
+    searchAdminUser(keyword) {
+      if (!keyword || String(keyword).trim().length < 1) {
+        this.adminUserList = []
+        return
+      }
+      this.bindSearchLoading = true
+      adminUserOptions(keyword).then(response => {
+        this.adminUserList = response.data || []
+        this.bindSearchLoading = false
+      }).catch(() => {
+        this.bindSearchLoading = false
+      })
+    },
+    /** 远程搜索会员 */
+    searchMember(keyword) {
+      if (!keyword || String(keyword).trim().length < 1) {
+        this.memberList = []
+        return
+      }
+      this.bindSearchLoading = true
+      memberOptions(keyword).then(response => {
+        this.memberList = response.data || []
+        this.bindSearchLoading = false
+      }).catch(() => {
+        this.bindSearchLoading = false
+      })
+    },
+    /** 提交更换主账号（换绑 account_id，不改 sys_user 资料） */
+    submitAccount() {
       this.$refs["accountForm"].validate(valid => {
         if (!valid) {
           return
         }
-        const payload = {
-          loginName: this.accountForm.loginNameRaw,
-          adminName: this.accountForm.adminName,
-          password: this.accountForm.password || null
-        }
-        // 改登录名时走两步 confirm（v1.3）；未改登录名则不传 confirm
-        if (this.accountForm.loginNameRaw !== this.originalLoginName) {
-          payload.confirm = confirm === true
-        }
-        updateShopAccount(this.currentMerchantId, payload).then(response => {
-          if (response.data && response.data.needConfirm) {
-            this.$modal.confirm(response.data.confirmMessage || "将同步至该商户下全部店铺，是否继续？").then(() => {
-              this.submitAccount(true)
-            }).catch(() => {})
+        const payload = { bindType: this.accountForm.bindType }
+        if (payload.bindType === "SYS_USER") {
+          if (this.accountForm.bindUserId === this.accountForm.accountId) {
+            this.$modal.msgWarning("所选账号与当前主账号相同")
             return
           }
-          this.$modal.msgSuccess("保存成功")
+          payload.bindUserId = this.accountForm.bindUserId
+        } else {
+          payload.bindMemberId = this.accountForm.bindMemberId
+        }
+        this.$modal.confirm("更换后将同步至该商户下全部店铺，是否继续？").then(() => {
+          return updateShopAccount(this.currentMerchantId, payload)
+        }).then(() => {
+          this.$modal.msgSuccess("更换成功")
           this.accountOpen = false
           this.getList()
-        })
+        }).catch(() => {})
       })
     },
     /** 删除店铺（先预检再确认） */
@@ -449,7 +564,7 @@ export default {
           this.$modal.msgWarning(reasons || "当前店铺不满足删除条件")
           return
         }
-        this.$modal.confirm("删除后不可恢复，是否继续？").then(() => {
+        this.$modal.confirm("删除后店铺不可恢复经营，是否继续？").then(() => {
           return delShop(row.shopId)
         }).then(() => {
           this.$modal.msgSuccess("删除成功")
@@ -477,7 +592,7 @@ export default {
   margin-bottom: 12px;
 }
 .shop-tags {
-  padding-left: 100px;
+  line-height: 1.8;
 }
 .shop-tag {
   margin-right: 8px;

ruoyi-ui/src/views/agri/seller/goods/detail.vue

@@ -103,7 +103,7 @@
       <div v-if="detail.detailContent" class="detail-content mb16" v-html="detail.detailContent"></div>
 
       <div class="action-bar">
-        <el-button v-if="detail.canEdit !== false" type="primary" plain @click="handleEdit" v-hasPermi="['agri:seller:goods:edit']">编辑</el-button>
+        <el-button v-if="canShowEdit" type="primary" plain @click="handleEdit" v-hasPermi="['agri:seller:goods:edit']">编辑</el-button>
         <el-button v-if="detail.canSubmit" type="success" @click="handleSubmit" v-hasPermi="['agri:seller:goods:edit']">提交上架</el-button>
         <el-button v-if="detail.canOffShelf" type="warning" plain @click="handleOffShelf" v-hasPermi="['agri:seller:goods:offshelf']">下架</el-button>
         <el-button v-if="detail.canDelete" type="danger" plain @click="handleDelete" v-hasPermi="['agri:seller:goods:remove']">删除</el-button>
@@ -133,6 +133,15 @@ export default {
       detail: {}
     }
   },
+  computed: {
+    /** 未上架 / 审核失败 / 已下架可编辑；优先用后端 canEdit */
+    canShowEdit() {
+      if (this.detail.canEdit === true) return true
+      if (this.detail.canEdit === false) return false
+      const status = this.detail.goodsStatus
+      return status === "0" || status === "3" || status === "4"
+    }
+  },
   watch: {
     visible(val) {
       this.localVisible = val
@@ -180,6 +189,10 @@ export default {
     },
     /** 跳转编辑 */
     handleEdit() {
+      if (!this.canShowEdit) {
+        this.$modal.msgWarning("当前状态不可编辑；出售中须先下架，待审核须等待平台审核结果")
+        return
+      }
       this.$emit("edit", this.detail)
       this.localVisible = false
     },

ruoyi-ui/src/views/agri/seller/goods/index.vue

@@ -28,7 +28,9 @@
       <el-tabs v-model="statusTab" @tab-click="handleTabClick">
         <el-tab-pane label="全部" name="all" />
         <el-tab-pane label="未上架" name="0" />
-        <el-tab-pane label="待审核" name="1" />
+        <el-tab-pane name="1">
+          <span slot="label">待审核<el-badge v-if="pendingCount > 0" :value="pendingCount" class="tab-badge" /></span>
+        </el-tab-pane>
         <el-tab-pane label="出售中" name="2" />
         <el-tab-pane label="审核失败" name="3" />
         <el-tab-pane label="已下架" name="4" />
@@ -63,9 +65,14 @@
         <el-table-column label="库存" align="center" prop="stock" width="70" />
         <el-table-column label="销量" align="center" prop="salesCount" width="70" />
         <el-table-column label="商品分类" align="center" prop="categoryPath" min-width="120" :show-overflow-tooltip="true" />
-        <el-table-column label="店铺分类" align="center" prop="shopCategoryName" min-width="110" :show-overflow-tooltip="true">
+        <el-table-column label="店铺分类" align="center" prop="shopCategoryPath" min-width="110" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            <span>{{ scope.row.shopCategoryName || '—' }}</span>
+            <span>{{ scope.row.shopCategoryPath || scope.row.shopCategoryName || '—' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="提交上架时间" align="center" prop="submitTime" width="160">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.submitTime) || '—' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="状态" align="center" prop="goodsStatus" width="90">
@@ -76,7 +83,7 @@
         <el-table-column label="操作" align="center" width="240" fixed="right">
           <template slot-scope="scope">
             <el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row)" v-hasPermi="['agri:seller:goods:query']">详情</el-button>
-            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['agri:seller:goods:edit']">编辑</el-button>
+            <el-button v-if="canRowEdit(scope.row)" size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['agri:seller:goods:edit']">编辑</el-button>
             <el-button v-if="canRowSubmit(scope.row)" size="mini" type="text" icon="el-icon-upload2" @click="handleRowSubmit(scope.row)" v-hasPermi="['agri:seller:goods:edit']">提交上架</el-button>
             <el-button v-if="scope.row.goodsStatus === '2'" size="mini" type="text" icon="el-icon-bottom" @click="handleRowOffShelf(scope.row)" v-hasPermi="['agri:seller:goods:offshelf']">下架</el-button>
             <el-button v-if="canRowDelete(scope.row)" size="mini" type="text" icon="el-icon-delete" @click="handleRowDelete(scope.row)" v-hasPermi="['agri:seller:goods:remove']">删除</el-button>
@@ -84,6 +91,10 @@
         </el-table-column>
       </el-table>
 
+      <el-empty v-if="!loading && !goodsList.length" description="暂无商品">
+        <el-button type="primary" size="small" @click="handleAdd" v-hasPermi="['agri:seller:goods:add']">添加商品</el-button>
+      </el-empty>
+
       <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
     </el-card>
 
@@ -270,6 +281,7 @@ export default {
       loading: true,
       showSearch: true,
       total: 0,
+      pendingCount: 0,
       goodsList: [],
       selection: [],
       detailOpen: false,
@@ -358,12 +370,22 @@ export default {
     initPage() {
       this.loadShopContext().then(() => {
         this.loadFormOptions()
+        this.loadPendingCount()
         this.getList()
       }).catch(() => {
         this.loadFormOptions()
+        this.loadPendingCount()
         this.getList()
       })
     },
+    /** 待审核 Tab 角标数量 */
+    loadPendingCount() {
+      listSellerGoods({ pageNum: 1, pageSize: 1, goodsStatusQuery: "1" }).then(response => {
+        this.pendingCount = response.total || 0
+      }).catch(() => {
+        this.pendingCount = 0
+      })
+    },
     /** 写入 X-Shop-Id 缓存 */
     loadShopContext() {
       return getSellerContext().then(response => {
@@ -482,12 +504,30 @@ export default {
     },
     /** 是否可提交上架 */
     canRowSubmit(row) {
+      if (row.canSubmit === true) return true
+      if (row.canSubmit === false) return false
+      return row.goodsStatus === "0" || row.goodsStatus === "3" || row.goodsStatus === "4"
+    },
+    /** 是否可编辑（待审核、出售中不可编辑） */
+    canRowEdit(row) {
+      if (row.canEdit === true) return true
+      if (row.canEdit === false) return false
       return row.goodsStatus === "0" || row.goodsStatus === "3" || row.goodsStatus === "4"
     },
     /** 是否可删除 */
     canRowDelete(row) {
+      if (row.canDelete === true) return true
+      if (row.canDelete === false) return false
       return this.canRowSubmit(row)
     },
+    /** 批量操作失败时展示 reasons */
+    showBatchFailure(error) {
+      const data = (error && error.data) || (error && error.response && error.response.data)
+      const reasons = data && data.reasons
+      if (reasons && reasons.length) {
+        this.$modal.msgWarning(reasons.join("；"))
+      }
+    },
     handleTabClick() {
       this.queryParams.goodsStatusQuery = this.statusTab === "all" ? undefined : this.statusTab
       this.queryParams.pageNum = 1
@@ -686,6 +726,10 @@ export default {
     },
     /** 打开编辑商品 */
     handleUpdate(row) {
+      if (!this.canRowEdit(row)) {
+        this.$modal.msgWarning("当前状态不可编辑；出售中须先下架，待审核须等待平台审核结果")
+        return
+      }
       getSellerGoods(row.goodsId).then(response => {
         const data = response.data || {}
         this.form = {
@@ -774,7 +818,9 @@ export default {
       }).then(() => {
         this.$modal.msgSuccess("批量提交成功")
         this.handleSuccess()
-      }).catch(() => {})
+      }).catch(err => {
+        this.showBatchFailure(err)
+      })
     },
     /** 单条下架 */
     handleRowOffShelf(row) {
@@ -793,7 +839,9 @@ export default {
       }).then(() => {
         this.$modal.msgSuccess("批量下架成功")
         this.handleSuccess()
-      }).catch(() => {})
+      }).catch(err => {
+        this.showBatchFailure(err)
+      })
     },
     /** 单条删除 */
     handleRowDelete(row) {
@@ -812,9 +860,12 @@ export default {
       }).then(() => {
         this.$modal.msgSuccess("批量删除成功")
         this.handleSuccess()
-      }).catch(() => {})
+      }).catch(err => {
+        this.showBatchFailure(err)
+      })
     },
     handleSuccess() {
+      this.loadPendingCount()
       this.getList()
     }
   }
@@ -880,4 +931,8 @@ export default {
   width: 100%;
   margin-bottom: 12px;
 }
+.tab-badge {
+  margin-left: 6px;
+  vertical-align: middle;
+}
 </style>

shop-app/api/merchantEntry.js

@@ -30,6 +30,14 @@ export function submitEntryApply(data) {
   })
 }
 
+/** 入驻上下文（是否仅开店铺、商户快照） */
+export function getEntryContext() {
+  return request({
+    url: '/api/merchant/entry/context',
+    method: 'GET'
+  })
+}
+
 /** 我的入驻申请列表 */
 export function getMyEntryApplies() {
   return request({

shop-app/subpackage/account/entry-apply.vue

@@ -9,7 +9,17 @@
 			<text>您有待审核或公示中的申请，请先在「我的入驻申请」查看进度</text>
 			<button class="mine-btn-outline entry-closed__btn" @click="goList">查看申请</button>
 		</view>
+		<view v-else-if="shopOnlyBlocked" class="entry-closed">
+			<text>{{ entryContext.blockReason || '当前无法申请开设新店铺' }}</text>
+			<button class="mine-btn-outline entry-closed__btn" @click="goList">查看申请</button>
+		</view>
 		<template v-else>
+			<view v-if="shopOnlyMode" class="entry-shop-only-banner">
+				<text class="entry-shop-only-banner__title">仅开店铺模式</text>
+				<text class="entry-shop-only-banner__tip">您已是商户管理员，本次仅需填写拟开设店铺信息，主体与经营信息沿用已有商户。</text>
+				<text v-if="entryContext.merchantName" class="entry-shop-only-banner__line">商户名称：{{ entryContext.merchantName }}</text>
+				<text v-if="entryContext.subjectLabel" class="entry-shop-only-banner__line">主体：{{ entryContext.subjectLabel }}</text>
+			</view>
 			<view class="entry-steps">
 				<text
 					v-for="(s, i) in stepTitles"
@@ -18,8 +28,8 @@
 				>{{ s }}</text>
 			</view>
 			<scroll-view class="entry-scroll" scroll-y>
-				<!-- 主体类型 -->
-				<view v-if="currentStep === 'type'" class="form-card">
+				<!-- 主体类型（新主体申请） -->
+				<view v-if="!shopOnlyMode && currentStep === 'type'" class="form-card">
 					<view
 						:class="['type-card', { 'type-card--on': form.merchantType === '1' }]"
 						@click="selectType('1')"
@@ -91,10 +101,17 @@
 import { ref, reactive, computed } from 'vue'
 import SafeNavBar from '@/components/common/SafeNavBar.vue'
 import { onLoad } from '@dcloudio/uni-app'
-import { getEntryAgreement, getEntryStatus, getMyEntryApplies, submitEntryApply } from '@/api/merchantEntry'
+import { getEntryAgreement, getEntryStatus, getMyEntryApplies, getEntryContext, submitEntryApply } from '@/api/merchantEntry'
 import { ensureApiToken } from '@/utils/apiAuth'
 import { hasBlockingApply } from '@/utils/entryConstants'
-import { createEntryForm, validateEntryStep, buildEntrySubmitPayload, applyRegion, applyRegRegion } from '@/utils/entryForm'
+import {
+  createEntryForm,
+  validateEntryStep,
+  buildEntrySubmitPayload,
+  buildShopOnlySubmitPayload,
+  applyRegion,
+  applyRegRegion
+} from '@/utils/entryForm'
 import { MERCHANT_TYPE_PERSON } from '@/utils/entryConstants'
 import AgreementBlock from '@/components/account/AgreementBlock.vue'
 import EntryPersonSubject from '@/components/mine/entry/EntryPersonSubject.vue'
@@ -122,12 +139,32 @@ const agreement = reactive({
 const stepIndex = ref(0)
 const entryOpen = ref(true)
 const blocked = ref(false)
+const entryContext = ref({
+  shopOnlyMode: false,
+  canShopOnlyApply: false,
+  blockReason: '',
+  merchantId: null,
+  merchantType: '',
+  subjectLabel: '',
+  merchantName: ''
+})
 const regionBiz = ref({ regionCode: '', regionName: '', pathCodes: [] })
 const regionReg = ref({ regionCode: '', regionName: '', pathCodes: [] })
 const userStore = useUserStore()
 
-const stepKeys = computed(() => ['type', 'subject', 'biz', 'shop', 'submit'])
-const stepTitles = ['类型', '主体', '经营', '店铺', '提交']
+/** 可仅填店铺提交（路径 A2） */
+const shopOnlyMode = computed(() => !!entryContext.value.shopOnlyMode && !!entryContext.value.canShopOnlyApply)
+/** 已是商户管理员但不可仅开店铺 */
+const shopOnlyBlocked = computed(() => !!entryContext.value.shopOnlyMode && !entryContext.value.canShopOnlyApply)
+
+const stepKeys = computed(() => {
+  if (shopOnlyMode.value) return ['shop', 'submit']
+  return ['type', 'subject', 'biz', 'shop', 'submit']
+})
+const stepTitles = computed(() => {
+  if (shopOnlyMode.value) return ['店铺', '提交']
+  return ['类型', '主体', '经营', '店铺', '提交']
+})
 const currentStep = computed(() => stepKeys.value[stepIndex.value])
 const isPerson = computed(() => form.merchantType === MERCHANT_TYPE_PERSON)
 const nextBtnText = computed(() => {
@@ -141,8 +178,8 @@ onLoad(() => {
 })
 
 function initPage() {
-  Promise.all([getEntryAgreement(), getEntryStatus(), getMyEntryApplies()])
-    .then(([agRes, stRes, myRes]) => {
+  Promise.all([getEntryAgreement(), getEntryStatus(), getMyEntryApplies(), getEntryContext()])
+    .then(([agRes, stRes, myRes, ctxRes]) => {
       const ag = agRes.data || {}
       agreement.enabled = !!ag.enabled
       agreement.message = ag.message || ''
@@ -152,7 +189,22 @@ function initPage() {
       agreement.checkboxLabel = ag.checkboxLabel || agreement.checkboxLabel
       entryOpen.value = stRes.data?.entryOpen !== false && agreement.enabled
       blocked.value = hasBlockingApply(myRes.data || [])
-      if (entryOpen.value && !blocked.value) {
+      entryContext.value = {
+        shopOnlyMode: !!ctxRes.data?.shopOnlyMode,
+        canShopOnlyApply: !!ctxRes.data?.canShopOnlyApply,
+        blockReason: ctxRes.data?.blockReason || '',
+        merchantId: ctxRes.data?.merchantId,
+        merchantType: ctxRes.data?.merchantType || '',
+        subjectLabel: ctxRes.data?.subjectLabel || '',
+        merchantName: ctxRes.data?.merchantName || ''
+      }
+      if (shopOnlyMode.value) {
+        form.merchantType = entryContext.value.merchantType || MERCHANT_TYPE_PERSON
+        form.shop = createEntryForm(form.merchantType).shop
+        form.agreementAccepted = false
+        stepIndex.value = 0
+      }
+      if (entryOpen.value && !blocked.value && !shopOnlyBlocked.value) {
         ensureMemberNickName()
       }
     })
@@ -226,13 +278,19 @@ function doSubmit() {
     ensureMemberNickName()
     return
   }
+  const confirmTip = shopOnlyMode.value
+    ? '提交后不可修改，将复用已有商户并申请开设新店铺，是否确认？'
+    : '提交后不可修改，是否确认？'
   uni.showModal({
     title: '确认提交',
-    content: '提交后不可修改，是否确认？',
+    content: confirmTip,
     success: (res) => {
       if (!res.confirm) return
       submitGuard.run(async () => {
-        await submitEntryApply(buildEntrySubmitPayload(form))
+        const payload = shopOnlyMode.value
+          ? buildShopOnlySubmitPayload(form)
+          : buildEntrySubmitPayload(form)
+        await submitEntryApply(payload)
         uni.showToast({ title: '提交成功，请等待审核', icon: 'none', duration: 2500 })
         setTimeout(() => {
           uni.redirectTo({ url: PAGE_ENTRY_LIST })
@@ -338,4 +396,29 @@ function goList() {
   font-size: 26rpx;
   color: #666;
 }
+.entry-shop-only-banner {
+  margin: 16rpx 24rpx 0;
+  padding: 24rpx;
+  background: #e8f5e9;
+  border-radius: 12rpx;
+}
+.entry-shop-only-banner__title {
+  display: block;
+  font-size: 28rpx;
+  font-weight: 600;
+  color: #2e7d32;
+}
+.entry-shop-only-banner__tip {
+  display: block;
+  margin-top: 8rpx;
+  font-size: 24rpx;
+  color: #4a6b4f;
+  line-height: 1.5;
+}
+.entry-shop-only-banner__line {
+  display: block;
+  margin-top: 8rpx;
+  font-size: 24rpx;
+  color: #5c5652;
+}
 </style>

shop-app/subpackage/account/entry-detail.vue

@@ -37,6 +37,7 @@
 			<view v-if="detail.applyStatus === APPLY_STATUS_DONE" class="detail-done">
 				<text>入驻已完成，请使用经营账号登录商家后台进行发品与店铺经营。</text>
 				<text v-if="detail.merchantId" class="detail-done__sub">商户 ID：{{ detail.merchantId }}</text>
+				<text v-if="detail.shopId" class="detail-done__sub">店铺 ID：{{ detail.shopId }}</text>
 			</view>
 		</view>
 		<view v-if="detail.applyStatus === APPLY_STATUS_REJECT && canReapply" class="form-footer">

shop-app/subpackage/account/entry-list.vue

@@ -21,6 +21,10 @@
 					</text>
 				</view>
 				<text class="entry-card__time">申请时间：{{ item.applyTime || '—' }}</text>
+				<text
+					v-if="item.applyStatus === APPLY_STATUS_PUBLICITY && formatPublicityPeriod(item)"
+					class="entry-card__publicity"
+				>公示期：{{ formatPublicityPeriod(item) }}</text>
 				<text
 					v-if="item.applyStatus === '2' && item.rejectReason"
 					class="entry-card__reject"
@@ -41,7 +45,7 @@ import { onShow } from '@dcloudio/uni-app'
 import { getMyEntryApplies } from '@/api/merchantEntry'
 import { getEntryStatus } from '@/api/merchantEntry'
 import { ensureApiToken } from '@/utils/apiAuth'
-import { formatApplyStatus, canSubmitNewApply } from '@/utils/entryConstants'
+import { formatApplyStatus, canSubmitNewApply, formatPublicityPeriod, APPLY_STATUS_PUBLICITY } from '@/utils/entryConstants'
 import { PAGE_ENTRY_APPLY, PAGE_ENTRY_DETAIL } from '@/utils/pageRoute'
 
 const list = ref([])
@@ -131,6 +135,12 @@ function goApply() {
   font-size: 24rpx;
   color: #999;
 }
+.entry-card__publicity {
+  display: block;
+  margin-top: 12rpx;
+  font-size: 24rpx;
+  color: #1976d2;
+}
 .entry-card__reject {
   display: block;
   margin-top: 12rpx;

shop-app/subpackage/account/profile.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="form-page">
 		<view class="form-card">
-			<!-- <view class="form-row">
+			<view class="form-row">
 				<text class="form-row__label">用户 ID</text>
 				<text class="form-row__readonly">{{ profile.memberId || '—' }}</text>
-			</view> -->
+			</view>
 			<view class="form-row">
 				<text class="form-row__label">会员名称</text>
 				<text class="form-row__readonly">{{ profile.memberCode || '—' }}</text>

shop-app/utils/entryConstants.js

@@ -56,3 +56,15 @@ export function canSubmitNewApply(list, entryOpen) {
   if (!entryOpen) return false
   return !hasBlockingApply(list)
 }
+
+/** 公示时间展示（列表/详情） */
+export function formatPublicityPeriod(item) {
+  if (!item || (item.applyStatus !== APPLY_STATUS_PUBLICITY && item.applyStatus !== APPLY_STATUS_DONE)) {
+    return ''
+  }
+  const start = item.publicityStartTime || ''
+  const end = item.publicityEndTime || ''
+  if (!start && !end) return ''
+  if (start && end) return `${start} 至 ${end}`
+  return start || end
+}

shop-app/utils/entryForm.js

@@ -226,7 +226,7 @@ export function validateEntryStep(form, stepKey) {
   return ''
 }
 
-/** 提交前组装 DTO */
+/** 提交前组装 DTO（新主体完整申请） */
 export function buildEntrySubmitPayload(form) {
   return {
     subject: { ...form.subject, merchantType: form.merchantType },
@@ -235,3 +235,11 @@ export function buildEntrySubmitPayload(form) {
     agreementAccepted: !!form.agreementAccepted
   }
 }
+
+/** 仅开店铺：仅提交 shop + 协议勾选（主体/经营由后端合并已有商户） */
+export function buildShopOnlySubmitPayload(form) {
+  return {
+    shop: { ...form.shop },
+    agreementAccepted: !!form.agreementAccepted
+  }
+}