diff --git a/.env.development b/.env.development index 2a5e48a..275d6fc 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ ENV = 'development' # base api # VUE_APP_BASE_API = '/dev-api' # VUE_APP_BASE_API = 'http://106.75.49.247:20400' -VUE_APP_BASE_API = 'https://yruibao.com/admin' -# VUE_APP_BASE_API = 'http://192.168.2.26:20401' +# VUE_APP_BASE_API = 'https://yruibao.com/admin' +VUE_APP_BASE_API = 'http://192.168.2.26:20401' # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, diff --git a/.env.production b/.env.production index 7119b75..4cfe70a 100644 --- a/.env.production +++ b/.env.production @@ -4,5 +4,5 @@ ENV = 'production' # base api # VUE_APP_BASE_API = '/prod-api' # VUE_APP_BASE_API = 'http://106.75.49.247:20400' -VUE_APP_BASE_API = 'https://yruibao.com/admin' -# VUE_APP_BASE_API = 'http://192.168.2.26:20401' +# VUE_APP_BASE_API = 'https://yruibao.com/admin' +VUE_APP_BASE_API = 'http://192.168.2.26:20401' diff --git a/package.json b/package.json index 695404a..685dd2c 100644 --- a/package.json +++ b/package.json @@ -54,6 +54,7 @@ "js-cookie": "2.2.0", "jsonlint": "1.6.3", "jszip": "^3.10.1", + "mapbox-gl": "^3.2.0", "mpvue-calendar": "^2.3.7", "normalize.css": "7.0.0", "nprogress": "0.2.0", @@ -72,6 +73,7 @@ "vue": "2.6.10", "vue-awesome-swiper": "^3.1.3", "vue-echarts": "^4.0.3", + "vue-image-lightbox": "^7.2.0", "vue-pdf": "^4.3.0", "vue-router": "3.0.2", "vue-ydui": "^1.2.6", diff --git a/src/api/channel.js b/src/api/channel.js index cd1b05e..fde52d0 100644 --- a/src/api/channel.js +++ b/src/api/channel.js @@ -50,6 +50,19 @@ export function ListChannel(pram) { params: data, }); } + +export function getAuditList(pram) { + const data = { + + page: pram.page, + limit: pram.limit, + }; + return request({ + url: 'admin/system/admin/auditorList', + method: 'GET', + params: data, + }); +} /** * 渠道统计列表 * @param pram diff --git a/src/api/order.js b/src/api/order.js index aa55a33..5a96425 100644 --- a/src/api/order.js +++ b/src/api/order.js @@ -37,6 +37,18 @@ export function orderListDataApi(params) { params, }); } + +/** + * 订单 列表 数据统计 +// * @param params + */ +export function getAuditnum(num) { + return request({ + url: `/admin/store/order/claim?num=`+num, + method: 'get', + // params, + }); +} /** * 订单 删除 * @param params @@ -177,7 +189,15 @@ export function orderStatisticsApi() { method: 'get', }); } - +/** + * 订单 统计 待领取待审核订单数量 + */ +export function getUnclaimed() { + return request({ + url: `admin/store/order/getUnclaimed/num`, + method: 'get', + }); +} /** * 核销订单 月列表数据 */ diff --git a/src/api/setting1.js b/src/api/setting1.js index 82f135b..41ae627 100644 --- a/src/api/setting1.js +++ b/src/api/setting1.js @@ -63,7 +63,8 @@ export function AddInstallments(pram) { amountComesUp: pram.amountComesUp, downPaymentPercent: pram.downPaymentPercent, downPaymentNumber: pram.downPaymentNumber, - cycle:pram.cycle + cycle:pram.cycle, + tips:pram.tips }; return request({ url: '/admin/installments/save', @@ -84,7 +85,8 @@ export function UpdateInstallments(pram) { amountComesUp: pram.amountComesUp, downPaymentPercent: pram.downPaymentPercent, downPaymentNumber: pram.downPaymentNumber, - cycle:pram.cycle + cycle:pram.cycle, + tips:pram.tips }; return request({ url: '/admin/installments/update', diff --git a/src/router/index.js b/src/router/index.js index e896a7b..e83a4a8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -24,6 +24,7 @@ import appSettingRouter from './modules/appSetting'; import maintainRouter from './modules/maintain'; import mobileRouter from './modules/mobile'; import statistic from './modules/statistic'; +import examineRouter from './modules/examine' /** * Note: sub-menu only appear when route children.length >= 1 @@ -82,6 +83,9 @@ export const constantRoutes = [ mobileRouter, // 统计管理 statistic, + // 审核管理 + examineRouter, + { path: '/404', @@ -154,6 +158,7 @@ export const constantRoutes = [ meta: { title: '渠道统计' }, component: () => import('@/views/statistic/channel/index'), }, + ], }, { diff --git a/src/router/modules/examine.js b/src/router/modules/examine.js new file mode 100644 index 0000000..93228f4 --- /dev/null +++ b/src/router/modules/examine.js @@ -0,0 +1,29 @@ +import Layout from '@/layout'; + +const examineRouter = { + path: '/examine', + component: Layout, + redirect: '/examine/index', + name: 'examine', + alwaysShow: true, + meta: { + title: '审核', + icon: 'clipboard', + }, + children: [ + { + path: 'index', + component: () => import('@/views/examine/index'), + name: 'examineIndex', + meta: { title: '审核看板' }, + }, + { + path: 'examineList', + component: () => import('@/views/examine/examineList'), + name: 'examineList', + meta: { title: '审核报表' }, + }, + ], +}; + +export default examineRouter; diff --git a/src/views/dashboard/components/gridMenu.vue b/src/views/dashboard/components/gridMenu.vue index dc99ab6..a693726 100644 --- a/src/views/dashboard/components/gridMenu.vue +++ b/src/views/dashboard/components/gridMenu.vue @@ -23,7 +23,7 @@ class="nav_grid_item" v-for="(item, index) in businessList" :key="index" - @click="navigatorTo(item.path)" + @click="navigatorTo(item.path,item.status)" >
{{ item.num }}
{{ item.title }}
@@ -110,13 +110,13 @@ export default { // }, ], statisticData: [ - { title: '待发货订单', num: 0, path: '/order/index', perms: ['admin:order:list'] }, - { title: '退款中订单', num: 0, path: '/order/index', perms: ['admin:order:list'] }, - { title: '待审核订单', num: 0, perms: ['admin:order:list'] }, + { title: '待发货订单', num: 0, path: '/order/index', perms: ['admin:order:list'],status:'notShipped' }, + { title: '退款中订单', num: 0, path: '/order/index', perms: ['admin:order:list'],status:'refunding' }, + { title: '待审核订单', num: 0,path: '/order/index', perms: ['admin:order:list'],status:'audit' }, { title: '昨日回款率', num: 0, perms: ['admin:product:list'] }, { title: '明日到期', num: 0, perms: ['admin:product:list'] }, { title: '仓库商品', num: 0, path: '/store/index', perms: ['admin:product:list'] }, - { title: '提现待审核', num: 0, path: '/financial/commission/template', perms: ['admin:finance:apply:list'] }, + // { title: '提现待审核', num: 0, path: '/financial/commission/template', perms: ['admin:finance:apply:list'] }, { title: '账户充值', num: 0, path: '/financial/record/charge', perms: ['admin:recharge:list'] }, ], optionData: {}, @@ -151,8 +151,10 @@ export default { }, methods: { checkPermi, - navigatorTo(path) { - this.$router.push(path); + navigatorTo(path,status) { + console.log(path,status,'pathpathpathpath'); + this.$router.push({ path: path, query: { status: status }}); + }, getbusinessData() { businessData().then((res) => { diff --git a/src/views/examine/examineList.vue b/src/views/examine/examineList.vue new file mode 100644 index 0000000..645cf81 --- /dev/null +++ b/src/views/examine/examineList.vue @@ -0,0 +1,524 @@ + +