diff --git a/public/themes/simpleboot3/portal/order/get_all.html b/public/themes/simpleboot3/portal/order/get_all.html index 2bdda1a..f5d3847 100755 --- a/public/themes/simpleboot3/portal/order/get_all.html +++ b/public/themes/simpleboot3/portal/order/get_all.html @@ -94,9 +94,11 @@ <!--<div class="myorder_bottom2_2">查看订单</div>--> <!--</a>--> <elseif condition="$vo.state eq 5"/> - <a href="{:url('logistics/index',array('indent_id'=>$vo['id']))}"> - <div class="myorder_bottom2_2">查看物流</div> - </a> + <if condition="$vo.is_courier eq 2"> + <a href="{:url('logistics/index',array('indent_id'=>$vo['id']))}"> + <div class="myorder_bottom2_2">查看物流</div> + </a> + </if> <div class="myorder_bottom2_2 delivery" data-id="{$vo.id}">确认收货</div> <elseif condition="$vo.state eq 3"/> <!--<div class="myorder_bottom2_2">去评价</div>--> @@ -325,9 +327,11 @@ <!--<div class="myorder_bottom2_2">查看订单</div>--> <!--</a>--> <elseif condition="$vo.state eq 5"/> - <a href="{:url('logistics/index',array('indent_id'=>$vo['id']))}"> - <div class="myorder_bottom2_2">查看物流</div> - </a> + <if condition="$vo.is_courier eq 2"> + <a href="{:url('logistics/index',array('indent_id'=>$vo['id']))}"> + <div class="myorder_bottom2_2">查看物流</div> + </a> + </if> <div class="myorder_bottom2_2 delivery" data-id="{$vo.id}">确认收货</div> <elseif condition="$vo.state eq 3"/> <!--<div class="myorder_bottom2_2">去评价</div>--> diff --git a/public/themes/simpleboot3/portal/order/get_one.html b/public/themes/simpleboot3/portal/order/get_one.html index b9c7de5..1589ce0 100755 --- a/public/themes/simpleboot3/portal/order/get_one.html +++ b/public/themes/simpleboot3/portal/order/get_one.html @@ -183,9 +183,12 @@ <div class="pay_bottom"> <div class="pay_bottom2"> <if condition="$data.state eq 5"> - <a href="{:url('logistics/index',array('indent_id'=>$data['id']))}"> - <div class="pay_bottom2_1">物流信息</div> - </a> + <if condition="$data.is_courier eq 2"> + <a href="{:url('logistics/index',array('indent_id'=>$data['id']))}"> + <div class="pay_bottom2_1">物流信息</div> + </a> + </if> + <elseif condition="$data.state eq 5 || $data.state eq 3 || $data.state eq 2"/> <!--<div class="pay_bottom2_2">售后咨询</div>--> <elseif condition="$data.state eq 4"/> diff --git a/public/themes/simpleboot3/public/assets/css/base.css b/public/themes/simpleboot3/public/assets/css/base.css index 0aa41a5..08e3fbc 100755 --- a/public/themes/simpleboot3/public/assets/css/base.css +++ b/public/themes/simpleboot3/public/assets/css/base.css @@ -592,9 +592,10 @@ body { } .de_topImg { - width: 100%; + /*width: 100%;*/ + width: 7.5rem; cursor: pointer; - height: 6.6rem; + height: 7.5rem; } .de_topImg img { diff --git a/simplewind/cmf/controller/WeChatBaseController.php b/simplewind/cmf/controller/WeChatBaseController.php index f2c40a6..9093ee9 100644 --- a/simplewind/cmf/controller/WeChatBaseController.php +++ b/simplewind/cmf/controller/WeChatBaseController.php @@ -204,8 +204,8 @@ class WeChatBaseController extends BaseController */ public function checkWeChatUserLogin() { - /*$user = Db::name('user')->where('id',2)->find(); - cmf_update_current_user($user);*/ + $user = Db::name('user')->where('id',7)->find(); + cmf_update_current_user($user); $userId = cmf_get_current_user_id(); if (empty($userId)) { $config = [