anyv / xkeasy · 提交

转到一个项目

作者 王晓刚
提交 fc02ef607f1e1a9d5449706a0beda4160359b2fa 2 个父辈 57014ee0 2bc9a45e
1 个管道 的构建 通过 耗费 3 秒

合并分支 'wangxiaogang' 到 'master' 

Wangxiaogang



查看合并请求 !124
内嵌 并排对比
正在显示 2 个修改的文件 包含 56 行增加 和 24 行删除
@@ -111,6 +111,12 @@ class OrderSalesmanController extends WeChatBaseController @@ -111,6 +111,12 @@ class OrderSalesmanController extends WeChatBaseController
111 foreach($data as $key => $vo){ 111 foreach($data as $key => $vo){
112 $indent_goods = $indentGoodsModel->selectData(['indent_id'=>$vo['id']]); 112 $indent_goods = $indentGoodsModel->selectData(['indent_id'=>$vo['id']]);
113 $data[$key]['indent_goods'] = $indent_goods; 113 $data[$key]['indent_goods'] = $indent_goods;
  114 + if($vo['is_courier'] == 2){
  115 + $address = Db::name('address')->where(['id'=>$vo['indent_address']])->find();
  116 + $data[$key]['region'] = $address['region'];
  117 + $data[$key]['detailed'] = $address['detailed'];
  118 + $data[$key]['phone'] = $address['phone'];
  119 + }
114 } 120 }
115 $this->success('SUCCESS','',$data); 121 $this->success('SUCCESS','',$data);
116 } 122 }
@@ -919,30 +919,56 @@ @@ -919,30 +919,56 @@
919 // " <div class=\"log_three_center_three\"><span>￥</span>" + indent_goods_data[i3].price + "</div>\n" + 919 // " <div class=\"log_three_center_three\"><span>￥</span>" + indent_goods_data[i3].price + "</div>\n" +
920 // " </div>\n" + 920 // " </div>\n" +
921 // " </div>"; 921 // " </div>";
922 - indent_goods_html += "<div class=\"dingdan_detail\">\n" +  
923 - " <div class=\"log_three_list_center\" style=\"display: flex;justify-content: flex-start;\">\n" +  
924 - " <div class=\"log_three_list_center_left\" style=\"width: 1.44rem;height:1.44rem\">\n" +  
925 - " <img src=\""+indent_goods_data[i3].thumbnail+"\" alt=\"\"\n" +  
926 - " style=\"width: 100%;height: 100%;\"/>\n" +  
927 - " </div>\n" +  
928 - " <div class=\"right_dingdan\">\n" +  
929 - " <div class=\"right_dingdan_top\">\n" +  
930 - " <div class=\"right_dingdan_one\">"+indent_goods_data[i3].book_name+"</div>\n" +  
931 - " <div class=\"right_dingdan_two\">￥"+indent_goods_data[i3].price+"</div>\n" +  
932 - " </div>\n" +  
933 - " <div class=\"right_dingdan_center\">\n" +  
934 - " <div class=\"right_dindan_three right_dingdan_one\">x"+indent_goods_data[i3].number+"</div>\n" +  
935 - " </div>\n" +  
936 - "\n" +  
937 - " <div class=\"right_dingdan_four right_dingdan_one\">地址："+result[i].school+" "+result[i].grade+"\n" +  
938 - " "+result[i].class+"\n" +  
939 - " </div>\n" +  
940 - " <div class=\"right_dingdan_four right_dingdan_one\" style=\"margin-top: -0.05rem;\">\n" +  
941 - " "+result[i].name+"电话："+result[i].phone+"\n" +  
942 - " </div>\n" +  
943 - " </div>\n" +  
944 - " </div>\n" +  
945 - " </div>"; 922 + if(result[i].is_courier == 2){
  923 + indent_goods_html += "<div class=\"dingdan_detail\">\n" +
  924 + " <div class=\"log_three_list_center\" style=\"display: flex;justify-content: flex-start;\">\n" +
  925 + " <div class=\"log_three_list_center_left\" style=\"width: 1.44rem;height:1.44rem\">\n" +
  926 + " <img src=\""+indent_goods_data[i3].thumbnail+"\" alt=\"\"\n" +
  927 + " style=\"width: 100%;height: 100%;\"/>\n" +
  928 + " </div>\n" +
  929 + " <div class=\"right_dingdan\">\n" +
  930 + " <div class=\"right_dingdan_top\">\n" +
  931 + " <div class=\"right_dingdan_one\">"+indent_goods_data[i3].book_name+"</div>\n" +
  932 + " <div class=\"right_dingdan_two\">￥"+indent_goods_data[i3].price+"</div>\n" +
  933 + " </div>\n" +
  934 + " <div class=\"right_dingdan_center\">\n" +
  935 + " <div class=\"right_dindan_three right_dingdan_one\">x"+indent_goods_data[i3].number+"</div>\n" +
  936 + " </div>\n" +
  937 + "\n" +
  938 + " <div class=\"right_dingdan_four right_dingdan_one\">地址："+result[i].region+" "+result[i].detailed+"\n" +
  939 + " </div>\n" +
  940 + " <div class=\"right_dingdan_four right_dingdan_one\" style=\"margin-top: -0.05rem;\">\n" +
  941 + " "+result[i].name+"电话："+result[i].phone+"\n" +
  942 + " </div>\n" +
  943 + " </div>\n" +
  944 + " </div>\n" +
  945 + " </div>";
  946 + }else{
  947 + indent_goods_html += "<div class=\"dingdan_detail\">\n" +
  948 + " <div class=\"log_three_list_center\" style=\"display: flex;justify-content: flex-start;\">\n" +
  949 + " <div class=\"log_three_list_center_left\" style=\"width: 1.44rem;height:1.44rem\">\n" +
  950 + " <img src=\""+indent_goods_data[i3].thumbnail+"\" alt=\"\"\n" +
  951 + " style=\"width: 100%;height: 100%;\"/>\n" +
  952 + " </div>\n" +
  953 + " <div class=\"right_dingdan\">\n" +
  954 + " <div class=\"right_dingdan_top\">\n" +
  955 + " <div class=\"right_dingdan_one\">"+indent_goods_data[i3].book_name+"</div>\n" +
  956 + " <div class=\"right_dingdan_two\">￥"+indent_goods_data[i3].price+"</div>\n" +
  957 + " </div>\n" +
  958 + " <div class=\"right_dingdan_center\">\n" +
  959 + " <div class=\"right_dindan_three right_dingdan_one\">x"+indent_goods_data[i3].number+"</div>\n" +
  960 + " </div>\n" +
  961 + "\n" +
  962 + " <div class=\"right_dingdan_four right_dingdan_one\">地址："+result[i].school+" "+result[i].grade+"\n" +
  963 + " "+result[i].class+"\n" +
  964 + " </div>\n" +
  965 + " <div class=\"right_dingdan_four right_dingdan_one\" style=\"margin-top: -0.05rem;\">\n" +
  966 + " "+result[i].name+"电话："+result[i].phone+"\n" +
  967 + " </div>\n" +
  968 + " </div>\n" +
  969 + " </div>\n" +
  970 + " </div>";
  971 + }
946 } 972 }
947 if (is_courier == 1) { 973 if (is_courier == 1) {
948 html += "<div class=\"log_three_list order_" + result[i].id + "\">\n" + 974 html += "<div class=\"log_three_list order_" + result[i].id + "\">\n" +