Merge branch 'feature/newRadio' into test

components/Questionnaire/QuestionComponents/QuesRadio.vue

 <template>
 <template>
-  <van-field :class="`ques-radio ques-radio--${theme}`" :rules="rulesConstruct('radio', formItem.rule, formItem.type)">
+  <van-field v-model="formItem.answer" :class="`ques-radio ques-radio--${theme}`" :rules="rulesConstruct('radio', formItem.rule, formItem.type)">
     <template v-if="formItem.rule.style === 1" #input>
     <template v-if="formItem.rule.style === 1" #input>
       <div class="select" @click="showPicker = true">
       <div class="select" @click="showPicker = true">
         <div style="width: 16px; height: 16px"></div>
         <div style="width: 16px; height: 16px"></div>

components/Questionnaire/QuestionForm.vue

@@ -201,7 +201,6 @@ export default {
     	} else {
     	} else {
         	this.oldIsReaded = index;
         	this.oldIsReaded = index;
 	    }
 	    }
-      console.log(this.isReaded,this.oldIsReaded);
     }
     }
   },
   },
 }
 }

utils/rulesConstruct.js

@@ -3,7 +3,7 @@ export default function(type, rules, specialSign) {
   if(type === 'checkbox'){
   if(type === 'checkbox'){
     if (rules.limit.workOption.length !== 0) {
     if (rules.limit.workOption.length !== 0) {
       if (rules.limit.workOption.length === 2) {
       if (rules.limit.workOption.length === 2) {
-        return [{ 
+        return [{
           required: Boolean(rules.required),
           required: Boolean(rules.required),
           validator: value => {
           validator: value => {
             // console.log(value, value.length, `${rules.limit.min}-${rules.limit.max}`);
             // console.log(value, value.length, `${rules.limit.min}-${rules.limit.max}`);
@@ -16,7 +16,7 @@ export default function(type, rules, specialSign) {
           message: `请选择${rules.limit.min}-${rules.limit.max}项`
           message: `请选择${rules.limit.min}-${rules.limit.max}项`
         }];
         }];
       } else if (rules.limit.workOption.includes('min')) {
       } else if (rules.limit.workOption.includes('min')) {
-        return [{ 
+        return [{
           required: Boolean(rules.required),
           required: Boolean(rules.required),
           validator: value => {
           validator: value => {
             // console.log(value, value.length, `n<${rules.limit.min}`);
             // console.log(value, value.length, `n<${rules.limit.min}`);
@@ -29,7 +29,7 @@ export default function(type, rules, specialSign) {
           message: `至少选择${rules.limit.min}项`
           message: `至少选择${rules.limit.min}项`
         }];
         }];
       } else if (rules.limit.workOption.includes('max')) {
       } else if (rules.limit.workOption.includes('max')) {
-        return [{ 
+        return [{
           required: Boolean(rules.required),
           required: Boolean(rules.required),
           validator: value => {
           validator: value => {
             // console.log(value, value.length, `n>${rules.limit.max}`);
             // console.log(value, value.length, `n>${rules.limit.max}`);
@@ -47,7 +47,13 @@ export default function(type, rules, specialSign) {
     }
     }
   }
   }
   if(type === 'radio'){
   if(type === 'radio'){
-    return [{ required: Boolean(rules.required), message: "请选择一项" }];
+    return [{
+      required: Boolean(rules.required),
+      validator: value => {
+        return value !== 0
+      },
+      message: "请选择一项",
+    }];
   }
   }
   if(specialSign){
   if(specialSign){
     if(specialSign === 'phone') {
     if(specialSign === 'phone') {