Merge branch 'dev/ver/1.0.0' of http://git.ichunt.net/semour/semour_web into dev/ver/1.0.0

app/Http/Services/OrderService.php

@@ -466,9 +466,9 @@ class OrderService
         $temp = [];
         $temp = [];
         $return_amount_all = 0;
         $return_amount_all = 0;
         foreach ($returnItems as $k=>$v){
         foreach ($returnItems as $k=>$v){
-             $orderGoodsInfo = \Arr::get($orderItemsArr,$v["rec_id"]);
-             $temp[] = [
-                 "no"=>$k+1,
+             $recId = $v["rec_id"];
+             $orderGoodsInfo = \Arr::get($orderItemsArr,$recId);
+             $temp[$recId] = [
                  "part_no"=>$orderGoodsInfo["goods_name"], // 型号名称
                  "part_no"=>$orderGoodsInfo["goods_name"], // 型号名称
                  "manufacturer"=>$orderGoodsInfo["brand_name"], // 品牌名称
                  "manufacturer"=>$orderGoodsInfo["brand_name"], // 品牌名称
                  "price_per_unit"=>$orderGoodsInfo["goods_price"], // 单价
                  "price_per_unit"=>$orderGoodsInfo["goods_price"], // 单价
@@ -481,6 +481,11 @@ class OrderService
              ];
              ];
             $return_amount_all += $v["return_amount"];
             $return_amount_all += $v["return_amount"];
         }
         }
+
+        $temp = array_values($temp);
+        foreach ($temp as $c=>&$a){
+            $a["no"] = $c+1;
+        }
         return  ["return_amount_all"=>$return_amount_all,"items"=>$temp];
         return  ["return_amount_all"=>$return_amount_all,"items"=>$temp];
     }
     }
 
 

resources/views/car/car.blade.php

@@ -78,7 +78,7 @@
                         </div>
                         </div>
                     </div>
                     </div>
                     <div class="create createcarbtn">Place Order</div>
                     <div class="create createcarbtn">Place Order</div>
-                    @if(empty($_COOKIE['sem_email']))
+                    @if(Auth::check())
                     <div class="lgtips">
                     <div class="lgtips">
                         Already Registered? <a href="/login?referer={{\Illuminate\Support\Facades\URL::current()}}">Log In</a>
                         Already Registered? <a href="/login?referer={{\Illuminate\Support\Facades\URL::current()}}">Log In</a>
                     </div>
                     </div>