Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud

# Conflicts:
#	.env.development

src/components/DictSelect/index.vue

@@ -1,52 +1,66 @@
 <template>
-    <el-select style="width: 100%;" v-model="state.selectId" :placeholder="props.placeholder" clearable
-        @visible-change="(e: boolean) => e && getDictOptions()">
-        <el-option v-for="v in state.dictList" :key="v.code" :label="v.label" :value="v.value" />
-    </el-select>
+	<el-select
+		style="width: 100%"
+		v-model="state.selectId"
+		:placeholder="props.placeholder"
+		clearable
+		@visible-change="(e: boolean) => e && getDictOptions()"
+	>
+		<el-option v-for="v in state.dictList" :key="v.code" :label="v.label" :value="v.value" />
+	</el-select>
 </template>
 
 <script setup lang="ts" name="dict-select">
-import { reactive, computed, defineModel, withDefaults, defineProps } from 'vue';
-import { dict } from '/@/stores/dict';
-import { getDicts } from '/@/api/admin/dict';
+import { reactive } from "vue"
+import { dict } from "/@/stores/dict"
+import { getDicts } from "/@/api/admin/dict"
 
 const selectId = defineModel()
 
 export type Props = {
-    dictCode: string,
-    placeholder?: string,
+	dictCode: string
+	placeholder?: string
 }
 const props = withDefaults(defineProps<Props>(), {
-    placeholder: "请选择",
+	placeholder: "请选择",
 })
 
 const state = reactive<any>({
-    selectId: selectId,
-    dictList: []
+	selectId: selectId,
+	dictList: [],
 })
 
-watch(selectId, (newVal, oldValue) => {
-    if (newVal == oldValue) return
-    state.selectId = newVal
-    getDictOptions()
-}, { immediate: true })
+watch(
+	selectId,
+	(newVal, oldValue) => {
+		if (newVal == oldValue) return
+		state.selectId = newVal
+		getDictOptions()
+	},
+	{ immediate: true },
+)
 
 async function getDictOptions() {
-    if (!props.dictCode) return []
-    const dicts = dict().getDict(props.dictCode)
-    if (dicts) {
-        state.dictList = dicts
-        return
-    }
-    const res = await getDicts(props.dictCode)
-    if (!res) return []
-    state.dictList = res.data.map((p: any) => ({ label: p.label, value: p.value, elTagType: p.listClass, elTagClass: p.cssClass }));
-    dict().setDict(props.dictCode, state.dictList);
+	if (!props.dictCode) return []
+	const dicts = dict().getDict(props.dictCode)
+	if (dicts) {
+		state.dictList = dicts
+		return
+	}
+	const res = await getDicts(props.dictCode)
+	if (!res) return []
+	state.dictList = res.data.map((p: any) => ({
+		label: p.label,
+		value: p.value,
+		elTagType: p.listClass,
+		elTagClass: p.cssClass,
+	}))
+	dict().setDict(props.dictCode, state.dictList)
 }
 </script>
 
 <style scoped>
-.el-tag+.el-tag {
-    margin-left: 10px;
+.el-tag + .el-tag {
+	margin-left: 10px;
 }
 </style>

src/components/Select/SelectCtcg.vue

@@ -25,7 +25,7 @@
 </template>
 
 <script setup lang="ts" name="select-merchant">
-import { reactive, computed, defineModel, withDefaults, defineProps } from "vue"
+import { reactive } from "vue"
 import { fetchList as getCanteenCategory } from "/@/api/canteen/canteenCategory"
 
 const selectId = defineModel()

src/components/Select/SelectCtcgol.vue

@@ -25,7 +25,7 @@
 </template>
 
 <script setup lang="ts" name="select-merchant">
-import { reactive, computed, defineModel, withDefaults, defineProps } from "vue"
+import { reactive } from "vue"
 import * as cocApi from "/@/api/canteen/canteenOnlineCategory"
 
 const selectId = defineModel()

src/components/Select/SelectDept.vue

@@ -1,73 +1,84 @@
 <template>
-    <el-tree-select class="w100" v-model="state.selectId" :data="state.options"
-        @visible-change="(e: boolean) => e && getOptions()"
-        :props="{ value: 'id', label: 'name', children: 'children' }" clearable check-strictly
-        :render-after-expand="false" :placeholder="props.placeholder" />
+	<el-tree-select
+		class="w100"
+		v-model="state.selectId"
+		:data="state.options"
+		@visible-change="(e: boolean) => e && getOptions()"
+		:props="{ value: 'id', label: 'name', children: 'children' }"
+		clearable
+		check-strictly
+		:render-after-expand="false"
+		:placeholder="props.placeholder"
+	/>
 </template>
 
 <script setup lang="ts" name="select-dept">
-import { reactive, computed, defineModel, withDefaults, defineProps } from 'vue'
-import * as deptApi from "/@/api/admin/dept";
+import { reactive } from "vue"
+import * as deptApi from "/@/api/admin/dept"
 
 const selectId = defineModel()
 
 export type Props = {
-    placeholder?: string,
+	placeholder?: string
 }
 const props = withDefaults(defineProps<Props>(), {
-    placeholder: "请选择",
+	placeholder: "请选择",
 })
 
 const queryForm = reactive<any>({
-    name: "",
-    current: 1,
-    size: 10,
+	name: "",
+	current: 1,
+	size: 10,
 })
 
 const state = reactive<any>({
-    loading: true,
-    selectId: selectId,
-    options: []
+	loading: true,
+	selectId: selectId,
+	options: [],
 })
 
-watch(selectId, (newVal, oldValue) => {
-    if (newVal == oldValue) return
-    state.selectId = newVal
-    getOptions()
-}, { immediate: true })
+watch(
+	selectId,
+	(newVal, oldValue) => {
+		if (newVal == oldValue) return
+		state.selectId = newVal
+		getOptions()
+	},
+	{ immediate: true },
+)
 
 async function getOptions() {
-    try {
-        state.loading = true
-        const _pa = {
-            ...queryForm
-        }
-        const { data } = await deptApi.deptTree(_pa)
-        state.options = data ?? []
-    } finally {
-        setTimeout(() => state.loading = false, 500);
-    }
+	try {
+		state.loading = true
+		const _pa = {
+			...queryForm,
+		}
+		const { data } = await deptApi.deptTree(_pa)
+		state.options = data ?? []
+	} finally {
+		setTimeout(() => (state.loading = false), 500)
+	}
 }
 
 function remoteSearch(params: string) {
-    if (params != queryForm.name) {
-        queryForm.name = params
-        getOptions()
-    }
+	if (params != queryForm.name) {
+		queryForm.name = params
+		getOptions()
+	}
 }
 
 function filterTreeData(treeData: Array<any>) {
-    return treeData.filter(item => {
-        if (item.children && item.children.length) {
-            item.disabled = true;
-            item.children = filterTreeData(item.children)
-        }
-        return item
-    })
+	return treeData.filter((item) => {
+		if (item.children && item.children.length) {
+			item.disabled = true
+			item.children = filterTreeData(item.children)
+		}
+		return item
+	})
 }
 
 function clear() {
-    state.selectId = null
-    getOptions()
+	state.selectId = null
+	getOptions()
 }
-</script>
+</script>

src/components/Select/SelectMch.vue

@@ -25,7 +25,7 @@
 </template>
 
 <script setup lang="ts" name="select-merchant">
-import { reactive, defineModel, withDefaults, defineProps } from "vue"
+import { reactive } from "vue"
 import * as mchApi from "/@/api/wallet/mch-manage"
 
 const selectId = defineModel()

src/components/Select/SelectUser.vue

@@ -21,7 +21,7 @@
 </template>
 
 <script setup lang="ts" name="select-user">
-import { reactive, computed, defineModel, withDefaults, defineProps } from "vue"
+import { reactive } from "vue"
 import * as userApi from "/@/api/admin/user"
 
 const selectId = defineModel()

src/components/Select/SelectWalletType.vue

@@ -1,79 +1,91 @@
 <template>
-    <el-select style="width: 100%;" v-model="state.selectId" :placeholder="props.placeholder" clearable
-        remote-show-suffix filterable remote :remote-method="remoteSearch" :loading="state.loading"
-        @visible-change="(e: boolean) => e && getOptions()">
-        <el-option v-for="v in state.options" :key="v.id" :label="`${v.name}`" :value="v.id">
-            <div class="flex items-center">
-                <div class="color-primary">{{ v.name }}</div>
-                <div class="flex items-center just ml5">
-                    <el-tag size="small">
-                        {{ state.walletType.find((i: any) => i.value == v.uniqueCode)?.label }}
-                    </el-tag>
-                </div>
-            </div>
-        </el-option>
-    </el-select>
+	<el-select
+		style="width: 100%"
+		v-model="state.selectId"
+		:placeholder="props.placeholder"
+		clearable
+		remote-show-suffix
+		filterable
+		remote
+		:remote-method="remoteSearch"
+		:loading="state.loading"
+		@visible-change="(e: boolean) => e && getOptions()"
+	>
+		<el-option v-for="v in state.options" :key="v.id" :label="`${v.name}`" :value="v.id">
+			<div class="flex items-center">
+				<div class="color-primary">{{ v.name }}</div>
+				<div class="flex items-center just ml5">
+					<el-tag size="small">
+						{{ state.walletType.find((i: any) => i.value == v.uniqueCode)?.label }}
+					</el-tag>
+				</div>
+			</div>
+		</el-option>
+	</el-select>
 </template>
 
 <script setup lang="ts" name="select-wallet-type">
-import { reactive, computed, defineModel, withDefaults, defineProps } from 'vue'
-import * as walletTypeApi from '/@/api/wallet/wallet-type'
-import { useDict } from '/@/hooks/dict'
+import { reactive } from "vue"
+import * as walletTypeApi from "/@/api/wallet/wallet-type"
+import { useDict } from "/@/hooks/dict"
 
 const selectId = defineModel()
 
 export type Props = {
-    placeholder?: string,
+	placeholder?: string
 }
 const props = withDefaults(defineProps<Props>(), {
-    placeholder: "请选择",
+	placeholder: "请选择",
 })
 
 const queryForm = reactive<any>({
-    name: "",
-    current: 1,
-    size: 10,
+	name: "",
+	current: 1,
+	size: 10,
 })
 
 const state = reactive<any>({
-    loading: true,
-    selectId: selectId,
-    options: [],
-    walletType: []
+	loading: true,
+	selectId: selectId,
+	options: [],
+	walletType: [],
 })
 
-watch(selectId, (newVal, oldValue) => {
-    if (newVal == oldValue) return
-    state.selectId = newVal
-    getOptions()
-}, { immediate: true })
+watch(
+	selectId,
+	(newVal, oldValue) => {
+		if (newVal == oldValue) return
+		state.selectId = newVal
+		getOptions()
+	},
+	{ immediate: true },
+)
 
 async function getOptions() {
-    try {
-        state.loading = true
-        const _pa = {
-            ...queryForm
-        }
-        const { data } = await walletTypeApi.fetchList(_pa)
-        state.options = data.records ?? []
+	try {
+		state.loading = true
+		const _pa = {
+			...queryForm,
+		}
+		const { data } = await walletTypeApi.fetchList(_pa)
+		state.options = data.records ?? []
 
-        const { wallet_type } = useDict('wallet_type')
-        state.walletType = wallet_type
-    } finally {
-        setTimeout(() => state.loading = false, 500);
-    }
+		const { wallet_type } = useDict("wallet_type")
+		state.walletType = wallet_type
+	} finally {
+		setTimeout(() => (state.loading = false), 500)
+	}
 }
 
 function remoteSearch(params: string) {
-    if (params != queryForm.name) {
-        queryForm.name = params
-        getOptions()
-    }
+	if (params != queryForm.name) {
+		queryForm.name = params
+		getOptions()
+	}
 }
 
 function clear() {
-    state.selectId = null
-    getOptions()
+	state.selectId = null
+	getOptions()
 }
-
-</script>
+</script>

src/components/Select/selectHardGroup.vue

@@ -20,7 +20,7 @@
 </template>
 
 <script setup lang="ts" name="select-hard-group">
-import { reactive, defineModel, withDefaults, defineProps } from "vue"
+import { reactive } from "vue"
 import * as hardGroup from "/@/api/hard/hard-group"
 
 const selectId = defineModel()

src/views/canteen/canteenDailyMenu/form.vue

@@ -337,10 +337,11 @@ const handleClickSelect = async () => {
 	selectDialogVisible.value = true
 
 	selectObjs.value = [...selectedFood.value]
-	await getDataListAndSelect() // 获取菜品数据并且勾选表格行
 
+	await getDataListAndSelect() // 获取菜品数据并且勾选表格行
+	// 获取菜品分类数据
 	try {
-		const res = await getCanteenCategory()
+		const res = await getCanteenCategory({ current: 1, size: 999999 })
 		categoryOptions.value = res.data.records
 	} catch (error) {
 		categoryOptions.value = []

src/views/home/navMenu/index.vue

@@ -2,7 +2,10 @@
 	<el-card class="card" v-loading="loading">
 		<el-row>
 			<el-col :span="4" v-for="(item, index) in navMenuList" :key="index">
-				<div :class="['nav-menu-item-top', item.id == currentActiveMenuId ? 'nav-menu-item-active' : '']" @click="currentActiveMenuId = item.id">
+				<div
+					:class="['nav-menu-item-top', item.id == currentActiveMenuId ? 'nav-menu-item-active' : '']"
+					@click="currentActiveMenuId = item.id"
+				>
 					<el-image class="nav-menu-item-icon" :src="imageBaseUrl + item.menuPic" fit="cover" />
 					<div class="nav-menu-item-name">{{ $t(item.name) }}</div>
 				</div>
@@ -10,7 +13,7 @@
 		</el-row>
 		<br />
 		<el-row v-if="currentActiveMenuId" style="background-color: #e2eff677; border-radius: 1rem; padding: 2rem 6rem">
-			<el-col v-for="(item, index) in navMenuListBottom" :key="index" :span="!item.meta?.isHide ? 3 : 0">
+			<el-col v-for="(item, index) in navMenuListBottom" :key="index" :span="!item.meta?.isHide ? 4 : 0">
 				<div v-if="!item.meta?.isHide" class="nav-menu-item-bottom" @click="handleClickBottomMenu(item)">
 					<el-image class="nav-menu-item-icon" :src="imageBaseUrl + item.menuPic" fit="cover" />
 					<div class="nav-menu-item-name">{{ $t(item.name) }}</div>
@@ -21,55 +24,55 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
-import { ElMessage } from 'element-plus';
-import { useMenuApi } from '/@/api/admin/menu';
+import { ref } from "vue"
+import { ElMessage } from "element-plus"
+import { useMenuApi } from "/@/api/admin/menu"
 
-const router = useRouter();
-const menuApi = useMenuApi();
-const loading = ref(false);
-const navMenuList = ref<any>([]);
-const currentActiveMenuId = ref('');
-const imageBaseUrl = import.meta.env.VITE_IMAGE_BASE_PATH;
+const router = useRouter()
+const menuApi = useMenuApi()
+const loading = ref(false)
+const navMenuList = ref<any>([])
+const currentActiveMenuId = ref("")
+const imageBaseUrl = import.meta.env.VITE_IMAGE_BASE_PATH
 
 // 获取菜单列表
 const getNavMenuList = async () => {
-	loading.value = true;
+	loading.value = true
 	try {
-		const res = await menuApi.getAdminMenu().finally(() => (loading.value = false));
+		const res = await menuApi.getAdminMenu().finally(() => (loading.value = false))
 		if (res.code == 0 && res.data.length > 0) {
-			navMenuList.value = res.data;
+			navMenuList.value = res.data
 		}
 	} catch (error) {
-		navMenuList.value = [];
-		ElMessage.error('加载错误');
-		loading.value = false;
+		navMenuList.value = []
+		ElMessage.error("加载错误")
+		loading.value = false
 	}
-};
+}
 
 const navMenuListBottom = computed(() => {
 	if (navMenuList.value) {
-		const currentMenuItem = navMenuList.value.find((item: any) => item.id == currentActiveMenuId.value);
-		if (currentMenuItem && currentMenuItem.children) return currentMenuItem.children;
+		const currentMenuItem = navMenuList.value.find((item: any) => item.id == currentActiveMenuId.value)
+		if (currentMenuItem && currentMenuItem.children) return currentMenuItem.children
 	} else {
-		return [];
+		return []
 	}
-});
+})
 
 // 点击菜单项
 const handleClickBottomMenu = (item: any) => {
-	router.push(item.path);
-};
+	router.push(item.path)
+}
 
 onMounted(async () => {
-	await getNavMenuList();
-});
+	await getNavMenuList()
+})
 </script>
 
 <style scoped lang="scss">
 .card {
 	padding: 5vw;
-	height: 100%;
+	height: calc(100vh - 85px);
 	background-image: linear-gradient(0deg, #ffffff 0%, #e4ebff 100%);
 }
 .nav-menu-item-top {