'整理项目'

application/admin/controller/Recharge.php

@@ -26,7 +26,7 @@ class Recharge extends AdminControl
         if(!empty($time)){
             $gap = explode(' - ', $time);
             $begin = $gap[0];
-            $end = $gap[1];
+            $end = date('Y-m-d', strtotime ("+1 day", strtotime($gap[1])));
         }
         $condition = array();
         if($title){
@@ -89,7 +89,7 @@ class Recharge extends AdminControl
             $userInfo->startTrans();
             $userMessage->startTrans();
             $capitalMovements->startTrans();
-            try {
+            /*try {*/
                 $balance = $recharge->userInfo_money + $money;
                 $model_recharge->updateRecharge(['recharge_id'=>$recharge_id], ['recharge_money'=>$money,'user_money'=>$balance,'recharge_status'=>1]);
                 $userInfo->updateUserInfo(['user_id'=>$recharge->user_id], ['userInfo_money'=>$balance]);
@@ -102,9 +102,9 @@ class Recharge extends AdminControl
                     'userMessage_update' => $nowDate,
                 ];
                 $userMessage->addMessage($userMessageData);
-                if ($recharge->type == 1) {
+                if ($recharge->recharge_type == 1) {
                     $type = '支付宝充值';
-                } else if ($recharge->type == 2) {
+                } else if ($recharge->recharge_type == 2) {
                     $type = '微信充值';
                 } else {
                     $type = '银行卡转账';
@@ -126,14 +126,14 @@ class Recharge extends AdminControl
                 $userMessage->commit();
                 $capitalMovements->commit();
                 return ["msg" => "审核成功"];
-            } catch (\Exception $e) {
+            /*} catch (\Exception $e) {
                 // 回滚事务
                 $model_recharge->rollBack();
                 $userInfo->rollBack();
                 $userMessage->rollBack();
                 $capitalMovements->rollBack();
                 return ["msg" => "操作失败"];
-            }
+            }*/
         } else if($recharge_id) {
             $model_recharge = Model('Recharge');
             $userMessage = Model('userMessage');

application/admin/view/information/index.html

@@ -44,6 +44,12 @@
                         <input type="text" class="layui-input field-name" name="inc_address" id="inc_address" value="{$IncData.inc_address|default=''}" lay-verify="" autocomplete="off" placeholder="{$Think.lang.ds_please_enter}{$Think.lang.fax}" required />
                     </div>
                 </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">经营许可证</label>
+                    <div class="layui-input-inline">
+                        <input type="text" class="layui-input field-name" name="inc_authentication" value="{$IncData.inc_authentication|default=''}" lay-verify="" autocomplete="off" placeholder="{$Think.lang.ds_please_enter}经营许可证" required />
+                    </div>
+                </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">{$Think.lang.inc_logo}</label>
                     <div class="layui-input-inline">

application/database.php

@@ -6,7 +6,7 @@ return [
 // 服务器地址
 'hostname'       => '192.168.2.186',
 // 数据库名
-'database'       => 'ds_cms',
+'database'       => 'aqmdata',
 // 用户名
 'username'       => 'root',
 // 密码

application/home/view/layout/header.html

@@ -129,17 +129,14 @@
 </header>
 <script type="text/javascript">
     const pathName = window.location.pathname
-    if (pathName == '/home/index/index.html') {
-        $("#home_index").attr("class","nav-link active")
-    }
     if (pathName == '/home/product/product.html') {
         $("#home_product").attr("class","nav-link active")
-    }
-    if (pathName == '/home/about/about.html') {
+    } else if (pathName == '/home/about/about.html') {
         $("#home_about").attr("class","nav-item dropdown mr-3 active")
-    }
-    if (pathName == '/home/contact/contact.html') {
+    } else if (pathName == '/home/contact/contact.html') {
         $("#home_contact").attr("class","nav-item dropdown mr-3 active")
+    } else {
+        $("#home_index").attr("class","nav-link active")
     }
 </script>
 <!-- //header -->

application/user/model/Userproduct.php

@@ -19,14 +19,13 @@ class Userproduct extends Model
     public function getRenewProductCount($userId)
     {
         $allData = $this
-            ->field(['userProduct_dayNumber', 'userProduct_buyTime'])
+            ->field(['userProduct_maturityTime'])
             ->where(['user_id' => $userId])
             ->select();
         $count = 0;
         foreach ($allData as $key => $value) {
-            $numberDay = $value->userProduct_dayNumber - 15;
-            $remindDate = date("Y-m-d",strtotime($numberDay . " day"));
-            if ($value->userProduct_buyTime >= $remindDate) {
+            $remindDate = date("Y-m-d",strtotime(15 . " day"));
+            if ($value->userProduct_maturityTime <= $remindDate) {
                 $count++;
             }
         }

application/user/view/cost/orderManagement.html

@@ -2,13 +2,13 @@
 {block name="container"}
 <div class="layui-tab layui-tab-card">
     <ul class="layui-tab-title">
-        <li id="li-1" onclick="showCurrent('')">
+        <li id="li-1" onclick="showCurrent(0)">
             <a>全部</a>
         </li>
-        <li id="li-2" onclick="showCurrent('1')">
+        <li id="li-2" onclick="showCurrent(1)">
             <a>已完成</a>
         </li>
-        <li id="li-3" onclick="showCurrent('2')">
+        <li id="li-3" onclick="showCurrent(2)">
             <a>已取消</a>
         </li>
     </ul>
@@ -65,15 +65,19 @@
 <script>
     const myHost = "http://" + window.location.host;
     let current = $("#status").val();
-    if (!current) {
-        $("#li-1").attr("class","layui-this")
-    } else if (current == 1) {
+    if (current == 1) {
         $("#li-2").attr("class","layui-this")
     } else if (current == 2) {
         $("#li-3").attr("class","layui-this")
+    } else {
+        $("#li-1").attr("class","layui-this")
     }
     function showCurrent(id) {
-        if (id) {
+        if (id===0) {
+            $("#status").val('')
+        } else if (id===1) {
+            $("#status").val(id)
+        } else if (id===2) {
             $("#status").val(id)
         }
         let timeRang = $("#timeRang").val();

application/user/view/renewal/index.html

@@ -116,7 +116,7 @@
     function hiddenTips2() {
         $("#layui-layer3").attr("style","display: none")
         $("#layui-layer-shade4").attr("style","display: none")
-        window.location.href = myHost + "/Admin/renewal/index.html";
+        window.location.href = myHost + "/User/renewal/index.html";
     }
     function onchangeSelect() {
         let name = $("#selectTime").find("option:selected").attr("name");

public/uploads/sqldata/20190610-105124-1.sql

@@ -1,41 +0,0 @@
--- -----------------------------
--- Think MySQL Data Transfer 
--- 
--- Host     : 192.168.2.186
--- Port     : 3306
--- Database : ds_cms
--- 
--- Part : #1
--- Date : 2019-06-10 10:51:24
--- -----------------------------
-
-SET FOREIGN_KEY_CHECKS = 0;
-
-
--- -----------------------------
--- Table structure for `bm_admin`
--- -----------------------------
-DROP TABLE IF EXISTS `bm_admin`;
-CREATE TABLE `bm_admin` (
-  `admin_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '管理员自增ID',
-  `admin_name` varchar(20) NOT NULL COMMENT '管理员名称',
-  `admin_password` varchar(32) NOT NULL COMMENT '管理员密码',
-  `admin_add_time` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间',
-  `admin_login_time` int(11) NOT NULL COMMENT '登录时间',
-  `admin_login_num` int(11) NOT NULL COMMENT '登录次数',
-  `admin_is_super` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否超级管理员',
-  `admin_group_id` smallint(6) DEFAULT '0' COMMENT '权限组ID',
-  `admin_pid` int(11) DEFAULT '0' COMMENT 'pid',
-  `admin_status` tinyint(1) DEFAULT '1' COMMENT '状态1-是0否',
-  PRIMARY KEY (`admin_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=25 DEFAULT CHARSET=utf8 COMMENT='管理员表';
-
--- -----------------------------
--- Records of `bm_admin`
--- -----------------------------
-INSERT INTO `bm_admin` VALUES ('1', 'admin', '7fef6171469e80d32c0559f88b377245', '0', '1560134914', '98', '1', '1', '', '1');
-INSERT INTO `bm_admin` VALUES ('2', 'dacheng', '7fef6171469e80d32c0559f88b377245', '1546416864', '1548230143', '10', '0', '3', '3', '1');
-INSERT INTO `bm_admin` VALUES ('3', '麦邦公司', '7fef6171469e80d32c0559f88b377245', '1546481266', '1548917242', '11', '0', '2', '0', '1');
-INSERT INTO `bm_admin` VALUES ('4', '帮麦公司', '7fef6171469e80d32c0559f88b377245', '1546824903', '1549871629', '3', '0', '2', '0', '1');
-INSERT INTO `bm_admin` VALUES ('19', '客服001', '7fef6171469e80d32c0559f88b377245', '0', '1551234292', '10', '0', '3', '4', '1');
-INSERT INTO `bm_admin` VALUES ('21', '测试公司', '7fef6171469e80d32c0559f88b377245', '1548315143', '1550130475', '2', '0', '2', '0', '1');