合并冲突

questionnair/src/app/page3/page3.component.html

@@ -16,8 +16,8 @@
     <div class="icon">+</div>
     <div class="icon">+</div>
     <div data-toggle="modal">增加孩子年龄</div>
     <div data-toggle="modal">增加孩子年龄</div>
   </div> -->
   </div> -->
-  <div class="toastWrapper toast" *ngIf="isShow"  (click)="closeToast()">
-    
+  <div class="toastWrapper toast" *ngIf="isShow" (click)="closeToast()">
+
   </div>
   </div>
 </div>
 </div>
 <div class="toastContent" *ngIf="isShow">
 <div class="toastContent" *ngIf="isShow">
@@ -27,7 +27,7 @@
       *ngFor="let options of curQues.options"
       *ngFor="let options of curQues.options"
       (click)="
       (click)="
         closeToast();
         closeToast();
-        getAnswer(options);
+        getAnswer(curQues['questionId'],options);
         changeStyle(options, options.optionId)
         changeStyle(options, options.optionId)
       "
       "
     >
     >