fix

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) {

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("fontName", false, "PingFang SC")
-      ed.target.editorCommands.execCommand("fontSize", false, "19px")
+      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() // 第一个字段聚焦

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 => { })
     },
     // 删除关键词

src/views/match/add/step2.vue

@@ -80,8 +80,7 @@
                   <span class="req">*</span>
                   团队参赛人数限制：
                   <el-radio v-model="item.teamNumLimitOpt"
-                            :label="0"
+                            :label="0">不限制</el-radio>
-                            @change="item.teamNumLimit = 0">不限制</el-radio>
                   <el-radio v-model="item.teamNumLimitOpt"
                             :label="1">自定义</el-radio>
                   <el-input v-model.number="item.teamNumLimit"
@@ -454,7 +453,7 @@ export default {
               }
               e.resultAnnouncementTime = +e.resultAnnouncementTime
             }
-            if (e.teamNumLimit) teamNumLimit += e.teamNumLimit // 各阶段自定义的人数之和
+            if (e.teamNumLimitOpt && e.teamNumLimit) teamNumLimit += e.teamNumLimit // 各阶段自定义的人数之和
           }
           if (invalid) return
           if (form.teamLimit && competitionType) {