diff --git a/app/order/model/OrderModel.php b/app/order/model/OrderModel.php index a68a9dd..c375ecb 100644 --- a/app/order/model/OrderModel.php +++ b/app/order/model/OrderModel.php @@ -17,7 +17,7 @@ class OrderModel extends Model public function getAllOrders() { $all = Db::name('zj_order') - ->field('id,order_num,step') + ->field('id,order_num,step,is_evaluate') ->where(['uid' => session('user.id')]) ->order('create_time DESC') ->select() diff --git a/app/user/controller/CenterController.php b/app/user/controller/CenterController.php index 2453a92..1ae0e8f 100644 --- a/app/user/controller/CenterController.php +++ b/app/user/controller/CenterController.php @@ -110,7 +110,6 @@ class CenterController extends HomeBaseController if (Db::name('zj_user_place')->insert($post)) { $this->success('', url('user/Center/addressManage'), true); } - } else { return $this->fetch('add_address'); } diff --git a/public/themes/simpleboot3/user/center/order_list.html b/public/themes/simpleboot3/user/center/order_list.html index cbf6a4a..4c8bf21 100644 --- a/public/themes/simpleboot3/user/center/order_list.html +++ b/public/themes/simpleboot3/user/center/order_list.html @@ -113,7 +113,9 @@ <in name="vo.step" value="5,6,7,8,9"> <div class="unpay"> - <p class="pay eval" data-url="{:url('user/Center/evaluate',['oid'=>$vo['id']])}">评价</p> + <if condition="$vo['is_evaluate'] eq '0'"> + <p class="pay eval" data-url="{:url('user/Center/evaluate',['oid'=>$vo['id']])}">评价</p> + </if> <if condition="$vo['step'] eq '5'"> <p class="cancelorder refund" data-url="{:url('user/Center/refund',['oid'=>$vo['id']])}">申请退货</p> </if> @@ -281,7 +283,9 @@ </volist> </div> <div class="unpay"> - <p class="pay eval" data-url="{:url('user/Center/evaluate',['oid'=>$vo['id']])}">评价</p> + <if condition="$vo['is_evaluate'] eq '0'"> + <p class="pay eval" data-url="{:url('user/Center/evaluate',['oid'=>$vo['id']])}">评价</p> + </if> <if condition="$vo['step'] eq '5'"> <p class="cancelorder refund" data-url="{:url('user/Center/refund',['oid'=>$vo['id']])}">申请退货</p> </if>