From 2803cb180b9dd5d51aa564cdf6b55d5c83caacbd Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Tue, 3 Jun 2025 23:26:55 +0800
Subject: [PATCH] 开发完成营销记录

---
 src/api/market/marketBlacklistManageApi.js      |  81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/api/market/marketLogApi.js                  |  24 ++++++++++++++++++++++++
 src/components/market/AddMarketBlacklist.vue    |  79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/components/market/DeleteMarketBlacklist.vue |  43 +++++++++++++++++++++++++++++++++++++++++++
 src/components/market/EditMarketBlacklist.vue   |  84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/components/market/ViewMarketSendContent.vue |  43 +++++++++++++++++++++++++++++++++++++++++++
 src/i18n/index.js                               |   6 ++++++
 src/router/index.js                             |  10 ++++++++++
 src/views/market/marketBlacklistManageLang.js   |  94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/market/marketBlacklistManageList.vue  | 143 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/market/marketLogLang.js               |  92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/market/marketLogList.vue              | 174 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 12 files changed, 873 insertions(+), 0 deletions(-)
 create mode 100644 src/api/market/marketBlacklistManageApi.js
 create mode 100644 src/api/market/marketLogApi.js
 create mode 100644 src/components/market/AddMarketBlacklist.vue
 create mode 100644 src/components/market/DeleteMarketBlacklist.vue
 create mode 100644 src/components/market/EditMarketBlacklist.vue
 create mode 100644 src/components/market/ViewMarketSendContent.vue
 create mode 100644 src/views/market/marketBlacklistManageLang.js
 create mode 100644 src/views/market/marketBlacklistManageList.vue
 create mode 100644 src/views/market/marketLogLang.js
 create mode 100644 src/views/market/marketLogList.vue

diff --git a/src/api/market/marketBlacklistManageApi.js b/src/api/market/marketBlacklistManageApi.js
new file mode 100644
index 0000000..ad92cf7
--- /dev/null
+++ b/src/api/market/marketBlacklistManageApi.js
@@ -0,0 +1,81 @@
+import request from '@/utils/request'
+
+// 获取营销黑白单列表
+export function listMarketBlacklist(params) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/marketBlacklist.listMarketBlacklist',
+      method: 'get',
+      params
+    }).then(response => {
+      const res = response.data
+      if (res.code === 0) {
+        resolve(res)
+      } else {
+        reject(new Error(res.msg || '获取营销黑白单列表失败'))
+      }
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+// 添加营销黑白单
+export function saveMarketBlacklist(data) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/marketBlacklist.saveMarketBlacklist',
+      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 updateMarketBlacklist(data) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/marketBlacklist.updateMarketBlacklist',
+      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 deleteMarketBlacklist(data) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/marketBlacklist.deleteMarketBlacklist',
+      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)
+    })
+  })
+}
\ No newline at end of file
diff --git a/src/api/market/marketLogApi.js b/src/api/market/marketLogApi.js
new file mode 100644
index 0000000..ca388ba
--- /dev/null
+++ b/src/api/market/marketLogApi.js
@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+// List market logs
+export function listMarketLog(params) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/marketRule.listMarketLog',
+      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 get market logs'))
+      }
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
\ No newline at end of file
diff --git a/src/components/market/AddMarketBlacklist.vue b/src/components/market/AddMarketBlacklist.vue
new file mode 100644
index 0000000..9373fc4
--- /dev/null
+++ b/src/components/market/AddMarketBlacklist.vue
@@ -0,0 +1,79 @@
+<template>
+  <el-dialog 
+    :title="$t('marketBlacklist.add.title')" 
+    :visible.sync="visible" 
+    width="50%"
+    @close="handleClose"
+  >
+    <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
+      <el-form-item :label="$t('marketBlacklist.form.personName')" prop="personName">
+        <el-input v-model="formData.personName" />
+      </el-form-item>
+      <el-form-item :label="$t('marketBlacklist.form.filter')" prop="filter">
+        <el-input v-model="formData.filter" />
+      </el-form-item>
+      <el-form-item :label="$t('marketBlacklist.form.remark')" prop="remark">
+        <el-input v-model="formData.remark" type="textarea" />
+      </el-form-item>
+    </el-form>
+    
+    <div 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>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { saveMarketBlacklist } from '@/api/market/marketBlacklistManageApi'
+
+export default {
+  name: 'AddMarketBlacklist',
+  data() {
+    return {
+      visible: false,
+      formData: {
+        personName: '',
+        filter: '',
+        remark: ''
+      },
+      rules: {
+        personName: [
+          { required: true, message: this.$t('marketBlacklist.validate.personName'), trigger: 'blur' },
+          { max: 64, message: this.$t('marketBlacklist.validate.personNameMax'), trigger: 'blur' }
+        ],
+        filter: [
+          { required: true, message: this.$t('marketBlacklist.validate.filter'), trigger: 'blur' },
+          { max: 64, message: this.$t('marketBlacklist.validate.filterMax'), trigger: 'blur' }
+        ],
+        remark: [
+          { required: true, message: this.$t('marketBlacklist.validate.remark'), trigger: 'blur' },
+          { max: 512, message: this.$t('marketBlacklist.validate.remarkMax'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    open() {
+      this.visible = true
+    },
+    handleClose() {
+      this.$refs.form.resetFields()
+    },
+    handleSubmit() {
+      this.$refs.form.validate(async valid => {
+        if (valid) {
+          try {
+            await saveMarketBlacklist(this.formData)
+            this.$message.success(this.$t('marketBlacklist.add.success'))
+            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/market/DeleteMarketBlacklist.vue b/src/components/market/DeleteMarketBlacklist.vue
new file mode 100644
index 0000000..0c294f7
--- /dev/null
+++ b/src/components/market/DeleteMarketBlacklist.vue
@@ -0,0 +1,43 @@
+<template>
+  <el-dialog 
+    :title="$t('marketBlacklist.delete.title')" 
+    :visible.sync="visible" 
+    width="30%"
+  >
+    <p>{{ $t('marketBlacklist.delete.confirm') }}</p>
+    <div 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>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { deleteMarketBlacklist } from '@/api/market/marketBlacklistManageApi'
+
+export default {
+  name: 'DeleteMarketBlacklist',
+  data() {
+    return {
+      visible: false,
+      formData: {}
+    }
+  },
+  methods: {
+    open(data) {
+      this.formData = { ...data }
+      this.visible = true
+    },
+    async handleConfirm() {
+      try {
+        await deleteMarketBlacklist(this.formData)
+        this.$message.success(this.$t('marketBlacklist.delete.success'))
+        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/market/EditMarketBlacklist.vue b/src/components/market/EditMarketBlacklist.vue
new file mode 100644
index 0000000..046e008
--- /dev/null
+++ b/src/components/market/EditMarketBlacklist.vue
@@ -0,0 +1,84 @@
+<template>
+  <el-dialog 
+    :title="$t('marketBlacklist.edit.title')" 
+    :visible.sync="visible" 
+    width="50%"
+    @close="handleClose"
+  >
+    <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
+      <el-form-item :label="$t('marketBlacklist.form.personName')" prop="personName">
+        <el-input v-model="formData.personName" />
+      </el-form-item>
+      <el-form-item :label="$t('marketBlacklist.form.filter')" prop="filter">
+        <el-input v-model="formData.filter" />
+      </el-form-item>
+      <el-form-item :label="$t('marketBlacklist.form.remark')" prop="remark">
+        <el-input v-model="formData.remark" type="textarea" />
+      </el-form-item>
+    </el-form>
+    
+    <div 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>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { updateMarketBlacklist } from '@/api/market/marketBlacklistManageApi'
+
+export default {
+  name: 'EditMarketBlacklist',
+  data() {
+    return {
+      visible: false,
+      formData: {
+        blId: '',
+        personName: '',
+        filter: '',
+        remark: ''
+      },
+      rules: {
+        personName: [
+          { required: true, message: this.$t('marketBlacklist.validate.personName'), trigger: 'blur' },
+          { max: 64, message: this.$t('marketBlacklist.validate.personNameMax'), trigger: 'blur' }
+        ],
+        filter: [
+          { required: true, message: this.$t('marketBlacklist.validate.filter'), trigger: 'blur' },
+          { max: 64, message: this.$t('marketBlacklist.validate.filterMax'), trigger: 'blur' }
+        ],
+        remark: [
+          { required: true, message: this.$t('marketBlacklist.validate.remark'), trigger: 'blur' },
+          { max: 512, message: this.$t('marketBlacklist.validate.remarkMax'), trigger: 'blur' }
+        ],
+        blId: [
+          { required: true, message: this.$t('marketBlacklist.validate.blId'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    open(data) {
+      this.formData = { ...data }
+      this.visible = true
+    },
+    handleClose() {
+      this.$refs.form.resetFields()
+    },
+    handleSubmit() {
+      this.$refs.form.validate(async valid => {
+        if (valid) {
+          try {
+            await updateMarketBlacklist(this.formData)
+            this.$message.success(this.$t('marketBlacklist.edit.success'))
+            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/market/ViewMarketSendContent.vue b/src/components/market/ViewMarketSendContent.vue
new file mode 100644
index 0000000..91f7e7a
--- /dev/null
+++ b/src/components/market/ViewMarketSendContent.vue
@@ -0,0 +1,43 @@
+<template>
+  <el-dialog
+    :title="$t('marketLog.viewContent.title')"
+    :visible.sync="visible"
+    width="70%"
+  >
+    <el-form label-width="120px">
+      <el-form-item :label="$t('marketLog.viewContent.sendContent')">
+        <el-input
+          v-model="form.sendContent"
+          type="textarea"
+          :rows="8"
+          readonly
+        />
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">
+        {{ $t('common.close') }}
+      </el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'ViewMarketSendContent',
+  data() {
+    return {
+      visible: false,
+      form: {
+        sendContent: ''
+      }
+    }
+  },
+  methods: {
+    open(data) {
+      this.form.sendContent = data.sendContent || ''
+      this.visible = true
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/i18n/index.js b/src/i18n/index.js
index dec48b9..8299fc1 100644
--- a/src/i18n/index.js
+++ b/src/i18n/index.js
@@ -100,6 +100,8 @@ import { messages as marketSmsManageMessages } from '../views/market/marketSmsMa
 import { messages as marketWayMessages } from '../views/market/marketWayLang'
 import { messages as marketGoodsItemManageMessages } from '../views/market/marketGoodsItemManageLang'
 import { messages as marketRuleMessages } from '../views/market/marketRuleLang'
+import { messages as marketBlacklistManageMessages } from '../views/market/marketBlacklistManageLang'
+import { messages as marketLogMessages } from '../views/market/marketLogLang'
 
 Vue.use(VueI18n)
 
@@ -204,6 +206,8 @@ const messages = {
     ...marketWayMessages.en,
     ...marketGoodsItemManageMessages.en,
     ...marketRuleMessages.en,
+    ...marketBlacklistManageMessages.en,
+    ...marketLogMessages.en,
   },
   zh: {
     ...loginMessages.zh,
@@ -304,6 +308,8 @@ const messages = {
     ...marketWayMessages.zh,
     ...marketGoodsItemManageMessages.zh,
     ...marketRuleMessages.zh,
+    ...marketBlacklistManageMessages.zh,
+    ...marketLogMessages.zh,
   }
 }
 
diff --git a/src/router/index.js b/src/router/index.js
index 552ed5c..2270298 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -486,6 +486,16 @@ const routes = [
         name: '/pages/admin/marketRule',
         component: () => import('@/views/market/marketRuleList.vue')
       },
+      {
+        path:'/pages/admin/marketBlacklistManage',
+        name:'/pages/admin/marketBlacklistManage',
+        component: () => import('@/views/market/marketBlacklistManageList.vue')
+        },
+        {
+          path:'/pages/admin/marketLog',
+          name:'/pages/admin/marketLog',
+          component: () => import('@/views/market/marketLogList.vue')
+          },
       // 其他子路由可以在这里添加
     ]
   },
diff --git a/src/views/market/marketBlacklistManageLang.js b/src/views/market/marketBlacklistManageLang.js
new file mode 100644
index 0000000..0e45350
--- /dev/null
+++ b/src/views/market/marketBlacklistManageLang.js
@@ -0,0 +1,94 @@
+export const messages = {
+  en: {
+    marketBlacklist: {
+      search: {
+        title: 'Search Conditions',
+        personName: 'Please enter person name',
+        filter: 'Please enter filter'
+      },
+      list: {
+        title: 'Marketing Blacklist'
+      },
+      table: {
+        personName: 'Person Name',
+        filter: 'Filter',
+        createTime: 'Create Time',
+        remark: 'Remark'
+      },
+      form: {
+        personName: 'Person Name',
+        filter: 'Filter',
+        remark: 'Remark'
+      },
+      validate: {
+        personName: 'Person name is required',
+        personNameMax: 'Person name cannot exceed 64 characters',
+        filter: 'Filter is required',
+        filterMax: 'Filter cannot exceed 64 characters',
+        remark: 'Remark is required',
+        remarkMax: 'Remark cannot exceed 512 characters',
+        blId: 'ID is required'
+      },
+      add: {
+        title: 'Add Marketing Blacklist',
+        success: 'Add successfully'
+      },
+      edit: {
+        title: 'Edit Marketing Blacklist',
+        success: 'Edit successfully'
+      },
+      delete: {
+        title: 'Delete Confirmation',
+        confirm: 'Are you sure to delete this marketing blacklist?',
+        success: 'Delete successfully'
+      },
+      fetchError: 'Failed to fetch marketing blacklist data'
+    }
+  },
+  zh: {
+    marketBlacklist: {
+      search: {
+        title: '查询条件',
+        personName: '请输入用户名称',
+        filter: '请输入过滤条件'
+      },
+      list: {
+        title: '营销黑白单'
+      },
+      table: {
+        personName: '用户名称',
+        filter: '过滤条件',
+        createTime: '创建时间',
+        remark: '备注'
+      },
+      form: {
+        personName: '用户名称',
+        filter: '过滤条件',
+        remark: '备注'
+      },
+      validate: {
+        personName: '用户名称不能为空',
+        personNameMax: '用户名称不能超过64个字符',
+        filter: '过滤条件不能为空',
+        filterMax: '过滤条件不能超过64个字符',
+        remark: '备注不能为空',
+        remarkMax: '备注不能超过512个字符',
+        blId: '编号不能为空'
+      },
+      add: {
+        title: '添加营销黑白单',
+        success: '添加成功'
+      },
+      edit: {
+        title: '修改营销黑白单',
+        success: '修改成功'
+      },
+      delete: {
+        title: '删除确认',
+        confirm: '确定删除该营销黑白单吗?',
+        success: '删除成功'
+      },
+      fetchError: '获取营销黑白单数据失败'
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/views/market/marketBlacklistManageList.vue b/src/views/market/marketBlacklistManageList.vue
new file mode 100644
index 0000000..61f93e2
--- /dev/null
+++ b/src/views/market/marketBlacklistManageList.vue
@@ -0,0 +1,143 @@
+<template>
+  <div class="market-blacklist-container">
+    <!-- 查询条件 -->
+    <el-card class="search-wrapper">
+      <div slot="header" class="clearfix text-left">
+        <span>{{ $t('marketBlacklist.search.title') }}</span>
+      </div>
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-input v-model="searchForm.personName" :placeholder="$t('marketBlacklist.search.personName')" clearable />
+        </el-col>
+        <el-col :span="6">
+          <el-input v-model="searchForm.filter" :placeholder="$t('marketBlacklist.search.filter')" clearable />
+        </el-col>
+        <el-col :span="2">
+          <el-button type="primary" @click="handleSearch">{{ $t('common.search') }}</el-button>
+        </el-col>
+      </el-row>
+    </el-card>
+
+    <!-- 列表 -->
+    <el-card class="list-wrapper">
+      <div slot="header" class="clearfix flex justify-between">
+        <span>{{ $t('marketBlacklist.list.title') }}</span>
+        <el-button type="primary" style="float: right" @click="handleAdd">{{ $t('common.add') }}</el-button>
+      </div>
+
+      <el-table :data="tableData" border style="width: 100%">
+        <el-table-column prop="personName" :label="$t('marketBlacklist.table.personName')" align="center" />
+        <el-table-column prop="filter" :label="$t('marketBlacklist.table.filter')" align="center" />
+        <el-table-column prop="createTime" :label="$t('marketBlacklist.table.createTime')" align="center" />
+        <el-table-column prop="remark" :label="$t('marketBlacklist.table.remark')" align="center" />
+        <el-table-column :label="$t('common.operation')" align="center" width="200">
+          <template slot-scope="scope">
+            <el-button size="mini" type="primary" @click="handleEdit(scope.row)">{{ $t('common.edit') }}</el-button>
+            <el-button size="mini" type="danger" @click="handleDelete(scope.row)">{{ $t('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-market-blacklist ref="addDialog" @success="handleSuccess" />
+    <edit-market-blacklist ref="editDialog" @success="handleSuccess" />
+    <delete-market-blacklist ref="deleteDialog" @success="handleSuccess" />
+  </div>
+</template>
+
+<script>
+import { listMarketBlacklist } from '@/api/market/marketBlacklistManageApi'
+import AddMarketBlacklist from '@/components/market/AddMarketBlacklist'
+import EditMarketBlacklist from '@/components/market/EditMarketBlacklist'
+import DeleteMarketBlacklist from '@/components/market/DeleteMarketBlacklist'
+
+export default {
+  name: 'MarketBlacklistManageList',
+  components: {
+    AddMarketBlacklist,
+    EditMarketBlacklist,
+    DeleteMarketBlacklist
+  },
+  data() {
+    return {
+      loading: false,
+      searchForm: {
+        personName: '',
+        filter: ''
+      },
+      tableData: [],
+      page: {
+        current: 1,
+        size: 10,
+        total: 0
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    async getList() {
+      try {
+        this.loading = true
+        const params = {
+          page: this.page.current,
+          row: this.page.size,
+          ...this.searchForm
+        }
+        const { data, records } = await listMarketBlacklist(params)
+        this.tableData = data
+        this.page.total = records
+      } catch (error) {
+        this.$message.error(this.$t('marketBlacklist.fetchError'))
+      } finally {
+        this.loading = false
+      }
+    },
+    handleSearch() {
+      this.page.current = 1
+      this.getList()
+    },
+    handleAdd() {
+      this.$refs.addDialog.open()
+    },
+    handleEdit(row) {
+      this.$refs.editDialog.open(row)
+    },
+    handleDelete(row) {
+      this.$refs.deleteDialog.open(row)
+    },
+    handleSuccess() {
+      this.getList()
+    },
+    handleSizeChange(val) {
+      this.page.size = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.page.current = val
+      this.getList()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.market-blacklist-container {
+  padding: 20px;
+
+  .search-wrapper {
+    margin-bottom: 20px;
+  }
+
+  .el-pagination {
+    margin-top: 20px;
+    text-align: right;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/market/marketLogLang.js b/src/views/market/marketLogLang.js
new file mode 100644
index 0000000..be132d1
--- /dev/null
+++ b/src/views/market/marketLogLang.js
@@ -0,0 +1,92 @@
+export const messages = {
+  en: {
+    marketLog: {
+      search: {
+        title: 'Search Conditions',
+        communityName: 'Community Name',
+        sendWay: 'Marketing Method',
+        businessType: 'Business Type',
+        personNameLike: 'Marketer Name',
+        startTime: 'Start Time',
+        endTime: 'End Time'
+      },
+      list: {
+        title: 'Marketing Records'
+      },
+      table: {
+        logId: 'ID',
+        ruleName: 'Marketing Rule',
+        communityName: 'Community Name',
+        personName: 'Marketer',
+        personTel: 'Phone',
+        openId: 'OpenId',
+        sendWayName: 'Marketing Method',
+        businessTypeName: 'Business Type',
+        createTime: 'Send Time',
+        remark: 'Remark',
+        viewContent: 'View Content'
+      },
+      sendWay: {
+        sms: 'SMS',
+        wechat: 'WeChat Template Message',
+        other: 'Other'
+      },
+      businessType: {
+        accessControl: 'Access Control',
+        vehicleGate: 'Vehicle Gate',
+        mobilePayment: 'Mobile Payment',
+        repairOrder: 'Repair Order'
+      },
+      viewContent: {
+        title: 'Send Content',
+        sendContent: 'Send Content'
+      },
+      fetchError: 'Failed to fetch marketing logs'
+    }
+  },
+  zh: {
+    marketLog: {
+      search: {
+        title: '查询条件',
+        communityName: '小区名称',
+        sendWay: '营销方式',
+        businessType: '业务类型',
+        personNameLike: '营销人',
+        startTime: '开始时间',
+        endTime: '结束时间'
+      },
+      list: {
+        title: '营销记录'
+      },
+      table: {
+        logId: '编号',
+        ruleName: '营销规则',
+        communityName: '小区名称',
+        personName: '营销人',
+        personTel: '手机号',
+        openId: 'OpenId',
+        sendWayName: '营销方式',
+        businessTypeName: '业务类型',
+        createTime: '发送时间',
+        remark: '说明',
+        viewContent: '发送内容'
+      },
+      sendWay: {
+        sms: '短信',
+        wechat: '微信模板消息',
+        other: '其他'
+      },
+      businessType: {
+        accessControl: '门禁',
+        vehicleGate: '车辆道闸',
+        mobilePayment: '手机支付完成',
+        repairOrder: '报修单提交'
+      },
+      viewContent: {
+        title: '发送内容',
+        sendContent: '发送内容'
+      },
+      fetchError: '获取营销记录失败'
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/views/market/marketLogList.vue b/src/views/market/marketLogList.vue
new file mode 100644
index 0000000..4fb08aa
--- /dev/null
+++ b/src/views/market/marketLogList.vue
@@ -0,0 +1,174 @@
+<template>
+  <div class="market-log-container">
+    <!-- Search Conditions -->
+    <el-card class="search-wrapper">
+      <div slot="header" class="clearfix text-left">
+        <span>{{ $t('marketLog.search.title') }}</span>
+      </div>
+      <el-row :gutter="20">
+        <el-col :span="4">
+          <el-input v-model="searchForm.communityName" :placeholder="$t('marketLog.search.communityName')" clearable />
+        </el-col>
+        <el-col :span="4">
+          <el-select v-model="searchForm.sendWay" :placeholder="$t('marketLog.search.sendWay')" clearable>
+            <el-option v-for="item in sendWayOptions" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-col>
+        <el-col :span="4">
+          <el-select v-model="searchForm.businessType" :placeholder="$t('marketLog.search.businessType')" clearable>
+            <el-option v-for="item in businessTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-col>
+        <el-col :span="4">
+          <el-input v-model="searchForm.personNameLike" :placeholder="$t('marketLog.search.personNameLike')" clearable />
+        </el-col>
+     
+        <el-col :span="4">
+          <el-button type="primary" @click="handleSearch">
+            {{ $t('common.search') }}
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20" style="margin-top: 20px">
+        <el-col :span="4">
+          <el-date-picker v-model="searchForm.startTime" type="datetime" :placeholder="$t('marketLog.search.startTime')"
+            value-format="yyyy-MM-dd HH:mm:ss" />
+        </el-col>
+        <el-col :span="4">
+          <el-date-picker v-model="searchForm.endTime" type="datetime" :placeholder="$t('marketLog.search.endTime')"
+            value-format="yyyy-MM-dd HH:mm:ss" />
+        </el-col>
+      </el-row>
+    </el-card>
+
+    <!-- Market Log List -->
+    <el-card class="list-wrapper">
+      <div slot="header" class="clearfix text-left">
+        <span>{{ $t('marketLog.list.title') }}</span>
+      </div>
+      <el-table v-loading="loading" :data="tableData" border style="width: 100%">
+        <el-table-column prop="logId" :label="$t('marketLog.table.logId')" align="center" />
+        <el-table-column prop="ruleName" :label="$t('marketLog.table.ruleName')" align="center" />
+        <el-table-column prop="communityName" :label="$t('marketLog.table.communityName')" align="center" />
+        <el-table-column prop="personName" :label="$t('marketLog.table.personName')" align="center" />
+        <el-table-column prop="personTel" :label="$t('marketLog.table.personTel')" align="center" />
+        <el-table-column prop="openId" :label="$t('marketLog.table.openId')" align="center" />
+        <el-table-column prop="sendWayName" :label="$t('marketLog.table.sendWayName')" align="center" />
+        <el-table-column prop="businessTypeName" :label="$t('marketLog.table.businessTypeName')" align="center" />
+        <el-table-column prop="createTime" :label="$t('marketLog.table.createTime')" align="center" />
+        <el-table-column prop="remark" :label="$t('marketLog.table.remark')" align="center" />
+        <el-table-column :label="$t('common.operation')" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button size="mini" type="primary" @click="handleViewContent(scope.row)">
+              {{ $t('marketLog.table.viewContent') }}
+            </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>
+
+    <ViewMarketSendContent ref="viewContentDialog" />
+  </div>
+</template>
+
+<script>
+import { listMarketLog } from '@/api/market/marketLogApi'
+import ViewMarketSendContent from '@/components/market/ViewMarketSendContent'
+
+export default {
+  name: 'MarketLogList',
+  components: {
+    ViewMarketSendContent
+  },
+  data() {
+    return {
+      loading: false,
+      searchForm: {
+        communityName: '',
+        sendWay: '',
+        businessType: '',
+        personNameLike: '',
+        startTime: '',
+        endTime: ''
+      },
+      sendWayOptions: [
+        { value: '1001', label: this.$t('marketLog.sendWay.sms') },
+        { value: '2002', label: this.$t('marketLog.sendWay.wechat') },
+        { value: '3003', label: this.$t('marketLog.sendWay.other') }
+      ],
+      businessTypeOptions: [
+        { value: '1001', label: this.$t('marketLog.businessType.accessControl') },
+        { value: '2002', label: this.$t('marketLog.businessType.vehicleGate') },
+        { value: '3003', label: this.$t('marketLog.businessType.mobilePayment') },
+        { value: '4004', label: this.$t('marketLog.businessType.repairOrder') }
+      ],
+      tableData: [],
+      page: {
+        current: 1,
+        size: 10,
+        total: 0
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    async getList() {
+      try {
+        this.loading = true
+        const params = {
+          ...this.searchForm,
+          page: this.page.current,
+          row: this.page.size
+        }
+        const { data, total } = await listMarketLog(params)
+        this.tableData = data
+        this.page.total = total
+      } catch (error) {
+        this.$message.error(this.$t('marketLog.fetchError'))
+      } finally {
+        this.loading = false
+      }
+    },
+    handleSearch() {
+      this.page.current = 1
+      this.getList()
+    },
+    handleSizeChange(val) {
+      this.page.size = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.page.current = val
+      this.getList()
+    },
+    handleViewContent(row) {
+      this.$refs.viewContentDialog.open(row)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.market-log-container {
+  padding: 20px;
+
+  .search-wrapper {
+    margin-bottom: 20px;
+  }
+
+  .list-wrapper {
+    margin-bottom: 20px;
+  }
+
+  .el-pagination {
+    margin-top: 20px;
+    text-align: right;
+  }
+}
+</style>
\ No newline at end of file
--
libgit2 0.21.4