diff --git a/src/api/mall/convenienceMenusManageApi.js b/src/api/mall/convenienceMenusManageApi.js
new file mode 100644
index 0000000..7b14579
--- /dev/null
+++ b/src/api/mall/convenienceMenusManageApi.js
@@ -0,0 +1,87 @@
+import request from '@/utils/request'
+
+// 获取便民服务菜单列表
+export function getConvenienceMenusList(params) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/convenienceMenus/queryConvenienceMenus',
+      method: 'get',
+      params
+    }).then(response => {
+      const res = response.data
+      if (res.code == 0) {
+        resolve({
+          data: res.data,
+          total: res.total
+        })
+      } else {
+        reject(new Error(res.msg || '获取便民服务菜单列表失败'))
+      }
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+// 添加便民服务菜单
+export function addConvenienceMenus(data) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/convenienceMenus/saveConvenienceMenus',
+      method: 'post',
+      data
+    }).then(response => {
+      const res = response.data
+      if (res.code == 0) {
+        resolve(res)
+      } else {
+        reject(new Error(res.msg || '添加便民服务菜单失败'))
+      }
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+// 删除便民服务菜单
+export function deleteConvenienceMenus(data) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/convenienceMenus/deleteConvenienceMenus',
+      method: 'post',
+      data
+    }).then(response => {
+      const res = response.data
+      if (res.code == 0) {
+        resolve(res)
+      } else {
+        reject(new Error(res.msg || '删除便民服务菜单失败'))
+      }
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+// 上传文件
+export function uploadFile(data) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/uploadFile',
+      method: 'post',
+      data,
+      headers: {
+        'Content-Type': 'multipart/form-data'
+      }
+    }).then(response => {
+      const res = response.data
+      if (res.code == 0) {
+        resolve(res)
+      } else {
+        reject(new Error(res.msg || '上传文件失败'))
+      }
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
\ No newline at end of file
diff --git a/src/api/mall/storeInfoManageApi.js b/src/api/mall/storeInfoManageApi.js
new file mode 100644
index 0000000..8d789fb
--- /dev/null
+++ b/src/api/mall/storeInfoManageApi.js
@@ -0,0 +1,130 @@
+import request from '@/utils/request'
+
+// 查询商户信息列表
+export function queryStoreInfo(params) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/storeInfo/queryStoreInfo',
+      method: 'get',
+      params
+    }).then(response => {
+      const res = response.data
+      if (res.code === 0) {
+        resolve({
+          data: res.data,
+          total: res.total
+        })
+      } else {
+        reject(new Error(res.msg || 'Failed to query store info'))
+      }
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+// 查询便民菜单列表
+export function queryConvenienceMenus(params) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/convenienceMenus/queryConvenienceMenus',
+      method: 'get',
+      params
+    }).then(response => {
+      const res = response.data
+      if (res.code === 0) {
+        resolve({
+          data: res.data,
+          total: res.total
+        })
+      } else {
+        reject(new Error(res.msg || 'Failed to query convenience menus'))
+      }
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+// 保存商户信息
+export function saveStoreInfo(data) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/storeInfo/saveStoreInfo',
+      method: 'post',
+      data
+    }).then(response => {
+      const res = response.data
+      if (res.code === 0) {
+        resolve(res)
+      } else {
+        reject(new Error(res.msg || 'Failed to save store info'))
+      }
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+// 更新商户信息
+export function updateStoreInfo(data) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/storeInfo/updateStoreInfo',
+      method: 'post',
+      data
+    }).then(response => {
+      const res = response.data
+      if (res.code === 0) {
+        resolve(res)
+      } else {
+        reject(new Error(res.msg || 'Failed to update store info'))
+      }
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+// 删除商户信息
+export function deleteStoreInfo(data) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/storeInfo/deleteStoreInfo',
+      method: 'post',
+      data
+    }).then(response => {
+      const res = response.data
+      if (res.code === 0) {
+        resolve(res)
+      } else {
+        reject(new Error(res.msg || 'Failed to delete store info'))
+      }
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+// 上传文件
+export function uploadFile(data) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/uploadFile',
+      method: 'post',
+      data,
+      headers: {
+        'Content-Type': 'multipart/form-data'
+      }
+    }).then(response => {
+      const res = response.data
+      if (res.code === 0) {
+        resolve(res)
+      } else {
+        reject(new Error(res.msg || 'Failed to upload file'))
+      }
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
\ No newline at end of file
diff --git a/src/components/mall/AddConvenienceMenus.vue b/src/components/mall/AddConvenienceMenus.vue
new file mode 100644
index 0000000..e2e8d5a
--- /dev/null
+++ b/src/components/mall/AddConvenienceMenus.vue
@@ -0,0 +1,91 @@
+<template>
+  <el-dialog :title="$t('convenienceMenus.addTitle')" :visible.sync="visible" width="50%" @close="handleClose">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form-item :label="$t('convenienceMenus.menuName')" prop="name">
+        <el-input v-model="form.name" :placeholder="$t('convenienceMenus.menuNamePlaceholder')" />
+      </el-form-item>
+      <el-form-item :label="$t('convenienceMenus.imageUrl')" prop="icon">
+        <upload-image-url ref="uploadImage" @uploadCoverImage="handleImageChange" />
+      </el-form-item>
+      <el-form-item :label="$t('convenienceMenus.pagePath')" prop="url">
+        <el-input v-model="form.url" :placeholder="$t('convenienceMenus.pagePathPlaceholder')" />
+      </el-form-item>
+      <el-form-item :label="$t('convenienceMenus.displayOrder')" prop="seq">
+        <el-input-number v-model="form.seq" :min="1" />
+      </el-form-item>
+      <el-form-item :label="$t('convenienceMenus.remark')" prop="remark">
+        <el-input v-model="form.remark" type="textarea" :rows="3" />
+      </el-form-item>
+    </el-form>
+
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">{{ $t('common.cancel') }}</el-button>
+      <el-button type="primary" @click="handleSubmit">{{ $t('common.confirm') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { addConvenienceMenus } from '@/api/mall/convenienceMenusManageApi'
+import UploadImageUrl from '@/components/upload/UploadImageUrl'
+
+export default {
+  name: 'AddConvenienceMenus',
+  components: {
+    UploadImageUrl
+  },
+  data() {
+    return {
+      visible: false,
+      form: {
+        name: '',
+        icon: '',
+        url: '',
+        seq: 1,
+        remark: ''
+      },
+      rules: {
+        name: [
+          { required: true, message: this.$t('convenienceMenus.menuNameRequired'), trigger: 'blur' },
+          { max: 50, message: this.$t('convenienceMenus.menuNameMaxLength'), trigger: 'blur' }
+        ],
+        url: [
+          { max: 100, message: this.$t('convenienceMenus.pagePathMaxLength'), trigger: 'blur' }
+        ],
+        seq: [
+          { required: true, message: this.$t('convenienceMenus.displayOrderRequired'), trigger: 'blur' }
+        ],
+        remark: [
+          { max: 200, message: this.$t('convenienceMenus.remarkMaxLength'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    open() {
+      this.visible = true
+    },
+    handleClose() {
+      this.$refs.form.resetFields()
+      this.$refs.uploadImage.clear()
+    },
+    handleImageChange(url) {
+      this.form.icon = url
+    },
+    async handleSubmit() {
+      this.$refs.form.validate(async valid => {
+        if (valid) {
+          try {
+            await addConvenienceMenus(this.form)
+            this.$message.success(this.$t('common.addSuccess'))
+            this.visible = false
+            this.$emit('success')
+          } catch (error) {
+            this.$message.error(error.message)
+          }
+        }
+      })
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/mall/AddStoreInfo.vue b/src/components/mall/AddStoreInfo.vue
new file mode 100644
index 0000000..c654375
--- /dev/null
+++ b/src/components/mall/AddStoreInfo.vue
@@ -0,0 +1,211 @@
+<template>
+  <el-dialog
+    :title="$t('storeInfoManage.common.add')"
+    :visible.sync="visible"
+    width="50%"
+    @close="handleClose"
+  >
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form-item
+        :label="$t('storeInfoManage.table.storeName')"
+        prop="name"
+      >
+        <el-input
+          v-model="form.name"
+          :placeholder="$t('storeInfoManage.search.storeName')"
+        />
+      </el-form-item>
+      <el-form-item
+        :label="$t('storeInfoManage.table.convenienceType')"
+        prop="convenienceMenusId"
+      >
+        <el-select
+          v-model="form.convenienceMenusId"
+          :placeholder="$t('storeInfoManage.search.convenienceType')"
+          style="width: 100%"
+        >
+          <el-option
+            v-for="item in menuInfos"
+            :key="item.convenienceMenusId"
+            :label="item.name"
+            :value="item.convenienceMenusId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        :label="$t('storeInfoManage.table.isShow')"
+        prop="isShow"
+      >
+        <el-select
+          v-model="form.isShow"
+          :placeholder="$t('storeInfoManage.search.isShow')"
+          style="width: 100%"
+        >
+          <el-option
+            :label="$t('storeInfoManage.common.yes')"
+            value="Y"
+          />
+          <el-option
+            :label="$t('storeInfoManage.common.no')"
+            value="N"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        :label="$t('storeInfoManage.table.icon')"
+        prop="icon"
+      >
+        <upload-image
+          ref="uploadImage"
+          :image-count="1"
+          @change="handleImageChange"
+        />
+      </el-form-item>
+      <el-form-item
+        :label="$t('storeInfoManage.table.tel')"
+        prop="tel"
+      >
+        <el-input
+          v-model="form.tel"
+          :placeholder="$t('storeInfoManage.search.storeName')"
+        />
+      </el-form-item>
+      <el-form-item
+        :label="$t('storeInfoManage.table.site')"
+        prop="site"
+      >
+        <el-input
+          v-model="form.site"
+          :placeholder="$t('storeInfoManage.search.storeName')"
+        />
+      </el-form-item>
+      <el-form-item
+        :label="$t('storeInfoManage.table.seq')"
+        prop="seq"
+      >
+        <el-input
+          v-model="form.seq"
+          :placeholder="$t('storeInfoManage.search.storeName')"
+        />
+      </el-form-item>
+      <el-form-item
+        :label="$t('storeInfoManage.table.workTime')"
+        prop="workTime"
+      >
+        <el-input
+          v-model="form.workTime"
+          :placeholder="$t('storeInfoManage.search.storeName')"
+        />
+      </el-form-item>
+      <el-form-item
+        :label="$t('storeInfoManage.table.remark')"
+        prop="remark"
+      >
+        <el-input
+          v-model="form.remark"
+          type="textarea"
+          :rows="4"
+          :placeholder="$t('storeInfoManage.search.storeName')"
+        />
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="handleClose">
+        {{ $t('storeInfoManage.common.cancel') }}
+      </el-button>
+      <el-button type="primary" @click="handleSubmit">
+        {{ $t('storeInfoManage.common.save') }}
+      </el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { saveStoreInfo } from '@/api/mall/storeInfoManageApi'
+import UploadImage from '@/components/mall/UploadImage'
+
+export default {
+  name: 'AddStoreInfo',
+  components: {
+    UploadImage
+  },
+  props: {
+    menuInfos: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      form: {
+        name: '',
+        convenienceMenusId: '',
+        isShow: '',
+        icon: '',
+        tel: '',
+        site: '',
+        seq: '',
+        workTime: '',
+        remark: ''
+      },
+      rules: {
+        name: [
+          { required: true, message: this.$t('storeInfoManage.search.storeName'), trigger: 'blur' },
+          { max: 50, message: this.$t('storeInfoManage.error.maxLength50'), trigger: 'blur' }
+        ],
+        tel: [
+          { max: 13, message: this.$t('storeInfoManage.error.maxLength13'), trigger: 'blur' }
+        ],
+        site: [
+          { max: 100, message: this.$t('storeInfoManage.error.maxLength100'), trigger: 'blur' }
+        ],
+        seq: [
+          { required: true, message: this.$t('storeInfoManage.error.required'), trigger: 'blur' },
+          { type: 'number', message: this.$t('storeInfoManage.error.number'), trigger: 'blur' }
+        ],
+        workTime: [
+          { max: 200, message: this.$t('storeInfoManage.error.maxLength200'), trigger: 'blur' }
+        ],
+        remark: [
+          { max: 5000, message: this.$t('storeInfoManage.error.maxLength5000'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    open() {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs.form && this.$refs.form.resetFields()
+        this.$refs.uploadImage && this.$refs.uploadImage.clear()
+      })
+    },
+    handleClose() {
+      this.visible = false
+      this.$emit('close')
+    },
+    handleImageChange(images) {
+      this.form.icon = images.length > 0 ? images[0] : ''
+    },
+    async handleSubmit() {
+      try {
+        await this.$refs.form.validate()
+        const formData = { ...this.form }
+        if (formData.seq) {
+          formData.seq = Number(formData.seq)
+        }
+        
+        await saveStoreInfo(formData)
+        this.$message.success(this.$t('storeInfoManage.common.saveSuccess'))
+        this.$emit('success')
+        this.handleClose()
+      } catch (error) {
+        if (error !== 'validate') {
+          this.$message.error(error.message || this.$t('storeInfoManage.error.saveFailed'))
+        }
+      }
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/mall/DeleteConvenienceMenus.vue b/src/components/mall/DeleteConvenienceMenus.vue
new file mode 100644
index 0000000..65a5ebf
--- /dev/null
+++ b/src/components/mall/DeleteConvenienceMenus.vue
@@ -0,0 +1,42 @@
+<template>
+  <el-dialog :title="$t('common.deleteConfirm')" :visible.sync="visible" width="30%" @close="handleClose">
+    <p>{{ $t('convenienceMenus.deleteConfirm') }}</p>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">{{ $t('common.cancel') }}</el-button>
+      <el-button type="primary" @click="handleConfirm">{{ $t('common.confirm') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { deleteConvenienceMenus } from '@/api/mall/convenienceMenusManageApi'
+
+export default {
+  name: 'DeleteConvenienceMenus',
+  data() {
+    return {
+      visible: false,
+      convenienceMenusId: ''
+    }
+  },
+  methods: {
+    open(row) {
+      this.convenienceMenusId = row.convenienceMenusId
+      this.visible = true
+    },
+    handleClose() {
+      this.convenienceMenusId = ''
+    },
+    async handleConfirm() {
+      try {
+        await deleteConvenienceMenus({ convenienceMenusId: this.convenienceMenusId })
+        this.$message.success(this.$t('common.deleteSuccess'))
+        this.visible = false
+        this.$emit('success')
+      } catch (error) {
+        this.$message.error(error.message)
+      }
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/mall/DeleteStoreInfo.vue b/src/components/mall/DeleteStoreInfo.vue
new file mode 100644
index 0000000..07fb95f
--- /dev/null
+++ b/src/components/mall/DeleteStoreInfo.vue
@@ -0,0 +1,53 @@
+<template>
+  <el-dialog
+    :title="$t('storeInfoManage.common.confirm')"
+    :visible.sync="visible"
+    width="30%"
+  >
+    <div>
+      {{ $t('storeInfoManage.delete.confirmDelete') }} {{ storeInfo.name }}?
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">
+        {{ $t('storeInfoManage.common.cancel') }}
+      </el-button>
+      <el-button type="primary" @click="handleConfirm">
+        {{ $t('storeInfoManage.common.confirm') }}
+      </el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { deleteStoreInfo } from '@/api/mall/storeInfoManageApi'
+
+export default {
+  name: 'DeleteStoreInfo',
+  props: {
+    storeInfo: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      visible: false
+    }
+  },
+  methods: {
+    open() {
+      this.visible = true
+    },
+    async handleConfirm() {
+      try {
+        await deleteStoreInfo({ storeInfoId: this.storeInfo.storeInfoId })
+        this.$message.success(this.$t('storeInfoManage.common.deleteSuccess'))
+        this.visible = false
+        this.$emit('success')
+      } catch (error) {
+        this.$message.error(error.message || this.$t('storeInfoManage.error.deleteFailed'))
+      }
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/mall/EditStoreInfo.vue b/src/components/mall/EditStoreInfo.vue
new file mode 100644
index 0000000..8096f7c
--- /dev/null
+++ b/src/components/mall/EditStoreInfo.vue
@@ -0,0 +1,226 @@
+<template>
+  <el-dialog
+    :title="$t('storeInfoManage.common.edit')"
+    :visible.sync="visible"
+    width="50%"
+    @close="handleClose"
+  >
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form-item
+        :label="$t('storeInfoManage.table.storeName')"
+        prop="name"
+      >
+        <el-input
+          v-model="form.name"
+          :placeholder="$t('storeInfoManage.search.storeName')"
+        />
+      </el-form-item>
+      <el-form-item
+        :label="$t('storeInfoManage.table.convenienceType')"
+        prop="convenienceMenusId"
+      >
+        <el-select
+          v-model="form.convenienceMenusId"
+          :placeholder="$t('storeInfoManage.search.convenienceType')"
+          style="width: 100%"
+        >
+          <el-option
+            v-for="item in menuInfos"
+            :key="item.convenienceMenusId"
+            :label="item.name"
+            :value="item.convenienceMenusId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        :label="$t('storeInfoManage.table.isShow')"
+        prop="isShow"
+      >
+        <el-select
+          v-model="form.isShow"
+          :placeholder="$t('storeInfoManage.search.isShow')"
+          style="width: 100%"
+        >
+          <el-option
+            :label="$t('storeInfoManage.common.yes')"
+            value="Y"
+          />
+          <el-option
+            :label="$t('storeInfoManage.common.no')"
+            value="N"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        :label="$t('storeInfoManage.table.icon')"
+        prop="icon"
+      >
+        <upload-image
+          ref="uploadImage"
+          :image-count="1"
+          :initial-images="[form.icon]"
+          @change="handleImageChange"
+        />
+      </el-form-item>
+      <el-form-item
+        :label="$t('storeInfoManage.table.tel')"
+        prop="tel"
+      >
+        <el-input
+          v-model="form.tel"
+          :placeholder="$t('storeInfoManage.search.storeName')"
+        />
+      </el-form-item>
+      <el-form-item
+        :label="$t('storeInfoManage.table.site')"
+        prop="site"
+      >
+        <el-input
+          v-model="form.site"
+          :placeholder="$t('storeInfoManage.search.storeName')"
+        />
+      </el-form-item>
+      <el-form-item
+        :label="$t('storeInfoManage.table.seq')"
+        prop="seq"
+      >
+        <el-input
+          v-model="form.seq"
+          :placeholder="$t('storeInfoManage.search.storeName')"
+        />
+      </el-form-item>
+      <el-form-item
+        :label="$t('storeInfoManage.table.workTime')"
+        prop="workTime"
+      >
+        <el-input
+          v-model="form.workTime"
+          :placeholder="$t('storeInfoManage.search.storeName')"
+        />
+      </el-form-item>
+      <el-form-item
+        :label="$t('storeInfoManage.table.remark')"
+        prop="remark"
+      >
+        <el-input
+          v-model="form.remark"
+          type="textarea"
+          :rows="4"
+          :placeholder="$t('storeInfoManage.search.storeName')"
+        />
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="handleClose">
+        {{ $t('storeInfoManage.common.cancel') }}
+      </el-button>
+      <el-button type="primary" @click="handleSubmit">
+        {{ $t('storeInfoManage.common.save') }}
+      </el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { updateStoreInfo } from '@/api/mall/storeInfoManageApi'
+import UploadImage from '@/components/mall/UploadImage'
+
+export default {
+  name: 'EditStoreInfo',
+  components: {
+    UploadImage
+  },
+  props: {
+    storeInfo: {
+      type: Object,
+      default: () => ({})
+    },
+    menuInfos: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      form: {
+        storeInfoId: '',
+        name: '',
+        convenienceMenusId: '',
+        isShow: '',
+        icon: '',
+        tel: '',
+        site: '',
+        seq: '',
+        workTime: '',
+        remark: ''
+      },
+      rules: {
+        name: [
+          { required: true, message: this.$t('storeInfoManage.search.storeName'), trigger: 'blur' },
+          { max: 50, message: this.$t('storeInfoManage.error.maxLength50'), trigger: 'blur' }
+        ],
+        tel: [
+          { max: 13, message: this.$t('storeInfoManage.error.maxLength13'), trigger: 'blur' }
+        ],
+        site: [
+          { max: 100, message: this.$t('storeInfoManage.error.maxLength100'), trigger: 'blur' }
+        ],
+        seq: [
+          { required: true, message: this.$t('storeInfoManage.error.required'), trigger: 'blur' },
+          { type: 'number', message: this.$t('storeInfoManage.error.number'), trigger: 'blur' }
+        ],
+        workTime: [
+          { max: 200, message: this.$t('storeInfoManage.error.maxLength200'), trigger: 'blur' }
+        ],
+        remark: [
+          { max: 5000, message: this.$t('storeInfoManage.error.maxLength5000'), trigger: 'blur' }
+        ],
+        storeInfoId: [
+          { required: true, message: this.$t('storeInfoManage.error.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  watch: {
+    storeInfo: {
+      immediate: true,
+      handler(val) {
+        if (val) {
+          this.form = { ...val }
+        }
+      }
+    }
+  },
+  methods: {
+    open() {
+      this.visible = true
+    },
+    handleClose() {
+      this.visible = false
+      this.$emit('close')
+    },
+    handleImageChange(images) {
+      this.form.icon = images.length > 0 ? images[0] : ''
+    },
+    async handleSubmit() {
+      try {
+        await this.$refs.form.validate()
+        const formData = { ...this.form }
+        if (formData.seq) {
+          formData.seq = Number(formData.seq)
+        }
+        
+        await updateStoreInfo(formData)
+        this.$message.success(this.$t('storeInfoManage.common.updateSuccess'))
+        this.$emit('success')
+        this.handleClose()
+      } catch (error) {
+        if (error !== 'validate') {
+          this.$message.error(error.message || this.$t('storeInfoManage.error.updateFailed'))
+        }
+      }
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/mall/UploadImage.vue b/src/components/mall/UploadImage.vue
new file mode 100644
index 0000000..4276ab6
--- /dev/null
+++ b/src/components/mall/UploadImage.vue
@@ -0,0 +1,121 @@
+<template>
+  <div class="upload-image-container">
+    <div v-for="(image, index) in images" :key="index" class="image-item">
+      <el-image
+        :src="image"
+        fit="cover"
+        style="width: 100px; height: 100px;"
+        :preview-src-list="[image]"
+      ></el-image>
+      <i class="el-icon-delete" @click="removeImage(index)"></i>
+    </div>
+    <el-upload
+      v-if="images.length < maxCount"
+      action=""
+      :show-file-list="false"
+      :before-upload="beforeUpload"
+      :http-request="handleUpload"
+    >
+      <div class="upload-btn">
+        <i class="el-icon-plus"></i>
+      </div>
+    </el-upload>
+  </div>
+</template>
+
+<script>
+import { uploadFile } from '@/api/mall/convenienceMenusManageApi'
+
+export default {
+  name: 'UploadImage',
+  props: {
+    maxCount: {
+      type: Number,
+      default: 1
+    }
+  },
+  data() {
+    return {
+      images: []
+    }
+  },
+  methods: {
+    beforeUpload(file) {
+      const isImage = file.type.includes('image/')
+      const isLt2M = file.size / 1024 / 1024 < 2
+
+      if (!isImage) {
+        this.$message.error(this.$t('upload.imageTypeError'))
+      }
+      if (!isLt2M) {
+        this.$message.error(this.$t('upload.imageSizeError'))
+      }
+      return isImage && isLt2M
+    },
+    async handleUpload({ file }) {
+      try {
+        const formData = new FormData()
+        formData.append('uploadFile', file)
+        const { url } = await uploadFile(formData)
+        this.images.push(url)
+        this.$emit('change', url)
+      } catch (error) {
+        this.$message.error(error.message)
+      }
+    },
+    removeImage(index) {
+      this.images.splice(index, 1)
+      this.$emit('change', this.images[0] || '')
+    },
+    clear() {
+      this.images = []
+      this.$emit('change', '')
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.upload-image-container {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+
+  .image-item {
+    position: relative;
+
+    .el-icon-delete {
+      position: absolute;
+      top: 5px;
+      right: 5px;
+      color: #f56c6c;
+      cursor: pointer;
+      font-size: 16px;
+      background: rgba(255, 255, 255, 0.7);
+      border-radius: 50%;
+      padding: 5px;
+    }
+  }
+
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    background-color: #fbfdff;
+
+    &:hover {
+      border-color: #409eff;
+    }
+
+    i {
+      font-size: 28px;
+      color: #8c939d;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/i18n/index.js b/src/i18n/index.js
index f455bfd..5219f5a 100644
--- a/src/i18n/index.js
+++ b/src/i18n/index.js
@@ -103,6 +103,8 @@ import { messages as marketRuleMessages } from '../views/market/marketRuleLang'
 import { messages as marketBlacklistManageMessages } from '../views/market/marketBlacklistManageLang'
 import { messages as marketLogMessages } from '../views/market/marketLogLang'
 import { messages as advertManageMessages } from '../views/admin/advertManageLang'
+import { messages as convenienceMenusManageMessages } from '../views/mall/convenienceMenusManageLang'
+import { messages as storeInfoManageMessages } from '../views/mall/storeInfoManageLang'
 
 Vue.use(VueI18n)
 
@@ -210,6 +212,8 @@ const messages = {
     ...marketBlacklistManageMessages.en,
     ...marketLogMessages.en,
     ...advertManageMessages.en,
+    ...convenienceMenusManageMessages.en,
+    ...storeInfoManageMessages.en,
   },
   zh: {
     ...loginMessages.zh,
@@ -313,6 +317,8 @@ const messages = {
     ...marketBlacklistManageMessages.zh,
     ...marketLogMessages.zh,
     ...advertManageMessages.zh,
+    ...convenienceMenusManageMessages.zh,
+    ...storeInfoManageMessages.zh,
   }
 }
 
diff --git a/src/router/index.js b/src/router/index.js
index 15aaa70..a4b052d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -501,6 +501,16 @@ const routes = [
         name: '/pages/property/advertManage',
         component: () => import('@/views/admin/advertManageList.vue')
       },
+      {
+        path:'/pages/admin/convenienceMenusManage',
+        name:'/pages/admin/convenienceMenusManage',
+        component: () => import('@/views/mall/convenienceMenusManageList.vue')
+        },
+        {
+          path:'/pages/admin/storeInfoManage',
+          name:'/pages/admin/storeInfoManage',
+          component: () => import('@/views/mall/storeInfoManageList.vue')
+          },
       // 其他子路由可以在这里添加
     ]
   },
diff --git a/src/views/mall/convenienceMenusManageLang.js b/src/views/mall/convenienceMenusManageLang.js
new file mode 100644
index 0000000..694679f
--- /dev/null
+++ b/src/views/mall/convenienceMenusManageLang.js
@@ -0,0 +1,32 @@
+export const messages = {
+  en: {
+    convenienceMenus: {
+      title: 'Convenience Services',
+      assetId: 'Asset ID',
+      menuName: 'Menu Name',
+      imageUrl: 'Image URL',
+      pagePath: 'Page Path',
+      displayOrder: 'Display Order',
+      remark: 'Remark',
+      fetchError: 'Failed to fetch convenience menus',
+      addTitle: 'Add Convenience Menu',
+      editTitle: 'Edit Convenience Menu',
+      deleteConfirm: 'Are you sure to delete this convenience menu?'
+    }
+  },
+  zh: {
+    convenienceMenus: {
+      title: '便民服务',
+      assetId: '资产ID',
+      menuName: '菜单名称',
+      imageUrl: '图片地址',
+      pagePath: '页面路径',
+      displayOrder: '显示序号',
+      remark: '备注',
+      fetchError: '获取便民服务菜单失败',
+      addTitle: '添加便民服务菜单',
+      editTitle: '修改便民服务菜单',
+      deleteConfirm: '确定删除便民服务菜单吗?'
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/views/mall/convenienceMenusManageList.vue b/src/views/mall/convenienceMenusManageList.vue
new file mode 100644
index 0000000..83f2566
--- /dev/null
+++ b/src/views/mall/convenienceMenusManageList.vue
@@ -0,0 +1,119 @@
+<template>
+  <div class="convenience-menus-container">
+    <el-card class="box-card">
+      <div slot="header" class="clearfix flex justify-between">
+        <span>{{ $t('convenienceMenus.title') }}</span>
+        <el-button type="primary" size="small" style="float: right" @click="openAddModal">
+          <i class="el-icon-plus"></i>
+          {{ $t('common.add') }}
+        </el-button>
+      </div>
+
+      <el-table :data="tableData" border style="width: 100%">
+        <el-table-column prop="convenienceMenusId" :label="$t('convenienceMenus.assetId')" align="center" />
+        <el-table-column prop="name" :label="$t('convenienceMenus.menuName')" align="center" />
+        <el-table-column :label="$t('convenienceMenus.imageUrl')" align="center">
+          <template slot-scope="scope">
+            <el-image style="width: 60px; height: 60px; border-radius: 5px;" :src="scope.row.icon"
+              :preview-src-list="[scope.row.icon]" fit="cover"></el-image>
+          </template>
+        </el-table-column>
+        <el-table-column prop="url" :label="$t('convenienceMenus.pagePath')" align="center" />
+        <el-table-column prop="seq" :label="$t('convenienceMenus.displayOrder')" align="center" />
+        <el-table-column prop="remark" :label="$t('convenienceMenus.remark')" align="center" />
+        <el-table-column :label="$t('common.operation')" align="center" width="200">
+          <template slot-scope="scope">
+            <el-button size="mini" type="danger" @click="openDeleteModal(scope.row)">
+              {{ $t('common.delete') }}
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-pagination :current-page="pagination.current" :page-sizes="[10, 20, 30, 50]" :page-size="pagination.size"
+        :total="pagination.total" layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange"
+        @current-change="handleCurrentChange" />
+    </el-card>
+
+    <add-convenience-menus ref="addModal" @success="fetchData" />
+    <delete-convenience-menus ref="deleteModal" @success="fetchData" />
+  </div>
+</template>
+
+<script>
+import { getConvenienceMenusList } from '@/api/mall/convenienceMenusManageApi'
+import AddConvenienceMenus from '@/components/mall/AddConvenienceMenus'
+import DeleteConvenienceMenus from '@/components/mall/DeleteConvenienceMenus'
+
+export default {
+  name: 'ConvenienceMenusManageList',
+  components: {
+    AddConvenienceMenus,
+    DeleteConvenienceMenus
+  },
+  data() {
+    return {
+      tableData: [],
+      pagination: {
+        current: 1,
+        size: 10,
+        total: 0
+      },
+      searchForm: {
+        name: ''
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    async fetchData() {
+      try {
+        const params = {
+          page: this.pagination.current,
+          row: this.pagination.size,
+          ...this.searchForm
+        }
+        const { data, total } = await getConvenienceMenusList(params)
+        this.tableData = data
+        this.pagination.total = total
+      } catch (error) {
+        this.$message.error(this.$t('convenienceMenus.fetchError'))
+      }
+    },
+    openAddModal() {
+      this.$refs.addModal.open()
+    },
+    openEditModal(row) {
+      this.$refs.editModal.open(row)
+    },
+    openDeleteModal(row) {
+      this.$refs.deleteModal.open(row)
+    },
+    handleSizeChange(val) {
+      this.pagination.size = val
+      this.fetchData()
+    },
+    handleCurrentChange(val) {
+      this.pagination.current = val
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.convenience-menus-container {
+  padding: 20px;
+
+  .box-card {
+    margin-bottom: 20px;
+  }
+
+  .el-pagination {
+    margin-top: 20px;
+    text-align: right;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/mall/storeInfoManageLang.js b/src/views/mall/storeInfoManageLang.js
new file mode 100644
index 0000000..0c9e015
--- /dev/null
+++ b/src/views/mall/storeInfoManageLang.js
@@ -0,0 +1,144 @@
+export const messages = {
+  en: {
+    storeInfoManage: {
+      search: {
+        title: 'Search Conditions',
+        storeName: 'Please enter store name',
+        convenienceType: 'Please select convenience type',
+        isShow: 'Please select whether to display'
+      },
+      list: {
+        title: 'Store Information'
+      },
+      table: {
+        storeInfoId: 'Store ID',
+        storeName: 'Store Name',
+        icon: 'Image URL',
+        tel: 'Store Phone',
+        site: 'Store Location',
+        seq: 'Display Sequence',
+        isShow: 'Is Show',
+        convenienceType: 'Convenience Type',
+        workTime: 'Work Time',
+        remark: 'Remark'
+      },
+      common: {
+        search: 'Search',
+        add: 'Add',
+        edit: 'Edit',
+        delete: 'Delete',
+        yes: 'Yes',
+        no: 'No',
+        operation: 'Operation',
+        cancel: 'Cancel',
+        save: 'Save',
+        confirm: 'Confirm',
+        saveSuccess: 'Save successfully',
+        updateSuccess: 'Update successfully',
+        deleteSuccess: 'Delete successfully',
+        required: 'Required',
+        optional: 'Optional'
+      },
+      delete: {
+        confirmDelete: 'Are you sure to delete store info'
+      },
+      error: {
+        fetchStoreInfoFailed: 'Failed to get store information',
+        fetchConvenienceMenusFailed: 'Failed to get convenience menus',
+        saveFailed: 'Failed to save store info',
+        updateFailed: 'Failed to update store info',
+        deleteFailed: 'Failed to delete store info',
+        uploadFailed: 'Failed to upload image',
+        uploadImageOnly: 'Only image files can be uploaded',
+        imageSizeLimit: 'Image size cannot exceed 2MB',
+        maxLength50: 'Cannot exceed 50 characters',
+        maxLength13: 'Cannot exceed 13 characters',
+        maxLength100: 'Cannot exceed 100 characters',
+        maxLength200: 'Cannot exceed 200 characters',
+        maxLength5000: 'Cannot exceed 5000 characters',
+        required: 'This field is required',
+        number: 'Please enter a valid number'
+      },
+      validation: {
+        storeNameRequired: 'Store name is required',
+        seqRequired: 'Display sequence is required',
+        seqNumber: 'Display sequence must be a number',
+        telMaxLength: 'Phone number cannot exceed 13 characters',
+        siteMaxLength: 'Location cannot exceed 100 characters',
+        workTimeMaxLength: 'Work time cannot exceed 200 characters',
+        remarkMaxLength: 'Remark cannot exceed 5000 characters'
+      }
+    }
+  },
+  zh: {
+    storeInfoManage: {
+      search: {
+        title: '查询条件',
+        storeName: '请输入商户名称',
+        convenienceType: '请选择便民种类',
+        isShow: '请选择是否显示'
+      },
+      list: {
+        title: '商户信息'
+      },
+      table: {
+        storeInfoId: '商户信息ID',
+        storeName: '商户名称',
+        icon: '图片地址',
+        tel: '商户电话',
+        site: '商户位置',
+        seq: '显示序号',
+        isShow: '是否显示',
+        convenienceType: '便民类型',
+        workTime: '工作时间',
+        remark: '备注'
+      },
+      common: {
+        search: '查询',
+        add: '添加',
+        edit: '修改',
+        delete: '删除',
+        yes: '是',
+        no: '否',
+        operation: '操作',
+        cancel: '取消',
+        save: '保存',
+        confirm: '确认',
+        saveSuccess: '保存成功',
+        updateSuccess: '更新成功',
+        deleteSuccess: '删除成功',
+        required: '必填',
+        optional: '选填'
+      },
+      delete: {
+        confirmDelete: '确定删除商户信息'
+      },
+      error: {
+        fetchStoreInfoFailed: '获取商户信息失败',
+        fetchConvenienceMenusFailed: '获取便民菜单失败',
+        saveFailed: '保存商户信息失败',
+        updateFailed: '更新商户信息失败',
+        deleteFailed: '删除商户信息失败',
+        uploadFailed: '上传图片失败',
+        uploadImageOnly: '只能上传图片文件',
+        imageSizeLimit: '图片大小不能超过2MB',
+        maxLength50: '不能超过50个字符',
+        maxLength13: '不能超过13个字符',
+        maxLength100: '不能超过100个字符',
+        maxLength200: '不能超过200个字符',
+        maxLength5000: '不能超过5000个字符',
+        required: '此字段为必填项',
+        number: '请输入有效的数字'
+      },
+      validation: {
+        storeNameRequired: '商户名称为必填项',
+        seqRequired: '显示序号为必填项',
+        seqNumber: '显示序号必须为数字',
+        telMaxLength: '电话号码不能超过13个字符',
+        siteMaxLength: '位置不能超过100个字符',
+        workTimeMaxLength: '工作时间不能超过200个字符',
+        remarkMaxLength: '备注不能超过5000个字符'
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/views/mall/storeInfoManageList.vue b/src/views/mall/storeInfoManageList.vue
new file mode 100644
index 0000000..ce3abb1
--- /dev/null
+++ b/src/views/mall/storeInfoManageList.vue
@@ -0,0 +1,214 @@
+<template>
+  <div class="store-info-manage-container">
+    <!-- 查询条件 -->
+    <el-card v-if="componentShow === 'storeInfoManage'" class="search-wrapper">
+      <div slot="header" class="clearfix text-left">
+        <span>{{ $t('storeInfoManage.search.title') }}</span>
+      </div>
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-input v-model="conditions.name" :placeholder="$t('storeInfoManage.search.storeName')" clearable />
+        </el-col>
+        <el-col :span="6">
+          <el-select v-model="conditions.convenienceMenusId" :placeholder="$t('storeInfoManage.search.convenienceType')"
+            clearable>
+            <el-option v-for="item in menuInfos" :key="item.convenienceMenusId" :label="item.name"
+              :value="item.convenienceMenusId" />
+          </el-select>
+        </el-col>
+        <el-col :span="6">
+          <el-select v-model="conditions.isShow" :placeholder="$t('storeInfoManage.search.isShow')" clearable>
+            <el-option :label="$t('storeInfoManage.common.yes')" value="Y" />
+            <el-option :label="$t('storeInfoManage.common.no')" value="N" />
+          </el-select>
+        </el-col>
+        <el-col :span="6">
+          <el-button type="primary" @click="handleQuery">
+            <i class="el-icon-search"></i>
+            {{ $t('storeInfoManage.common.search') }}
+          </el-button>
+        </el-col>
+      </el-row>
+    </el-card>
+
+    <!-- 商户信息列表 -->
+    <el-card v-if="componentShow === 'storeInfoManage'" class="list-wrapper">
+      <div slot="header" class="clearfix flex justify-between">
+        <span>{{ $t('storeInfoManage.list.title') }}</span>
+        <el-button type="primary" size="small" style="float: right;" @click="handleAdd">
+          <i class="el-icon-plus"></i>
+          {{ $t('storeInfoManage.common.add') }}
+        </el-button>
+      </div>
+      <el-table v-loading="loading" :data="storeInfos" border style="width: 100%">
+        <el-table-column prop="storeInfoId" :label="$t('storeInfoManage.table.storeInfoId')" align="center" />
+        <el-table-column prop="name" :label="$t('storeInfoManage.table.storeName')" align="center" />
+        <el-table-column :label="$t('storeInfoManage.table.icon')" align="center">
+          <template slot-scope="scope">
+            <el-image style="width: 60px; height: 60px; border-radius: 5px;" :src="scope.row.icon"
+              :preview-src-list="[scope.row.icon]" fit="cover" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="tel" :label="$t('storeInfoManage.table.tel')" align="center" />
+        <el-table-column prop="site" :label="$t('storeInfoManage.table.site')" align="center" />
+        <el-table-column prop="seq" :label="$t('storeInfoManage.table.seq')" align="center" />
+        <el-table-column :label="$t('storeInfoManage.table.isShow')" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.isShow === 'Y' ? $t('storeInfoManage.common.yes') : $t('storeInfoManage.common.no') }}
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('storeInfoManage.common.operation')" align="center" width="200">
+          <template slot-scope="scope">
+            <el-button size="mini" type="primary" @click="handleEdit(scope.row)">
+              {{ $t('storeInfoManage.common.edit') }}
+            </el-button>
+            <el-button size="mini" type="danger" @click="handleDelete(scope.row)">
+              {{ $t('storeInfoManage.common.delete') }}
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination :current-page.sync="page.current" :page-sizes="[10, 20, 30, 50]" :page-size="page.size"
+        :total="page.total" layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange"
+        @current-change="handleCurrentChange" />
+    </el-card>
+
+    <!-- 子组件 -->
+    <add-store-info v-if="componentShow === 'addStoreInfo'" ref="addStoreInfo" @success="handleSuccess"
+      @close="handleClose" />
+    <edit-store-info v-if="componentShow === 'editStoreInfo'" ref="editStoreInfo" :store-info="currentStoreInfo"
+      @success="handleSuccess" @close="handleClose" />
+    <delete-store-info ref="deleteStoreInfo" :store-info="currentStoreInfo" @success="handleSuccess" />
+  </div>
+</template>
+
+<script>
+import { queryStoreInfo, queryConvenienceMenus } from '@/api/mall/storeInfoManageApi'
+import AddStoreInfo from '@/components/mall/AddStoreInfo'
+import EditStoreInfo from '@/components/mall/EditStoreInfo'
+import DeleteStoreInfo from '@/components/mall/DeleteStoreInfo'
+
+export default {
+  name: 'StoreInfoManageList',
+  components: {
+    AddStoreInfo,
+    EditStoreInfo,
+    DeleteStoreInfo
+  },
+  data() {
+    return {
+      loading: false,
+      componentShow: 'storeInfoManage',
+      conditions: {
+        name: '',
+        isShow: '',
+        convenienceMenusId: ''
+      },
+      storeInfos: [],
+      menuInfos: [],
+      currentStoreInfo: {},
+      page: {
+        current: 1,
+        size: 10,
+        total: 0
+      }
+    }
+  },
+  created() {
+    this.getStoreInfoList()
+    this.getConvenienceMenusList()
+  },
+  methods: {
+    async getStoreInfoList() {
+      try {
+        this.loading = true
+        const params = {
+          page: this.page.current,
+          row: this.page.size,
+          ...this.conditions
+        }
+        const { data, total } = await queryStoreInfo(params)
+        this.storeInfos = data
+        this.page.total = total
+      } catch (error) {
+        this.$message.error(this.$t('storeInfoManage.error.fetchStoreInfoFailed'))
+      } finally {
+        this.loading = false
+      }
+    },
+    async getConvenienceMenusList() {
+      try {
+        const params = {
+          page: 1,
+          row: 50
+        }
+        const { data } = await queryConvenienceMenus(params)
+        this.menuInfos = data
+      } catch (error) {
+        this.$message.error(this.$t('storeInfoManage.error.fetchConvenienceMenusFailed'))
+      }
+    },
+    handleQuery() {
+      this.page.current = 1
+      this.getStoreInfoList()
+    },
+    handleAdd() {
+      this.componentShow = 'addStoreInfo'
+      this.$nextTick(() => {
+        this.$refs.addStoreInfo.open()
+      })
+    },
+    handleEdit(row) {
+      this.componentShow = 'editStoreInfo'
+      this.currentStoreInfo = { ...row }
+      this.$nextTick(() => {
+        this.$refs.editStoreInfo.open()
+      })
+    },
+    handleDelete(row) {
+      this.currentStoreInfo = { ...row }
+      this.$nextTick(() => {
+        this.$refs.deleteStoreInfo.open()
+      })
+    },
+    handleSuccess() {
+      this.componentShow = 'storeInfoManage'
+      this.getStoreInfoList()
+    },
+    handleClose() {
+      this.componentShow = 'storeInfoManage'
+    },
+    handleSizeChange(val) {
+      this.page.size = val
+      this.getStoreInfoList()
+    },
+    handleCurrentChange(val) {
+      this.page.current = val
+      this.getStoreInfoList()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.store-info-manage-container {
+  padding: 20px;
+
+  .search-wrapper {
+    margin-bottom: 20px;
+
+    .el-select {
+      width: 100%;
+    }
+  }
+
+  .list-wrapper {
+    margin-bottom: 20px;
+  }
+
+  .el-pagination {
+    margin-top: 20px;
+    text-align: right;
+  }
+}
+</style>
\ No newline at end of file