Merge branch 'develop' of zhengxifeng/zc100 into master

template/pc/common/include/step.htm

@@ -442,7 +442,7 @@
         //咨询费用
         $('#zxfy').click(function(){
             var url = '{eyou:global name='web_attr_26' /}';
-            var html = "<div style='width:100%;text-align: center;'>请使用微信扫一扫二维码<br/><img src='"+url+"'/></div>";
+            var html = "<div style='width:100%;text-align: center;'>请使用微信扫一扫二维码<br/><img style='width: 200px;margin-top: 10px;' src='"+url+"'/></div>";
             //$('#myModal .modal-title').html('提示');
             $('#myModal .modal-body p').html(html);
             $('#myModal').modal('show');
@@ -460,8 +460,9 @@
         //点击获取二维码
         $('#getCode').click(function(){
             var url = '{eyou:global name='web_attr_26' /}';
-            var html = "<div style='width:100%;text-align: center;'>请使用微信扫一扫二维码<br/><img src='"+url+"'/></div>";
+            var html = "<div style='width:100%;text-align: center;'>请使用微信扫一扫二维码<br/><img style='width: 200px;margin-top: 10px;' src='"+url+"'/></div>";
             //$('#myModal .modal-title').html('提示');
+            //$('#myModal .modal-body p').addClass('');
             $('#myModal .modal-body p').html(html);
             $('#myModal').modal('show');
         });

template/pc/components/index/step.htm

@@ -461,7 +461,9 @@
                                     <span>职称申报&nbsp;一键测评</span>
                                 </div>
                                 <div class="form-top-left">
-                                    <h3>第五步</h3>
+                                    {eyou:if condition='($is_detail > 0)'}
+                                        <h3>第五步</h3>
+                                    {/eyou:if}
                                     <!--<p>请填写您用于接收匹配结果的手机号码:</p>-->
 
                                     <?php

template/pc/js/botstrap-step/style.css

@@ -1037,7 +1037,9 @@ only screen and (                min-resolution: 2dppx) {
     .m-btn i{
         line-height: 45px;
     }
-
+    .form-top-left h3{
+        font-weight: bold;
+    }
 }
 
 /** pc端改写的css
@@ -1716,6 +1718,9 @@ only screen and (                min-resolution: 2dppx) {
     .td-b img{
         width: 12px;
     }
+    .form-top-left h3{
+        font-weight: bold;
+    }
 }