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 @@
- {{item.name}}
-
-
-
-
-