测试

@@ -67,6 +67,7 @@ class GoodsController extends HomeBaseController
     {
         $id = request()->param('id');
         $data = Db::name('zj_goods')->field('thumb,name,intro,price,content')->where(['id' => $id])->find();
+        $data['content'] = html_entity_decode($data['content']);
         $total = Db::name('zj_cart')->field('sum(num) as total')->where(['uid' => session('user.id')])->select();
         if ($total[0]['total'] == '') {
             $total = 0;

@@ -220,4 +220,29 @@ class CenterController extends HomeBaseController
         }
     }
 
+    public function cancelOrder()
+    {
+        $request = request();
+        if ($request->isAjax()) {
+            $oid = $request->param('oid');
+            Db::startTrans();
+            if (Db::name('zj_order')->where(['id' => $oid])->value('step') == 1) {
+                if (Db::name('zj_order')->delete($oid)) {
+                    if (Db::name('zj_order_goods')->where(['oid' => $oid])->delete()) {
+                        Db::commit();
+                        $this->success('订单已取消', '', true);
+                    } else {
+                        Db::rollback();
+                        $this->success('取消失败', '', false);
+                    }
+                } else {
+                    Db::rollback();
+                    $this->success('取消失败', '', false);
+                }
+            } else {
+                $this->success('该订单禁止取消', '', false);
+            }
+        }
+    }
+
 }
\ No newline at end of file

@@ -81,7 +81,7 @@
             <if condition="$vo['step'] eq '1'">
                 <div class="unpay">
                     <p class="pay">付款</p>
-                    <p class="cancelorder cancellist">取消订单</p>
+                    <p class="cancelorder cancellist" data-id="{$vo.id}">取消订单</p>
                 </div>
             </if>
             <if condition="$vo['step'] eq '3'">
@@ -135,7 +135,7 @@
             </div>
             <div class="unpay">
                 <p class="pay">付款</p>
-                <p class="cancelorder cancellist">取消订单</p>
+                <p class="cancelorder cancellist" data-id="{$vo.id}">取消订单</p>
             </div>
         </div>
         </volist>
@@ -277,12 +277,31 @@
         }
     })
     //取消订单弹出层
+    var oid ='';
     $(".cancellist").click(function(){
+        oid = $(this).attr('data-id');
         $(".deletewrap").show();
+
     })
     //确认取消订单
     $(".sure").click(function(){
         $(".deletewrap").hide();
+        $.ajax({
+            url:"{:url('user/Center/cancelOrder')}",
+            data:{
+                oid:oid
+            },
+            type:"POST",
+            dataType:"JSON",
+
+            success: function (data) {
+                if(data.data === true) {
+                    window.location.reload();
+                }
+            }
+        })
+
+
     })
     $(".cancel").click(function(){
         $(".deletewrap").hide();