diff --git a/package.json b/package.json
index 5459e12..084a967 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
"@riophae/vue-treeselect": "^0.4.0",
"axios": "0.18.1",
"core-js": "3.6.5",
+ "dayjs": "^1.11.13",
"echarts": "^5.4.2",
"element-ui": "2.13.2",
"file-saver": "^2.0.5",
diff --git a/src/api/settle.js b/src/api/settle.js
index 01f1031..c1957b2 100644
--- a/src/api/settle.js
+++ b/src/api/settle.js
@@ -10,7 +10,7 @@ import request from '@/utils/request'
export function accountList() {
return request({
url: '/system/pub/enums/account',
- method: 'get',
+ method: 'get'
})
}
@@ -18,7 +18,7 @@ export function accountList() {
export function currencyType() {
return request({
url: '/system/pub/enums/currency-type',
- method: 'get',
+ method: 'get'
})
}
@@ -26,7 +26,7 @@ export function currencyType() {
export function vertexList() {
return request({
url: '/system/manage/vertex/find-all',
- method: 'get',
+ method: 'get'
})
}
@@ -34,7 +34,7 @@ export function vertexList() {
export function memberTeam() {
return request({
url: '/member/manage/member-team/list',
- method: 'get',
+ method: 'get'
})
}
@@ -110,7 +110,6 @@ export function makerSpaceReject(data) {
})
}
-
// 获取创客空间详情
export function markerSpaceDetail(params) {
return request({
@@ -403,7 +402,7 @@ export function queryTitle(params) {
})
}
-//顶点下拉选
+// 顶点下拉选
export function topVertexList(params) {
return request({
url: '/member/manage/bonus-vertex-statis/vertexList',
@@ -469,4 +468,13 @@ export function bonusLenStatis(params) {
method: 'get',
params
})
-}
\ No newline at end of file
+}
+
+// 拓展延缓列表
+export function expansionDelayList(params) {
+ return request({
+ url: '/bonus/manage/bonus-delay/delay-list',
+ method: 'get',
+ params
+ })
+}
diff --git a/src/router/index.js b/src/router/index.js
index ac0d251..5bf1ba4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -931,6 +931,12 @@ export const constantRoutes = [
component: () => import('@/views/settlementCenter/recommendData/index'),
meta: { title: '推荐数据' }
},
+ {
+ path: 'bonus/expansionDelay',
+ name: 'BonusExpansionDelay',
+ component: () => import('@/views/settlementCenter/bonus/expansion-delay/index.vue'),
+ meta: { title: '拓展延缓' }
+ },
{
path: 'recommendDatas',
name: 'recommendDatas',
diff --git a/src/utils/date.js b/src/utils/date.js
new file mode 100644
index 0000000..fc15ef7
--- /dev/null
+++ b/src/utils/date.js
@@ -0,0 +1,6 @@
+import dayjs from 'dayjs'
+
+export function getBeforeDays(n = 1) {
+ return dayjs().subtract(n, 'day').format('YYYY-MM-DD')
+}
+
diff --git a/src/views/settlementCenter/bonus/expansion-delay/index.vue b/src/views/settlementCenter/bonus/expansion-delay/index.vue
new file mode 100644
index 0000000..b7a0dc7
--- /dev/null
+++ b/src/views/settlementCenter/bonus/expansion-delay/index.vue
@@ -0,0 +1,371 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ '搜索' }}
+ {{ '重置' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/theme/index.css b/theme/index.css
index bc7160f..b87451d 100644
--- a/theme/index.css
+++ b/theme/index.css
@@ -11316,7 +11316,7 @@
}
.el-date-table td.disabled div {
- background-color: #c8161d;
+ background-color: #f5f7fa;
opacity: 1;
cursor: not-allowed;
color: #ccc
diff --git a/vue.config.js b/vue.config.js
index b6559a2..61345ef 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -44,11 +44,11 @@ module.exports = {
},
proxy: {
'/prod-api': {
- target: 'http://t-mana.beida413.com',
- changeOrigin: true
- // pathRewrite: {
- // '^/prod-api': ''
- // }
+ target: 'http://192.168.0.104:8080/',
+ changeOrigin: true,
+ pathRewrite: {
+ '^/prod-api': ''
+ }
}
}
// before: require('./mock/mock-server.js')