Merge branch 'master' of http://114.215.101.231:8099/anyv/xkeasy into wangxiaogang

@@ -393,20 +393,20 @@ class SalesmanController extends AdminBaseController{
 
 
         $id = $_POST['id'];
         $id = $_POST['id'];
         //删除老师购物车 浏览记录 收藏 订单待付款信息
         //删除老师购物车 浏览记录 收藏 订单待付款信息
-        $teacher = Db::name('my_user') -> where('id',$id) -> find();
-        Db::name('shopping_cart') -> where('uid',$teacher['uid']) -> delete();
+        //$teacher = Db::name('my_user') -> where('id',$id) -> find();
+        /*Db::name('shopping_cart') -> where('uid',$teacher['uid']) -> delete();
         Db::name('browsing_history') -> where('uid',$teacher['uid']) -> delete();
         Db::name('browsing_history') -> where('uid',$teacher['uid']) -> delete();
         Db::name('collect') -> where('uid',$teacher['uid']) -> delete();
         Db::name('collect') -> where('uid',$teacher['uid']) -> delete();
-        Db::name('indent') -> where("uid=".$teacher['uid']." and state=4") -> delete();
+        Db::name('indent') -> where("uid=".$teacher['uid']." and state=4") -> delete();*/
         //获取这个老师下的所有学生信息
         //获取这个老师下的所有学生信息
-        $student = Db::name('my_user') -> where('pid',$id) -> select();
+        //$student = Db::name('my_user') -> where('pid',$id) -> select();
         //循环删除学生的购物车 浏览记录 收藏 订单待付款信息
         //循环删除学生的购物车 浏览记录 收藏 订单待付款信息
-        foreach ($student as $key => $val){
+        /*foreach ($student as $key => $val){
             Db::name('shopping_cart') -> where('uid',$val['uid']) -> delete();
             Db::name('shopping_cart') -> where('uid',$val['uid']) -> delete();
             Db::name('browsing_history') -> where('uid',$val['uid']) -> delete();
             Db::name('browsing_history') -> where('uid',$val['uid']) -> delete();
             Db::name('collect') -> where('uid',$val['uid']) -> delete();
             Db::name('collect') -> where('uid',$val['uid']) -> delete();
             Db::name('indent') -> where("uid=".$val['uid']." and state=4") -> delete();
             Db::name('indent') -> where("uid=".$val['uid']." and state=4") -> delete();
-        }
+        }*/
         //改变老师的身份状态
         //改变老师的身份状态
         $data = Db::name('my_user') -> where('id',$id) -> update(['status'=>0,'pid'=>0,'is_pro'=>0,'bind_status'=>0,'is_withdrawal'=>1]);
         $data = Db::name('my_user') -> where('id',$id) -> update(['status'=>0,'pid'=>0,'is_pro'=>0,'bind_status'=>0,'is_withdrawal'=>1]);
         //改变学生的身份状态
         //改变学生的身份状态

@@ -22,7 +22,7 @@ class IndexController extends WeChatBaseController
         $data_classif= Db::name('classification') -> select();
         $data_classif= Db::name('classification') -> select();
         $this -> assign('data_classif',$data_classif);
         $this -> assign('data_classif',$data_classif);
         //热门推荐
         //热门推荐
-        $data_goods_hot = Db::name('goods') -> alias('a') -> field('a.*,b.name') -> join('classification b','a.classify_id = b.id','LEFT') -> where("recommend_hot=1 and type = 1") -> select() -> toArray();
+        $data_goods_hot = Db::name('goods') -> alias('a') -> field('a.*,b.name') -> join('classification b','a.classify_id = b.id','LEFT') -> where("a.recommend_hot=1 and a.type = 1 and a.is_out = 1") -> select() -> toArray();
         if(!empty($data_goods_hot)){
         if(!empty($data_goods_hot)){
             foreach($data_goods_hot as $key => $val){
             foreach($data_goods_hot as $key => $val){
                 $price = explode('.',$data_goods_hot[$key]['price']);
                 $price = explode('.',$data_goods_hot[$key]['price']);

@@ -13,6 +13,7 @@ use app\portal\model\AddressModel;
 use app\portal\model\IndentGoodsModel;
 use app\portal\model\IndentGoodsModel;
 use app\portal\model\IndentModel;
 use app\portal\model\IndentModel;
 use cmf\controller\WeChatBaseController;
 use cmf\controller\WeChatBaseController;
+use think\Db;
 
 
 class OrderController extends WeChatBaseController
 class OrderController extends WeChatBaseController
 {
 {
@@ -112,4 +113,104 @@ class OrderController extends WeChatBaseController
         }
         }
         $this->success('SUCCESS','',$data);
         $this->success('SUCCESS','',$data);
     }
     }
+
+    /**
+     * 判断用户去支付是否为上级业务员所卖书籍
+     */
+    public function is_my_salesman(){
+
+        $uid = cmf_get_current_user_id();
+        $indent_id = $_POST['indent_id'];
+        //获取这条订单
+        $indent = Db::name('indent') -> where('id',$indent_id) -> find();
+        //如果这条订单为平台订单
+        if($indent['indent_type'] == 1){
+            //获取这条订单下的所有商品
+            $pingtai_goods = Db::name('indent_goods') -> where('indent_id',$indent_id) -> select();
+            //循环判断商品是否存在是否下架
+            foreach ($pingtai_goods as $key => $val){
+                $pt_goods = Db::name('goods') -> where('id',$val['goods_id']) -> find();
+                //判断商品是否存在
+                if(empty($pt_goods)){
+                    return false;
+                }
+                //判断商品是否下架
+                if($pt_goods['is_out'] == 0){
+                    return false;
+                }
+            }
+            return true;
+        }
+        //获取当前用户身份
+        $my_user = Db::name('my_user') -> where('uid',$uid) -> find();
+        //判断用户身份 获取上级业务员
+        if($my_user['status'] == 3){
+            //当为老师时
+            $salesman = Db::name('my_user') -> where('id',$my_user['pid']) -> find();
+            if(empty($salesman)){
+               return false;
+            }
+        }
+        if($my_user['status'] == 4){
+            //当为学生时
+            $teacher = Db::name('my_user') -> where('id',$my_user['pid']) -> find();
+            if(empty($teacher)){
+                return false;
+            }
+            $salesman = Db::name('my_user') -> where('id',$teacher['pid']) -> find();
+        }
+
+        //获取订单下的商品
+        $indent_goods = Db::name('indent_goods') -> where('indent_id',$indent_id) -> select();
+        foreach ($indent_goods as $key => $val){
+            $goods = Db::name('goods') -> where('id',$val['goods_id']) -> find();
+            //判断商品是否存在
+            if(empty($goods)){
+                return false;
+            }
+            //判断商品是否下架
+            if($goods['is_out'] == 0){
+                return false;
+            }
+            if($salesman['uid'] != $goods['uid']){
+                return false;
+            }
+
+        }
+        return true;
+
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 }

@@ -28,8 +28,6 @@ class OrderpageController extends WeChatBaseController{
             if(empty($address)){
             if(empty($address)){
                 $this -> assign('address',4);
                 $this -> assign('address',4);
             }else{
             }else{
-                $address_arr = explode(',',$address['detailed']);
-                $address['detailed'] = $address_arr[0].$address_arr[1];
                 $indet_data = Db::name('indent') -> where("id",$indet_id['indet_id']) -> find();
                 $indet_data = Db::name('indent') -> where("id",$indet_id['indet_id']) -> find();
                 if($indet_data['state'] == 4){
                 if($indet_data['state'] == 4){
                     $indet_data_update['id'] = $indet_id['indet_id'];
                     $indet_data_update['id'] = $indet_id['indet_id'];

@@ -381,7 +381,10 @@ class PersonalcenterController extends WeChatBaseController{
             $cumulative_money += $val['money'];
             $cumulative_money += $val['money'];
         }
         }
         $cumulative_money = $cumulative_money-$cumulative_money*0.006;
         $cumulative_money = $cumulative_money-$cumulative_money*0.006;
+        $cumulative_money = sprintf("%.2f",$cumulative_money);
         $money_ratio = Db::name('money_ratio') -> where('id',1) -> find();
         $money_ratio = Db::name('money_ratio') -> where('id',1) -> find();
+        $money_ratio['platform_ratio'] = $money_ratio['platform_ratio']*100;
+        $money_ratio['platform_ratio'] = $money_ratio['platform_ratio'].'%';
         $this -> assign('money_ratio',$money_ratio);
         $this -> assign('money_ratio',$money_ratio);
         $this -> assign('balance',$balance['balance']);
         $this -> assign('balance',$balance['balance']);
         $this -> assign('cumulative_money',$cumulative_money);
         $this -> assign('cumulative_money',$cumulative_money);
@@ -510,16 +513,27 @@ class PersonalcenterController extends WeChatBaseController{
     public function income_record(){
     public function income_record(){
 
 
         $uid = cmf_get_current_user_id();
         $uid = cmf_get_current_user_id();
+        $get = $this -> request -> param();
         $my_user = Db::name('my_user') -> where('uid',$uid) -> find();
         $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();
         $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){
         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'];
             $name = $val['user_nickname'];
             $avatar = $val['avatar'];
             $avatar = $val['avatar'];
           foreach ($data[$key] as $key1 => $val1){
           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]['user_name'] = $name;
               $data[$key][$key1]['avatar'] = $avatar;
               $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_income = Db::name('money_income') -> where("indent_id =".$val1['id']." and uid = ".$uid) -> select() -> toArray();
                 $money = 0;
                 $money = 0;
                 foreach ($money_income as $key2 => $val2){
                 foreach ($money_income as $key2 => $val2){
@@ -536,10 +550,19 @@ class PersonalcenterController extends WeChatBaseController{
         $this -> assign('res',$res);
         $this -> assign('res',$res);
         //搜索老师用户
         //搜索老师用户
         $teacher_avatar = Db::name('user') -> where('id',$uid) -> find();
         $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){
         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]['user_name'] = $teacher_avatar['user_nickname'];
             $teacher_data[$key]['avatar'] = $teacher_avatar['avatar'];
             $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();
             $tea_money_income = Db::name('money_income') -> where("indent_id =".$val['id']." and uid = ".$uid) -> select() -> toArray();
             $money = 0;
             $money = 0;
             foreach ($tea_money_income as $key2 => $val2){
             foreach ($tea_money_income as $key2 => $val2){

@@ -37,7 +37,7 @@ class IndexController extends HomeBaseController
                 ->where('app_id', $appId)
                 ->where('app_id', $appId)
                 ->find();
                 ->find();
             if ($findThirdPartyUser) {
             if ($findThirdPartyUser) {
-                $this->wechatUserLogin($findThirdPartyUser,$openid,$appId);
+                $this->wechatUserLogin($wechat_user,$findThirdPartyUser,$openid,$appId);
             }else{
             }else{
                 $this->wechatUserRegister($wechat_user,$openid,$appId);
                 $this->wechatUserRegister($wechat_user,$openid,$appId);
             }
             }
@@ -57,14 +57,19 @@ class IndexController extends HomeBaseController
      * @param $openid
      * @param $openid
      * @param $appId
      * @param $appId
      */
      */
-    protected function wechatUserLogin($findThirdPartyUser,$openid,$appId){
+    protected function wechatUserLogin($wechat_user,$findThirdPartyUser,$openid,$appId){
         $currentTime = time();
         $currentTime = time();
         $ip          = $this->request->ip(0, true);
         $ip          = $this->request->ip(0, true);
         $token = cmf_generate_user_token($findThirdPartyUser['user_id'], 'public');
         $token = cmf_generate_user_token($findThirdPartyUser['user_id'], 'public');
         $userData = [
         $userData = [
             'last_login_ip'   => $ip,
             'last_login_ip'   => $ip,
             'last_login_time' => $currentTime,
             'last_login_time' => $currentTime,
-            'login_times'     => ['exp', 'login_times+1']
+            'login_times'     => ['exp', 'login_times+1'],
+        ];
+        $userDatas = [
+            'last_login_ip'   => $ip,
+            'last_login_time' => $currentTime,
+            'user_nickname'   => $wechat_user['nickname']
         ];
         ];
         $row1=Db::name("third_party_user")
         $row1=Db::name("third_party_user")
             ->where('openid', $openid)
             ->where('openid', $openid)
@@ -76,7 +81,7 @@ class IndexController extends HomeBaseController
         unset($userData['login_times']);
         unset($userData['login_times']);
         $row2=Db::name("user")
         $row2=Db::name("user")
             ->where('id', $userInfo['user_id'])
             ->where('id', $userInfo['user_id'])
-            ->update($userData);
+            ->update($userDatas);
         if($row1!==false&&$row2!==false){
         if($row1!==false&&$row2!==false){
             $userModel=new UserModel();
             $userModel=new UserModel();
             $user=$userModel->getUserInfo(['user_id'=>$userInfo['user_id'],'app_id'=>$appId]);
             $user=$userModel->getUserInfo(['user_id'=>$userInfo['user_id'],'app_id'=>$appId]);

@@ -26,7 +26,7 @@
                     <img src="{:cmf_get_image_url($vo.show_img)}" alt="">
                     <img src="{:cmf_get_image_url($vo.show_img)}" alt="">
                 </div>
                 </div>
                 <div class="in_hotText">
                 <div class="in_hotText">
-                    <div class="in_hotName txt-cut"><span>{$vo.name}</span>{$vo.book_name}</div>
+                    <div class="in_hotName txt-cut"><span>{$vo.grade}</span>{$vo.book_name}</div>
                     <div class="in_cam_shopPrice">
                     <div class="in_cam_shopPrice">
                         <div class="in_hotPrice1">￥<span>{$vo.price0}</span>.{$vo.price1}</div>
                         <div class="in_hotPrice1">￥<span>{$vo.price0}</span>.{$vo.price1}</div>
                         <div class="in_cam_shopY">￥{$vo.pricing}</div>
                         <div class="in_cam_shopY">￥{$vo.pricing}</div>

@@ -136,6 +136,12 @@
                 <img src="__TMPL__/public/assets/images/12.png" alt="">
                 <img src="__TMPL__/public/assets/images/12.png" alt="">
             </div>
             </div>
             <div class="in_campusTitle2">热门推荐</div>
             <div class="in_campusTitle2">热门推荐</div>
+            <div class="in_campusTitle3">
+                更多
+                <a href="{:url('Index/hot_goods')}">
+                    <img src="__TMPL__/public/assets/images/8.png" alt="" />
+                </a>
+            </div>
         </div>
         </div>
         <!-- 小标题 -->
         <!-- 小标题 -->
         <div class="in_campust2">好货上新，火热开抢！</div>
         <div class="in_campust2">好货上新，火热开抢！</div>

@@ -86,9 +86,9 @@
                         <div class="myorder_bottom2">
                         <div class="myorder_bottom2">
                             <if condition="$vo.state eq 4">
                             <if condition="$vo.state eq 4">
                                 <div class="myorder_bottom2_1 cancel_order" data-id="{$vo.id}">取消订单</div>
                                 <div class="myorder_bottom2_1 cancel_order" data-id="{$vo.id}">取消订单</div>
-                                <a href="{:url('portal/pay/index',array('id'=>$vo['id']))}">
-                                    <div class="myorder_bottom2_2" data-id="{$vo.id}">去支付</div>
-                                </a>
+                                <!--<a href="{:url('portal/pay/index',array('id'=>$vo['id']))}">-->
+                                    <div class="myorder_bottom2_2" data-id="{$vo.id}" onclick="is_my_salesman({$vo.id})">去支付</div>
+                                <!--</a>-->
                                 <elseif condition="$vo.state eq 2"/>
                                 <elseif condition="$vo.state eq 2"/>
                                 <!--<a href="w_Ypayment.html">-->
                                 <!--<a href="w_Ypayment.html">-->
                                 <!--<div class="myorder_bottom2_2">查看订单</div>-->
                                 <!--<div class="myorder_bottom2_2">查看订单</div>-->
@@ -162,9 +162,9 @@
                             <div class="myorder_bottom2">
                             <div class="myorder_bottom2">
                                 <if condition="$vo.state eq 4">
                                 <if condition="$vo.state eq 4">
                                     <div class="myorder_bottom2_1 cancel_order" data-id="{$vo.id}">取消订单</div>
                                     <div class="myorder_bottom2_1 cancel_order" data-id="{$vo.id}">取消订单</div>
-                                    <a href="{:url('portal/pay/index',array('id'=>$vo['id']))}">
-                                        <div class="myorder_bottom2_2" data-id="{$vo.id}">去支付</div>
-                                    </a>
+                                    <!--<a href="{:url('portal/pay/index',array('id'=>$vo['id']))}">-->
+                                        <div class="myorder_bottom2_2" data-id="{$vo.id}" onclick="is_my_salesman({$vo.id})">去支付</div>
+                                    <!--</a>-->
                                     <elseif condition="$vo.state eq 2"/>
                                     <elseif condition="$vo.state eq 2"/>
                                     <!--<a href="w_Ypayment.html">-->
                                     <!--<a href="w_Ypayment.html">-->
                                     <!--<div class="myorder_bottom2_2">查看订单</div>-->
                                     <!--<div class="myorder_bottom2_2">查看订单</div>-->
@@ -317,9 +317,9 @@
                             <div class="myorder_bottom2">
                             <div class="myorder_bottom2">
                                 <if condition="$vo.state eq 4">
                                 <if condition="$vo.state eq 4">
                                     <div class="myorder_bottom2_1 cancel_order" data-id="{$vo.id}">取消订单</div>
                                     <div class="myorder_bottom2_1 cancel_order" data-id="{$vo.id}">取消订单</div>
-                                    <a href="{:url('portal/pay/index',array('id'=>$vo['id']))}">
-                                        <div class="myorder_bottom2_2" data-id="{$vo.id}">去支付</div>
-                                    </a>
+                                    <!--<a href="{:url('portal/pay/index',array('id'=>$vo['id']))}">-->
+                                        <div class="myorder_bottom2_2" data-id="{$vo.id}" >去支付</div>
+                                    <!--</a>-->
                                     <elseif condition="$vo.state eq 2"/>
                                     <elseif condition="$vo.state eq 2"/>
                                     <!--<a href="w_Ypayment.html">-->
                                     <!--<a href="w_Ypayment.html">-->
                                     <!--<div class="myorder_bottom2_2">查看订单</div>-->
                                     <!--<div class="myorder_bottom2_2">查看订单</div>-->
@@ -421,6 +421,22 @@
 <script src="__TMPL__/public/assets/js/base.js"></script>
 <script src="__TMPL__/public/assets/js/base.js"></script>
 <script src="__TMPL__/public/assets/js/jquery.js"></script>
 <script src="__TMPL__/public/assets/js/jquery.js"></script>
 <script>
 <script>
+    /**
+     *去支付之前判断物品是否为上级业务员的所卖的书
+     */
+    function is_my_salesman(id){
+
+        $.post("{:url('Order/is_my_salesman')}",{indent_id:id},function(data){
+            if(data){
+                window.location.href = "{:url('portal/pay/index')}?id="+id;
+            }else{
+                alert('不再此区域销售');
+            }
+        });
+
+    }
+</script>
+<script>
     function load() {
     function load() {
         var index = $(".myor_title ul li").index($('.myor_title_active'));
         var index = $(".myor_title ul li").index($('.myor_title_active'));
         $(".myorder_con1").eq(index).show().siblings().hide();
         $(".myorder_con1").eq(index).show().siblings().hide();

@@ -122,27 +122,36 @@
      *点击去支付
      *点击去支付
      */
      */
     function go_pay(){
     function go_pay(){
-        name = $('#name').text();
-        phone = $('#phone').text();
-        detailed = $('#detailed').text();
-        if(name == ''){
-            alert('收货地址不能为空');
-        }else if(phone == ''){
-            alert('收货地址不能为空');
-        }else if(detailed == ''){
-            alert('收货地址不能为空');
-        }else{
-            id = {$indent_id};
-            liuyan = $('#liuyan').val();
-            $.post("{:url('Orderpage/goods_leave_word_update')}",{id:id,leave_word:liuyan},function(data){
-                if(data){
-                    window.location.href = "{:url('Pay/index',array('id'=>$indent_id))}";
+        indnet_id = "{$indent_id}";
+        $.post("{:url('Order/is_my_salesman')}",{indent_id:indnet_id},function(data){
+            if(data){
+                name = $('#name').text();
+                phone = $('#phone').text();
+                detailed = $('#detailed').text();
+                if(name == ''){
+                    alert('收货地址不能为空');
+                }else if(phone == ''){
+                    alert('收货地址不能为空');
+                }else if(detailed == ''){
+                    alert('收货地址不能为空');
                 }else{
                 }else{
-                    alert('订单更新失败！');
+                    id = {$indent_id};
+                    liuyan = $('#liuyan').val();
+                    $.post("{:url('Orderpage/goods_leave_word_update')}",{id:id,leave_word:liuyan},function(data){
+                        if(data){
+                            window.location.href = "{:url('Pay/index',array('id'=>$indent_id))}";
+                        }else{
+                            alert('订单更新失败！');
+                        }
+                    });
+
                 }
                 }
-            });
+            }else{
+                alert('不再此区域销售');
+            }
+        });
+
 
 
-        }
     }
     }
 
 
     /**
     /**

@@ -139,27 +139,35 @@
          *点击去支付
          *点击去支付
          */
          */
         function go_pay(){
         function go_pay(){
-            name = $('#name').text();
-            phone = $('#phone').text();
-            detailed = $('#detailed').text();
-            if(name == ''){
-                alert('收货地址不能为空');
-            }else if(phone == ''){
-                alert('收货地址不能为空');
-            }else if(detailed == ''){
-                alert('收货地址不能为空');
-            }else{
-                liuyan = $('#liuyan').val();
-                indet_id = {$indet_id};
-                money = $('#money').text();
-                $.post("{:url('Orderpage/salesman_go_pay')}",{leave_word:liuyan,id:indet_id,money:money},function(data){
-                    if(data){
-                        window.location.href = "{:url('Pay/index',array('id'=>$indet_id))}";
+            indnet_id = "{$indet_id}";
+            $.post("{:url('Order/is_my_salesman')}",{indent_id:indnet_id},function(data){
+                if(data){
+                    name = $('#name').text();
+                    phone = $('#phone').text();
+                    detailed = $('#detailed').text();
+                    if(name == ''){
+                        alert('收货地址不能为空');
+                    }else if(phone == ''){
+                        alert('收货地址不能为空');
+                    }else if(detailed == ''){
+                        alert('收货地址不能为空');
                     }else{
                     }else{
-                        alert('更新订单失败');
+                        liuyan = $('#liuyan').val();
+                        indet_id = {$indet_id};
+                        money = $('#money').text();
+                        $.post("{:url('Orderpage/salesman_go_pay')}",{leave_word:liuyan,id:indet_id,money:money},function(data){
+                            if(data){
+                                window.location.href = "{:url('Pay/index',array('id'=>$indet_id))}";
+                            }else{
+                                alert('更新订单失败');
+                            }
+                        });
                     }
                     }
-                });
-            }
+                }else{
+                    alert('不再此区域销售');
+                }
+            });
+
         }
         }
 
 
         /**
         /**

@@ -232,30 +232,38 @@
      *点击去支付
      *点击去支付
      */
      */
     function go_pay(){
     function go_pay(){
-        region = $('#city_text').text();
-        school_class = $('#school_class').text();
-        name = $('#name').val();
-        phone = $('#phone').val();
-        if(region == '请选择省市区'){
-            alert('地区不能为空');
-        }else if(school_class == '请选择学校和班级'){
-            alert('学校班级不能为空');
-        }else if(name == ''){
-            alert('姓名不能为空');
-        }else if(phone == ''){
-            alert('手机号不能为空');
-        }else{
-            liuyan = $('#liuyan').val();
-            indet_id = {$indent_id};
-            money = {$money.0};
-            $.post("{:url('Orderpage/salesman_ty_go_pay')}",{leave_word:liuyan,id:indet_id,money:money,region:region,school_class:school_class,name:name,phone:phone},function(data){
-                if(data){
-                    window.location.href = "{:url('Pay/index',array('id'=>$indent_id))}";
+        indnet_id = "{$indent_id}";
+        $.post("{:url('Order/is_my_salesman')}",{indent_id:indnet_id},function(data){
+            if(data){
+                region = $('#city_text').text();
+                school_class = $('#school_class').text();
+                name = $('#name').val();
+                phone = $('#phone').val();
+                if(region == '请选择省市区'){
+                    alert('地区不能为空');
+                }else if(school_class == '请选择学校和班级'){
+                    alert('学校班级不能为空');
+                }else if(name == ''){
+                    alert('姓名不能为空');
+                }else if(phone == ''){
+                    alert('手机号不能为空');
                 }else{
                 }else{
-                    alert('更新订单失败');
+                    liuyan = $('#liuyan').val();
+                    indet_id = {$indent_id};
+                    money = {$money.0};
+                    $.post("{:url('Orderpage/salesman_ty_go_pay')}",{leave_word:liuyan,id:indet_id,money:money,region:region,school_class:school_class,name:name,phone:phone},function(data){
+                        if(data){
+                            window.location.href = "{:url('Pay/index',array('id'=>$indent_id))}";
+                        }else{
+                            alert('更新订单失败');
+                        }
+                    });
                 }
                 }
-            });
-        }
+            }else{
+                alert('不再此区域销售');
+            }
+        });
+
 
 
     }
     }
 
 

@@ -8,8 +8,59 @@
     <title>学考无忧-收入记录</title>
     <title>学考无忧-收入记录</title>
     <link rel="stylesheet" href="__TMPL__/public/assets/css/reset.css">
     <link rel="stylesheet" href="__TMPL__/public/assets/css/reset.css">
     <link rel="stylesheet" href="__TMPL__/public/assets/css/base.css">
     <link rel="stylesheet" href="__TMPL__/public/assets/css/base.css">
+    <link rel="stylesheet" href="__TMPL__/public/assets/css/mui.min.css">
+    <link rel="stylesheet" href="__TMPL__/public/assets/css/mui.picker.min.css">
 </head>
 </head>
+<style>
+    .time {
+        display: flex;
+        display: -webkit-flex;
+        justify-content: space-around;
+        align-items: center;
+        padding: 0.3rem 0 0.14rem 0;
+    }
 
 
+    .time_btn {
+        width: 1.16rem;
+        height: 0.64rem;
+        background: linear-gradient(328deg, rgba(255, 78, 0, 1) 0%, rgba(255, 157, 45, 1) 100%);
+        box-shadow: 0 0.06rem 0.12rem rgba(255, 128, 0, 0.24);
+        opacity: 1;
+        border-radius: 0.08rem;
+        text-align: center;
+        line-height: 0.64rem;
+        font-size: 0.28rem;
+        color: rgba(255, 255, 255, 1);
+    }
+
+    .time button {
+        width: 2.2rem;
+        height: 0.64rem;
+        background: rgba(235, 235, 235, 1);
+        border-radius: 0.32rem;
+        text-align: center;
+        font-size: 0.26rem;
+        color: rgba(153, 153, 153, 1);
+        border: none;
+        outline: 0;
+    }
+
+    .mui-poppicker-header,
+    .mui-picker {
+        background-color: white;
+    }
+
+    .mui-btn-blue,
+    .mui-btn-primary,
+    input[type=submit] {
+        background-color: #FF7700;
+        border: 0;
+    }
+
+    .mui-pciker-list li.highlight {
+        color: #FF7700;
+    }
+</style>
 <body>
 <body>
 <!-- 顶部 -->
 <!-- 顶部 -->
 <div class="order_top">
 <div class="order_top">
@@ -18,6 +69,18 @@
     </a>
     </a>
     <p>收入记录</p>
     <p>收入记录</p>
 </div>
 </div>
+
+<div class="time">
+    <div class="start_time">
+        <button id='result' data-options='{"type":"date"}'>选择起始时间</button>
+    </div>
+    <div class="end_time">
+        <button id='ss' data-options='{"type":"date"}'>选择截止时间</button>
+    </div>
+    <div class="time_btn" onclick="my_search()">搜索</div>
+</div>
+
+
 <div class="record_Box">
 <div class="record_Box">
     <ul>
     <ul>
         <volist name="res" id="vo">
         <volist name="res" id="vo">
@@ -26,7 +89,7 @@
                     <img src="{$vo.avatar}" alt="">
                     <img src="{$vo.avatar}" alt="">
                 </div>
                 </div>
                 <div class="recordTxt">
                 <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">
                     <if condition="$vo.indent_type eq 1">
                         <div class="recordTxt2">平台订单</div>
                         <div class="recordTxt2">平台订单</div>
                     </if>
                     </if>
@@ -44,7 +107,7 @@
                     <img src="{$vo.avatar}" alt="">
                     <img src="{$vo.avatar}" alt="">
                 </div>
                 </div>
                 <div class="recordTxt">
                 <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">
                     <if condition="$vo.indent_type eq 1">
                         <div class="recordTxt2">平台订单</div>
                         <div class="recordTxt2">平台订单</div>
                     </if>
                     </if>
@@ -61,6 +124,66 @@
 <!-- 底部更多 -->
 <!-- 底部更多 -->
 <div class="in_what">—— 已经到底了哦 ——</div>
 <div class="in_what">—— 已经到底了哦 ——</div>
 <script src="__TMPL__/public/assets/js/base.js"></script>
 <script src="__TMPL__/public/assets/js/base.js"></script>
+<script src="__TMPL__/public/assets/js/mui.min.js"></script>
+<script src="__TMPL__/public/assets/js/mui.picker.min.js"></script>
+<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();
+        var result = $('#result')[0];
+        var ss = document.getElementById("ss");
+        var btns = $('.btn');
+        result.addEventListener('tap', function() {
+            var optionsJson = this.getAttribute('data-options') || '{}';
+            var options = JSON.parse(optionsJson);
+            var id = this.getAttribute('id');
+            var picker = new $.DtPicker(options);
+            picker.show(function(rs) {
+                result.innerText = rs.text;
+                picker.dispose();
+                start_time = 1;
+            });
+            if(start_time==1&&end_time==1){
+                time_btn[0].innerText = '搜索'
+            }
+
+        }, false);
+        ss.addEventListener('tap', function() {
+            var optionsJson = this.getAttribute('data-options') || '{}';
+            var options = JSON.parse(optionsJson);
+            var id = this.getAttribute('id');
+            var picker = new $.DtPicker(options);
+            picker.show(function(rs) {
+                ss.innerText = rs.text;
+                picker.dispose();
+                end_time = 1
+                if(start_time==1&&end_time==1){
+                    time_btn[0].innerText = '搜索'
+                }
+            });
+
+        }, false);
+    })(mui);
+</script>
 </body>
 </body>
 
 
 </html>
 </html>

@@ -31,7 +31,7 @@
                             <p class="tationCon1_Txt1 one-txt-cut">{$vo.user_nickname}</p>
                             <p class="tationCon1_Txt1 one-txt-cut">{$vo.user_nickname}</p>
                         </div>
                         </div>
                         <div class="tationCon1_right">
                         <div class="tationCon1_right">
-                            <p class="tationCon1_Txt2">累计购买 ￥{$vo.cumulative_money}</p>
+                            <p class="tationCon1_Txt2">累计收益 ￥{$vo.cumulative_money}</p>
                             <div class="tationCon1_Img2">
                             <div class="tationCon1_Img2">
                                 <img src="__TMPL__/public/assets/images/down.png" alt="">
                                 <img src="__TMPL__/public/assets/images/down.png" alt="">
                             </div>
                             </div>

@@ -9,7 +9,12 @@
     <link rel="stylesheet" href="__TMPL__/public/assets/css/reset.css" />
     <link rel="stylesheet" href="__TMPL__/public/assets/css/reset.css" />
     <link rel="stylesheet" href="__TMPL__/public/assets/css/log.css" />
     <link rel="stylesheet" href="__TMPL__/public/assets/css/log.css" />
 </head>
 </head>
-
+<style>
+    .log_five_list_center{
+        width: 3.4rem;
+        padding-top: 0.04rem;
+    }
+</style>
 <body>
 <body>
 <!-- 弹窗 -->
 <!-- 弹窗 -->
 <div class="tx_mask">
 <div class="tx_mask">
@@ -53,7 +58,7 @@
                     <img src="{:cmf_get_image_url($vo.show_img)}" alt="" style="width: 100%;height: 100%;"/>
                     <img src="{:cmf_get_image_url($vo.show_img)}" alt="" style="width: 100%;height: 100%;"/>
                 </div>
                 </div>
                 <div class="log_five_list_center">
                 <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}
                         {$vo.book_name}
                     </div>
                     </div>
                     <div class="log_four_zong_shu" style="margin-top: 0.16rem">
                     <div class="log_four_zong_shu" style="margin-top: 0.16rem">

@@ -1305,6 +1305,7 @@
 }
 }
 
 
 .log_four_zong_shu {
 .log_four_zong_shu {
+	line-height: 1;
 	font-size: 0.4rem;
 	font-size: 0.4rem;
 	font-weight: 400;
 	font-weight: 400;
 	color: rgba(242, 0, 0, 1);
 	color: rgba(242, 0, 0, 1);
@@ -1315,7 +1316,6 @@
 	font-size: 0.28rem
 	font-size: 0.28rem
 }
 }
 
 
-
 /* log_five页面 */
 /* log_five页面 */
 
 
 
 
@@ -1325,6 +1325,7 @@
 	padding: 0.32rem 0.3rem 0.32rem 0.32rem;
 	padding: 0.32rem 0.3rem 0.32rem 0.32rem;
 	display: flex;
 	display: flex;
 	justify-content: space-around;
 	justify-content: space-around;
+	align-items: center;
 }
 }
 
 
 .log_five_list_left {
 .log_five_list_left {
@@ -1333,8 +1334,9 @@
 }
 }
 
 
 .log_five_list_center_one {
 .log_five_list_center_one {
-	font-size: 0.32rem;
+	font-size: 0.28rem;
 	font-weight: 400;
 	font-weight: 400;
+	line-height: 0.36rem;
 	color: rgba(51, 51, 51, 1);
 	color: rgba(51, 51, 51, 1);
 	opacity: 1;
 	opacity: 1;
 }
 }

@@ -204,7 +204,7 @@ class WeChatBaseController extends BaseController
      */
      */
     public function checkWeChatUserLogin()
     public function checkWeChatUserLogin()
     {
     {
-      /* $user = Db::name('user')->where('id',5)->find();
+       /*$user = Db::name('user')->where('id',2)->find();
        cmf_update_current_user($user);*/
        cmf_update_current_user($user);*/
         $userId = cmf_get_current_user_id();
         $userId = cmf_get_current_user_id();
         if (empty($userId)) {
         if (empty($userId)) {