diff --git a/src/setting.js b/src/setting.js
index f60605c..848549c 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -12,7 +12,7 @@ if (isDev) {
jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统
sandPath = `http://${location.hostname}:9520`
host = 'http://121.37.12.51/'
- host = 'https://huorantech.cn/'
+ // host = 'https://huorantech.cn/'
// host = 'http://192.168.31.217:9000/'// 榕
// host = 'http://192.168.31.51:9000/'// 赓
} else if (isPro) {
diff --git a/src/utils/editor.js b/src/utils/editor.js
index 1e57ef3..71fb9e3 100644
--- a/src/utils/editor.js
+++ b/src/utils/editor.js
@@ -352,8 +352,8 @@ export default {
setup: function(editor) {
editor.on('init', function(ed) {
// 设置默认字体
- ed.target.editorCommands.execCommand("fontName", false, "Microsoft Yahei")
- ed.target.editorCommands.execCommand("fontSize", false, "19px")
+ ed.target.editorCommands.execCommand("fontName", false, "PingFang SC")
+ ed.target.editorCommands.execCommand("fontSize", false, "16px")
ed.target.editorCommands.execCommand("lineHeight", false, "1.5")
const el = top.document.querySelector('#focus-el')
el && el.focus() // 第一个字段聚焦
diff --git a/src/views/data/Introduce.vue b/src/views/data/Introduce.vue
index 66af1d3..24f8581 100644
--- a/src/views/data/Introduce.vue
+++ b/src/views/data/Introduce.vue
@@ -80,6 +80,7 @@
export default {
data () {
return {
+ id: this.$route.query.id || '',
typeList: [],
defaultProps: {
children: 'children',
@@ -122,11 +123,10 @@ export default {
})
}
handleId(res)
- console.log(res)
this.typeList = res
- // 取首个的id和简介
if (!this.edited) {
+ // 取首个的id和简介
if (res[0].children.length) {
let item = res[0].children[0]
this.categoryId = item.id
@@ -146,13 +146,18 @@ export default {
this.$nextTick(() => {
this.$refs.type.setCurrentKey(this.categoryId)
})
+ } else if (this.id) {
+ this.$nextTick(() => {
+ this.defaultActive = [+this.id]
+ this.$refs.type.setCurrentKey(+this.id)
+ })
}
this.getKeyword()
}).catch(res => { })
},
// 分类点击
typeClick (data, node) {
- console.log(data)
+ this.$router.push(`/data?tab=third&id=${data.id}`).catch(e => { })
this.editing = false
this.categoryId = data.id
this.defaultActive = [data.id]
@@ -186,7 +191,7 @@ export default {
this.introduceText = this.introduce
this.editing = false
this.edited = true
- // this.getData()
+ this.getData()
}).catch(res => { })
},
// 删除关键词
diff --git a/src/views/match/add/step2.vue b/src/views/match/add/step2.vue
index fcc433d..25842ee 100644
--- a/src/views/match/add/step2.vue
+++ b/src/views/match/add/step2.vue
@@ -80,8 +80,7 @@
*
团队参赛人数限制:
不限制
+ :label="0">不限制
自定义