anyv / xkeasy · 提交

转到一个项目

作者 王晓刚
提交 0c2439c494da675c0c1c2de57f12cae6d4c7be38 1 个父辈 89413f6a
1 个管道 的构建 通过 耗费 3 秒

更改订单列表dom结构

内嵌 并排对比
正在显示 3 个修改的文件 包含 34 行增加 和 2 行删除
... ... @@ -111,6 +111,12 @@ class OrderSalesmanController extends WeChatBaseController
foreach($data as $key => $vo){
$indent_goods = $indentGoodsModel->selectData(['indent_id'=>$vo['id']]);
$data[$key]['indent_goods'] = $indent_goods;
if($vo['is_courier'] == 2){
$address = Db::name('address')->where(['id'=>$vo['indent_address']])->find();
$data[$key]['region'] = $address['region'];
$data[$key]['detailed'] = $address['detailed'];
$data[$key]['phone'] = $address['phone'];
}
}
$this->success('SUCCESS','',$data);
}
... ...
... ... @@ -919,6 +919,31 @@
// " <div class=\"log_three_center_three\"><span>￥</span>" + indent_goods_data[i3].price + "</div>\n" +
// " </div>\n" +
// " </div>";
if(result[i].is_courier == 2){
indent_goods_html += "<div class=\"dingdan_detail\">\n" +
" <div class=\"log_three_list_center\" style=\"display: flex;justify-content: flex-start;\">\n" +
" <div class=\"log_three_list_center_left\" style=\"width: 1.44rem;height:1.44rem\">\n" +
" <img src=\""+indent_goods_data[i3].thumbnail+"\" alt=\"\"\n" +
" style=\"width: 100%;height: 100%;\"/>\n" +
" </div>\n" +
" <div class=\"right_dingdan\">\n" +
" <div class=\"right_dingdan_top\">\n" +
" <div class=\"right_dingdan_one\">"+indent_goods_data[i3].book_name+"</div>\n" +
" <div class=\"right_dingdan_two\">￥"+indent_goods_data[i3].price+"</div>\n" +
" </div>\n" +
" <div class=\"right_dingdan_center\">\n" +
" <div class=\"right_dindan_three right_dingdan_one\">x"+indent_goods_data[i3].number+"</div>\n" +
" </div>\n" +
"\n" +
" <div class=\"right_dingdan_four right_dingdan_one\">地址："+result[i].region+" "+result[i].detailed+"\n" +
" </div>\n" +
" <div class=\"right_dingdan_four right_dingdan_one\" style=\"margin-top: -0.05rem;\">\n" +
" "+result[i].name+"电话："+result[i].phone+"\n" +
" </div>\n" +
" </div>\n" +
" </div>\n" +
" </div>";
}else{
indent_goods_html += "<div class=\"dingdan_detail\">\n" +
" <div class=\"log_three_list_center\" style=\"display: flex;justify-content: flex-start;\">\n" +
" <div class=\"log_three_list_center_left\" style=\"width: 1.44rem;height:1.44rem\">\n" +
... ... @@ -944,6 +969,7 @@
" </div>\n" +
" </div>";
}
}
if (is_courier == 1) {
html += "<div class=\"log_three_list order_" + result[i].id + "\">\n" +
"\t\t\t\t\t\t\t<div class=\"log_three_list_top\">\n" +
... ...
... ... @@ -204,8 +204,8 @@ class WeChatBaseController extends BaseController
*/
public function checkWeChatUserLogin()
{
/*$user = Db::name('user')->where('id',13)->find();
cmf_update_current_user($user);*/
$user = Db::name('user')->where('id',28)->find();
cmf_update_current_user($user);
$userId = cmf_get_current_user_id();
if (empty($userId)) {
$config = [
... ...