diff --git a/.env.base b/.env.base index 19b9a09..2d3b1b8 100644 --- a/.env.base +++ b/.env.base @@ -4,8 +4,8 @@ VITE_NODE_ENV=development VITE_DEV=true # 请求路径 -VITE_BASE_URL='http://47.98.161.246:48080' -# VITE_BASE_URL='http://114.215.207.150:48080' +# VITE_BASE_URL='http://47.98.161.246:48080' +VITE_BASE_URL='http://114.215.207.150:48080' # 小程序接口请求路劲 VITE_APPLET_URL='https://cloud.ahduima.com' diff --git a/src/api/xjapplet/resell.js b/src/api/xjapplet/resell.js index 4042167..dc7975d 100644 --- a/src/api/xjapplet/resell.js +++ b/src/api/xjapplet/resell.js @@ -30,3 +30,10 @@ export const getResellDetail = async (id) => { url: '/admin-api/applet/xunjia/distribution/' + id }) } + +export const getResellSimpleList = async (params) => { + return await request.get({ + url: '/admin-api/applet/xunjia/distribution/simple-list', + params: params + }) +} diff --git a/src/api/xjapplet/vip.js b/src/api/xjapplet/vip.js index 5581edd..c9c50c0 100644 --- a/src/api/xjapplet/vip.js +++ b/src/api/xjapplet/vip.js @@ -37,7 +37,7 @@ export const updateVipType = async (data) => { export const deleteVipType = async (id) => { return await request.delete({ - url: '/admin-api/applet/xunjia/member/memberId?id=' + id + url: '/admin-api/applet/xunjia/member/delete?memberId=' + id }) } @@ -47,3 +47,10 @@ export const getVipTypeOptions = async (params) => { params: params }) } + +export const getRechargeRecords = async (params) => { + return await request.get({ + url: '/admin-api/applet/xunjia/pay/list', + params: params + }) +} diff --git a/src/permission.js b/src/permission.js index f0cb6e5..bf1625c 100644 --- a/src/permission.js +++ b/src/permission.js @@ -42,12 +42,9 @@ router.beforeEach(async (to, from, next) => { if (to.path === '/login') { if (to.query?.tenantId && to.query?.appId) { setApp(to.query.tenantId, to.query.appId) - setTimeout(() => { - next({ path: '/' }) - }, 1500) - } else { - next({ path: '/' }) + await waitTime(1500) } + next({ path: '/' }) } else { // 获取所有字典 const dictStore = useDictStoreWithOut() @@ -80,15 +77,23 @@ router.beforeEach(async (to, from, next) => { const tenantId = getTenantId() const appId = getAppId() if (tenantId && appId) { - next(`/oa/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页 + next(`/crm/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页 } else { - next(`/oa/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页 + next(`/crm/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页 } } } } }) +async function waitTime(seconds) { + return new Promise((resolve) => { + setTimeout(() => { + resolve() + }, seconds) + }) +} + function setApp(tenantId, appId) { setTenantId(tenantId) diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index bf745cb..3720fda 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -53,24 +53,37 @@ const remainingRouter: AppRouteRecordRaw[] = [ { path: '/', component: Layout, - redirect: '/index', + redirect: '/Home/index', name: '', meta: { - title: '首页' - }, - children: [ - { - path: '/index', - component: () => import('@/views/Home/Index.vue'), - name: 'Home', - meta: { - title: '首页', - icon: 'ep:home-filled', - noTagsView: true, - affix: true - } - } - ] + title: '首页', + hidden: true + } + // children: [ + // { + // path: '/index', + // component: () => import('@/views/Home/Index.vue'), + // name: 'Home', + // meta: { + // title: '首页', + // icon: 'ep:home-filled', + // noTagsView: true, + // affix: true + // // hidden: true + // } + // } + // { + // path: 'menu', + // component: () => import('@/views/Basic/Menu/index.vue'), + // name: 'Menu', + // meta: { + // affix: true, + // noTagsView: true, + // icon: 'ep:user', + // title: '菜单管理' + // } + // } + // ] }, { path: '/swagger', @@ -145,11 +158,11 @@ const remainingRouter: AppRouteRecordRaw[] = [ // path: '/Basic', // component: Layout, // name: 'Basic', - // meta: { title: '菜单管理' }, // redirect: '/Basic/menu', + // meta: { title: '菜单管理' }, // children: [ // { - // path: '/menu', + // path: 'menu', // component: () => import('@/views/Basic/Menu/index.vue'), // name: 'Menu', // meta: { diff --git a/src/views/XjApplet/Vip/components/Recharge.vue b/src/views/XjApplet/Vip/components/Recharge.vue new file mode 100644 index 0000000..ec68950 --- /dev/null +++ b/src/views/XjApplet/Vip/components/Recharge.vue @@ -0,0 +1,109 @@ + + + + + diff --git a/src/views/XjApplet/Vip/components/VipType.vue b/src/views/XjApplet/Vip/components/VipType.vue index 39c80b8..2bc3b17 100644 --- a/src/views/XjApplet/Vip/components/VipType.vue +++ b/src/views/XjApplet/Vip/components/VipType.vue @@ -6,8 +6,8 @@ - 小车 - 摩托车 + 小车 + 摩托车 @@ -68,14 +68,14 @@ - - + + - - - - + + + + @@ -116,7 +116,7 @@ import { getVipTypeList, addVipType, updateVipType, deleteVipType } from '@/api/ const message = useMessage() const searchForm = ref({ memberName: undefined, - carTypeId: '1001', + carTypeId: 1001, pageNo: 1, pageSize: 50 }) @@ -146,7 +146,7 @@ const showDialog = ref(false) const form = ref({ memberName: '', carTypeId: undefined, - subjects: [], + subjectList: [], price: '', discount: '', duration: '', @@ -156,7 +156,7 @@ const form = ref({ const rules = ref({ memberName: [{ required: true, message: '请输入会员名称', trigger: 'blur' }], carTypeId: [{ required: true, message: '请输入车型', trigger: 'change' }], - subjects: [{ required: true, message: '请输入科目', trigger: 'blur' }], + subjectList: [{ required: true, message: '请输入科目', trigger: 'blur' }], price: [{ required: true, message: '请输入价格', trigger: 'blur' }], discount: [{ required: true, message: '请输入折扣价', trigger: 'blur' }], duration: [{ required: true, message: '请输入有效期', trigger: 'blur' }] @@ -165,10 +165,10 @@ const rules = ref({ function addVip() { showDialog.value = true - form.value.carTypeId = { + form.value = { memberName: '', carTypeId: searchForm.value.carTypeId, - subjects: [], + subjectList: [], price: '', discount: '', duration: '', @@ -178,7 +178,7 @@ function addVip() { } function editVip(row) { - form.value = { ...row, subjects: row.subjects.split(','), unit: Number(row.unit) } + form.value = { ...row, unit: Number(row.unit) } showDialog.value = true } diff --git a/src/views/XjApplet/Vip/index.vue b/src/views/XjApplet/Vip/index.vue index b73a841..e92be68 100644 --- a/src/views/XjApplet/Vip/index.vue +++ b/src/views/XjApplet/Vip/index.vue @@ -13,6 +13,9 @@ + + + @@ -23,6 +26,7 @@ import UserDiscount from './components/UserDiscount.vue' import VipDiscount from './components/VipDiscount.vue' import VipType from './components/VipType.vue' import VipUser from './components/VipUser.vue' +import Recharge from './components/Recharge.vue' const tabIndex = ref(1)