diff --git a/package.json b/package.json
index d843b6d..52b2eb3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "vue-admin",
 	"private": true,
-	"version": "1.2.34",
+	"version": "1.2.36",
 	"type": "module",
 	"scripts": {
 		"dev": "vite",
diff --git a/src/api/shop.js b/src/api/shop.js
index c16a86d..1d859c5 100644
--- a/src/api/shop.js
+++ b/src/api/shop.js
@@ -223,4 +223,28 @@ export function manualMerchantIncom(params) {
         url: `/merchantChannel/manualMerchantIncom`,
         params
     })
-}
\ No newline at end of file
+}
+
+/**
+ * 营业执照信息
+ * @returns
+ */
+export function merchLicense(userId) {
+    return request({
+        method: 'get',
+        url: `/merchantInfo/detail/merchLicense/${userId}`
+    })
+}
+
+/**
+ * 更改营业执照信息
+ * @param {*} data 
+ * @returns 
+ */
+export function updatemerchLicense(data) {
+    return request({
+        method: 'post',
+        url: '/merchantInfo/detail/updatemerchLicense',
+        data
+    })
+}
diff --git a/src/views/organization/components/businessLicense.vue b/src/views/organization/components/businessLicense.vue
new file mode 100644
index 0000000..5fe984a
--- /dev/null
+++ b/src/views/organization/components/businessLicense.vue
@@ -0,0 +1,154 @@
+<!-- 营业执照信息 -->
+<template>
+    <el-form ref="formRef" :model="form" label-width="120" label-position="left">
+        <el-row :gutter="gutter">
+            <el-col :span="span">
+                <el-form-item label="法人姓名">
+                    <el-input v-model="form.license.principalperson" placeholder="请输入法人姓名" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="span">
+                <el-form-item label="法人身份证号">
+                    <el-input v-model="form.idCard.certno" placeholder="请输入法人身份证号" />
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <el-row :gutter="gutter">
+            <el-col :span="span">
+                <el-form-item label="身份证发放日期">
+                    <el-date-picker style="width: 100%;" value-format="YYYYMMDD" v-model="form.idCard.certstarttime"
+                        type="date" placeholder="请选择身份证发放日期" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="span">
+                <el-form-item label="身份证截止日期">
+                    <el-date-picker style="width: 100%;" value-format="YYYYMMDD" v-model="form.idCard.certendtime"
+                        type="date" placeholder="请选择身份证截止日期" />
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <el-row :gutter="gutter">
+            <el-col :span="span">
+                <el-form-item label="执照名称">
+                    <el-input v-model="form.license.bussauthname" placeholder="请输入执照名称" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="span">
+                <el-form-item label="工商注册号">
+                    <el-input v-model="form.license.bussauthnum" placeholder="请输入工商注册号" />
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <el-row :gutter="gutter">
+            <el-col :span="span">
+                <el-form-item label="开始时间">
+                    <el-date-picker style="width: 100%;" value-format="YYYY年MM月DD日" v-model="form.license.bussauthstarttime"
+                        type="date" placeholder="营业执照开始时间" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="span">
+                <el-form-item label="结束时间">
+                    <el-date-picker style="width: 100%;" value-format="YYYY年MM月DD日" v-model="form.license.bussauthendtime"
+                        type="date" placeholder="营业执照失效时间" />
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <el-row :gutter="gutter">
+            <el-col :span="span">
+                <el-form-item label="注册地址">
+                    <el-input type="textarea" :autosize="{ minRows: 4 }" v-model="form.license.bussauthaddress"
+                        placeholder="请输入执照注册地址" />
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <el-row :gutter="gutter">
+            <el-col :span="span">
+                <el-form-item label="营业执照照片">
+                    <upload-card ref="uploadRef1" @selectFile="file => form.license.licenseimage = file"
+                        @removeFile="form.license.licenseimage = ''" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="span">
+                <el-form-item label="法人身份证正面">
+                    <upload-card ref="uploadRef2" @selectFile="file => form.idCard.imgpositive = file"
+                        @removeFile="form.idCard.imgpositive = ''" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="span">
+                <el-form-item label="法人身份证反面">
+                    <upload-card ref="uploadRef3" @selectFile="file => form.idCard.imgnegative = file"
+                        @removeFile="form.idCard.imgnegative = ''" />
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <el-form-item>
+            <el-button type="primary" :loading="loading" @click="submitHandel">立即提交</el-button>
+        </el-form-item>
+    </el-form>
+</template>
+
+<script setup>
+import { merchLicense, updatemerchLicense } from '@/api/shop.js'
+
+import uploadCard from './uploadCard.vue'
+import { ElMessage } from 'element-plus'
+
+import { useRoute } from 'vue-router'
+const route = useRoute()
+
+const span = ref(8)
+const gutter = ref(50)
+
+const uploadRef1 = ref(null)
+const uploadRef2 = ref(null)
+const uploadRef3 = ref(null)
+
+const loading = ref(false)
+
+const formRef = ref(null)
+const form = reactive({
+    license: {},
+    idCard: {}
+})
+
+// 立即提交
+async function submitHandel() {
+    try {
+        loading.value = true
+        if (form.license.licenseimage.uid) {
+            form.license.licenseimage = await uploadOSS(form.license.licenseimage.raw)
+        }
+        if (form.idCard.imgpositive.uid) {
+            form.idCard.imgpositive = await uploadOSS(form.idCard.imgpositive.raw)
+        }
+        if (form.idCard.imgnegative.uid) {
+            form.idCard.imgnegative = await uploadOSS(form.idCard.imgnegative.raw)
+        }
+        await updatemerchLicense(form)
+        ElMessage.success('修改成功')
+        loading.value = false
+    } catch (error) {
+        loading.value = false
+        console.log('更改营业执照信息===', error)
+    }
+}
+
+// 营业执照信息
+async function merchLicenseAjax() {
+    try {
+        const res = await merchLicense(route.query.id)
+        form.license = res.license
+        form.idCard = res.idCard
+        uploadRef1.value.pselectFile({ url: form.license.licenseimage })
+        uploadRef2.value.pselectFile({ url: form.idCard.imgpositive })
+        uploadRef3.value.pselectFile({ url: form.idCard.imgnegative })
+    } catch (error) {
+        console.error('营业执照信息===', error)
+    }
+}
+
+onMounted(() => {
+    merchLicenseAjax()
+})
+
+</script>
\ No newline at end of file
diff --git a/src/views/organization/components/settleInfo.vue b/src/views/organization/components/settleInfo.vue
index 9f7584e..b45a7ad 100644
--- a/src/views/organization/components/settleInfo.vue
+++ b/src/views/organization/components/settleInfo.vue
@@ -40,7 +40,7 @@
                     <el-input v-model="d1Form.idcard.certno" placeholder="请输入身份证号码" style="width: 80%;" />
                 </el-form-item>
                 <el-form-item label="发放日期">
-                    <el-date-picker style="width: 80%;" value-format="YYYYMMDD" v-model="d1Form.idcard.createtime" type="date"
+                    <el-date-picker style="width: 80%;" value-format="YYYYMMDD" v-model="d1Form.idcard.certstarttime" type="date"
                         placeholder="请选择发放日期" />
                 </el-form-item>
                 <el-form-item label="失效日期">
@@ -103,7 +103,7 @@
                     <el-input v-model="d0Form.idcard.certno" placeholder="请输入身份证号码" style="width: 80%;" />
                 </el-form-item>
                 <el-form-item label="发放日期">
-                    <el-date-picker style="width: 80%;" value-format="YYYYMMDD" v-model="d0Form.idcard.createtime" type="date"
+                    <el-date-picker style="width: 80%;" value-format="YYYYMMDD" v-model="d0Form.idcard.certstarttime" type="date"
                         placeholder="请选择发放日期" />
                 </el-form-item>
                 <el-form-item label="失效日期">
diff --git a/src/views/organization/shop_detail.vue b/src/views/organization/shop_detail.vue
index fb532d0..3e1cf50 100644
--- a/src/views/organization/shop_detail.vue
+++ b/src/views/organization/shop_detail.vue
@@ -9,10 +9,6 @@
         </div>
         <div class="container mt15">
             <div class="compont_wrap">
-                <!-- <authentication v-if="type == 1" />
-                <shopInfo v-if="type == 2" />
-                <settleInfo v-if="type == 3" />
-                <aisleInfo v-if="type == 4" /> -->
                 <component :is="componentList[type]" />
             </div>
             <div class="shop_info">
@@ -68,12 +64,13 @@
 </template>
 
 <script setup>
-import { connectInfo, merchBaseInfo, merchantInfoDetail, merchBaseAccount, messageChannel, userIpPage } from '@/api/shop.js'
+import { connectInfo, merchBaseInfo, merchantInfoDetail, merchBaseAccount, messageChannel, userIpPage, merchLicense } from '@/api/shop.js'
 
 import authentication from './components/authentication.vue'
 import shopInfo from './components/shopInfo.vue'
 import settleInfo from './components/settleInfo.vue'
 import aisleInfo from './components/aisleInfo.vue'
+import businessLicense from './components/businessLicense.vue'
 
 import { useRoute } from 'vue-router'
 import { reactive } from 'vue'
@@ -87,29 +84,13 @@ const type = ref(1)
 const componentList = {
     1: authentication,
     2: shopInfo,
-    3: settleInfo,
-    4: aisleInfo
+    3: businessLicense,
+    4: settleInfo,
+    5: aisleInfo
 }
 
 const navs = reactive([])
 
-// {
-//     type: 1,
-//     label: '实名认证信息'
-// },
-// {
-//     type: 2,
-//     label: '商户基本信息'
-// },
-// {
-//     type: 3,
-//     label: '结算信息'
-// },
-// {
-//     type: 4,
-//     label: '通道进件信息'
-// }
-
 // 表格参数
 const tableOptions = reactive({
     loading: true,
@@ -185,6 +166,23 @@ async function merchBaseInfoAjax() {
     }
 }
 
+// 营业执照信息
+async function merchLicenseAjax() {
+    try {
+        const res = await merchLicense(route.query.id)
+        if (res.license.id) {
+            navs.push(
+                {
+                    type: 3,
+                    label: '营业执照信息'
+                }
+            )
+        }
+    } catch (error) {
+        console.log('商户基本信息===', error)
+    }
+}
+
 // 结算信息
 async function merchBaseAccountAjax() {
     try {
@@ -192,7 +190,7 @@ async function merchBaseAccountAjax() {
         if (res.D0.bankCard) {
             navs.push(
                 {
-                    type: 3,
+                    type: 4,
                     label: '结算信息'
                 }
             )
@@ -209,7 +207,7 @@ async function messageChannelAjax() {
         if (res.merchantChannelMessage.length) {
             navs.push(
                 {
-                    type: 4,
+                    type: 5,
                     label: '通道进件信息'
                 }
             )
@@ -225,6 +223,7 @@ onMounted(async () => {
     userIpPageAjax()
     await merchantInfoDetailAjax()
     await merchBaseInfoAjax()
+    await merchLicenseAjax()
     await merchBaseAccountAjax()
     await messageChannelAjax()
     type.value = navs[0].type