Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

 Conflicts:

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

Application/Admin/Controller/PromoteCoinController.class.php

@@ -110,9 +110,6 @@ class PromoteCoinController extends ThinkController
 
     public function deduct()
     {
-        if (empty(I('user_id'))) {
-            $this->error('请输入正确的玩家账号');
-        }
         $this->m_title = '平台币收回';
         $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'PromoteCoin/deduct_lists', 'status' => 1])->find());
         $this->add(2, 'deduct_lists', $_REQUEST['typee'] ? $_REQUEST['typee'] : 1);
@@ -137,6 +134,9 @@ class PromoteCoinController extends ThinkController
             }
             //平台币修改
             if ($tt == 1) {
+                if (empty(I('user_id'))) {
+                    $this->error('请输入正确的玩家账号');
+                }
                 $res = D('User')->edit_user_balance_coin(I('user_id'), abs(I('num')));
             } else {
                 $promoteService = new PromoteService();

Application/Home/Controller/FinanceController.class.php

@@ -420,6 +420,9 @@ class FinanceController extends BaseController
                 $list['create_time'] = date('Y-m-d H:i:s', $list['create_time']);
                 $list['settlement_end_time'] = date('Y-m-d H:i:s', $list['settlement_end_time']);
                 $list['status_name'] = FinanceController::$withdrawStatus[$list['status']];
+                if ($list['status'] == -1) {
+                    $list['status_name'] = '<span style="color: red;">' . $list['status_name'] . '</span>';
+                }
             }
         }
 

Application/Home/Controller/SafeController.class.php

@@ -321,8 +321,11 @@ class SafeController extends BaseController{
     public function safeDocument() {
         $time = time();
         $endTime = date('Y-m-d',strtotime('+1 year'));
+        $loginPromote = $this->getLoginPromote();
+        $sn = date('Ymd' . $loginPromote['create_time']) . '-' . strtoupper(substr(md5($loginPromote['id']), 8, 16));
         $this->assign('time',date('Y-m-d',$time));
         $this->assign('endTime',$endTime);
+        $this->assign('sn',$sn);
         $this->display();
     }
 }

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

@@ -204,6 +204,8 @@
 
   <script type="text/javascript">
       $().ready(function () {
+          setValue('row', '{:I("get.row",10)}');
+
           $("#pagehtml a").on("click", function (event) {
               event.preventDefault();//使a自带的方法失效，即无法调整到href中的URL(http://www.baidu.com)
               var geturl = $(this).attr('href');

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

@@ -211,6 +211,8 @@
 
   <script type="text/javascript">
       $().ready(function () {
+          setValue('row', '{:I("get.row",10)}');
+
           $('.back-btn').on('click', function () {
               location.href = "{:U('withdrawRecord')}";
           });

Application/Home/View/default/Query/arpu.html

@@ -308,6 +308,27 @@ var gameId = $('#game-select').val();
     }
 var promoteUrl = "{:U('Query/getSubPromotes')}"
   initPromoteSelect(promoteUrl)
+
+  $('.keywords_information .keywords_mark').click(function() {
+    var that = $(this).siblings().addClass('active');
+    console.log(that);
+    $(document).click(function(event) {
+      var e = event || window.event;
+      var target= $(e.target);
+      if (!target.hasClass('keywords_information') && target.closest('.keywords_information').length<1) {
+        that.removeClass('active');
+      }
+
+    });
+
+    that.find('.keywords_close').click(function() {
+      that.removeClass('active');
+
+      return false;
+    });
+
+    return false;
+  });
 </script>
 
 </block>

Application/Home/View/default/Safe/safeDocument.html

@@ -50,7 +50,7 @@ and open the template in the editor.
              <div class="title"><h2>游戏推广服务框架协议</h1></div>
              <div class="text">
                  <p>本协议由以下双方于<span>{$time}</span>签订:</p>
-                 <p>合同编号：WM-SY-XYN20190001</p>
+                 <p>合同编号：{$sn}</p>
                  <p style="font-weight: bold">甲方：海南万盟天下科技有限公司</p>
                  <p>注册地址：海南省海口市南海大道26号海口国家高新区创业孵化中心A楼5层A1-1268室</p>
                  <p>联系电话：13067391751</p>