diff --git a/kaka总后台-正式.zip b/kaka总后台-正式.zip index ed6ab32..bece0bf 100644 Binary files a/kaka总后台-正式.zip and b/kaka总后台-正式.zip differ diff --git a/kaka总后台-测试.zip b/kaka总后台-测试.zip index 6b5e790..b8e863e 100644 Binary files a/kaka总后台-测试.zip and b/kaka总后台-测试.zip differ diff --git a/package.json b/package.json index 08416de..4bfe8f7 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,6 @@ "build:staging": "vue-cli-service build --mode staging", "build:all": "npm run build:staging && npm run build:prod", "build:staging:merchant_1": "vue-cli-service build --mode staging --variant merchant_1", - "build:prod": "vue-cli-service build", "preview": "node build/index.js --preview", "lint": "eslint --ext .js,.vue src" }, @@ -46,6 +45,7 @@ "axios": "0.24.0", "clipboard": "2.0.8", "core-js": "3.25.3", + "dayjs": "^1.11.9", "echarts": "5.4.0", "element-ui": "2.15.12", "file-saver": "2.0.5", @@ -81,14 +81,14 @@ "connect": "3.6.6", "eslint": "7.15.0", "eslint-plugin-vue": "7.2.0", + "filemanager-webpack-plugin": "3.1.1", "lint-staged": "10.5.3", "runjs": "4.4.2", "sass": "1.32.13", "sass-loader": "10.1.1", "script-ext-html-webpack-plugin": "2.1.5", "svg-sprite-loader": "5.1.1", - "vue-template-compiler": "2.6.12", - "filemanager-webpack-plugin": "3.1.1" + "vue-template-compiler": "2.6.12" }, "engines": { "node": ">=8.9", diff --git a/src/api/merchant/PayernameBlacklist.js b/src/api/merchant/PayernameBlacklist.js new file mode 100644 index 0000000..c85f876 --- /dev/null +++ b/src/api/merchant/PayernameBlacklist.js @@ -0,0 +1,51 @@ +import request from '@/utils/request' + +// 查询付款人黑名单列表 +export function listPayernameBlacklist(query) { + return request({ + url: '/merchant/blacklist/list', + method: 'get', + params: query + }) +} + +// 查询付款人黑名单详细 +export function getPayernameBlacklist(id) { + return request({ + url: '/merchant/payername/blacklist/' + id, + method: 'get' + }) +} + +// 新增付款人黑名单 +export function addPayernameBlacklist(data) { + return request({ + url: '/merchant/blacklist', + method: 'post', + data: data + }) +} +// 修改付款人黑名单 +export function updatePayernameBlacklist(data) { + return request({ + url: '/merchant/blacklist', + method: 'put', + data: data + }) +} +// 删除付款人黑名单 +export function delPayernameBlacklist(id) { + return request({ + url: '/merchant/blacklist/' + id, + method: 'delete' + }) +} + +// 导出付款人黑名单 +export function exportPayernameBlacklist(query) { + return request({ + url: '/merchant/PayernameBlacklist/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/views/exchange/daifuSonOrder.vue b/src/views/exchange/daifuSonOrder.vue index 83f5f8d..d5f1a69 100644 --- a/src/views/exchange/daifuSonOrder.vue +++ b/src/views/exchange/daifuSonOrder.vue @@ -8,7 +8,7 @@ - + + + + + + + + @@ -67,15 +77,29 @@ + + - - + + + + + + + + + + + + @@ -90,8 +114,10 @@