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

Application/Common/Common/extend.php

@@ -2856,3 +2856,20 @@ function getIsTask($user_id){
         return $shiftres['id'];
     }
 }
+
+function encryption($string) {
+    //订单隐藏算法
+    $orderLen = strlen($string);
+    $strLen = 3;
+    $hideChar = '';
+
+    if($orderLen <=8) {
+        $strLen = 2;
+    }
+
+    for($i = 0;$i<$orderLen-$strLen*2;$i++) {
+        $hideChar .='*';
+    }
+
+    return substr($string, 0, $strLen) . $hideChar . substr($string, $orderLen-$strLen);
+}

Application/Home/Controller/PromoteController.class.php

@@ -899,6 +899,13 @@ class PromoteController extends BaseController
         $query = M('promote', 'tab_')->where($map);
         list($records, $pagination, $count) = $this->paginate($query);
 
+        foreach ($records as $key => $value) {
+
+            $records[$key]['idcard'] = encryption($value['idcard']);
+            $records[$key]['mobile_phone'] = encryption($value['mobile_phone']);
+
+        }
+
         $ids = array_column($records, 'id');
 
         $countList = [];

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

@@ -118,11 +118,11 @@
         <div class="form-group normal_space">
           <label class="form-title select-title" style="position: relative;">起止时间：</label>
           <div class="select-time">
-            <input type="text" readonly id="sdate" class="txt" name="begtime" placeholder="开始时间" value="{:I('begtime')}">
+            <input type="text" id="sdate" class="txt" name="begtime" placeholder="开始时间" value="{:I('begtime')}">
           </div>
           <label class="form-title select-title zhi_color">&nbsp;—&nbsp;</label>
           <div class="select-time">
-            <input type="text" readonly id="edate" class="txt" name="endtime" placeholder="结束时间" value="{:I('endtime')}">
+            <input type="text" id="edate" class="txt" name="endtime" placeholder="结束时间" value="{:I('endtime')}">
           </div>
         </div>