Skip to content

O
op-web-service
Commit 3e365632 authored by lihui's avatar lihui
Browse files
Options

feat: mearge-fix-dom

parents 99209d02 3fd5ee2d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4401 additions and 1158 deletions
README.md
View file @ 3e365632
......@@ -37,7 +37,7 @@ npm run web-dev
# 部署发布流程
## 测试环境（http://clay.yidian-inc.com）
## 测试环境（http://venus.int.yidian-inc.com:8055）
待提测代码push test分支。对应下列三个job 打包部署测试环境
- 1. bp-op-web-service-branch-commit
- 2. bp-op-web-service-branch-assemble
......
jest.config.js 0 → 100644
View file @ 3e365632
/*
* For a detailed explanation regarding each configuration property, visit:
* https://jestjs.io/docs/configuration
*/
module.exports = {
// All imported modules in your tests should be mocked automatically
// automock: false,
// Stop running tests after `n` failures
// bail: 0,
// The directory where Jest should store its cached dependency information
// cacheDirectory: "/private/var/folders/5p/f45l166j057533bqfd5n9w880000gp/T/jest_dy",
// Automatically clear mock calls and instances between every test
clearMocks: true,
// Indicates whether the coverage information should be collected while executing the test
// collectCoverage: false,
// An array of glob patterns indicating a set of files for which coverage information should be collected
// collectCoverageFrom: undefined,
// The directory where Jest should output its coverage files
// coverageDirectory: undefined,
// An array of regexp pattern strings used to skip coverage collection
// coveragePathIgnorePatterns: [
// "/node_modules/"
// ],
// Indicates which provider should be used to instrument code for coverage
coverageProvider: "v8",
// A list of reporter names that Jest uses when writing coverage reports
// coverageReporters: [
// "json",
// "text",
// "lcov",
// "clover"
// ],
// An object that configures minimum threshold enforcement for coverage results
// coverageThreshold: undefined,
// A path to a custom dependency extractor
// dependencyExtractor: undefined,
// Make calling deprecated APIs throw helpful error messages
// errorOnDeprecated: false,
// Force coverage collection from ignored files using an array of glob patterns
// forceCoverageMatch: [],
// A path to a module which exports an async function that is triggered once before all test suites
// globalSetup: undefined,
// A path to a module which exports an async function that is triggered once after all test suites
// globalTeardown: undefined,
// A set of global variables that need to be available in all test environments
// globals: {},
// The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
// maxWorkers: "50%",
// An array of directory names to be searched recursively up from the requiring module's location
// moduleDirectories: [
// "node_modules"
// ],
// An array of file extensions your modules use
moduleFileExtensions: ["js", "json", "vue"],
// A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
moduleNameMapper: {
"@/(.*)$": "<rootDir>/src/$1"
},
// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
// modulePathIgnorePatterns: [],
// Activates notifications for test results
// notify: false,
// An enum that specifies notification mode. Requires { notify: true }
// notifyMode: "failure-change",
// A preset that is used as a base for Jest's configuration
// preset: undefined,
// Run tests from one or more projects
// projects: undefined,
// Use this configuration option to add custom reporters to Jest
// reporters: undefined,
// Automatically reset mock state between every test
// resetMocks: false,
// Reset the module registry before running each individual test
// resetModules: false,
// A path to a custom resolver
// resolver: undefined,
// Automatically restore mock state between every test
// restoreMocks: false,
// The root directory that Jest should scan for tests and modules within
// rootDir: undefined,
// A list of paths to directories that Jest should use to search for files in
// roots: [
// "<rootDir>"
// ],
// Allows you to use a custom runner instead of Jest's default test runner
// runner: "jest-runner",
// The paths to modules that run some code to configure or set up the testing environment before each test
// setupFiles: [],
// A list of paths to modules that run some code to configure or set up the testing framework before each test
// setupFilesAfterEnv: [],
// The number of seconds after which a test is considered as slow and reported as such in the results.
// slowTestThreshold: 5,
// A list of paths to snapshot serializer modules Jest should use for snapshot testing
// snapshotSerializers: [],
// The test environment that will be used for testing
testEnvironment: "jsdom",
// Options that will be passed to the testEnvironment
// testEnvironmentOptions: {},
// Adds a location field to test results
// testLocationInResults: false,
// The glob patterns Jest uses to detect test files
// testMatch: [
// "**/__tests__/**/*.[jt]s?(x)",
// "**/?(*.)+(spec|test).[tj]s?(x)"
// ],
// An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
// testPathIgnorePatterns: [
// "/node_modules/"
// ],
// The regexp pattern or array of patterns that Jest uses to detect test files
// testRegex: [],
// This option allows the use of a custom results processor
// testResultsProcessor: undefined,
// This option allows use of a custom test runner
// testRunner: "jest-circus/runner",
// This option sets the URL for the jsdom environment. It is reflected in properties such as location.href
// testURL: "http://localhost",
// Setting this value to "fake" allows the use of fake timers for functions such as "setTimeout"
// timers: "real",
// A map from regular expressions to paths to transformers
transform: {
"^.+\\.vue$": "vue3-jest",
"^.+\\.js$": "babel-jest"
}
// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
// transformIgnorePatterns: [
// "/node_modules/",
// "\\.pnp\\.[^\\/]+$"
// ],
// An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
// unmockedModulePathPatterns: undefined,
// Indicates whether each individual test should be reported during the run
// verbose: undefined,
// An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
// watchPathIgnorePatterns: [],
// Whether to use watchman for file crawling
// watchman: true,
};
package-lock.json
View file @ 3e365632
......@@ -7300,9 +7300,15 @@
"dev": true
},
"node_modules/dayjs": {
<<<<<<< HEAD
"version": "1.10.6",
"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.6.tgz",
"integrity": "sha512-AztC/IOW4L1Q41A86phW5Thhcrco3xuAA+YX/BLpLWWjRcTj5TOt/QImBLmCKlrF7u7k47arTnOyL6GnbG8Hvw=="
=======
"version": "1.10.5",
"resolved": "https://registry.nlark.com/dayjs/download/dayjs-1.10.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdayjs%2Fdownload%2Fdayjs-1.10.5.tgz",
"integrity": "sha1-VgDfRUj8JFOz8WPrsqu+llzPuYY="
>>>>>>> master
},
"node_modules/deasync": {
"version": "0.1.21",
......@@ -23989,17 +23995,6 @@
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
"integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"cliui": {
"version": "6.0.0",
"resolved": "https://registry.npm.taobao.org/cliui/download/cliui-6.0.0.tgz",
......@@ -24035,25 +24030,6 @@
"ms": "2.1.2"
}
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
"optional": true
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz?cache=0&sync_timestamp=1607433988749&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.1.2.tgz",
......@@ -24069,28 +24045,6 @@
"minipass": "^3.1.1"
}
},
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"optional": true,
"requires": {
"has-flag": "^4.0.0"
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.2.0",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.2.0.tgz",
"integrity": "sha512-TitGhqSQ61RJljMmhIGvfWzJ2zk9m1Qug049Ugml6QP3t0e95o0XJjk29roNEiPKJQBEi8Ord5hFuSuELzSp8Q==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
}
},
"wrap-ansi": {
"version": "6.2.0",
"resolved": "https://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-6.2.0.tgz",
......@@ -37998,6 +37952,87 @@
}
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.3.3",
"resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.3.3.tgz?cache=0&sync_timestamp=1626830452707&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvue-loader%2Fdownload%2Fvue-loader-16.3.3.tgz",
"integrity": "sha1-5EDk6xJ4bhYTi12YthIgjynd9TI=",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995547052&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
"integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.1",
"resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.1.tgz?cache=0&sync_timestamp=1618995354302&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.1.tgz",
"integrity": "sha1-yAs/qyi/Y3HmhjMl7uZ+YYt35q0=",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
"integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
"integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
"dev": true,
"optional": true
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz",
"integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
"dev": true,
"optional": true
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
"integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1626703400240&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
"integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
"dev": true,
"optional": true,
"requires": {
"has-flag": "^4.0.0"
}
}
}
},
"vue-router": {
"version": "4.0.8",
"resolved": "https://registry.nlark.com/vue-router/download/vue-router-4.0.8.tgz",
server/config.js
View file @ 3e365632
......@@ -19,5 +19,7 @@ module.exports = {
API_INTERNAL_URI: API_INTERNAL_URI[env],
PANDORA_URI: PANDORA_URI[env],
GOODS_URI: API_INTERNAL_URI[env],
ACTIVITY_URI: API_INTERNAL_URI[env]
ACTIVITY_URI: API_INTERNAL_URI[env],
WITHDRAWAL_URI: API_INTERNAL_URI[env],
GROUPMEAL_URI: API_INTERNAL_URI[env],
};
server/controllers/groupmeal.js 0 → 100644
View file @ 3e365632
const GROUPMEAL_URI = require("../config.js").GROUPMEAL_URI;
const req = require("../utils/request").httpReq;
// 获取订单管理列表
exports.getOrderList = async ctx => {
const url = `${GROUPMEAL_URI}/order/background/order_list`;
const opts = {
url,
method: "GET"
};
ctx.body = await req(ctx, opts);
};
// 获取主页配送列表
exports.getList = async ctx => {
const opts = {
url: `${GROUPMEAL_URI}/order/deliverer/list_day_deliverer_conf`,
method: "POST",
json: true,
body: ctx.request.body
};
ctx.body = await req(ctx, opts);
};
// 获取配送列表
exports.getDelivererList = async ctx => {
const opts = {
url: `${GROUPMEAL_URI}/order/deliverer/list_day_deliverer`,
method: "POST",
json: true,
body: ctx.request.body
};
ctx.body = await req(ctx, opts);
};
// 添加骑手
exports.getAddDeliverer = async ctx => {
const opts = {
url: `${GROUPMEAL_URI}/order/deliverer/add_deliverer`,
method: "POST",
json: true,
body: ctx.request.body
};
ctx.body = await req(ctx, opts);
};
// 分配骑手
exports.getSaveDeliverer = async ctx => {
const opts = {
url: `${GROUPMEAL_URI}/order/deliverer/save_day_deliverer`,
method: "POST",
json: true,
body: ctx.request.body
};
ctx.body = await req(ctx, opts);
};
// 获取活动名称
exports.getMarketingList = async ctx => {
const url = `${GROUPMEAL_URI}/order/background/marketing_list`;
const opts = {
url,
method: "GET"
};
ctx.body = await req(ctx, opts);
};
// 获取商品名称
exports.getGoodsList = async ctx => {
const url = `${GROUPMEAL_URI}/order/background/goods_list`;
const opts = {
url,
method: "GET"
};
ctx.body = await req(ctx, opts);
};
// 获取自提点
exports.getSubShopList = async ctx => {
const url = `${GROUPMEAL_URI}/order/background/sub_shop_list`;
const opts = {
url,
method: "GET"
};
ctx.body = await req(ctx, opts);
};
// 导出订单
exports.orderExport = async ctx => {
const url = `${GROUPMEAL_URI}/order/background/order_export`;
const opts = {
url,
method: "GET"
};
ctx.body = await req(ctx, opts);
};
// 打印订单
exports.orderPrint = async ctx => {
const url = `${GROUPMEAL_URI}/order/background/order_print`;
const opts = {
url,
method: "GET"
};
ctx.body = await req(ctx, opts);
};
// 订单退款列表
exports.orderItemList = async ctx => {
const url = `${GROUPMEAL_URI}/order/background/order_item_list`;
const opts = {
url,
method: "GET"
};
ctx.body = await req(ctx, opts);
};
// 订单退款列表
exports.orderRefund = async ctx => {
const url = `${GROUPMEAL_URI}/order/background/order_refund`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
};
ctx.body = await req(ctx, opts);
};
// 订单驳回
exports.orderRefundReject = async ctx => {
const url = `${GROUPMEAL_URI}/order/background/order_refund_reject`;
const opts = {
url,
method: "GET"
};
ctx.body = await req(ctx, opts);
};
server/controllers/utils.js
View file @ 3e365632
......@@ -9,7 +9,7 @@ exports.getUserPermission = async (ctx) => {
url,
method: "GET",
qs: {
//user_email: "jianghaiming@126.com"
// user_email: "jianghaiming@126.com"
user_email: user
}
};
......
server/controllers/withdrawal.js 0 → 100644
View file @ 3e365632
const WITHDRAWAL_URI = require("../config").WITHDRAWAL_URI;
const req = require("../utils/request").httpReq;
// const controller_utils = require('./utils')
/**
* 示例
* exports.方法名 = async ctx => {
* const url = `${设置好的域名}/向服务端发送的请求地址`;
* const opts = {
* url,
* method:"发送什么请求"，
* qs: ctx.request.query （get请求的参数）
* body：ctx.request.body （post请求的参数）
* json：boolean (是否转换为json)
* };
* ctx.body = await req(ctx,opts); 将发送请求后的数据传递给前端页面
* };
*/
// 获取提现审核列表
exports.getApplyList = async ctx => {
const url = `${WITHDRAWAL_URI}/wallet/background/apply_list`;
const opts = {
url,
method: "GET",
qs: ctx.request.query
};
ctx.body = await req(ctx, opts);
};
// 获取黑名单冻结账户
exports.getBlackList = async ctx => {
const url = `${WITHDRAWAL_URI}/wallet/background/blacklist`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
};
ctx.body = await req(ctx, opts);
};
// 获取通过、拒绝订单审核
exports.getWithdrawAudit = async ctx => {
const url = `${WITHDRAWAL_URI}/wallet/background/withdraw_audit`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body,
timeout: 10000
}
ctx.body = await req(ctx, opts)
}
// 获取提现失败冻结
exports.getFreezingFund = async ctx => {
const url = `${WITHDRAWAL_URI}/wallet/background/back_freezing_fund`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
}
ctx.body = await req(ctx, opts)
}
// 获取提现审核详情
exports.getApplyDetail = async ctx => {
const url = `${WITHDRAWAL_URI}/wallet/background/apply_detail`;
const opts = {
url,
method: "GET",
qs: ctx.request.query
}
ctx.body = await req(ctx, opts)
}
const getUserPermission = async (ctx) => {
const url = `${WITHDRAWAL_URI}/merchant/authority/get_role_list`;
const { email, op_cur_user } = ctx.request.query;
const user = email || op_cur_user;
const opts = {
url,
method: "GET",
qs: {
// user_email: "jianghaiming@126.com"
user_email: user
}
};
return await req(ctx, opts);
}
exports.getAll_role_list = async (ctx, next) => {
ctx.body = await getUserPermission(ctx);
}
\ No newline at end of file
server/router.js
View file @ 3e365632
......@@ -7,6 +7,8 @@ const role = require('./controllers/role')
const life = require('./controllers/life-no');
const goods = require('./controllers/goods');
const activity = require('./controllers/activity');
const withdrawal = require('./controllers/withdrawal');
const groupmeal = require('./controllers/groupmeal');
const router = Router();
const API_VERSION = "/api/v1";
......@@ -82,5 +84,29 @@ router.post(`${API_VERSION}/marketing/background/marketing_info`, activity.marke
router.post(`${API_VERSION}/marketing/background/update_marketing`, activity.updateMarketing);
// 团餐运营--配送
router.post(`${API_VERSION}/order/deliverer/list_day_deliverer_conf`, groupmeal.getList)
router.post(`${API_VERSION}/order/deliverer/list_day_deliverer`, groupmeal.getDelivererList)
router.post(`${API_VERSION}/order/deliverer/add_deliverer`, groupmeal.getAddDeliverer)
router.post(`${API_VERSION}/order/deliverer/save_day_deliverer`, groupmeal.getSaveDeliverer)
// 订单管理
router.get(`${API_VERSION}/order/background/order_list`, groupmeal.getOrderList);
router.get(`${API_VERSION}/order/background/marketing_list`, groupmeal.getMarketingList);
router.get(`${API_VERSION}/order/background/goods_list`, groupmeal.getGoodsList);
router.get(`${API_VERSION}/order/background/sub_shop_list`, groupmeal.getSubShopList);
router.get(`${API_VERSION}/order/background/order_export`, groupmeal.orderExport);
router.get(`${API_VERSION}/order/background/order_export`, groupmeal.orderExport);
router.get(`${API_VERSION}/order/background/order_print`, groupmeal.orderPrint);
router.get(`${API_VERSION}/order/background/order_item_list`, groupmeal.orderItemList);
router.get(`${API_VERSION}/order/background/order_refund_reject`, groupmeal.orderRefundReject);
router.post(`${API_VERSION}/order/background/order_refund`, groupmeal.orderRefund);
// 钱包提现审核 wallet/background/apply_detail
router.get(`${API_VERSION}/get_withdrawal_apply_list`, withdrawal.getApplyList)
router.post(`${API_VERSION}/get_withdrawal_black_list`, withdrawal.getBlackList)
router.post(`${API_VERSION}/get_withdraw_audit`, withdrawal.getWithdrawAudit)
router.post(`${API_VERSION}/get_freezing_fund`, withdrawal.getFreezingFund)
router.get(`${API_VERSION}/get_apply_detail`, withdrawal.getApplyDetail)
module.exports = router;
server/utils/request.js
View file @ 3e365632
const request = require("request");
exports.httpReq = (ctx, opts) => {
// opts.timeout = opts.timeout || 10000;
opts.timeout = 10000;
opts.timeout = opts.timeout || 10000;
return new Promise((resolve, reject) => {
var time_start = +new Date();
......
src/App.vue
View file @ 3e365632
......@@ -14,13 +14,17 @@ import { fetchCurrentUser } from "./service/user";
import { redirectToLogin } from "./utils/util";
export default {
async mounted() {
async created() {
console.log("master debug 2 !!!!!!");
if (this.$store.state.permissions && this.$store.state.userInfo) return;
const { status, user } = await fetchCurrentUser();
if (status === "success") {
this.$store.commit("updateUserInfo", user);
this.$store.dispatch("updateUserPermission", { email: user.email });
// 无奈之举，后期需要重构到提现管理中
this.$store.dispatch("fetchPermission", {
appId: "merchant-op-auditing",
});
} else {
redirectToLogin();
}
......
src/components/Pagination/index.vue
View file @ 3e365632
......@@ -24,7 +24,7 @@ export default {
},
data () {
return {
currentPage: 5
currentPage: 1
}
},
methods: {
......
src/components/Roles/RoleDetail.vue 0 → 100644
View file @ 3e365632
<template>
<div class="user-detail">
<el-page-header @back="goBack" content="角色详情页面"> </el-page-header>
<el-card class="management">
<h5 style="margin-bottom: 10px">角色信息</h5>
<el-descriptions class="margin-top" :column="2" border>
<el-descriptions-item>
<template #label> ID </template>
{{ roleId }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 角色状态 </template>
{{
role_info_detail.role_status == 1
? "正常"
: role_info_detail.role_status == 2
? "禁用"
: "删除"
}}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 角色名称 </template>
{{ role_info_detail.role_name }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 创建人账号 </template>
{{ role_info_detail.create_user_name }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 创建时间 </template>
{{ role_info_detail.create_time }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 最后修改人账号 </template>
{{ role_info_detail.update_user_name }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 最后修改时间 </template>
{{ role_info_detail.update_time }}
</el-descriptions-item>
</el-descriptions>
<div class="tree" v-if="selectedOptions">
<h5 style="margin-bottom: 10px">角色范围</h5>
<div>
<el-cascader
v-model="selectedOptions"
:options="permissionsAll"
placeholder="暂无数据"
disabled
:props="props"
style="width: 300px"
></el-cascader>
</div>
</div>
<div v-if="role_info_detail.role_account_list.length">
<h5 style="margin: 10px 0">角色账号</h5>
<div class="roleList">
<div
class="role_account_list"
v-for="(item, index) in role_info_detail.role_account_list"
:key="index"
>
{{ item }}
</div>
</div>
</div>
</el-card>
</div>
</template>
<script>
import {
get_role_info as reqGet_role_info,
getAll_role_list as reqGetAll_role_list,
} from "../../service/role";
export default {
name: "RoleDetail",
props: ["appId"],
data() {
return {
roleId: this.$route.query.roleId,
props: {
multiple: true, //设置为多选
value: "id", //value值和哪个值绑定
label: "desc", //label值和哪个值绑定
children: "sub_permissions", //children值和哪个值绑定
},
selectedOptions: [],
permissionsAll: [],
role_info_detail: {
//详情非编辑项
role_id: "",
role_name: "",
role_status: "",
update_time: "",
update_user_name: "",
create_time: "",
create_user_name: "",
role_account_list: [],
},
};
},
mounted() {
this.roleId = this.$route.query.roleId;
let { email } = this.$store.state.userInfo;
reqGetAll_role_list(email, this.appId).then((res) => {
this.permissionsAll = res.permissions;
});
reqGet_role_info(this.roleId, this.appId).then((res) => {
const {
role_name,
role_status,
update_time,
update_user_name,
create_time,
create_user_name,
role_account_list,
permissions,
} = res.result;
this.role_info_detail = {
role_name,
role_status,
update_time,
update_user_name,
create_time,
create_user_name,
role_account_list,
};
this.editEchoData(permissions);
});
},
methods: {
goBack() {
this.$router.back(-1);
},
//遍历回显值selectedOptions
editEchoData(permissions) {
let selectData = [];
permissions.map((item) => {
let one = { id: item.id };
if (item.sub_permissions) {
item.sub_permissions.map((info) => {
let selectId = [one.id, info.id];
selectData.push(selectId);
});
}
});
this.selectedOptions = selectData;
},
},
};
</script>
<style lang="less" scoped>
.user-detail {
margin: 50px;
.role_account_list {
padding: 10px;
color: #909399;
background: #fafafa;
font-weight: 400;
line-height: 1.5;
}
.management {
margin-top: 20px;
}
.roleList {
max-height: 300px;
overflow-y: scroll;
}
.tree {
// border: 1px solid #ebeef5;
margin-top: 20px;
}
}
</style>
src/components/Roles/RoleList.vue 0 → 100644
View file @ 3e365632
This diff is collapsed.
src/components/UserList/components/UserInfoEditModal.vue 0 → 100644
View file @ 3e365632
<template>
<div class="user-container">
<el-dialog title="编辑用户" v-model="modalVisable" :before-close="cancel">
<el-form :model="userInfo">
<el-form-item label="用户ID" :label-width="formLabelWidth">
<el-input
class="form-val"
v-model="userInfo.user_id"
size="medium"
disabled
></el-input>
</el-form-item>
<el-form-item label="状态" :label-width="formLabelWidth">
<!-- <el-input class="form-val">{{data.user_status===1?'启用':'禁用'}}</el-input> -->
<el-switch
class="form-val"
v-model="userInfo.user_status"
active-value="1"
inactive-value="2"
active-text="启用"
inactive-text="禁用"
>
</el-switch>
</el-form-item>
<el-form-item label="姓名" :label-width="formLabelWidth">
<el-input
class="form-val"
v-model="userInfo.user_name"
disabled
></el-input>
</el-form-item>
<el-form-item label="邮箱" :label-width="formLabelWidth" required>
<el-input
class="form-val"
v-model="userInfo.user_email"
disabled
></el-input>
</el-form-item>
<el-form-item label="手机号" :label-width="formLabelWidth">
<el-input class="form-val" v-model="userInfo.user_mobile"></el-input>
</el-form-item>
<el-form-item label="所属组织" :label-width="formLabelWidth">
<el-input
class="form-val"
v-model="userInfo.organization"
disabled
></el-input>
</el-form-item>
<el-form-item
label="授权角色信息"
:label-width="formLabelWidth"
required
>
<el-select
v-model="userInfo.roles"
multiple
placeholder="请选择"
class="form-val"
>
<el-option
v-for="item in roles"
:key="item.role_id"
:label="item.role_name"
:value="item.role_id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="敏感词权限" :label-width="formLabelWidth">
<el-switch
v-model="userInfo.is_sensitive_authority"
class="form-val"
active-value="1"
inactive-value="2"
active-text="开启"
inactive-text="关闭"
>
</el-switch>
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="confirm">确 定</el-button>
</span>
</template>
</el-dialog>
</div>
</template>
<script>
import { ElMessage } from "element-plus";
import { getRole_list as reqGetRoles } from "@/service/role";
export default {
name: "UserInfoEditModal",
props: {
data: Object,
visable: {
type: Boolean,
default: false
},
appId: String
},
data() {
return {
formLabelWidth: "120px",
userInfo: {},
roles: [],
modalVisable: false
};
},
watch: {
data(val) {
this.userInfo = JSON.parse(JSON.stringify(val));
this.userInfo.roles = val.roles.map(ele => ele.role_id);
this.userInfo.user_status = val.user_status.toString();
this.userInfo.is_sensitive_authority = val.is_sensitive_authority.toString();
},
visable(val) {
this.modalVisable = val;
}
},
beforeMount() {
this.getRoles();
},
methods: {
async getRoles() {
const { code, result } = await reqGetRoles(
{ page_size: 2000, page: 1 },
this.appId
);
if (code !== 0) {
ElMessage.error("获取角色列表出错！");
return;
}
this.roles = result;
},
confirm() {
const checkConditions = {
user_email: {
check: val => val.trim() !== "",
tip: "请输入邮箱！"
},
roles: {
check: val => val.length !== 0,
tip: "请添加角色！"
}
};
const keys = Object.keys(checkConditions);
for (let i = 0; i < keys.length; i++) {
const field = keys[i];
if (!checkConditions[field].check(this.userInfo[field])) {
ElMessage.error(checkConditions[field].tip);
return;
}
}
this.$emit("confirm", this.userInfo);
},
cancel() {
this.$emit("cancel");
}
}
};
</script>
<style lang="less">
.form-val {
margin-left: 20px;
width: 300px;
}
.form-val.el-input {
width: 80%;
}
</style>
src/components/UserList/components/UserInfoModal.vue 0 → 100644
View file @ 3e365632
<template>
<div class="user-container">
<el-dialog :title="title" v-model="modalVisable" :before-close="cancel">
<el-form :model="data">
<el-form-item label="用户ID" :label-width="formLabelWidth">
<text class="form-val">{{ data.user_id }}</text>
</el-form-item>
<el-form-item label="状态" :label-width="formLabelWidth">
<text class="form-val">{{
data.user_status == 1 ? "启用" : "禁用"
}}</text>
</el-form-item>
<el-form-item label="姓名" :label-width="formLabelWidth">
<text class="form-val">{{ data.user_name }}</text>
</el-form-item>
<el-form-item label="账号" :label-width="formLabelWidth">
<text class="form-val">{{ data.user_email }}</text>
</el-form-item>
<el-form-item label="手机号" :label-width="formLabelWidth">
<text class="form-val">{{ data.user_mobile }}</text>
</el-form-item>
<el-form-item label="所属组织" :label-width="formLabelWidth">
<text class="form-val">{{ data.organization }}</text>
</el-form-item>
<el-form-item label="添加账号人" :label-width="formLabelWidth">
<text class="form-val">{{ data.create_user_name }}</text>
</el-form-item>
<el-form-item label="添加时间" :label-width="formLabelWidth">
<text class="form-val">{{ data.create_time }}</text>
</el-form-item>
<el-form-item label="最后修改人账号" :label-width="formLabelWidth">
<text class="form-val">{{ data.update_user_name }}</text>
</el-form-item>
<el-form-item label="最后修改时间" :label-width="formLabelWidth">
<text class="form-val">{{ data.update_time }}</text>
</el-form-item>
<el-form-item label="授权角色信息" :label-width="formLabelWidth">
<text class="form-val">{{
data.roles.map(ele => ele.role_name).join(",")
}}</text>
</el-form-item>
<el-form-item label="敏感词权限" :label-width="formLabelWidth">
<text class="form-val">{{
data.is_sensitive_authority === 1 ? "是" : "否"
}}</text>
</el-form-item>
</el-form>
</el-dialog>
</div>
</template>
<script>
export default {
name: "UserInfoModal",
props: {
mode: {
type: String,
default: "check"
},
data: Object,
title: {
type: String,
default: "用户信息"
},
visable: {
type: Boolean,
default: false
}
},
data() {
return {
formLabelWidth: "180px",
modalVisable: false
};
},
watch: {
visable(val) {
this.modalVisable = val;
}
},
methods: {
cancel: function() {
this.$emit("cancel");
}
}
};
</script>
<style lang="less">
.form-val {
margin-left: 20px;
}
</style>
src/components/UserList/components/UserInfoNewModal.vue 0 → 100644
View file @ 3e365632
<template>
<div class="user-container">
<el-dialog title="创建用户" v-model="modalVisable" :before-close="cancel">
<el-form :model="userInfo">
<el-form-item label="状态" :label-width="formLabelWidth">
<!-- <el-input class="form-val">{{data.user_status===1?'启用':'禁用'}}</el-input> -->
<el-switch
class="form-val"
v-model="userInfo.user_status"
active-value="1"
inactive-value="2"
active-text="启用"
inactive-text="禁用"
>
</el-switch>
</el-form-item>
<el-form-item label="姓名" :label-width="formLabelWidth">
<el-input class="form-val" v-model="userInfo.user_name"></el-input>
</el-form-item>
<el-form-item label="邮箱" :label-width="formLabelWidth" required>
<el-input class="form-val" v-model="userInfo.user_email"></el-input>
</el-form-item>
<el-form-item label="手机号" :label-width="formLabelWidth">
<el-input class="form-val" v-model="userInfo.user_mobile"></el-input>
</el-form-item>
<el-form-item label="所属组织" :label-width="formLabelWidth">
<el-input class="form-val" v-model="userInfo.organization"></el-input>
</el-form-item>
<el-form-item label="授权角色" :label-width="formLabelWidth" required>
<el-select
v-model="userInfo.roles"
multiple
placeholder="请选择"
class="form-val"
>
<el-option
v-for="item in roles"
:key="item.role_id"
:label="item.role_name"
:value="item.role_id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="敏感词权限" :label-width="formLabelWidth">
<el-switch
v-model="userInfo.is_sensitive_authority"
class="form-val"
active-value="1"
inactive-value="2"
active-text="开启"
inactive-text="关闭"
>
</el-switch>
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="confirm">确 定</el-button>
</span>
</template>
</el-dialog>
</div>
</template>
<script>
import { ElMessage } from "element-plus";
import { getRole_list as reqGetRoles } from "@/service/role";
export default {
name: "UserInfoEditModal",
props: {
visable: {
type: Boolean,
default: false
},
appId: String
},
data() {
return {
formLabelWidth: "120px",
userInfo: {
user_name: "",
user_email: "",
is_sensitive_authority: "0",
user_mobile: "",
roles: [],
user_status: "1",
organization: ""
},
roles: [],
modalVisable: false
};
},
watch: {
visable(val) {
this.modalVisable = val;
if (val) {
this.userInfo = {
user_name: "",
user_email: "",
is_sensitive_authority: "0",
user_mobile: "",
roles: [],
user_status: "1",
organization: ""
};
}
}
},
beforeMount() {
this.getRoles();
},
methods: {
async getRoles() {
const { code, result } = await reqGetRoles(
{ page_size: 2000, page: 1 },
this.appId
);
if (code !== 0) {
ElMessage.error("获取角色列表出错！");
return;
}
this.roles = result;
},
confirm() {
const checkConditions = {
user_email: {
check: val => val.trim() !== "",
tip: "请输入邮箱！"
},
roles: {
check: val => val.length !== 0,
tip: "请添加角色！"
}
};
const keys = Object.keys(checkConditions);
for (let i = 0; i < keys.length; i++) {
const field = keys[i];
if (!checkConditions[field].check(this.userInfo[field])) {
ElMessage.error(checkConditions[field].tip);
return;
}
}
this.$emit("confirm", this.userInfo);
},
cancel() {
this.$emit("cancel");
}
}
};
</script>
<style lang="less">
.form-val {
margin-left: 20px;
width: 300px;
}
.form-val.el-input {
width: 80%;
}
</style>
src/components/UserList/index.vue 0 → 100644
View file @ 3e365632
<template>
<div class="user">
<el-form :inline="true" :model="pageParams" class="demo-form-inline">
<el-form-item label="用户姓名">
<el-input
maxlength="15"
v-model="pageParams.user_name"
placeholder="用户姓名"
></el-input>
</el-form-item>
<el-form-item label="用户账号">
<el-input
v-model="pageParams.user_email"
placeholder="用户账号"
></el-input>
</el-form-item>
<el-form-item label="手机号">
<el-input
v-model="pageParams.user_mobile"
placeholder="手机号"
></el-input>
</el-form-item>
<el-form-item label="状态">
<el-select v-model="pageParams.user_status" placeholder="状态">
<el-option value="1" label="启用"></el-option>
<el-option value="2" label="禁用"></el-option>
</el-select>
</el-form-item>
<el-form-item class="func-btn">
<el-button type="primary" @click="getUserList">查询</el-button>
<el-button @click="onReset">重置</el-button>
<el-button @click="createUser" :disabled="!permission.get('create')"
>新建用户</el-button
>
</el-form-item>
</el-form>
<el-table :data="renderUserList" border style="width: 100%">
<el-table-column prop="user_id" label="用户ID" width="70">
</el-table-column>
<el-table-column prop="user_name" label="用户姓名"> </el-table-column>
<el-table-column prop="user_email" label="用户账号"> </el-table-column>
<el-table-column prop="user_status" label="状态"> </el-table-column>
<el-table-column prop="user_mobile" label="手机号"> </el-table-column>
<el-table-column prop="update_time" label="最后修改日期">
</el-table-column>
<el-table-column prop="update_user_name" label="最后修改人账号">
</el-table-column>
<el-table-column fixed="right" label="操作" width="140">
<template #default="scope">
<el-button type="text" size="small" @click="checkUser(scope.row)"
>查看</el-button
>
<el-button
@click="editUser(scope.row)"
type="text"
size="small"
:disabled="!permission.get('edit')"
>修改</el-button
>
<el-button
v-if="scope.row.user_status === '启用'"
type="text"
size="small"
@click="disableUser(scope.row)"
:disabled="!permission.get('enable')"
>禁用</el-button
>
<el-button
v-if="scope.row.user_status === '禁用'"
type="text"
size="small"
@click="enableUser(scope.row)"
:disabled="!permission.get('disable')"
>启用</el-button
>
</template>
</el-table-column>
</el-table>
<page
:totalNum="totalNum"
:pageSize="pageParams.size"
@update="updatePage"
/>
</div>
<user-info-modal
:data="curUserInfo"
:visable="modalVisable.info"
@cancel="cancelModal('info')"
:appId="appId"
></user-info-modal>
<user-info-edit-modal
:data="curUserInfo"
:visable="modalVisable.edit"
@confirm="confirmEditModal"
@cancel="cancelModal('edit')"
:appId="appId"
></user-info-edit-modal>
<user-info-new-modal
:visable="modalVisable.new"
@confirm="confirmEditModal"
@cancel="cancelModal('new')"
:appId="appId"
></user-info-new-modal>
</template>
<script>
import page from "@/components/Pagination";
import UserInfoModal from "./components/UserInfoModal";
import UserInfoEditModal from "./components/UserInfoEditModal";
import UserInfoNewModal from "./components/UserInfoNewModal";
import { ElMessage } from "element-plus";
import {
getUserList as reqGetUserList,
getUserDetail as reqGetUserDetail,
editUser as reqEditUser,
createUser as reqCreateUser,
} from "@/service/user";
export default {
name: "UserList",
props: ["appId", "userPermissionId"],
components: {
page,
UserInfoModal,
UserInfoEditModal,
UserInfoNewModal,
},
data() {
return {
pageParams: {
appid: this.appId,
page: 1,
size: 20,
user_name: "",
user_email: "",
user_mobile: "",
user_status: "",
},
totalNum: 0,
userList: [],
curUserInfo: {},
modalVisable: {
info: false,
edit: false,
new: false,
},
curOperateMode: "new",
};
},
computed: {
permission() {
const appId = this.appId || "";
const userPermissionId = this.userPermissionId || "user";
const modulePermissions =
this.$store.getters.moduleSubPermissions(userPermissionId, appId) || [];
console.log("Current page func-permissions:", modulePermissions);
return new Map(modulePermissions.map((ele) => [ele.name, true]));
},
renderUserList() {
const statusMap = new Map([
[1, "启用"],
[2, "禁用"],
[3, "删除"],
]);
return this.userList.map((ele) => {
ele.user_status = statusMap.get(ele.user_status);
return ele;
});
},
},
beforeMount() {
this.getUserList();
},
methods: {
async getUserList() {
const { code, result } = await reqGetUserList(this.pageParams);
if (code !== 0) {
ElMessage.error("获取用户列表出错！");
return;
}
const { data, count } = result;
this.totalNum = count;
this.userList = data;
},
async setCurUserInfo(user_id) {
const { code, result } = await reqGetUserDetail({
appid: this.appId,
user_id,
});
if (code === 0) {
this.curUserInfo = {
...result.user_info,
roles: result.role_list,
};
} else {
ElMessage.error("获取用户信息出错！");
}
},
async checkUser(row) {
const { user_id } = row;
await this.setCurUserInfo(user_id);
this.openModal("info");
},
async editUser(row) {
const { user_id } = row;
await this.setCurUserInfo(user_id);
// this.openModal('edit');
this.modalVisable.edit = true;
this.curOperateMode = "edit";
},
openModal(key) {
Object.keys(this.modalVisable).forEach((ele) => {
this.modalVisable[ele] = key === ele;
});
},
async confirmEditModal(userInfo) {
const {
user_id,
user_name,
user_email,
is_sensitive_authority,
user_mobile,
roles,
user_status,
organization,
} = userInfo;
let res = {};
if (this.curOperateMode === "edit") {
const editData = {
user_id,
user_name,
user_email,
is_sensitive_authority: parseInt(is_sensitive_authority),
user_mobile,
role_id: roles,
user_status: parseInt(user_status),
};
res = await reqEditUser(editData, this.appId);
} else if (this.curOperateMode === "new") {
const newData = {
user_name,
user_email,
is_sensitive_authority: parseInt(is_sensitive_authority),
user_mobile,
role_id: roles,
user_status: parseInt(user_status),
organization,
};
res = await reqCreateUser(newData, this.appId);
}
if (res.code === 0) {
this.cancelModal(this.curOperateMode);
ElMessage.success("更新成功！");
this.getUserList();
} else {
ElMessage.error(res.reason);
}
},
cancelModal(name) {
this.modalVisable[name] = false;
},
createUser() {
this.curOperateMode = "new";
this.openModal("new");
},
//重置
onReset() {
this.pageParams = {
appid: this.appId,
page: 1,
pageSize: 20,
user_name: "",
user_email: "",
user_mobile: "",
user_status: "",
};
this.getUserList();
},
updatePage({ page, pageSize }) {
page && (this.pageParams.page = page);
pageSize && (this.pageParams.pageSize = pageSize);
this.getUserList();
},
async enableUser(row) {
const { user_id } = row;
const { code, reason } = await reqEditUser(
{
user_status: 1,
user_id,
},
this.appId
);
if (code === 0) {
ElMessage.success("启用成功！");
this.getUserList();
} else {
ElMessage.error(reason);
}
},
async disableUser(row) {
const { user_id } = row;
const { code, reason } = await reqEditUser(
{
user_status: 2,
user_id,
},
this.appId
);
if (code === 0) {
ElMessage.success("禁用成功！");
this.getUserList();
} else {
ElMessage.error(reason);
}
},
},
};
</script>
<style lang="less" scoped>
.user {
padding: 50px;
.search_life {
width: 280px;
}
.func-btn {
float: right;
}
}
</style>
src/config/pageconfig.js
View file @ 3e365632
......@@ -54,10 +54,10 @@ export const PERMISSIONNAME_PAGEMODULE = (function () {
* router 用该配置做路由权限拦截。需要增加权限拦截的路由，需在此添加配置。
*/
export const PATH_PERMISSION_NAME = {
'/enterprise/certification': 'enterprise_certification_management',
'/enterprise/audit': 'enterprise_certification_management.audit',
'/enterprise/establish': 'enterprise_certification_management.create',
'/lifeNo': 'life_official_account_management',
'/roleManageRole': 'role_management',
'/user': 'user_management'
'/op/enterprise/certification': 'enterprise_certification_management',
'/op/enterprise/audit': 'enterprise_certification_management.audit',
'/op/enterprise/establish': 'enterprise_certification_management.create',
'/op/lifeNo': 'life_official_account_management',
'/op/roleManageRole': 'role_management',
'/op/user': 'user_management'
}
\ No newline at end of file
src/pages/Activity/releaseProduc/components/addProduc.vue
View file @ 3e365632
......@@ -408,7 +408,6 @@ export default {
this.addCommodityPopup = true;
this.commodityForm = {};
if (type == "add") {
console.log(this.editInfo);
this.commodityForm.total_amount_order = 0;
this.addCommodityTitle = "商品添加";
} else {
......@@ -484,8 +483,27 @@ export default {
// 商品库选择商品保存
comLibrarySave() {
if (this.multipleSelection.length == 0) {
ElMessage.error("请选择商品");
return;
}
this.selCommodityPopup = false;
this.comTableData.push(...this.multipleSelection);
if (this.comTableData.length == 0) {
this.comTableData.push(...this.multipleSelection);
} else {
this.multipleSelection.forEach((item) => {
let num = 0;
this.comTableData.some((val) => {
num++;
if (val.goods_sku_id === item.goods_sku_id) {
val.goods_sku_id = item.goods_sku_id;
return true;
} else if (num === this.comTableData.length) {
this.comTableData.push(Object.assign({}, item));
}
});
});
}
},
// 移除
......
src/pages/Catch/forbidden.vue
View file @ 3e365632
<template>
<div>
<layout> 没有权限! </layout>
没有权限!
</div>
</template>
<script>
import Layout from '@/layouts';
export default {
components: {
Layout,
},
};
</script>
......
src/pages/Goods/Detail/index.less
View file @ 3e365632
.detail {
height: 100%;
// height: 100%;
.state {
display: flex;
align-items: center;
......
src/pages/Goods/Detail/index.vue
View file @ 3e365632
......@@ -381,6 +381,14 @@
></el-input>
<span v-else>{{ goodsObj.original_price }}</span>
</el-form-item>
<el-form-item label="结算价">
<el-input
v-if="$route.params.operation === 'EDIT'"
v-model="goodsObj.clear_price"
@change="perPrice"
></el-input>
<span v-else>{{ goodsObj.clear_price }}</span>
</el-form-item>
<h4 style="margin:20px 0">库存信息</h4>
<el-form-item label="剩余库存量:">
<span>{{ goodsObj.inventory_rest }}</span>
......@@ -432,6 +440,7 @@
v-if="$route.params.operation === 'EDIT'"
v-model="goodsObj.rule_refund"
placeholder="请选择"
:disabled="goodsObj.audit_status===1"
>
<el-option
v-for="item in rulesForm.rulesOptions"
......@@ -681,6 +690,12 @@ export default {
this.optionsValue = [val.category_1_id, val.category_2_id];
this.rulesForm.useStartTime = this.formatDate(val.rule_start_time);
this.rulesForm.useEndTime = this.formatDate(val.rule_end_time);
console.log(val.original_price);
if (!val.original_price) {
this.$nextTick(() => {
this.goodsObj.original_price = "";
})
}
},
rejectVisible (val) {
if (!val) {
......@@ -1142,8 +1157,10 @@ export default {
// 更改售价
salePrice () {
if (this.goodsObj.price.length === 0) {
this.goodsObj.price = 0;
if (!this.goodsObj.price) {
this.$nextTick(() => {
this.goodsObj.price = "";
})
}
const parseFloatValue = Number(this.goodsObj.price).toFixed(2);
this.goodsObj.price = Number(parseFloatValue);
......@@ -1151,25 +1168,18 @@ export default {
typeof this.goodsObj.price === "number" &&
isNaN(this.goodsObj.price)
) {
this.goodsObj.price = 0;
this.goodsObj.price = "";
return this.$message.error("售价价格必须为数字");
}
},
// 更改原价
perPrice () {
if (this.goodsObj.original_price.length === 0) {
this.goodsObj.original_price = 0;
}
const parseOriginalPrice = Number(this.goodsObj.original_price).toFixed(
2
);
this.goodsObj.original_price = Number(parseOriginalPrice);
if (
typeof this.goodsObj.original_price === "number" &&
isNaN(this.goodsObj.original_price)
) {
this.goodsObj.original_price = 0;
perPrice (val) {
if (val.length === 0) val = 0;
const parseOriginalPrice = Number(val).toFixed(2);
val = Number(parseOriginalPrice);
if (typeof val === "number" &&isNaN(val)) {
val = 0;
return this.$message.error("原价价格必为数字");
}
},
......@@ -1265,15 +1275,18 @@ export default {
if (!query.rule_refund) {
return this.$message.error("请填写退款规则");
}
if (query.original_price.length === 0) {
return this.$message.error("请填写原价(保留两位小数)");
if (query.original_price === "0") {
return this.$message.error("原价价格不得为0");
}
if (query.price.length === 0) {
return this.$message.error("请填写售价(保留两位小数)");
}
if (typeof query.original_price !== "number") {
return this.$message.error("原价价格必须为数字");
if (query.price == 0) {
return this.$message.error("售价价格不得为0");
}
// if (query.original_price && typeof query.original_price !== "number") {
// return this.$message.error("原价价格必须为数字");
// }
if (typeof query.price !== "number") {
return this.$message.error("售价价格必须为数字格式");
}
......@@ -1283,6 +1296,10 @@ export default {
}
console.log(query);
// 是否该商品关联的分销活动满足售价-分销总金额>=结算价
// if (query.price - d >= query.clear_price) {
// return this.$message.error("请至少选择一个门店");
// }
const res = await editGoods(query);
if (res.code !== 0) {
......
src/pages/Goods/Retail/index.vue
View file @ 3e365632
......@@ -200,6 +200,17 @@
></el-input>
<div style="margin: 20px 0"></div>
</el-form-item>
<el-form-item
prop="commission_mode"
label="金额计算方式:"
>
<el-radio-group
v-model="ruleForm.commission_mode"
>
<el-radio :label="2">按金额</el-radio>
<el-radio :label="1">按比例</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="上线佣金:" prop="first_commission_value">
<el-input
v-model="ruleForm.first_commission_value"
......@@ -207,7 +218,7 @@
@input="changeValue($event, 'first_commission_value')"
:disabled="shopStart !== 0"
>
<template #append>%</template>
<template #append>{{ruleForm.commission_mode == 1? '%' : '￥'}}</template>
</el-input>
</el-form-item>
<el-form-item label="分享者佣金: " prop="second_commission_value">
......@@ -217,7 +228,7 @@
@input="changeValue($event, 'second_commission_value')"
:disabled="shopStart !== 0"
>
<template #append>%</template>
<template #append>{{ruleForm.commission_mode == 1? '%' : '￥'}}</template>
</el-input>
</el-form-item>
<el-form-item label="活动生效时间:">
......@@ -358,10 +369,11 @@ export default {
data() {
var commission = (rule, value, callback) => {
if (
this.ruleForm.first_commission_value +
this.ruleForm.commission_mode == 1 &&
(this.ruleForm.first_commission_value +
this.ruleForm.second_commission_value >
50 ||
value > 50
value > 50 )
) {
callback(new Error("上线佣金与分享者佣金之和不可大于50%"));
} else {
......@@ -398,6 +410,7 @@ export default {
ruleForm: {
marketing_name: "",
commission_mode: 1,
first_commission_value: "",
second_commission_value: "",
start_time: "",
......@@ -603,10 +616,10 @@ export default {
this.ruleForm.goods_spu_id &&
this.ruleForm.goods_spu_id.join(",");
}
// console.log(goods_sku_id)；
let {
marketing_name,
first_commission_value,
commission_mode,
second_commission_value,
} = this.ruleForm;
let [start_time, end_time] = this.timeSelect || [];
......@@ -621,6 +634,7 @@ export default {
}
let addParams = {
goods_sku_id,
commission_mode,
marketing_name,
first_commission_value: first_commission_value + "",
second_commission_value: second_commission_value + "",
......
src/pages/Groupmeal/Distrib/index.less 0 → 100644
View file @ 3e365632
.goods {
width: 100%;
height: 100%;
padding: 0 30px;
.header {
text-align: right;
margin-bottom: 30px;
}
.dioFor {
margin-left: 5%;
width: 70%;
}
.diotab {
margin-left: 5%;
margin-top: 10px;
}
.dialog-footer {
display: flex;
align-items: center;
justify-content: center;
}
.commodity_list {
margin-top: 30px;
}
.pagination {
margin-top: 30px;
}
}
src/pages/Groupmeal/Distrib/index.vue
View file @ 3e365632
......@@ -49,7 +49,7 @@
<!-- 页码区 -->
<Pagination
@current-change="handleCurrentChange"
v-model.current-page="page"
v-model:current-page="page"
:page-size="pageSize"
:total="total"
></Pagination>
......
src/pages/Groupmeal/components/PageHeader/User.vue 0 → 100644
View file @ 3e365632
<template>
<el-dropdown>
<div class="user-info">
<el-avatar
:src="userInfo.avatar || DEFAULT_AVATAR"
size="small"
></el-avatar>
<span class="user-name">{{userInfo.name}}</span>
</div>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item>
<i class="el-icon-message"></i>
{{userInfo.email}}
</el-dropdown-item>
<el-dropdown-item>
<span><a
class="link"
href="//pandora.yidian-inc.com/"
>返回pandora工具平台</a></span>
</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
</template>
<script>
import { mapState } from 'vuex'
import { HEADER_CONFIG } from '@/config/pageconfig';
export default {
computed: mapState({
userInfo: state => (state.userInfo || {}),
}),
data () {
return {
DEFAULT_AVATAR: HEADER_CONFIG.miscellaneous.defaultAvatar,
};
},
};
</script>
<style lang="less" scoped>
.user-info {
display: flex;
align-items: center;
}
.user-name {
margin-left: 12px;
color: #fff;
}
</style>
src/pages/Groupmeal/components/PageHeader/config.js 0 → 100644
View file @ 3e365632
const headerConfig = [
{
name: "订单管理",
path: "/op/groupmeal/orderManagement"
},
{
path: '/op/groupmeal/distrib',
name: '配送员管理'
},
];
export default headerConfig;
\ No newline at end of file
src/pages/Groupmeal/components/PageHeader/index.vue 0 → 100644
View file @ 3e365632
<template>
<div id="pageheader">
<div class="line"></div>
<el-menu
class="header-menu"
mode="horizontal"
:router="true"
background-color="#545c64"
text-color="#fff"
:default-active="activeMenu"
active-text-color="#ffd04b"
unique-opened
>
<el-menu-item
v-for="item in headerConfig"
:index="item.path"
:key="item.path"
>
{{ item.name }}
</el-menu-item>
<el-menu-item
key="usermenu"
class="user-menu"
>
<user></user>
</el-menu-item>
</el-menu>
</div>
</template>
<script>
import headerConfig from "./config";
import User from "./User.vue";
export default {
name: "PageHeader",
components: {
User
},
data () {
return {
headerConfig
};
},
computed: {
activeMenu () {
return this.$route.path;
}
},
beforeMount () { },
methods: {}
};
</script>
<style lang="less">
</style>
src/pages/Groupmeal/components/Pagination/index.vue 0 → 100644
View file @ 3e365632
<template>
<div class="block">
<el-pagination
class="pagination"
layout="prev, pager, next, jumper, ->,page , total"
v-bind="$attrs"
v-on="$listener"
>
</el-pagination>
</div>
</template>
<script>
export default {
name: 'Pagination'
};
</script>
<style lang="less">
.block {
margin-top: 50px;
}
</style>
src/pages/Groupmeal/layout/index.less 0 → 100644
View file @ 3e365632
.layout {
display: flex;
flex-direction: column;
height: 100%;
}
.main {
flex: 1;
}
src/pages/Groupmeal/layout/index.vue 0 → 100644
View file @ 3e365632
<template>
<div class="layout">
<!-- 页面公共 header -->
<page-header class="page-header"></page-header>
<!-- 页面主体部分 -->
<div class="main">
<slot></slot>
</div>
</div>
</template>
<script>
import PageHeader from '../components/PageHeader';
export default {
components: { PageHeader },
};
</script>
<style lang="less" src="./index.less"></style>
src/pages/Groupmeal/orderManagement/index.less 0 → 100644
View file @ 3e365632
.orderManage {
padding: 30px;
box-sizing: border-box;
}
.tabHead{
margin-bottom:10px;
}
.exportForm,.exportBtn{
text-align:center;
}
.refundBtnGroup {
display: block;
text-align: center;
}
.refundCon /deep/ .el-row {
margin-bottom: 15px;
display: flex;
align-items: center;
}
\ No newline at end of file
src/pages/Groupmeal/orderManagement/index.vue 0 → 100644
View file @ 3e365632
This diff is collapsed.
src/pages/Role/manage-role.vue
View file @ 3e365632
This diff is collapsed.
src/pages/Role/role-detail.vue
View file @ 3e365632
<template>
<div class="user-detail">
<el-page-header @back="goBack" content="角色详情页面"> </el-page-header>
<el-card class="management">
<h5 style="margin-bottom: 10px">角色信息</h5>
<el-descriptions class="margin-top" :column="2" border>
<el-descriptions-item>
<template #label> ID </template>
{{ roleId }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 角色状态 </template>
{{
role_info_detail.role_status == 1
? "正常"
: role_info_detail.role_status == 2
? "禁用"
: "删除"
}}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 角色名称 </template>
{{ role_info_detail.role_name }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 创建人账号 </template>
{{ role_info_detail.create_user_name }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 创建时间 </template>
{{ role_info_detail.create_time }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 最后修改人账号 </template>
{{ role_info_detail.update_user_name }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 最后修改时间 </template>
{{ role_info_detail.update_time }}
</el-descriptions-item>
</el-descriptions>
<div class="tree" v-if="selectedOptions">
<h5 style="margin-bottom: 10px">角色范围</h5>
<div>
<el-cascader
v-model="selectedOptions"
:options="permissionsAll"
placeholder="暂无数据"
disabled
:props="props"
style="width: 300px"
></el-cascader>
</div>
</div>
<div v-if="role_info_detail.role_account_list.length">
<h5 style="margin: 10px 0">角色账号</h5>
<div class="roleList">
<div
class="role_account_list"
v-for="(item, index) in role_info_detail.role_account_list"
:key="index"
>
{{ item }}
</div>
</div>
</div>
</el-card>
</div>
<RoleDetail appId="merchant-op" />
</template>
<script>
import { get_role_info as reqGet_role_info, getAll_role_list as reqGetAll_role_list, } from '../../service/role'
import RoleDetail from "@/components/Roles/RoleDetail";
export default {
data () {
return {
roleId: this.$route.query.roleId,
user_info: {
name: "jianghaiming",
email: "jianghaiming@126.com",
},
props: {
multiple: true,//设置为多选
value: 'id', //value值和哪个值绑定
label: 'desc',//label值和哪个值绑定
children: 'sub_permissions'//children值和哪个值绑定
},
selectedOptions: [],
permissionsAll: [],
role_info_detail: {//详情非编辑项
role_id: "",
role_name: "",
role_status: "",
update_time: "",
update_user_name: "",
create_time: "",
create_user_name: "",
role_account_list: []
}
}
},
activated () {
this.roleId = this.$route.query.roleId
let { email } = this.$store.state.userInfo
reqGetAll_role_list(email).then(res => {
this.permissionsAll = res
})
reqGet_role_info(this.roleId).then((res) => {
const { role_name, role_status, update_time, update_user_name, create_time, create_user_name, role_account_list, permissions } = res
this.role_info_detail = {
role_name,
role_status,
update_time,
update_user_name,
create_time,
create_user_name,
role_account_list
}
this.editEchoData(permissions)
})
},
methods: {
goBack () {
this.$router.back(-1);
},
//遍历回显值selectedOptions
editEchoData (permissions) {
let selectData = []
permissions.map(item => {
let one = { id: item.id }
if (item.sub_permissions) {
item.sub_permissions.map(info => {
let selectId = [one.id, info.id]
selectData.push(selectId)
})
}
})
this.selectedOptions = selectData
},
components: {
RoleDetail
}
}
};
</script>
<style lang="less" scoped>
.user-detail {
margin: 50px;
.role_account_list {
padding: 10px;
color: #909399;
background: #fafafa;
font-weight: 400;
line-height: 1.5;
}
.management {
margin-top: 20px;
}
.roleList {
max-height: 300px;
overflow-y: scroll;
}
.tree {
// border: 1px solid #ebeef5;
margin-top: 20px;
}
}
</style>
\ No newline at end of file
src/pages/User/user-detail.vue deleted 100644 → 0
View file @ 99209d02
<template>
<div class="user-detail">
<el-page-header @back="goBack" content="用户详情页面"> </el-page-header>
<el-card class="management">
<h2 style="margin-bottom: 10px">用户信息</h2>
<el-descriptions class="margin-top" :column="3" :size="size" border>
<el-descriptions-item>
<template #label> 用户姓名 </template>
{{ user_info.user_name }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 手机号 </template>
{{ user_info.user_mobile }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 所属组织 </template>
{{ user_info.organization }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 添加人账号 </template>
{{ user_info.create_user_name }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 添加时间 </template>
{{ user_info.create_time }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 最后修改人账号 </template>
{{ user_info.update_user_name }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 最后修改时间 </template>
{{ user_info.update_user_name }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 敏感词权限 </template>
{{ user_info.is_sensitive_authority == 1 ? "有" : "无" }}
</el-descriptions-item>
</el-descriptions>
<div class="role">角色信息</div>
<el-table :data="role_list" border style="width: 100%">
<el-table-column prop="role_id" label="ID" width="180">
</el-table-column>
<el-table-column prop="role_name" label="角色名称"> </el-table-column>
</el-table>
</el-card>
</div>
</template>
<script>
import { getUser_detail as reqGetUser_detail } from "../../service/user";
export default {
data () {
return {
user_id: this.$route.query.userId,
user_info: {},
role_list: []//角色池
}
},
created () {
this.getUser_date()
},
methods: {
getUser_date () {
reqGetUser_detail(this.user_id).then((res) => {
this.user_info = res.user_info
this.role_list = res.role_list
})
},
goBack () {
this.$router.go(-1)
}
}
}
</script>
<style lang="less" scoped>
.user-detail {
margin: 50px;
.role {
margin: 10px;
font-weight: bold;
}
}
</style>
\ No newline at end of file
src/pages/User/userList/index.vue
View file @ 3e365632
<template>
<layout>
<div class="user">
<el-form :inline="true" :model="pageParams" class="demo-form-inline">
<el-form-item label="用户姓名">
<el-input
maxlength="15"
v-model="pageParams.user_name"
placeholder="用户姓名"
></el-input>
</el-form-item>
<el-form-item label="用户账号">
<el-input
v-model="pageParams.user_email"
placeholder="用户账号"
></el-input>
</el-form-item>
<el-form-item label="手机号">
<el-input
v-model="pageParams.user_mobile"
placeholder="手机号"
></el-input>
</el-form-item>
<el-form-item label="状态">
<el-select v-model="pageParams.user_status" placeholder="状态">
<el-option value="1" label="启用"></el-option>
<el-option value="2" label="禁用"></el-option>
</el-select>
</el-form-item>
<el-form-item class="func-btn">
<el-button type="primary" @click="getUserList">查询</el-button>
<el-button @click="onReset">重置</el-button>
<el-button @click="createUser" :disabled="!permission.get('create')"
>新建用户</el-button
>
</el-form-item>
</el-form>
<el-table :data="renderUserList" border style="width: 100%">
<el-table-column prop="user_id" label="用户ID" width="70">
</el-table-column>
<el-table-column prop="user_name" label="用户姓名"> </el-table-column>
<el-table-column prop="user_email" label="用户账号"> </el-table-column>
<el-table-column prop="user_status" label="状态"> </el-table-column>
<el-table-column prop="user_mobile" label="手机号"> </el-table-column>
<el-table-column prop="update_time" label="最后修改日期">
</el-table-column>
<el-table-column prop="update_user_name" label="最后修改人账号">
</el-table-column>
<el-table-column fixed="right" label="操作" width="140">
<template #default="scope">
<el-button type="text" size="small" @click="checkUser(scope.row)"
>查看</el-button
>
<el-button
@click="editUser(scope.row)"
type="text"
size="small"
:disabled="!permission.get('edit')"
>修改</el-button
>
<el-button
v-if="scope.row.user_status === '启用'"
type="text"
size="small"
@click="disableUser(scope.row)"
:disabled="!permission.get('enable')"
>禁用</el-button
>
<el-button
v-if="scope.row.user_status === '禁用'"
type="text"
size="small"
@click="enableUser(scope.row)"
:disabled="!permission.get('disable')"
>启用</el-button
>
</template>
</el-table-column>
</el-table>
<page
:totalNum="totalNum"
:pageSize="pageParams.size"
@update="updatePage"
/>
</div>
<user-info-modal
:data="curUserInfo"
:visable="modalVisable.info"
@cancel="cancelModal('info')"
></user-info-modal>
<user-info-edit-modal
:data="curUserInfo"
:visable="modalVisable.edit"
@confirm="confirmEditModal"
@cancel="cancelModal('edit')"
></user-info-edit-modal>
<user-info-new-modal
:visable="modalVisable.new"
@confirm="confirmEditModal"
@cancel="cancelModal('new')"
></user-info-new-modal>
<UserList appId="merchant-op" />
</layout>
</template>
<script>
import Layout from "@/layouts";
import page from "@/components/Pagination";
import UserInfoModal from "./components/UserInfoModal";
import UserInfoEditModal from "./components/UserInfoEditModal";
import UserInfoNewModal from "./components/UserInfoNewModal";
import { ElMessage } from "element-plus";
import {
getUserList as reqGetUserList,
getUserDetail as reqGetUserDetail,
editUser as reqEditUser,
createUser as reqCreateUser,
} from "@/service/user";
import UserList from "@/components/UserList";
export default {
components: {
Layout,
page,
UserInfoModal,
UserInfoEditModal,
UserInfoNewModal,
},
data() {
return {
pageParams: {
page: 1,
size: 20,
user_name: "",
user_email: "",
user_mobile: "",
user_status: "",
},
totalNum: 0,
userList: [],
curUserInfo: {},
modalVisable: {
info: false,
edit: false,
new: false,
},
curOperateMode: "new",
};
},
computed: {
permission() {
const modulePermissions =
this.$store.getters.moduleSubPermissions("user") || [];
console.log("Current page func-permissions:", modulePermissions);
return new Map(modulePermissions.map((ele) => [ele.name, true]));
},
renderUserList() {
const statusMap = new Map([
[1, "启用"],
[2, "禁用"],
[3, "删除"],
]);
return this.userList.map((ele) => {
ele.user_status = statusMap.get(ele.user_status);
return ele;
});
},
},
beforeMount() {
this.getUserList();
},
methods: {
async getUserList() {
const { code, result } = await reqGetUserList(this.pageParams);
if (code !== 0) {
ElMessage.error("获取用户列表出错！");
return;
}
const { data, count } = result;
this.totalNum = count;
this.userList = data;
},
async setCurUserInfo(user_id) {
const { code, result } = await reqGetUserDetail({ user_id });
if (code === 0) {
this.curUserInfo = {
...result.user_info,
roles: result.role_list,
};
} else {
ElMessage.error("获取用户信息出错！");
}
},
async checkUser(row) {
const { user_id } = row;
await this.setCurUserInfo(user_id);
this.openModal("info");
},
async editUser(row) {
const { user_id } = row;
await this.setCurUserInfo(user_id);
// this.openModal('edit');
this.modalVisable.edit = true;
this.curOperateMode = "edit";
},
openModal(key) {
Object.keys(this.modalVisable).forEach((ele) => {
this.modalVisable[ele] = key === ele;
});
},
async confirmEditModal(userInfo) {
const {
user_id,
user_name,
user_email,
is_sensitive_authority,
user_mobile,
roles,
user_status,
organization,
} = userInfo;
let res = {};
if (this.curOperateMode === "edit") {
const editData = {
user_id,
user_name,
user_email,
is_sensitive_authority: parseInt(is_sensitive_authority),
user_mobile,
role_id: roles,
user_status: parseInt(user_status),
};
res = await reqEditUser(editData);
} else if (this.curOperateMode === "new") {
const newData = {
user_name,
user_email,
is_sensitive_authority: parseInt(is_sensitive_authority),
user_mobile,
role_id: roles,
user_status: parseInt(user_status),
organization,
};
res = await reqCreateUser(newData);
}
if (res.code === 0) {
this.cancelModal(this.curOperateMode);
ElMessage.success("更新成功！");
this.getUserList();
} else {
ElMessage.error(res.reason);
}
},
cancelModal(name) {
this.modalVisable[name] = false;
},
createUser() {
this.curOperateMode = "new";
this.openModal("new");
},
//重置
onReset() {
this.pageParams = {
page: 1,
pageSize: 20,
user_name: "",
user_email: "",
user_mobile: "",
user_status: "",
};
this.getUserList();
},
updatePage({ page, pageSize }) {
page && (this.pageParams.page = page);
pageSize && (this.pageParams.pageSize = pageSize);
this.getUserList();
},
async enableUser(row) {
const { user_id } = row;
const { code, reason } = await reqEditUser({ user_status: 1, user_id });
if (code === 0) {
ElMessage.success("启用成功！");
this.getUserList();
} else {
ElMessage.error(reason);
}
},
async disableUser(row) {
const { user_id } = row;
const { code, reason } = await reqEditUser({ user_status: 2, user_id });
if (code === 0) {
ElMessage.success("禁用成功！");
this.getUserList();
} else {
ElMessage.error(reason);
}
},
},
UserList
}
};
</script>
<style lang="less" scoped>
......
src/pages/Withdrawal/Examine/__tests__/examine.spec.js 0 → 100644
View file @ 3e365632
import { render } from "@testing-library/vue";
import ExaminePage from "..";
import { getApplyList } from "@/service/Withdrawal/withdrawal";
import store from "@/store";
jest.mock("@/service/Withdrawal/withdrawal");
it("should not enable audition for people without such privilege", () => {
const $route = {
path: "/op/withdrawal/examine"
};
getApplyList.mockResolvedValue({
code: 0,
status: "success",
result: {
list: [
{
withdraw_apply_id: "21072711253403105009",
wallet_id: "21072214560673105003",
user_id: 510227177373,
amount: "6.00",
withdraw_apply_status: 0,
withdraw_audit_time: "2021-07-27 11:25:34",
refuse_reason: "",
audit_user_name: "",
create_time: "2021-07-27 11:25:34",
lately_amount: "0.00",
id: "21072711253403105009",
city_name: "简网员工",
lately_share: 0,
lately_download: 0,
history_share: 52,
history_download: 0,
history_download_keep: "0%",
status_text: "待审核"
}
],
count: 1
}
});
const { getByText } = render(ExaminePage, {
store,
global: {
mocks: {
$route,
$store: {
getters: {
moduleSubPermissions: jest.fn().mockReturnValue(true)
}
}
}
}
});
getByText("审核");
});
src/pages/Withdrawal/Examine/index.less 0 → 100644
View file @ 3e365632
.tab-show {
width: 100%;
height: 100%;
padding: 0px 55px;
background-color: white;
.el-tabs__nav-wrap::after {
background-color: transparent;
}
.el-tabs__header {
margin: 0;
}
}
.goods {
width: 100%;
height: 100%;
padding: 0px 30px;
.search_condition {
display: flex;
flex-wrap: wrap;
align-items: center;
.search_button {
display: flex;
align-items: center;
justify-self: flex-end;
.el-form-item__content {
display: flex;
justify-content: space-around;
}
}
}
.commodity_list {
margin-top: 30px;
}
.pagination {
margin-top: 30px;
}
}
.listShow {
// padding-left: 60px;
padding-left: 120px;
li {
width: 100%;
padding-bottom: 10px;
.list-left {
// display:inline-block;
width: 30%;
// text-align: right;
padding-right: 10px;
}
.list-right {
display:inline-block;
width: 70%;
}
}
}
.text-area {
width: 100%;
padding-left: 120px;
.el-form-item__label {
width: 100%;
text-align: left;
}
}
.dialog-footer {
// display: flex;
// justify-content: center;
// align-items: center;
text-align: center;
}
.cancel {
background-color: #409EFF !important;
color: white;
border: none;
}
.confirm {
background-color: #b8b8b8 !important;
border: none;
}
.el-card__body{
padding: 10px;
}
\ No newline at end of file
src/pages/Withdrawal/Examine/index.vue 0 → 100644
View file @ 3e365632
This diff is collapsed.
src/pages/Role/add-role.vue → src/pages/Withdrawal/Role/add-role.vue
View file @ 3e365632
......@@ -67,14 +67,14 @@
</div>
</template>
<script>
import page from "../components/Pagination"
import page from "../../../components/Pagination"
import roleInfo from './components/roleInfo'
import {
getRole_list as reqGetRole_list, getAdd_role as reqGetAdd_role,
getAll_role_list as reqGetAll_role_list,
getUpdate_role as reqGetUpdate_role,
get_role_info as reqGet_role_info
} from "../../service/role";
} from "../../../service/role";
import { ElMessage } from 'element-plus'
export default {
name: 'KeepaddRole',
......@@ -128,7 +128,7 @@ export default {
},
methods: {
toRoleDetail (row) {
this.$router.push({ name: 'RoleDetail', query: { roleId: row.role_id } });
this.$router.push({ name: 'withdrawalRoleDetail', query: { roleId: row.role_id } });
},
goBack () {
this.$router.go(-1)
......
src/pages/Withdrawal/Role/manage-role.vue 0 → 100644
View file @ 3e365632
<template>
<layout>
<role-list
appId="merchant-op-auditing"
detailPath="/op/withdrawal/roleRoleDetail"
rolePermissionId="role_management"
></role-list>
</layout>
</template>
<script>
import Layout from "../layout";
import RoleList from "../../../components/Roles/RoleList";
export default {
name: "KeepRoleManagement",
components: {
Layout,
RoleList,
},
};
</script>
<style lang="less" scoped></style>
src/pages/Withdrawal/Role/role-detail.vue 0 → 100644
View file @ 3e365632
<template>
<role-detail appId="merchant-op-auditing"></role-detail>
</template>
<script>
import RoleDetail from "../../../components/Roles/RoleDetail.vue";
export default {
components: {
RoleDetail,
},
};
</script>
src/pages/User/userList/components/UserInfoEditModal.vue → src/pages/Withdrawal/User/userList/components/UserInfoEditModal.vue
View file @ 3e365632
......@@ -63,7 +63,7 @@
<script>
import { ElMessage } from "element-plus";
import { getRole_list as reqGetRoles } from '@/service/role';
import { getRole_list as reqGetRoles } from '../../../../../service/role';
export default {
name: 'UserInfoEditModal',
......
src/pages/User/userList/components/UserInfoNewModal.vue → src/pages/Withdrawal/User/userList/components/UserInfoNewModal.vue
View file @ 3e365632
......@@ -60,7 +60,7 @@
<script>
import { ElMessage } from "element-plus";
import { getRole_list as reqGetRoles } from '@/service/role';
import { getRole_list as reqGetRoles } from '../../../../../service/role';
export default {
name: 'UserInfoEditModal',
......
src/pages/Withdrawal/User/userList/index.vue 0 → 100644
View file @ 3e365632
<template>
<layout>
<user-list
appId="merchant-op-auditing"
userPermissionId="user_management"
></user-list>
</layout>
</template>
<script>
import UserList from "../../../../components/UserList";
import Layout from "../../layout";
export default {
components: {
Layout,
UserList,
},
};
</script>
src/pages/Withdrawal/components/PageHeader/User.vue 0 → 100644
View file @ 3e365632
<template>
<el-dropdown>
<div class="user-info">
<el-avatar
:src="userInfo.avatar || DEFAULT_AVATAR"
size="small"
></el-avatar>
<span class="user-name">{{userInfo.name}}</span>
</div>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item>
<i class="el-icon-message"></i>
{{userInfo.email}}
</el-dropdown-item>
<el-dropdown-item>
<span><a
class="link"
href="//pandora.yidian-inc.com/"
>返回pandora工具平台</a></span>
</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
</template>
<script>
import { mapState } from 'vuex'
import { HEADER_CONFIG } from '@/config/pageconfig';
export default {
computed: mapState({
userInfo: state => (state.userInfo || {}),
}),
data () {
return {
DEFAULT_AVATAR: HEADER_CONFIG.miscellaneous.defaultAvatar,
};
},
};
</script>
<style lang="less" scoped>
.user-info {
display: flex;
align-items: center;
}
.user-name {
margin-left: 12px;
color: #fff;
}
</style>
src/pages/Withdrawal/components/PageHeader/config.js 0 → 100644
View file @ 3e365632
const headerConfig = [
{
name: "提现审核",
path: "/op/withdrawal/examine"
},
{
path: "/op/withdrawal/roleManageRole",
name: "角色管理",
requireAuthentication: true,
requiredPermission: "role_management"
},
{
path: "/op/withdrawal/user",
name: "用户管理",
requireAuthentication: true,
requiredPermission: "user_management"
}
];
export default headerConfig;
src/pages/Withdrawal/components/PageHeader/index.vue 0 → 100644
View file @ 3e365632
<template>
<div id="pageheader">
<div class="line"></div>
<el-menu
class="header-menu"
mode="horizontal"
:router="true"
background-color="#545c64"
text-color="#fff"
:default-active="activeMenu"
active-text-color="#ffd04b"
unique-opened
>
<el-menu-item
v-for="item in visibleMenuItems"
:index="item.path"
:key="item.path"
>
{{ item.name }}
</el-menu-item>
<el-menu-item key="usermenu" class="user-menu">
<user></user>
</el-menu-item>
</el-menu>
</div>
</template>
<script>
import headerConfig from "./config";
import User from "./User.vue";
export default {
name: "PageHeader",
components: {
User,
},
data() {
return {
headerConfig,
};
},
computed: {
activeMenu() {
return this.$route.path;
},
visibleMenuItems() {
const visibleMenuItems = this.headerConfig.filter((item) => {
if (!item.requireAuthentication) {
return true;
}
if (this.hasPermission(item.requiredPermission)) {
return true;
}
return false;
});
return visibleMenuItems;
},
},
beforeMount() {},
methods: {
hasPermission(permissionId) {
return (
this.$store.getters.moduleSubPermissions(
permissionId,
"merchant-op-auditing"
).length !== 0
);
},
},
};
</script>
<style lang="less"></style>
src/pages/Withdrawal/layout/index.less 0 → 100644
View file @ 3e365632
.layout {
display: flex;
flex-direction: column;
height: 100%;
}
.main {
flex: 1;
}
src/pages/Withdrawal/layout/index.vue 0 → 100644
View file @ 3e365632
<template>
<div class="layout">
<!-- 页面公共 header -->
<page-header class="page-header"></page-header>
<!-- 页面主体部分 -->
<div class="main">
<slot></slot>
</div>
</div>
</template>
<script>
import PageHeader from '../components/PageHeader';
export default {
components: { PageHeader },
};
</script>
<style lang="less" src="./index.less"></style>
src/router/Groupmeal/index.js 0 → 100644
View file @ 3e365632
/**
* 团餐运营管理
*/
const groupmealRouters = [
{
path: "/op/groupmeal/orderManagement",
name: "orderManagement",
// redirect: "/op/groupmeal/orderManagement",
component: () => import(/* webpackChunkName: "goods" */ "@/pages/Groupmeal/orderManagement")
},
{
path: "/op/groupmeal/distrib",
name: "Distrib",
component: () => import(/* webpackChunkName: "goods" */ "@/pages/Groupmeal/Distrib")
},
];
export default groupmealRouters;
\ No newline at end of file
src/router/Withdrawal/index.js 0 → 100644
View file @ 3e365632
// 提现审核
const withdrawalRoutes = [
{
path: "/op/withdrawal",
redirect: "/op/withdrawal/examine"
},
{
path: "/op/withdrawal/examine",
name: "Examine",
component: () =>
import(/* webpackChunkName: "Withdrawal" */ "@/pages/Withdrawal/Examine")
},
//用户管理
{
path: "/op/withdrawal/user",
name: "User",
component: () =>
import(
/* webpackChunkName: "Withdrawal" */ "@/pages/Withdrawal/User/userList"
)
},
//角色管理
{
path: "/op/withdrawal/roleAddRole",
name: "AddRole",
component: () =>
import(
/* webpackChunkName: "Withdrawal" */ "@/pages/Withdrawal/Role/add-role"
),
meta: {
requireAuth: true,
keepAlive: true
}
},
{
path: "/op/withdrawal/roleManageRole",
name: "withdrawalManageRole",
component: () =>
import(
/* webpackChunkName: "Withdrawal" */ "@/pages/Withdrawal/Role/manage-role"
),
meta: {
requireAuth: true,
keepAlive: true
}
},
{
path: "/op/withdrawal/roleRoleDetail",
name: "withdrawalRoleDetail",
component: () =>
import(
/* webpackChunkName: "Withdrawal" */ "@/pages/Withdrawal/Role/role-detail"
)
}
];
export default withdrawalRoutes;
src/router/index.js
View file @ 3e365632
This diff is collapsed.
src/service/Groupmeal/groupmeal.js 0 → 100644
View file @ 3e365632
This diff is collapsed.
src/service/Withdrawal/common.js 0 → 100644
View file @ 3e365632
export const defaultParams = {
appid: "merchant-op-auditing"
}
src/service/Withdrawal/withdrawal.js 0 → 100644
View file @ 3e365632
import axios from "@/utils/request";
import { defaultParams } from "./common";
const getParams = (p = {}) => {
return { ...defaultParams, ...p };
};
// 获取提现审核列表
export async function getApplyList(params) {
const res = await axios.get("/api/v1/get_withdrawal_apply_list", {
params: getParams(params)
});
return res;
}
// 黑名单，冻结用户
export async function getBlackList(params) {
const res = await axios.post(
"/api/v1/get_withdrawal_black_list",
getParams(params)
);
return res;
}
// 获取订单审核--通过，拒绝
export async function getWithdrawAudit(params) {
const res = await axios.post("/api/v1/get_withdraw_audit", getParams(params));
return res;
}
// 获取提现失败冻结
export async function getFreezingFund(params) {
const res = await axios.post("/api/v1/get_freezing_fund", getParams(params));
return res;
}
// 获取提现审核详情
export async function getApplyDetail(params) {
const res = await axios.get("/api/v1/get_apply_detail", {
params: getParams(params)
});
return res;
}
//权限列表
export async function getRolesForUser(user_email) {
const res = await axios.post(
"/api/v1/merchant/authority/get_role_list?appid=merchant-op-auditing",
{
user_email
}
);
return res.permissions;
}
src/service/role.js
View file @ 3e365632
This diff is collapsed.
src/service/user.js
View file @ 3e365632
This diff is collapsed.
src/store/index.js
View file @ 3e365632
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment