anyv / xkeasy · 提交

转到一个项目

作者 王晓刚
提交 abb465d597bda0228ec5f0cac61c2f70824c4e8b 2 个父辈 523fc98a cf8d5b4b
1 个管道 的构建 通过 耗费 1 秒

合并分支 'wangxiaogang' 到 'master' 

后台调是发货



查看合并请求 !107
内嵌 并排对比
正在显示 3 个修改的文件 包含 101 行增加 和 14 行删除
@@ -183,4 +183,29 @@ class OrderSalesmanController extends WeChatBaseController @@ -183,4 +183,29 @@ class OrderSalesmanController extends WeChatBaseController
183 $this->assign('data',$indent); 183 $this->assign('data',$indent);
184 return $this->fetch(); 184 return $this->fetch();
185 } 185 }
  186 + public function take_all(){
  187 + $indent_ids = $this->request->param('indent_ids');
  188 + $data['state'] = 3;
  189 + $indent_ids = explode(',',$indent_ids);
  190 + $where['id'] = ['in',$indent_ids];
  191 + $indentModel = new IndentModel();
  192 + $result = $indentModel->updateData($where,$data);
  193 + if(empty($result)){
  194 + $this->error('更新失败');
  195 + }else{
  196 + $this->success('更新成功');
  197 + }
  198 + }
  199 + public function take_one(){
  200 + $indent_id = $this->request->param('indent_id');
  201 + $data['state'] = 3;
  202 + $where['id'] = ['eq',$indent_id];
  203 + $indentModel = new IndentModel();
  204 + $result = $indentModel->updateData($where,$data);
  205 + if(empty($result)){
  206 + $this->error('更新失败');
  207 + }else{
  208 + $this->success('更新成功');
  209 + }
  210 + }
186 } 211 }
@@ -19,6 +19,21 @@ @@ -19,6 +19,21 @@
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{
  23 + margin-top: 0.3rem;
  24 + width: 1.6rem;
  25 + height: 0.48rem;
  26 + background: linear-gradient(328deg, rgba(255, 78, 0, 1) 0%, rgba(255, 157, 45, 1) 100%);
  27 + box-shadow: 0 0.06rem 0.12rem rgba(255, 128, 0, 0.24);
  28 + opacity: 1;
  29 + border-radius: 0.08rem;
  30 + display: flex;
  31 + justify-content: center;
  32 + align-items: center;
  33 + font-size: 0.26rem;
  34 + font-weight: 400;
  35 + color: rgba(255, 255, 255, 1);
  36 + }
22 </style> 37 </style>
23 </head> 38 </head>
24 39
@@ -345,6 +360,10 @@ @@ -345,6 +360,10 @@
345 查看物流 360 查看物流
346 </div> 361 </div>
347 </a> 362 </a>
  363 + <else />
  364 + <div class="take_one" data-indent-id="{$vo.id}">
  365 + 完成
  366 + </div>
348 </if> 367 </if>
349 <elseif condition="$vo.state eq 3"/> 368 <elseif condition="$vo.state eq 3"/>
350 <!--<div class="log_three_bottom" data-indent-id="{$vo.id}">--> 369 <!--<div class="log_three_bottom" data-indent-id="{$vo.id}">-->
@@ -421,6 +440,9 @@ @@ -421,6 +440,9 @@
421 查看物流 440 查看物流
422 </div> 441 </div>
423 </a> 442 </a>
  443 + <div class="log_three_bottom" data-indent-id="{$vo.id}">
  444 + 已完成
  445 + </div>
424 </if> 446 </if>
425 <elseif condition="$vo.state eq 3"/> 447 <elseif condition="$vo.state eq 3"/>
426 <!--<div class="log_three_bottom" data-indent-id="{$vo.id}">--> 448 <!--<div class="log_three_bottom" data-indent-id="{$vo.id}">-->
@@ -649,13 +671,13 @@ @@ -649,13 +671,13 @@
649 "\t\t\t\t\t\t\t\t\t\t\t</div></div>\n" + 671 "\t\t\t\t\t\t\t\t\t\t\t</div></div>\n" +
650 "\t\t\t\t\t\t\t\t\t\t</a>"; 672 "\t\t\t\t\t\t\t\t\t\t</a>";
651 } else { 673 } else {
652 - var html_bottom = ""; 674 + var html_bottom = "<div class=\"take_one\" data-indent-id=\""+result[i].id+"\">\n" +
  675 + " 完成\n" +
  676 + " </div>";
653 } 677 }
654 } else { 678 } else {
655 var state = '已完成'; 679 var state = '已完成';
656 - // var html_bottom = "<div class=\"log_three_bottom\" data-indent-id=\"\"+result[i].id+\"\">\n" +  
657 - // "\t\t\t\t\t\t\t\t\t\t已完成啦\n" +  
658 - // "\t\t\t\t\t\t\t\t\t</div>"; 680 + var html_bottom = "";
659 } 681 }
660 var indent_goods_data = result[i].indent_goods; 682 var indent_goods_data = result[i].indent_goods;
661 var indent_goods_html = ''; 683 var indent_goods_html = '';
@@ -678,7 +700,7 @@ @@ -678,7 +700,7 @@
678 "\t\t\t\t\t\t\t<div class=\"log_three_list_top\">\n" + 700 "\t\t\t\t\t\t\t<div class=\"log_three_list_top\">\n" +
679 "\t\t\t\t\t\t\t\t<div class=\"log_three_list_top_left\">\n" + 701 "\t\t\t\t\t\t\t\t<div class=\"log_three_list_top_left\">\n" +
680 "\t\t\t\t\t\t\t\t\t<div class=\"log_three_list_top_lo\">\n" + 702 "\t\t\t\t\t\t\t\t\t<div class=\"log_three_list_top_lo\">\n" +
681 - "\t\t\t\t\t\t\t\t\t\t<img src=\"__TMPL__/public/assets/images/fangkuang.png\" alt=\"\" />\n" + 703 + "\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" +
682 "\t\t\t\t\t\t\t\t\t</div>\n" + 704 "\t\t\t\t\t\t\t\t\t</div>\n" +
683 "\t\t\t\t\t\t\t\t\t<div class=\"log_three_list_top_lt\">\n" + 705 "\t\t\t\t\t\t\t\t\t<div class=\"log_three_list_top_lt\">\n" +
684 "\t\t\t\t\t\t\t\t\t\t<div class=\"log_three_zhongbiao\">\n" + 706 "\t\t\t\t\t\t\t\t\t\t<div class=\"log_three_zhongbiao\">\n" +
@@ -693,7 +715,7 @@ @@ -693,7 +715,7 @@
693 "\t\t\t\t\t\t\t\t\t\t" + state + "\n" + 715 "\t\t\t\t\t\t\t\t\t\t" + state + "\n" +
694 "\t\t\t\t\t\t\t\t</div>\n" + 716 "\t\t\t\t\t\t\t\t</div>\n" +
695 "\t\t\t\t\t\t\t</div><a href=\"{:url('get_one','',false,true)}/id/"+result[i].id+"\">\n" + indent_goods_html +"</a>"+ 717 "\t\t\t\t\t\t\t</div><a href=\"{:url('get_one','',false,true)}/id/"+result[i].id+"\">\n" + indent_goods_html +"</a>"+
696 - "\t\t\t\t\t\t" + html_bottom + "</div>"; 718 + "\t\t\t\t\t\t<div class=\"log_three_bottom_btn\">" + html_bottom + "</div></div>";
697 } else if (is_courier == 2) { 719 } else if (is_courier == 2) {
698 html += "<div class=\"log_three_list order_" + result[i].id + "\">\n" + 720 html += "<div class=\"log_three_list order_" + result[i].id + "\">\n" +
699 "\t\t\t\t\t\t\t<div class=\"log_three_list_top\">\n" + 721 "\t\t\t\t\t\t\t<div class=\"log_three_list_top\">\n" +
@@ -714,7 +736,7 @@ @@ -714,7 +736,7 @@
714 "\t\t\t\t\t\t\t\t\t\t" + state + "\n" + 736 "\t\t\t\t\t\t\t\t\t\t" + state + "\n" +
715 "\t\t\t\t\t\t\t\t</div>\n" + 737 "\t\t\t\t\t\t\t\t</div>\n" +
716 "\t\t\t\t\t\t\t</div><a href=\"{:url('get_one','',false,true)}/id/"+result[i].id+"\">\n" + indent_goods_html +"</a>"+ 738 "\t\t\t\t\t\t\t</div><a href=\"{:url('get_one','',false,true)}/id/"+result[i].id+"\">\n" + indent_goods_html +"</a>"+
717 - "\t\t\t\t\t\t" + html_bottom + "</div>"; 739 + "\t\t\t\t\t\t<div class=\"log_three_bottom_btn\">" + html_bottom + "</div></div>";
718 } 740 }
719 } 741 }
720 742
@@ -778,7 +800,7 @@ @@ -778,7 +800,7 @@
778 $('.confirm').attr('data-is_courier', is_courier); 800 $('.confirm').attr('data-is_courier', is_courier);
779 $('.confirm').attr('data-indent-id', indent_id); 801 $('.confirm').attr('data-indent-id', indent_id);
780 $('.confirm').attr('data-is_courier', is_courier); 802 $('.confirm').attr('data-is_courier', is_courier);
781 - }) 803 + });
782 //点击确认 804 //点击确认
783 $("body").on('click', '.confirm', function () { 805 $("body").on('click', '.confirm', function () {
784 var is_courier = $(this).attr('data-is_courier'); 806 var is_courier = $(this).attr('data-is_courier');
@@ -839,14 +861,33 @@ @@ -839,14 +861,33 @@
839 var index = $(".log_three_tab_top .log_three_tab_one").index($('.aaa')); 861 var index = $(".log_three_tab_top .log_three_tab_one").index($('.aaa'));
840 var length = $(".log_three_list_contant").eq(index).find('.log_three_list_top_lo img').length-1; 862 var length = $(".log_three_list_contant").eq(index).find('.log_three_list_top_lo img').length-1;
841 var arr = []; 863 var arr = [];
842 - for (var i = 0; i < length; i++) {  
843 - if ($('.log_three_list_top_lo img').attr('src') == "__TMPL__/public/assets/images/xuanzhong (1).png") { 864 + for (var i = 0; i <= length; i++) {
  865 + if ($('.log_three_list_top_lo img').eq(i).attr('src') == "__TMPL__/public/assets/images/xuanzhong (1).png") {
844 arr.push($('.log_three_list_top_lo img').eq(i).attr('data-indent-id')); 866 arr.push($('.log_three_list_top_lo img').eq(i).attr('data-indent-id'));
845 } 867 }
846 } 868 }
847 $('.confirm2').attr('data-indent-id', arr.join(",")); 869 $('.confirm2').attr('data-indent-id', arr.join(","));
  870 + var type = $('.unify_all').attr('data-type');
848 if (arr.length != 0) { 871 if (arr.length != 0) {
849 - $('.tx_masktwo').show(); 872 + if(type == 1){
  873 + $.ajax({
  874 + url:"{:url('take_all')}",
  875 + type:"GET",
  876 + data:{'indent_ids':arr.join(",")},
  877 + success: function(res){
  878 + if (res.code == 1) {
  879 + $(arr).each(function(i,vo){
  880 + $('.order_'+vo).remove();
  881 + })
  882 + alert('操作成功')
  883 + } else {
  884 + alert(res.msg);
  885 + }
  886 + }
  887 + })
  888 + }else{
  889 + $('.tx_masktwo').show();
  890 + }
850 } else { 891 } else {
851 alert('请至少选择一个订单'); 892 alert('请至少选择一个订单');
852 } 893 }
@@ -878,6 +919,22 @@ @@ -878,6 +919,22 @@
878 }); 919 });
879 update(); 920 update();
880 921
  922 + $('body').on('click','.take_one',function(){
  923 + var indent_id = $(this).attr('data-indent-id');
  924 + $.ajax({
  925 + url:"{:url('take_one')}",
  926 + type:"GET",
  927 + data:{'indent_id':indent_id},
  928 + success:function(res){
  929 + if(res.code == 1){
  930 + $('.order_'+indent_id).remove();
  931 + alert('操作成功')
  932 + }else{
  933 + alert(res.msg)
  934 + }
  935 + }
  936 + })
  937 + })
881 }) 938 })
882 939
883 function update() { 940 function update() {
@@ -885,8 +942,13 @@ @@ -885,8 +942,13 @@
885 var index = $('.log_three_tab_top').children('.aaa').index(); 942 var index = $('.log_three_tab_top').children('.aaa').index();
886 if (is_courier == 1 && index == 0) { 943 if (is_courier == 1 && index == 0) {
887 $('.log_three_list_fixed').show(); 944 $('.log_three_list_fixed').show();
888 - } else if (is_courier == 2 || index != 0) { 945 + $('.unify_all').text('统一发货');
  946 + $('.unify_all').attr('data-type','')
  947 + } else if (is_courier == 2 || (index != 0 && index != 1)) {
889 $('.log_three_list_fixed').hide(); 948 $('.log_three_list_fixed').hide();
  949 + } else if(index == 1){
  950 + $('.unify_all').text('统一完成');
  951 + $('.unify_all').attr('data-type',1)
890 } 952 }
891 } 953 }
892 </script> 954 </script>
@@ -204,8 +204,8 @@ class WeChatBaseController extends BaseController @@ -204,8 +204,8 @@ class WeChatBaseController extends BaseController
204 */ 204 */
205 public function checkWeChatUserLogin() 205 public function checkWeChatUserLogin()
206 { 206 {
207 - /* $user = Db::name('user')->where('id',2)->find();  
208 - cmf_update_current_user($user);*/ 207 + $user = Db::name('user')->where('id',5)->find();
  208 + cmf_update_current_user($user);
209 $userId = cmf_get_current_user_id(); 209 $userId = cmf_get_current_user_id();
210 if (empty($userId)) { 210 if (empty($userId)) {
211 $config = [ 211 $config = [