diff --git a/src/api/system/payment/model/index.ts b/src/api/system/payment/model/index.ts index 31a8ac7..1761bb4 100644 --- a/src/api/system/payment/model/index.ts +++ b/src/api/system/payment/model/index.ts @@ -8,6 +8,8 @@ export interface Payment { id?: number; // 支付方式 name?: string; + // 支付类型 + type?: number; // 标识 code?: string; // 支付图标 diff --git a/src/components/PayMethod/index.vue b/src/components/PayMethod/index.vue index 660d2db..68ef844 100644 --- a/src/components/PayMethod/index.vue +++ b/src/components/PayMethod/index.vue @@ -30,17 +30,16 @@ dictCode?: string; }>(), { - placeholder: '请选择服务器厂商' + placeholder: '请选择支付方式' } ); // 字典数据 const options = ref([ - { value: 'wxPay', label: '微信支付', icon: 'WechatOutlined' }, - { value: 'aliPay', label: '支付宝支付', icon: 'AlipayCircleOutlined' }, - { value: 'balancePay', label: '余额支付', icon: 'PayCircleOutlined' }, - { value: 'yearCardPay', label: '年卡支付', icon: 'IdcardOutlined' }, - { value: 'icCardPay', label: 'IC卡支付', icon: 'IdcardOutlined' } + { value: 0, label: '余额支付', key: 'balancePay', icon: 'PayCircleOutlined' }, + { value: 1, label: '微信支付', key: 'wxPay', icon: 'WechatOutlined' }, + { value: 2, label: '会员卡支付',key: 'userCardPay', icon: 'IdcardOutlined' }, + { value: 3, label: '支付宝支付',key: 'aliPay', icon: 'AlipayCircleOutlined' } ]); /* 更新选中数据 */ diff --git a/src/views/cms/mp-weixin/admin/components/mpMenuEdit.vue b/src/views/cms/mp-weixin/admin/components/mpMenuEdit.vue new file mode 100644 index 0000000..4cc2b38 --- /dev/null +++ b/src/views/cms/mp-weixin/admin/components/mpMenuEdit.vue @@ -0,0 +1,279 @@ + + + + diff --git a/src/views/cms/mp-weixin/admin/components/search.vue b/src/views/cms/mp-weixin/admin/components/search.vue new file mode 100644 index 0000000..c5b4ab3 --- /dev/null +++ b/src/views/cms/mp-weixin/admin/components/search.vue @@ -0,0 +1,52 @@ + + + + diff --git a/src/views/cms/mp-weixin/admin/components/simulator.vue b/src/views/cms/mp-weixin/admin/components/simulator.vue new file mode 100644 index 0000000..9051599 --- /dev/null +++ b/src/views/cms/mp-weixin/admin/components/simulator.vue @@ -0,0 +1,550 @@ + + + + + diff --git a/src/views/cms/mp-weixin/admin/index.vue b/src/views/cms/mp-weixin/admin/index.vue new file mode 100644 index 0000000..cb66b1c --- /dev/null +++ b/src/views/cms/mp-weixin/admin/index.vue @@ -0,0 +1,296 @@ + + + + + + + diff --git a/src/views/cms/mp-weixin/home/index.vue b/src/views/cms/mp-weixin/home/index.vue index bfe2dbe..6472da9 100644 --- a/src/views/cms/mp-weixin/home/index.vue +++ b/src/views/cms/mp-weixin/home/index.vue @@ -28,8 +28,7 @@ href="https://www.iconfont.cn" target="_blank" >阿里巴巴矢量图标库,修改完后需要清除缓存,修改完后需要清除缓存才会生效 @@ -97,6 +96,7 @@ } from '@/api/cms/mp-menu'; import type { MpMenu, MpMenuParam } from '@/api/cms/mp-menu/model'; import { getPageTitle, openUrl } from '@/utils/common'; + import { removeSiteInfoCache } from '@/api/cms/website'; // 表格实例 const tableRef = ref | null>(null); @@ -214,6 +214,17 @@ showMove.value = true; }; + // 清除缓存 + const clearSiteInfoCache = () => { + removeSiteInfoCache('SiteInfo:' + localStorage.getItem('TenantId')).then( + (msg) => { + if (msg) { + message.success('缓存已更新'); + } + } + ); + }; + /* 删除单个 */ const remove = (row: MpMenu) => { const hide = message.loading('请求中..', 0); diff --git a/src/views/cms/mp-weixin/order/index.vue b/src/views/cms/mp-weixin/order/index.vue index e09dd22..e05fc1f 100644 --- a/src/views/cms/mp-weixin/order/index.vue +++ b/src/views/cms/mp-weixin/order/index.vue @@ -28,7 +28,7 @@ href="https://www.iconfont.cn" target="_blank" >阿里巴巴矢量图标库,修改完后需要,修改完后需要清除缓存才会生效 @@ -97,6 +97,7 @@ } from '@/api/cms/mp-menu'; import type { MpMenu, MpMenuParam } from '@/api/cms/mp-menu/model'; import { getPageTitle, openUrl } from '@/utils/common'; + import { removeSiteInfoCache } from "@/api/cms/website"; // 表格实例 const tableRef = ref | null>(null); @@ -210,6 +211,17 @@ showMove.value = true; }; + // 清除缓存 + const clearSiteInfoCache = () => { + removeSiteInfoCache('SiteInfo:' + localStorage.getItem('TenantId')).then( + (msg) => { + if (msg) { + message.success('缓存已更新'); + } + } + ); + }; + /* 删除单个 */ const remove = (row: MpMenu) => { const hide = message.loading('请求中..', 0); diff --git a/src/views/cms/mp-weixin/shop/components/simulator.vue b/src/views/cms/mp-weixin/shop/components/simulator.vue index d68685e..e9e7e9f 100644 --- a/src/views/cms/mp-weixin/shop/components/simulator.vue +++ b/src/views/cms/mp-weixin/shop/components/simulator.vue @@ -10,26 +10,9 @@
- - diff --git a/src/views/cms/mp-weixin/user/components/simulator.vue b/src/views/cms/mp-weixin/user/components/simulator.vue index 9051599..f8e40c9 100644 --- a/src/views/cms/mp-weixin/user/components/simulator.vue +++ b/src/views/cms/mp-weixin/user/components/simulator.vue @@ -296,9 +296,9 @@ }); }); - listMpMenu({}).then((list) => { - server.value = list.filter((d) => d.type == 0); - order.value = list.filter((d) => d.type == 1); + listMpMenu({ type: 0 }).then((list) => { + server.value = list.filter((d) => d.rows == 1); + order.value = list.filter((d) => d.rows == 0); scrollList.value = list.filter((d) => d.type == 2); }); diff --git a/src/views/cms/mp-weixin/user/index.vue b/src/views/cms/mp-weixin/user/index.vue index 4362247..d85a59e 100644 --- a/src/views/cms/mp-weixin/user/index.vue +++ b/src/views/cms/mp-weixin/user/index.vue @@ -28,7 +28,7 @@ href="https://www.iconfont.cn" target="_blank" >阿里巴巴矢量图标库,修改完后需要,修改完后需要清除缓存才会生效
@@ -97,6 +97,7 @@ } from '@/api/cms/mp-menu'; import type { MpMenu, MpMenuParam } from '@/api/cms/mp-menu/model'; import { getPageTitle, openUrl } from '@/utils/common'; + import { removeSiteInfoCache } from "@/api/cms/website"; // 表格实例 const tableRef = ref | null>(null); @@ -131,6 +132,7 @@ if (filters) { where.status = filters.status; } + where.type = 0; return pageMpMenu({ ...where, ...orders, @@ -166,10 +168,16 @@ dataIndex: 'path', key: 'path' }, + // { + // title: '分类ID', + // dataIndex: 'type', + // key: 'type', + // align: 'center' + // }, { - title: '分类ID', - dataIndex: 'type', - key: 'type', + title: '所在行', + dataIndex: 'rows', + key: 'rows', align: 'center' }, { @@ -211,6 +219,17 @@ showMove.value = true; }; + // 清除缓存 + const clearSiteInfoCache = () => { + removeSiteInfoCache('SiteInfo:' + localStorage.getItem('TenantId')).then( + (msg) => { + if (msg) { + message.success('缓存已更新'); + } + } + ); + }; + /* 删除单个 */ const remove = (row: MpMenu) => { const hide = message.loading('请求中..', 0); diff --git a/src/views/system/payment/components/paymentEdit.vue b/src/views/system/payment/components/paymentEdit.vue index 9cfc241..8075514 100644 --- a/src/views/system/payment/components/paymentEdit.vue +++ b/src/views/system/payment/components/paymentEdit.vue @@ -28,7 +28,7 @@ /> -