Merge branch 'online' of http://git.dayaedu.com/molingzhide/dy-admin-manager into online

dist/static/css/chunk-6f1acfee.39fb3ea8.css → dist/static/css/chunk-558196a1.bb9eaeb3.css

@@ -1 +1 @@
-[data-v-edfb85f0] .description-title{margin-bottom:0}.video[data-v-edfb85f0]{background:#fff;margin-top:10px;width:100%;height:430px}[data-v-ea242d5c] .el-dialog__body{padding:10px 20px}
+[data-v-edfb85f0] .description-title{margin-bottom:0}.video[data-v-edfb85f0]{background:#fff;margin-top:10px;width:100%;height:430px}[data-v-e3e027b6] .el-dialog__body{padding:10px 20px}

src/views/matchManager/index.vue

@@ -218,6 +218,15 @@ import Tooltip from '@/components/Tooltip/index'
 import { studentCompetitionPage, studentCompetitionUpdate } from './api.js'
 import cleanDeep from 'clean-deep'
 import MatchDetail from './matchDetail'
+const validateScore = (rule, value, callBack) => {
+  if (value == '' && typeof value == 'string' || value == null) {
+    callBack(new Error('请输入得分'))
+  } else if (value < 0 || value > 100) {
+    callBack(new Error('输入得分必须在0-100之间'))
+  } else {
+    callBack()
+  }
+}
 export default {
   components: { pagination, Tooltip, MatchDetail },
   data () {
@@ -256,7 +265,7 @@ export default {
         comment: null
       },
       rules: {
-        score: [{required: true, message:'请输入分数', trigger: 'blur'}],
+        score: [{required: true, validator: validateScore, trigger: 'blur'}],
         // prizeLevel: [{required: true, message:'请选择获奖级别', trigger: 'blur'}],
         // show: [{required: true, message:'请选择是否展示', trigger: 'blur'}],
       }