diff --git a/.env.development b/.env.development index 6b10fd6..1df38d5 100644 --- a/.env.development +++ b/.env.development @@ -2,6 +2,5 @@ ENV = 'development' # base api -VUE_APP_BASE_API = http://book-test.ali251.langye.net -VUE_APP_UPLOAD_API = http://book-test.ali251.langye.net/api/admin/upload-file -VUE_APP_PUBLIC='' \ No newline at end of file +VUE_APP_BASE_API = https://yybtest.ali251.langye.net +#VUE_APP_BASE_API = https://yunyubang.ali251.langye.net diff --git a/.env.production b/.env.production index a27a513..1575aab 100644 --- a/.env.production +++ b/.env.production @@ -2,6 +2,5 @@ ENV = 'production' # base api -VUE_APP_BASE_API = http://book-test.ali251.langye.net -VUE_APP_UPLOAD_API =http://book-test.ali251.langye.net/api/admin/upload-file -VUE_APP_PUBLIC='/admin/' +VUE_APP_BASE_API = https://yunyubang.ali251.langye.net + diff --git a/public/favicon.ico b/public/favicon.ico index 41cb8b8..49376c6 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/api/bookRecord/recordIndex.js b/src/api/bookRecord/recordIndex.js deleted file mode 100644 index ba31eb7..0000000 --- a/src/api/bookRecord/recordIndex.js +++ /dev/null @@ -1,35 +0,0 @@ -import request from '@/utils/request' - -export function save(data) { - return request({ - url: '/api/admin/borrow-log/save', - method: 'post', - data - }) -} - -export function list(params) { - return request({ - url: '/api/admin/borrow-log/index', - method: 'get', - params - }) -} - -export function show(params) { - return request({ - url: '/api/admin/borrow-log/show', - method: 'get', - params - }) -} - - -export function del(params) { - return request({ - url: '/api/admin/borrow-log/destroy', - method: 'get', - params - }) -} - diff --git a/src/api/bookStore/bookIndex.js b/src/api/bookStore/bookIndex.js deleted file mode 100644 index a26c108..0000000 --- a/src/api/bookStore/bookIndex.js +++ /dev/null @@ -1,89 +0,0 @@ -import request from '@/utils/request' - -export function save(data) { - return request({ - url: '/api/admin/book/save', - method: 'post', - data - }) -} - -export function list(params) { - return request({ - url: '/api/admin/book/index', - method: 'get', - params - }) -} - -export function show(params) { - return request({ - url: '/api/admin/book/show', - method: 'get', - params - }) -} - - -export function del(params) { - return request({ - url: '/api/admin/book/destroy', - method: 'get', - params - }) -} - -export function isbn(params) { - return request({ - url: '/api/admin/other/isbn', - method: 'get', - params - }) -} - - - -export function isbnCheck(params) { - return request({ - url: '/api/admin/other/isbn-check', - method: 'get', - params - }) -} - - - - - -export function saveDetail(data) { - return request({ - url: '/api/admin/book_detail/save', - method: 'post', - data - }) -} - -export function listDetail(params) { - return request({ - url: '/api/admin/book_detail/index', - method: 'get', - params - }) -} - -export function showDetail(params) { - return request({ - url: '/api/admin/book_detail/show', - method: 'get', - params - }) -} - - -export function delDetail(params) { - return request({ - url: '/api/admin/book_detail/destroy', - method: 'get', - params - }) -} diff --git a/src/api/bookStore/bookType.js b/src/api/bookStore/bookType.js deleted file mode 100644 index 32d619f..0000000 --- a/src/api/bookStore/bookType.js +++ /dev/null @@ -1,34 +0,0 @@ -import request from '@/utils/request' - -export function save(data) { - return request({ - url: '/api/admin/book_type/save', - method: 'post', - data - }) -} - -export function list(params) { - return request({ - url: '/api/admin/book_type/index', - method: 'get', - params - }) -} - -export function show(params) { - return request({ - url: '/api/admin/book_type/show', - method: 'get', - params - }) -} - - -export function del(params) { - return request({ - url: '/api/admin/book_type/destroy', - method: 'get', - params - }) -} diff --git a/src/api/bookStore/interface.js b/src/api/bookStore/interface.js deleted file mode 100644 index adc771b..0000000 --- a/src/api/bookStore/interface.js +++ /dev/null @@ -1,67 +0,0 @@ -import Vue from "vue" -import vueResource from "vue-resource" -Vue.use(vueResource) -import { - MessageBox, - Message, - Loading -} from 'element-ui' - - -// 请求接口通用方法 -export function request(api, params, callback) { - let url = api + "?t=" + new Date(); - Vue.http.post(url, params, { - header: { - "Content-Type": "application/x-www-form-urlencoded" - } - }).then((response) => { - let res = response.body - if (res.retCode === 0) { - if (typeof callback === "function") { - callback(res) - } - } else { - Message({ - message: res.msg + ',重新获取中' || 'Error', - type: 'error', - duration: 5 * 1000 - }) - } - }).catch(err => { - - }) -} - - -export function get_isbn(params, callback) { - const api = "/query" - requestGet(api, { - params: { - key: "417d45266d502c8f67235e96f1e891e2", - ...params - } - }, callback) -} - -// 请求接口通用方法 -export function requestGet(api, params, callback) { - let url = api + "?t=" + new Date(); - Vue.http.get(url, params).then((response) => { - console.log(response) - let res = response.body - if (res.error_code === 0) { - if (typeof callback === "function") { - callback(res) - } - } else { - Message({ - message: res.msg + ',重新获取中' || 'Error', - type: 'error', - duration: 5 * 1000 - }) - } - }).catch(err => { - - }) -} diff --git a/src/api/bookStore/storeList.js b/src/api/bookStore/storeList.js deleted file mode 100644 index c7b002b..0000000 --- a/src/api/bookStore/storeList.js +++ /dev/null @@ -1,34 +0,0 @@ -import request from '@/utils/request' - -export function save(data) { - return request({ - url: '/api/admin/book_detail/save', - method: 'post', - data - }) -} - -export function list(params) { - return request({ - url: '/api/admin/book_detail/index', - method: 'get', - params - }) -} - -export function show(params) { - return request({ - url: '/api/admin/book_detail/show', - method: 'get', - params - }) -} - - -export function del(params) { - return request({ - url: '/api/admin/book_detail/destroy', - method: 'get', - params - }) -} diff --git a/src/api/lendCenter/index.js b/src/api/lendCenter/index.js deleted file mode 100644 index 79d337b..0000000 --- a/src/api/lendCenter/index.js +++ /dev/null @@ -1,47 +0,0 @@ -import request from '@/utils/request' - - -export function userIndex(params) { - return request({ - url: '/api/mobile/other/user-index', - method: 'get', - params - }) -} - -export function bookDetail(params) { - return request({ - url: '/api/mobile/other/book-detail', - method: 'get', - params - }) -} - - -export function bookBorrow(data) { - return request({ - url: '/api/mobile/other/book-borrow', - method: 'post', - data - }) -} - - - - -export function bookReturn(data) { - return request({ - url: '/api/mobile/other/book-return', - method: 'post', - data - }) -} - - -export function checkBookBorrow(data) { - return request({ - url: '/api/mobile/other/check-book-borrow', - method: 'post', - data - }) -} diff --git a/src/api/staff/deptIndex.js b/src/api/staff/deptIndex.js deleted file mode 100644 index 754a04c..0000000 --- a/src/api/staff/deptIndex.js +++ /dev/null @@ -1,34 +0,0 @@ -import request from '@/utils/request' - -export function save(data) { - return request({ - url: '/api/admin/user-department/save', - method: 'post', - data - }) -} - -export function list(params) { - return request({ - url: '/api/admin/user-department/index', - method: 'get', - params - }) -} - -export function show(params) { - return request({ - url: '/api/admin/user-department/show', - method: 'get', - params - }) -} - - -export function del(params) { - return request({ - url: '/api/admin/user-department/destroy', - method: 'get', - params - }) -} diff --git a/src/api/staff/staffIndex.js b/src/api/staff/staffIndex.js deleted file mode 100644 index c6f7502..0000000 --- a/src/api/staff/staffIndex.js +++ /dev/null @@ -1,34 +0,0 @@ -import request from '@/utils/request' - -export function save(data) { - return request({ - url: '/api/admin/user/save', - method: 'post', - data - }) -} - -export function list(params) { - return request({ - url: '/api/admin/user/index', - method: 'get', - params - }) -} - -export function show(params) { - return request({ - url: '/api/admin/user/show', - method: 'get', - params - }) -} - - -export function del(params) { - return request({ - url: '/api/admin/user/destroy', - method: 'get', - params - }) -} diff --git a/src/api/user.js b/src/api/user.js index e12d073..70ace67 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function login(data) { return request({ - url: '/api/admin/auth/login', + url: '/api/merchant/login', method: 'post', data }) @@ -10,7 +10,7 @@ export function login(data) { export function getInfo(token) { return request({ - url: '/api/admin/auth/me', + url: '/api/merchant/me', method: 'post', params: { token } }) @@ -29,4 +29,4 @@ export function getAuthMenu(token) { method: 'get', params: { token } }) -} \ No newline at end of file +} diff --git a/src/assets/bg.jpg b/src/assets/bg.jpg deleted file mode 100644 index 021b6d1..0000000 Binary files a/src/assets/bg.jpg and /dev/null differ diff --git a/src/assets/bg.png b/src/assets/bg.png new file mode 100644 index 0000000..11c1620 Binary files /dev/null and b/src/assets/bg.png differ diff --git a/src/assets/logo-mini.png b/src/assets/logo-mini.png index 0be211e..afc71c9 100644 Binary files a/src/assets/logo-mini.png and b/src/assets/logo-mini.png differ diff --git a/src/assets/logo.png b/src/assets/logo.png index 03c2e15..784e767 100644 Binary files a/src/assets/logo.png and b/src/assets/logo.png differ diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 566ddc4..b1549ac 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -6,6 +6,7 @@ + @@ -35,8 +36,8 @@ transition: opacity 1.5s; } .sidebar-name-logo { - width: 160px; - height: 36px; + width: 120px; + height: 28px; } .sidebarLogoFade-enter, diff --git a/src/router/index.js b/src/router/index.js index 661173b..727c48f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -31,18 +31,6 @@ import Layout from '@/layout' * all roles can be accessed */ export const constantRoutes = [{ - path: '/index', - component: () => import('@/views/lendCenter/index'), - hidden: true - },{ - path: '/brrow', - component: () => import('@/views/lendCenter/brrow'), - hidden: true - },{ - path: '/return', - component: () => import('@/views/lendCenter/return'), - hidden: true - },{ path: '/login', component: () => import('@/views/login/index'), hidden: true diff --git a/src/settings.js b/src/settings.js index e99652b..fe88925 100644 --- a/src/settings.js +++ b/src/settings.js @@ -1,6 +1,6 @@ module.exports = { - title: '同心读书会自助借阅系统', + title: '孕育邦-商家端', /** * @type {boolean} true | false diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 06fd367..0987f3c 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -179,29 +179,17 @@ const actions = { }, roles) { return new Promise(resolve => { const loadMenuData = [] - // 先查询后台并返回左侧菜单数据并把数据添加到路由 - getAuthMenu(state.token).then(response => { - let data = response - - //console.log(JSON.stringify(data)) - - Object.assign(loadMenuData, data) - asyncRoutes.length=0; - generaMenu(asyncRoutes, loadMenuData) - let accessedRoutes - if (roles.includes('admin')) { - // alert(JSON.stringify(asyncRoutes)) - accessedRoutes = asyncRoutes || [] - } else { - accessedRoutes = filterAsyncRoutes(asyncRoutes, roles) - } - commit('SET_ROUTES', accessedRoutes) - resolve(accessedRoutes) - - // generaMenu(asyncRoutes, data) - }).catch(error => { - console.log(error) - }) + Object.assign(loadMenuData, asyncRoutes) + generaMenu(asyncRoutes, loadMenuData) + let accessedRoutes + if (roles.includes('admin')) { + // alert(JSON.stringify(asyncRoutes)) + accessedRoutes = asyncRoutes || [] + } else { + accessedRoutes = filterAsyncRoutes(asyncRoutes, roles) + } + commit('SET_ROUTES', accessedRoutes) + resolve(accessedRoutes) }) } } diff --git a/src/styles/element-variables.scss b/src/styles/element-variables.scss index 5546ec6..e44cb29 100644 --- a/src/styles/element-variables.scss +++ b/src/styles/element-variables.scss @@ -1,5 +1,5 @@ /* 改变主题色变量 */ -$--color-primary: #006756; +$--color-primary: #071e34; /* 改变 icon 字体路径变量,必需 */ $--font-path: '~element-ui/lib/theme-chalk/fonts'; diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 4184c59..36473d0 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -11,7 +11,7 @@ transition: width 0.28s; width: $sideBarWidth !important; //background-color: $menuBg; - background: linear-gradient(180deg, #006756, #039980); + background: linear-gradient(180deg, #071e34, #071e34); box-shadow: 1px 1px 15px 0px rgba(17, 76, 157, 0.2); height: 100%; position: fixed; @@ -229,7 +229,7 @@ >.el-menu--popup { max-height: 100vh; overflow-y: auto; - background: #006756 !important; + background: #071e34 !important; &::-webkit-scrollbar-track-piece { background: #d3dce6; diff --git a/src/styles/variables.scss b/src/styles/variables.scss index ed7787c..5e6df77 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -13,7 +13,7 @@ $subMenuHover:rgba(242, 242, 242, .4); $submenuActiveBg:rgba(242, 242, 242, .4); $sideBarWidth: 210px; -$primaryColor: #006756; +$primaryColor: #071e34; // the :export directive is the magic sauce for webpack // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass :export { diff --git a/src/styles/viewui-mine.less b/src/styles/viewui-mine.less index d1f00a5..3e83da5 100644 --- a/src/styles/viewui-mine.less +++ b/src/styles/viewui-mine.less @@ -1,4 +1,4 @@ @import '~view-design/src/styles/index.less'; // Here are the variables to cover, such as: -@primary-color: #006756; +@primary-color: #071e34; diff --git a/src/utils/auth.js b/src/utils/auth.js index 74ba1ab..1836d62 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -1,6 +1,6 @@ import Cookies from 'js-cookie' -const TokenKey = 'sishitongtang_token' +const TokenKey = 'YUNYUBANG_SUPPLIER_TOKEN' export function getToken() { return Cookies.get(TokenKey) diff --git a/src/views/404.vue b/src/views/404.vue index 1791f55..be26391 100644 --- a/src/views/404.vue +++ b/src/views/404.vue @@ -14,7 +14,7 @@
{{ message }}
Please check that the URL you entered is correct, or click the button below to return to the homepage.
- Back to home + 返回 diff --git a/src/views/bookRecord/recordIndex.vue b/src/views/bookRecord/recordIndex.vue deleted file mode 100644 index c62dcbc..0000000 --- a/src/views/bookRecord/recordIndex.vue +++ /dev/null @@ -1,174 +0,0 @@ - - - - - diff --git a/src/views/bookStore/bookIndex.vue b/src/views/bookStore/bookIndex.vue deleted file mode 100644 index 766b797..0000000 --- a/src/views/bookStore/bookIndex.vue +++ /dev/null @@ -1,209 +0,0 @@ - - - - - diff --git a/src/views/bookStore/bookType.vue b/src/views/bookStore/bookType.vue deleted file mode 100644 index b656737..0000000 --- a/src/views/bookStore/bookType.vue +++ /dev/null @@ -1,224 +0,0 @@ - - diff --git a/src/views/bookStore/components/addBook.vue b/src/views/bookStore/components/addBook.vue deleted file mode 100644 index 2a26e4b..0000000 --- a/src/views/bookStore/components/addBook.vue +++ /dev/null @@ -1,509 +0,0 @@ - - - - - diff --git a/src/views/bookStore/components/putIn.vue b/src/views/bookStore/components/putIn.vue deleted file mode 100644 index b71dd5e..0000000 --- a/src/views/bookStore/components/putIn.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - diff --git a/src/views/bookStore/components/viewBook.vue b/src/views/bookStore/components/viewBook.vue deleted file mode 100644 index f40be48..0000000 --- a/src/views/bookStore/components/viewBook.vue +++ /dev/null @@ -1,202 +0,0 @@ - - - - - diff --git a/src/views/bookStore/storeList.vue b/src/views/bookStore/storeList.vue deleted file mode 100644 index ffe7bf0..0000000 --- a/src/views/bookStore/storeList.vue +++ /dev/null @@ -1,174 +0,0 @@ - - - - - diff --git a/src/views/lendCenter/brrow.vue b/src/views/lendCenter/brrow.vue deleted file mode 100644 index a437665..0000000 --- a/src/views/lendCenter/brrow.vue +++ /dev/null @@ -1,556 +0,0 @@ - - - - - diff --git a/src/views/lendCenter/index.vue b/src/views/lendCenter/index.vue deleted file mode 100644 index 3a3789a..0000000 --- a/src/views/lendCenter/index.vue +++ /dev/null @@ -1,123 +0,0 @@ - - - - - diff --git a/src/views/lendCenter/return.vue b/src/views/lendCenter/return.vue deleted file mode 100644 index 68ba1c4..0000000 --- a/src/views/lendCenter/return.vue +++ /dev/null @@ -1,309 +0,0 @@ - - - - - diff --git a/src/views/login/index.vue b/src/views/login/index.vue index d50357a..d7a0e38 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -193,7 +193,7 @@ min-height: 100%; width: 100%; //background-color: $bg; - background: url("../../assets/bg.jpg") no-repeat; + background: url("../../assets/bg.png") no-repeat; overflow: hidden; .login-form { diff --git a/src/views/staff/deptIndex.vue b/src/views/staff/deptIndex.vue deleted file mode 100644 index 710e228..0000000 --- a/src/views/staff/deptIndex.vue +++ /dev/null @@ -1,230 +0,0 @@ - - diff --git a/src/views/staff/staffIndex.vue b/src/views/staff/staffIndex.vue deleted file mode 100644 index 8c6731f..0000000 --- a/src/views/staff/staffIndex.vue +++ /dev/null @@ -1,233 +0,0 @@ - - - - - diff --git a/vue.config.js b/vue.config.js index 7ab996f..3ff6a77 100644 --- a/vue.config.js +++ b/vue.config.js @@ -13,7 +13,7 @@ const name = defaultSettings.title // page title // For example, Mac: sudo npm run // You can change the port by the following methods: // port = 9528 npm run dev OR npm run dev --port = 9528 -const port = process.env.port || process.env.npm_config_port || 8014 // dev port +const port = process.env.port || process.env.npm_config_port || 8015 // dev port // All configuration item explanations can be find in https://cli.vuejs.org/config/ module.exports = { @@ -25,7 +25,7 @@ module.exports = { * Detail: https://cli.vuejs.org/config/#publicpath */ publicPath: '/admin/', - outputDir: '/Users/liuxiangyu/Work/g-guangdian/app/b-bookmanage/book-manage-service/public/admin', + outputDir: '/Users/liuxiangyu/Work/yunyubang/yunyubang-service/public/merchant', assetsDir: 'static', css: { loaderOptions: { // 向 CSS 相关的 loader 传递选项 @@ -45,14 +45,6 @@ module.exports = { }, //before: require('./mock/mock-server.js'), proxy: { - '^/query': { - target: "http://apis.juhe.cn/isbn/query", - secure: true, - changeOrigin: true, //配置跨域 - pathRewrite: { - "^/query": "", - } - }, [process.env.VUE_APP_BASE_API]: { target: process.env.VUE_APP_BASE_API, changeOrigin: true, //配置跨域