merged

app/Http/Controllers/PaymentController.php

@@ -55,14 +55,14 @@ class PaymentController extends Controller
                 return Response::json(['status' => 'fail', 'data' => '', 'message' => '创建支付单失败：商品不可重复购买']);
             }
         }
-      
-      	//单个商品限购
-            if ($goods->is_limit == 1) {
-                $noneExpireOrderExist = Order::query()->where('status', '>=', 0)->where('user_id', Auth::user()->id)->where('goods_id', $goods_id)->exists();
-                if ($noneExpireOrderExist) {
-                    return Response::json(['status' => 'fail', 'data' => '', 'message' => '创建支付单失败：此商品每人限购1次']);
-                }
+
+        //单个商品限购
+        if ($goods->is_limit == 1) {
+            $noneExpireOrderExist = Order::query()->where('status', '>=', 0)->where('user_id', Auth::user()->id)->where('goods_id', $goods_id)->exists();
+            if ($noneExpireOrderExist) {
+                return Response::json(['status' => 'fail', 'data' => '', 'message' => '创建支付单失败：此商品每人限购1次']);
             }
+        }
 
         // 使用优惠券
         if ($coupon_sn) {

app/Http/Controllers/ShopController.php

@@ -205,15 +205,15 @@ class ShopController extends Controller
             DB::beginTransaction();
             try {
                 $data = [
-                    'name'   => $name,
-                    'desc'   => $desc,
-                    'logo'   => $logo,
-                    'price'  => $price * 100,
-                    'sort'   => $sort,
-                    'color'  => $color,
-                    'is_hot' => $is_hot,
+                    'name'     => $name,
+                    'desc'     => $desc,
+                    'logo'     => $logo,
+                    'price'    => $price * 100,
+                    'sort'     => $sort,
+                    'color'    => $color,
+                    'is_hot'   => $is_hot,
                     'is_limit' => $is_limit,
-                    'status' => $status
+                    'status'   => $status
                 ];
 
                 Goods::query()->where('id', $id)->update($data);

resources/views/ticket/replyTicket.blade.php

@@ -158,10 +158,11 @@
         function replyTicket() {
             var content = UE.getEditor('editor').getContent();
 
-            if (content =="" || content == undefined) {
+            if (content == "" || content == undefined) {
                 layer.alert('您未填写工单内容', {icon: 2, title:'提示'});
                 return false;
             }
+
             layer.confirm('确定回复工单？', {icon: 3, title:'提示'}, function(index) {
                 $.post("{{url('ticket/replyTicket')}}",{_token:'{{csrf_token()}}', id:'{{$ticket->id}}', content:content}, function(ret) {
                     layer.msg(ret.message, {time:1000}, function() {
@@ -170,6 +171,7 @@
                         }
                     });
                 });
+
                 layer.close(index);
             });
         }