Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote

Application/Home/View/default/Finance/settlementOrder.html

@@ -124,7 +124,7 @@
                 <else/>
                 {$withdraw.sum_money}
               </if>
-              <span style="color: red;">(实际提现金额=提现金额+奖惩金额)</span>
+              <span style="color: red;">(实际提现金额=收益金额+奖惩金额)</span>
             </span>
           </div>
         </div>

Application/Media/View/default/Game/game_detail.html

@@ -8,8 +8,8 @@
 <link href="__CSS__/viewer.min.css" rel="stylesheet" />
 <script type="text/javascript" src="__JS__/viewer.min.js"></script>
 <script type="text/javascript" src="__JS__/game.js"></script>
-  <div class="">
+  <div class="" style="background: url(__IMG__/inner_banner1.jpg) no-repeat 100%/cover;height: 3rem;">
-    <img src="__IMG__/inner_banner1.jpg">
+    <!-- <img src="__IMG__/inner_banner1.jpg"> -->
   </div>
   <div class="official">
   <div class="inner clearfix">

Public/Media/css/base1.css

@@ -1,6 +1,6 @@
 @charset "utf-8";
 html{font-family:"Microsoft YaHei","Helvetica Neue",Helvetica,sans-serif,Arial,"tahoma";}
-body{background:#fff; font:12px/22px "Microsoft YaHei"; min-width:1200px;}
+/* body{background:#fff; font:12px/22px "Microsoft YaHei"; min-width:1200px;} */
 body,div,ul,ol,li,dl,dt,dd,h1,h2,h3,h4,h5,h6,p,img,select,input{padding:0; margin:0; list-style:none; vertical-align:middle;}
 input,textarea:focus{outline:none;}
 input::-webkit-input-placeholder,input:-ms-input-placeholder,input::-moz-placeholder{color:#999;}