Merge branch 'hotfix/pc' into dev

Application/Media/View/default/Public/base.html

@@ -228,9 +228,10 @@
   </div>
 </div>
 <!--浮动层-->
-<!--<div class="float_contact_position ">
+<div class="float_contact_position ">
   <div class="float_contact ">
-    <div class="float-bg "></div>
+      <img src="/Public/Media/images/index_about/qrcode.png" width="270">
+    <!-- <div class="float-bg "></div>
     <ul>
       <li class="show kf ">
         <a href="tencent://message/?uin={:C('PC_SET_SERVER_QQ')}&amp;menu=yes"></a>
@@ -250,9 +251,9 @@
       <li>
         <a href="javascript:void(0); " class="top "></a>
       </li>
-    </ul>
+    </ul> -->
   </div>
-</div>-->
+</div>
 
 <block name="giftextend"></block>
 <script>