diff --git a/config-run-note b/config-run-note
new file mode 100644
index 0000000..17bcf22
--- /dev/null
+++ b/config-run-note
@@ -0,0 +1,5 @@
+文档说明:
+企业微信-若依框架+AI
+
+命令行:
+npm run dev(后台和redis运行后)
diff --git a/src/api/merchant/dish.js b/src/api/merchant/dish.js
new file mode 100644
index 0000000..5fa50e7
--- /dev/null
+++ b/src/api/merchant/dish.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询菜品名称列表
+export function listDish(query) {
+ return request({
+ url: '/merchant/dish/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询菜品名称详细
+export function getDish(id) {
+ return request({
+ url: '/merchant/dish/' + id,
+ method: 'get'
+ })
+}
+
+// 新增菜品名称
+export function addDish(data) {
+ return request({
+ url: '/merchant/dish',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改菜品名称
+export function updateDish(data) {
+ return request({
+ url: '/merchant/dish',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除菜品名称
+export function delDish(id) {
+ return request({
+ url: '/merchant/dish/' + id,
+ method: 'delete'
+ })
+}
diff --git a/src/views/merchant/dish/index.vue b/src/views/merchant/dish/index.vue
new file mode 100644
index 0000000..d7d7e49
--- /dev/null
+++ b/src/views/merchant/dish/index.vue
@@ -0,0 +1,350 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 菜品口味与关系信息
+
+
+ 添加
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+