Skip to content

O
op-web-service
Commit c3a373c3 authored by liwenhong's avatar liwenhong
Browse files
Options

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
Expand all Show whitespace changes
Inline Side-by-side
Showing with 21479 additions and 63949 deletions
.editorconfig 0 → 100644
View file @ c3a373c3
# 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
.eslintignore
View file @ c3a373c3
......@@ -7,4 +7,3 @@ public
dist
.prettierrc.js
.eslintrc.js
server/
.eslintrc.js
View file @ c3a373c3
......@@ -3,23 +3,15 @@ module.exports = {
env: {
node: true,
},
extends: ['plugin:vue/vue3-essential', 'eslint:recommended', '@vue/prettier'],
extends: ["plugin:vue/vue3-essential", "eslint:recommended", "@vue/prettier"],
parserOptions: {
parser: 'babel-eslint',
parser: "babel-eslint",
},
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
"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",
},
overrides: [
{
files: [
'**/__tests__/*.{j,t}s?(x)',
'**/tests/unit/**/*.spec.{j,t}s?(x)',
],
env: {
jest: true,
},
},
],
};
.gitignore
View file @ c3a373c3
......@@ -7,7 +7,6 @@ dist
# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
......
.prettierrc.js 0 → 100755
View file @ c3a373c3
// 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,
};
.vscode/settings.json 0 → 100644
View file @ c3a373c3
{
// 保存自动格式化
"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"
}
}
babel.config.js
View file @ c3a373c3
module.exports = {
presets: ['@vue/cli-plugin-babel/preset'],
presets: ["@vue/cli-plugin-babel/preset"],
};
package-lock.json
View file @ c3a373c3
This diff is collapsed.
package.json
View file @ c3a373c3
......@@ -11,11 +11,11 @@
"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": {
"@types/qr-image": "^3.2.4",
"axios": "^0.21.1",
"core-js": "^3.6.5",
"dayjs": "^1.10.6",
......@@ -31,34 +31,28 @@
"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-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",
"@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",
"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": "^1.19.1",
"vue3-jest": "^27.0.0-alpha.1"
"prettier": "^2.2.1"
},
"browserslist": [
"> 1%",
......@@ -67,5 +61,16 @@
"iOS >= 8",
"Android >= 4.1"
],
"license": "YIDIAN"
"license": "YIDIAN",
"gitHooks": {
"pre-commit": "lint-staged"
},
"lint-staged": {
"src/**/*.{js,vue}": [
"eslint --fix"
],
"server/**/*.js": [
"eslint --fix"
]
}
}
server/config.js
View file @ c3a373c3
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"
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"
production: "http://bp.int.yidian-inc.com",
};
module.exports = {
......@@ -24,5 +24,5 @@ module.exports = {
GROUPMEAL_URI: API_INTERNAL_URI[env],
ACTIVITY_URI: API_INTERNAL_URI[env],
WITHDRAWAL_URI: API_INTERNAL_URI[env],
API_YD_LOGIN
API_YD_LOGIN,
};
server/controllers/activity.js
View file @ c3a373c3
......@@ -2,183 +2,183 @@ const ACTIVITY_URI = require("../config.js").ACTIVITY_URI;
const req = require("../utils/request").httpReq;
// 获取商家列表
exports.getBusinessList = async ctx => {
exports.getBusinessList = async (ctx) => {
const url = `${ACTIVITY_URI}/goods/background/ota_list`;
const opts = {
url,
method: "GET"
method: "GET",
};
ctx.body = await req(ctx, opts);
};
// 添加商品
exports.addGoods = async ctx => {
exports.addGoods = async (ctx) => {
const url = `${ACTIVITY_URI}/goods/background/add_goods`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 商品库列表
exports.pindanGoods = async ctx => {
exports.pindanGoods = async (ctx) => {
const url = `${ACTIVITY_URI}/goods/background/pindan_goods`;
const opts = {
url,
method: "GET"
method: "GET",
};
ctx.body = await req(ctx, opts);
};
// 查看商品详情
exports.markGoodsInfo = async ctx => {
exports.markGoodsInfo = async (ctx) => {
const url = `${ACTIVITY_URI}/goods/background/marketing_goods_info`;
const opts = {
url,
method: "GET"
method: "GET",
};
ctx.body = await req(ctx, opts);
};
// 编辑商品
exports.editGoods = async ctx => {
exports.editGoods = async (ctx) => {
const url = `${ACTIVITY_URI}/goods/background/edit_goods`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 获取活动过列表
exports.getActivityList = async ctx => {
exports.getActivityList = async (ctx) => {
const url = `${ACTIVITY_URI}/marketing/background/marketing_list`;
const opts = {
url,
method: "GET"
method: "GET",
};
ctx.body = await req(ctx, opts);
};
// 修改商品
exports.editGoodsDetail = async ctx => {
exports.editGoodsDetail = async (ctx) => {
const url = `${ACTIVITY_URI}/goods/background/edit_goods`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 添加营销活动
exports.addMarketing = async ctx => {
exports.addMarketing = async (ctx) => {
const url = `${ACTIVITY_URI}/marketing/background/add_marketing`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 编辑营销活动
exports.updateMarketing = async ctx => {
exports.updateMarketing = async (ctx) => {
const url = `${ACTIVITY_URI}/marketing/background/update_marketing`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 营销活动详情
exports.marketingInfo = async ctx => {
exports.marketingInfo = async (ctx) => {
const url = `${ACTIVITY_URI}/marketing/background/marketing_info`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 关闭/开启 活动
exports.updateActivity = async ctx => {
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
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 查看活动订单
exports.checkActivityDetail = async ctx => {
exports.checkActivityDetail = async (ctx) => {
const url = `${ACTIVITY_URI}/marketing/background/marketing_info`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 查看活动订单
exports.checkActivityDetailInfo = async ctx => {
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
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 获取自提点列表
exports.getPlaceList = async ctx => {
exports.getPlaceList = async (ctx) => {
const url = `${ACTIVITY_URI}/marketing/background/take_place_list`;
const opts = {
url,
method: "GET"
method: "GET",
};
ctx.body = await req(ctx, opts);
};
// 添加自提点
exports.addPlace = async ctx => {
exports.addPlace = async (ctx) => {
const url = `${ACTIVITY_URI}/marketing/background/add_take_place`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
//删除自提点
exports.deletePlace = async ctx => {
exports.deletePlace = async (ctx) => {
const url = `${ACTIVITY_URI}/marketing/background/delete_take_place`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
server/controllers/enterprise.js
View file @ c3a373c3
......@@ -3,49 +3,49 @@ const req = require("../utils/request").httpReq;
const controller_utils = require("./utils");
// 获取企业信息列表
exports.auditList = async ctx => {
exports.auditList = async (ctx) => {
const url = `${API_INTERNAL_URI}/merchant/inner/audit_list`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = JSON.stringify(await req(ctx, opts));
};
// 企业认证获取验证码
exports.sendCode = async ctx => {
exports.sendCode = async (ctx) => {
const url = `${API_INTERNAL_URI}/merchant/lifeinner/send_code`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 企业认证校验验证码
exports.checkCode = async ctx => {
exports.checkCode = async (ctx) => {
const url = `${API_INTERNAL_URI}/merchant/lifeinner/check_code`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 审核列表详情页回显信息列表
exports.getRecordInfo = async ctx => {
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
body: ctx.request.body,
};
let permission = await controller_utils.getUserPermission(ctx);
permission = JSON.parse(permission);
......@@ -71,60 +71,60 @@ exports.getRecordInfo = async ctx => {
};
// 历史提交审核日志详情页
exports.getLog = async ctx => {
exports.getLog = async (ctx) => {
const url = `${API_INTERNAL_URI}/merchant/inner/get_log`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 企业资料审核
exports.postAudit = async ctx => {
exports.postAudit = async (ctx) => {
const url = `${API_INTERNAL_URI}/merchant/inner/audit`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 企业资料修改
exports.opBusinessUpdate = async ctx => {
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
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
}
};
// 商户上传营业执照信息
exports.postBusiness = async ctx => {
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
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 商户信息代提交(op后台)
exports.opCommit = async ctx => {
exports.opCommit = async (ctx) => {
const url = `${API_INTERNAL_URI}/merchant/inner/op_commit`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
server/controllers/goods.js
View file @ c3a373c3
......@@ -16,302 +16,299 @@ const req = require("../utils/request").httpReq;
* };
*/
// 获取分类
exports.getCategoryList = async ctx => {
exports.getCategoryList = async (ctx) => {
const url = `${GOODS_URI}/goods/background/get_goods_category_list`;
const opts = {
url,
method: "GET"
method: "GET",
};
ctx.body = await req(ctx, opts);
};
// 获取商品列表
exports.getList = async ctx => {
exports.getList = async (ctx) => {
const url = `${GOODS_URI}/goods/background/get_goods_list`;
const opts = {
url,
method: "GET",
qs: ctx.request.query
qs: ctx.request.query,
};
ctx.body = await req(ctx, opts);
};
// 商品上架
exports.putOnline = async ctx => {
exports.putOnline = async (ctx) => {
const url = `${GOODS_URI}/goods/background/online`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 商品下架
exports.putOffline = async ctx => {
exports.putOffline = async (ctx) => {
const url = `${GOODS_URI}/goods/background/offline`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 获取商品详情列表
exports.getGoodsInfo = async ctx => {
exports.getGoodsInfo = async (ctx) => {
const url = `${GOODS_URI}/goods/background/get_goods_info`;
const opts = {
url,
method: "GET",
qs: ctx.request.query
qs: ctx.request.query,
};
ctx.body = await req(ctx, opts);
};
// 商品审核通过
exports.postSuccess = async ctx => {
exports.postSuccess = async (ctx) => {
const opts = {
url: `${GOODS_URI}/goods/background/audit_pass`,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 营销活动列表
exports.getMarketingList = async ctx => {
exports.getMarketingList = async (ctx) => {
const url = `${GOODS_URI}/marketing/background/marketing_list`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 检查商品名称是否被占用
exports.checkGoodsName = async ctx => {
exports.checkGoodsName = async (ctx) => {
const opts = {
url: `${GOODS_URI}/goods/background/check_goods_name`,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 获取查询活动列表
exports.getFindGoodsList = async ctx => {
exports.getFindGoodsList = async (ctx) => {
const url = `${GOODS_URI}/marketing/background/goods_list`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 审核拒绝
exports.auditReject = async ctx => {
exports.auditReject = async (ctx) => {
const opts = {
url: `${GOODS_URI}/goods/background/audit_reject`,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
}
};
// 添加活动列表
exports.getAddMarketingList = async ctx => {
exports.getAddMarketingList = async (ctx) => {
const url = `${GOODS_URI}/marketing/background/add_marketing`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 获取门店列表
exports.getShopsList = async ctx => {
exports.getShopsList = async (ctx) => {
const opts = {
url: `${GOODS_URI}/shop/background/shop_list`,
method: "GET",
qs: ctx.request.query
qs: ctx.request.query,
};
ctx.body = await req(ctx, opts);
};
// 添加门店
exports.addShop = async ctx => {
exports.addShop = async (ctx) => {
const opts = {
url: `${GOODS_URI}/shop/background/add_shop`,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
}
};
// 查看列表详情
exports.getMarketingInfo = async ctx => {
exports.getMarketingInfo = async (ctx) => {
const url = `${GOODS_URI}/marketing/background/marketing_info`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 修改商品
exports.editGoods = async ctx => {
exports.editGoods = async (ctx) => {
const opts = {
url: `${GOODS_URI}/goods/background/edit_goods`,
method: "POST",
json: true,
body: ctx.request.body
}
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 开启关闭状态
exports.updateMarketingList = async ctx => {
exports.updateMarketingList = async (ctx) => {
const url = `${GOODS_URI}/marketing/background/update_marketing`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
const res = await req(ctx, opts);
ctx.body = res;
};
//团长列表
exports.coloneList = async ctx => {
exports.coloneList = async (ctx) => {
const url = `${GOODS_URI}/marketing/background/colonel_list`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
const res = await req(ctx, opts);
ctx.body = res;
};
//团长申请列表
exports.coloneApplyList = async ctx => {
exports.coloneApplyList = async (ctx) => {
const url = `${GOODS_URI}/marketing/background/colonel_apply_list`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
const res = await req(ctx, opts);
ctx.body = res;
};
//团长申请操作
exports.colonelAudit = async ctx => {
exports.colonelAudit = async (ctx) => {
const url = `${GOODS_URI}/marketing/background/colonel_audit`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
const res = await req(ctx, opts);
ctx.body = res;
};
//团长获取自提点信息
exports.colonelApplyPoint = async ctx => {
exports.colonelApplyPoint = async (ctx) => {
const url = `${GOODS_URI}/marketing/background/colonel_show_apply_point`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
const res = await req(ctx, opts);
ctx.body = res;
};
//团长添加自提点
exports.colonelAddApplyPoint = async ctx => {
exports.colonelAddApplyPoint = async (ctx) => {
const url = `${GOODS_URI}/marketing/background/colonel_add_apply_point`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
const res = await req(ctx, opts);
ctx.body = res;
};
//营销中心-活动列表
exports.yingxiaoList = async ctx => {
exports.yingxiaoList = async (ctx) => {
const url = `${GOODS_URI}/marketing/background/yingxiao_list`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
const res = await req(ctx, opts);
ctx.body = res;
};
//营销中心-活动列表
exports.toogleYingxiaoOnlineStatus = async ctx => {
exports.toogleYingxiaoOnlineStatus = async (ctx) => {
const url = `${GOODS_URI}/marketing/background/toogle_yingxiao_online_status`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
const res = await req(ctx, opts);
ctx.body = res;
};
//营销中心-充值
exports.addAmount = async ctx => {
exports.addAmount = async (ctx) => {
const url = `${GOODS_URI}/coupon/background/add_amount`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
const res = await req(ctx, opts);
ctx.body = res;
};
//营销中心-查看活动配置
exports.yingxiaoConfig = async ctx => {
exports.yingxiaoConfig = async (ctx) => {
const url = `${GOODS_URI}/marketing/background/yingxiao_config`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
const res = await req(ctx, opts);
ctx.body = res;
};
//营销中心-修改活动配置
exports.yingxiaoSaveConfig = async ctx => {
exports.yingxiaoSaveConfig = async (ctx) => {
const url = `${GOODS_URI}/marketing/background/yingxiao_save_config`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
const res = await req(ctx, opts);
ctx.body = res;
};
server/controllers/groupmeal.js
View file @ c3a373c3
......@@ -2,62 +2,62 @@ const GROUPMEAL_URI = require("../config.js").GROUPMEAL_URI;
const req = require("../utils/request").httpReq;
// 获取主页配送列表
exports.getList = async ctx => {
exports.getList = async (ctx) => {
const opts = {
url: `${GROUPMEAL_URI}/order/deliverer/list_day_deliverer_conf`,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 获取配送列表
exports.getDelivererList = async ctx => {
exports.getDelivererList = async (ctx) => {
const opts = {
url: `${GROUPMEAL_URI}/order/deliverer/list_day_deliverer`,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 添加骑手
exports.getAddDeliverer = async ctx => {
exports.getAddDeliverer = async (ctx) => {
const opts = {
url: `${GROUPMEAL_URI}/order/deliverer/add_deliverer`,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 分配骑手
exports.getSaveDeliverer = async ctx => {
exports.getSaveDeliverer = async (ctx) => {
const opts = {
url: `${GROUPMEAL_URI}/order/deliverer/save_day_deliverer`,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 下载配送路线 -lh
exports.getDeliveryRoutes = async ctx => {
exports.getDeliveryRoutes = async (ctx) => {
const opts = {
url: `${GROUPMEAL_URI}/order/deliverer/build_plan`,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 查看下载配送路线记录 -lh
exports.getEmailRecords = async ctx => {
exports.getEmailRecords = async (ctx) => {
const opts = {
url: `${GROUPMEAL_URI}/order/deliverer/plan_down_log`,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
......@@ -65,93 +65,93 @@ exports.getEmailRecords = async ctx => {
// 老订单管理
// 获取订单管理列表
exports.getOrderList = async ctx => {
exports.getOrderList = async (ctx) => {
const url = `${GROUPMEAL_URI}/order/oldbackground/order_list`;
const opts = {
url,
method: "GET"
method: "GET",
};
ctx.body = await req(ctx, opts);
};
// 获取活动名称
exports.getMarketingList = async ctx => {
exports.getMarketingList = async (ctx) => {
const url = `${GROUPMEAL_URI}/order/oldbackground/marketing_list`;
const opts = {
url,
method: "GET"
method: "GET",
};
ctx.body = await req(ctx, opts);
};
// 获取商品名称
exports.getGoodsList = async ctx => {
exports.getGoodsList = async (ctx) => {
const url = `${GROUPMEAL_URI}/order/oldbackground/goods_list`;
const opts = {
url,
method: "GET"
method: "GET",
};
ctx.body = await req(ctx, opts);
};
// 获取自提点
exports.getSubShopList = async ctx => {
exports.getSubShopList = async (ctx) => {
const url = `${GROUPMEAL_URI}/order/oldbackground/sub_shop_list`;
const opts = {
url,
method: "GET"
method: "GET",
};
ctx.body = await req(ctx, opts);
};
// 导出订单
exports.orderExport = async ctx => {
exports.orderExport = async (ctx) => {
const url = `${GROUPMEAL_URI}/order/oldbackground/order_export`;
const opts = {
url,
method: "GET"
method: "GET",
};
ctx.body = await req(ctx, opts);
};
// 打印订单
exports.orderPrint = async ctx => {
exports.orderPrint = async (ctx) => {
const url = `${GROUPMEAL_URI}/order/oldbackground/order_print`;
const opts = {
url,
method: "GET"
method: "GET",
};
ctx.body = await req(ctx, opts);
};
// 订单退款列表
exports.orderItemList = async ctx => {
exports.orderItemList = async (ctx) => {
const url = `${GROUPMEAL_URI}/order/oldbackground/order_item_list`;
const opts = {
url,
method: "GET"
method: "GET",
};
ctx.body = await req(ctx, opts);
};
// 订单退款列表
exports.orderRefund = async ctx => {
exports.orderRefund = async (ctx) => {
const url = `${GROUPMEAL_URI}/order/oldbackground/order_refund`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 订单驳回
exports.orderRefundReject = async ctx => {
exports.orderRefundReject = async (ctx) => {
const url = `${GROUPMEAL_URI}/order/oldbackground/order_refund_reject`;
const opts = {
url,
method: "GET"
method: "GET",
};
ctx.body = await req(ctx, opts);
};
......@@ -159,93 +159,94 @@ exports.orderRefundReject = async ctx => {
// 新订单管理
// 获取订单管理列表
exports.newGetOrderList = async ctx => {
exports.newGetOrderList = async (ctx) => {
const url = `${GROUPMEAL_URI}/order/background/order_list`;
const opts = {
url,
method: "GET"
method: "GET",
};
ctx.body = await req(ctx, opts);
};
// 获取活动名称
exports.newGetMarketingList = async ctx => {
exports.newGetMarketingList = async (ctx) => {
const url = `${GROUPMEAL_URI}/order/background/order_condition_marketing_list`;
const opts = {
url,
method: "GET"
method: "GET",
};
ctx.body = await req(ctx, opts);
};
// 获取商品名称
exports.newGetGoodsList = async ctx => {
exports.newGetGoodsList = async (ctx) => {
const url = `${GROUPMEAL_URI}/order/background/order_condition_goods_list`;
const opts = {
url,
method: "GET"
method: "GET",
};
ctx.body = await req(ctx, opts);
};
// 获取自提点
exports.newGetSubShopList = async ctx => {
exports.newGetSubShopList = async (ctx) => {
const url = `${GROUPMEAL_URI}/order/background/order_condition_take_place_list`;
const opts = {
url,
method: "GET"
method: "GET",
};
ctx.body = await req(ctx, opts);
};
// 导出订单
exports.newOrderExport = async ctx => {
exports.newOrderExport = async (ctx) => {
const url = `${GROUPMEAL_URI}/order/background/order_export`;
const opts = {
url,
method: "GET"
method: "GET",
};
ctx.body = await req(ctx, opts);
};
// 打印订单
exports.newOrderPrint = async ctx => {
exports.newOrderPrint = async (ctx) => {
const url = `${GROUPMEAL_URI}/order/background/order_print`;
const opts = {
url,
method: "GET"
method: "GET",
timeout: 30000,
};
ctx.body = await req(ctx, opts);
};
// 订单退款列表
exports.newOrderItemList = async ctx => {
exports.newOrderItemList = async (ctx) => {
const url = `${GROUPMEAL_URI}/order/background/order_item_list`;
const opts = {
url,
method: "GET"
method: "GET",
};
ctx.body = await req(ctx, opts);
};
// 订单退款列表
exports.newOrderRefund = async ctx => {
exports.newOrderRefund = async (ctx) => {
const url = `${GROUPMEAL_URI}/order/background/order_refund`;
const opts = {
url,
method: "POST",
json: true,
body: ctx.request.body
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
// 订单驳回
exports.newOrderRefundReject = async ctx => {
exports.newOrderRefundReject = async (ctx) => {
const url = `${GROUPMEAL_URI}/order/background/order_refund_reject`;
const opts = {
url,
method: "GET"
method: "GET",
};
ctx.body = await req(ctx, opts);
};
server/controllers/life-no.js
View file @ c3a373c3
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
}
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',
method: "POST",
json: true,
timeout: 8000,
body: ctx.request.body
}
ctx.body = await req(ctx, opts)
}
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
server/controllers/qr-code.js
View file @ c3a373c3
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>";
}
};
server/controllers/role.js
View file @ c3a373c3
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);
}
};
exports.getRole_list = async (ctx, next) => {
var url = `${API_INTERNAL_URI}/merchant/authority/role_list`;
var opts = {
url: url,
method: 'POST',
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.getAdd_role = async (ctx, next) => {
var url = `${API_INTERNAL_URI}/merchant/authority/add_role`;
var opts = {
url: url,
method: 'POST',
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.get_role_info = async (ctx, next) => {
var url = `${API_INTERNAL_URI}/merchant/authority/get_role_info`;
var opts = {
url: url,
method: 'POST',
method: "POST",
json: true,
timeout: 8000,
body: ctx.request.body
}
ctx.body = await req(ctx, opts)
}
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',
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.getDelete_role = async (ctx, next) => {
var url = `${API_INTERNAL_URI}/merchant/authority/delete_role`;
var opts = {
url: url,
method: 'POST',
method: "POST",
json: true,
body: ctx.request.body
}
ctx.body = await req(ctx, opts)
}
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
server/controllers/static-router.js
View file @ c3a373c3
......@@ -11,15 +11,22 @@ exports.index = (ctx, next) => {
const hostname = ctx.hostname;
const pathArr = ctx.path.substring(1).split("/");
// console.log(hostname);
// console.log(pathArr);
console.log(hostname);
console.log(pathArr);
if (hostname === "opservice.yidianzixun.com" || hostname === "www.opservice.yidianzixun.com") {
if (pathArr[1] !== "activity" && pathArr[1] !== "groupmeal") {
// 外网域名
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) {
cachePage = fs.readFileSync(path.join(__dirname, "../../public/dist/index.html"), { encoding: "utf-8" });
......
server/controllers/system.js
View file @ c3a373c3
......@@ -2,15 +2,14 @@ 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
}
Cookie: ctx.request.header.cookie,
},
};
ctx.body = await req(ctx, opts);
};
......@@ -19,20 +18,20 @@ exports.J_login = async (ctx, next) => {
var url = `${API_INTERNAL_URI}/merchant/authority/login`;
var opts = {
url: url,
method: 'POST',
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.YD_login = async (ctx, next) => {
var url = API_YD_LOGIN;
var opts = {
url: url,
method: 'POST',
method: "POST",
json: true,
body: ctx.request.body
}
ctx.body = await req(ctx, opts)
}
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
server/controllers/user.js
View file @ c3a373c3
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',
method: "POST",
json: true,
timeout: 8000,
body: ctx.request.body
}
ctx.body = await req(ctx, opts)
}
body: ctx.request.body,
};
ctx.body = await req(ctx, opts);
};
var query = {
async get_permissions (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]) {
......@@ -34,7 +33,7 @@ exports.query = async (ctx, next) => {
} else {
ctx.body = {
status: "failed",
reason: "Invalid type param"
reason: "Invalid type param",
};
}
};
......@@ -104,6 +103,3 @@ exports.couponGrant = async (ctx, next) => {
};
ctx.body = await req(ctx, opts);
};
server/controllers/utils.js
View file @ c3a373c3
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`;
......@@ -10,8 +10,8 @@ exports.getUserPermission = async (ctx) => {
method: "GET",
qs: {
// user_email: "jianghaiming@126.com"
user_email: user
}
user_email: user,
},
};
return await req(ctx, opts);
}
\ No newline at end of file
};
server/controllers/withdrawal.js
View file @ c3a373c3
......@@ -17,124 +17,124 @@ 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`;
......@@ -145,11 +145,11 @@ const getUserPermission = async (ctx) => {
method: "GET",
qs: {
// user_email: "jianghaiming@126.com"
user_email: user
}
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
};
server/router.js
View file @ c3a373c3
This diff is collapsed.
server/utils/request.js
View file @ c3a373c3
......@@ -11,17 +11,13 @@ exports.httpReq = (ctx, opts) => {
version: "999999",
distribution: "op",
net: "wifi",
platform: "2"
platform: "2",
};
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`
);
console.info(`[Api] httpReq (${opts.url}, user:[${opts.qs.op_cur_user}]) spent: ${+new Date() - time_start}ms`);
if (!err) {
resolve(body);
......
src/App.vue
View file @ c3a373c3
......@@ -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>
......
src/components/Dialog/YDDialoag.vue
View file @ c3a373c3
......@@ -14,15 +14,8 @@
<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
>
<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>
......@@ -30,94 +23,94 @@
</template>
<script>
export default {
export default {
props: {
// 标题
dialogTitle: {
type: String,
default: "标题"
default: "标题",
},
// dialog 显示控制
myDialogVisible: {
type: Boolean,
default: false
default: false,
},
// 确认button文案
confirmButtonText: {
type: String,
default: "确 定"
default: "确 定",
},
// 取消button文案
cancelButtonText: {
type: String,
default: "取 消"
default: "取 消",
},
// 宽度
dialogWidth: {
type: String,
default: "50%"
default: "50%",
},
// 距离顶部的margin
dialogMarginTop: {
type: String,
default: "15vh"
default: "15vh",
},
// 是否需要遮罩层
dialogModel: {
type: Boolean,
default: true
default: true,
},
// 点击遮罩层是否关闭dialog
dialogCloseOnClickModal: {
type: Boolean,
default: false
default: false,
},
// 是否显示关闭（右上角X）
showDialogClose: {
type: Boolean,
default: false
default: false,
},
// 是否展示确定按钮
isShowConfirmButton: {
type: Boolean,
default: true
default: true,
},
// 是否展示取消按钮
isShowCancelButton: {
type: Boolean,
default: true
default: true,
},
// 点击esc是否关闭
dialogCloseOnPressEscape: {
type: Boolean,
default: false
default: false,
},
// 底部按钮是否居中显示
dialogCenter: {
type: Boolean,
default: false
default: false,
},
// cancelDialog 方法名称
cancelDialogMethodName: {
type: String,
default: "dialogCancel"
default: "dialogCancel",
},
// confirmDialog 方法名称
confirmDialogMethodName: {
type: String,
default: "dialogConfirm"
}
default: "dialogConfirm",
},
},
data() {
return {
dialogVisible: this.myDialogVisible
dialogVisible: this.myDialogVisible,
};
},
watch: {
myDialogVisible(newVal) {
this.dialogVisible = newVal;
}
},
},
methods: {
cancel() {
......@@ -125,8 +118,8 @@ export default {
},
cofirm() {
this.$emit(this.confirmDialogMethodName);
}
}
};
},
},
};
</script>
<style lang="less" scoped></style>
src/components/PageFooter/index.vue
View file @ c3a373c3
......@@ -3,7 +3,7 @@
</template>
<script>
export default {};
export default {};
</script>
<style></style>
src/components/PageHeader/User.vue
View file @ c3a373c3
<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>
<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-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 {
export default {
computed: mapState({
userInfo: state => (state.userInfo || {}),
userInfo: (state) => state.userInfo || {},
}),
data () {
data() {
return {
DEFAULT_AVATAR: HEADER_CONFIG.miscellaneous.defaultAvatar,
userEmail: ''
userEmail: "",
};
},
mounted() {
this.userEmail = getCookie('username') || ''
}
};
this.userEmail = getCookie("username") || "";
},
};
</script>
<style lang="less" scoped>
.user-info {
.user-info {
display: flex;
align-items: center;
}
}
.user-name {
.user-name {
margin-left: 12px;
color: #fff;
}
}
</style>
src/components/PageHeader/config.js
View file @ c3a373c3
const headerConfig = {
appName: 'OP运营管理后台',
logo: 'http://si1.go2yd.com/get-image/0ZAJxXeZ6iu',
appName: "OP运营管理后台",
logo: "http://si1.go2yd.com/get-image/0ZAJxXeZ6iu",
menuItems: [
{
path: '/enterprise/certification',
name: '企业认证管理'
path: "/enterprise/certification",
name: "企业认证管理",
},
{
path: '/lifeNo',
name: '生活号管理'
path: "/lifeNo",
name: "生活号管理",
},
{
path: '/role',
name: '角色管理'
path: "/role",
name: "角色管理",
},
{
path: '/user',
name: '用户管理'
}
path: "/user",
name: "用户管理",
},
],
miscellaneous: {
// 配置当用户头像不存在时使用的fallback头像图URL
defaultAvatar: '//s.go2yd.com/a/thead_meiguoduizhang.png',
defaultAvatar: "//s.go2yd.com/a/thead_meiguoduizhang.png",
},
};
......
src/components/PageHeader/index.vue
View file @ c3a373c3
......@@ -8,11 +8,7 @@
active-text-color="#ffd04b"
mode="horizontal"
>
<el-menu-item
v-for="item in menuItemsWithAuth"
:index="item.path"
:key="item.name"
>
<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">
......@@ -23,51 +19,50 @@
</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 {
export default {
name: "PageHeader",
components: {
User,
},
data () {
data() {
return {
menuItems,
};
},
computed: {
menuItemsWithAuth: function () {
const keys = Object.keys(this.$store.getters.subPermissions)
return this.menuItems.filter(ele => keys.includes(ele.key))
const keys = Object.keys(this.$store.getters.subPermissions);
return this.menuItems.filter((ele) => keys.includes(ele.key));
},
activeMenu: function () {
return this.$route.path;
},
},
beforeMount () {
},
beforeMount() {},
methods: {
...mapActions(['logout']),
...mapActions(["logout"]),
handleLogout() {
this.logout()
this.logout();
},
},
};
};
</script>
<style lang="less">
.menu-router {
.menu-router {
display: inline-block;
line-height: 60px;
width: 100%;
}
.user-menu {
}
.user-menu {
float: right !important;
margin-right: 20px;
}
}
</style>
src/components/Pagination/index.vue
View file @ c3a373c3
......@@ -7,40 +7,38 @@
:page-size="pageSize"
layout=" total,prev, pager, next"
:total="totalNum"
>
</el-pagination>
></el-pagination>
</div>
</template>
<script>
export default {
export default {
props: {
data: Object,
totalNum: Number,
pageSize: {
type: Number,
default: 20,
}
},
data () {
},
data() {
return {
currentPage: 1
}
currentPage: 1,
};
},
methods: {
handleSizeChange (size) {
handleSizeChange(size) {
console.log(`每页 ${size} 条`);
this.$emit('update', { pageSize: size, })
this.$emit("update", { pageSize: size });
},
handleCurrentChange (pageIndex) {
handleCurrentChange(pageIndex) {
console.log(`当前页: ${pageIndex}`);
this.$emit('update', { page: pageIndex })
}
this.$emit("update", { page: pageIndex });
},
},
}
};
</script>
<style lang="less">
.block {
.block {
margin-top: 50px;
}
}
</style>
src/components/Roles/RoleDetail.vue
View file @ c3a373c3
<template>
<div class="user-detail">
<el-page-header @back="goBack" content="角色详情页面"> </el-page-header>
<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>
<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
? "禁用"
: "删除"
}}
<template #label>角色状态</template>
{{ role_info_detail.role_status == 1 ? "正常" : role_info_detail.role_status == 2 ? "禁用" : "删除" }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 角色名称 </template>
<template #label>角色名称</template>
{{ role_info_detail.role_name }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 创建人账号 </template>
<template #label>创建人账号</template>
{{ role_info_detail.create_user_name }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 创建时间 </template>
<template #label>创建时间</template>
{{ role_info_detail.create_time }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 最后修改人账号 </template>
<template #label>最后修改人账号</template>
{{ role_info_detail.update_user_name }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 最后修改时间 </template>
<template #label>最后修改时间</template>
{{ role_info_detail.update_time }}
</el-descriptions-item>
</el-descriptions>
......@@ -55,11 +49,7 @@
<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"
>
<div class="role_account_list" v-for="(item, index) in role_info_detail.role_account_list" :key="index">
{{ item }}
</div>
</div>
......@@ -68,11 +58,8 @@
</div>
</template>
<script>
import {
get_role_info as reqGet_role_info,
getAll_role_list as reqGetAll_role_list,
} from "../../service/role";
export default {
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() {
......@@ -106,16 +93,8 @@ export default {
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;
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,
......@@ -147,10 +126,10 @@ export default {
this.selectedOptions = selectData;
},
},
};
};
</script>
<style lang="less" scoped>
.user-detail {
.user-detail {
margin: 50px;
.role_account_list {
padding: 10px;
......@@ -170,5 +149,5 @@ export default {
// border: 1px solid #ebeef5;
margin-top: 20px;
}
}
}
</style>
src/components/Roles/RoleList.vue
View file @ c3a373c3
......@@ -7,10 +7,7 @@
<el-input v-model="searchForm.roleName"></el-input>
</el-form-item>
<el-form-item label="状态">
<el-select
v-model="searchForm.roleStatus"
placeholder="请选择角色状态"
>
<el-select v-model="searchForm.roleStatus" placeholder="请选择角色状态">
<el-option label="正常" :value="1"></el-option>
<el-option label="禁用" :value="2"></el-option>
<el-option label="删除" :value="3"></el-option>
......@@ -23,86 +20,32 @@
</el-form>
<el-form>
<el-form-item>
<el-button
type="primary"
:disabled="!permission.get('create')"
@click="onCreateRole"
>创建角色</el-button
>
<el-button type="primary" :disabled="!permission.get('create')" @click="onCreateRole">创建角色</el-button>
</el-form-item>
</el-form>
</div>
<!-- 角色搜索列表 -->
<el-table border :data="managementList">
<el-table-column
label="ID"
width="200px"
prop="role_id"
align="center"
></el-table-column>
<el-table-column
label="角色名称"
prop="role_name"
align="center"
></el-table-column>
<el-table-column
label="状态"
width="200px"
:formatter="hasStatusFormat"
align="center"
>
</el-table-column>
<el-table-column
label="最后修改日期"
prop="update_time"
align="center"
></el-table-column>
<el-table-column
label="最后修改人账号"
prop="update_user_name"
align="center"
></el-table-column>
<el-table-column label="ID" width="200px" prop="role_id" align="center"></el-table-column>
<el-table-column label="角色名称" prop="role_name" align="center"></el-table-column>
<el-table-column label="状态" width="200px" :formatter="hasStatusFormat" align="center"></el-table-column>
<el-table-column label="最后修改日期" prop="update_time" align="center"></el-table-column>
<el-table-column label="最后修改人账号" prop="update_user_name" align="center"></el-table-column>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
:disabled="
!permission.get('edit') ||
scope.row.role_status == 2 ||
scope.row.role_status == 3
"
:disabled="!permission.get('edit') || scope.row.role_status == 2 || scope.row.role_status == 3"
@click.stop="handelModify(scope.row)"
type="text"
size="mini"
>修改</el-button
>
<el-button
:disabled="!permission.get('delete')"
@click.stop="handelDelete(scope.row)"
size="mini"
type="text"
>删除</el-button
>
<el-button
:disabled="!permission.get('disable')"
@click.stop="handelDisable(scope.row)"
size="mini"
type="text"
>禁用</el-button
>
<el-button
:disabled="!permission.get('enable')"
@click.stop="handelEnable(scope.row)"
size="mini"
type="text"
>启用</el-button
>
<el-button
@click.stop="toRoleDetail(scope.row)"
size="mini"
type="text"
>查看详情</el-button
>
修改
</el-button>
<el-button :disabled="!permission.get('delete')" @click.stop="handelDelete(scope.row)" size="mini" type="text">删除</el-button>
<el-button :disabled="!permission.get('disable')" @click.stop="handelDisable(scope.row)" size="mini" type="text">禁用</el-button>
<el-button :disabled="!permission.get('enable')" @click.stop="handelEnable(scope.row)" size="mini" type="text">启用</el-button>
<el-button @click.stop="toRoleDetail(scope.row)" size="mini" type="text">查看详情</el-button>
</template>
</el-table-column>
</el-table>
......@@ -134,16 +77,16 @@
</el-dialog>
</template>
<script>
import page from "../Pagination";
import {
import page from "../Pagination";
import {
getRole_list as reqGetRole_list,
getAll_role_list as reqGetAll_role_list,
getUpdate_role as reqGetUpdate_role,
get_role_info as reqGet_role_info,
getDelete_role as reqGetDelete_role,
getAdd_role as reqGetAdd_role,
} from "../../service/role";
export default {
} from "../../service/role";
export default {
name: "RoleList",
props: ["appId", "detailPath", "rolePermissionId"],
components: {
......@@ -153,9 +96,8 @@ export default {
permission() {
let rolePermissionId = this.rolePermissionId || "role";
let appId = this.appId || "";
const modulePermissions =
this.$store.getters.moduleSubPermissions(rolePermissionId, appId) || [];
console.log('modulePermissions', modulePermissions)
const modulePermissions = this.$store.getters.moduleSubPermissions(rolePermissionId, appId) || [];
console.log("modulePermissions", modulePermissions);
return new Map(modulePermissions.map((ele) => [ele.name, true]));
},
},
......@@ -380,9 +322,7 @@ export default {
//确认修改
confirm() {
let checkRolePrivilege = [];
this.edit
? (checkRolePrivilege = this.currentRolePrivilege)
: (checkRolePrivilege = this.currenPermissionsUpdate);
this.edit ? (checkRolePrivilege = this.currentRolePrivilege) : (checkRolePrivilege = this.currenPermissionsUpdate);
if (!(this.roleName && checkRolePrivilege.length > 0)) {
this.$message({
type: "error",
......@@ -400,12 +340,7 @@ export default {
getEditRole() {
let { role_id } = this.role_info_detail;
let role_status = "";
this.getUpdate_role(
this.roleName,
role_id,
role_status,
this.currentRolePrivilege
);
this.getUpdate_role(this.roleName, role_id, role_status, this.currentRolePrivilege);
},
//新增角色
getAdd_role() {
......@@ -450,10 +385,7 @@ export default {
} else {
newData.forEach((el) => {
if (el.id === oldDataRule[i].id) {
el.sub_permissions = [
...el.sub_permissions,
...oldDataRule[i].sub_permissions,
];
el.sub_permissions = [...el.sub_permissions, ...oldDataRule[i].sub_permissions];
}
});
}
......@@ -462,17 +394,17 @@ export default {
this.currenPermissionsUpdate = newData;
},
},
};
};
</script>
<style lang="less" scoped>
.creatRole {
.creatRole {
display: flex;
justify-content: space-between;
}
.role_management {
}
.role_management {
padding: 20px;
}
.role_management .el-button {
}
.role_management .el-button {
margin: 0 2px;
}
}
</style>
src/components/UserList/components/UserInfoEditModal.vue
View file @ c3a373c3
......@@ -3,12 +3,7 @@
<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-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> -->
......@@ -19,51 +14,23 @@
inactive-value="2"
active-text="启用"
inactive-text="禁用"
>
</el-switch>
></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-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-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-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-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">
......@@ -74,8 +41,7 @@
inactive-value="2"
active-text="开启"
inactive-text="关闭"
>
</el-switch>
></el-switch>
</el-form-item>
</el-form>
<template #footer>
......@@ -88,48 +54,45 @@
</div>
</template>
<script>
import { ElMessage } from "element-plus";
import { ElMessage } from "element-plus";
import { getRole_list as reqGetRoles } from "@/service/role";
import { getRole_list as reqGetRoles } from "@/service/role";
export default {
export default {
name: "UserInfoEditModal",
props: {
data: Object,
visable: {
type: Boolean,
default: false
default: false,
},
appId: String
appId: String,
},
data() {
return {
formLabelWidth: "120px",
userInfo: {},
roles: [],
modalVisable: false
modalVisable: false,
};
},
watch: {
data(val) {
this.userInfo = JSON.parse(JSON.stringify(val));
this.userInfo.roles = val.roles.map(ele => ele.role_id);
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
);
const { code, result } = await reqGetRoles({ page_size: 2000, page: 1 }, this.appId);
if (code !== 0) {
ElMessage.error("获取角色列表出错！");
return;
......@@ -139,13 +102,13 @@ export default {
confirm() {
const checkConditions = {
user_email: {
check: val => val.trim() !== "",
tip: "请输入邮箱！"
check: (val) => val.trim() !== "",
tip: "请输入邮箱！",
},
roles: {
check: val => val.length !== 0,
tip: "请添加角色！"
}
check: (val) => val.length !== 0,
tip: "请添加角色！",
},
};
const keys = Object.keys(checkConditions);
......@@ -161,16 +124,16 @@ export default {
},
cancel() {
this.$emit("cancel");
}
}
};
},
},
};
</script>
<style lang="less">
.form-val {
.form-val {
margin-left: 20px;
width: 300px;
}
.form-val.el-input {
}
.form-val.el-input {
width: 80%;
}
}
</style>
src/components/UserList/components/UserInfoModal.vue
View file @ c3a373c3
......@@ -6,9 +6,7 @@
<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>
<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>
......@@ -36,57 +34,53 @@
</el-form-item>
<el-form-item label="授权角色信息" :label-width="formLabelWidth">
<text class="form-val">{{
data.roles.map(ele => ele.role_name).join(",")
}}</text>
<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>
<text class="form-val">{{ data.is_sensitive_authority === 1 ? "是" : "否" }}</text>
</el-form-item>
</el-form>
</el-dialog>
</div>
</template>
<script>
export default {
export default {
name: "UserInfoModal",
props: {
mode: {
type: String,
default: "check"
default: "check",
},
data: Object,
title: {
type: String,
default: "用户信息"
default: "用户信息",
},
visable: {
type: Boolean,
default: false
}
default: false,
},
},
data() {
return {
formLabelWidth: "180px",
modalVisable: false
modalVisable: false,
};
},
watch: {
visable(val) {
this.modalVisable = val;
}
},
},
methods: {
cancel: function() {
cancel: function () {
this.$emit("cancel");
}
}
};
},
},
};
</script>
<style lang="less">
.form-val {
.form-val {
margin-left: 20px;
}
}
</style>
src/components/UserList/components/UserInfoNewModal.vue
View file @ c3a373c3
......@@ -11,8 +11,7 @@
inactive-value="2"
active-text="启用"
inactive-text="禁用"
>
</el-switch>
></el-switch>
</el-form-item>
<el-form-item label="姓名" :label-width="formLabelWidth">
<el-input class="form-val" v-model="userInfo.user_name"></el-input>
......@@ -27,19 +26,8 @@
<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 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">
......@@ -50,8 +38,7 @@
inactive-value="2"
active-text="开启"
inactive-text="关闭"
>
</el-switch>
></el-switch>
</el-form-item>
</el-form>
<template #footer>
......@@ -64,18 +51,18 @@
</div>
</template>
<script>
import { ElMessage } from "element-plus";
import { ElMessage } from "element-plus";
import { getRole_list as reqGetRoles } from "@/service/role";
import { getRole_list as reqGetRoles } from "@/service/role";
export default {
export default {
name: "UserInfoEditModal",
props: {
visable: {
type: Boolean,
default: false
default: false,
},
appId: String
appId: String,
},
data() {
return {
......@@ -87,10 +74,10 @@ export default {
user_mobile: "",
roles: [],
user_status: "1",
organization: ""
organization: "",
},
roles: [],
modalVisable: false
modalVisable: false,
};
},
watch: {
......@@ -104,20 +91,17 @@ export default {
user_mobile: "",
roles: [],
user_status: "1",
organization: ""
organization: "",
};
}
}
},
},
beforeMount() {
this.getRoles();
},
methods: {
async getRoles() {
const { code, result } = await reqGetRoles(
{ page_size: 2000, page: 1 },
this.appId
);
const { code, result } = await reqGetRoles({ page_size: 2000, page: 1 }, this.appId);
if (code !== 0) {
ElMessage.error("获取角色列表出错！");
return;
......@@ -127,13 +111,13 @@ export default {
confirm() {
const checkConditions = {
user_email: {
check: val => val.trim() !== "",
tip: "请输入邮箱！"
check: (val) => val.trim() !== "",
tip: "请输入邮箱！",
},
roles: {
check: val => val.length !== 0,
tip: "请添加角色！"
}
check: (val) => val.length !== 0,
tip: "请添加角色！",
},
};
const keys = Object.keys(checkConditions);
......@@ -149,16 +133,16 @@ export default {
},
cancel() {
this.$emit("cancel");
}
}
};
},
},
};
</script>
<style lang="less">
.form-val {
.form-val {
margin-left: 20px;
width: 300px;
}
.form-val.el-input {
}
.form-val.el-input {
width: 80%;
}
}
</style>
src/components/UserList/index.vue
View file @ c3a373c3
......@@ -2,23 +2,13 @@
<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-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-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-input v-model="pageParams.user_mobile" placeholder="手机号"></el-input>
</el-form-item>
<el-form-item label="状态">
<el-select v-model="pageParams.user_status" placeholder="状态">
......@@ -29,66 +19,46 @@
<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-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 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 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>
<el-button
v-if="scope.row.user_status === '禁用'"
type="text"
size="small"
@click="enableUser(scope.row)"
:disabled="!permission.get('disable')"
>启用</el-button
>
启用
</el-button>
</template>
</el-table-column>
</el-table>
<page
:totalNum="totalNum"
:pageSize="pageParams.size"
@update="updatePage"
/>
<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-modal :data="curUserInfo" :visable="modalVisable.info" @cancel="cancelModal('info')" :appId="appId"></user-info-modal>
<user-info-edit-modal
:data="curUserInfo"
:visable="modalVisable.edit"
......@@ -96,28 +66,23 @@
@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>
<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 {
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";
} from "@/service/user";
export default {
export default {
name: "UserList",
props: ["appId", "userPermissionId"],
components: {
......@@ -152,8 +117,7 @@ export default {
permission() {
const appId = this.appId || "";
const userPermissionId = this.userPermissionId || "user";
const modulePermissions =
this.$store.getters.moduleSubPermissions(userPermissionId, appId) || [];
const modulePermissions = this.$store.getters.moduleSubPermissions(userPermissionId, appId) || [];
console.log("Current page func-permissions:", modulePermissions);
return new Map(modulePermissions.map((ele) => [ele.name, true]));
},
......@@ -222,16 +186,7 @@ export default {
},
async confirmEditModal(userInfo) {
const {
user_id,
user_name,
user_email,
is_sensitive_authority,
user_mobile,
roles,
user_status,
organization,
} = userInfo;
const { user_id, user_name, user_email, is_sensitive_authority, user_mobile, roles, user_status, organization } = userInfo;
let res = {};
......@@ -305,7 +260,7 @@ export default {
user_status: 1,
user_id,
},
this.appId
this.appId,
);
if (code === 0) {
ElMessage.success("启用成功！");
......@@ -322,7 +277,7 @@ export default {
user_status: 2,
user_id,
},
this.appId
this.appId,
);
if (code === 0) {
ElMessage.success("禁用成功！");
......@@ -332,10 +287,10 @@ export default {
}
},
},
};
};
</script>
<style lang="less" scoped>
.user {
.user {
padding: 50px;
.search_life {
width: 280px;
......@@ -344,5 +299,5 @@ export default {
.func-btn {
float: right;
}
}
}
</style>
src/components/YDDialog.vue
View file @ c3a373c3
<template>
<el-dialog
title="提示"
v-model="dialogVisible"
width="30%"
:before-close="handleClose"
>
<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
>
<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
</span>
</template>
</el-dialog>
</template>
<script>
export default {
export default {
components: {},
props: {},
data() {
return {
dialogVisible: true
dialogVisible: true,
};
},
watch: {},
computed: {},
methods: {},
created() {},
mounted() {}
};
mounted() {},
};
</script>
<style lang="less" scoped></style>
src/config/app.config.js
View file @ c3a373c3
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
};
src/config/constant.js
View file @ c3a373c3
exports.KS3_CONST = {
AccessKeyID: 'AKLTTpZx6fNBQsGSKe5chqHdXA',
AccessKeySecret: 'OG9Bk93RUHwaH71U9K+OtWkvx44AdMheywjFlifILikvh96jNGgznJm+AyR5l4wPhw==',
DOMAIN: 'ks3-cn-beijing.ksyun.com'
}
\ No newline at end of file
AccessKeyID: "AKLTTpZx6fNBQsGSKe5chqHdXA",
AccessKeySecret: "OG9Bk93RUHwaH71U9K+OtWkvx44AdMheywjFlifILikvh96jNGgznJm+AyR5l4wPhw==",
DOMAIN: "ks3-cn-beijing.ksyun.com",
};
src/config/pageconfig.js
View file @ c3a373c3
// 系统顶栏header展示项
export const HEADER_CONFIG = {
appName: 'OP运营管理后台',
logo: 'http://si1.go2yd.com/get-image/0ZAJxXeZ6iu',
appName: "OP运营管理后台",
logo: "http://si1.go2yd.com/get-image/0ZAJxXeZ6iu",
menuItems: [
{
path: '/op/enterprise/certification',
name: '企业认证管理',
key: 'enterprise',
path: "/op/enterprise/certification",
name: "企业认证管理",
key: "enterprise",
},
{
path: '/op/lifeNo',
name: '生活号管理',
key: 'lifeNo',
path: "/op/lifeNo",
name: "生活号管理",
key: "lifeNo",
},
{
path: '/op/roleManageRole',
name: '角色管理',
key: 'role',
path: "/op/roleManageRole",
name: "角色管理",
key: "role",
},
{
path: '/op/user',
name: '用户管理',
key: 'user',
}
path: "/op/user",
name: "用户管理",
key: "user",
},
],
miscellaneous: {
// 配置当用户头像不存在时使用的fallback头像图URL
defaultAvatar: '//s.go2yd.com/a/thead_meiguoduizhang.png',
defaultAvatar: "//s.go2yd.com/a/thead_meiguoduizhang.png",
},
};
......@@ -35,29 +35,29 @@ export const HEADER_CONFIG = {
* key需要与 「HEADER_CONFIG」 中的key对应。
*/
export const PAGEMODULE_PERMISSIONNAME = {
enterprise: 'enterprise_certification_management',
lifeNo: 'life_official_account_management',
role: 'role_management',
user: 'user_management'
}
enterprise: "enterprise_certification_management",
lifeNo: "life_official_account_management",
role: "role_management",
user: "user_management",
};
export const PERMISSIONNAME_PAGEMODULE = (function () {
const obj = {}
const obj = {};
for (let ele in PAGEMODULE_PERMISSIONNAME) {
obj[PAGEMODULE_PERMISSIONNAME[ele]] = ele
obj[PAGEMODULE_PERMISSIONNAME[ele]] = ele;
}
return obj;
})()
})();
/**
* 页面路由对应的权限名称。
* router 用该配置做路由权限拦截。需要增加权限拦截的路由，需在此添加配置。
*/
export const PATH_PERMISSION_NAME = {
'/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
"/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",
};
src/global.less
View file @ c3a373c3
@import './styles/reset.less';
@import './styles/loading.less';
@import "./styles/reset.less";
@import "./styles/loading.less";
html,
body,
#root,
#app {
height: 100%;
height: 100%;
}
body {
margin: 0;
margin: 0;
}
src/layouts/index.vue
View file @ c3a373c3
......@@ -13,15 +13,15 @@
</div>
</template>
<script>
import PageHeader from '@/components/PageHeader';
// import PageFooter from '@/components/PageFooter';
import PageHeader from "@/components/PageHeader";
// import PageFooter from '@/components/PageFooter';
export default {
export default {
components: {
PageHeader,
// PageFooter,
},
};
};
</script>
<style lang="less" src="./index.less"></style>
src/main.js
View file @ c3a373c3
......@@ -50,8 +50,4 @@ router.beforeResolve(async (to, from, next) => {
}
});
createApp(App)
.use(router)
.use(store)
.use(ElementPlus, { locale })
.mount("#app");
createApp(App).use(router).use(store).use(ElementPlus, { locale }).mount("#app");
src/pages/Activity/ActivityDetail/index.vue
View file @ c3a373c3
......@@ -44,9 +44,9 @@
<h3>{{ marketingInfo.marketing_name }}</h3>
<!-- 查看参与字段待确认 -->
<p>
<span>{{ detailInfo.lookUserCount }}人查看</span>｜<span
>{{ detailInfo.haveBuyGoodsUserCount }}人参与</span
>
<span>{{ detailInfo.lookUserCount }}人查看</span>
｜
<span>{{ detailInfo.haveBuyGoodsUserCount }}人参与</span>
</p>
<p class="endTime">{{ showTimer }}</p>
</div>
......@@ -82,11 +82,7 @@
></el-image>
</el-card>
<el-card class="activities box-card">
<div
v-for="goodsItem in goodsList"
:key="goodsItem.goods_sku_id"
class="activityItem"
>
<div v-for="goodsItem in goodsList" :key="goodsItem.goods_sku_id" class="activityItem">
<el-image
class="activityImage"
style="width: 100px; height: 100px"
......@@ -97,15 +93,9 @@
<p>{{ goodsItem.goods_name }}</p>
<p class="price">
<span class="nowPrice">{{ `¥${goodsItem.price}` }}</span>
<span class="originPrice">{{
`¥${goodsItem.original_price} `
}}</span>
<span class="sold" v-if="goodsItem.inventory_rest == 0"
>抢光了</span
>
<span class="sold" v-else
>已售{{ goodsItem.all_have_buy_goods_count }}</span
>
<span class="originPrice">{{ `¥${goodsItem.original_price} ` }}</span>
<span class="sold" v-if="goodsItem.inventory_rest == 0">抢光了</span>
<span class="sold" v-else>已售{{ goodsItem.all_have_buy_goods_count }}</span>
</p>
</div>
</div>
......@@ -113,23 +103,17 @@
</section>
</div>
<div class="button-close">
<el-button
class="button-block"
size="medium"
type="primary"
@click="closePage"
>关 闭</el-button
>
<el-button class="button-block" size="medium" type="primary" @click="closePage">关 闭</el-button>
</div>
</div>
</template>
<script>
import ActivityService from "@/service/Activity/index";
import { ElMessage } from "element-plus";
import dayJs from "dayjs";
import ActivityService from "@/service/Activity/index";
import { ElMessage } from "element-plus";
import dayJs from "dayjs";
export default {
export default {
props: {},
data() {
return {
......@@ -138,7 +122,7 @@ export default {
marketingInfo: {},
endTime: "",
showTimer: "",
detailInfo: {}
detailInfo: {},
};
},
watch: {},
......@@ -150,11 +134,11 @@ export default {
let dataArr = await Promise.all([
ActivityService.checkActivityDetail({
marketing_id: this.$route.query.marketing_id,
marketing_type: this.$route.query.marketing_type
marketing_type: this.$route.query.marketing_type,
}),
ActivityService.checkActivityDetailInfo({
marketing_id: this.$route.query.marketing_id
})
marketing_id: this.$route.query.marketing_id,
}),
]);
this.pageLoading = false;
this.goodsList = dataArr[0].result.goods_list;
......@@ -171,21 +155,10 @@ export default {
getTimeout(timeCount) {
if (timeCount > 0) {
var days = parseInt(timeCount / (1000 * 60 * 60 * 24));
var hours = parseInt(
(timeCount % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60)
);
var hours = parseInt((timeCount % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
var minutes = parseInt((timeCount % (1000 * 60 * 60)) / (1000 * 60));
var seconds = parseInt((timeCount % (1000 * 60)) / 1000);
this.showTimer =
"距结束：" +
days +
" 天 " +
hours +
" 小时 " +
minutes +
" 分钟 " +
seconds +
" 秒 ";
this.showTimer = "距结束：" + days + " 天 " + hours + " 小时 " + minutes + " 分钟 " + seconds + " 秒 ";
} else {
this.showTimer = "已结束";
}
......@@ -206,7 +179,7 @@ export default {
closePage() {
this.$router.go(-1);
}
},
},
async created() {
await this.checkActivityDetail();
......@@ -214,11 +187,11 @@ export default {
},
beforeUnmount() {
clearInterval(this.timer);
}
};
},
};
</script>
<style lang="less" scoped>
.wrapper {
.wrapper {
height: 100%;
display: flex;
overflow-y: scroll;
......@@ -324,5 +297,5 @@ export default {
width: 200px;
}
}
}
}
</style>
src/pages/Activity/Manage/index.vue
View file @ c3a373c3
This diff is collapsed.
src/pages/Activity/releaseProduc/components/infoEditing.vue
View file @ c3a373c3
<template>
<div class="infoEditing">
<el-form
ref="infoEditForm"
:model="infoEditForm"
label-width="80px"
@submit.prevent
>
<el-form ref="infoEditForm" :model="infoEditForm" label-width="80px" @submit.prevent>
<el-form-item label="标题：">
<el-input v-model="infoEditForm.title" maxlength="30"></el-input>
</el-form-item>
<el-form-item label="介绍：">
<el-input
type="textarea"
v-model="infoEditForm.desc"
maxlength="1000"
rows="4"
></el-input>
<el-input type="textarea" v-model="infoEditForm.desc" maxlength="1000" rows="4"></el-input>
</el-form-item>
<el-form-item label="图片：">
<el-upload
......@@ -47,18 +37,18 @@
</template>
<script>
import { GOODS_URI } from "../../../../../server/config";
export default {
import { GOODS_URI } from "../../../../../server/config";
export default {
props: {
infoEditArr: {
type: Object,
default: () => {
return {
pindan_pic_url: []
pindan_pic_url: [],
};
},
require: true
}
require: true,
},
},
data() {
return {
......@@ -66,38 +56,38 @@ export default {
title: "", // 标题
desc: "", // 介绍
picUploadList: [], // 上传详情图片列表
picUrlList: [] // 图片回显列表
picUrlList: [], // 图片回显列表
},
picSubmitList: [], // 发布功能需要的图片列表
propData: {},
isShowPopver: false, // 是否展示图片框
uploadUrl: `${GOODS_URI}/ksy/ks3apiunencrypt/ks3api_upload`, // 金山云上传地址
hideUpload: false,
limitCount: 9
limitCount: 9,
};
},
watch: {
infoEditArr: {
// 监听props属性 展示自提点列表
handler: function(newVal) {
handler: function (newVal) {
if (this.$route.query.marketing_id) {
this.propData = newVal;
this.infoEditForm.title = this.propData.marketing_name;
this.infoEditForm.desc = this.propData.pindan_desc;
for (var i in this.propData.pindan_pic_url) {
this.infoEditForm.picUrlList.push({
url: this.propData.pindan_pic_url[i]
url: this.propData.pindan_pic_url[i],
});
this.picSubmitList.push({
url: this.propData.pindan_pic_url[i]
url: this.propData.pindan_pic_url[i],
});
}
this.hideUpload = this.picSubmitList.length >= this.limitCount; // 大于9 隐藏
}
},
deep: true,
immediate: true
}
immediate: true,
},
},
methods: {
// 展示商品大图
......@@ -115,7 +105,7 @@ export default {
this.infoEditForm.picUploadList.push(res.result.image_id); // 上传成功图片的id
this.picSubmitList.push({
// 发布功能需要的图片列表
url: res.result.url
url: res.result.url,
});
this.hideUpload = this.picSubmitList.length >= this.limitCount;
},
......@@ -141,23 +131,23 @@ export default {
this.infoEditForm.desc = this.propData.pindan_desc;
for (var i in this.propData.pindan_pic_url) {
this.infoEditForm.picUrlList.push({
url: this.propData.pindan_pic_url[i]
url: this.propData.pindan_pic_url[i],
});
}
}
},
},
created() {
// this.marketingInfoMet();
}
};
},
};
</script>
<style scoped>
.infoEditing {
.infoEditing {
width: 64%;
margin: 0 auto;
}
.hide /deep/ .el-upload--picture-card {
}
.hide /deep/ .el-upload--picture-card {
display: none;
}
}
</style>
src/pages/Activity/releaseProduc/components/myMap.vue
View file @ c3a373c3
......@@ -5,42 +5,39 @@
<el-form ref="form" @submit.prevent>
<el-form-item label-position="left">
<el-button @click="handleSearch">搜索</el-button>
<el-input
class="dialog-input"
v-model="searchKey"
placeholder="请输入关键字"
autocomplete="on"
>
<el-input class="dialog-input" v-model="searchKey" placeholder="请输入关键字" autocomplete="on">
<template #suffix>
<i
@click="searchKey = ''"
class="el-input__icon el-icon-close"
></i>
<i @click="searchKey = ''" class="el-input__icon el-icon-close"></i>
</template>
</el-input>
</el-form-item>
</el-form>
<div id="js-result" v-show="searchKey" class="result"></div>
</div>
<div id="js-container" class="myMap">
正在加载数据 ...
</div>
<div id="js-container" class="myMap">正在加载数据 ...</div>
</div>
<div class="mapInfo">
<div class="infoAll">
<h3 class="title">拖拽选址</h3>
<ul class="info">
<li><span>经度：</span>{{ dragData.lng }}</li>
<li><span>纬度：</span>{{ dragData.lat }}</li>
<li><span>地址：</span>{{ dragData.address }}</li>
<li>
<span>经度：</span>
{{ dragData.lng }}
</li>
<li>
<span>纬度：</span>
{{ dragData.lat }}
</li>
<li>
<span>地址：</span>
{{ dragData.address }}
</li>
</ul>
</div>
<div class="confirmButton">
<el-button class="button_pre" @click="cancel">取 消</el-button>
<el-button class="button_next" type="primary" @click="confirm"
>确 定</el-button
>
<el-button class="button_next" type="primary" @click="confirm">确 定</el-button>
</div>
</div>
<!-- <div class="confirmButton">
......@@ -51,8 +48,8 @@
</template>
<script>
import remoteLoad from "@/utils/remoteLoad.js";
export default {
import remoteLoad from "@/utils/remoteLoad.js";
export default {
name: "app",
data() {
return {
......@@ -65,8 +62,8 @@ export default {
address: null,
nearestJunction: null,
nearestRoad: null,
nearestPOI: null
}
nearestPOI: null,
},
};
},
methods: {
......@@ -92,7 +89,7 @@ export default {
address: data.address,
province: data.regeocode.addressComponent.province,
city: data.regeocode.addressComponent.city,
area: data.regeocode.addressComponent.district
area: data.regeocode.addressComponent.district,
};
},
......@@ -102,9 +99,9 @@ export default {
let AMapUI = (this.AMapUI = window.AMapUI);
let AMap = (this.AMap = window.AMap);
AMapUI.loadUI(["misc/PositionPicker"], PositionPicker => {
AMapUI.loadUI(["misc/PositionPicker"], (PositionPicker) => {
let mapConfig = {
zoom: 16
zoom: 16,
// cityName: this.MapCityName
};
if (this.lat && this.lng) {
......@@ -120,21 +117,21 @@ export default {
citylimit: true,
// city: this.MapCityName,
map: map,
panel: "js-result"
panel: "js-result",
});
});
// 启用工具条
AMap.plugin(["AMap.ToolBar"], function() {
AMap.plugin(["AMap.ToolBar"], function () {
map.addControl(
new AMap.ToolBar({
position: "RB"
})
position: "RB",
}),
);
});
// 地图地图定位
AMap.plugin("AMap.Geolocation", function() {
AMap.plugin("AMap.Geolocation", function () {
var geolocation = new AMap.Geolocation({
// 是否使用高精度定位，默认：true
enableHighAccuracy: true,
......@@ -145,7 +142,7 @@ export default {
// 定位成功后调整地图视野范围使定位位置及精度范围视野内可见，默认：false
zoomToAccuracy: true,
// 定位按钮的排放位置, RB表示右下
buttonPosition: "RB"
buttonPosition: "RB",
});
map.addControl(geolocation);
geolocation.getCurrentPosition();
......@@ -171,18 +168,18 @@ export default {
//自定义外观
url: "//webapi.amap.com/ui/1.0/assets/position-picker2.png", //图片地址
size: [50, 50], //要显示的点大小，将缩放图片
ancher: [24, 40] //锚点的位置，即被size缩放之后，图片的什么位置作为选中的位置
}
ancher: [24, 40], //锚点的位置，即被size缩放之后，图片的什么位置作为选中的位置
},
});
// 拖拽完成发送自定义 drag 事件
positionPicker.on("success", positionResult => {
positionPicker.on("success", (positionResult) => {
this.dragMap(positionResult);
});
// 启动拖放
positionPicker.start();
});
}
},
},
async mounted() {
// 已载入高德地图API，则直接初始化地图
......@@ -190,18 +187,16 @@ export default {
this.initMap();
// 未载入高德地图API，则先载入API再初始化
} else {
await remoteLoad(
`http://webapi.amap.com/maps?v=1.3&key=bb057625545d8cf77df1379e7aaae0b5`
);
await remoteLoad(`http://webapi.amap.com/maps?v=1.3&key=bb057625545d8cf77df1379e7aaae0b5`);
await remoteLoad("http://webapi.amap.com/ui/1.0/main.js");
this.initMap();
}
}
};
},
};
</script>
<style lang="less" scoped>
.mapContainer {
.mapContainer {
height: 100%;
width: 100%;
// display: flex;
......@@ -250,19 +245,19 @@ export default {
}
}
}
}
.m-map .search {
}
.m-map .search {
position: absolute;
top: 10px;
left: 10px;
width: 285px;
z-index: 1;
}
.m-map .search input {
}
.m-map .search input {
width: 180px;
border: 1px solid #ccc;
line-height: 20px;
padding: 5px;
outline: none;
}
}
</style>
src/pages/Activity/releaseProduc/index.vue
View file @ c3a373c3
This diff is collapsed.
src/pages/Catch/forbidden.vue
View file @ c3a373c3
<template>
<div>
没有权限!
</div>
<div>没有权限!</div>
</template>
<script>
export default {
};
export default {};
</script>
<style lang="less">
</style>
<style lang="less"></style>
src/pages/Catch/notFound.vue
View file @ c3a373c3
<template>
<div>
<layout>
页面不存在！
</layout>
<layout>页面不存在！</layout>
</div>
</template>
<script>
import Layout from '@/layouts';
import Layout from "@/layouts";
export default {
components: {
Layout,
......@@ -15,5 +13,4 @@
};
</script>
<style lang="less">
</style>
<style lang="less"></style>
src/pages/Enterprise/Audit/index.vue
View file @ c3a373c3
This diff is collapsed.
src/pages/Enterprise/Establish/index.vue
View file @ c3a373c3
<template>
<layout>
<!-- 标题 -->
<el-page-header
class="title"
content="企业信息提交"
@back="goBack"
></el-page-header>
<el-page-header class="title" content="企业信息提交" @back="goBack"></el-page-header>
<enterprise-form :type="'SUBMIT'"></enterprise-form>
</layout>
......@@ -14,24 +10,23 @@
<style lang="less" src="./index.less" scope></style>
<script>
import Layout from "@/layouts";
import EnterpriseForm from "../components/enterpriseForm.vue";
export default {
import Layout from "@/layouts";
import EnterpriseForm from "../components/enterpriseForm.vue";
export default {
name: "Establish",
components: { Layout, EnterpriseForm },
created () {
},
created() {},
data () {
data() {
return {};
},
methods: {
// 返回
goBack () {
goBack() {
this.$router.replace({ name: "Certification" });
},
}
};
},
};
</script>
src/pages/Goods/Detail/index.vue
View file @ c3a373c3
This diff is collapsed.
src/pages/Goods/List/index.vue
View file @ c3a373c3
This diff is collapsed.
src/pages/Goods/Retail/index.vue
View file @ c3a373c3
This diff is collapsed.
src/pages/Goods/components/PageHeader/User.vue
View file @ c3a373c3
<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>
<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>
{{ userEmail }}
</el-dropdown-item>
<el-dropdown-item @click="$emit('logout')">
退出登录
</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";
export default {
import { mapState } from "vuex";
import { HEADER_CONFIG } from "@/config/pageconfig";
import { getCookie } from "@/utils/util";
export default {
computed: mapState({
userInfo: state => (state.userInfo || {}),
userInfo: (state) => state.userInfo || {},
}),
data () {
data() {
return {
DEFAULT_AVATAR: HEADER_CONFIG.miscellaneous.defaultAvatar,
userEmail: ''
userEmail: "",
};
},
mounted() {
this.userEmail = getCookie('username') || ''
}
};
this.userEmail = getCookie("username") || "";
},
};
</script>
<style lang="less" scoped>
.user-info {
.user-info {
display: flex;
align-items: center;
}
}
.user-name {
.user-name {
margin-left: 12px;
color: #fff;
}
}
</style>
src/pages/Goods/components/PageHeader/config.js
View file @ c3a373c3
const headerConfig = [
{
name: "商品管理",
path: "/op/goods/list"
path: "/op/goods/list",
},
{
name: "分销",
path: "/op/goods/retail"
path: "/op/goods/retail",
},
];
export default headerConfig;
src/pages/Goods/layout/index.vue
View file @ c3a373c3
......@@ -10,11 +10,11 @@
</div>
</template>
<script>
import PageHeader from "../components/PageHeader";
import PageHeader from "../components/PageHeader";
export default {
components: { PageHeader }
};
export default {
components: { PageHeader },
};
</script>
<style lang="less" src="./index.less"></style>
src/pages/Goods/utils/filterInput.js
View file @ c3a373c3
// 检测内容是否带表情符号
function checkString (strings) {
const checkKey = /[^\u0020-\u007E\u00A0-\u00BE\u2E80-\uA4CF\uF900-\uFAFF\uFE30-\uFE4F\uFF00-\uFFEF\u0080-\u009F\u2000-\u201f\u2026\u2022\u20ac\r\n]/g;
function checkString(strings) {
const checkKey =
/[^\u0020-\u007E\u00A0-\u00BE\u2E80-\uA4CF\uF900-\uFAFF\uFE30-\uFE4F\uFF00-\uFFEF\u0080-\u009F\u2000-\u201f\u2026\u2022\u20ac\r\n]/g;
if (checkKey.test(strings)) {
return false;
} else {
return true;
};
};
export default { checkString }
\ No newline at end of file
}
}
export default { checkString };
src/pages/Groupmeal/Distrib/index.vue
View file @ c3a373c3
This diff is collapsed.
src/pages/Groupmeal/layout/index.vue
View file @ c3a373c3
This diff is collapsed.
src/pages/Life-no/index.vue
View file @ c3a373c3
This diff is collapsed.
src/pages/Life-no/life-no-detail.vue
View file @ c3a373c3
This diff is collapsed.
src/pages/Login/index.vue
View file @ c3a373c3
This diff is collapsed.
src/pages/Role/manage-role.vue
View file @ c3a373c3
This diff is collapsed.
src/pages/Role/role-detail.vue
View file @ c3a373c3
This diff is collapsed.
src/pages/User/userList/index.vue
View file @ c3a373c3
This diff is collapsed.
src/pages/Withdrawal/Examine/__tests__/examine.spec.js deleted 100644 → 0
View file @ 7f46b0fe
This diff is collapsed.
src/pages/Withdrawal/Examine/h5.vue
View file @ c3a373c3
This diff is collapsed.
src/pages/Withdrawal/Examine/index.vue
View file @ c3a373c3
This diff is collapsed.
src/pages/Withdrawal/Role/add-role.vue
View file @ c3a373c3
This diff is collapsed.
src/pages/Withdrawal/Role/manage-role.vue
View file @ c3a373c3
This diff is collapsed.
src/pages/Withdrawal/Role/role-detail.vue
View file @ c3a373c3
This diff is collapsed.
src/pages/Withdrawal/layout/index.vue
View file @ c3a373c3
This diff is collapsed.
src/pages/components/Pagination.vue
View file @ c3a373c3
This diff is collapsed.
src/router/Activity/index.js
View file @ c3a373c3
This diff is collapsed.
src/router/Goods/index.js
View file @ c3a373c3
This diff is collapsed.
src/router/Groupmeal/index.js
View file @ c3a373c3
This diff is collapsed.
src/router/Withdrawal/index.js
View file @ c3a373c3
This diff is collapsed.
src/router/index.js
View file @ c3a373c3
This diff is collapsed.
src/service/Activity/index.js
View file @ c3a373c3
This diff is collapsed.
src/service/Goods/goods.js
View file @ c3a373c3
This diff is collapsed.
src/service/Groupmeal/groupmeal.js
View file @ c3a373c3
This diff is collapsed.
src/service/Withdrawal/common.js
View file @ c3a373c3
This diff is collapsed.
src/service/Withdrawal/withdrawal.js
View file @ c3a373c3
This diff is collapsed.
src/service/common.js
View file @ c3a373c3
This diff is collapsed.
src/service/enterprise.js
View file @ c3a373c3
This diff is collapsed.
src/service/image.js
View file @ c3a373c3
This diff is collapsed.
src/service/life-no.js
View file @ c3a373c3
This diff is collapsed.
src/service/role.js
View file @ c3a373c3
This diff is collapsed.
src/service/user.js
View file @ c3a373c3
This diff is collapsed.
src/store/index.js
View file @ c3a373c3
This diff is collapsed.
src/store/modules/login.js
View file @ c3a373c3
This diff is collapsed.
src/store/modules/user.js
View file @ c3a373c3
This diff is collapsed.
src/utils/authUtil.js
View file @ c3a373c3
This diff is collapsed.
src/utils/handlerResponse.js
View file @ c3a373c3
This diff is collapsed.
src/utils/remoteLoad.js
View file @ c3a373c3
This diff is collapsed.
src/utils/request.js
View file @ c3a373c3
This diff is collapsed.
src/utils/tools.js
View file @ c3a373c3
This diff is collapsed.
src/utils/util.js
View file @ c3a373c3
This diff is collapsed.
vue.config.js
View file @ c3a373c3
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