Skip to content

Commit 6b9b979

Browse files
wenjianzhangwenjianzhang
authored
publish🚀 v1.3.0
2 parents 121dfd9 + b7b426f commit 6b9b979

File tree

8 files changed

+38
-32
lines changed

8 files changed

+38
-32
lines changed

Diff for: ‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "go-admin",
3-
"version": "1.3.0-rc.0",
3+
"version": "1.3.0",
44
"description": "A magical vue admin. An out-of-box UI solution for enterprise applications. Newest development stack of vue. Lots of awesome features",
55
"author": "https://github.com/wenjianzhang",
66
"license": "MIT",
@@ -39,10 +39,10 @@
3939
],
4040
"repository": {
4141
"type": "git",
42-
"url": "git+https://github.com/wenjianzhang/go-admin.git"
42+
"url": "git+https://github.com/go-admin-team/go-admin.git"
4343
},
4444
"bugs": {
45-
"url": "https://github.com/wenjianzhang/go-admin/issues"
45+
"url": "https://github.com/go-admin-team/go-admin/issues"
4646
},
4747
"dependencies": {
4848
"@riophae/vue-treeselect": "0.4.0",

Diff for: ‎src/api/login.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ export function getCodeImg() {
88
})
99
}
1010

11-
// 查询
11+
// 查询 此接口不在验证数据权限
1212
export function getSetting() {
1313
return request({
14-
url: '/api/v1/setting',
14+
url: '/api/v1/app-config',
1515
method: 'get'
1616
})
1717
}
1818

19-
// 修改
20-
export function updateSetting(data) {
21-
return request({
22-
url: '/api/v1/setting',
23-
method: 'post',
24-
data: data
25-
})
26-
}
19+
// // 修改
20+
// export function updateSetting(data) {
21+
// return request({
22+
// url: '/api/v1/setting',
23+
// method: 'post',
24+
// data: data
25+
// })
26+
// }

Diff for: ‎src/layout/components/Sidebar/Logo.vue

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: $store.state.settings.themeStyle === 'dark' ? variables.menuBg : variables.menuLightBg }">
33
<transition name="sidebarLogoFade">
44
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
5-
<img v-if="appInfo.logo" :src="appInfo.logo" class="sidebar-logo">
6-
<h1 v-else class="sidebar-title" :style="{ color: $store.state.settings.themeStyle === 'dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ appInfo.name }} </h1>
5+
<img v-if="appInfo.sys_app_logo" :src="appInfo.sys_app_logo" class="sidebar-logo">
6+
<h1 v-else class="sidebar-title" :style="{ color: $store.state.settings.themeStyle === 'dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ appInfo.sys_app_name }} </h1>
77
</router-link>
88
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
9-
<img v-if="appInfo.logo" :src="appInfo.logo" class="sidebar-logo">
10-
<h1 class="sidebar-title" :style="{ color: $store.state.settings.themeStyle === 'dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ appInfo.name }} </h1>
9+
<img v-if="appInfo.sys_app_logo" :src="appInfo.sys_app_logo" class="sidebar-logo">
10+
<h1 class="sidebar-title" :style="{ color: $store.state.settings.themeStyle === 'dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ appInfo.sys_app_name }} </h1>
1111
</router-link>
1212
</transition>
1313
</div>

Diff for: ‎src/store/modules/system.js

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { getSetting, updateSetting } from '@/api/login'
2+
// import { logout } from '@/api/user'
23
import storage from '@/utils/storage'
34
const state = {
45
info: storage.get('app_info')
@@ -15,6 +16,7 @@ const actions = {
1516
settingDetail({ commit }) {
1617
return new Promise((resolve, reject) => {
1718
getSetting().then(response => {
19+
debugger
1820
const { data } = response
1921
commit('SET_INFO', data)
2022
resolve(data)

Diff for: ‎src/utils/get-page-title.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import storage from '@/utils/storage'
22

33
export default function getPageTitle(pageTitle) {
44
const app_info = storage.get('app_info')
5-
const title = app_info ? app_info.name : 'go-admin 后台管理系统'
5+
const title = app_info ? app_info.sys_app_name : 'go-admin 后台管理系统'
66
if (pageTitle) {
77
return `${pageTitle} - ${title}`
88
}

Diff for: ‎src/views/config/index.vue

+13-9
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,12 @@
142142
>{{ dict.dictLabel }}</el-radio>
143143
</el-radio-group>
144144
</el-form-item>
145+
<el-form-item label="是否前台显示" prop="isFrontend">
146+
<el-select v-model="form.isFrontend" placeholder="是否前台显示" clearable size="small">
147+
<el-option label="是" value="1" />
148+
<el-option label="否" value="2" />
149+
</el-select>
150+
</el-form-item>
145151
<el-form-item label="备注" prop="remark">
146152
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
147153
</el-form-item>
@@ -197,15 +203,10 @@ export default {
197203
form: {},
198204
// 表单校验
199205
rules: {
200-
configName: [
201-
{ required: true, message: '参数名称不能为空', trigger: 'blur' }
202-
],
203-
configKey: [
204-
{ required: true, message: '参数键名不能为空', trigger: 'blur' }
205-
],
206-
configValue: [
207-
{ required: true, message: '参数键值不能为空', trigger: 'blur' }
208-
]
206+
configName: [{ required: true, message: '参数名称不能为空', trigger: 'blur' }],
207+
configKey: [{ required: true, message: '参数键名不能为空', trigger: 'blur' }],
208+
configValue: [{ required: true, message: '参数键值不能为空', trigger: 'blur' }],
209+
isFrontend: [{ required: true, message: '是否前台显示不能为空', trigger: 'blur' }]
209210
}
210211
}
211212
},
@@ -243,6 +244,7 @@ export default {
243244
configKey: undefined,
244245
configValue: undefined,
245246
configType: 'Y',
247+
isFrontend: 1,
246248
remark: undefined
247249
}
248250
this.resetForm('form')
@@ -277,6 +279,7 @@ export default {
277279
const ID = row.id || this.ids
278280
getConfig(ID).then(response => {
279281
this.form = response.data
282+
this.form.isFrontend = String(this.form.isFrontend)
280283
this.open = true
281284
this.title = '修改参数'
282285
this.isEdit = true
@@ -286,6 +289,7 @@ export default {
286289
submitForm: function() {
287290
this.$refs['form'].validate(valid => {
288291
if (valid) {
292+
this.form.isFrontend = parseInt(this.form.isFrontend)
289293
if (this.form.id !== undefined) {
290294
updateConfig(this.form).then(response => {
291295
if (response.code === 200) {

Diff for: ‎src/views/login/index.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<div class="login-weaper animated bounceInDown">
2525
<div class="login-left">
2626
<div class="login-time" v-text="currentTime" />
27-
<img :src="sysInfo.logo" alt="" class="img">
28-
<p class="title" v-text="sysInfo.name" />
27+
<img :src="sysInfo.sys_app_logo" alt="" class="img">
28+
<p class="title" v-text="sysInfo.sys_app_name" />
2929
</div>
3030
<div class="login-border">
3131
<div class="login-main">
@@ -228,7 +228,7 @@ export default {
228228
getSystemSetting() {
229229
this.$store.dispatch('system/settingDetail').then((ret) => {
230230
this.sysInfo = ret
231-
document.title = ret.name
231+
document.title = ret.sys_app_name
232232
})
233233
},
234234
getCurrentTime() {

Diff for: ‎src/views/system/settings.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<!-- <el-button type="primary" @click="fileShowlogo">选择文件</el-button> -->
1616
</el-form-item>
1717

18-
<el-form-item>
18+
<!-- <el-form-item>
1919
<el-button v-permisaction="['system:system:edit']" type="primary" @click="submitForm('ruleForm')">确定</el-button>
20-
</el-form-item>
20+
</el-form-item> -->
2121
</el-form>
2222
<FileChoose ref="fileChoose" :dialog-form-visible="fileOpen" @confirm="getImgList" @close="fileClose" />
2323
</div>

0 commit comments

Comments
 (0)