Merge branch 'dev' into release-1.0.0

Application/Admin/Common/function.php

@@ -596,4 +596,10 @@ function encryptStr($str) {
         $stars_str = $stars_str."*";
     }
     return substr_replace($str, $stars_str, 3, $length-6);
+}
+
+function encryptIdCard($str) {
+    $length = strlen($str);
+    $stars_str = "****";
+    return substr_replace($str, $stars_str, $length-4, 4);
 }

Application/Admin/View/Member/edit.html

@@ -113,7 +113,7 @@
                         <tr>
                             <td class="l">身份证号</td>
                             <td class="r">
-                                <input type="text" class="txt" value="{$data['idcard']|encryptStr}" readonly>
+                                <input type="text" class="txt" value="{$data['idcard']|encryptIdCard}" readonly>
                                 <span id="idcard" class="table_click"><span class="table_click_text inner-click-text">点击修改</span></span>
                             </td>
                         </tr>

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

@@ -21,6 +21,9 @@
   .trunk-search .select-time .txt {
     width: 100px;
   }
+    .title-cursor-pointer {
+      cursor: pointer;
+    }
   </style>
 </block>
 <block name="body">
@@ -95,13 +98,13 @@
         <div class="trunk-list list_normal">
           <table class="table normal_table">
               <tr class="odd">
-                <th>玩家账号</th>
-                <th>游戏名称</th>
-                <th>平台</th>
-                <th>游戏区服</th>
-                <th>角色名</th>
-                <th>等级</th>
-                <th class="sort" sort-name="recharge_cost">充值总额
+                <th class="title-cursor-pointer" title="平台用户的账号">玩家账号</th>
+                <th class="title-cursor-pointer" title="玩家所产生消费的游戏">游戏名称</th>
+                <th class="title-cursor-pointer" title="设备类型，安卓或者ios">平台</th>
+                <th class="title-cursor-pointer" title="游戏内区服">游戏区服</th>
+                <th class="title-cursor-pointer" title="游戏角色">角色名</th>
+                <th class="title-cursor-pointer" title="游戏区服内等级">等级</th>
+                <th class="sort" sort-name="recharge_cost" class="title-cursor-pointer" title="该游戏区服 内的充值总额">充值总额
                   <if condition="'recharge_cost' == I('sort_name', '')">
                     <if condition="1 == $sort">
                       <i class="iconfont iconsort-down"></i>
@@ -112,7 +115,7 @@
                     <i class="iconfont iconsort"></i>
                   </if>
                 </th>
-                <th class="sort" sort-name="recharge_count">充值次数
+                <th class="sort" sort-name="recharge_count" class="title-cursor-pointer" title="在游戏区服内的充值次数">充值次数
                   <if condition="'recharge_count' == I('sort_name', '')">
                     <if condition="1 == $sort">
                       <i class="iconfont iconsort-down"></i>
@@ -123,7 +126,7 @@
                     <i class="iconfont iconsort"></i>
                   </if>
                 </th>
-                <th class="sort" sort-name="recharge_cost_today">昨日充值
+                <th class="sort" sort-name="recharge_cost_today" class="title-cursor-pointer" title="玩家昨日游戏区服的充值总额">昨日充值
                   <if condition="'recharge_cost_today' == I('sort_name', '')">
                     <if condition="1 == $sort">
                       <i class="iconfont iconsort-down"></i>
@@ -134,7 +137,7 @@
                     <i class="iconfont iconsort"></i>
                   </if>
                 </th>
-                <th class="sort" sort-name="unlogin_day">未登录天数
+                <th class="sort" sort-name="unlogin_day" class="title-cursor-pointer" title="玩家该角色未登录天数">未登录天数
                   <if condition="'unlogin_day' == I('sort_name', '')">
                     <if condition="1 == $sort">
                       <i class="iconfont iconsort-down"></i>
@@ -145,7 +148,7 @@
                     <i class="iconfont iconsort"></i>
                   </if>
                 </th>
-                <th class="sort" sort-name="user_game_login_count" title="玩家在该游戏累计登陆的天数（不分区服）">游戏累计登录天数
+                <th class="sort" sort-name="user_game_login_count" class="title-cursor-pointer" title="游戏累计登陆天数:玩家在该游戏累计登陆的天数（不分区服）">游戏累计登录天数
                   <if condition="'user_game_login_count' == I('sort_name', '')">
                     <if condition="1 == $sort">
                       <i class="iconfont iconsort-down"></i>
@@ -156,7 +159,7 @@
                     <i class="iconfont iconsort"></i>
                   </if>
                 </th>
-                <th class="sort" sort-name="create_time" title="账号在该游戏的创角时间">注册时间
+                <th class="sort" sort-name="create_time" class="title-cursor-pointer" title="账号所注册的时间">注册时间
                   <if condition="'create_time' == I('sort_name', '')">
                     <if condition="1 == $sort">
                       <i class="iconfont iconsort-down"></i>
@@ -167,8 +170,8 @@
                     <i class="iconfont iconsort"></i>
                   </if>
                 </th>
-                <th>最后登录时间</th>
-                <th>推广员账号</th>
+                <th class="title-cursor-pointer" title="玩家角色上次登录的时间">最后登录时间</th>
+                <th class="title-cursor-pointer" title="对应推广员的账号">推广员账号</th>
               </tr>
               <empty name="records">
               <tr><td colspan="12" style="text-align: center;height: 45vh;"><img src="__IMG__/20180207/icon_wushujv2.png"/><p style="line-height: 40px;color: #A5A5A5;">暂无数据</p></td></tr>

Data/update.sql

@@ -686,7 +686,7 @@ CREATE TABLE `tab_server_union` (
   KEY `create_time` (`create_time`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='合服游戏区服表';
 
--- 用户行为
+-- 用户行为 tping
 ALTER TABLE `tab_pay_info` ADD COLUMN `user_account` varchar(30) DEFAULT NULL COMMENT '用户账号';
 ALTER TABLE `tab_pay_info` ADD COLUMN `game_player_name` varchar(30) DEFAULT '' COMMENT '游戏玩家昵称';
 ALTER TABLE `tab_pay_info` ADD COLUMN `game_name` varchar(30) DEFAULT '' COMMENT '游戏名称';
@@ -703,6 +703,11 @@ ALTER TABLE `tab_pay_info`
 ADD COLUMN `ip`  varchar(255) NOT NULL DEFAULT '0' AFTER `promote_account`,
 ADD COLUMN `pay_way`  int NOT NULL DEFAULT 0 AFTER `ip`;
 
+-- 苹果内购  tping
+ALTER TABLE `tab_spend_distinction`
+MODIFY COLUMN `extend`  varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '通知游戏方扩展(一般是游戏方透传)' AFTER `game_name`;
+
+
 -- 菜单(游戏充值预下单)
 INSERT INTO `sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `is_dev`, `status`) VALUES ('游戏充值预下单', 16, 0, 'BehaviorLog/game', 0, '', '行为日志', 0, 1);