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

Conflicts: Application/Admin/Controller/ExportController.class.php
5 years ago · 9abca632ae
parent fd15fde141 757526ea05
commit 9abca632ae
15 changed files with 184 additions and 127 deletions
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@ -49,10 +49,9 @@ class ExportController extends Controller
    //导出Excel
    function expUser($id)
    {
-                $xlsName = $_REQUEST['xlsname'];
+        $xlsName = $_REQUEST['xlsname'];
        switch ($id) {
            case 1:
-
                $xlsCell = array(
                    array('user_account', "玩家账号"),
                    array('game_name', "游戏名称"),
@ -861,10 +860,11 @@ class ExportController extends Controller
                    $map['spend_ip'] = array('like', '%' . trim($_REQUEST['spend_ip']) . '%');
                    unset($_REQUEST['spend_ip']);
                }
-                if (isset($_REQUEST['time-start']) && isset($_REQUEST['time-end'])) {
-                    $map['pay_time'] = array('BETWEEN', array(strtotime($_REQUEST['time-start']), strtotime($_REQUEST['time-end']) + 24 * 60 * 60 - 1));
-                    unset($_REQUEST['time-start']);
-                    unset($_REQUEST['time-end']);
+
+                if (isset($_REQUEST['timestart']) && isset($_REQUEST['timeend'])) {
+                    $map['pay_time'] = array('BETWEEN', array(strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 24 * 60 * 60 - 1));
+                    unset($_REQUEST['timestart']);
+                    unset($_REQUEST['timeend']);
                }
                if (isset($_REQUEST['start']) && isset($_REQUEST['end'])) {
                    $map['pay_time'] = array('BETWEEN', array(strtotime($_REQUEST['start']), strtotime($_REQUEST['end']) + 24 * 60 * 60 - 1));
@ -3419,9 +3419,9 @@ if ($key == 'model'){
 		 * 登录记录
 		 * @author 鹿文学
 		 */
-		public function login_record() {
+    public function login_record() {

-			$xlsName = $_REQUEST['xlsname'];
+        $xlsName = $_REQUEST['xlsname'];

 //			$xlsCell = array(
 //				array('user_account','玩家账号'),
@ -3432,114 +3432,114 @@ if ($key == 'model'){
 //				array('login_ip','最后登录ip'),
 //			);

-            $xlsCell = array(
-                '玩家账号',
-                '游戏名称',
-                '游戏区服',
-                '角色名',
-                '登录时间',
-                '最后登录ip',
-            );
+        $xlsCell = array(
+            '玩家账号',
+            '游戏名称',
+            '游戏区服',
+            '角色名',
+            '登录时间',
+            '最后登录ip',
+        );



-			if (isset($_REQUEST['login_ip'])) {
-					$map['login_ip'] = $_REQUEST['login_ip'];
-			}
-			if (isset($_REQUEST['game_id'])) {
-					$map['game_id'] = $_REQUEST['game_id'];
-            }
-            if (isset($_REQUEST['game_name'])) {
-                $map['game_name'] = ['like', $_REQUEST['game_name']."%"];
-                unset($_REQUEST['game_name']);
-            }
-            if (isset($_REQUEST['game_type'])) {
-                $map['sdk_version'] = $_REQUEST['game_type'];
-                unset($_REQUEST['game_type']);
-            }
-            if (isset($_REQUEST['server_name'])) {
-                $map['server_name'] = $_REQUEST['server_name'];
-                unset($_REQUEST['server_name']);
-            }
-			if (isset($_REQUEST['timestart']) && isset($_REQUEST['timeend'])) {
-					$map['login_time'] = array('BETWEEN', array(strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 24 * 60 * 60 - 1));
-			}elseif(isset($_REQUEST['timestart'])){
-					$map['login_time'] = array('GT',strtotime($_REQUEST['timestart']));
-			}elseif(isset($_REQUEST['timeend'])){
-					$map['login_time'] = array('lt',(strtotime($_REQUEST['timeend'])+ 24 * 60 * 60 - 1));
-			}
-			if (isset($_REQUEST['account'])) {
-					$map['user_account'] = array('like', '%' . trim($_REQUEST['account']) . '%');
-            }
-            
+        if (isset($_REQUEST['login_ip'])) {
+            $map['login_ip'] = $_REQUEST['login_ip'];
+        }
+        if (isset($_REQUEST['game_id'])) {
+            $map['game_id'] = $_REQUEST['game_id'];
+        }
+        if (isset($_REQUEST['game_name'])) {
+            $map['game_name'] = ['like', $_REQUEST['game_name']."%"];
+            unset($_REQUEST['game_name']);
+        }
+        if (isset($_REQUEST['game_type'])) {
+            $map['sdk_version'] = $_REQUEST['game_type'];
+            unset($_REQUEST['game_type']);
+        }
+        if (isset($_REQUEST['server_name'])) {
+            $map['server_name'] = $_REQUEST['server_name'];
+            unset($_REQUEST['server_name']);
+        }
+        if (isset($_REQUEST['timestart']) && isset($_REQUEST['timeend'])) {
+            $map['login_time'] = array('BETWEEN', array(strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 24 * 60 * 60 - 1));
+        }elseif(isset($_REQUEST['timestart'])){
+            $map['login_time'] = array('GT',strtotime($_REQUEST['timestart']));
+        }elseif(isset($_REQUEST['timeend'])){
+            $map['login_time'] = array('lt',(strtotime($_REQUEST['timeend'])+ 24 * 60 * 60 - 1));
+        }
+        if (isset($_REQUEST['account'])) {
+            $map['user_account'] = array('like', '%' . trim($_REQUEST['account']) . '%');
+        }
+
 //            $map['login_time'] = array('neq', 0);

-			$page = intval($_REQUEST['p']);
+        $page = intval($_REQUEST['p']);

-			$page = $page?$page:1;
+        $page = $page?$page:1;

-			$row = $_REQUEST['row']?$_REQUEST['row']:10;
+        $row = $_REQUEST['row']?$_REQUEST['row']:10;


-            //查询数量
-            $accessNum = M('UserLoginRecord','tab_')
-                ->where($map)->order('id desc')->count();
+        //查询数量
+        $accessNum = M('UserLoginRecord','tab_')
+            ->where($map)->order('id desc')->count();

-            if ($accessNum > 1000000) {
-                echo "数据量过大，大于100万";die();
-            }
+        if ($accessNum > 1000000) {
+            echo "数据量过大，大于100万";die();
+        }

-            $csvFileName = $xlsName.'.csv';
-            //设置好告诉浏览器要下载excel文件的headers
-            header('Content-Description: File Transfer');
-            header('Content-Type: application/vnd.ms-excel');
-            header('Content-Disposition: attachment; filename="'. $csvFileName .'"');
-            header('Expires: 0');
-            header('Cache-Control: must-revalidate');
-            header('Pragma: public');
-            $fp = fopen('php://output', 'a');//打开output流
-            mb_convert_variables('GBK', 'UTF-8', $xlsCell);
-            fputcsv($fp, $xlsCell);//将数据格式化为CSV格式并写入到output流中
-
-            $perSize = 50000;//每次查询的条数
-            $pages   = ceil($accessNum / $perSize);
-            for($i = 1; $i <= $pages; $i++) {
-
-                $data = M('UserLoginRecord','tab_')
-                    ->field("user_account,game_name,server_name,user_nickname,login_time,login_ip")
-                    ->where($map)
-                    ->limit(($i-1)*$perSize  ,$perSize)
-                    ->order('id desc')
-                    ->select();
+        $csvFileName = $xlsName.'.csv';
+        //设置好告诉浏览器要下载excel文件的headers
+        header('Content-Description: File Transfer');
+        header('Content-Type: application/vnd.ms-excel');
+        header('Content-Disposition: attachment; filename="'. $csvFileName .'"');
+        header('Expires: 0');
+        header('Cache-Control: must-revalidate');
+        header('Pragma: public');
+        $fp = fopen('php://output', 'a');//打开output流
+        mb_convert_variables('GBK', 'UTF-8', $xlsCell);
+        fputcsv($fp, $xlsCell);//将数据格式化为CSV格式并写入到output流中
+
+        $perSize = 50000;//每次查询的条数
+        $pages   = ceil($accessNum / $perSize);
+        for($i = 1; $i <= $pages; $i++) {

-                foreach($data as $k => $v) {
+            $data = M('UserLoginRecord','tab_')
+                ->field("user_account,game_name,server_name,user_nickname,login_time,login_ip")
+                ->where($map)
+                ->limit(($i-1)*$perSize  ,$perSize)
+                ->order('id desc')
+                ->select();

-                    $v['login_time'] = date('Y-m-d H:i:s',$v['login_time']);
-                    $v['server_name'] = empty($v['server_name'])?'空':$v['server_name'];
+            foreach($data as $k => $v) {
+
+                $v['login_time'] = date('Y-m-d H:i:s',$v['login_time']);
+                $v['server_name'] = empty($v['server_name'])?'空':$v['server_name'];

 //                    $gamename=trim(get_game_name($v['game_id'],'id'));

 //                    $v['game_name'] = empty($gamename)?($v['type']==2?'APP登录':'平台登录'):$gamename;

-                    $xlsData[] = $v;
-
-                    mb_convert_variables('GBK', 'UTF-8', $v);
-                    fputcsv($fp, $v);
-                }
+                $xlsData[] = $v;

-                unset($xlsData);//释放变量的内存
-                //刷新输出缓冲到浏览器
-                ob_flush();
-                flush();//必须同时使用 ob_flush() 和flush() 函数来刷新输出缓冲。
+                mb_convert_variables('GBK', 'UTF-8', $v);
+                fputcsv($fp, $v);
            }
+
+            unset($xlsData);//释放变量的内存
+            //刷新输出缓冲到浏览器
+            ob_flush();
+            flush();//必须同时使用 ob_flush() 和flush() 函数来刷新输出缓冲。
+        }
 //			$xlsData = [];

-            exit();
+        exit();


 //			$this->exportExcel($xlsName, $xlsCell, $xlsData);

-		}
+    }


 		/**
--- a/Application/Admin/Controller/MendController.class.php
+++ b/Application/Admin/Controller/MendController.class.php
@ -81,6 +81,8 @@ class MendController extends ThinkController {
                "order_time"=>$create['order_time'],
                "type"=>2,
                "shift_ids"=>[$create['user_id']],
+                "creator_type"=>0,
+                "creator_id"=>$_SESSION["onethink_admin"]["user_auth"]["uid"]
            );
            if(!empty($create['remark'])){
                $params['remark'] = $create['remark'];
@ -111,13 +113,16 @@ class MendController extends ThinkController {
    {
        $id  = I('id');
        $info = M("shift_task")->where("id = {$id} and status = 0")->find();
+        
        if(empty($info)){
            $this->error("补链不存在或已处理");
        }
        

        $info['user_id'] = json_decode($info['shift_ids'])[0]; 
-        $info['order_time'] = date("Y-m-d",$info['order_time']); 
+        $info['order_time'] = date("Y-m-d",$info['order_time']);
+        $userid = $info['user_id'];
+        $info['account'] = M("User","tab_")->field("account")->where("id = '{$userid}'")->find()['account'];
        $this->assign('data',$info);
        $this->display();
    }
--- a/Application/Admin/View/Mend/lists.html
+++ b/Application/Admin/View/Mend/lists.html
@ -107,6 +107,7 @@
                        <th>补链前渠道</th>
                        <th>补链后渠道</th>
                        <th style="width: 450px;">备注</th>
+                        <th>切分时间</th>
                        <th>补链时间</th>
                        <th>操作人员</th>
                    </tr>
@ -126,6 +127,7 @@
                            <td class="js-pop" >
                                <a href="javascript:" title="点击查看" class="remarkView" info="{$data['remark']}">{:get_title($data['remark'])}</a>
                            </td>
+                            <td>{$data.order_time|date='Y-m-d H:i:s',###}</td>
                            <td>{$data.create_time|date='Y-m-d H:i:s',###}</td>
                            <td>{$data.op_account}</td>
                        </tr>
--- a/Application/Admin/View/Mend/shiftInfo.html
+++ b/Application/Admin/View/Mend/shiftInfo.html
@ -57,7 +57,7 @@
            <tr>
                <td class="l noticeinfo">用户账号</td>
                <td class="r table_radio">
-                    <input name="account" value="{:get_promote_name($data['promote_id'])}" disabled readonly type="text" class="">
+                    <input name="account" value="{$data['account']}" disabled readonly type="text" class="">
                </td>
            </tr>
            <tr>
@ -82,13 +82,13 @@
                </td>
            </tr>

-            <tr>
+            <!-- <tr>
                <td class="l noticeinfo">换绑类型</td>
                <td class="r table_radio">
                    <input name="bind_type" value="1" type="radio">In
                    <input name="bind_type" value="2" type="radio">Out
                </td>
-            </tr>
+            </tr> -->

            <tr>
                <td class="l noticeinfo">备注</td>
--- a/Application/Admin/View/Spend/lists.html
+++ b/Application/Admin/View/Spend/lists.html
@ -230,13 +230,16 @@


                    <td>汇总</td>
-                    <td colspan="99">
+                    <td colspan="6">
                        当页充值：{:null_to_0(array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount')))}
                        今日充值：{$ttotal}
                        昨日充值：{$ytotal}
                        累计充值：{$total}（此处只汇总充值成功的订单）
                    </td>
-                    <td></td>
+                    <td colspan="99" style="color: #a9a9a9;">
+                        今日充值：今日平台所有推广员的累计充值（包括官方渠道）/
+                        昨日充值：昨日平台所有推广员的累计充值（包括官方渠道）
+                    </td>
                </tr>
                </tbody>
            </table>
--- a/Application/Base/Service/PromoteService.class.php
+++ b/Application/Base/Service/PromoteService.class.php
@ -92,7 +92,9 @@ class PromoteService {
        $balanceCoinMode = isset($params['balance_coin_mode']) ? $params['balance_coin_mode'] : 0;
        $type = isset($params['type']) ? $params['type'] : 0;
        $shiftIds = isset($params['shift_ids']) && $params['shift_ids'] ? $params['shift_ids'] : [];
-        $createPromoteId = empty(session('promote_auth.pid')) ? 0 : session('promote_auth.pid');
+        $creatorId = isset($params['creator_id']) ? $params['creator_id'] : 0;
+        $creatorType = isset($params['creator_type']) ? $params['creator_type'] : 0;
+        $remark = isset($params['remark']) ? $params['remark'] : '';

        if ($fromPromoteId == $toPromoteId) {
            return [
@ -140,9 +142,11 @@ class PromoteService {
            'order_time' => strtotime($orderTime),
            'balance_coin_mode' => $balanceCoinMode,
            'create_time' => time(),
-            'create_promote_id' => $createPromoteId,
+            'creator_id' => $creatorId,
+            'creator_type' => $creatorType,
            'status' => 0,
            'type' => $type,
+            'remark' => $remark,
            'shift_ids' => json_encode($shiftIds)
        ];

@ -299,9 +303,19 @@ class PromoteService {
    {
        $toPromoteId = $task['to_promote_id'];
        $fromPromoteId = $task['from_promote_id'];
+        $orderTime = $task['order_time'];
        $shiftIds = json_decode($task['shift_ids'], true) ?? [];
+        $remark = $task['remark'] ?? '';

-        $createPromote = M('promote', 'tab_')->where(['create_promote_id' => $task['create_promote_id']])->find();
+        $creator = null;
+        $opAccount = '';
+        if ($task['creator_type'] == 1) {
+            $creator = M('promote', 'tab_')->where(['id' => $task['creator_id']])->find();
+            $opAccount = $creator ? $creator['account'] : '';
+        } else {
+            $creator = M('ucenter_member', 'sys_')->where(['id' => $task['creator_id']])->find();
+            $opAccount = $creator ? $creator['username'] : '';
+        }

        $toPromote = M('promote', 'tab_')->where(['id' => $toPromoteId])->find();
        $fromPromote = M('promote', 'tab_')->where(['id' => $fromPromoteId])->find();
@ -332,11 +346,12 @@ class PromoteService {
                'promote_account' => $fromPromote['account'],
                'promote_id_to' => $toPromote['id'],
                'promote_account_to' => $toPromote['account'],
-                'remark' => '玩家迁移',
+                'remark' => $remark == '' ? ($task['creator_type'] == 0 ? '后台补链' : '玩家迁移') : $remark,
+                'order_time' => $orderTime,
                'create_time' => time(),
-                'op_id' => $createPromote ? $createPromote['id'] : 0,
-                'op_account' => $createPromote ? $createPromote['account'] : '',
-                'op_type' => 1,
+                'op_id' => $creator ? $creator['id'] : 0,
+                'op_account' => $opAccount,
+                'op_type' => $task['creator_type'],
                'bind_type' => 1,
            ];
        }
@ -370,9 +385,15 @@ class PromoteService {
        M('user_play', 'tab_')->where($otherMap)->save($updateData);
        M('user_play_info', 'tab_')->where($otherMap)->save($updateData);
        
-        M('spend', 'tab_')->where($otherMap)->where(['is_check' => ['in','1,2']])->save($updateData); // 只改未对账的数据
-        M('deposit', 'tab_')->where($otherMap)->save($updateData);
-        M('bind_spend', 'tab_')->where($otherMap)->save($updateData);
+        $orderMap1 = $otherMap;
+        $orderMap1['pay_time'] = ['egt', $orderTime];
+        M('spend', 'tab_')->where($orderMap1)->where(['is_check' => ['in','1,2']])->save($updateData); // 只改未对账的数据
+        M('bind_spend', 'tab_')->where($orderMap1)->save($updateData);
+
+        $orderMap2 = $otherMap;
+        $orderMap2['create_time'] = ['egt', $orderTime];
+        M('deposit', 'tab_')->where($orderMap2)->save($updateData);
+        M('user_play_data_count', 'tab_')->where($orderMap2)->save(['promote_id' => $toPromote['id']]);

        $status = M('shift_task', 'sys_')->where('id=' . $task['id'])->save(['status' => 1, 'handle_time' => time()]);
        if (!$status) {
--- a/Application/Home/Controller/PromoteController.class.php
+++ b/Application/Home/Controller/PromoteController.class.php
@ -1935,8 +1935,12 @@ class PromoteController extends BaseController

    public function shift()
    {
+        $loginPromote = $this->getLoginPromote();
+        $params = $_POST;
+        $params['creator_id'] = $loginPromote['id'];
+        $params['creator_type'] = 1;
        $promoteService = new PromoteService();
-        $result = $promoteService->addShiftTask($_POST);
+        $result = $promoteService->addShiftTask($params);
        $this->ajaxReturn($result);
    }

--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@ -1719,7 +1719,7 @@ class QueryController extends BaseController
        $sortName = trim(I('sort_name', ''));
        $sort = intval(I('sort', 1));
        $sortNameData = ['recharge_cost', 'recharge_count', 'recharge_cost_today', 'unlogin_day'];
-        $nowTime = date('Y-m-d');
+        $nowTime = date('Y-m-d', time() - 3600 * 24);
        $initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
        $initBegTime = empty(I('begtime')) ? $initBegTime : I('begtime');
        $initEndTime = $nowTime;
@ -1727,7 +1727,7 @@ class QueryController extends BaseController
        $begTime = strtotime($initBegTime);
        $endTime = strtotime($initEndTime);
        $endTime += 3600 * 24;
-        $nowTime = strtotime(date('Y-m-d 00:00:00', time()));
+        $nowTime = strtotime($nowTime);

        $promote = $this->getLoginPromote();
        $levelPromote = $this->getLevelPromote();
@ -1842,6 +1842,7 @@ class QueryController extends BaseController
        $this->assign('initBegTime', $initBegTime);
        $this->assign('initEndTime', $initEndTime);
        $this->assign('sort', $sort);
+        $this->assign('setdate', date('Y-m-d', $nowTime));
        $this->display('userRecharges');
    }

--- a/Application/Home/View/default/Query/userRecharges.html
+++ b/Application/Home/View/default/Query/userRecharges.html
@ -31,6 +31,7 @@
      </div>
      <img src="__IMG__/20180207/icon_normal_game.png">
      <span class="title_main">玩家充值</span>
+      <span class="details">说明：充值数据不包含当日</span>
    </div>
    <div class="trunk-content article">
        <div class="trunk-search clearfix jssearch">
@ -122,7 +123,7 @@
                    <i class="iconfont iconsort"></i>
                  </if>
                </th>
-                <th class="sort" sort-name="recharge_cost_today">今日充值
+                <th class="sort" sort-name="recharge_cost_today">昨日充值
                  <if condition="'recharge_cost_today' == I('sort_name', '')">
                    <if condition="1 == $sort">
                      <i class="iconfont iconsort-down"></i>
@ -200,6 +201,7 @@ $(function(){
    $(".select_gallery").select2();

    var date = "{$setdate}";
+    console.log(date);
    $('#sdate').datetimepicker({
        format: 'yyyy-mm-dd',
        language: "zh-CN",
--- a/Application/Media/Controller/RechargeController.class.php
+++ b/Application/Media/Controller/RechargeController.class.php
@ -98,15 +98,15 @@ class RechargeController extends BaseController
            case 'alipay':
                //判断是否开启支付宝充值
                if (pay_set_status('alipay') == 0) {
-                    $this->error("网站未启用支付宝充值", '', 1);
-                    exit();
+//                    $this->error("网站未启用支付宝充值", '', 1);
+//                    exit();
                }
                echo $pay->buildRequestForm($vo);
                break;
            case 'weixin':
                if (pay_set_status('wei_xin') == 0 && pay_set_status('weixin') == 0&&pay_set_status('weixin_gf')==0 ) {
-                    $this->error("网站未启用微信充值", '', 1);
-                    exit();
+//                    $this->error("网站未启用微信充值", '', 1);
+//                    exit();
                }
                if (get_wx_type() == 0) {//微信官方
                    $data['pay_order_number'] = $data['order_no'];
--- a/Application/Media/View/default/Index/business.html
+++ b/Application/Media/View/default/Index/business.html
@ -32,7 +32,7 @@
            </div>
            <div class="have_product">
                <ul >
-                    <volist name="recommend" id="rec" offset="0" length="1">
+                    <volist name="recommend" id="rec">
                    <li>
                        <img src="{:get_cover($rec['cover'],'path')}" onerror="this.src='__IMG__/empty.jpg';this.onerror=null"/>
                        <div class="have_product_box">
@ -42,6 +42,7 @@
                        </div>
                    </li>
                    </volist>
+
                </ul>
            </div>
        </div>
--- a/Application/Media/View/default/Recharge/pay.html
+++ b/Application/Media/View/default/Recharge/pay.html
@ -136,20 +136,25 @@
        <div class="way-box">
          <div class="way-select">

-            <if condition="get_tool_status('alipay') eq 1">
+<!--            <if condition="get_tool_status('alipay') eq 1">-->
+<!--            <div class="wayBg" data-type="alipay">-->
+<!--              <img src="__IMG__/zhifubaozhifu.png" alt="">-->
+<!--              <span>支付宝</span>-->
+<!--            </div>-->
+
+<!--            </if>-->
+
+<!--            <if condition="get_tool_status('weixin') eq 1 or get_tool_status('wei_xin') eq 1 or get_tool_status('weixin_gf') eq 1">-->
            <div class="wayBg" data-type="alipay">
              <img src="__IMG__/zhifubaozhifu.png" alt="">
              <span>支付宝</span>
-
            </div>
-            </if>
-
-            <if condition="get_tool_status('weixin') eq 1 or get_tool_status('wei_xin') eq 1 or get_tool_status('weixin_gf') eq 1">
            <div class="" data-type="weixin">
              <img src="__IMG__/weixin.png" alt="">
              <span>微信支付</span>
            </div>
-            </if>
+
+<!--            </if>-->

            <if condition="get_tool_status('jft') eq 1">
              <div class="" data-type="jft"><span class="p1_1 g" id="p1">竣付通</span></div>
@ -180,8 +185,8 @@
        <img src="__IMG__/foot_logo.png" alt="">
        <div class="foot_top_ri">
          <div class="foot_link">
-            <a>家长监护</a>
-            <a>客服帮助</a>
+            <a href="/media.php?s=/Article/news1/type/supervise.html">家长监护</a>
+            <a href="/media.php?s=/Service/index.html">客服帮助</a>
 <!--            <a href="#">国浩律所</a>-->
          </div>
          <div class="foot_serial">
--- a/Application/Media/View/default/Service/detail.html
+++ b/Application/Media/View/default/Service/detail.html
@ -19,7 +19,6 @@
      height: 30px;
      padding-left: 12px;
      padding-right: 30px;
-      font-size: 1rem;
    }

    .search-icon {
--- a/Application/Mobile/View/User/userphone.html
+++ b/Application/Mobile/View/User/userphone.html
@ -100,8 +100,12 @@
            $(e).removeClass('g-btn').addClass('g-btntn');
            var a = setInterval(function() {
              r--;
-              $(e).text('成功'+r + '秒后重发'),
-              0 == r && ($(e).removeClass('g-btntn').addClass('g-btn'), $(e).text('获取短信验证码'), clearInterval(a))
+              $(e).text(r + '秒'),
+              $(e).css("background", "rgba(169,169,169)");
+              0 == r && ($(e).removeClass('g-btntn').addClass('g-btn'),
+                      $(e).text('获取短信验证码'),
+                      $(e).css("background", "rgba(33,177,235,1)"),
+                      clearInterval(a))
            },1e3)
          }
        };
--- a/Data/update.sql
+++ b/Data/update.sql
@ -585,4 +585,14 @@ VALUES
  ('contact_cs', '联系客服', '[{\"name\":\"support\",\"title\":\"\\u8054\\u7cfb\\u5ba2\\u670d\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"2\",\"act\":\"3007567814\",\"ios_url\":\"3007567814\",\"sort\":\"1\",\"id\":1,\"icon\":\"\",\"cover\":\"\"}]', '', 5, 1, 1571723212 );
 INSERT INTO `tab_tool` (`name`, `title`, `config`, `template`, `type`, `status`, `create_time` )
 VALUES
-  ('sdk_menu', 'SDK用户菜单', '[{\"name\":\"mine\",\"title\":\"\\u6211\\u7684\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"my\",\"ios_url\":\"\",\"sort\":\"1\",\"id\":\"1\",\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd524dfd76fa.png\",\"cover\":\"1980\"},{\"name\":\"gift\",\"title\":\"\\u793c\\u5305\",\"menu_version\":\"0\",\"url\":\"\\/sdk.php\\/GameGiftPage\\/gift_list\",\"type\":\"0\",\"act\":\"gift\",\"ios_url\":\"?action=gift\",\"sort\":\"2\",\"id\":2,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd52509f3767.png\",\"cover\":\"1981\"},{\"name\":\"support\",\"title\":\"\\u5ba2\\u670d\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"support\",\"ios_url\":\"\",\"sort\":\"3\",\"id\":3,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd5251e0aee3.png\",\"cover\":\"1982\"},{\"name\":\"message\",\"title\":\"\\u6d88\\u606f\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"msg\",\"ios_url\":\"\",\"sort\":\"4\",\"id\":4,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525606ff53.png\",\"cover\":\"1983\"},{\"name\":\"logout\",\"title\":\"\\u9000\\u51fa\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"logout\",\"ios_url\":\"\",\"sort\":\"5\",\"id\":5,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525d99ed99.png\",\"cover\":\"1984\"},{\"name\":\"suppersign\",\"title\":\"\\u8d85\\u7ea7\\u7b7e\",\"menu_version\":\"2\",\"url\":\"\\/mobile.php\\/ssg\\/home\",\"type\":\"2\",\"act\":\"suppersign\",\"ios_url\":\"http:\\/\\/m.wmtxkj.cn\\/mobile.php\\/ssg\\/home\",\"sort\":\"6\",\"id\":6,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525f388843.png\",\"cover\":\"1985\"}]', '', 5, 1, 1571723212 );
+  ('sdk_menu', 'SDK用户菜单', '[{\"name\":\"mine\",\"title\":\"\\u6211\\u7684\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"my\",\"ios_url\":\"\",\"sort\":\"1\",\"id\":\"1\",\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd524dfd76fa.png\",\"cover\":\"1980\"},{\"name\":\"gift\",\"title\":\"\\u793c\\u5305\",\"menu_version\":\"0\",\"url\":\"\\/sdk.php\\/GameGiftPage\\/gift_list\",\"type\":\"0\",\"act\":\"gift\",\"ios_url\":\"?action=gift\",\"sort\":\"2\",\"id\":2,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd52509f3767.png\",\"cover\":\"1981\"},{\"name\":\"support\",\"title\":\"\\u5ba2\\u670d\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"support\",\"ios_url\":\"\",\"sort\":\"3\",\"id\":3,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd5251e0aee3.png\",\"cover\":\"1982\"},{\"name\":\"message\",\"title\":\"\\u6d88\\u606f\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"msg\",\"ios_url\":\"\",\"sort\":\"4\",\"id\":4,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525606ff53.png\",\"cover\":\"1983\"},{\"name\":\"logout\",\"title\":\"\\u9000\\u51fa\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"logout\",\"ios_url\":\"\",\"sort\":\"5\",\"id\":5,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525d99ed99.png\",\"cover\":\"1984\"},{\"name\":\"suppersign\",\"title\":\"\\u8d85\\u7ea7\\u7b7e\",\"menu_version\":\"2\",\"url\":\"\\/mobile.php\\/ssg\\/home\",\"type\":\"2\",\"act\":\"suppersign\",\"ios_url\":\"http:\\/\\/m.wmtxkj.cn\\/mobile.php\\/ssg\\/home\",\"sort\":\"6\",\"id\":6,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525f388843.png\",\"cover\":\"1985\"}]', '', 5, 1, 1571723212 );
+
+-- 修改迁移
+ALTER TABLE `tab_mend` 
+ADD COLUMN `order_time` int(11) NOT NULL DEFAULT 0 COMMENT '订单时间' AFTER `remark`;
+ALTER TABLE `sys_shift_task` 
+CHANGE COLUMN `create_promote_id` `creator_id` int(11) NOT NULL DEFAULT 0 COMMENT '创建渠道ID' AFTER `status`;
+ALTER TABLE `sys_shift_task` 
+ADD COLUMN `creator_type` tinyint(1) NOT NULL DEFAULT 0 COMMENT '创建者类型 0 后台管理员 1 推广员' AFTER `creator_id`;
+ALTER TABLE `tab_mend` 
+ADD COLUMN `op_type` tinyint(0) NOT NULL DEFAULT 0 COMMENT '0 管理员 1 推广员' AFTER `op_account`;