diff --git a/app/portal/controller/OrderController.php b/app/portal/controller/OrderController.php index 2b54c8e..ea2e874 100644 --- a/app/portal/controller/OrderController.php +++ b/app/portal/controller/OrderController.php @@ -39,6 +39,15 @@ class OrderController extends WeChatBaseController $where2['indent_id'] = ['eq',$vo['id']]; $indentGoods = $indentGoodsModel->selectData($where2); $data[$key]['indent_goods'] = $indentGoods; + if($vo['is_courier'] == 1){ + if(empty($vo['name'])){ + unset($data[$key]); + } + }else if($vo['is_courier'] == 2){ + if(empty($vo['indent_address'])){ + unset($data[$key]); + } + } } } $this->assign('data',$data); diff --git a/public/themes/simpleboot3/portal/order/get_all.html b/public/themes/simpleboot3/portal/order/get_all.html index 2ebdbf3..2bdda1a 100755 --- a/public/themes/simpleboot3/portal/order/get_all.html +++ b/public/themes/simpleboot3/portal/order/get_all.html @@ -99,7 +99,7 @@ </a> <div class="myorder_bottom2_2 delivery" data-id="{$vo.id}">确认收货</div> <elseif condition="$vo.state eq 3"/> - <div class="myorder_bottom2_2">去评价</div> + <!--<div class="myorder_bottom2_2">去评价</div>--> </if> </div> </div> @@ -175,7 +175,7 @@ </a> <div class="myorder_bottom2_2 delivery" data-id="{$vo.id}">确认收货</div> <elseif condition="$vo.state eq 3"/> - <div class="myorder_bottom2_2">去评价</div> + <!--<div class="myorder_bottom2_2">去评价</div>--> </if> </div> </div> diff --git a/public/themes/simpleboot3/portal/share/to_user.html b/public/themes/simpleboot3/portal/share/to_user.html index 65c2fbc..bbd0781 100644 --- a/public/themes/simpleboot3/portal/share/to_user.html +++ b/public/themes/simpleboot3/portal/share/to_user.html @@ -37,8 +37,8 @@ </a> <p style="color:white">ta的推广</p> </div> -<div class="code_Box"> -<img src="{:cmf_get_image_url($share_image)}"/> +<div class="code_Box" style="background: #FE3A00;"> + <img src="{:cmf_get_image_url($share_image)}" style="-webkit-background-size: 100%;background-size: 100%;height: auto;width: 100%;"/> </div> <script src="__TMPL__/public/assets/js/base.js"></script> </body>