Merge branch 'zzd' of ssh://was.baoshi56.com:10022/var/git/bswas

app/Services/OrderService.php

@@ -606,7 +606,10 @@ class OrderService
     }
 
     public function pushQueue($orderHeaders){
-        $orders = Order::query()->with(["logistic","packages.commodities.commodity"])->where('wms_status','订单完成')->whereIn('code',data_get($orderHeaders,'*.code'))->get();
+        $orders = Order::query()->with(["logistic","packages.commodities.commodity"])
+            ->where('wms_status','订单完成')
+            ->whereIn('code',data_get($orderHeaders,'*.orderno'))
+            ->get();
         $orders->each(function($order){
             dispatch(new OrderCreateInstantBill($order));
         });

resources/views/customer/project/create.blade.php

@@ -176,8 +176,8 @@
                     discount_type:[
                         "无减免","按单减免","固定减免"
                     ],
-                    feature_type:['商品名称','订单类型','承运商','店铺类型','订单数'],
-                    logic : ['包含','不包含','等于','大于','大于等于','小于','小于等于'],
+                    feature_type:['商品名称','订单类型','承运商','店铺类型'],
+                    logic : ['包含','不包含','等于'],
                 },
                 poolMapping:{},//基础数据选择池的映射对象 供展示使用
                 selectedModel:{//已选定的计费模型

resources/views/maintenance/menu.blade.php

@@ -62,10 +62,6 @@
                 <li class="nav-item">
                     <a target="maintenance/logistic" class="nav-link text-dark" href="{{url('maintenance/logistic')}}" :class="{active:isActive('logistic',2)}">承运商</a>
                 </li> @endcan
-            {{--@can('承运商')
-                <li class="nav-item">
-                    <a class="nav-link text-dark" href="{{url('maintenance/carrier')}}" :class="{active:isActive('carrier',2)}">承运商</a>
-                </li> @endcan--}}
             @can('车型')
                 <li class="nav-item">
                     <a target="maintenance/carType" class="nav-link text-dark" href="{{url('maintenance/carType')}}" :class="{active:isActive('carType',2)}">车型</a>

resources/views/maintenance/priceModel/operation/create.blade.php

@@ -172,8 +172,8 @@
                     {id:"{{$unit->id}}",name:"{{$unit->name}}"},
                     @endforeach
                 ],
-                type : ['商品名称','订单类型','承运商','店铺类型','订单数'],
-                logic : ['包含','不包含','等于','大于','大于等于','小于','小于等于'],
+                type : ['商品名称','订单类型','承运商','店铺类型'],
+                logic : ['包含','不包含','等于'],
                 features : [],
                 thisIndex : "",
                 errors:{!! $errors !!},

resources/views/maintenance/priceModel/operation/index.blade.php

@@ -161,8 +161,8 @@
                 items : [],
                 updateDetailId : '',
                 units : null,
-                type : ['商品名称','订单类型','承运商','店铺类型','订单数'],
-                logic : ['包含','不包含','等于','大于','大于等于','小于','小于等于'],
+                type : ['商品名称','订单类型','承运商','店铺类型'],
+                logic : ['包含','不包含','等于'],
                 item : {
                     "strategy" : '特征',
                     "amount" : "",

resources/views/maintenance/region/index.blade.php

@@ -1,8 +1,9 @@
 @extends('layouts.app')
 @section('title')设置@endsection
-
 @section('content')
-    @component('maintenance.menu')@endcomponent
+    <span id="nav2">
+       @component('maintenance.menu')@endcomponent
+    </span>
     <div class="container-fluid d-none" id="container">
         <div class="card">
             <div class="card-body mt-2">