添加姓名判断

consulting/js/base.js

@@ -31,12 +31,17 @@ $(function () {
             $('.modalBox').hide();
             $('.modalBox').hide();
             goTopay();
             goTopay();
         } else {
         } else {
+            if (getQueryString('campaign') == '12task1') {
+
+            } else {
                 $("#phone").val('');
                 $("#phone").val('');
                 $("#code").val('');
                 $("#code").val('');
                 $("#name").val('');
                 $("#name").val('');
                 $('.modalBox').show();
                 $('.modalBox').show();
             }
             }
 
 
+        }
+
     })
     })
     $('.closeModal').click(function () {
     $('.closeModal').click(function () {
         $('.modalBox').hide();
         $('.modalBox').hide();
@@ -325,13 +330,12 @@ $(function () {
     function goTopay() {
     function goTopay() {
         if (getQueryString('campaign') && getQueryString('campaign') != 'double12') {
         if (getQueryString('campaign') && getQueryString('campaign') != 'double12') {
             param.verificationCodeValider = true;
             param.verificationCodeValider = true;
-
         } else {
         } else {
             param.phone = $("#phone").val();
             param.phone = $("#phone").val();
             param.name = $("#name").val();
             param.name = $("#name").val();
             if (getQueryString('campaign') == 'double12') {
             if (getQueryString('campaign') == 'double12') {
-                window.sessionStorage.setItem('campaignCode', getQueryString('campaign'))
-                window.sessionStorage.setItem('campaignTaskCode', getQueryString('task'))
+                window.sessionStorage.setItem('campaignCode', getQueryString('campaign'));
+                window.sessionStorage.setItem('campaignTaskCode', getQueryString('task'));
             }
             }
         }
         }
         if (!REG_CODE.test(param.phone)) {
         if (!REG_CODE.test(param.phone)) {

questionnaire/src/app/live/live.component.ts

@@ -269,6 +269,16 @@ export class LiveComponent implements OnInit {
       this.errorModal('请输入短信验证码');
       this.errorModal('请输入短信验证码');
       return;
       return;
     }
     }
+    if (!this.loginData.name) {
+      this.errorModal('姓名不能为空');
+      return;
+    } else {
+      const NAME_REGEXP = /(^[\u4e00-\u9fa5]{1}[\u4e00-\u9fa5\.·()（）。]{0,48}[\u4e00-\u9fa5]{1}$)|(^[a-zA-Z]{1}[a-zA-Z\s]{0,48}[a-zA-Z]{1}$)/;
+      if (!NAME_REGEXP.test(this.loginData.name)) {
+        this.errorModal('请输入正确的姓名');
+        return;
+      }
+    }
     this.commonService.compare({
     this.commonService.compare({
       'mobileNo': this.loginData.mobileNo,
       'mobileNo': this.loginData.mobileNo,
       'verificationCode': this.loginData.code,
       'verificationCode': this.loginData.code,