5

anyv
app/portal/controller/PersonalcenterController.php
public/themes/simpleboot3/portal/personalcenter/income_record.html
public/themes/simpleboot3/portal/salesmangoods/salesman_goods.html
public/themes/simpleboot3/public/assets/css/log.css
simplewind/cmf/controller/WeChatBaseController.php
--- a/app/portal/controller/PersonalcenterController.php
查看文件 @5aea58a
+++ b/app/portal/controller/PersonalcenterController.php
查看文件 @5aea58a
@@ -513,16 +513,27 @@ class PersonalcenterController extends WeChatBaseController{
     public function income_record(){
         $uid = cmf_get_current_user_id();
+        $get = $this -> request -> param();
         $my_user = Db::name('my_user') -> where('uid',$uid) -> find();
         //搜索老师下级学生用户
         $student = Db::name('my_user') -> alias('a') -> field("a.*,b.user_nickname,b.avatar") -> join("user b","a.uid = b.id",'LEFT') -> where("a.pid",$my_user['id']) -> select() -> toArray();
         foreach ($student as $key => $val){
-            $data[$key] = Db::name('indent') -> where('uid',$val['uid']) -> where("state = 2 or state = 3 or state = 5") -> select() -> toArray();
+            if(!empty($get['startime']) && !empty($get['endtime'])){
+                $startime = strtotime($get['startime']);
+                $endtime = strtotime($get['endtime']);
+                $data[$key] = Db::name('indent') -> where('uid',$val['uid']) -> where("state = 2 or state = 3 or state = 5") -> where("pay_time>=".$startime." and pay_time<=".$endtime) -> select() -> toArray();
+            }else{
+                $data[$key] = Db::name('indent') -> where('uid',$val['uid']) -> where("state = 2 or state = 3 or state = 5") -> select() -> toArray();
+            }
+
+
             $name = $val['user_nickname'];
             $avatar = $val['avatar'];
           foreach ($data[$key] as $key1 => $val1){
+              $book_name = Db::name('indent_goods') -> where("indent_id",$val1['id']) -> find();
               $data[$key][$key1]['user_name'] = $name;
               $data[$key][$key1]['avatar'] = $avatar;
+              $data[$key][$key1]['book_name'] = $book_name['book_name'];
                 $money_income = Db::name('money_income') -> where("indent_id =".$val1['id']." and uid = ".$uid) -> select() -> toArray();
                 $money = 0;
                 foreach ($money_income as $key2 => $val2){
@@ -539,10 +550,19 @@ class PersonalcenterController extends WeChatBaseController{
         $this -> assign('res',$res);
         //搜索老师用户
         $teacher_avatar = Db::name('user') -> where('id',$uid) -> find();
-        $teacher = Db::name('indent') -> where('uid',$uid) -> where("state = 2 or state = 3 or state = 5") -> select() -> toArray();
+        if(!empty($get['startime']) && !empty($get['endtime'])){
+            $startime = strtotime($get['startime']);
+            $endtime = strtotime($get['endtime']);
+            $teacher = Db::name('indent') -> where('uid',$uid) -> where("pay_time>=".$startime." and pay_time<=".$endtime) -> where("state = 2 or state = 3 or state = 5") -> select() -> toArray();
+        }else{
+            $teacher = Db::name('indent') -> where('uid',$uid) -> where("state = 2 or state = 3 or state = 5") -> select() -> toArray();
+        }
+
         foreach($teacher as $key => $val){
+            $teacher_book_name = Db::name('indent_goods') -> where("indent_id",$val1['id']) -> find();
             $teacher_data[$key]['user_name'] = $teacher_avatar['user_nickname'];
             $teacher_data[$key]['avatar'] = $teacher_avatar['avatar'];
+            $teacher_data[$key]['book_name'] = $teacher_book_name['book_name'];
             $tea_money_income = Db::name('money_income') -> where("indent_id =".$val['id']." and uid = ".$uid) -> select() -> toArray();
             $money = 0;
             foreach ($tea_money_income as $key2 => $val2){
--- a/public/themes/simpleboot3/portal/personalcenter/income_record.html
查看文件 @5aea58a
+++ b/public/themes/simpleboot3/portal/personalcenter/income_record.html
查看文件 @5aea58a
@@ -75,9 +75,9 @@
         <button id='result' data-options='{"type":"date"}'>选择起始时间</button>
     </div>
     <div class="end_time">
-        <button id='ss' data-options='{"type":"date"}'>选择截止时间 </button>
+        <button id='ss' data-options='{"type":"date"}'>选择截止时间</button>
     </div>
-    <div class="time_btn">重置</div>
+    <div class="time_btn" onclick="my_search()">搜索</div>
 </div>
@@ -89,7 +89,7 @@
                     <img src="{$vo.avatar}" alt="">
                 </div>
                 <div class="recordTxt">
-                    <div class="recordTxt1 one-txt-cut">{$vo.user_name}</div>
+                    <div class="recordTxt1 one-txt-cut">{$vo.user_name}购买了{$vo.book_name}</div>
                     <if condition="$vo.indent_type eq 1">
                         <div class="recordTxt2">平台订单</div>
                     </if>
@@ -107,7 +107,7 @@
                     <img src="{$vo.avatar}" alt="">
                 </div>
                 <div class="recordTxt">
-                    <div class="recordTxt1 one-txt-cut">{$vo.user_name}</div>
+                    <div class="recordTxt1 one-txt-cut">{$vo.user_name}购买了{$vo.book_name}</div>
                     <if condition="$vo.indent_type eq 1">
                         <div class="recordTxt2">平台订单</div>
                     </if>
@@ -129,6 +129,23 @@
 <script src="__TMPL__/public/assets/js/city.data-3.js"></script>
 <script src="__TMPL__/public/assets/js/jquery.js"></script>
 <script>
+    /**
+     *点击搜索
+     */
+    function my_search(){
+        var startime = $('#result').text();
+        var endtime = $('#ss').text();
+        if(startime == '选择起始时间' || endtime == '选择截止时间'){
+            window.location.href="{:url('Personalcenter/income_record')}";
+        }else{
+            window.location.href="{:url('Personalcenter/income_record')}?startime="+startime+"&endtime="+endtime;
+        }
+
+
+
+    }
+</script>
+<script>
     var start_time = 0,end_time = 0,time_btn=$(".time_btn");
     (function($) {
         $.init();
--- a/public/themes/simpleboot3/portal/salesmangoods/salesman_goods.html
查看文件 @5aea58a
+++ b/public/themes/simpleboot3/portal/salesmangoods/salesman_goods.html
查看文件 @5aea58a
@@ -9,7 +9,12 @@
     <link rel="stylesheet" href="__TMPL__/public/assets/css/reset.css" />
     <link rel="stylesheet" href="__TMPL__/public/assets/css/log.css" />
 </head>
-
+<style>
+    .log_five_list_center{
+        width: 3.4rem;
+        padding-top: 0.04rem;
+    }
+</style>
 <body>
 <!-- 弹窗 -->
 <div class="tx_mask">
@@ -53,7 +58,7 @@
                     <img src="{:cmf_get_image_url($vo.show_img)}" alt="" style="width: 100%;height: 100%;"/>
                 </div>
                 <div class="log_five_list_center">
-                    <div class="log_five_list_center_one">
+                    <div class="log_five_list_center_one txt-cut" style="-webkit-line-clamp: 2; ">
                         {$vo.book_name}
                     </div>
                     <div class="log_four_zong_shu" style="margin-top: 0.16rem">
--- a/public/themes/simpleboot3/public/assets/css/log.css
查看文件 @5aea58a
+++ b/public/themes/simpleboot3/public/assets/css/log.css
查看文件 @5aea58a
@@ -1305,6 +1305,7 @@
 }
 .log_four_zong_shu {
+	line-height: 1;
 	font-size: 0.4rem;
 	font-weight: 400;
 	color: rgba(242, 0, 0, 1);
@@ -1315,7 +1316,6 @@
 	font-size: 0.28rem
 }
-
 /* log_five页面 */
@@ -1325,6 +1325,7 @@
 	padding: 0.32rem 0.3rem 0.32rem 0.32rem;
 	display: flex;
 	justify-content: space-around;
+	align-items: center;
 }
 .log_five_list_left {
@@ -1333,8 +1334,9 @@
 }
 .log_five_list_center_one {
-	font-size: 0.32rem;
+	font-size: 0.28rem;
 	font-weight: 400;
+	line-height: 0.36rem;
 	color: rgba(51, 51, 51, 1);
 	opacity: 1;
 }
--- a/simplewind/cmf/controller/WeChatBaseController.php
查看文件 @5aea58a
+++ b/simplewind/cmf/controller/WeChatBaseController.php
查看文件 @5aea58a
@@ -204,7 +204,7 @@ class WeChatBaseController extends BaseController
      */
     public function checkWeChatUserLogin()
     {
-      /* $user = Db::name('user')->where('id',5)->find();
+       /*$user = Db::name('user')->where('id',2)->find();
        cmf_update_current_user($user);*/
         $userId = cmf_get_current_user_id();
         if (empty($userId)) {