diff --git a/.env.merchant b/.env.merchant
index 58dbce729..037cdcb80 100644
--- a/.env.merchant
+++ b/.env.merchant
@@ -1,5 +1,5 @@
 # 名称
-VITE_GLOB_APP_TITLE=DaxPay商户管理端
+VITE_GLOB_APP_TITLE=DaxPay商户端
 
 # 压缩方式
 VITE_BUILD_COMPRESS='gzip'
diff --git a/.env.merchant-build b/.env.merchant-build
index 58dbce729..037cdcb80 100644
--- a/.env.merchant-build
+++ b/.env.merchant-build
@@ -1,5 +1,5 @@
 # 名称
-VITE_GLOB_APP_TITLE=DaxPay商户管理端
+VITE_GLOB_APP_TITLE=DaxPay商户端
 
 # 压缩方式
 VITE_BUILD_COMPRESS='gzip'
diff --git a/package.json b/package.json
index a2db41c0e..6d3d0b25c 100644
--- a/package.json
+++ b/package.json
@@ -9,8 +9,8 @@
     "build:analyze": "cross-env NODE_OPTIONS=--max-old-space-size=8192 pnpm vite build --mode admin-build",
     "build:admin": "cross-env NODE_OPTIONS=--max-old-space-size=8192 pnpm vite build --mode admin",
     "build:merchant": "cross-env NODE_OPTIONS=--max-old-space-size=8192 pnpm vite build --mode merchant-build",
-    "dev:admin": "pnpm vite --mode admin",
-    "dev:merchant": "pnpm vite --mode merchant",
+    "dev:admin": "pnpm vite --mode admin --port=3000",
+    "dev:merchant": "pnpm vite --mode merchant --port=3300",
     "preinstall": "npx only-allow pnpm",
     "postinstall": "turbo run stub",
     "lint": "turbo run lint",
diff --git a/src/views/daxpay/admin/merchant/info/MerchantEdit.vue b/src/views/daxpay/admin/merchant/info/MerchantEdit.vue
index c44ef30e8..c1bd2d095 100644
--- a/src/views/daxpay/admin/merchant/info/MerchantEdit.vue
+++ b/src/views/daxpay/admin/merchant/info/MerchantEdit.vue
@@ -62,11 +62,12 @@
             placeholder="请输入法人名称"
           />
         </a-form-item>
-        <a-form-item label="证件号" name="idNo">
-          <a-input v-model:value="form.idNo" :disabled="showable" placeholder="请输入证件号" />
-        </a-form-item>
-        <a-form-item label="联系方式" name="contact">
-          <a-input v-model:value="form.contact" :disabled="showable" placeholder="请输入联系方式" />
+        <a-form-item label="法人联系方式" name="contact">
+          <a-input
+            v-model:value="form.contact"
+            :disabled="showable"
+            placeholder="请输入法人联系方式"
+          />
         </a-form-item>
 
         <a-form-item label="法人证件号码" name="idNo">
diff --git a/src/views/daxpay/merchant/info/MerchantInfo.api.ts b/src/views/daxpay/merchant/info/MerchantInfo.api.ts
index 8f6edb748..3d573e5ad 100644
--- a/src/views/daxpay/merchant/info/MerchantInfo.api.ts
+++ b/src/views/daxpay/merchant/info/MerchantInfo.api.ts
@@ -10,3 +10,10 @@ export const get = () => {
     url: '/merchant/get',
   })
 }
+
+export const update = (data: Merchant) => {
+  return defHttp.post<Result<Merchant>>({
+    url: '/merchant/update',
+    data,
+  })
+}
diff --git a/src/views/daxpay/merchant/info/MerchantInfo.vue b/src/views/daxpay/merchant/info/MerchantInfo.vue
index 3ae88d9d7..71df8bbb7 100644
--- a/src/views/daxpay/merchant/info/MerchantInfo.vue
+++ b/src/views/daxpay/merchant/info/MerchantInfo.vue
@@ -1,5 +1,156 @@
-<script setup lang="ts"></script>
+<template>
+  <div>
+    <div class="m-3 p-3 bg-white">
+      <a-spin :spinning="loading">
+        <a-form
+          ref="formRef"
+          :validate-trigger="['blur', 'change']"
+          :label-col="{ span: 12 }"
+          :model="form"
+          :rules="rules"
+        >
+          <a-row>
+            <a-col :span="20">
+              <a-form-item class="w-800px" label="商户名称" name="mchName">
+                <a-tag>{{ form.mchName }}</a-tag>
+              </a-form-item>
+            </a-col>
+            <a-col :span="20">
+              <a-form-item class="w-800px" label="商户号" name="mchNo">
+                <a-tag>{{ form.mchNo }}</a-tag>
+              </a-form-item>
+            </a-col>
+            <a-col :span="20">
+              <a-form-item class="w-800px" label="公司名称" name="companyName">
+                <a-input
+                  placeholder="请输入公司名称"
+                  v-model:value="form.companyName"
+                  :disabled="!edit"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :span="20">
+              <a-form-item class="w-800px" label="公司联系方式" name="companyContact">
+                <a-input
+                  placeholder="请输入公司联系方式"
+                  v-model:value="form.companyContact"
+                  :disabled="!edit"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :span="20">
+              <a-form-item class="w-800px" label="公司信用编码" name="companyCode">
+                <a-input
+                  placeholder="请输入公司信用编码"
+                  v-model:value="form.companyCode"
+                  :disabled="!edit"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :span="20">
+              <a-form-item class="w-800px" label="公司地址" name="companyAddress">
+                <a-textarea
+                  placeholder="请输入公司地址"
+                  v-model:value="form.companyAddress"
+                  :disabled="!edit"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :span="20">
+              <a-form-item class="w-800px" label="法人名称" name="legalPerson">
+                <a-input
+                  placeholder="请输入法人名称"
+                  v-model:value="form.legalPerson"
+                  :disabled="!edit"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :span="20">
+              <a-form-item class="w-800px" label="法人证件号码" name="idNo">
+                <a-input
+                  placeholder="请输入法人证件号码"
+                  v-model:value="form.idNo"
+                  :disabled="!edit"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :span="20">
+              <a-form-item class="w-800px" label="法人联系方式" name="contact">
+                <a-input
+                  placeholder="请输入法人联系方式"
+                  v-model:value="form.contact"
+                  :disabled="!edit"
+                />
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row>
+            <a-col :push="8">
+              <a-button v-if="edit" @click="initData">取消</a-button>
+              <a-button v-if="edit" style="margin-left: 50px" type="primary" @click="updateInfo"
+                >更新</a-button
+              >
+              <a-button v-if="!edit" @click="edit = true">编辑信息</a-button>
+            </a-col>
+          </a-row>
+        </a-form>
+      </a-spin>
+    </div>
+  </div>
+</template>
 
-<template></template>
+<script setup lang="ts">
+  import { FormInstance, Rule } from 'ant-design-vue/lib/form'
+  import { onMounted, reactive, ref } from 'vue'
+  import { Merchant } from '@/views/daxpay/admin/merchant/info/Merchant.api'
+  import { get, update } from './MerchantInfo.api'
+  import { useMessage } from '@/hooks/web/useMessage'
+
+  const { createConfirm, createMessage } = useMessage()
+
+  let form = ref<Merchant>({})
+  let loading = ref(false)
+  const formRef = ref<FormInstance>()
+  let edit = ref(false)
+
+  // 校验
+  const rules = reactive({
+    mchName: [{ required: true, message: '请输入商户名称' }],
+    companyName: [{ required: true, message: '请输入公司名称' }],
+  } as Record<string, Rule[]>)
+
+  onMounted(() => initData())
+
+  /**
+   * 初始化数据
+   */
+  function initData() {
+    edit.value = false
+    loading.value = true
+    get().then(({ data }) => {
+      form.value = data
+      loading.value = false
+    })
+  }
+
+  /**
+   * 更新信息
+   */
+  function updateInfo() {
+    formRef.value?.validate().then(() => {
+      createConfirm({
+        iconType: 'warning',
+        title: '警告',
+        content: '是否更新商户信息',
+        onOk: () => {
+          update(form.value).then(() => {
+            createMessage.success('更新成功')
+            initData()
+          })
+        },
+      })
+    })
+  }
+</script>
 
 <style scoped lang="less"></style>