sunhao 5 years ago
parent
commit
6d54791372

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

@@ -523,6 +523,7 @@ class OrderController extends Controller
523 523
             $data['goods_name'] = $goods_name;
524 524
             $data['propsName'] = $sku['propsName'];
525 525
             $data['price'] = $sku['price'];
526
+            $data['num'] = $v['num'];
526 527
             if($v['type'] == 0){
527 528
                 $m_gift[] = $data;
528 529
             }else{

+ 15 - 1
resources/views/order/ordercreate.blade.php

@@ -211,6 +211,7 @@
211 211
                 </div>
212 212
             </div> 
213 213
 
214
+            @if(!empty($b_gift))
214 215
             <div id='b_gift_div' class="row cl" style="display: none">
215 216
                 <label class="form-label col-xs-4 col-sm-2">
216 217
                     <font color='red'> </font>是否使用生日套餐</label>
@@ -220,7 +221,17 @@
220 221
                     <input id='use_b_gift_1' type="radio" name="use_b_gift" value="1" disabled>
221 222
                     <label for="status-1">是</label>
222 223
                 </div>
223
-            </div>    
224
+            </div>
225
+            <div id='b_gift_list' class="row cl" style="display: none">
226
+                <label class="form-label col-xs-4 col-sm-2">
227
+                    <font color='red'> </font>生日套餐包含:</label>
228
+                <div class="formControls col-xs-6 col-sm-6">
229
+                    @foreach($b_gift as $item)
230
+                        {{$item['goods_name']}}【{{$item['propsName']}} ¥{{$item['price']}}】 x {{$item['num']}}<br>
231
+                    @endforeach                  
232
+                </div>
233
+            </div>
234
+            @endif    
224 235
 
225 236
             <div class="row cl">
226 237
                 <label class="form-label col-xs-4 col-sm-2">
@@ -897,6 +908,7 @@
897 908
                                 $("input[name=use_b_gift]").removeAttr('disabled');
898 909
                                 //$("#use_b_gift_1").attr("checked","checked");
899 910
                                 $("#b_gift_div").show();
911
+                                $("#b_gift_list").show();
900 912
                             }
901 913
                         }else{
902 914
                             $("input[name=use_coupon]").attr('disabled','disabled');
@@ -905,6 +917,7 @@
905 917
                             $("#use_coupon_div").hide();
906 918
                             $("#m_gift_div").hide();
907 919
                             $("#b_gift_div").hide();
920
+                            $("#b_gift_list").hide();
908 921
                         }
909 922
                        
910 923
                     }
@@ -917,6 +930,7 @@
917 930
                 $("#use_coupon_div").hide();
918 931
                 $("#m_gift_div").hide();
919 932
                 $("#b_gift_div").hide();
933
+                $("#b_gift_list").hide();
920 934
             }
921 935
         }
922 936