Commit c3a373c3 authored by liwenhong's avatar liwenhong

Merge branch 'master' into lwh/head-distribution

# Conflicts:
#	server/controllers/user.js
#	server/router.js
#	src/pages/Groupmeal/components/PageHeader/config.js
#	src/router/Groupmeal/index.js
parents 7f46b0fe 0e2efed7
# EditorConfig is awesome: https://EditorConfig.org
# top-most EditorConfig file
root = true
[*]
indent_style = space
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = false
insert_final_newline = false
\ No newline at end of file
......@@ -7,4 +7,3 @@ public
dist
.prettierrc.js
.eslintrc.js
server/
module.exports = {
root: true,
env: {
node: true,
},
extends: ['plugin:vue/vue3-essential', 'eslint:recommended', '@vue/prettier'],
parserOptions: {
parser: 'babel-eslint',
},
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
},
overrides: [
{
files: [
'**/__tests__/*.{j,t}s?(x)',
'**/tests/unit/**/*.spec.{j,t}s?(x)',
],
env: {
jest: true,
},
root: true,
env: {
node: true,
},
extends: ["plugin:vue/vue3-essential", "eslint:recommended", "@vue/prettier"],
parserOptions: {
parser: "babel-eslint",
},
rules: {
"no-console": process.env.NODE_ENV === "production" ? "warn" : "off",
"no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off",
"prettier/prettier": "error",
"vue/script-setup-uses-vars": "off",
"no-unused-vars": "off",
},
],
};
......@@ -7,7 +7,6 @@ dist
# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
......
// https://prettier.io/docs/en/options.html
module.exports = {
printWidth: 150,
tabWidth: 4,
semi: true,
singleQuote: false,
trailingComma: "all",
bracketSpacing: true,
jsxBracketSameLine: false,
htmlWhitespaceSensitivity: "ignore",
endOfLine: "auto",
vueIndentScriptAndStyle: true,
};
{
// 保存自动格式化
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
// For ESLint
"source.fixAll.eslint": true
},
"eslint.validate": [
"vue",
"javascript",
"javascriptreact"
],
// 设置全部语言的默认格式化程序为prettier
"editor.defaultFormatter": "esbenp.prettier-vscode",
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[jsonc]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[vue]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[html]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[markdown]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[css]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[less]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
}
module.exports = {
presets: ['@vue/cli-plugin-babel/preset'],
presets: ["@vue/cli-plugin-babel/preset"],
};
This diff is collapsed.
{
"name": "op-management",
"version": "0.1.0",
"private": true,
"main": "app.js",
"scripts": {
"dev": "sh ./bin/start.sh development",
"test": "sh ./bin/start.sh test",
"prod": "sh ./bin/start.sh production",
"koa": "nodemon app.js",
"web-dev": "cross-env NODE_ENV=development vue-cli-service serve",
"web-test": "cross-env NODE_ENV=test vue-cli-service build",
"web-build": "cross-env NODE_ENV=production vue-cli-service build",
"test:unit": "vue-cli-service test:unit",
"lint": "vue-cli-service lint"
},
"dependencies": {
"@types/qr-image": "^3.2.4",
"axios": "^0.21.1",
"core-js": "^3.6.5",
"dayjs": "^1.10.6",
"element-plus": "^1.0.2-beta.44",
"form-data": "^4.0.0",
"json-bigint": "^1.0.0",
"koa": "^2.13.1",
"koa-body": "^4.2.0",
"koa-bodyparser": "^4.3.0",
"koa-router": "^10.0.0",
"koa-static": "^5.0.0",
"koa-views": "^7.0.1",
"moment": "^2.29.1",
"qr-image": "^3.2.0",
"request": "^2.88.2",
"uglifyjs-webpack-plugin": "^2.2.0",
"uuid": "^8.3.2",
"vue": "3.0.11",
"vue-router": "^4.0.0-beta.12",
"vuex": "^4.0.0-beta.4"
},
"devDependencies": {
"@testing-library/vue": "^6.4.2",
"@vue/cli-plugin-babel": "^4.5.6",
"@vue/cli-plugin-eslint": "^4.5.6",
"@vue/cli-plugin-unit-jest": "^4.5.6",
"@vue/cli-service": "^4.5.6",
"@vue/compiler-sfc": "^3.0.0-beta.1",
"@vue/eslint-config-prettier": "^6.0.0",
"@vue/test-utils": "^2.0.0-alpha.1",
"babel-eslint": "^10.1.0",
"babel-jest": "^27.0.6",
"cross-env": "^7.0.3",
"eslint": "^6.7.2",
"eslint-plugin-prettier": "^3.1.3",
"eslint-plugin-vue": "^7.0.0-alpha.0",
"jest": "^27.0.6",
"less": "^3.0.4",
"less-loader": "^5.0.0",
"nodemon": "^2.0.7",
"pm2": "3.5.1",
"prettier": "^1.19.1",
"vue3-jest": "^27.0.0-alpha.1"
},
"browserslist": [
"> 1%",
"last 10 versions",
"not ie <= 8",
"iOS >= 8",
"Android >= 4.1"
],
"license": "YIDIAN"
"name": "op-management",
"version": "0.1.0",
"private": true,
"main": "app.js",
"scripts": {
"dev": "sh ./bin/start.sh development",
"test": "sh ./bin/start.sh test",
"prod": "sh ./bin/start.sh production",
"koa": "nodemon app.js",
"web-dev": "cross-env NODE_ENV=development vue-cli-service serve",
"web-test": "cross-env NODE_ENV=test vue-cli-service build",
"web-build": "cross-env NODE_ENV=production vue-cli-service build",
"web-build-report": "cross-env NODE_ENV=production vue-cli-service build --report",
"test:unit": "vue-cli-service test:unit",
"lint": "vue-cli-service lint"
},
"dependencies": {
"axios": "^0.21.1",
"core-js": "^3.6.5",
"dayjs": "^1.10.6",
"element-plus": "^1.0.2-beta.44",
"form-data": "^4.0.0",
"json-bigint": "^1.0.0",
"koa": "^2.13.1",
"koa-body": "^4.2.0",
"koa-bodyparser": "^4.3.0",
"koa-router": "^10.0.0",
"koa-static": "^5.0.0",
"koa-views": "^7.0.1",
"moment": "^2.29.1",
"qr-image": "^3.2.0",
"request": "^2.88.2",
"uuid": "^8.3.2",
"vue": "3.0.11",
"vue-router": "^4.0.0-beta.12",
"vuex": "^4.0.0-beta.4"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^4.5.6",
"@vue/cli-plugin-eslint": "~4.5.0",
"@vue/cli-service": "^4.5.6",
"@vue/compiler-sfc": "^3.0.0-beta.1",
"@vue/eslint-config-prettier": "^6.0.0",
"babel-eslint": "^10.1.0",
"cross-env": "^7.0.3",
"eslint": "^6.7.2",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-vue": "^7.17.0",
"less": "^3.0.4",
"less-loader": "^5.0.0",
"lint-staged": "^11.1.2",
"nodemon": "^2.0.7",
"pm2": "3.5.1",
"prettier": "^2.2.1"
},
"browserslist": [
"> 1%",
"last 10 versions",
"not ie <= 8",
"iOS >= 8",
"Android >= 4.1"
],
"license": "YIDIAN",
"gitHooks": {
"pre-commit": "lint-staged"
},
"lint-staged": {
"src/**/*.{js,vue}": [
"eslint --fix"
],
"server/**/*.js": [
"eslint --fix"
]
}
}
const env = process.env.NODE_ENV || "development";
const port = process.env.PORT || 8055;
const API_YD_LOGIN = 'http://web-rest.int.yidian-inc.com/api/v1/pandora/auth'
const API_YD_LOGIN = "http://web-rest.int.yidian-inc.com/api/v1/pandora/auth";
const PANDORA_URI = {
development: "http://pandora.yidian-inc.com",
test: "http://pandora.yidian-inc.com",
production: "http://pandora.yidian-inc.com"
development: "http://pandora.yidian-inc.com",
test: "http://pandora.yidian-inc.com",
production: "http://pandora.yidian-inc.com",
};
const API_INTERNAL_URI = {
test: "http://bp-dev.ini.yidian-inc.com",
development: "http://bp-test.ini.yidian-inc.com",
production: "http://bp.int.yidian-inc.com"
test: "http://bp-dev.ini.yidian-inc.com",
development: "http://bp-test.ini.yidian-inc.com",
production: "http://bp.int.yidian-inc.com",
};
module.exports = {
env: env,
port: port,
API_INTERNAL_URI: API_INTERNAL_URI[env],
PANDORA_URI: PANDORA_URI[env],
GOODS_URI: API_INTERNAL_URI[env],
GROUPMEAL_URI: API_INTERNAL_URI[env],
ACTIVITY_URI: API_INTERNAL_URI[env],
WITHDRAWAL_URI: API_INTERNAL_URI[env],
API_YD_LOGIN
env: env,
port: port,
API_INTERNAL_URI: API_INTERNAL_URI[env],
PANDORA_URI: PANDORA_URI[env],
GOODS_URI: API_INTERNAL_URI[env],
GROUPMEAL_URI: API_INTERNAL_URI[env],
ACTIVITY_URI: API_INTERNAL_URI[env],
WITHDRAWAL_URI: API_INTERNAL_URI[env],
API_YD_LOGIN,
};
......@@ -2,183 +2,183 @@ const ACTIVITY_URI = require("../config.js").ACTIVITY_URI;
const req = require("../utils/request").httpReq;
// 获取商家列表
exports.getBusinessList = async ctx => {
const url = `${ACTIVITY_URI}/goods/background/ota_list`;
const opts = {
url,
method: "GET"
};
ctx.body = await req(ctx, opts);
exports.getBusinessList = async (ctx) => {
const url = `${ACTIVITY_URI}/goods/background/ota_list`;
const opts = {
url,
method: "GET",
};
ctx.body = await req(ctx, opts);
};
// 添加商品
exports.addGoods = async ctx => {
const url = `${ACTIVITY_URI}/goods/background/add_goods`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
};
ctx.body = await req(ctx, opts);
exports.addGoods = async (ctx) => {
const url = `${ACTIVITY_URI}/goods/background/add_goods`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 商品库列表
exports.pindanGoods = async ctx => {
const url = `${ACTIVITY_URI}/goods/background/pindan_goods`;
const opts = {
url,
method: "GET"
};
ctx.body = await req(ctx, opts);
exports.pindanGoods = async (ctx) => {
const url = `${ACTIVITY_URI}/goods/background/pindan_goods`;
const opts = {
url,
method: "GET",
};
ctx.body = await req(ctx, opts);
};
// 查看商品详情
exports.markGoodsInfo = async ctx => {
const url = `${ACTIVITY_URI}/goods/background/marketing_goods_info`;
const opts = {
url,
method: "GET"
};
ctx.body = await req(ctx, opts);
exports.markGoodsInfo = async (ctx) => {
const url = `${ACTIVITY_URI}/goods/background/marketing_goods_info`;
const opts = {
url,
method: "GET",
};
ctx.body = await req(ctx, opts);
};
// 编辑商品
exports.editGoods = async ctx => {
const url = `${ACTIVITY_URI}/goods/background/edit_goods`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
};
ctx.body = await req(ctx, opts);
exports.editGoods = async (ctx) => {
const url = `${ACTIVITY_URI}/goods/background/edit_goods`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 获取活动过列表
exports.getActivityList = async ctx => {
const url = `${ACTIVITY_URI}/marketing/background/marketing_list`;
const opts = {
url,
method: "GET"
};
ctx.body = await req(ctx, opts);
exports.getActivityList = async (ctx) => {
const url = `${ACTIVITY_URI}/marketing/background/marketing_list`;
const opts = {
url,
method: "GET",
};
ctx.body = await req(ctx, opts);
};
// 修改商品
exports.editGoodsDetail = async ctx => {
const url = `${ACTIVITY_URI}/goods/background/edit_goods`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
};
ctx.body = await req(ctx, opts);
exports.editGoodsDetail = async (ctx) => {
const url = `${ACTIVITY_URI}/goods/background/edit_goods`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 添加营销活动
exports.addMarketing = async ctx => {
const url = `${ACTIVITY_URI}/marketing/background/add_marketing`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
};
ctx.body = await req(ctx, opts);
exports.addMarketing = async (ctx) => {
const url = `${ACTIVITY_URI}/marketing/background/add_marketing`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 编辑营销活动
exports.updateMarketing = async ctx => {
const url = `${ACTIVITY_URI}/marketing/background/update_marketing`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
};
ctx.body = await req(ctx, opts);
exports.updateMarketing = async (ctx) => {
const url = `${ACTIVITY_URI}/marketing/background/update_marketing`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 营销活动详情
exports.marketingInfo = async ctx => {
const url = `${ACTIVITY_URI}/marketing/background/marketing_info`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
};
ctx.body = await req(ctx, opts);
exports.marketingInfo = async (ctx) => {
const url = `${ACTIVITY_URI}/marketing/background/marketing_info`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 关闭/开启 活动
exports.updateActivity = async ctx => {
const url = `${ACTIVITY_URI}/marketing/background/update_marketing_online_status`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
};
ctx.body = await req(ctx, opts);
exports.updateActivity = async (ctx) => {
const url = `${ACTIVITY_URI}/marketing/background/update_marketing_online_status`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 查看活动订单
exports.checkActivityDetail = async ctx => {
const url = `${ACTIVITY_URI}/marketing/background/marketing_info`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
};
ctx.body = await req(ctx, opts);
exports.checkActivityDetail = async (ctx) => {
const url = `${ACTIVITY_URI}/marketing/background/marketing_info`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 查看活动订单
exports.checkActivityDetailInfo = async ctx => {
const url = `${ACTIVITY_URI}/order/background/pindan_marketing_info_data_statistics`;
const opts = {
url,
method: "GET",
json: true,
body: ctx.request.body
};
ctx.body = await req(ctx, opts);
exports.checkActivityDetailInfo = async (ctx) => {
const url = `${ACTIVITY_URI}/order/background/pindan_marketing_info_data_statistics`;
const opts = {
url,
method: "GET",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 获取自提点列表
exports.getPlaceList = async ctx => {
const url = `${ACTIVITY_URI}/marketing/background/take_place_list`;
const opts = {
url,
method: "GET"
};
ctx.body = await req(ctx, opts);
exports.getPlaceList = async (ctx) => {
const url = `${ACTIVITY_URI}/marketing/background/take_place_list`;
const opts = {
url,
method: "GET",
};
ctx.body = await req(ctx, opts);
};
// 添加自提点
exports.addPlace = async ctx => {
const url = `${ACTIVITY_URI}/marketing/background/add_take_place`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
};
ctx.body = await req(ctx, opts);
exports.addPlace = async (ctx) => {
const url = `${ACTIVITY_URI}/marketing/background/add_take_place`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
//删除自提点
exports.deletePlace = async ctx => {
const url = `${ACTIVITY_URI}/marketing/background/delete_take_place`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
};
ctx.body = await req(ctx, opts);
exports.deletePlace = async (ctx) => {
const url = `${ACTIVITY_URI}/marketing/background/delete_take_place`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
......@@ -3,128 +3,128 @@ const req = require("../utils/request").httpReq;
const controller_utils = require("./utils");
// 获取企业信息列表
exports.auditList = async ctx => {
const url = `${API_INTERNAL_URI}/merchant/inner/audit_list`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
};
ctx.body = JSON.stringify(await req(ctx, opts));
exports.auditList = async (ctx) => {
const url = `${API_INTERNAL_URI}/merchant/inner/audit_list`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = JSON.stringify(await req(ctx, opts));
};
// 企业认证获取验证码
exports.sendCode = async ctx => {
const url = `${API_INTERNAL_URI}/merchant/lifeinner/send_code`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
};
ctx.body = await req(ctx, opts);
exports.sendCode = async (ctx) => {
const url = `${API_INTERNAL_URI}/merchant/lifeinner/send_code`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 企业认证校验验证码
exports.checkCode = async ctx => {
const url = `${API_INTERNAL_URI}/merchant/lifeinner/check_code`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
};
ctx.body = await req(ctx, opts);
exports.checkCode = async (ctx) => {
const url = `${API_INTERNAL_URI}/merchant/lifeinner/check_code`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 审核列表详情页回显信息列表
exports.getRecordInfo = async ctx => {
const url = `${API_INTERNAL_URI}/merchant/inner/get_record_info`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
};
let permission = await controller_utils.getUserPermission(ctx);
permission = JSON.parse(permission);
const request = await req(ctx, opts);
if (permission.is_sensitive_data !== 1) {
request.result.record.entterprise_image = null; // 营业执照照片
request.result.record.legal_person = "********"; // 法人姓名
request.result.record.legal_id_card = "********"; // 法人身份证号
request.result.record.legal_validity_start_time = "********"; // 法人身份证开始时间
request.result.record.legal_validity_end_time = "********"; // 法人身份证结束时间
request.result.record.legal_front_id_card = null; // 法人身份证正面照
request.result.record.legal_back_id_card = null; // 法人身份证反面照
request.result.record.legal_id_card_hash = "********"; // 法人身份证哈希值
request.result.record.enterprice_address = "********"; // 企业地址
request.result.record.legal_issued_by = "********"; // 法人身份证地址
request.result.record.legal_nationality = "********"; // 法人民族
request.result.record.mobile = "********"; // 法人电话
request.result.record.sensitiveWord = false; // 是否有查看敏感词权限
} else {
request.result.record.sensitiveWord = true; // 是否有查看敏感词权限
}
ctx.body = request;
exports.getRecordInfo = async (ctx) => {
const url = `${API_INTERNAL_URI}/merchant/inner/get_record_info`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body,
};
let permission = await controller_utils.getUserPermission(ctx);
permission = JSON.parse(permission);
const request = await req(ctx, opts);
if (permission.is_sensitive_data !== 1) {
request.result.record.entterprise_image = null; // 营业执照照片
request.result.record.legal_person = "********"; // 法人姓名
request.result.record.legal_id_card = "********"; // 法人身份证号
request.result.record.legal_validity_start_time = "********"; // 法人身份证开始时间
request.result.record.legal_validity_end_time = "********"; // 法人身份证结束时间
request.result.record.legal_front_id_card = null; // 法人身份证正面照
request.result.record.legal_back_id_card = null; // 法人身份证反面照
request.result.record.legal_id_card_hash = "********"; // 法人身份证哈希值
request.result.record.enterprice_address = "********"; // 企业地址
request.result.record.legal_issued_by = "********"; // 法人身份证地址
request.result.record.legal_nationality = "********"; // 法人民族
request.result.record.mobile = "********"; // 法人电话
request.result.record.sensitiveWord = false; // 是否有查看敏感词权限
} else {
request.result.record.sensitiveWord = true; // 是否有查看敏感词权限
}
ctx.body = request;
};
// 历史提交审核日志详情页
exports.getLog = async ctx => {
const url = `${API_INTERNAL_URI}/merchant/inner/get_log`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
};
ctx.body = await req(ctx, opts);
exports.getLog = async (ctx) => {
const url = `${API_INTERNAL_URI}/merchant/inner/get_log`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 企业资料审核
exports.postAudit = async ctx => {
const url = `${API_INTERNAL_URI}/merchant/inner/audit`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
};
ctx.body = await req(ctx, opts);
exports.postAudit = async (ctx) => {
const url = `${API_INTERNAL_URI}/merchant/inner/audit`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 企业资料修改
exports.opBusinessUpdate = async ctx => {
const url = `${API_INTERNAL_URI}/merchant/inner/op_business_update`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
};
ctx.body = await req(ctx, opts);
}
exports.opBusinessUpdate = async (ctx) => {
const url = `${API_INTERNAL_URI}/merchant/inner/op_business_update`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 商户上传营业执照信息
exports.postBusiness = async ctx => {
const url = `${API_INTERNAL_URI}/merchant/inner/op_business_commit`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
};
ctx.body = await req(ctx, opts);
exports.postBusiness = async (ctx) => {
const url = `${API_INTERNAL_URI}/merchant/inner/op_business_commit`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 商户信息代提交(op后台)
exports.opCommit = async ctx => {
const url = `${API_INTERNAL_URI}/merchant/inner/op_commit`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
};
ctx.body = await req(ctx, opts);
exports.opCommit = async (ctx) => {
const url = `${API_INTERNAL_URI}/merchant/inner/op_commit`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
This diff is collapsed.
This diff is collapsed.
const API_INTERNAL_URI = require('../config.js').API_INTERNAL_URI
const API_INTERNAL_URI = require("../config.js").API_INTERNAL_URI;
//生活号列表
const req = require('../utils/request').httpReq
const req = require("../utils/request").httpReq;
exports.get_life_list = async (ctx, next) => {
var url = `${API_INTERNAL_URI}/merchant/lifeinner/life_list`;
var opts = {
url: url,
method: 'GET',
qs: ctx.request.query
}
var url = `${API_INTERNAL_URI}/merchant/lifeinner/life_list`;
var opts = {
url: url,
method: "GET",
qs: ctx.request.query,
};
ctx.body = await req(ctx, opts)
}
ctx.body = await req(ctx, opts);
};
//生活号详情
exports.get_life_info = async (ctx, next) => {
var url = `${API_INTERNAL_URI}/merchant/lifeinner/life_info`;
var opts = {
url: url,
method: 'POST',
json: true,
timeout: 8000,
body: ctx.request.body
}
ctx.body = await req(ctx, opts)
}
var url = `${API_INTERNAL_URI}/merchant/lifeinner/life_info`;
var opts = {
url: url,
method: "POST",
json: true,
timeout: 8000,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
const qr = require('qr-image');
const qr = require("qr-image");
exports.gen_qr_code = async (ctx) => {
const url = ctx.query.url;
try {
let img = qr.image(decodeURIComponent(url));
ctx.type= 'image/png';
ctx.type = "image/png";
ctx.body = img;
} catch (e) {
ctx.type='text/html;charset=utf-8';
ctx.body='<h1>414 Request-URI Too Large</h1>';
ctx.type = "text/html;charset=utf-8";
ctx.body = "<h1>414 Request-URI Too Large</h1>";
}
};
const API_INTERNAL_URI = require('../config.js').API_INTERNAL_URI
const req = require('../utils/request').httpReq
const controller_utils = require('./utils')
const API_INTERNAL_URI = require("../config.js").API_INTERNAL_URI;
const req = require("../utils/request").httpReq;
const controller_utils = require("./utils");
exports.getAll_role_list = async (ctx, next) => {
ctx.body = await controller_utils.getUserPermission(ctx);
}
ctx.body = await controller_utils.getUserPermission(ctx);
};
exports.getRole_list = async (ctx, next) => {
var url = `${API_INTERNAL_URI}/merchant/authority/role_list`;
var opts = {
url: url,
method: 'POST',
json: true,
body: ctx.request.body
}
ctx.body = await req(ctx, opts)
}
var url = `${API_INTERNAL_URI}/merchant/authority/role_list`;
var opts = {
url: url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
exports.getAdd_role = async (ctx, next) => {
var url = `${API_INTERNAL_URI}/merchant/authority/add_role`;
var opts = {
url: url,
method: 'POST',
json: true,
body: ctx.request.body
}
ctx.body = await req(ctx, opts)
}
var url = `${API_INTERNAL_URI}/merchant/authority/add_role`;
var opts = {
url: url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
exports.get_role_info = async (ctx, next) => {
var url = `${API_INTERNAL_URI}/merchant/authority/get_role_info`;
var opts = {
url: url,
method: 'POST',
json: true,
timeout: 8000,
body: ctx.request.body
}
ctx.body = await req(ctx, opts)
}
var url = `${API_INTERNAL_URI}/merchant/authority/get_role_info`;
var opts = {
url: url,
method: "POST",
json: true,
timeout: 8000,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
exports.getUpdate_role = async (ctx, next) => {
var url = `${API_INTERNAL_URI}/merchant/authority/update_role`;
var opts = {
url: url,
method: 'POST',
json: true,
body: ctx.request.body
}
ctx.body = await req(ctx, opts)
}
var url = `${API_INTERNAL_URI}/merchant/authority/update_role`;
var opts = {
url: url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
exports.getDelete_role = async (ctx, next) => {
var url = `${API_INTERNAL_URI}/merchant/authority/delete_role`;
var opts = {
url: url,
method: 'POST',
json: true,
body: ctx.request.body
}
ctx.body = await req(ctx, opts)
}
var url = `${API_INTERNAL_URI}/merchant/authority/delete_role`;
var opts = {
url: url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
......@@ -11,14 +11,21 @@ exports.index = (ctx, next) => {
const hostname = ctx.hostname;
const pathArr = ctx.path.substring(1).split("/");
// console.log(hostname);
// console.log(pathArr);
if (hostname === "opservice.yidianzixun.com" || hostname === "www.opservice.yidianzixun.com") {
if (pathArr[1] !== "activity" && pathArr[1] !== "groupmeal") {
ctx.body = "权限不足";
return;
}
console.log(hostname);
console.log(pathArr);
// 外网域名
const hostNameArr = ["127.0.0.1", "opservice.yidianzixun.com", "test-opservice.yidianzixun.com", "preprod-opservice.yidianzixun.com"];
// 允许访问的模块
const allowModuleArr = ["activity", "groupmeal"];
// 不允许访问的模块
const noAllowModuleArr = ["goods", "enterprise", "withdrawal"];
if (hostNameArr.includes(hostname) && noAllowModuleArr.includes(pathArr[1])) {
ctx.body = "权限不足";
return;
}
if (!cachePage) {
......
......@@ -2,37 +2,36 @@ const PANDORA_URI = require("../config.js").PANDORA_URI;
const req = require("../utils/request").httpReq;
const { API_INTERNAL_URI, API_YD_LOGIN } = require("../config.js");
exports.fetch_user = async (ctx, next) => {
const url = `${PANDORA_URI}/api/user/getuser`;
const opts = {
url: url,
method: "GET",
headers: {
Cookie: ctx.request.header.cookie
}
};
ctx.body = await req(ctx, opts);
const url = `${PANDORA_URI}/api/user/getuser`;
const opts = {
url: url,
method: "GET",
headers: {
Cookie: ctx.request.header.cookie,
},
};
ctx.body = await req(ctx, opts);
};
exports.J_login = async (ctx, next) => {
var url = `${API_INTERNAL_URI}/merchant/authority/login`;
var opts = {
url: url,
method: 'POST',
json: true,
body: ctx.request.body
}
ctx.body = await req(ctx, opts)
}
var url = `${API_INTERNAL_URI}/merchant/authority/login`;
var opts = {
url: url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
exports.YD_login = async (ctx, next) => {
var url = API_YD_LOGIN;
var opts = {
url: url,
method: 'POST',
json: true,
body: ctx.request.body
}
ctx.body = await req(ctx, opts)
}
var url = API_YD_LOGIN;
var opts = {
url: url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
const API_INTERNAL_URI = require('../config.js').API_INTERNAL_URI
const req = require('../utils/request').httpReq
const controller_utils = require('./utils')
const API_INTERNAL_URI = require("../config.js").API_INTERNAL_URI;
const req = require("../utils/request").httpReq;
const controller_utils = require("./utils");
//用户详情
exports.getUser_detail = async (ctx, next) => {
var url = `${API_INTERNAL_URI}/merchant/authority/get_user_info`;
var opts = {
url: url,
method: 'POST',
json: true,
timeout: 8000,
body: ctx.request.body
}
ctx.body = await req(ctx, opts)
}
var url = `${API_INTERNAL_URI}/merchant/authority/get_user_info`;
var opts = {
url: url,
method: "POST",
json: true,
timeout: 8000,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
var query = {
async get_permissions (ctx) {
ctx.body = await controller_utils.getUserPermission(ctx);
}
async get_permissions(ctx) {
ctx.body = await controller_utils.getUserPermission(ctx);
},
};
exports.query = async (ctx, next) => {
var type = ctx.params.type;
if (query[type]) {
try {
ctx.set("Content-Type", "application/json; charset=utf-8");
await query[type](ctx, next);
} catch (e) {
console.error("/api/v1 error", e, ctx.url, ctx.headers["cookie"]);
ctx.body = { status: "failed", reason: "Internal Server Error" };
var type = ctx.params.type;
if (query[type]) {
try {
ctx.set("Content-Type", "application/json; charset=utf-8");
await query[type](ctx, next);
} catch (e) {
console.error("/api/v1 error", e, ctx.url, ctx.headers["cookie"]);
ctx.body = { status: "failed", reason: "Internal Server Error" };
}
} else {
ctx.body = {
status: "failed",
reason: "Invalid type param",
};
}
} else {
ctx.body = {
status: "failed",
reason: "Invalid type param"
};
}
};
exports.user_list = async (ctx, next) => {
const url = `${API_INTERNAL_URI}/merchant/authority/get_user_list`;
const opts = {
url: url,
method: "GET",
qs: ctx.request.query,
};
ctx.body = await req(ctx, opts);
const url = `${API_INTERNAL_URI}/merchant/authority/get_user_list`;
const opts = {
url: url,
method: "GET",
qs: ctx.request.query,
};
ctx.body = await req(ctx, opts);
};
exports.user_detail = async (ctx, next) => {
const url = `${API_INTERNAL_URI}/merchant/authority/get_user_info`;
const opts = {
url: url,
method: "GET",
qs: ctx.request.query,
};
ctx.body = await req(ctx, opts);
const url = `${API_INTERNAL_URI}/merchant/authority/get_user_info`;
const opts = {
url: url,
method: "GET",
qs: ctx.request.query,
};
ctx.body = await req(ctx, opts);
};
exports.user_edit = async (ctx, next) => {
const url = `${API_INTERNAL_URI}/merchant/authority/update_user`;
const opts = {
url: url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
const url = `${API_INTERNAL_URI}/merchant/authority/update_user`;
const opts = {
url: url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
exports.user_new = async (ctx, next) => {
const url = `${API_INTERNAL_URI}/merchant/authority/add_user_role`;
const opts = {
url: url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
const url = `${API_INTERNAL_URI}/merchant/authority/add_user_role`;
const opts = {
url: url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
//通过手机号获取小程序用户信息
exports.getPhoneWechat = async (ctx, next) => {
const url = `${API_INTERNAL_URI}/user/background/get_phone_wechat`;
const opts = {
url: url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
const url = `${API_INTERNAL_URI}/user/background/get_phone_wechat`;
const opts = {
url: url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 配置优惠券
exports.couponGrant = async (ctx, next) => {
const url = `${API_INTERNAL_URI}/coupon/background/grant`;
const opts = {
url: url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
const url = `${API_INTERNAL_URI}/coupon/background/grant`;
const opts = {
url: url,
method: "POST",
json: true,
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
const API_INTERNAL_URI = require('../config.js').API_INTERNAL_URI
const req = require('../utils/request').httpReq
const API_INTERNAL_URI = require("../config.js").API_INTERNAL_URI;
const req = require("../utils/request").httpReq;
exports.getUserPermission = async (ctx) => {
const url = `${API_INTERNAL_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);
}
\ No newline at end of file
const url = `${API_INTERNAL_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);
};
......@@ -17,139 +17,139 @@ const req = require("../utils/request").httpReq;
* };
*/
// 获取提现审核列表
exports.getApplyList = async ctx => {
exports.getApplyList = async (ctx) => {
const url = `${WITHDRAWAL_URI}/wallet/background/apply_list`;
const opts = {
url,
method: "GET",
qs: ctx.request.query
qs: ctx.request.query,
};
ctx.body = await req(ctx, opts);
};
// 获取黑名单冻结账户
exports.getBlackList = async ctx => {
exports.getBlackList = async (ctx) => {
const url = `${WITHDRAWAL_URI}/wallet/background/blacklist`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 获取通过、拒绝订单审核
exports.getWithdrawAudit = async ctx => {
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)
}
timeout: 10000,
};
ctx.body = await req(ctx, opts);
};
// 获取提现失败冻结
exports.getFreezingFund = async ctx => {
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)
}
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 获取提现审核详情
exports.getApplyDetail = async ctx => {
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)
}
qs: ctx.request.query,
};
ctx.body = await req(ctx, opts);
};
// 提现审核迭代
// 获取钱包账户列表
exports.getAccountList = async ctx => {
exports.getAccountList = async (ctx) => {
const url = `${WITHDRAWAL_URI}/wallet/background/account_list`;
const opts = {
url,
method: "GET",
qs: ctx.request.query
}
ctx.body = await req(ctx, opts)
}
qs: ctx.request.query,
};
ctx.body = await req(ctx, opts);
};
// 获取钱包账户流水列表
exports.getRecordList = async ctx => {
exports.getRecordList = async (ctx) => {
const url = `${WITHDRAWAL_URI}/wallet/background/record_list`;
const opts = {
url,
method: "GET",
qs: ctx.request.query
}
ctx.body = await req(ctx, opts)
}
qs: ctx.request.query,
};
ctx.body = await req(ctx, opts);
};
// 钱包账户黑名单
exports.getAccountBlackList = async ctx => {
exports.getAccountBlackList = 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)
}
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 钱包账户释放
exports.getReblackList = async ctx => {
exports.getReblackList = async (ctx) => {
const url = `${WITHDRAWAL_URI}/wallet/background/reblacklist`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
}
ctx.body = await req(ctx, opts)
}
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 获取钱包账户余额状态
exports.getWalletAccountStatus = async ctx=>{
exports.getWalletAccountStatus = async (ctx) => {
const url = `${WITHDRAWAL_URI}/wallet/background/get_wallet_account_status`;
const opts = {
url,
method: "GET",
qs: ctx.request.query
}
ctx.body = await req(ctx,opts)
}
qs: ctx.request.query,
};
ctx.body = await req(ctx, opts);
};
// 钱包账户余额状态
exports.resetAccountStatus = async ctx=>{
exports.resetAccountStatus = async (ctx) => {
const url = `${WITHDRAWAL_URI}/wallet/background/reset_wallet_account_status`;
const opts = {
url,
method:"POST",
json:true,
body:ctx.request.body
}
ctx.body = await req(ctx,opts)
}
method: "POST",
json: true,
body: ctx.request.body,
};
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
}
url,
method: "GET",
qs: {
// user_email: "jianghaiming@126.com"
user_email: user,
},
};
return await req(ctx, opts);
}
exports.getAll_role_list = async (ctx, next) => {
};
exports.getAll_role_list = async (ctx, next) => {
ctx.body = await getUserPermission(ctx);
}
\ No newline at end of file
};
This diff is collapsed.
const request = require("request");
exports.httpReq = (ctx, opts) => {
opts.timeout = opts.timeout || 10000;
return new Promise((resolve, reject) => {
var time_start = +new Date();
opts.timeout = opts.timeout || 10000;
return new Promise((resolve, reject) => {
var time_start = +new Date();
const defaultQs = {
appid: "merchant-op",
cv: "1.0.0",
version: "999999",
distribution: "op",
net: "wifi",
platform: "2"
};
const defaultQs = {
appid: "merchant-op",
cv: "1.0.0",
version: "999999",
distribution: "op",
net: "wifi",
platform: "2",
};
opts.qs = { ...defaultQs, ...ctx.request.query, ...opts.qs };
opts.qs = { ...defaultQs, ...ctx.request.query, ...opts.qs };
request(opts, (err, res, body) => {
console.info(
`[Api] httpReq (${opts.url}, user:[${
opts.qs.op_cur_user
}]) spent: ${+new Date() - time_start}ms`
);
request(opts, (err, res, body) => {
console.info(`[Api] httpReq (${opts.url}, user:[${opts.qs.op_cur_user}]) spent: ${+new Date() - time_start}ms`);
if (!err) {
resolve(body);
} else {
reject(err);
console.error(opts.url, err);
}
if (!err) {
resolve(body);
} else {
reject(err);
console.error(opts.url, err);
}
});
});
});
};
......@@ -10,27 +10,27 @@
</template>
<script>
import { getCookie, redirectToLogin } from '@/utils/util';
import { fetchCurrentUser } from './service/user';
import { getCookie, redirectToLogin } from "@/utils/util";
import { fetchCurrentUser } from "./service/user";
export default {
async mounted() {
if (this.$store.state.permissions && this.$store.state.userInfo) return;
if (!getCookie('username') && window.location.pathname != '/op/login') {
this.$message('请先登录');
if (!getCookie("username") && window.location.pathname != "/op/login") {
this.$message("请先登录");
return redirectToLogin();
}
if (!this.$store.state.permissions) {
const { status, user } = await fetchCurrentUser();
if (status === 'success') {
this.$store.commit('updateUserInfo', user);
await this.$store.dispatch('updateUserPermission', { email: user.email });
this.$store.dispatch('fetchPermission', {
appId: 'merchant-op-auditing'
if (status === "success") {
this.$store.commit("updateUserInfo", user);
await this.$store.dispatch("updateUserPermission", { email: user.email });
this.$store.dispatch("fetchPermission", {
appId: "merchant-op-auditing",
});
}
}
}
},
};
</script>
......
<template>
<div class="YDDialog">
<el-dialog
:title="dialogTitle"
v-model="dialogVisible"
:width="dialogWidth"
:show-close="showDialogClose"
:top="dialogMarginTop"
:modal="dialogModel"
:close-on-click-modal="dialogCloseOnClickModal"
:close-on-press-escape="dialogCloseOnPressEscape"
:center="dialogCenter"
>
<slot></slot>
<template #footer>
<span class="dialog-footer">
<el-button v-show="isShowCancelButton" @click="cancel">{{
cancelButtonText
}}</el-button>
<el-button
v-show="isShowConfirmButton"
type="primary"
@click="cofirm"
>{{ confirmButtonText }}</el-button
>
</span>
</template>
</el-dialog>
</div>
<div class="YDDialog">
<el-dialog
:title="dialogTitle"
v-model="dialogVisible"
:width="dialogWidth"
:show-close="showDialogClose"
:top="dialogMarginTop"
:modal="dialogModel"
:close-on-click-modal="dialogCloseOnClickModal"
:close-on-press-escape="dialogCloseOnPressEscape"
:center="dialogCenter"
>
<slot></slot>
<template #footer>
<span class="dialog-footer">
<el-button v-show="isShowCancelButton" @click="cancel">{{ cancelButtonText }}</el-button>
<el-button v-show="isShowConfirmButton" type="primary" @click="cofirm">{{ confirmButtonText }}</el-button>
</span>
</template>
</el-dialog>
</div>
</template>
<script>
export default {
props: {
// 标题
dialogTitle: {
type: String,
default: "标题"
},
// dialog 显示控制
myDialogVisible: {
type: Boolean,
default: false
},
// 确认button文案
confirmButtonText: {
type: String,
default: "确 定"
},
// 取消button文案
cancelButtonText: {
type: String,
default: "取 消"
},
// 宽度
dialogWidth: {
type: String,
default: "50%"
},
// 距离顶部的margin
dialogMarginTop: {
type: String,
default: "15vh"
},
// 是否需要遮罩层
dialogModel: {
type: Boolean,
default: true
},
// 点击遮罩层是否关闭dialog
dialogCloseOnClickModal: {
type: Boolean,
default: false
},
// 是否显示关闭(右上角X)
showDialogClose: {
type: Boolean,
default: false
},
// 是否展示确定按钮
isShowConfirmButton: {
type: Boolean,
default: true
},
// 是否展示取消按钮
isShowCancelButton: {
type: Boolean,
default: true
},
// 点击esc是否关闭
dialogCloseOnPressEscape: {
type: Boolean,
default: false
},
// 底部按钮是否居中显示
dialogCenter: {
type: Boolean,
default: false
},
// cancelDialog 方法名称
cancelDialogMethodName: {
type: String,
default: "dialogCancel"
},
// confirmDialog 方法名称
confirmDialogMethodName: {
type: String,
default: "dialogConfirm"
}
},
data() {
return {
dialogVisible: this.myDialogVisible
};
},
export default {
props: {
// 标题
dialogTitle: {
type: String,
default: "标题",
},
// dialog 显示控制
myDialogVisible: {
type: Boolean,
default: false,
},
// 确认button文案
confirmButtonText: {
type: String,
default: "确 定",
},
// 取消button文案
cancelButtonText: {
type: String,
default: "取 消",
},
// 宽度
dialogWidth: {
type: String,
default: "50%",
},
// 距离顶部的margin
dialogMarginTop: {
type: String,
default: "15vh",
},
// 是否需要遮罩层
dialogModel: {
type: Boolean,
default: true,
},
// 点击遮罩层是否关闭dialog
dialogCloseOnClickModal: {
type: Boolean,
default: false,
},
// 是否显示关闭(右上角X)
showDialogClose: {
type: Boolean,
default: false,
},
// 是否展示确定按钮
isShowConfirmButton: {
type: Boolean,
default: true,
},
// 是否展示取消按钮
isShowCancelButton: {
type: Boolean,
default: true,
},
// 点击esc是否关闭
dialogCloseOnPressEscape: {
type: Boolean,
default: false,
},
// 底部按钮是否居中显示
dialogCenter: {
type: Boolean,
default: false,
},
// cancelDialog 方法名称
cancelDialogMethodName: {
type: String,
default: "dialogCancel",
},
// confirmDialog 方法名称
confirmDialogMethodName: {
type: String,
default: "dialogConfirm",
},
},
data() {
return {
dialogVisible: this.myDialogVisible,
};
},
watch: {
myDialogVisible(newVal) {
this.dialogVisible = newVal;
}
},
methods: {
cancel() {
this.$emit(this.cancelDialogMethodName);
},
cofirm() {
this.$emit(this.confirmDialogMethodName);
}
}
};
watch: {
myDialogVisible(newVal) {
this.dialogVisible = newVal;
},
},
methods: {
cancel() {
this.$emit(this.cancelDialogMethodName);
},
cofirm() {
this.$emit(this.confirmDialogMethodName);
},
},
};
</script>
<style lang="less" scoped></style>
<template>
<div class="page-footer"></div>
<div class="page-footer"></div>
</template>
<script>
export default {};
export default {};
</script>
<style></style>
<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 trigger="hover">
<el-dropdown-item>
{{ userEmail }}
</el-dropdown-item>
<el-dropdown-item @click="$emit('logout')">
退出登录
</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
<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 trigger="hover">
<el-dropdown-item>
{{ userEmail }}
</el-dropdown-item>
<el-dropdown-item @click="$emit('logout')">退出登录</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
</template>
<script>
import { mapState } from 'vuex'
import { HEADER_CONFIG } from '@/config/pageconfig';
import { getCookie } from "@/utils/util";
import { mapState } from "vuex";
import { HEADER_CONFIG } from "@/config/pageconfig";
import { getCookie } from "@/utils/util";
export default {
computed: mapState({
userInfo: state => (state.userInfo || {}),
}),
export default {
computed: mapState({
userInfo: (state) => state.userInfo || {},
}),
data () {
return {
DEFAULT_AVATAR: HEADER_CONFIG.miscellaneous.defaultAvatar,
userEmail: ''
data() {
return {
DEFAULT_AVATAR: HEADER_CONFIG.miscellaneous.defaultAvatar,
userEmail: "",
};
},
mounted() {
this.userEmail = getCookie("username") || "";
},
};
},
mounted() {
this.userEmail = getCookie('username') || ''
}
};
</script>
<style lang="less" scoped>
.user-info {
display: flex;
align-items: center;
}
.user-info {
display: flex;
align-items: center;
}
.user-name {
margin-left: 12px;
color: #fff;
}
.user-name {
margin-left: 12px;
color: #fff;
}
</style>
const headerConfig = {
appName: 'OP运营管理后台',
logo: 'http://si1.go2yd.com/get-image/0ZAJxXeZ6iu',
menuItems: [
{
path: '/enterprise/certification',
name: '企业认证管理'
appName: "OP运营管理后台",
logo: "http://si1.go2yd.com/get-image/0ZAJxXeZ6iu",
menuItems: [
{
path: "/enterprise/certification",
name: "企业认证管理",
},
{
path: "/lifeNo",
name: "生活号管理",
},
{
path: "/role",
name: "角色管理",
},
{
path: "/user",
name: "用户管理",
},
],
miscellaneous: {
// 配置当用户头像不存在时使用的fallback头像图URL
defaultAvatar: "//s.go2yd.com/a/thead_meiguoduizhang.png",
},
{
path: '/lifeNo',
name: '生活号管理'
},
{
path: '/role',
name: '角色管理'
},
{
path: '/user',
name: '用户管理'
}
],
miscellaneous: {
// 配置当用户头像不存在时使用的fallback头像图URL
defaultAvatar: '//s.go2yd.com/a/thead_meiguoduizhang.png',
},
};
export default headerConfig;
\ No newline at end of file
export default headerConfig;
<template>
<div>
<el-menu
:router="true"
background-color="#545c64"
text-color="#fff"
:default-active="activeMenu"
active-text-color="#ffd04b"
mode="horizontal"
>
<el-menu-item
v-for="item in menuItemsWithAuth"
:index="item.path"
:key="item.name"
<div>
<el-menu
:router="true"
background-color="#545c64"
text-color="#fff"
:default-active="activeMenu"
active-text-color="#ffd04b"
mode="horizontal"
>
{{ item.name }}
</el-menu-item>
<el-menu-item key="usermenu" class="user-menu">
<user @logout="handleLogout"></user>
</el-menu-item>
</el-menu>
</div>
<el-menu-item v-for="item in menuItemsWithAuth" :index="item.path" :key="item.name">
{{ item.name }}
</el-menu-item>
<el-menu-item key="usermenu" class="user-menu">
<user @logout="handleLogout"></user>
</el-menu-item>
</el-menu>
</div>
</template>
<script>
import { HEADER_CONFIG } from "@/config/pageconfig";
import User from './User.vue';
import { createNamespacedHelpers } from 'vuex'
const { mapActions } = createNamespacedHelpers('login')
const { menuItems } = HEADER_CONFIG;
import { HEADER_CONFIG } from "@/config/pageconfig";
import User from "./User.vue";
import { createNamespacedHelpers } from "vuex";
const { mapActions } = createNamespacedHelpers("login");
const { menuItems } = HEADER_CONFIG;
export default {
name: "PageHeader",
components: {
User,
},
data () {
return {
menuItems,
};
},
computed: {
menuItemsWithAuth: function () {
const keys = Object.keys(this.$store.getters.subPermissions)
return this.menuItems.filter(ele => keys.includes(ele.key))
},
export default {
name: "PageHeader",
components: {
User,
},
data() {
return {
menuItems,
};
},
computed: {
menuItemsWithAuth: function () {
const keys = Object.keys(this.$store.getters.subPermissions);
return this.menuItems.filter((ele) => keys.includes(ele.key));
},
activeMenu: function () {
return this.$route.path;
},
},
beforeMount () {
},
methods: {
...mapActions(['logout']),
handleLogout() {
this.logout()
},
},
};
activeMenu: function () {
return this.$route.path;
},
},
beforeMount() {},
methods: {
...mapActions(["logout"]),
handleLogout() {
this.logout();
},
},
};
</script>
<style lang="less">
.menu-router {
display: inline-block;
line-height: 60px;
width: 100%;
}
.user-menu {
float: right !important;
margin-right: 20px;
}
.menu-router {
display: inline-block;
line-height: 60px;
width: 100%;
}
.user-menu {
float: right !important;
margin-right: 20px;
}
</style>
<template>
<div class="block">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
v-model:currentPage="currentPage"
:page-size="pageSize"
layout=" total,prev, pager, next"
:total="totalNum"
>
</el-pagination>
</div>
<div class="block">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
v-model:currentPage="currentPage"
:page-size="pageSize"
layout=" total,prev, pager, next"
:total="totalNum"
></el-pagination>
</div>
</template>
<script>
export default {
props: {
data: Object,
totalNum: Number,
pageSize: {
type: Number,
default: 20,
}
},
data () {
return {
currentPage: 1
}
},
methods: {
handleSizeChange (size) {
console.log(`每页 ${size} 条`);
this.$emit('update', { pageSize: size, })
},
handleCurrentChange (pageIndex) {
console.log(`当前页: ${pageIndex}`);
this.$emit('update', { page: pageIndex })
}
},
}
export default {
props: {
data: Object,
totalNum: Number,
pageSize: {
type: Number,
default: 20,
},
},
data() {
return {
currentPage: 1,
};
},
methods: {
handleSizeChange(size) {
console.log(`每页 ${size} 条`);
this.$emit("update", { pageSize: size });
},
handleCurrentChange(pageIndex) {
console.log(`当前页: ${pageIndex}`);
this.$emit("update", { page: pageIndex });
},
},
};
</script>
<style lang="less">
.block {
margin-top: 50px;
}
</style>
\ No newline at end of file
.block {
margin-top: 50px;
}
</style>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
<template>
<el-dialog
title="提示"
v-model="dialogVisible"
width="30%"
:before-close="handleClose"
>
<span>这是一段信息</span>
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="dialogVisible = false"
>确 定</el-button
>
</span>
</template>
</el-dialog>
<el-dialog title="提示" v-model="dialogVisible" width="30%" :before-close="handleClose">
<span>这是一段信息</span>
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
</span>
</template>
</el-dialog>
</template>
<script>
export default {
components: {},
props: {},
data() {
return {
dialogVisible: true
export default {
components: {},
props: {},
data() {
return {
dialogVisible: true,
};
},
watch: {},
computed: {},
methods: {},
created() {},
mounted() {},
};
},
watch: {},
computed: {},
methods: {},
created() {},
mounted() {}
};
</script>
<style lang="less" scoped></style>
const currEnv = "prod"
const currEnv = "prod";
const API_URI = {
'dev': "XXX",
'test': "XXX",
'prod': "XXX"
}
dev: "XXX",
test: "XXX",
prod: "XXX",
};
export default {
API_URI: API_URI[currEnv],
}
\ No newline at end of file
API_URI: API_URI[currEnv],
};
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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