diff --git a/.env.development b/.env.development index 3896149..2bec093 100644 --- a/.env.development +++ b/.env.development @@ -2,7 +2,7 @@ ENV = 'development' # base api -VUE_APP_BASE_API = 'http://gb-test.ali251.langye.net' +VUE_APP_BASE_API = 'https://gb-test.ali251.langye.net' -#VUE_APP_BASE_API = 'http://gb-test.ali251.langye.net' +#VUE_APP_BASE_API = 'https://gb-test.ali251.langye.net' diff --git a/.env.production b/.env.production index 9a21d6c..9a8f863 100644 --- a/.env.production +++ b/.env.production @@ -3,5 +3,5 @@ ENV = 'production' # base api -#VUE_APP_BASE_API = 'http://gb-test.ali251.langye.net' -VUE_APP_BASE_API = 'http://gb-test.ali251.langye.net' +#VUE_APP_BASE_API = 'https://gb-test.ali251.langye.net' +VUE_APP_BASE_API = 'https://gb-test.ali251.langye.net' diff --git a/src/api/achievement/index.js b/src/api/achievement/index.js new file mode 100644 index 0000000..fd09c76 --- /dev/null +++ b/src/api/achievement/index.js @@ -0,0 +1,42 @@ +import request from '@/utils/request' + +export function index(params) { + return request({ + url: '/api/admin/achievement/index', + method: 'get', + params: params + }) +} + +export function store(data) { + return request({ + url: '/api/admin/achievement/store', + method: 'post', + data + }) +} + +export function save(data) { + return request({ + url: '/api/admin/achievement/save', + method: 'post', + data + }) +} + +export function show(params) { + return request({ + url: '/api/admin/achievement/show', + method: 'get', + params + }) +} + +export function destroy(params) { + return request({ + url: '/api/admin/achievement/destroy', + method: 'get', + params + }) +} + diff --git a/src/api/vr/index.js b/src/api/vr/index.js new file mode 100644 index 0000000..d460079 --- /dev/null +++ b/src/api/vr/index.js @@ -0,0 +1,42 @@ +import request from '@/utils/request' + +export function index(params) { + return request({ + url: '/api/admin/vr-exhibit/index', + method: 'get', + params: params + }) +} + +export function store(data) { + return request({ + url: '/api/admin/vr-exhibit/store', + method: 'post', + data + }) +} + +export function save(data) { + return request({ + url: '/api/admin/vr-exhibit/save', + method: 'post', + data + }) +} + +export function show(params) { + return request({ + url: '/api/admin/vr-exhibit/show', + method: 'get', + params + }) +} + +export function destroy(params) { + return request({ + url: '/api/admin/vr-exhibit/destroy', + method: 'get', + params + }) +} + diff --git a/src/components/LxHeader/index.vue b/src/components/LxHeader/index.vue index b41055b..92ff947 100644 --- a/src/components/LxHeader/index.vue +++ b/src/components/LxHeader/index.vue @@ -42,7 +42,7 @@ export default { font-size: 15px; // color: #fff; white-space: nowrap; - border-bottom: 2px solid #ef9525; + border-bottom: 2px solid #cf995a; > span { position: relative; top: 2px; diff --git a/src/layout/autor.jpeg b/src/layout/autor.jpeg index 36bb7f1..1767365 100644 Binary files a/src/layout/autor.jpeg and b/src/layout/autor.jpeg differ diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 5986e48..d8123fb 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -26,7 +26,7 @@ }, data() { return { - title: '智能工具箱管理平台', + title: '苏州革命博物馆', logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png' } } diff --git a/src/styles/element-variables.scss b/src/styles/element-variables.scss index 01e8ba8..7af9e57 100644 --- a/src/styles/element-variables.scss +++ b/src/styles/element-variables.scss @@ -1,5 +1,5 @@ /* 改变主题色变量 */ -$--color-primary: #EF9525; +$--color-primary: #cf995a; /* 改变 icon 字体路径变量,必需 */ $--font-path: '~element-ui/lib/theme-chalk/fonts'; diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 23f35a1..922e960 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -4,13 +4,13 @@ $menuActiveText:#fff; $subMenuActiveText:#fff; //https://github.com/ElemeFE/element/issues/12951 $menuBg:#ffffff;//#304156 -$menuHover:#ef9525; -$menuActiveBg:#ef9525; +$menuHover:#cf995a; +$menuActiveBg:#cf995a; $subMenuBg:#ffffff;//#1f2d3d -$subMenuHover:#ef9525; -$submenuActiveBg:#ef9525; +$subMenuHover:#cf995a; +$submenuActiveBg:#cf995a; $sideBarWidth: 210px; $primaryColor: #c69845; diff --git a/src/styles/viewui-mine.less b/src/styles/viewui-mine.less index 0505cb1..c479613 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: #EF9525; +@primary-color: #cf995a; diff --git a/src/views/achievement/component/addAchievement.vue b/src/views/achievement/component/addAchievement.vue new file mode 100644 index 0000000..7e5cf4f --- /dev/null +++ b/src/views/achievement/component/addAchievement.vue @@ -0,0 +1,307 @@ + + + + + diff --git a/src/views/achievement/index.vue b/src/views/achievement/index.vue new file mode 100644 index 0000000..a1dd9a5 --- /dev/null +++ b/src/views/achievement/index.vue @@ -0,0 +1,107 @@ + + + + + diff --git a/src/views/exhibit/component/addExhibit.vue b/src/views/exhibit/component/addExhibit.vue index 4096ec3..a1c4e67 100644 --- a/src/views/exhibit/component/addExhibit.vue +++ b/src/views/exhibit/component/addExhibit.vue @@ -11,6 +11,28 @@ + + + + +