From bf652139aa01b4f851ece1605c00d2f273d64641 Mon Sep 17 00:00:00 2001 From: gxwebsoft Date: Sun, 5 May 2024 16:29:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E7=AB=AF=E9=85=8D=E7=BD=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- src/api/cms/ad/model/index.ts | 1 + src/api/cms/mp-menu/index.ts | 106 ++++ src/api/cms/mp-menu/model/index.ts | 77 +++ src/api/cms/navigation/model/index.ts | 1 + src/api/cms/website/field/model/index.ts | 8 + src/api/shop/wechatDeposit/index.ts | 106 ++++ src/api/shop/wechatDeposit/model/index.ts | 43 ++ src/api/system/user/model/index.ts | 2 +- src/components/Simulator/index.vue | 206 ++++++- src/views/booking/school/index.vue | 6 + .../wechatDeposit/components/search.vue | 48 ++ .../components/wechatDepositEdit.vue | 249 ++++++++ src/views/booking/wechatDeposit/index.vue | 251 ++++++++ .../field/components/website-field-edit.vue | 1 + src/views/cms/field/index.vue | 33 +- .../mp-weixin/dict/components/dict-edit.vue | 178 ++++++ src/views/cms/mp-weixin/dict/index.vue | 211 +++++++ .../mp-weixin/home/components/mpMenuEdit.vue | 258 ++++++++ .../cms/mp-weixin/home/components/search.vue | 52 ++ .../mp-weixin/home/components/simulator.vue | 521 +++++++++++++++++ src/views/cms/mp-weixin/home/index.vue | 280 +++++++++ .../mp-weixin/menu/components/mpMenuEdit.vue | 261 +++++++++ .../cms/mp-weixin/menu/components/search.vue | 61 ++ src/views/cms/mp-weixin/menu/index.vue | 284 +++++++++ .../mp-weixin/order/components/mpMenuEdit.vue | 248 ++++++++ .../cms/mp-weixin/order/components/search.vue | 52 ++ .../mp-weixin/order/components/simulator.vue | 534 +++++++++++++++++ src/views/cms/mp-weixin/order/index.vue | 280 +++++++++ .../mp-weixin/shop/components/mpMenuEdit.vue | 248 ++++++++ .../cms/mp-weixin/shop/components/search.vue | 52 ++ .../mp-weixin/shop/components/simulator.vue | 497 ++++++++++++++++ src/views/cms/mp-weixin/shop/index.vue | 278 +++++++++ .../mp-weixin/user/components/mpMenuEdit.vue | 248 ++++++++ .../cms/mp-weixin/user/components/search.vue | 61 ++ .../mp-weixin/user/components/simulator.vue | 549 ++++++++++++++++++ src/views/cms/mp-weixin/user/index.vue | 278 +++++++++ .../navigation/components/navigation-edit.vue | 3 +- src/views/cms/navigation/index.vue | 1 + src/views/passport/login/index.vue | 1 + .../shop/wechatDeposit/components/search.vue | 42 ++ .../components/wechatDepositEdit.vue | 249 ++++++++ src/views/shop/wechatDeposit/index.vue | 281 +++++++++ .../{user => admin}/components/org-select.vue | 0 .../components/role-select.vue | 0 .../{user => admin}/components/sex-select.vue | 0 .../{user => admin}/components/user-edit.vue | 13 + .../components/user-import.vue | 0 .../{user => admin}/components/user-info.vue | 0 .../components/user-search.vue | 0 .../system/{user => admin}/details/index.vue | 0 src/views/system/{user => admin}/index.vue | 92 ++- .../organization/components/org-user-edit.vue | 4 +- 53 files changed, 7186 insertions(+), 73 deletions(-) create mode 100644 src/api/cms/mp-menu/index.ts create mode 100644 src/api/cms/mp-menu/model/index.ts create mode 100644 src/api/shop/wechatDeposit/index.ts create mode 100644 src/api/shop/wechatDeposit/model/index.ts create mode 100644 src/views/booking/wechatDeposit/components/search.vue create mode 100644 src/views/booking/wechatDeposit/components/wechatDepositEdit.vue create mode 100644 src/views/booking/wechatDeposit/index.vue create mode 100644 src/views/cms/mp-weixin/dict/components/dict-edit.vue create mode 100644 src/views/cms/mp-weixin/dict/index.vue create mode 100644 src/views/cms/mp-weixin/home/components/mpMenuEdit.vue create mode 100644 src/views/cms/mp-weixin/home/components/search.vue create mode 100644 src/views/cms/mp-weixin/home/components/simulator.vue create mode 100644 src/views/cms/mp-weixin/home/index.vue create mode 100644 src/views/cms/mp-weixin/menu/components/mpMenuEdit.vue create mode 100644 src/views/cms/mp-weixin/menu/components/search.vue create mode 100644 src/views/cms/mp-weixin/menu/index.vue create mode 100644 src/views/cms/mp-weixin/order/components/mpMenuEdit.vue create mode 100644 src/views/cms/mp-weixin/order/components/search.vue create mode 100644 src/views/cms/mp-weixin/order/components/simulator.vue create mode 100644 src/views/cms/mp-weixin/order/index.vue create mode 100644 src/views/cms/mp-weixin/shop/components/mpMenuEdit.vue create mode 100644 src/views/cms/mp-weixin/shop/components/search.vue create mode 100644 src/views/cms/mp-weixin/shop/components/simulator.vue create mode 100644 src/views/cms/mp-weixin/shop/index.vue create mode 100644 src/views/cms/mp-weixin/user/components/mpMenuEdit.vue create mode 100644 src/views/cms/mp-weixin/user/components/search.vue create mode 100644 src/views/cms/mp-weixin/user/components/simulator.vue create mode 100644 src/views/cms/mp-weixin/user/index.vue create mode 100644 src/views/shop/wechatDeposit/components/search.vue create mode 100644 src/views/shop/wechatDeposit/components/wechatDepositEdit.vue create mode 100644 src/views/shop/wechatDeposit/index.vue rename src/views/system/{user => admin}/components/org-select.vue (100%) rename src/views/system/{user => admin}/components/role-select.vue (100%) rename src/views/system/{user => admin}/components/sex-select.vue (100%) rename src/views/system/{user => admin}/components/user-edit.vue (96%) rename src/views/system/{user => admin}/components/user-import.vue (100%) rename src/views/system/{user => admin}/components/user-info.vue (100%) rename src/views/system/{user => admin}/components/user-search.vue (100%) rename src/views/system/{user => admin}/details/index.vue (100%) rename src/views/system/{user => admin}/index.vue (90%) diff --git a/.env.development b/.env.development index 914ba38..b3b219c 100644 --- a/.env.development +++ b/.env.development @@ -1,9 +1,9 @@ VITE_APP_NAME=后台管理系统 VITE_SOCKET_URL=wss://server.gxwebsoft.com VITE_SERVER_URL=https://server.gxwebsoft.com/api -#VITE_API_URL=https://modules.gxwebsoft.com/api +VITE_API_URL=https://modules.gxwebsoft.com/api -VITE_API_URL=http://127.0.0.1:9099/api +#VITE_API_URL=http://127.0.0.1:9099/api #VITE_SERVER_URL=http://127.0.0.1:9091/api #VITE_SOCKET_URL=ws://localhost:9191 #VITE_API_URL=https://server.gxwebsoft.com/api diff --git a/src/api/cms/ad/model/index.ts b/src/api/cms/ad/model/index.ts index 370f259..4ece24a 100644 --- a/src/api/cms/ad/model/index.ts +++ b/src/api/cms/ad/model/index.ts @@ -27,5 +27,6 @@ export interface AdParam extends PageParam { adId?: string; name?: number; type?: number; + adType?: string; userId?: number; } diff --git a/src/api/cms/mp-menu/index.ts b/src/api/cms/mp-menu/index.ts new file mode 100644 index 0000000..72153dc --- /dev/null +++ b/src/api/cms/mp-menu/index.ts @@ -0,0 +1,106 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { MpMenu, MpMenuParam } from './model'; +import { MODULES_API_URL } from '@/config/setting'; + +/** + * 分页查询小程序端菜单 + */ +export async function pageMpMenu(params: MpMenuParam) { + const res = await request.get>>( + MODULES_API_URL + '/cms/mp-menu/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询小程序端菜单列表 + */ +export async function listMpMenu(params?: MpMenuParam) { + const res = await request.get>( + MODULES_API_URL + '/cms/mp-menu', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加小程序端菜单 + */ +export async function addMpMenu(data: MpMenu) { + const res = await request.post>( + MODULES_API_URL + '/cms/mp-menu', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改小程序端菜单 + */ +export async function updateMpMenu(data: MpMenu) { + const res = await request.put>( + MODULES_API_URL + '/cms/mp-menu', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除小程序端菜单 + */ +export async function removeMpMenu(id?: number) { + const res = await request.delete>( + MODULES_API_URL + '/cms/mp-menu/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除小程序端菜单 + */ +export async function removeBatchMpMenu(data: (number | undefined)[]) { + const res = await request.delete>( + MODULES_API_URL + '/cms/mp-menu/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询小程序端菜单 + */ +export async function getMpMenu(id: number) { + const res = await request.get>( + MODULES_API_URL + '/cms/mp-menu/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/cms/mp-menu/model/index.ts b/src/api/cms/mp-menu/model/index.ts new file mode 100644 index 0000000..bcc7175 --- /dev/null +++ b/src/api/cms/mp-menu/model/index.ts @@ -0,0 +1,77 @@ +import type { PageParam } from '@/api'; + +/** + * 小程序端菜单 + */ +export interface MpMenu { + // ID + menuId?: number; + // 上级id, 0是顶级 + parentId?: number; + // 菜单名称 + title?: string; + // 类型 0自定义 1单页内容2外部链接 + type?: number; + // 是否微信小程序菜单 + isMpWeixin?: boolean; + // 菜单路由地址 + path?: string; + // 菜单组件地址, 目录可为空 + component?: string; + // 打开位置 + target?: string; + // 菜单图标 + icon?: string; + // 图标颜色 + color?: string; + // 所在行 + rows?: number; + // 是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单) + hide?: number; + // 位置 0不限 1顶部 2底部 + position?: number; + // 菜单侧栏选中的path + active?: string; + // 其它路由元信息 + meta?: string; + // 绑定的页面 + pageId?: number; + // 绑定的文章分类ID + articleCategoryId?: number; + // 绑定的文章ID + articleId?: number; + // 绑定的表单ID + formId?: number; + // 绑定的书籍标识 + bookCode?: string; + // 绑定的商品分类ID + goodsCategoryId?: number; + // 绑定的商品ID + goodsId?: number; + // 用户ID + userId?: number; + // 设为首页 + home?: number; + // 排序(数字越小越靠前) + sortNumber?: number; + // 备注 + comments?: string; + // 状态, 0正常, 1冻结 + status?: number; + // 租户id + tenantId?: number; + // 注册时间 + createTime?: string; + // 子菜单 + children?: MpMenu[]; + pageName?: string; +} + +/** + * 小程序端菜单搜索条件 + */ +export interface MpMenuParam extends PageParam { + menuId?: number; + type?: number; + keywords?: string; +} diff --git a/src/api/cms/navigation/model/index.ts b/src/api/cms/navigation/model/index.ts index b184daa..1c2d8a4 100644 --- a/src/api/cms/navigation/model/index.ts +++ b/src/api/cms/navigation/model/index.ts @@ -28,6 +28,7 @@ export interface Navigation { formId?: number; pageName?: string; createTime?: string; + isMpWeixin?: boolean; } /** diff --git a/src/api/cms/website/field/model/index.ts b/src/api/cms/website/field/model/index.ts index 827cf07..e48a3d2 100644 --- a/src/api/cms/website/field/model/index.ts +++ b/src/api/cms/website/field/model/index.ts @@ -26,6 +26,14 @@ export interface WebsiteParam { login_bg_img?: string; } +// 约定的小程序参数名称 +export interface MpWeixinParam { + // 小程序LOGO + site_logo?: string; + // 我的页面顶部背景图片 + mp_user_top?: string; +} + /** * 网站参数搜索条件 */ diff --git a/src/api/shop/wechatDeposit/index.ts b/src/api/shop/wechatDeposit/index.ts new file mode 100644 index 0000000..5032a2b --- /dev/null +++ b/src/api/shop/wechatDeposit/index.ts @@ -0,0 +1,106 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { WechatDeposit, WechatDepositParam } from './model'; +import { MODULES_API_URL } from '@/config/setting'; + +/** + * 分页查询押金 + */ +export async function pageWechatDeposit(params: WechatDepositParam) { + const res = await request.get>>( + MODULES_API_URL + '/shop/wechat-deposit/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询押金列表 + */ +export async function listWechatDeposit(params?: WechatDepositParam) { + const res = await request.get>( + MODULES_API_URL + '/shop/wechat-deposit', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加押金 + */ +export async function addWechatDeposit(data: WechatDeposit) { + const res = await request.post>( + MODULES_API_URL + '/shop/wechat-deposit', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改押金 + */ +export async function updateWechatDeposit(data: WechatDeposit) { + const res = await request.put>( + MODULES_API_URL + '/shop/wechat-deposit', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除押金 + */ +export async function removeWechatDeposit(id?: number) { + const res = await request.delete>( + MODULES_API_URL + '/shop/wechat-deposit/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除押金 + */ +export async function removeBatchWechatDeposit(data: (number | undefined)[]) { + const res = await request.delete>( + MODULES_API_URL + '/shop/wechat-deposit/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询押金 + */ +export async function getWechatDeposit(id: number) { + const res = await request.get>( + MODULES_API_URL + '/shop/wechat-deposit/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/shop/wechatDeposit/model/index.ts b/src/api/shop/wechatDeposit/model/index.ts new file mode 100644 index 0000000..3239379 --- /dev/null +++ b/src/api/shop/wechatDeposit/model/index.ts @@ -0,0 +1,43 @@ +import type { PageParam } from '@/api'; + +/** + * 押金 + */ +export interface WechatDeposit { + // + id?: number; + // 订单id + oid?: number; + // 用户id + uid?: number; + // 场地订单号 + orderNum?: string; + // 付款订单号 + wechatOrder?: string; + // 退款订单号 + wechatReturn?: string; + // 场馆名称 + siteName?: string; + // 微信昵称 + username?: string; + // 手机号码 + phone?: string; + // 物品名称 + name?: string; + // 押金金额 + price?: string; + // 押金状态,1已付款,2未付款,已退押金 + status?: string; + // + createTime?: number; + // 租户id + tenantId?: number; +} + +/** + * 押金搜索条件 + */ +export interface WechatDepositParam extends PageParam { + id?: number; + keywords?: string; +} diff --git a/src/api/system/user/model/index.ts b/src/api/system/user/model/index.ts index 593c1b5..6f0d3fe 100644 --- a/src/api/system/user/model/index.ts +++ b/src/api/system/user/model/index.ts @@ -103,7 +103,7 @@ export interface User { // truename?: string; // 是否管理员:1是;2否 - isAdmin?: boolean; + isAdmin?: number; // 客户端ID clientId?: string; // 注册来源客户端 (APP、H5、小程序等) diff --git a/src/components/Simulator/index.vue b/src/components/Simulator/index.vue index cbe3f05..a58403e 100644 --- a/src/components/Simulator/index.vue +++ b/src/components/Simulator/index.vue @@ -1,8 +1,82 @@ @@ -97,7 +101,6 @@ // 表格数据源 const datasource: DatasourceFunction = ({ page, limit, where, orders }) => { // 搜索条件 - where.deleted = 1; return pageWebsiteField({ ...where, ...orders, diff --git a/src/views/cms/mp-weixin/dict/components/dict-edit.vue b/src/views/cms/mp-weixin/dict/components/dict-edit.vue new file mode 100644 index 0000000..e0c2ff6 --- /dev/null +++ b/src/views/cms/mp-weixin/dict/components/dict-edit.vue @@ -0,0 +1,178 @@ + + + + diff --git a/src/views/cms/mp-weixin/dict/index.vue b/src/views/cms/mp-weixin/dict/index.vue new file mode 100644 index 0000000..bee9d17 --- /dev/null +++ b/src/views/cms/mp-weixin/dict/index.vue @@ -0,0 +1,211 @@ + + + + + diff --git a/src/views/cms/mp-weixin/home/components/mpMenuEdit.vue b/src/views/cms/mp-weixin/home/components/mpMenuEdit.vue new file mode 100644 index 0000000..a069118 --- /dev/null +++ b/src/views/cms/mp-weixin/home/components/mpMenuEdit.vue @@ -0,0 +1,258 @@ + + + + diff --git a/src/views/cms/mp-weixin/home/components/search.vue b/src/views/cms/mp-weixin/home/components/search.vue new file mode 100644 index 0000000..ae428dd --- /dev/null +++ b/src/views/cms/mp-weixin/home/components/search.vue @@ -0,0 +1,52 @@ + + + + diff --git a/src/views/cms/mp-weixin/home/components/simulator.vue b/src/views/cms/mp-weixin/home/components/simulator.vue new file mode 100644 index 0000000..bb1bd70 --- /dev/null +++ b/src/views/cms/mp-weixin/home/components/simulator.vue @@ -0,0 +1,521 @@ + + + + + diff --git a/src/views/cms/mp-weixin/home/index.vue b/src/views/cms/mp-weixin/home/index.vue new file mode 100644 index 0000000..bfe2dbe --- /dev/null +++ b/src/views/cms/mp-weixin/home/index.vue @@ -0,0 +1,280 @@ + + + + + + + diff --git a/src/views/cms/mp-weixin/menu/components/mpMenuEdit.vue b/src/views/cms/mp-weixin/menu/components/mpMenuEdit.vue new file mode 100644 index 0000000..6f96cb6 --- /dev/null +++ b/src/views/cms/mp-weixin/menu/components/mpMenuEdit.vue @@ -0,0 +1,261 @@ + + + + diff --git a/src/views/cms/mp-weixin/menu/components/search.vue b/src/views/cms/mp-weixin/menu/components/search.vue new file mode 100644 index 0000000..fd66994 --- /dev/null +++ b/src/views/cms/mp-weixin/menu/components/search.vue @@ -0,0 +1,61 @@ + + + + diff --git a/src/views/cms/mp-weixin/menu/index.vue b/src/views/cms/mp-weixin/menu/index.vue new file mode 100644 index 0000000..bf792ac --- /dev/null +++ b/src/views/cms/mp-weixin/menu/index.vue @@ -0,0 +1,284 @@ + + + + + + + diff --git a/src/views/cms/mp-weixin/order/components/mpMenuEdit.vue b/src/views/cms/mp-weixin/order/components/mpMenuEdit.vue new file mode 100644 index 0000000..7a094fe --- /dev/null +++ b/src/views/cms/mp-weixin/order/components/mpMenuEdit.vue @@ -0,0 +1,248 @@ + + + + diff --git a/src/views/cms/mp-weixin/order/components/search.vue b/src/views/cms/mp-weixin/order/components/search.vue new file mode 100644 index 0000000..544ba2e --- /dev/null +++ b/src/views/cms/mp-weixin/order/components/search.vue @@ -0,0 +1,52 @@ + + + + diff --git a/src/views/cms/mp-weixin/order/components/simulator.vue b/src/views/cms/mp-weixin/order/components/simulator.vue new file mode 100644 index 0000000..5889e00 --- /dev/null +++ b/src/views/cms/mp-weixin/order/components/simulator.vue @@ -0,0 +1,534 @@ + + + + + diff --git a/src/views/cms/mp-weixin/order/index.vue b/src/views/cms/mp-weixin/order/index.vue new file mode 100644 index 0000000..64fb7da --- /dev/null +++ b/src/views/cms/mp-weixin/order/index.vue @@ -0,0 +1,280 @@ + + + + + + + diff --git a/src/views/cms/mp-weixin/shop/components/mpMenuEdit.vue b/src/views/cms/mp-weixin/shop/components/mpMenuEdit.vue new file mode 100644 index 0000000..7a094fe --- /dev/null +++ b/src/views/cms/mp-weixin/shop/components/mpMenuEdit.vue @@ -0,0 +1,248 @@ + + + + diff --git a/src/views/cms/mp-weixin/shop/components/search.vue b/src/views/cms/mp-weixin/shop/components/search.vue new file mode 100644 index 0000000..ae428dd --- /dev/null +++ b/src/views/cms/mp-weixin/shop/components/search.vue @@ -0,0 +1,52 @@ + + + + diff --git a/src/views/cms/mp-weixin/shop/components/simulator.vue b/src/views/cms/mp-weixin/shop/components/simulator.vue new file mode 100644 index 0000000..d68685e --- /dev/null +++ b/src/views/cms/mp-weixin/shop/components/simulator.vue @@ -0,0 +1,497 @@ + + + + + diff --git a/src/views/cms/mp-weixin/shop/index.vue b/src/views/cms/mp-weixin/shop/index.vue new file mode 100644 index 0000000..203cce9 --- /dev/null +++ b/src/views/cms/mp-weixin/shop/index.vue @@ -0,0 +1,278 @@ + + + + + + + diff --git a/src/views/cms/mp-weixin/user/components/mpMenuEdit.vue b/src/views/cms/mp-weixin/user/components/mpMenuEdit.vue new file mode 100644 index 0000000..7a094fe --- /dev/null +++ b/src/views/cms/mp-weixin/user/components/mpMenuEdit.vue @@ -0,0 +1,248 @@ + + + + diff --git a/src/views/cms/mp-weixin/user/components/search.vue b/src/views/cms/mp-weixin/user/components/search.vue new file mode 100644 index 0000000..837060e --- /dev/null +++ b/src/views/cms/mp-weixin/user/components/search.vue @@ -0,0 +1,61 @@ + + + + diff --git a/src/views/cms/mp-weixin/user/components/simulator.vue b/src/views/cms/mp-weixin/user/components/simulator.vue new file mode 100644 index 0000000..8851322 --- /dev/null +++ b/src/views/cms/mp-weixin/user/components/simulator.vue @@ -0,0 +1,549 @@ + + + + + diff --git a/src/views/cms/mp-weixin/user/index.vue b/src/views/cms/mp-weixin/user/index.vue new file mode 100644 index 0000000..a2ae828 --- /dev/null +++ b/src/views/cms/mp-weixin/user/index.vue @@ -0,0 +1,278 @@ + + + + + + + diff --git a/src/views/cms/navigation/components/navigation-edit.vue b/src/views/cms/navigation/components/navigation-edit.vue index 79c9245..e019a2b 100644 --- a/src/views/cms/navigation/components/navigation-edit.vue +++ b/src/views/cms/navigation/components/navigation-edit.vue @@ -273,7 +273,8 @@ pageId: 0, articleCategoryId: 0, articleId: 0, - pageName: '' + pageName: '', + isMpWeixin: false }); // 表单验证规则 diff --git a/src/views/cms/navigation/index.vue b/src/views/cms/navigation/index.vue index 478e0ca..a3d6ccd 100644 --- a/src/views/cms/navigation/index.vue +++ b/src/views/cms/navigation/index.vue @@ -263,6 +263,7 @@ where = {}; where.title = searchText.value; where.position = position.value; + where.isMpWeixin = false; return listNavigation({ ...where }); }; diff --git a/src/views/passport/login/index.vue b/src/views/passport/login/index.vue index b00f5f3..dd54eb9 100644 --- a/src/views/passport/login/index.vue +++ b/src/views/passport/login/index.vue @@ -556,6 +556,7 @@ .login-input-group { display: flex; align-items: center; + background-repeat: no-repeat; :deep(.ant-input-affix-wrapper) { flex: 1; diff --git a/src/views/shop/wechatDeposit/components/search.vue b/src/views/shop/wechatDeposit/components/search.vue new file mode 100644 index 0000000..82fea9d --- /dev/null +++ b/src/views/shop/wechatDeposit/components/search.vue @@ -0,0 +1,42 @@ + + + + diff --git a/src/views/shop/wechatDeposit/components/wechatDepositEdit.vue b/src/views/shop/wechatDeposit/components/wechatDepositEdit.vue new file mode 100644 index 0000000..29de4c5 --- /dev/null +++ b/src/views/shop/wechatDeposit/components/wechatDepositEdit.vue @@ -0,0 +1,249 @@ + + + + diff --git a/src/views/shop/wechatDeposit/index.vue b/src/views/shop/wechatDeposit/index.vue new file mode 100644 index 0000000..3a00f16 --- /dev/null +++ b/src/views/shop/wechatDeposit/index.vue @@ -0,0 +1,281 @@ + + + + + + + diff --git a/src/views/system/user/components/org-select.vue b/src/views/system/admin/components/org-select.vue similarity index 100% rename from src/views/system/user/components/org-select.vue rename to src/views/system/admin/components/org-select.vue diff --git a/src/views/system/user/components/role-select.vue b/src/views/system/admin/components/role-select.vue similarity index 100% rename from src/views/system/user/components/role-select.vue rename to src/views/system/admin/components/role-select.vue diff --git a/src/views/system/user/components/sex-select.vue b/src/views/system/admin/components/sex-select.vue similarity index 100% rename from src/views/system/user/components/sex-select.vue rename to src/views/system/admin/components/sex-select.vue diff --git a/src/views/system/user/components/user-edit.vue b/src/views/system/admin/components/user-edit.vue similarity index 96% rename from src/views/system/user/components/user-edit.vue rename to src/views/system/admin/components/user-edit.vue index 3415fd8..f19cd97 100644 --- a/src/views/system/user/components/user-edit.vue +++ b/src/views/system/admin/components/user-edit.vue @@ -120,6 +120,14 @@ v-model:value="form.introduction" /> + + + @@ -191,6 +199,7 @@ idCard: '', comments: '', gradeName: '', + isAdmin: undefined, gradeId: undefined }); @@ -286,6 +295,10 @@ form.gradeId = data.gradeId; }; + const updateIsAdmin = (value: boolean) => { + form.isAdmin = value ? 1 : 0; + }; + /* 保存编辑 */ const save = () => { if (!formRef.value) { diff --git a/src/views/system/user/components/user-import.vue b/src/views/system/admin/components/user-import.vue similarity index 100% rename from src/views/system/user/components/user-import.vue rename to src/views/system/admin/components/user-import.vue diff --git a/src/views/system/user/components/user-info.vue b/src/views/system/admin/components/user-info.vue similarity index 100% rename from src/views/system/user/components/user-info.vue rename to src/views/system/admin/components/user-info.vue diff --git a/src/views/system/user/components/user-search.vue b/src/views/system/admin/components/user-search.vue similarity index 100% rename from src/views/system/user/components/user-search.vue rename to src/views/system/admin/components/user-search.vue diff --git a/src/views/system/user/details/index.vue b/src/views/system/admin/details/index.vue similarity index 100% rename from src/views/system/user/details/index.vue rename to src/views/system/admin/details/index.vue diff --git a/src/views/system/user/index.vue b/src/views/system/admin/index.vue similarity index 90% rename from src/views/system/user/index.vue rename to src/views/system/admin/index.vue index 4938628..2631d3a 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/admin/index.vue @@ -66,22 +66,19 @@