Merge branch 'release' of 47.111.118.107:wmtx/platform into release

Application/Home/Controller/PromoteController.class.php

@@ -232,20 +232,20 @@ class PromoteController extends BaseController
         $this->assign("rules", $rules);
         $this->assign("rules_count", count($rules));
 
-//        $redis = new \Org\RedisSDK\Redis(['host'=>'127.0.0.1','port'=>6379],[]);
+        $redis = new \Org\RedisSDK\Redis(['host'=>'127.0.0.1','port'=>6379],[]);
-//        $cacheKey = "pop:rule:set";
+        $cacheKey = "pop:rule:set";
-//        if (!$redis->sIsMember($cacheKey, get_pid())) {
+        if (!$redis->sIsMember($cacheKey, get_pid())) {
-//            $currentTime = strtotime(date('Y-m-d'));
+            $currentTime = strtotime(date('Y-m-d'));
-//            $weekArray = [7,1,2,3,4,5,6];
+            $weekArray = [7,1,2,3,4,5,6];
-//            $week = $weekArray[date("w")];
+            $week = $weekArray[date("w")];
-//            $match_rules = M("document_pop_rules")
+            $match_rules = M("document_pop_rules")
-//            ->field('id')
+            ->field('id')
-//            ->where("(type = 1 and pop_time = {$currentTime}) or (type = 2 and pop_time = {$week})")
+            ->where("(type = 1 and pop_time = {$currentTime}) or (type = 2 and pop_time = {$week})")
-//            ->order("sort asc, id desc")
+            ->order("sort asc, id desc")
-//            ->select();
+            ->select();
-//        } else {
+        } else {
-//            $match_rules = [];
+            $match_rules = [];
-//        }
+        }
 
         
         $this->assign("match_rules_id", $match_rules ? json_encode(array_column($match_rules, 'id')) : 'null');

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

@@ -109,11 +109,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="{$initBegTime}">
+            <input type="text" id="sdate" class="txt" name="begtime" placeholder="开始时间" value="{$initBegTime}">
           </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="{$initEndTime}">
+            <input type="text" id="edate" class="txt" name="endtime" placeholder="结束时间" value="{$initEndTime}">
           </div>
         </div>
 
@@ -237,7 +237,7 @@
   <script type="text/javascript">
       $().ready(function () {
         setValue('row', '{:I("get.row",10)}');
-        setValue('settlement_type', '{:I("get.settlement_type",0)}');
+        setValue('settlement_type', '{:I("get.settlement_type","")}');
           var date = "{$setdate}";
           $('#sdate').datetimepicker({
               format: 'yyyy-mm-dd',