sunhao 5 years ago
parent
commit
9589eb656b

+ 1 - 2
app/Http/Controllers/Admin/OrderController.php

@@ -1337,8 +1337,7 @@ class OrderController extends Controller
1337 1337
         }catch (Exception $e){
1338 1338
             DB::rollback();
1339 1339
             Log::errorLog($request,['error'=>$e->getMessage()],"order/update",0,'');
1340
-            var_dump($e->getMessage());
1341
-            //return redirect('/admin/order/index?'.$str_query)->with('info', $e->getMessage()); 
1340
+            return redirect('/admin/order/index?'.$str_query)->with('info', $e->getMessage()); 
1342 1341
         }     
1343 1342
 
1344 1343
         if(!empty($last_url)){

+ 6 - 4
resources/views/order/ordercreate.blade.php

@@ -52,9 +52,9 @@
52 52
                 <label class="form-label col-xs-4 col-sm-2">
53 53
                     <font color='red'>* </font>是否使用优惠券:</label>
54 54
                 <div class="formControls col-xs-6 col-sm-6">
55
-                    <input type="radio" name="use_coupon"  value="0" disabled>
55
+                    <input type="radio" name="use_coupon"  value="0" checked disabled>
56 56
                     <label for="status-0" style="margin-right: 27px;">否</label>
57
-                    <input type="radio" name="use_coupon" value="1" checked disabled>
57
+                    <input id='use_coupon_1' type="radio" name="use_coupon" value="1"  disabled>
58 58
                     <label for="status-1">是</label>
59 59
                 </div>
60 60
             </div>
@@ -216,9 +216,9 @@
216 216
                 <label class="form-label col-xs-4 col-sm-2">
217 217
                     <font color='red'> </font>是否使用生日赠品</label>
218 218
                 <div class="formControls col-xs-6 col-sm-6">
219
-                    <input type="radio" name="use_b_gift"  value="0" disabled >
219
+                    <input type="radio" name="use_b_gift"  value="0" checked disabled >
220 220
                     <label for="status-0" style="margin-right: 27px;">否</label>
221
-                    <input type="radio" name="use_b_gift" value="1" checked disabled>
221
+                    <input id='use_b_gift_1' type="radio" name="use_b_gift" value="1" disabled>
222 222
                     <label for="status-1">是</label>
223 223
                 </div>
224 224
             </div>    
@@ -872,6 +872,7 @@
872 872
                         if(data.code==0){
873 873
                             if(data.data.coupons == 1){
874 874
                                 $("input[name=use_coupon]").removeAttr('disabled');
875
+                                $("#use_coupon_1").attr("checked","checked");
875 876
                                 $("#use_coupon_div").show();                              
876 877
                             }
877 878
                             if(data.data.if_m_gift == 1){
@@ -880,6 +881,7 @@
880 881
                             }
881 882
                             if(data.data.if_b_gift == 1){
882 883
                                 $("input[name=use_b_gift]").removeAttr('disabled');
884
+                                $("#use_b_gift_1").attr("checked","checked");
883 885
                                 $("#b_gift_div").show();
884 886
                             }
885 887
                         }else{