anyv / xkeasy · 提交

转到一个项目

作者 王晓刚
提交 8d7f8d0fbc8a5e01722ac2bcc1f4ee1042cb9fd7 2 个父辈 d29ae02c fa959751
1 个管道 的构建 通过 耗费 1 秒

合并分支 'wangxiaogang' 到 'master' 

Wangxiaogang



查看合并请求 !121
内嵌 并排对比
正在显示 2 个修改的文件 包含 169 行增加 和 115 行删除
@@ -19,7 +19,8 @@ @@ -19,7 +19,8 @@
19 position: fixed; 19 position: fixed;
20 background-color: rgba(0, 0, 0, 0.5); 20 background-color: rgba(0, 0, 0, 0.5);
21 } 21 }
22 - .take_one{ 22 +
  23 + .take_one {
23 margin-top: 0.3rem; 24 margin-top: 0.3rem;
24 width: 1.6rem; 25 width: 1.6rem;
25 height: 0.48rem; 26 height: 0.48rem;
@@ -64,7 +65,8 @@ @@ -64,7 +65,8 @@
64 border-left: none; 65 border-left: none;
65 border-right: none 66 border-right: none
66 } 67 }
67 - .get_Go{ 68 +
  69 + .get_Go {
68 height: 0.36rem; 70 height: 0.36rem;
69 margin: 0.08rem; 71 margin: 0.08rem;
70 font-size: 0.24rem; 72 font-size: 0.24rem;
@@ -77,6 +79,7 @@ @@ -77,6 +79,7 @@
77 border-left: none; 79 border-left: none;
78 border-right: none; 80 border-right: none;
79 } 81 }
  82 +
80 .mui-poppicker-header, 83 .mui-poppicker-header,
81 .mui-picker { 84 .mui-picker {
82 background-color: white; 85 background-color: white;
@@ -92,10 +95,12 @@ @@ -92,10 +95,12 @@
92 .mui-pciker-list li.highlight { 95 .mui-pciker-list li.highlight {
93 color: #FF7700; 96 color: #FF7700;
94 } 97 }
95 - .mui-dtpicker-header,.mui-dtpicker-title h5{ 98 +
  99 + .mui-dtpicker-header, .mui-dtpicker-title h5 {
96 background-color: white; 100 background-color: white;
97 } 101 }
98 - .dingdan_lianxi_ren{ 102 +
  103 + .dingdan_lianxi_ren {
99 font-size: 0.28rem; 104 font-size: 0.28rem;
100 cursor: pointer; 105 cursor: pointer;
101 font-family: PingFang SC; 106 font-family: PingFang SC;
@@ -103,22 +108,27 @@ @@ -103,22 +108,27 @@
103 color: rgba(102, 102, 102, 1); 108 color: rgba(102, 102, 102, 1);
104 opacity: 1; 109 opacity: 1;
105 } 110 }
106 - .dingdan_detail{  
107 - padding-top: 0.22rem;  
108 - }  
109 - .dingdan_detail_hao{ 111 +
  112 + /*.dingdan_detail {*/
  113 + /*padding-top: 0.22rem;*/
  114 + /*}*/
  115 +
  116 + .dingdan_detail_hao {
110 font-size: 0.28rem; 117 font-size: 0.28rem;
111 cursor: pointer; 118 cursor: pointer;
112 font-family: PingFang SC; 119 font-family: PingFang SC;
113 font-weight: 400; 120 font-weight: 400;
114 color: rgba(102, 102, 102, 1); 121 color: rgba(102, 102, 102, 1);
115 opacity: 1; 122 opacity: 1;
  123 + margin-top:0.2rem;
116 } 124 }
117 - .right_dingdan{ 125 +
  126 + .right_dingdan {
118 width: 5.6rem; 127 width: 5.6rem;
119 margin-left: 0.2rem; 128 margin-left: 0.2rem;
120 } 129 }
121 - .right_dingdan_top{ 130 +
  131 + .right_dingdan_top {
122 display: flex; 132 display: flex;
123 justify-content: space-between; 133 justify-content: space-between;
124 display: -webkit-box; /* Chrome 4+, Safari 3.1, iOS Safari 3.2+ */ 134 display: -webkit-box; /* Chrome 4+, Safari 3.1, iOS Safari 3.2+ */
@@ -135,17 +145,20 @@ @@ -135,17 +145,20 @@
135 -moz-box-align-items: center; 145 -moz-box-align-items: center;
136 -ms-flexbox-align-items: center; 146 -ms-flexbox-align-items: center;
137 } 147 }
138 - .right_dingdan_center{ 148 +
  149 + .right_dingdan_center {
139 text-align: right; 150 text-align: right;
140 } 151 }
141 - .right_dingdan_one{ 152 +
  153 + .right_dingdan_one {
142 font-size: 0.26rem; 154 font-size: 0.26rem;
143 cursor: pointer; 155 cursor: pointer;
144 font-weight: 400; 156 font-weight: 400;
145 color: rgba(51, 51, 51, 1); 157 color: rgba(51, 51, 51, 1);
146 opacity: 1; 158 opacity: 1;
147 } 159 }
148 - .right_dingdan_two{ 160 +
  161 + .right_dingdan_two {
149 font-size: 0.34rem; 162 font-size: 0.34rem;
150 font-weight: 400; 163 font-weight: 400;
151 cursor: pointer; 164 cursor: pointer;
@@ -153,7 +166,8 @@ @@ -153,7 +166,8 @@
153 color: rgba(51, 51, 51, 1); 166 color: rgba(51, 51, 51, 1);
154 opacity: 1; 167 opacity: 1;
155 } 168 }
156 - .shuju_zongshu{ 169 +
  170 + .shuju_zongshu {
157 padding-left: 0.4rem; 171 padding-left: 0.4rem;
158 font-size: 0.28rem; 172 font-size: 0.28rem;
159 font-weight: 600; 173 font-weight: 600;
@@ -313,14 +327,14 @@ @@ -313,14 +327,14 @@
313 </div> 327 </div>
314 <!-- 下拉框 --> 328 <!-- 下拉框 -->
315 <div class="log_three_select"> 329 <div class="log_three_select">
316 - <!-- <div class="log_three_select_one log_three_select_school" style="cursor: pointer">  
317 - <div class="log_three_select_title log_three_select_school2">  
318 - 请选择学校/班级  
319 - </div>  
320 - <div class="log_three_select_img">  
321 - <img src="__TMPL__/public/assets/images/75.png" alt=""/>  
322 - </div>  
323 - </div>--> 330 + <!-- <div class="log_three_select_one log_three_select_school" style="cursor: pointer">
  331 + <div class="log_three_select_title log_three_select_school2">
  332 + 请选择学校/班级
  333 + </div>
  334 + <div class="log_three_select_img">
  335 + <img src="__TMPL__/public/assets/images/75.png" alt=""/>
  336 + </div>
  337 + </div>-->
324 338
325 339
326 <div class="log_three_select_one log_three_select_school"> 340 <div class="log_three_select_one log_three_select_school">
@@ -328,7 +342,7 @@ @@ -328,7 +342,7 @@
328 请选择学校 342 请选择学校
329 </div> 343 </div>
330 <!--<div class="log_three_select_img">--> 344 <!--<div class="log_three_select_img">-->
331 - <!--<img src="__TMPL__/public/assets/images/75.png" alt="" />--> 345 + <!--<img src="__TMPL__/public/assets/images/75.png" alt="" />-->
332 <!--</div>--> 346 <!--</div>-->
333 </div> 347 </div>
334 <div class="log_three_select_one log_three_select_school"> 348 <div class="log_three_select_one log_three_select_school">
@@ -336,7 +350,7 @@ @@ -336,7 +350,7 @@
336 请选择班级 350 请选择班级
337 </div> 351 </div>
338 <!--<div class="log_three_select_img">--> 352 <!--<div class="log_three_select_img">-->
339 - <!--<img src="__TMPL__/public/assets/images/75.png" alt="" />--> 353 + <!--<img src="__TMPL__/public/assets/images/75.png" alt="" />-->
340 <!--</div>--> 354 <!--</div>-->
341 </div> 355 </div>
342 356
@@ -346,7 +360,7 @@ @@ -346,7 +360,7 @@
346 统一配送 360 统一配送
347 </div> 361 </div>
348 <!--<div class="log_three_select_img">--> 362 <!--<div class="log_three_select_img">-->
349 - <!--<img src="__TMPL__/public/assets/images/75.png" alt=""/>--> 363 + <!--<img src="__TMPL__/public/assets/images/75.png" alt=""/>-->
350 <!--</div>--> 364 <!--</div>-->
351 </div> 365 </div>
352 <div class="log_three_select_one log_three_select_btn search"> 366 <div class="log_three_select_one log_three_select_btn search">
@@ -356,7 +370,7 @@ @@ -356,7 +370,7 @@
356 <input type="hidden" id="grade" value=""/> 370 <input type="hidden" id="grade" value=""/>
357 <input type="hidden" id="is_courier" value="1"/> 371 <input type="hidden" id="is_courier" value="1"/>
358 </div> 372 </div>
359 -<div class="shuju_zongshu">搜索结果为20条</div> 373 +<div class="shuju_zongshu">搜索结果为<span class="count">{:count($data)}</span>条</div>
360 <!-- 列表内容 --> 374 <!-- 列表内容 -->
361 <div> 375 <div>
362 <!--未发货--> 376 <!--未发货-->
@@ -393,39 +407,43 @@ @@ -393,39 +407,43 @@
393 </div> 407 </div>
394 </div> 408 </div>
395 <a href="{:url('get_one',array('id'=>$vo['id']))}"> 409 <a href="{:url('get_one',array('id'=>$vo['id']))}">
  410 + <div class="dingdan_detail_top">
  411 + <div class="dingdan_detail_hao">订单号：{$vo.order_number}</div>
  412 + </div>
396 <foreach name="$vo.indent_goods" item="i_g"> 413 <foreach name="$vo.indent_goods" item="i_g">
397 <div class="dingdan_detail"> 414 <div class="dingdan_detail">
398 - <div class="dingdan_detail_top">  
399 - <div class="dingdan_detail_hao">订单号：{$vo.order_number}</div>  
400 - <div class="dingdan_lianxi_ren">联系人：{$vo.name}</div>  
401 - </div>  
402 <div class="log_three_list_center" style="display: flex;justify-content: flex-start;"> 415 <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"> 416 <div class="log_three_list_center_left" style="width: 1.44rem;height:1.44rem">
404 - <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt="" style="width: 100%;height: 100%;"/> 417 + <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt=""
  418 + style="width: 100%;height: 100%;"/>
405 </div> 419 </div>
406 <!--<div class="log_three_list_center_right" style="margin-left: 0.16rem;width: 5.6rem">--> 420 <!--<div class="log_three_list_center_right" style="margin-left: 0.16rem;width: 5.6rem">-->
407 - <!--<div class="log_three_center_one">-->  
408 - <!--{$i_g.book_name}-->  
409 - <!--</div>-->  
410 - <!--<div class="right_dingdan_money">-->  
411 - <!--<div class="log_three_center_three"><span>￥</span>{$i_g.price}</div>-->  
412 - <!--<div class="log_three_center_two">×{$i_g.number}</div>-->  
413 - <!--</div>--> 421 + <!--<div class="log_three_center_one">-->
  422 + <!--{$i_g.book_name}-->
  423 + <!--</div>-->
  424 + <!--<div class="right_dingdan_money">-->
  425 + <!--<div class="log_three_center_three"><span>￥</span>{$i_g.price}</div>-->
  426 + <!--<div class="log_three_center_two">×{$i_g.number}</div>-->
  427 + <!--</div>-->
414 <!--</div>--> 428 <!--</div>-->
415 <div class="right_dingdan"> 429 <div class="right_dingdan">
416 <div class="right_dingdan_top"> 430 <div class="right_dingdan_top">
417 <div class="right_dingdan_one">{$i_g.book_name}</div> 431 <div class="right_dingdan_one">{$i_g.book_name}</div>
418 <div class="right_dingdan_two">￥{$i_g.price}</div> 432 <div class="right_dingdan_two">￥{$i_g.price}</div>
419 </div> 433 </div>
420 - <div class="right_dingdan_center">  
421 - <div class="right_dindan_three right_dingdan_one">x{$i_g.number}</div>  
422 - </div> 434 + <div class="right_dingdan_center">
  435 + <div class="right_dindan_three right_dingdan_one">x{$i_g.number}</div>
  436 + </div>
423 437
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> 438 + <div class="right_dingdan_four right_dingdan_one">地址：{$vo.school} {$vo.grade}
  439 + {$vo.class}
  440 + </div>
  441 + <div class="right_dingdan_four right_dingdan_one" style="margin-top: -0.05rem;">
  442 + {$vo.name}电话：{$vo.phone}
  443 + </div>
  444 + </div>
426 </div> 445 </div>
427 </div> 446 </div>
428 -  
429 </foreach> 447 </foreach>
430 </a> 448 </a>
431 <!-- 立即发货 --> 449 <!-- 立即发货 -->
@@ -448,7 +466,7 @@ @@ -448,7 +466,7 @@
448 </if> 466 </if>
449 <elseif condition="$vo.state eq 3"/> 467 <elseif condition="$vo.state eq 3"/>
450 <!--<div class="log_three_bottom" data-indent-id="{$vo.id}">--> 468 <!--<div class="log_three_bottom" data-indent-id="{$vo.id}">-->
451 - <!--已完成啦--> 469 + <!--已完成啦-->
452 <!--</div>--> 470 <!--</div>-->
453 </if> 471 </if>
454 </div> 472 </div>
@@ -496,8 +514,9 @@ @@ -496,8 +514,9 @@
496 <a href="{:url('get_one',array('id'=>$vo['id']))}"> 514 <a href="{:url('get_one',array('id'=>$vo['id']))}">
497 <foreach name="$vo.indent_goods" item="i_g"> 515 <foreach name="$vo.indent_goods" item="i_g">
498 <div class="log_three_list_center" style="display: flex;justify-content: flex-start;"> 516 <div class="log_three_list_center" style="display: flex;justify-content: flex-start;">
499 - <div class="log_three_list_center_left" style="width: 1.44rem;height:1.44rem">  
500 - <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt="" style="width: 100%;height: 100%;"/> 517 + <div class="log_three_list_center_left" style="width: 1.44rem;height:1.44rem">
  518 + <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt=""
  519 + style="width: 100%;height: 100%;"/>
501 </div> 520 </div>
502 <div class="log_three_list_center_right" style="margin-left: 0.16rem;"> 521 <div class="log_three_list_center_right" style="margin-left: 0.16rem;">
503 <div class="log_three_center_one"> 522 <div class="log_three_center_one">
@@ -522,14 +541,14 @@ @@ -522,14 +541,14 @@
522 查看物流 541 查看物流
523 </div> 542 </div>
524 </a> 543 </a>
525 - <else /> 544 + <else/>
526 <div class="take_one" data-indent-id="{$vo.id}"> 545 <div class="take_one" data-indent-id="{$vo.id}">
527 完成 546 完成
528 </div> 547 </div>
529 </if> 548 </if>
530 <elseif condition="$vo.state eq 3"/> 549 <elseif condition="$vo.state eq 3"/>
531 <!--<div class="log_three_bottom" data-indent-id="{$vo.id}">--> 550 <!--<div class="log_three_bottom" data-indent-id="{$vo.id}">-->
532 - <!--已完成啦--> 551 + <!--已完成啦-->
533 <!--</div>--> 552 <!--</div>-->
534 </if> 553 </if>
535 </div> 554 </div>
@@ -577,7 +596,8 @@ @@ -577,7 +596,8 @@
577 <foreach name="$vo.indent_goods" item="i_g"> 596 <foreach name="$vo.indent_goods" item="i_g">
578 <div class="log_three_list_center" style="display: flex;justify-content: flex-start;"> 597 <div class="log_three_list_center" style="display: flex;justify-content: flex-start;">
579 <div class="log_three_list_center_left" style="width: 1.44rem;height:1.44rem"> 598 <div class="log_three_list_center_left" style="width: 1.44rem;height:1.44rem">
580 - <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt="" style="width: 100%;height: 100%;"/> 599 + <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt=""
  600 + style="width: 100%;height: 100%;"/>
581 </div> 601 </div>
582 <div class="log_three_list_center_right" style="margin-left: 0.16rem;"> 602 <div class="log_three_list_center_right" style="margin-left: 0.16rem;">
583 <div class="log_three_center_one"> 603 <div class="log_three_center_one">
@@ -608,7 +628,7 @@ @@ -608,7 +628,7 @@
608 </if> 628 </if>
609 <elseif condition="$vo.state eq 3"/> 629 <elseif condition="$vo.state eq 3"/>
610 <!--<div class="log_three_bottom" data-indent-id="{$vo.id}">--> 630 <!--<div class="log_three_bottom" data-indent-id="{$vo.id}">-->
611 - <!--已完成啦--> 631 + <!--已完成啦-->
612 <!--</div>--> 632 <!--</div>-->
613 </if> 633 </if>
614 </div> 634 </div>
@@ -646,27 +666,29 @@ @@ -646,27 +666,29 @@
646 var classpicker = new mui.PopPicker(); 666 var classpicker = new mui.PopPicker();
647 var class_arr = ''; 667 var class_arr = '';
648 zujian(); 668 zujian();
649 - function zujian(data_class_arr){  
650 - (function($, doc) { 669 +
  670 + function zujian(data_class_arr) {
  671 + (function ($, doc) {
651 $.init(); 672 $.init();
652 school_arr = {$school}; 673 school_arr = {$school};
653 - console.log(data_class_arr,'dfdfds');  
654 - $.ready(function() { 674 + console.log(data_class_arr, 'dfdfds');
  675 + $.ready(function () {
655 schoolpicker.setData(school_arr); 676 schoolpicker.setData(school_arr);
656 classpicker.setData(data_class_arr); 677 classpicker.setData(data_class_arr);
657 }); 678 });
658 })(mui, document); 679 })(mui, document);
659 } 680 }
  681 +
660 var school_name; 682 var school_name;
661 - $(".log_three_select_school2").click(function() {  
662 - schoolpicker.show(function(e) { 683 + $(".log_three_select_school2").click(function () {
  684 + schoolpicker.show(function (e) {
663 school_name = e[0].value; 685 school_name = e[0].value;
664 school_names = e[0].text; 686 school_names = e[0].text;
665 $('#school').val(school_names); 687 $('#school').val(school_names);
666 $(".log_three_select_school2").text(e[0].text); 688 $(".log_three_select_school2").text(e[0].text);
667 $('.log_three_select_school2').css('color', '#333333'); 689 $('.log_three_select_school2').css('color', '#333333');
668 - $.post("{:url('Personalcenter/get_grade_class')}",{id:school_name},function(data){  
669 - if(data){ 690 + $.post("{:url('Personalcenter/get_grade_class')}", {id: school_name}, function (data) {
  691 + if (data) {
670 data = JSON.parse(data); 692 data = JSON.parse(data);
671 zujian(data); 693 zujian(data);
672 } 694 }
@@ -675,10 +697,10 @@ @@ -675,10 +697,10 @@
675 }); 697 });
676 698
677 }) 699 })
678 - $(".log_three_select_class2").click(function() {  
679 - if(school_name != undefined) {  
680 - classpicker.show(function(e) {  
681 - class_name=e[0].text; 700 + $(".log_three_select_class2").click(function () {
  701 + if (school_name != undefined) {
  702 + classpicker.show(function (e) {
  703 + class_name = e[0].text;
682 $('#grade').val(class_name); 704 $('#grade').val(class_name);
683 $(".log_three_select_class2").text(e[0].text); 705 $(".log_three_select_class2").text(e[0].text);
684 $('.log_three_select_class2').css('color', '#333333'); 706 $('.log_three_select_class2').css('color', '#333333');
@@ -692,18 +714,19 @@ @@ -692,18 +714,19 @@
692 function zZFun(e) { 714 function zZFun(e) {
693 window.event ? (window.event.cancelBubble = true) : e.stopPropagation(); 715 window.event ? (window.event.cancelBubble = true) : e.stopPropagation();
694 } 716 }
  717 +
695 // 选择学校 718 // 选择学校
696 -// $(".three_model_school_left").click(function () {  
697 -// var indexs = $(this).index();  
698 -// $(".three_model_school_data").eq(indexs).css("display", "block").siblings().css("display", "none");  
699 -// }); 719 + // $(".three_model_school_left").click(function () {
  720 + // var indexs = $(this).index();
  721 + // $(".three_model_school_data").eq(indexs).css("display", "block").siblings().css("display", "none");
  722 + // });
700 723
701 $(".log_three_tab_one").click(function () { 724 $(".log_three_tab_one").click(function () {
702 var tabIndex = $(this).index(); 725 var tabIndex = $(this).index();
703 $(this).addClass("log_three_tab_two").addClass("word_color").addClass('aaa').siblings().removeClass("log_three_tab_two").removeClass("word_color").removeClass("aaa"); 726 $(this).addClass("log_three_tab_two").addClass("word_color").addClass('aaa').siblings().removeClass("log_three_tab_two").removeClass("word_color").removeClass("aaa");
704 $('.log_three_list_contant').eq(tabIndex).css('display', 'block').siblings().css('display', 'none'); 727 $('.log_three_list_contant').eq(tabIndex).css('display', 'block').siblings().css('display', 'none');
705 search(); 728 search();
706 - $('.log_three_fixed_left_one img').attr('src',"__TMPL__/public/assets/images/fangkuang.png") 729 + $('.log_three_fixed_left_one img').attr('src', "__TMPL__/public/assets/images/fangkuang.png")
707 }); 730 });
708 $(".three_model_school_tab>div").click(function () { 731 $(".three_model_school_tab>div").click(function () {
709 $(this).addClass("three_model_school_hover").addClass("word_color").addClass('aaa').siblings().removeClass("three_model_school_hover").removeClass("word_color").removeClass("aaa"); 732 $(this).addClass("three_model_school_hover").addClass("word_color").addClass('aaa').siblings().removeClass("three_model_school_hover").removeClass("word_color").removeClass("aaa");
@@ -718,23 +741,25 @@ @@ -718,23 +741,25 @@
718 //判断订单是否全选了 741 //判断订单是否全选了
719 check(); 742 check();
720 }); 743 });
721 - function check(){ 744 +
  745 + function check() {
722 var index = $(".log_three_tab_top .log_three_tab_one").index($('.aaa')); 746 var index = $(".log_three_tab_top .log_three_tab_one").index($('.aaa'));
723 var length = $(".log_three_list_contant").eq(index).find('.log_three_list_top_lo img').length; 747 var length = $(".log_three_list_contant").eq(index).find('.log_three_list_top_lo img').length;
724 var l = 0; 748 var l = 0;
725 - for(var n=0;n<length;n++){ 749 + for (var n = 0; n < length; n++) {
726 console.log($(".log_three_list_contant").eq(index).find('.log_three_list_top_lo img').eq(n).attr('src')); 750 console.log($(".log_three_list_contant").eq(index).find('.log_three_list_top_lo img').eq(n).attr('src'));
727 - if($(".log_three_list_contant").eq(index).find('.log_three_list_top_lo img').eq(n).attr('src') == "__TMPL__/public/assets/images/xuanzhong (1).png"){ 751 + if ($(".log_three_list_contant").eq(index).find('.log_three_list_top_lo img').eq(n).attr('src') == "__TMPL__/public/assets/images/xuanzhong (1).png") {
728 l++ 752 l++
729 } 753 }
730 } 754 }
731 - console.log('@@@@@'+l+'@@@@@'+length);  
732 - if(l == length){  
733 - $('.log_three_fixed_left_one img').attr('src',"__TMPL__/public/assets/images/xuanzhong (1).png")  
734 - }else{  
735 - $('.log_three_fixed_left_one img').attr('src',"__TMPL__/public/assets/images/fangkuang.png") 755 + console.log('@@@@@' + l + '@@@@@' + length);
  756 + if (l == length) {
  757 + $('.log_three_fixed_left_one img').attr('src', "__TMPL__/public/assets/images/xuanzhong (1).png")
  758 + } else {
  759 + $('.log_three_fixed_left_one img').attr('src', "__TMPL__/public/assets/images/fangkuang.png")
736 } 760 }
737 } 761 }
  762 +
738 $(".log_three_fixed_left_one").click(function () { 763 $(".log_three_fixed_left_one").click(function () {
739 if ( 764 if (
740 $(this) 765 $(this)
@@ -834,9 +859,10 @@ @@ -834,9 +859,10 @@
834 console.log(data); 859 console.log(data);
835 if (data.code == 1) { 860 if (data.code == 1) {
836 var result = data.data; 861 var result = data.data;
837 - if(result == 0){ 862 + console.log(result);
  863 + if (result == 0) {
838 var html = "<div style=\"text-align: center;width: 100%;height:100%;margin:0 auto;\">暂无数据</div>"; 864 var html = "<div style=\"text-align: center;width: 100%;height:100%;margin:0 auto;\">暂无数据</div>";
839 - }else{ 865 + } else {
840 var html = ''; 866 var html = '';
841 } 867 }
842 for (var i = 0; i < result.length; i++) { 868 for (var i = 0; i < result.length; i++) {
@@ -860,7 +886,7 @@ @@ -860,7 +886,7 @@
860 "\t\t\t\t\t\t\t\t\t\t\t</div></div>\n" + 886 "\t\t\t\t\t\t\t\t\t\t\t</div></div>\n" +
861 "\t\t\t\t\t\t\t\t\t\t</a>"; 887 "\t\t\t\t\t\t\t\t\t\t</a>";
862 } else { 888 } else {
863 - var html_bottom = "<div class=\"take_one\" data-indent-id=\""+result[i].id+"\">\n" + 889 + var html_bottom = "<div class=\"take_one\" data-indent-id=\"" + result[i].id + "\">\n" +
864 " 完成\n" + 890 " 完成\n" +
865 " </div>"; 891 " </div>";
866 } 892 }
@@ -871,25 +897,49 @@ @@ -871,25 +897,49 @@
871 var indent_goods_data = result[i].indent_goods; 897 var indent_goods_data = result[i].indent_goods;
872 var indent_goods_html = ''; 898 var indent_goods_html = '';
873 for (var i3 = 0; i3 < indent_goods_data.length; i3++) { 899 for (var i3 = 0; i3 < indent_goods_data.length; i3++) {
874 - indent_goods_html += "<div class=\"log_three_list_center\" style=\"display: flex;justify-content: flex-start;\">\n" +  
875 - " <div class=\"log_three_list_center_left\" style=\"width: 1.44rem;height:1.44rem\">\n" +  
876 - " <img src=\"" + indent_goods_data[i3].thumbnail + "\" alt=\"\" style=\"width: 100%;height: 100%;\"/>\n" +  
877 - " </div>\n" +  
878 - " <div class=\"log_three_list_center_right\" style=\"margin-left: 0.16rem;\">\n" +  
879 - " <div class=\"log_three_center_one\">\n" +  
880 - " " + indent_goods_data[i3].book_name + "\n" + 900 + // indent_goods_html += "<div class=\"log_three_list_center\" style=\"display: flex;justify-content: flex-start;\">\n" +
  901 + // " <div class=\"log_three_list_center_left\" style=\"width: 1.44rem;height:1.44rem\">\n" +
  902 + // " <img src=\"" + indent_goods_data[i3].thumbnail + "\" alt=\"\" style=\"width: 100%;height: 100%;\"/>\n" +
  903 + // " </div>\n" +
  904 + // " <div class=\"log_three_list_center_right\" style=\"margin-left: 0.16rem;\">\n" +
  905 + // " <div class=\"log_three_center_one\">\n" +
  906 + // " " + indent_goods_data[i3].book_name + "\n" +
  907 + // " </div>\n" +
  908 + // " <div class=\"log_three_center_two\">×" + indent_goods_data[i3].number + "</div>\n" +
  909 + // " <div class=\"log_three_center_three\"><span>￥</span>" + indent_goods_data[i3].price + "</div>\n" +
  910 + // " </div>\n" +
  911 + // " </div>";
  912 + indent_goods_html += "<div class=\"dingdan_detail\">\n" +
  913 + " <div class=\"log_three_list_center\" style=\"display: flex;justify-content: flex-start;\">\n" +
  914 + " <div class=\"log_three_list_center_left\" style=\"width: 1.44rem;height:1.44rem\">\n" +
  915 + " <img src=\""+indent_goods_data[i3].thumbnail+"\" alt=\"\"\n" +
  916 + " style=\"width: 100%;height: 100%;\"/>\n" +
  917 + " </div>\n" +
  918 + " <div class=\"right_dingdan\">\n" +
  919 + " <div class=\"right_dingdan_top\">\n" +
  920 + " <div class=\"right_dingdan_one\">"+indent_goods_data[i3].book_name+"</div>\n" +
  921 + " <div class=\"right_dingdan_two\">￥"+indent_goods_data[i3].price+"</div>\n" +
  922 + " </div>\n" +
  923 + " <div class=\"right_dingdan_center\">\n" +
  924 + " <div class=\"right_dindan_three right_dingdan_one\">x"+indent_goods_data[i3].number+"</div>\n" +
  925 + " </div>\n" +
  926 + "\n" +
  927 + " <div class=\"right_dingdan_four right_dingdan_one\">地址："+result[i].school+" "+result[i].grade+"\n" +
  928 + " "+result[i].class+"\n" +
  929 + " </div>\n" +
  930 + " <div class=\"right_dingdan_four right_dingdan_one\" style=\"margin-top: -0.05rem;\">\n" +
  931 + " "+result[i].name+"电话："+result[i].phone+"\n" +
  932 + " </div>\n" +
  933 + " </div>\n" +
881 " </div>\n" + 934 " </div>\n" +
882 - " <div class=\"log_three_center_two\">×" + indent_goods_data[i3].number + "</div>\n" +  
883 - " <div class=\"log_three_center_three\"><span>￥</span>" + indent_goods_data[i3].price + "</div>\n" +  
884 - " </div>\n" +  
885 - " </div>"; 935 + " </div>";
886 } 936 }
887 if (is_courier == 1) { 937 if (is_courier == 1) {
888 html += "<div class=\"log_three_list order_" + result[i].id + "\">\n" + 938 html += "<div class=\"log_three_list order_" + result[i].id + "\">\n" +
889 "\t\t\t\t\t\t\t<div class=\"log_three_list_top\">\n" + 939 "\t\t\t\t\t\t\t<div class=\"log_three_list_top\">\n" +
890 "\t\t\t\t\t\t\t\t<div class=\"log_three_list_top_left\">\n" + 940 "\t\t\t\t\t\t\t\t<div class=\"log_three_list_top_left\">\n" +
891 "\t\t\t\t\t\t\t\t\t<div class=\"log_three_list_top_lo\">\n" + 941 "\t\t\t\t\t\t\t\t\t<div class=\"log_three_list_top_lo\">\n" +
892 - "\t\t\t\t\t\t\t\t\t\t<img src=\"__TMPL__/public/assets/images/fangkuang.png\" data-indent-id=\""+result[i].id+"\" alt=\"\" />\n" + 942 + "\t\t\t\t\t\t\t\t\t\t<img src=\"__TMPL__/public/assets/images/fangkuang.png\" data-indent-id=\"" + result[i].id + "\" alt=\"\" />\n" +
893 "\t\t\t\t\t\t\t\t\t</div>\n" + 943 "\t\t\t\t\t\t\t\t\t</div>\n" +
894 "\t\t\t\t\t\t\t\t\t<div class=\"log_three_list_top_lt\">\n" + 944 "\t\t\t\t\t\t\t\t\t<div class=\"log_three_list_top_lt\">\n" +
895 "\t\t\t\t\t\t\t\t\t\t<div class=\"log_three_zhongbiao\">\n" + 945 "\t\t\t\t\t\t\t\t\t\t<div class=\"log_three_zhongbiao\">\n" +
@@ -903,7 +953,9 @@ @@ -903,7 +953,9 @@
903 "\t\t\t\t\t\t\t\t<div class=\"log_three_list_top_right\">\n" + 953 "\t\t\t\t\t\t\t\t<div class=\"log_three_list_top_right\">\n" +
904 "\t\t\t\t\t\t\t\t\t\t" + state + "\n" + 954 "\t\t\t\t\t\t\t\t\t\t" + state + "\n" +
905 "\t\t\t\t\t\t\t\t</div>\n" + 955 "\t\t\t\t\t\t\t\t</div>\n" +
906 - "\t\t\t\t\t\t\t</div><a href=\"{:url('get_one','',false,true)}/id/"+result[i].id+"\">\n" + indent_goods_html +"</a>"+ 956 + "\t\t\t\t\t\t\t</div><a href=\"{:url('get_one','',false,true)}/id/" + result[i].id + "\"><div class=\"dingdan_detail_top\">\n" +
  957 + " <div class=\"dingdan_detail_hao\">订单号："+result[i].order_number+"</div>\n" +
  958 + " </div>\n" + indent_goods_html + "</a>" +
907 "\t\t\t\t\t\t<div class=\"log_three_bottom_btn\">" + html_bottom + "</div></div>"; 959 "\t\t\t\t\t\t<div class=\"log_three_bottom_btn\">" + html_bottom + "</div></div>";
908 } else if (is_courier == 2) { 960 } else if (is_courier == 2) {
909 html += "<div class=\"log_three_list order_" + result[i].id + "\">\n" + 961 html += "<div class=\"log_three_list order_" + result[i].id + "\">\n" +
@@ -924,11 +976,13 @@ @@ -924,11 +976,13 @@
924 "\t\t\t\t\t\t\t\t<div class=\"log_three_list_top_right\">\n" + 976 "\t\t\t\t\t\t\t\t<div class=\"log_three_list_top_right\">\n" +
925 "\t\t\t\t\t\t\t\t\t\t" + state + "\n" + 977 "\t\t\t\t\t\t\t\t\t\t" + state + "\n" +
926 "\t\t\t\t\t\t\t\t</div>\n" + 978 "\t\t\t\t\t\t\t\t</div>\n" +
927 - "\t\t\t\t\t\t\t</div><a href=\"{:url('get_one','',false,true)}/id/"+result[i].id+"\">\n" + indent_goods_html +"</a>"+ 979 + "\t\t\t\t\t\t\t</div><a href=\"{:url('get_one','',false,true)}/id/" + result[i].id + "\"><div class=\"dingdan_detail_top\">\n" +
  980 + " <div class=\"dingdan_detail_hao\">订单号："+result[i].order_number+"</div>\n" +
  981 + " </div>\n" + indent_goods_html + "</a>" +
928 "\t\t\t\t\t\t<div class=\"log_three_bottom_btn\">" + html_bottom + "</div></div>"; 982 "\t\t\t\t\t\t<div class=\"log_three_bottom_btn\">" + html_bottom + "</div></div>";
929 } 983 }
930 } 984 }
931 - 985 + $('.count').html(i);
932 $('.log_three_list_contant').eq(index).html(html); 986 $('.log_three_list_contant').eq(index).html(html);
933 update(); 987 update();
934 } else { 988 } else {
@@ -1048,7 +1102,7 @@ @@ -1048,7 +1102,7 @@
1048 }); 1102 });
1049 $('body').on('click', '.unify_all', function () { 1103 $('body').on('click', '.unify_all', function () {
1050 var index = $(".log_three_tab_top .log_three_tab_one").index($('.aaa')); 1104 var index = $(".log_three_tab_top .log_three_tab_one").index($('.aaa'));
1051 - var length = $(".log_three_list_contant").eq(index).find('.log_three_list_top_lo img').length-1; 1105 + var length = $(".log_three_list_contant").eq(index).find('.log_three_list_top_lo img').length - 1;
1052 var arr = []; 1106 var arr = [];
1053 for (var i = 0; i <= length; i++) { 1107 for (var i = 0; i <= length; i++) {
1054 if ($('.log_three_list_top_lo img').eq(i).attr('src') == "__TMPL__/public/assets/images/xuanzhong (1).png") { 1108 if ($('.log_three_list_top_lo img').eq(i).attr('src') == "__TMPL__/public/assets/images/xuanzhong (1).png") {
@@ -1058,15 +1112,15 @@ @@ -1058,15 +1112,15 @@
1058 $('.confirm2').attr('data-indent-id', arr.join(",")); 1112 $('.confirm2').attr('data-indent-id', arr.join(","));
1059 var type = $('.unify_all').attr('data-type'); 1113 var type = $('.unify_all').attr('data-type');
1060 if (arr.length != 0) { 1114 if (arr.length != 0) {
1061 - if(type == 1){ 1115 + if (type == 1) {
1062 $.ajax({ 1116 $.ajax({
1063 - url:"{:url('take_all')}",  
1064 - type:"GET",  
1065 - data:{'indent_ids':arr.join(",")},  
1066 - success: function(res){ 1117 + url: "{:url('take_all')}",
  1118 + type: "GET",
  1119 + data: {'indent_ids': arr.join(",")},
  1120 + success: function (res) {
1067 if (res.code == 1) { 1121 if (res.code == 1) {
1068 - $(arr).each(function(i,vo){  
1069 - $('.order_'+vo).remove(); 1122 + $(arr).each(function (i, vo) {
  1123 + $('.order_' + vo).remove();
1070 }) 1124 })
1071 alert('操作成功') 1125 alert('操作成功')
1072 } else { 1126 } else {
@@ -1074,7 +1128,7 @@ @@ -1074,7 +1128,7 @@
1074 } 1128 }
1075 } 1129 }
1076 }) 1130 })
1077 - }else{ 1131 + } else {
1078 $('.tx_masktwo').show(); 1132 $('.tx_masktwo').show();
1079 } 1133 }
1080 } else { 1134 } else {
@@ -1108,17 +1162,17 @@ @@ -1108,17 +1162,17 @@
1108 }); 1162 });
1109 update(); 1163 update();
1110 1164
1111 - $('body').on('click','.take_one',function(){ 1165 + $('body').on('click', '.take_one', function () {
1112 var indent_id = $(this).attr('data-indent-id'); 1166 var indent_id = $(this).attr('data-indent-id');
1113 $.ajax({ 1167 $.ajax({
1114 - url:"{:url('take_one')}",  
1115 - type:"GET",  
1116 - data:{'indent_id':indent_id},  
1117 - success:function(res){  
1118 - if(res.code == 1){  
1119 - $('.order_'+indent_id).remove(); 1168 + url: "{:url('take_one')}",
  1169 + type: "GET",
  1170 + data: {'indent_id': indent_id},
  1171 + success: function (res) {
  1172 + if (res.code == 1) {
  1173 + $('.order_' + indent_id).remove();
1120 alert('操作成功') 1174 alert('操作成功')
1121 - }else{ 1175 + } else {
1122 alert(res.msg) 1176 alert(res.msg)
1123 } 1177 }
1124 } 1178 }
@@ -1132,12 +1186,12 @@ @@ -1132,12 +1186,12 @@
1132 if (is_courier == 1 && index == 0) { 1186 if (is_courier == 1 && index == 0) {
1133 $('.log_three_list_fixed').show(); 1187 $('.log_three_list_fixed').show();
1134 $('.unify_all').text('统一发货'); 1188 $('.unify_all').text('统一发货');
1135 - $('.unify_all').attr('data-type','') 1189 + $('.unify_all').attr('data-type', '')
1136 } else if (is_courier == 2 || (index != 0 && index != 1)) { 1190 } else if (is_courier == 2 || (index != 0 && index != 1)) {
1137 $('.log_three_list_fixed').hide(); 1191 $('.log_three_list_fixed').hide();
1138 - } else if(index == 1){ 1192 + } else if (index == 1) {
1139 $('.unify_all').text('统一完成'); 1193 $('.unify_all').text('统一完成');
1140 - $('.unify_all').attr('data-type',1) 1194 + $('.unify_all').attr('data-type', 1)
1141 } 1195 }
1142 } 1196 }
1143 </script> 1197 </script>
@@ -932,7 +932,7 @@ cursor: pointer; @@ -932,7 +932,7 @@ cursor: pointer;
932 } 932 }
933 933
934 .log_three_list_center { 934 .log_three_list_center {
935 - margin-top: 0.32rem; 935 + margin-top: 0.2rem;
936 display: flex; 936 display: flex;
937 justify-content: space-between; 937 justify-content: space-between;
938 cursor: pointer; 938 cursor: pointer;