作者 anyv
1 个管道 的构建 通过 耗费 5 秒

4

@@ -50,6 +50,10 @@ class OrderSalesmanController extends WeChatBaseController @@ -50,6 +50,10 @@ class OrderSalesmanController extends WeChatBaseController
50 foreach($data as $key => $vo){ 50 foreach($data as $key => $vo){
51 $indent_goods = $indentGoodsModel->selectData(['indent_id'=>$vo['id']]); 51 $indent_goods = $indentGoodsModel->selectData(['indent_id'=>$vo['id']]);
52 $data[$key]['indent_goods'] = $indent_goods; 52 $data[$key]['indent_goods'] = $indent_goods;
  53 + //判断订单是不是平台订单
  54 + if($vo['indent_type'] == 1){
  55 + $data[$key]['dizhi'] = Db::name('address') -> where('id',$vo['indent_address']) -> find();
  56 + }
53 } 57 }
54 $school = Db::name('school')->where('uid',$user_id)->order('create_time desc')->select()->toArray(); 58 $school = Db::name('school')->where('uid',$user_id)->order('create_time desc')->select()->toArray();
55 if(count($school)!=0){ 59 if(count($school)!=0){
@@ -606,12 +606,13 @@ class PersonalcenterController extends WeChatBaseController{ @@ -606,12 +606,13 @@ class PersonalcenterController extends WeChatBaseController{
606 'a.indent_type' => 2, 606 'a.indent_type' => 2,
607 'a.salesman_uid' => $uid 607 'a.salesman_uid' => $uid
608 ]; 608 ];
609 -  
610 - if($res['grade_class'] != ''){  
611 - $school_grade_class = explode(' ',$res['grade_class']);  
612 - $where['a.school'] = $school_grade_class[0];  
613 - $where['a.grade'] = $school_grade_class[1];  
614 - $where['a.class'] = $school_grade_class[3]; 609 + if($res['school'] != ''){
  610 + $where['a.school'] = $res['school'];
  611 + }
  612 + if($res['grade'] != ''){
  613 + $school_grade_class = explode('-',$res['grade']);
  614 + $where['a.grade'] = $school_grade_class[0];
  615 + $where['a.class'] = $school_grade_class[1];
615 } 616 }
616 617
617 if($res['start_time'] != '' && $res['end_time'] != ''){ 618 if($res['start_time'] != '' && $res['end_time'] != ''){
@@ -620,7 +621,7 @@ class PersonalcenterController extends WeChatBaseController{ @@ -620,7 +621,7 @@ class PersonalcenterController extends WeChatBaseController{
620 $where['a.pay_time'] = [['>=',$start_time],['<=',$end_time]]; 621 $where['a.pay_time'] = [['>=',$start_time],['<=',$end_time]];
621 } 622 }
622 /*$indent_goods = Db::name('indent') -> alias('a') -> field("a.*,b.indent_id,b.book_name,b.pricing,b.price,b.number,b.thumbnail") -> join('indent_goods b','a.id=b.indent_id','LEFT') -> where($where) -> where("a.state =2 or a.state=3 or a.state=5") -> select();*/ 623 /*$indent_goods = Db::name('indent') -> alias('a') -> field("a.*,b.indent_id,b.book_name,b.pricing,b.price,b.number,b.thumbnail") -> join('indent_goods b','a.id=b.indent_id','LEFT') -> where($where) -> where("a.state =2 or a.state=3 or a.state=5") -> select();*/
623 - $indent_money = Db::name('indent') -> alias('a') -> field("a.id,a.order_number,b.uid,b.money,b.type,b.book_num,b.indent_id") -> join('money_income b','a.id=b.indent_id','LEFT') -> where($where) -> where("a.state =2 or a.state=3 or a.state=5") -> where("b.uid =".$uid) -> select() -> toArray(); 624 + $indent_money = Db::name('indent') -> alias('a') -> field("a.id,a.order_number,a.pay_time,b.uid,b.money,b.type,b.book_num,b.indent_id") -> join('money_income b','a.id=b.indent_id','LEFT') -> where($where) -> where("a.state =2 or a.state=3 or a.state=5") -> where("b.uid =".$uid) -> select() -> toArray();
624 if(count($indent_money)!=0){ 625 if(count($indent_money)!=0){
625 foreach ($indent_money as $key => $val){ 626 foreach ($indent_money as $key => $val){
626 $indent_money[$key]['book_name'] = Db::name('indent_goods') -> where('indent_id',$val['id']) -> select() -> toArray(); 627 $indent_money[$key]['book_name'] = Db::name('indent_goods') -> where('indent_id',$val['id']) -> select() -> toArray();
@@ -630,12 +631,13 @@ class PersonalcenterController extends WeChatBaseController{ @@ -630,12 +631,13 @@ class PersonalcenterController extends WeChatBaseController{
630 }else{ 631 }else{
631 632
632 /*$indent_goods = Db::name('indent') -> alias('a') -> field("a.*,b.indent_id,b.book_name,b.pricing,b.price,b.number,b.thumbnail") -> join('indent_goods b','a.id=b.indent_id','LEFT') -> where('a.indent_type=2 and a.salesman_uid='.$uid) -> where("a.state =2 or a.state=3 or a.state=5") -> select();*/ 633 /*$indent_goods = Db::name('indent') -> alias('a') -> field("a.*,b.indent_id,b.book_name,b.pricing,b.price,b.number,b.thumbnail") -> join('indent_goods b','a.id=b.indent_id','LEFT') -> where('a.indent_type=2 and a.salesman_uid='.$uid) -> where("a.state =2 or a.state=3 or a.state=5") -> select();*/
633 - $indent_goods = Db::name('indent') -> alias('a') -> field("a.id,a.order_number,b.uid,b.money,b.type,b.book_num,b.indent_id") -> join('money_income b','a.id=b.indent_id','LEFT') -> where('a.indent_type=2 and a.salesman_uid='.$uid) -> where("a.state =2 or a.state=3 or a.state=5") -> where("b.uid =".$uid) -> select() -> toArray(); 634 + $indent_goods = Db::name('indent') -> alias('a') -> field("a.id,a.order_number,a.pay_time,b.uid,b.money,b.type,b.book_num,b.indent_id") -> join('money_income b','a.id=b.indent_id','LEFT') -> where('a.indent_type=2 and a.salesman_uid='.$uid) -> where("a.state =2 or a.state=3 or a.state=5") -> where("b.uid =".$uid) -> select() -> toArray();
634 if(count($indent_goods)!=0){ 635 if(count($indent_goods)!=0){
635 foreach ($indent_goods as $key => $val){ 636 foreach ($indent_goods as $key => $val){
636 $indent_goods[$key]['book_name'] = Db::name('indent_goods') -> where('indent_id',$val['id']) -> select() -> toArray(); 637 $indent_goods[$key]['book_name'] = Db::name('indent_goods') -> where('indent_id',$val['id']) -> select() -> toArray();
637 } 638 }
638 } 639 }
  640 +
639 $this -> assign('indent_goods',$indent_goods); 641 $this -> assign('indent_goods',$indent_goods);
640 $indent_money = Db::name('money_income') -> where("uid =".$uid) -> select(); 642 $indent_money = Db::name('money_income') -> where("uid =".$uid) -> select();
641 } 643 }
@@ -396,8 +396,8 @@ @@ -396,8 +396,8 @@
396 <foreach name="$vo.indent_goods" item="i_g"> 396 <foreach name="$vo.indent_goods" item="i_g">
397 <div class="dingdan_detail"> 397 <div class="dingdan_detail">
398 <div class="dingdan_detail_top"> 398 <div class="dingdan_detail_top">
399 - <div class="dingdan_detail_hao">订单号:2019062557100499</div>  
400 - <div class="dingdan_lianxi_ren">联系人:姚经理</div> 399 + <div class="dingdan_detail_hao">订单号:{$vo.order_number}</div>
  400 + <div class="dingdan_lianxi_ren">联系人:{$vo.name}</div>
401 </div> 401 </div>
402 <div class="log_three_list_center" style="display: flex;justify-content: flex-start;"> 402 <div class="log_three_list_center" style="display: flex;justify-content: flex-start;">
403 <div class="log_three_list_center_left" style="width: 1.44rem;height:1.44rem"> 403 <div class="log_three_list_center_left" style="width: 1.44rem;height:1.44rem">
@@ -420,8 +420,9 @@ @@ -420,8 +420,9 @@
420 <div class="right_dingdan_center"> 420 <div class="right_dingdan_center">
421 <div class="right_dindan_three right_dingdan_one">x{$i_g.number}</div> 421 <div class="right_dindan_three right_dingdan_one">x{$i_g.number}</div>
422 </div> 422 </div>
423 - <div class="right_dingdan_four right_dingdan_one">bdkjasdhasjdkladjlasjdk;lasdl</div>  
424 - <div class="right_dingdan_four right_dingdan_one" style="margin-top: -0.05rem;">联系电话:15266669999</div> 423 +
  424 + <div class="right_dingdan_four right_dingdan_one">地址:{$vo.school} {$vo.grade} {$vo.class}</div>
  425 + <div class="right_dingdan_four right_dingdan_one" style="margin-top: -0.05rem;">联系电话:{$vo.phone}</div>
425 </div> 426 </div>
426 </div> 427 </div>
427 428
@@ -158,21 +158,25 @@ @@ -158,21 +158,25 @@
158 <div class="log_ten_list_one"> 158 <div class="log_ten_list_one">
159 <div class="log_ten_list_one_center"> 159 <div class="log_ten_list_one_center">
160 <div class="log_ten_list_one_center_top txt-cut" style="-webkit-line-clamp: 1;"> 160 <div class="log_ten_list_one_center_top txt-cut" style="-webkit-line-clamp: 1;">
161 - 111 161 + {$vo.order_number}
  162 + </div>
  163 + <div class="log_ten_shu_name txt-cut" style="-webkit-line-clamp: 2;">
  164 + <volist name="vo.book_name" id="vol">
  165 + {$vol.book_name},
  166 + </volist>
162 </div> 167 </div>
163 - <div class="log_ten_shu_name txt-cut" style="-webkit-line-clamp: 2;">一大堆的民治都是的萨哈大大一大堆的民治都是的萨哈大大一大堆的民治都是的萨哈大大姐撒旦教哦和卡视角断开连接案件断开连接</div>  
164 <div class="log_ten_list_one_center_bottom"> 168 <div class="log_ten_list_one_center_bottom">
165 <div class="log_ten_list_onb_icon"> 169 <div class="log_ten_list_onb_icon">
166 <img src="__TMPL__/public/assets/images/52.png" alt="" /> 170 <img src="__TMPL__/public/assets/images/52.png" alt="" />
167 </div> 171 </div>
168 <div class="log_ten_list_onb_title"> 172 <div class="log_ten_list_onb_title">
  173 + {$vo.pay_time|date="Y-m-d H:i:s",###}
169 174
170 - 1111  
171 </div> 175 </div>
172 </div> 176 </div>
173 </div> 177 </div>
174 <div class="log_ten_list_one_right" > 178 <div class="log_ten_list_one_right" >
175 - <div class="log_ten_list_one_right_top"><span></span>20</div> 179 + <div class="log_ten_list_one_right_top"><span></span>{$vo.money}</div>
176 </div> 180 </div>
177 </div> 181 </div>
178 </volist> 182 </volist>
@@ -351,22 +355,24 @@ @@ -351,22 +355,24 @@
351 start_time = $('.start_time').text(); 355 start_time = $('.start_time').text();
352 end_time = $('.end_time').text(); 356 end_time = $('.end_time').text();
353 357
  358 +
  359 + grade_class = xeschool+' '+xegread;
  360 + console.log(grade_class);
354 if(xeschool == '请选择学校'){ 361 if(xeschool == '请选择学校'){
355 - alert('请选择学校');  
356 - }else{ 362 + xeschool = '';
  363 + }
357 if(xegread == '请选择班级'){ 364 if(xegread == '请选择班级'){
358 - alert('请选择班级');  
359 - }else{  
360 - grade_class = xeschool+' '+xegread; 365 + xegread = '';
  366 + }
361 if(start_time == '请选择开始时间'){ 367 if(start_time == '请选择开始时间'){
362 start_time = ''; 368 start_time = '';
363 } 369 }
364 if(end_time == '请选择结束时间'){ 370 if(end_time == '请选择结束时间'){
365 end_time = ''; 371 end_time = '';
366 } 372 }
367 - window.location.href = "{:url('Personalcenter/mall_profit')}?grade_class="+grade_class+"&start_time="+start_time+"&end_time="+end_time;  
368 - }  
369 - } 373 + window.location.href = "{:url('Personalcenter/mall_profit')}?school="+xeschool+"&start_time="+start_time+"&end_time="+end_time+"&grade="+xegread;
  374 +
  375 +
370 } 376 }
371 377
372 </script> 378 </script>