Merge branch 'feature/studentsTwo' into release/5.1

@@ -149,7 +149,7 @@ exports.verifyIdentity = (uid, params) => {
         educationDegree: params.educationDegree,
         educationDegree: params.educationDegree,
         enrollmentYear: params.enrollmentYear
         enrollmentYear: params.enrollmentYear
     }) + '&';
     }) + '&';
-
+    
     return studentsApi.verifyIdentity(uid, params.certNo, params.name, pageUrl);
     return studentsApi.verifyIdentity(uid, params.certNo, params.name, pageUrl);
 };
 };
 
 

@@ -71,6 +71,7 @@
         		<span class="hide result-uid">{{uid}}</span>
         		<span class="hide result-uid">{{uid}}</span>
         		<span class="hide result-birthDay">{{birthDay}}</span>
         		<span class="hide result-birthDay">{{birthDay}}</span>
         		<span class="hide result-sex">{{sex}}</span>
         		<span class="hide result-sex">{{sex}}</span>
+                <span class="hide result-provName">{{provName}}</span>
         		<span class="hide result-collegeName">{{collegeName}}</span>
         		<span class="hide result-collegeName">{{collegeName}}</span>
         		<span class="hide result-educationDegree">{{educationDegree}}</span>
         		<span class="hide result-educationDegree">{{educationDegree}}</span>
         		<span class="hide result-enrollmentYear">{{enrollmentYear}}</span>
         		<span class="hide result-enrollmentYear">{{enrollmentYear}}</span>
@@ -80,7 +81,7 @@
 	            <p id="identity-fail-text" class="identity-back-title">{{errorMsg}}</p>
 	            <p id="identity-fail-text" class="identity-back-title">{{errorMsg}}</p>
 	            <p class="identity-back-subtitle">您可以<span class="backForm">重新验证></span></p>
 	            <p class="identity-back-subtitle">您可以<span class="backForm">重新验证></span></p>
 	        {{else}}
 	        {{else}}
-	        	{{#if isStudent}} 
+	        	{{#if isStudent}}
 		            <div id="identity-success" class="identity-back-icon success-icon"></div>
 		            <div id="identity-success" class="identity-back-icon success-icon"></div>
 		            <p class="identity-back-title">恭喜您，您的验证成功啦！</p>
 		            <p class="identity-back-title">恭喜您，您的验证成功啦！</p>
 		            <p class="identity-back-subtitle"><span>{{prompt}}</span></p>
 		            <p class="identity-back-subtitle"><span>{{prompt}}</span></p>
@@ -98,4 +99,4 @@
 		<a target="_blank" href="{{url}}"><img src="{{image adImg 401 360}}"></a>
 		<a target="_blank" href="{{url}}"><img src="{{image adImg 401 360}}"></a>
 		{{/if}}
 		{{/if}}
 	</div>
 	</div>
-</div>
+</div>

@@ -635,13 +635,14 @@ $(function() {
                 // xls-4学生认证成功埋点
                 // xls-4学生认证成功埋点
                 givePoint('YB_STUDENT_ATTCT_RESULT', {
                 givePoint('YB_STUDENT_ATTCT_RESULT', {
                     SRC_ID: 5,
                     SRC_ID: 5,
-                    SUBMIT_RES: 1,
+                    ATTCT_RES: 1,
                     ATTCT_INFO: {
                     ATTCT_INFO: {
-                        birthDay: $('.identity-back-wrap .result-birthDay').html(),
+                        birth: $('.identity-back-wrap .result-birthDay').html(),
                         sex: $('.identity-back-wrap .result-sex').html(),
                         sex: $('.identity-back-wrap .result-sex').html(),
-                        collegeName: $('.identity-back-wrap .result-collegeName').html(),
-                        educationDegree: $('.identity-back-wrap .result-educationDegree').html(),
-                        enrollmentYear: $('.identity-back-wrap .result-enrollmentYear').html()
+                        college_province: $('.identity-back-wrap .result-provName').html(),
+                        college_name: $('.identity-back-wrap .result-collegeName').html(),
+                        education_degree: $('.identity-back-wrap .result-educationDegree').html(),
+                        enrollment_year: $('.identity-back-wrap .result-enrollmentYear').html()
                     }
                     }
                 });
                 });
             }
             }
@@ -650,7 +651,7 @@ $(function() {
                 // xls-4学生认证失败埋点
                 // xls-4学生认证失败埋点
                 givePoint('YB_STUDENT_ATTCT_RESULT', {
                 givePoint('YB_STUDENT_ATTCT_RESULT', {
                     SRC_ID: 5,
                     SRC_ID: 5,
-                    SUBMIT_RES: 2,
+                    ATTCT_RES: 2,
                     FAILURE_CAUSE: $('#identity-fail-text').html()
                     FAILURE_CAUSE: $('#identity-fail-text').html()
                 });
                 });
             }
             }
@@ -824,7 +825,7 @@ $(function() {
     $('#stuRights .stu-rights-item:eq(0), #stuRights .stu-rights-item:eq(1),' +
     $('#stuRights .stu-rights-item:eq(0), #stuRights .stu-rights-item:eq(1),' +
         '#stuRights .stu-rights-item:eq(2), #stuRights .stu-rights-item:eq(3)').hover(function() {
         '#stuRights .stu-rights-item:eq(2), #stuRights .stu-rights-item:eq(3)').hover(function() {
             var content = $(this).find('.item-content');
             var content = $(this).find('.item-content');
-        
+
             var gapHeight;
             var gapHeight;
 
 
             content.removeClass('hide');
             content.removeClass('hide');