Skip to content

N
newShopFront
Commit 1f44ac22 authored by 邓学云's avatar 邓学云
Browse files
Options

文件下载等 api代理 cross-env安装 mock移除

parent b428e407
Hide whitespace changes
Inline Side-by-side
Showing with 339 additions and 64 deletions
package-lock.json
View file @ 1f44ac22
...@@ -4970,6 +4970,52 @@ ...@@ -4970,6 +4970,52 @@
"sha.js": "^2.4.8" "sha.js": "^2.4.8"
} }
}, },
"cross-env": {
"version": "6.0.3",
"resolved": "https://registry.npmjs.org/cross-env/-/cross-env-6.0.3.tgz",
"integrity": "sha512-+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag==",
"requires": {
"cross-spawn": "^7.0.0"
},
"dependencies": {
"cross-spawn": {
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz",
"integrity": "sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==",
"requires": {
"path-key": "^3.1.0",
"shebang-command": "^2.0.0",
"which": "^2.0.1"
}
},
"path-key": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
},
"shebang-command": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
"requires": {
"shebang-regex": "^3.0.0"
}
},
"shebang-regex": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
},
"which": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
"requires": {
"isexe": "^2.0.0"
}
}
}
},
"cross-spawn": { "cross-spawn": {
"version": "6.0.5", "version": "6.0.5",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
...@@ -8989,8 +9035,7 @@ ...@@ -8989,8 +9035,7 @@
"isexe": { "isexe": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
"dev": true
}, },
"ismobilejs": { "ismobilejs": {
"version": "0.5.2", "version": "0.5.2",
......
package.json
View file @ 1f44ac22
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",
"serve:no-mock": "cross-env MOCK=none vue-cli-service serve",
"build": "vue-cli-service build", "build": "vue-cli-service build",
"test:unit": "vue-cli-service test:unit", "test:unit": "vue-cli-service test:unit",
"lint": "vue-cli-service lint", "lint": "vue-cli-service lint",
...@@ -16,6 +17,7 @@ ...@@ -16,6 +17,7 @@
"ant-design-vue": "1.4.2", "ant-design-vue": "1.4.2",
"axios": "^0.19.0", "axios": "^0.19.0",
"core-js": "^3.1.2", "core-js": "^3.1.2",
"cross-env": "^6.0.3",
"enquire.js": "^2.1.6", "enquire.js": "^2.1.6",
"lodash.get": "^4.4.2", "lodash.get": "^4.4.2",
"lodash.pick": "^4.4.0", "lodash.pick": "^4.4.0",
...@@ -30,9 +32,9 @@ ...@@ -30,9 +32,9 @@
"vue-ls": "^3.2.1", "vue-ls": "^3.2.1",
"vue-quill-editor": "^3.0.6", "vue-quill-editor": "^3.0.6",
"vue-router": "^3.1.2", "vue-router": "^3.1.2",
"vue-svg-component-runtime": "^1.0.1",
"vuex": "^3.1.1", "vuex": "^3.1.1",
"wangeditor": "^3.1.1", "wangeditor": "^3.1.1"
"vue-svg-component-runtime": "^1.0.1"
}, },
"devDependencies": { "devDependencies": {
"@ant-design/colors": "^3.2.1", "@ant-design/colors": "^3.2.1",
......
src/api/store.js
View file @ 1f44ac22
...@@ -22,7 +22,7 @@ export function getEvaluateList (parameter) { ...@@ -22,7 +22,7 @@ export function getEvaluateList (parameter) {
// 'pageSize':parameter.pageSize // 'pageSize':parameter.pageSize
// } // }
return axios({ return axios({
url: homeUrl+'branch/branch-scores/branch-score-list', url: 'branch/branch-scores/branch-score-list',
method: 'get', method: 'get',
params: parameter params: parameter
}) })
...@@ -30,7 +30,7 @@ export function getEvaluateList (parameter) { ...@@ -30,7 +30,7 @@ export function getEvaluateList (parameter) {
// 获取门店评价详情 // 获取门店评价详情
export function getEvaluateDetails (id) { export function getEvaluateDetails (id) {
return axios({ return axios({
url: homeUrl+'branch/branch-scores/score-info?id='+id, url: 'branch/branch-scores/score-info?id='+id,
method: 'get' method: 'get'
}) })
} }
...@@ -38,7 +38,7 @@ export function getEvaluateDetails (id) { ...@@ -38,7 +38,7 @@ export function getEvaluateDetails (id) {
export function modifyEvaluateDetails (parameter) { export function modifyEvaluateDetails (parameter) {
// console.log(parameter) // console.log(parameter)
return axios({ return axios({
url: homeUrl+'branch/branch-scores/score-info-update', url: 'branch/branch-scores/score-info-update',
method: 'put', method: 'put',
data: parameter data: parameter
}) })
...@@ -46,7 +46,7 @@ export function modifyEvaluateDetails (parameter) { ...@@ -46,7 +46,7 @@ export function modifyEvaluateDetails (parameter) {
// 新建门店评价 // 新建门店评价
export function addEvaluate (parameter) { export function addEvaluate (parameter) {
return axios({ return axios({
url: homeUrl+'branch/branch-scores/add-branch-score', url: 'branch/branch-scores/add-branch-score',
method: 'post', method: 'post',
data: parameter data: parameter
}) })
...@@ -54,24 +54,59 @@ export function addEvaluate (parameter) { ...@@ -54,24 +54,59 @@ export function addEvaluate (parameter) {
// 删除门店评价 // 删除门店评价
export function deleteEvaluate (id) { export function deleteEvaluate (id) {
return axios({ return axios({
url: homeUrl+'branch/branch-scores/score-info-del?guid='+id, url: 'branch/branch-scores/score-info-del?GUID='+id,
method: 'delete' method: 'delete'
}) })
} }
// 下载模板 // 下载模板
export function downloadFile (parameter) { export function downloadFile (parameter) {
return axios({ return axios({
url: homeUrl+'common/down-templates/template-file', url: 'common/down-templates/template-file',
method: 'get', method: 'get',
params: parameter params: parameter,
responseType: 'arraybuffer'
})
}
// 导出门店评价列表
export function exportFile (parameter) {
return axios({
url: 'branch/branch-scores/score-export',
method: 'get',
params: parameter,
responseType: 'blob'
})
}
// 导入打分
export function uploadScore (parameter) {
return axios({
url: 'branch/branch-scores/score-import',
method: 'post',
data: parameter
}) })
} }
// 门店管理 // 门店管理
// 导出门店
export function exportStore (parameter) {
return axios({
url: 'branch/branches/export-branch',
method: 'get',
params: parameter,
responseType: 'arraybuffer'
})
}
// 上传门店
export function uploadStoreFile (parameter) {
return axios({
url: 'branch/branches/import-branch',
method: 'post',
data: parameter
})
}
// 获取门店列表 // 获取门店列表
export function getStoreList (parameter) { export function getStoreList (parameter) {
console.log(parameter) console.log(parameter)
return axios({ return axios({
url: homeUrl+'branch/branches/branch-list', url: 'branch/branches/branch-list',
method: 'get', method: 'get',
params: parameter params: parameter
}) })
...@@ -80,7 +115,7 @@ export function getStoreList (parameter) { ...@@ -80,7 +115,7 @@ export function getStoreList (parameter) {
export function loadAddress (parameter) { export function loadAddress (parameter) {
return axios({ return axios({
url: homeUrl+'common/shop-transport-areas/area', url: 'common/shop-transport-areas/area',
method: 'get', method: 'get',
params: parameter params: parameter
}) })
...@@ -88,7 +123,7 @@ export function loadAddress (parameter) { ...@@ -88,7 +123,7 @@ export function loadAddress (parameter) {
// 获取门店详情 // 获取门店详情
export function getStoreDetails (parameter) { export function getStoreDetails (parameter) {
return axios({ return axios({
url: homeUrl+'branch/branches/branch-detail', url: 'branch/branches/branch-detail',
method: 'get', method: 'get',
params: {GUID:parameter} params: {GUID:parameter}
}) })
...@@ -96,7 +131,7 @@ export function getStoreDetails (parameter) { ...@@ -96,7 +131,7 @@ export function getStoreDetails (parameter) {
// 门店管理中获取服务类目 // 门店管理中获取服务类目
export function getStoreServiceList (parameter) { export function getStoreServiceList (parameter) {
return axios({ return axios({
url: homeUrl+'branch/branches/branch-services', url: 'branch/branches/branch-services',
method: 'get', method: 'get',
params: parameter params: parameter
}) })
...@@ -104,7 +139,7 @@ export function getStoreServiceList (parameter) { ...@@ -104,7 +139,7 @@ export function getStoreServiceList (parameter) {
// 门店管理中获取配送类型 // 门店管理中获取配送类型
export function getStoreDeveliy (parameter) { export function getStoreDeveliy (parameter) {
return axios({ return axios({
url: homeUrl+'branch/branches/branch-transport-type', url: 'branch/branches/branch-transport-type',
method: 'get', method: 'get',
params: parameter params: parameter
}) })
...@@ -112,7 +147,7 @@ export function getStoreDeveliy (parameter) { ...@@ -112,7 +147,7 @@ export function getStoreDeveliy (parameter) {
// 门店管理上传图片 // 门店管理上传图片
export function uploadStorePicture (parameter) { export function uploadStorePicture (parameter) {
return axios({ return axios({
url: homeUrl+'branch/branches/branch-img-upload', url: 'branch/branches/branch-img-upload',
method: 'post', method: 'post',
data: parameter data: parameter
}) })
...@@ -120,7 +155,7 @@ export function uploadStorePicture (parameter) { ...@@ -120,7 +155,7 @@ export function uploadStorePicture (parameter) {
// 门店管理新增 // 门店管理新增
export function addStoreManage (parameter) { export function addStoreManage (parameter) {
return axios({ return axios({
url: homeUrl+'branch/branches/add-branch', url: 'branch/branches/add-branch',
method: 'post', method: 'post',
data: parameter data: parameter
}) })
...@@ -128,7 +163,7 @@ export function addStoreManage (parameter) { ...@@ -128,7 +163,7 @@ export function addStoreManage (parameter) {
// 门店管理编辑 // 门店管理编辑
export function modifyStoreManage (parameter) { export function modifyStoreManage (parameter) {
return axios({ return axios({
url: homeUrl+'branch/branches/revise-branch', url: 'branch/branches/revise-branch',
method: 'put', method: 'put',
data: parameter data: parameter
}) })
...@@ -141,7 +176,7 @@ export function getScategorymg(parameter) { ...@@ -141,7 +176,7 @@ export function getScategorymg(parameter) {
// 'pageSize': parameter.pageSize // 'pageSize': parameter.pageSize
// } // }
return axios({ return axios({
url: homeUrl + 'branch/branch-service-types/branch-service-list', url: 'branch/branch-service-types/branch-service-list',
method: 'get', method: 'get',
params: parameter params: parameter
}) })
...@@ -149,7 +184,7 @@ export function getScategorymg(parameter) { ...@@ -149,7 +184,7 @@ export function getScategorymg(parameter) {
// 新增门店服务类目 // 新增门店服务类目
export function addScategorymg (parameter) { export function addScategorymg (parameter) {
return axios({ return axios({
url: homeUrl+'branch/branch-service-types/add-branch-service', url: 'branch/branch-service-types/add-branch-service',
method: 'post', method: 'post',
data: parameter data: parameter
}) })
...@@ -157,7 +192,7 @@ export function addScategorymg (parameter) { ...@@ -157,7 +192,7 @@ export function addScategorymg (parameter) {
// 获取门店服务类目详情 // 获取门店服务类目详情
export function getScategorymgDetails(id) { export function getScategorymgDetails(id) {
return axios({ return axios({
url: homeUrl + 'branch/branch-service-types/branch-service-info?code='+id, url: 'branch/branch-service-types/branch-service-info?code='+id,
method: 'get' method: 'get'
}) })
} }
...@@ -165,7 +200,7 @@ export function getScategorymgDetails(id) { ...@@ -165,7 +200,7 @@ export function getScategorymgDetails(id) {
export function modifyScategorymgDetails(parameter) { export function modifyScategorymgDetails(parameter) {
// console.log(parameter) // console.log(parameter)
return axios({ return axios({
url: homeUrl + 'branch/branch-service-types/revise-branch-service', url: 'branch/branch-service-types/revise-branch-service',
// url:'http://localhost/hantengfei/newShopBack1/backend/web/v1/branch/branch-service-types/revise-branch-service', // url:'http://localhost/hantengfei/newShopBack1/backend/web/v1/branch/branch-service-types/revise-branch-service',
method: 'put', method: 'put',
data: parameter data: parameter
...@@ -176,7 +211,7 @@ export function deleteScategorymg(id) { ...@@ -176,7 +211,7 @@ export function deleteScategorymg(id) {
console.log(id) console.log(id)
return axios({ return axios({
url: homeUrl + 'branch/branch-service-types/del-branch-service', url: 'branch/branch-service-types/del-branch-service',
method: 'delete', method: 'delete',
data: { "GUID": id } data: { "GUID": id }
}) })
...@@ -185,7 +220,7 @@ export function deleteScategorymg(id) { ...@@ -185,7 +220,7 @@ export function deleteScategorymg(id) {
export function getCerfmg(parameter) { export function getCerfmg(parameter) {
console.log(parameter) console.log(parameter)
return axios({ return axios({
url: homeUrl + 'branch/branch-licences/licence-list', url: 'branch/branch-licences/licence-list',
method: 'get', method: 'get',
params: parameter params: parameter
}) })
...@@ -193,7 +228,7 @@ export function getCerfmg(parameter) { ...@@ -193,7 +228,7 @@ export function getCerfmg(parameter) {
// 获取证照管理详情 // 获取证照管理详情
export function getCerfmgDetails(id) { export function getCerfmgDetails(id) {
return axios({ return axios({
url: homeUrl + 'branch/branch-licences/licence-detail?GUID=' + id, url: 'branch/branch-licences/licence-detail?GUID=' + id,
method: 'get', method: 'get',
data: { "GUID": id } data: { "GUID": id }
}) })
...@@ -201,7 +236,7 @@ export function getCerfmgDetails(id) { ...@@ -201,7 +236,7 @@ export function getCerfmgDetails(id) {
// 新增证照管理 // 新增证照管理
export function addCerfmg (parameter) { export function addCerfmg (parameter) {
return axios({ return axios({
url: homeUrl+'branch/branch-licences/licence-insert', url: 'branch/branch-licences/licence-insert',
method: 'post', method: 'post',
data: parameter data: parameter
}) })
......
src/api/userstaff.js
View file @ 1f44ac22
...@@ -22,7 +22,7 @@ export function getPermissions(parameter) { ...@@ -22,7 +22,7 @@ export function getPermissions(parameter) {
// 'page': parameter.page-1 // 'page': parameter.page-1
// } // }
return axios({ return axios({
url: homeUrl+"shopuser/shop-users/employee-list", url: "shopuser/shop-users/employee-list",
method: 'get', method: 'get',
params: parameter params: parameter
}) })
...@@ -30,7 +30,7 @@ export function getPermissions(parameter) { ...@@ -30,7 +30,7 @@ export function getPermissions(parameter) {
// 获取员工信息详情 // 获取员工信息详情
export function getEminformanDetails(id) { export function getEminformanDetails(id) {
return axios({ return axios({
url: homeUrl + 'shopuser/shop-users/employee-info?id=' + id, url: 'shopuser/shop-users/employee-info?id=' + id,
method: 'get' method: 'get'
// data: { "GUID": id } // data: { "GUID": id }
}) })
...@@ -43,7 +43,7 @@ export function getServiceList(parameter) { ...@@ -43,7 +43,7 @@ export function getServiceList(parameter) {
// // 'pageSize': parameter.pageSize, // // 'pageSize': parameter.pageSize,
// } // }
return axios({ return axios({
url: homeUrl+"shopuser/user-complains/user-complain", url: "shopuser/user-complains/user-complain",
method: 'get', method: 'get',
params: parameter params: parameter
}) })
...@@ -55,7 +55,7 @@ export function getOrgTree(parameter) { ...@@ -55,7 +55,7 @@ export function getOrgTree(parameter) {
// newparameter.page = parameter.page; // newparameter.page = parameter.page;
// console.log(parameter) // console.log(parameter)
return axios({ return axios({
url: homeUrl+"shopuser/user-departments/department", url: "shopuser/user-departments/department",
method: 'get', method: 'get',
params: parameter params: parameter
}) })
...@@ -68,7 +68,7 @@ export function getUserGroup (parameter) { ...@@ -68,7 +68,7 @@ export function getUserGroup (parameter) {
// 'pageSize':parameter.pageSize // 'pageSize':parameter.pageSize
// } // }
return axios({ return axios({
url: homeUrl+'shopuser/shop-user-membergrades/membergrade-list', url: 'shopuser/shop-user-membergrades/membergrade-list',
method: 'get', method: 'get',
params: parameter params: parameter
}) })
...@@ -76,7 +76,7 @@ export function getUserGroup (parameter) { ...@@ -76,7 +76,7 @@ export function getUserGroup (parameter) {
// 新增用户组 // 新增用户组
export function addUserGroup (parameter) { export function addUserGroup (parameter) {
return axios({ return axios({
url: homeUrl+'shopuser/shop-user-membergrades/membergrade-add', url: 'shopuser/shop-user-membergrades/membergrade-add',
method: 'post', method: 'post',
data: parameter data: parameter
}) })
...@@ -84,7 +84,7 @@ export function addUserGroup (parameter) { ...@@ -84,7 +84,7 @@ export function addUserGroup (parameter) {
// 获取用户组详情 // 获取用户组详情
export function getUserGroupDetails (id) { export function getUserGroupDetails (id) {
return axios({ return axios({
url: homeUrl+'shopuser/shop-user-membergrades/membergrade-detail?guid='+id, url: 'shopuser/shop-user-membergrades/membergrade-detail?guid='+id,
method: 'get' method: 'get'
}) })
} }
...@@ -92,7 +92,7 @@ export function getUserGroupDetails (id) { ...@@ -92,7 +92,7 @@ export function getUserGroupDetails (id) {
export function modifyUserGroupDetails (parameter) { export function modifyUserGroupDetails (parameter) {
// console.log(parameter) // console.log(parameter)
return axios({ return axios({
url: homeUrl+'shopuser/shop-user-membergrades/membergrade-revise', url: 'shopuser/shop-user-membergrades/membergrade-revise',
method: 'put', method: 'put',
data: parameter data: parameter
}) })
...@@ -100,20 +100,18 @@ export function getUserGroupDetails (id) { ...@@ -100,20 +100,18 @@ export function getUserGroupDetails (id) {
// 删除用户组 // 删除用户组
export function deleteUserGroup (id) { export function deleteUserGroup (id) {
return axios({ return axios({
url: homeUrl+'shopuser/shop-user-membergrades/membergrade-delete', url: 'shopuser/shop-user-membergrades/membergrade-delete',
method: 'delete', method: 'delete',
data: {'GUID':id} data: {'GUID':id}
}) })
} }
// 获取用户列表 // 获取用户列表
export function getUList (parameter) { export function getUList (parameter) {
console.log(parameter)
if(parameter.CREATE_DATE){ if(parameter.CREATE_DATE){
console.log('666')
parameter.CREATE_DATE=parameter.CREATE_DATE.format('YYYY-MM-DD') parameter.CREATE_DATE=parameter.CREATE_DATE.format('YYYY-MM-DD')
} }
return axios({ return axios({
url: homeUrl+'shopuser/shop-user-lists/user-list', url: 'shopuser/shop-user-lists/user-list',
method: 'get', method: 'get',
params: parameter params: parameter
}) })
...@@ -121,14 +119,14 @@ export function getUserGroupDetails (id) { ...@@ -121,14 +119,14 @@ export function getUserGroupDetails (id) {
// 获取所有用户组 // 获取所有用户组
export function getUListUserGroup () { export function getUListUserGroup () {
return axios({ return axios({
url: homeUrl+'shopuser/shop-user-lists/get-member-grade-list', url: 'shopuser/shop-user-lists/get-member-grade-list',
method: 'get' method: 'get'
}) })
} }
// 用户列表详情 // 用户列表详情
export function getUListDetails (id) { export function getUListDetails (id) {
return axios({ return axios({
url: homeUrl+'shopuser/shop-user-lists/user-detail?GUID='+id, url: 'shopuser/shop-user-lists/user-detail?GUID='+id,
method: 'get' method: 'get'
}) })
} }
...@@ -138,7 +136,7 @@ export function UListModify (parameter) { ...@@ -138,7 +136,7 @@ export function UListModify (parameter) {
parameter.CREATE_DATE=parameter.CREATE_DATE.format('YYYY-MM-DD') parameter.CREATE_DATE=parameter.CREATE_DATE.format('YYYY-MM-DD')
} }
return axios({ return axios({
url: homeUrl+'shopuser/shop-user-lists/user-update', url: 'shopuser/shop-user-lists/user-update',
method: 'post', method: 'post',
data: parameter data: parameter
}) })
...@@ -146,7 +144,7 @@ export function UListModify (parameter) { ...@@ -146,7 +144,7 @@ export function UListModify (parameter) {
// 获取用户组列表 // 获取用户组列表
export function getUGroupList () { export function getUGroupList () {
return axios({ return axios({
url: homeUrl+'shopuser/shop-user-lists/get-member-grade-list', url: 'shopuser/shop-user-lists/get-member-grade-list',
method: 'get' method: 'get'
}) })
} }
......
src/main.js
View file @ 1f44ac22
...@@ -10,16 +10,18 @@ import { VueAxios } from './utils/request' ...@@ -10,16 +10,18 @@ import { VueAxios } from './utils/request'
// mock // mock
// WARNING: `mockjs` NOT SUPPORT `IE` PLEASE DO NOT USE IN `production` ENV. // WARNING: `mockjs` NOT SUPPORT `IE` PLEASE DO NOT USE IN `production` ENV.
import './mock' // import './mock'
import bootstrap from './core/bootstrap' import bootstrap from './core/bootstrap'
import './core/lazy_use' import './core/lazy_use'
import './permission' // permission control import './permission' // permission control
import './utils/filter' // global filter import './utils/filter' // global filter
import './components/global.less' import './components/global.less'
import common from '@/static/js/common.js'
Vue.config.productionTip = false Vue.config.productionTip = false
Vue.prototype.common=common
// mount axios Vue.$http and this.$http // mount axios Vue.$http and this.$http
Vue.use(VueAxios) Vue.use(VueAxios)
......
src/static/js/common.js 0 → 100644
View file @ 1f44ac22
export default {
// 处理下载blob数据
saveFile (data,fname,ftype) {
console.log(ftype)
let blob=new Blob([data],{
type:ftype+';;charset=utf-8'
})
let objectUrl=URL.createObjectURL(blob)
let link=document.createElement("a")
// let fname="门店服务评价打分模板"
link.href=objectUrl;
link.setAttribute('download',fname)
document.body.append(link)
link.click()
}
}
//xlsx格式 application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
// xls格式 application/vnd.ms-excel
//csv格式 text/csv
\ No newline at end of file
src/utils/request.js
View file @ 1f44ac22
...@@ -5,10 +5,16 @@ import notification from 'ant-design-vue/es/notification' ...@@ -5,10 +5,16 @@ import notification from 'ant-design-vue/es/notification'
import { VueAxios } from './axios' import { VueAxios } from './axios'
import { ACCESS_TOKEN } from '@/store/mutation-types' import { ACCESS_TOKEN } from '@/store/mutation-types'
Vue.prototype.$axios=axios;
// 创建 axios 实例 // 创建 axios 实例
const service = axios.create({ const service = axios.create({
baseURL: process.env.VUE_APP_API_BASE_URL, // api base_url // baseURL: process.env.VUE_APP_API_BASE_URL, // api base_url
timeout: 6000 // 请求超时时间 baseURL: '/apis',
// baseURL: 'http://localhost/dengxueyun/newshopBack/backend/web/v1/', // api base_url
timeout: 6000, // 请求超时时间
// withCredentials:true
}) })
const err = (error) => { const err = (error) => {
......
src/views/storedc/storeEvaluateManage.vue
View file @ 1f44ac22
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<span class="table-page-search-submitButtons"> <span class="table-page-search-submitButtons">
<a-button type="primary" @click="checkList">查询</a-button> <a-button type="primary" @click="checkList">查询</a-button>
<a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button> <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
<a-button style="margin-left: 8px">导出</a-button> <a-button @click="exportFile" style="margin-left: 8px">导出</a-button>
</span> </span>
</a-col> </a-col>
</a-row> </a-row>
...@@ -27,8 +27,13 @@ ...@@ -27,8 +27,13 @@
<div class="table-operator"> <div class="table-operator">
<a-button-group> <a-button-group>
<a-button @click="goEdit(1)" type='primary' icon='plus'>添加分值</a-button> <a-button @click="goEdit(1)" type='primary' icon='plus'>添加分值</a-button>
<a-button style="margin-left: 8px" type='primary' icon='file-add'>导入打分</a-button> <a-button @click="downloadFile" type='primary' icon='download'>下载导入模板</a-button>
<a-button @click="downloadFile" style="margin-left: 8px" type='primary' icon='download'>下载导入模板</a-button> <a-upload
name="file"
:customRequest="customRequest"
>
<a-button type='primary' icon='import'>导入打分</a-button>
</a-upload>
</a-button-group> </a-button-group>
</div> </div>
<s-table <s-table
...@@ -287,8 +292,9 @@ ...@@ -287,8 +292,9 @@
<script> <script>
import moment from 'moment' import moment from 'moment'
import axios from 'axios'
import { STable } from '@/components' import { STable } from '@/components'
import { getEvaluateList,getEvaluateDetails,modifyEvaluateDetails,addEvaluate,deleteEvaluate,downloadFile } from '@/api/store' import { getEvaluateList,getEvaluateDetails,modifyEvaluateDetails,addEvaluate,deleteEvaluate,downloadFile,exportFile,uploadScore } from '@/api/store'
export default { export default {
name: 'TableList', name: 'TableList',
...@@ -370,15 +376,58 @@ export default { ...@@ -370,15 +376,58 @@ export default {
// this.$refs.table.refresh(); // this.$refs.table.refresh();
}, },
methods: { methods: {
// 下载模板门店服务评价打分模板（shop_branch_score_import.xls） // 导入打分
customRequest(files) {
var that=this;
const { file } = files;
const formData = new FormData();
formData.append('uploadFile',file)
uploadScore(formData).then(res => {
console.log(res)
// if(files.action==1){
// this.fileList.push({
// uid:'-1',
// name:files.file.name,
// status:'done',
// url:imgData
// })
// this.licencePath=res.imgUrl[0]
// }else{
// this.BranchfileList.push({
// uid:'-1',
// name:files.file.name,
// status:'done',
// url:imgData
// })
// this.branchPath=res.imgUrl[0]
// }
}).catch(res => {
// console.log(res.response.data)
// notification.error({
// message: 'error',
// description: error.response.data
// })
})
},
// 导出门店评价列表 csv类型
exportFile(){
exportFile(this.queryParam).then(res => {
let fname='门店打分记录'+moment(new Date()).format("YYYY-MM-DD")
let ftype='application/vnd.ms-excel'
this.common.saveFile(res,fname,ftype)
})
},
// 下载模板门店服务评价打分模板 xlsx类型（shop_branch_score_import.xls）
downloadFile(){ downloadFile(){
let downloadData={ let downloadData={
'ENG_NAME':'shop_branch_score_import.xls', 'ENG_NAME':'shop_branch_score_import.xls',
'CN_NAME' :'门店服务评价打分模板' 'CN_NAME' :'门店服务评价打分模板'
} }
let ftype='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
downloadFile(downloadData).then(res => { downloadFile(downloadData).then(res => {
console.log(res.status)
this.common.saveFile(res,'门店服务评价打分模板',ftype)
}).catch(err => { }).catch(err => {
console.log(err)
}) })
}, },
remove ( key ) { remove ( key ) {
...@@ -487,4 +536,13 @@ export default { ...@@ -487,4 +536,13 @@ export default {
.operator { .operator {
margin-bottom: 18px; margin-bottom: 18px;
} }
.table-operator .ant-btn-group{
display: flex!important;
}
.table-operator .ant-btn-group>span{
display: inline-block;
}
.ant-upload button{
margin-right:0;
}
</style> </style>
src/views/storedc/storeManage.vue
View file @ 1f44ac22
...@@ -68,6 +68,7 @@ ...@@ -68,6 +68,7 @@
<span class="table-page-search-submitButtons" :style="advanced && { float: 'right', overflow: 'hidden' } || {} "> <span class="table-page-search-submitButtons" :style="advanced && { float: 'right', overflow: 'hidden' } || {} ">
<a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button> <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
<a-button style="margin-left: 8px" @click="() =>{ queryParam = {};addressTest=[]}">重置</a-button> <a-button style="margin-left: 8px" @click="() =>{ queryParam = {};addressTest=[]}">重置</a-button>
<a-button @click="exportStore" style="margin-left: 8px">导出</a-button>
<a @click="toggleAdvanced" style="margin-left: 8px"> <a @click="toggleAdvanced" style="margin-left: 8px">
{{ advanced ? '收起' : '展开' }} {{ advanced ? '收起' : '展开' }}
<a-icon :type="advanced ? 'up' : 'down'"/> <a-icon :type="advanced ? 'up' : 'down'"/>
...@@ -80,8 +81,8 @@ ...@@ -80,8 +81,8 @@
<div class="table-operator"> <div class="table-operator">
<a-button-group> <a-button-group>
<a-button type='primary' icon='plus' @click="handleEdit(1)">新建门店</a-button> <a-button type='primary' icon='plus' @click="handleEdit(1)">新建门店</a-button>
<a-button type='primary' icon='edit'>修改门店信息</a-button> <a-button type='primary' icon='edit' @click="getModal">修改门店信息</a-button>
<a-button style="margin-left: 8px" type='primary' icon='download'>导出门店</a-button> <!-- <a-button style="margin-left: 8px" type='primary' icon='download' @click="exportStore">导出门店</a-button> -->
</a-button-group> </a-button-group>
</div> </div>
<s-table <s-table
...@@ -99,6 +100,34 @@ ...@@ -99,6 +100,34 @@
</span> </span>
</s-table> </s-table>
<a-modal title="导入门店" :width="800" :destroyOnClose="destroyOnClose" v-model="visible" @ok="handleOk">
<div class="content">
<div class="table-operator">
<a-button-group>
<a-upload
name="file"
:customRequest="customRequest"
>
<a-button type='primary' icon='import'>导入门店</a-button>
</a-upload>
<a-button type='primary' icon='download' @click="downloadFile">下载模板</a-button>
</a-button-group>
</div>
<a-tooltip>
<a-breadcrumb>
<a-breadcrumb-item>
<a-icon type="info-circle" style="color:green" />
<span>说明</span>
</a-breadcrumb-item>
</a-breadcrumb>
<p>文件格式要求为xls,版本要求97-2003工作簿</p>
<p>
文件字段必须依次为：'门店编号'，'描述','联系人姓名','手机号','是否支持配送(注：1为是)','配送时间(例:10:00-16:00)','配送距离(默认单位为千米，不需要加单位)','营业时间','是否医保(注：1为是)','是否预约门店(注：1为是)','是否O2O门店(注：1为是)','是否中药熬送门店(注：1为是)','是否积分兑换(注：1为是)','是否虚拟门店(注;1为是)','是否支持冷链配送(注：1为是)','是否营业(注：1为是)','服务类目(多个服务类目用-隔开)','各配送方式(注：1为启用,0为不启用)','门店简称'
</p>
<p>请确保EXCEL文件中有以上字段，如果相应信息没有值，默认为空格即可</p>
</a-tooltip>
</div>
</a-modal>
</div> </div>
</a-card> </a-card>
</template> </template>
...@@ -106,7 +135,7 @@ ...@@ -106,7 +135,7 @@
<script> <script>
import moment from 'moment' import moment from 'moment'
import { STable } from '@/components' import { STable } from '@/components'
import { getStoreList,loadAddress } from '@/api/store' import { getStoreList,loadAddress,exportStore,downloadFile,uploadStoreFile } from '@/api/store'
export default { export default {
name: 'TableList', name: 'TableList',
...@@ -132,6 +161,7 @@ export default { ...@@ -132,6 +161,7 @@ export default {
value:'GUID', value:'GUID',
children:'children' children:'children'
}, },
destroyOnClose:true,
visible:false, visible:false,
size: 'default', size: 'default',
// 高级搜索 展开/关闭 // 高级搜索 展开/关闭
...@@ -195,6 +225,73 @@ export default { ...@@ -195,6 +225,73 @@ export default {
this.$refs.table.refresh(); this.$refs.table.refresh();
}, },
methods: { methods: {
// 上传门店
customRequest(files) {
var that=this;
const { file } = files;
// const reader =new FileReader();
// let imgData;
// reader.addEventListener("load",e => {
// const data=e.target.result;
// const image=new Image();
// image.addEventListener("load",() => {
// const w=image.width;
// const h=image.height;
// })
// image.src=data;
// imgData=image.src;
// })
// reader.readAsDataURL(file)
const formData = new FormData();
formData.append('uploadFile',file)
console.log(formData)
uploadStoreFile(formData).then(res => {
console.log(res)
// if(files.action==1){
// this.fileList.push({
// uid:'-1',
// name:files.file.name,
// status:'done',
// url:imgData
// })
// this.licencePath=res.imgUrl[0]
// }else{
// this.BranchfileList.push({
// uid:'-1',
// name:files.file.name,
// status:'done',
// url:imgData
// })
// this.branchPath=res.imgUrl[0]
// }
})
},
// 下载模板
downloadFile(){
let downloadData={
'ENG_NAME':'import_branch.xls',
'CN_NAME' :'门店导入模板'
}
let ftype='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
downloadFile(downloadData).then(res => {
console.log(res)
this.common.saveFile(res,'门店导入模板',ftype)
}).catch(err => {
console.log(err)
})
},
// 导入门店
getModal(){
this.visible = true
},
// 导出门店
exportStore(){
let ftype='application/vnd.ms-excel'
exportStore(this.queryParam).then(res => {
let fname='门店列表'+moment(new Date()).format("YYYY-MM-DD")
this.common.saveFile(res,fname,ftype)
})
},
// queryParame处理省市区传旨 // queryParame处理省市区传旨
addressCheck(value){ addressCheck(value){
if(value){ if(value){
...@@ -269,7 +366,8 @@ export default { ...@@ -269,7 +366,8 @@ export default {
}) })
} }
}, },
handleOk(value){ handleOk(){
this.visible=false;
}, },
handleEdit(value) { handleEdit(value) {
if(value==1){ if(value==1){
...@@ -284,3 +382,12 @@ export default { ...@@ -284,3 +382,12 @@ export default {
} }
} }
</script> </script>
<style scoped>
.ant-modal-body .ant-btn-group{
display: flex!important;
}
.table-operator .ant-btn-group>span{
display: inline-block;
}
</style>
vue.config.js
View file @ 1f44ac22
...@@ -98,15 +98,18 @@ const vueConfig = { ...@@ -98,15 +98,18 @@ const vueConfig = {
// }, // },
// lintOnSave:false, // lintOnSave:false,
// development server port 8000 // development server port 8000
port: 8000 port: 8000,
// If you want to turn on the proxy, please remove the mockjs /src/main.jsL11 // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
// proxy: { proxy: {
// '/api': { '/apis': {
// target: 'https://mock.ihx.me/mock/5baf3052f7da7e07e04a5116/antd-pro', target: 'http://localhost/dengxueyun/newshopBack/backend/web/v1/',
// ws: false, ws: false,
// changeOrigin: true changeOrigin: true,
// } pathRewrite:{
// } "^/apis":""
}
}
}
}, },
// disable source map in production // disable source map in production
......
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