Skip to content

Commit 545b103

Browse files
committed
add pack method
fix font-family
1 parent 1ff7cfc commit 545b103

File tree

8 files changed

+63
-15
lines changed

8 files changed

+63
-15
lines changed

src/api/manage.js

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
import { axios } from '@/utils/request'
2+
3+
const api = {
4+
user: '/user',
5+
role: '/role',
6+
service: '/service',
7+
permission: '/permission',
8+
}
9+
10+
export default api
11+
12+
export function getUserList(parameter) {
13+
return axios({
14+
url: api.user,
15+
method: 'get',
16+
params: parameter
17+
})
18+
}
19+
20+
export function getRoleList(parameter) {
21+
return axios({
22+
url: api.role,
23+
method: 'get',
24+
params: parameter
25+
})
26+
}
27+
28+
export function getServiceList(parameter) {
29+
return axios({
30+
url: api.service,
31+
method: 'get',
32+
params: parameter
33+
})
34+
}
35+
36+
// id == 0 add post
37+
// id != 0 update put
38+
export function saveService(parameter) {
39+
return axios({
40+
url: api.service,
41+
method: parameter.id == 0 ? 'post' : 'put',
42+
data: parameter
43+
})
44+
}

src/components/layout/LayoutMain.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@
233233
color: #fff;
234234
font-size: 20px;
235235
margin: 0 0 0 12px;
236-
font-family: "Myriad Pro", "Helvetica Neue", Arial, Helvetica, sans-serif;
236+
font-family: "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
237237
font-weight: 600;
238238
}
239239
}

src/utils/request.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Vue from 'vue'
22
import axios from 'axios'
3-
import store from '../store'
3+
import store from '@/store'
44
import { VueAxios } from './axios'
55
import notification from 'ant-design-vue/es/notification'
66
import { ACCESS_TOKEN } from "@/store/mutation-types"

src/views/Login.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@
295295
.title {
296296
font-size: 33px;
297297
color: rgba(0, 0, 0, .85);
298-
font-family: "Myriad Pro", "Helvetica Neue", Arial, Helvetica, sans-serif;
298+
font-family: "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
299299
font-weight: 600;
300300
position: relative;
301301
top: 2px;

src/views/account/center/Index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<script>
88
import PageLayout from '@/components/layout/PageLayout'
9-
import RouteView from "@/components/layout/RouteView";
9+
import RouteView from "@/components/layout/RouteView"
1010
1111
export default {
1212
components: {

src/views/account/settings/IndexOld.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@
9191
import PageLayout from '@/components/layout/PageLayout'
9292
9393
import HeadInfo from '@/components/tools/HeadInfo'
94-
import ASelect from "ant-design-vue/es/select";
95-
import AForm from "ant-design-vue/es/form/Form";
96-
import VueCropper from "vue-cropper/example/src/vue-cropper/vue-cropper";
94+
import ASelect from "ant-design-vue/es/select"
95+
import AForm from "ant-design-vue/es/form/Form"
96+
import VueCropper from "vue-cropper/example/src/vue-cropper/vue-cropper"
9797
9898
export default {
9999
name: "Index",

src/views/list/TableList.vue

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,10 @@
180180

181181
<script>
182182
import STable from '@/components/table/'
183-
import ATextarea from "ant-design-vue/es/input/TextArea";
184-
import AInput from "ant-design-vue/es/input/Input";
183+
import ATextarea from "ant-design-vue/es/input/TextArea"
184+
import AInput from "ant-design-vue/es/input/Input"
185+
186+
import { getRoleList, getServiceList } from '@/api/manage'
185187
186188
export default {
187189
name: "TableList",
@@ -244,17 +246,19 @@
244246
],
245247
// 加载数据方法 必须为 Promise 对象
246248
loadData: parameter => {
247-
return this.$http.get('/service', {
248-
params: Object.assign(parameter, this.queryParam)
249-
}).then(res => {
250-
return res.result
251-
})
249+
return getServiceList(Object.assign(parameter, this.queryParam))
250+
.then(res => {
251+
return res.result
252+
})
252253
},
253254
254255
selectedRowKeys: [],
255256
selectedRows: []
256257
}
257258
},
259+
created () {
260+
getRoleList({ t: new Date()})
261+
},
258262
methods: {
259263
handleEdit (record) {
260264
this.mdl = Object.assign({}, record)

src/views/profile/basic/Index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
import PageLayout from '@/components/layout/PageLayout'
4747
import STable from '@/components/table/'
4848
import DetailList from '@/components/tools/DetailList'
49-
import ABadge from "ant-design-vue/es/badge/Badge";
49+
import ABadge from "ant-design-vue/es/badge/Badge"
5050
const DetailListItem = DetailList.Item
5151
5252
export default {

0 commit comments

Comments
 (0)