rabin 3 년 전
부모
커밋
8e38de7463
3개의 변경된 파일8개의 추가작업 그리고 46개의 파일을 삭제
  1. 2 42
      app/shop/database/sign.php
  2. 1 1
      service/agent/database/member.php
  3. 5 3
      service/bill/lib/Cron.php

+ 2 - 42
app/shop/database/sign.php

@@ -24,6 +24,7 @@ return array
     'lang' => '自主签约',
     # 后台菜单排序
     'order' => 99,
+    'menu' => false,
     # 数据结构
     'struct' => array
     (
@@ -413,48 +414,7 @@ return array
     ),
 	'manage' => array
     (
-        'desc' => '<div class="layui-card">
-          <div class="layui-card-header">简约时间线</div>
-          <div class="layui-card-body">
-            
-            <ul class="layui-timeline">
-              <li class="layui-timeline-item">
-                <i class="layui-icon layui-timeline-axis"></i>
-                <div class="layui-timeline-content layui-text">
-                  <div class="layui-timeline-title">
-                    2018年,layui 5.0 发布,并发展成为中国最受欢迎的前端 UI 框架(期望)
-                  </div>
-                </div>
-              </li>
-              <li class="layui-timeline-item">
-                <i class="layui-icon layui-timeline-axis"></i>
-                <div class="layui-timeline-content layui-text">
-                  <div class="layui-timeline-title">2017年,layui 里程碑版本 2.0 发布</div>
-                </div>
-              </li>
-              <li class="layui-timeline-item">
-                <i class="layui-icon layui-timeline-axis"></i>
-                <div class="layui-timeline-content layui-text">
-                  <div class="layui-timeline-title">2016年,layui 首个版本发布</div>
-                </div>
-              </li>
-              <li class="layui-timeline-item">
-                <i class="layui-icon layui-timeline-axis"></i>
-                <div class="layui-timeline-content layui-text">
-                  <div class="layui-timeline-title">2015年,layui 孵化</div>
-                </div>
-              </li>
-              <li class="layui-timeline-item">
-                <i class="layui-icon layui-anim layui-anim-rotate layui-anim-loop layui-timeline-axis"></i>
-                <div class="layui-timeline-content layui-text">
-                  <div class="layui-timeline-title">更久前,轮子时代。维护几个独立组件:layer等</div>
-                </div>
-              </li>
-            </ul>
-            
-          </div>
-        </div>',
-        //'list' => 'update',
+        'desc' => Dever::timeline('签约状态', array('test', 'ss')),
         'tab' => array('门店信息', '法人信息', '企业信息', '银行信息'),
     ),
 );

+ 1 - 1
service/agent/database/member.php

@@ -644,7 +644,7 @@ return array
             'desc'      => '类型',
             'match'     => 'is_string',
             'search'    => 'hidden',
-            
+            'search'    => 'date',
         ),
 
         'dever_time'      => array

+ 5 - 3
service/bill/lib/Cron.php

@@ -282,10 +282,10 @@ class Cron
         
         for($i=0; $i<=$day; $i++) {
             $where = array();
-            $where['start'] = $start + 86400*$i;
-            $where['end'] = $start + 86400*$i + 86399;
+            $where['fstart'] = $start + 86400*$i;
+            $where['fend'] = $start + 86400*$i + 86399;
             $data = array();
-            $data['day'] = $where['start'];
+            $data['day'] = $where['fstart'];
             $info = Dever::db('bill/cash_in_stat')->find($data);
 
             $where['status'] = 4;
@@ -305,6 +305,8 @@ class Cron
                 $data['goods_cash'] = $cash['total'];
             }
             unset($where['status']);
+            $where['start'] = $where['fstart'];
+            $where['end'] = $where['fstart'];
 
             $where['type'] = 1;