Merge remote-tracking branch 'origin/branch20211008'

src/views/signUp/SignUpPage.vue

@@ -96,6 +96,7 @@
                                     :is-limit="true"
                                     :maxLength='50'>
                     </company-select>
+                    <span class="color-red">若没有您要选择的企业,请您添加企业信息(发票抬头)</span>
                   </a-form-item>
                 </a-col>
               </a-row>
@@ -525,10 +526,10 @@ export default {
       if(e.target.value !== 2 && this.currentMeetingInfo.meetingType !== '3' ){
         this.meetingCostSum = '0.00'
       }else {
-        // 会议是标协会议的话 需要判断企业是否是标准协会
+        // 会议是标协会议的话 需要判断企业是否是标协会员的企业
         if(this.currentMeetingInfo.meetingType === '2' && this.isStandardBool){
           this.meetingCostSum = this.currentMeetingInfo.meetingCostsVip
-        }else {
+        }else if(this.currentMeetingInfo.meetingType === '2'){
           this.meetingCostSum =   this.currentMeetingInfo.meetingCosts
         }
 
@@ -763,7 +764,9 @@ export default {
     }
   }
 }
-
+.color-red {
+  color: red;
+}
 .qr-code {
   width: 140px;
   height: 140px;