diff --git a/.env.development b/.env.development index 2e10aaf..22e3399 100644 --- a/.env.development +++ b/.env.development @@ -18,8 +18,8 @@ VITE_ADMIN_PROXY_PATH = http://192.168.101.29:9999 # 邓-本地 # VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # 线上 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc # VITE_IMAGE_BASE_PATH = http://localhost:9999 -VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地 -# VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境 +# VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地 +VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境 # 代码生成服务地址 VITE_GEN_PROXY_PATH = http://192.168.110.156:5003 diff --git a/.gitignore b/.gitignore index 4a204e5..2554c2c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,9 @@ docker/dist # local env files +.env +.env.development +.env.prod .env.local .env.*.local diff --git a/src/views/admin/system/menu/index.vue b/src/views/admin/system/menu/index.vue index f0755ad..f35e42c 100644 --- a/src/views/admin/system/menu/index.vue +++ b/src/views/admin/system/menu/index.vue @@ -4,20 +4,25 @@ - + - {{ $t('common.queryBtn') }} + {{ $t("common.queryBtn") }} - {{ $t('common.resetBtn') }} + {{ $t("common.resetBtn") }}
- {{ $t('common.addBtn') }} + {{ $t("common.addBtn") }} - - - + + + - - + + - + - - + + diff --git a/src/views/admin/system/user/form.vue b/src/views/admin/system/user/form.vue index 63122a2..e8aa791 100644 --- a/src/views/admin/system/user/form.vue +++ b/src/views/admin/system/user/form.vue @@ -187,7 +187,7 @@ const dataRules = ref({ }, ], email: [ - { type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }, + { required: true, message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }, { validator: rule.overLength, trigger: "blur" }, ], lockFlag: [{ required: true, message: "状态不能为空", trigger: "blur" }], diff --git a/src/views/canteen/canteenCategory/index.vue b/src/views/canteen/canteenCategory/index.vue index 8641c10..ad45669 100644 --- a/src/views/canteen/canteenCategory/index.vue +++ b/src/views/canteen/canteenCategory/index.vue @@ -7,17 +7,32 @@ - 查询 - 重置 + + 查询 + + 重置
- + 新 增 - + 删 除 + />
@@ -73,66 +102,71 @@ diff --git a/src/views/canteen/canteenDailyMenu/index.vue b/src/views/canteen/canteenDailyMenu/index.vue index 9454213..b98eb1a 100644 --- a/src/views/canteen/canteenDailyMenu/index.vue +++ b/src/views/canteen/canteenDailyMenu/index.vue @@ -85,6 +85,7 @@ import { getAllSimple as getCanteenCategory } from "/@/api/canteen/canteenCatego import { useMessage } from "/@/hooks/message" import { pageJoin } from "/@/api/wallet/mch-manage" import { displayPrice } from "/@/utils/formatMoney" +import { auth } from "/@/utils/authFunction" const FormDialog = defineAsyncComponent(() => import("./form.vue")) const imageBaseUrl = import.meta.env.VITE_IMAGE_BASE_PATH @@ -110,6 +111,7 @@ const merchantId = ref() // 商户Id const merchantInfo = ref([]) const addFood = async (hourType: number) => { + if (!auth("canteen_canteenDailyMenu_add")) return if (!merchantId.value) { useMessage().error("请选择商户再进行新增") return @@ -182,6 +184,7 @@ const selectTimeFood = async () => { // 删除菜品 const delteData = async (tid: number) => { + if (!auth("canteen_canteenDailyMenu_del")) return ElMessageBox.confirm("确定删除菜品吗?", "删除菜品", { confirmButtonText: "确定", cancelButtonText: "取消", diff --git a/src/views/canteen/canteenOnlineCategory/index.vue b/src/views/canteen/canteenOnlineCategory/index.vue index 9c04360..50c8e93 100644 --- a/src/views/canteen/canteenOnlineCategory/index.vue +++ b/src/views/canteen/canteenOnlineCategory/index.vue @@ -7,14 +7,22 @@ - 查询 - 重置 + + 查询 + + 重置
- + 新 增 + />
编辑 - + 删除 @@ -82,64 +96,69 @@ diff --git a/src/views/canteen/canteenOnlineSpu/index.vue b/src/views/canteen/canteenOnlineSpu/index.vue index 7248262..2dfede9 100644 --- a/src/views/canteen/canteenOnlineSpu/index.vue +++ b/src/views/canteen/canteenOnlineSpu/index.vue @@ -10,8 +10,10 @@ - 查询 - 重置 + + 查询 + + 重置 @@ -43,7 +45,7 @@ class="ml10 mr20" style="float: right" @queryTable="getDataList" - >
+ />
- 查询 - 重置 + + 查询 + + 重置 @@ -108,8 +110,9 @@ type="primary" v-auth="'canteen_canteenSpu_del'" @click="handleDelete([scope.row.id])" - >删除 + 删除 +