Commit 16ccdf71 authored by 裴文涛's avatar 裴文涛

解决冲突第三次

parent 25005edd
......@@ -43,7 +43,6 @@
* */
import VerifySlide from './Verify/VerifySlide'
import VerifyPoints from './Verify/VerifyPoints'
import { NULL } from 'node-sass'
export default {
name: 'Vue2Verify',
......@@ -70,15 +69,15 @@ export default {
captchaType: {
type: String,
required: true,
default: NULL
default: null
},
figure: {
type: Number,
default: NULL
default: null
},
arith: {
type: Number,
default: NULL
default: null
},
mode: {
type: String,
......@@ -86,11 +85,11 @@ export default {
},
vSpace: {
type: Number,
default: NULL
default: null
},
explain: {
type: String,
default: NULL
default: null
},
imgSize: {
type: Object,
......@@ -103,11 +102,11 @@ export default {
},
blockSize: {
type: Object,
default: NULL
default: null
},
barSize: {
type: Object,
default: NULL
default: null
}
},
data() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment