Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud

src/api/admin/user.ts

@@ -1,5 +1,15 @@
 import request from "/@/utils/request"
 
+/**
+ * 同步用户食堂信息
+ */
+export const syncDeptMch = () => {
+	return request({
+		url: "/admin/user/sync-user-canteen",
+		method: "post",
+	})
+}
+
 export const list = () => {
 	return request({
 		url: "/admin/user/list",

src/views/admin/system/user/index.vue

@@ -128,6 +128,7 @@
 								/>
 							</template>
 						</el-table-column>
+						<el-table-column label="所属商户" prop="merchantName" show-overflow-tooltip min-width="150" />
 						<el-table-column
 							v-auths="['sys_user_edit', 'userFace_sysUserFace_view', 'sys_user_del']"
 							label="操作"

src/views/wallet/wallet-setting/components/user/index.vue

@@ -0,0 +1,29 @@
+<template>
+	<div class="w-full">
+		<div class="layout-padding-auto layout-padding-view">
+			<div></div>
+			<div class="flex items-center" v-auth="'wallet_setting_edit'">
+				<el-button type="primary" @click="doSyncDeptCanteen" :disabled="syncDeptCanteenLoading">同步用户食堂信息</el-button>
+			</div>
+		</div>
+	</div>
+</template>
+<script setup lang="ts" name="userSetting">
+import { useMessage } from "/@/hooks/message"
+
+import * as userApi from "/@/api/admin/user"
+
+// 定义变量内容
+const syncDeptCanteenLoading = ref(false)
+
+const doSyncDeptCanteen = async () => {
+	syncDeptCanteenLoading.value = true
+	try {
+		userApi.syncDeptMch()
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	} finally {
+		syncDeptCanteenLoading.value = false
+	}
+}
+</script>

src/views/wallet/wallet-setting/index.vue

@@ -15,6 +15,7 @@
 				<Code v-if="activeName == 40" />
 				<off-line v-if="activeName == 50" />
 				<third-zy v-if="activeName == 60" />
+				<user-setting v-if="activeName == 70" />
 			</div>
 		</div>
 	</div>
@@ -27,6 +28,7 @@ const Refund = defineAsyncComponent(() => import("./components/refund/index.vue"
 const OffLine = defineAsyncComponent(() => import("./components/off-line/index.vue"))
 const ExtraPrice = defineAsyncComponent(() => import("./components/extra-price/index.vue"))
 const ThirdZy = defineAsyncComponent(() => import("./components/third-zy/index.vue"))
+const UserSetting = defineAsyncComponent(() => import("./components/user/index.vue"))
 
 const data = {
 	tabList: [
@@ -36,6 +38,7 @@ const data = {
 		{ id: 40, label: "二维码配置" },
 		{ id: 50, label: "离线配置" },
 		{ id: 60, label: "正元同步配置" },
+		{ id: 70, label: "用户同步配置" },
 	],
 }