Merge branch 'newVersion' into test

src/components/MainPage.vue

@@ -37,7 +37,7 @@
           </div>
           <span v-if="!canceledSym&&activeNum==0&&cancelNum===-1" class="edit" @click="cancelSymptom">修改</span>
         </div>
-        <div v-for="(item,idx) in symptomQasList" :key="'0'+idx+item.id" v-if="activeTab==1">
+        <div v-for="(item,idx) in symptomQasList" :key="'0'+idx+item.id" v-if="activeTab">
           <Dialog :idx="idx" v-if="item.show" :item="item" @cancel="cancelSelected" :num="activeNum" :cancelNum="cancelNum" :extNum ="[]"/>
         </div>
         <!-- <div v-for="(item,idx) in diagnoseQasList" :key="'1'+idx+item.id" v-if="activeTab==moduleKeys[1]||activeTab==moduleKeys[2]||activeTab==moduleKeys[3]">