Merge branch 'master' into wangyang

app/Jobs/WeightUpdateInstantBill.php

@@ -19,11 +19,11 @@ class WeightUpdateInstantBill implements ShouldQueue
     /**
      * Create a new job instance.
      *
-     * @param OrderPackage $package
+     * @param OrderPackage|null $package
      *
      * @return void
      */
-    public function __construct(OrderPackage $package)
+    public function __construct(?OrderPackage $package)
     {
         $this->package = $package;
     }
@@ -38,6 +38,7 @@ class WeightUpdateInstantBill implements ShouldQueue
      */
     public function handle(OrderService $service)
     {
+        if (!$this->package)return;
         if (!$this->package->weight)return;
         $this->package->loadMissing("order");
         if (!$this->package->order)return;

resources/js/queryForm/queryForm.js

@@ -85,10 +85,11 @@ const query = function getQueryForm(data) {
         addHiedDiv();
         rendererSearchForm();
         visibleClearBtn();
-        parentNodeFloat();
+        fixed();
         inputKeyDown();
         selectChange();
         createTip();
+        fixed();
         $('[data-toggle="tooltip"]').tooltip({'trigger': 'hover'})
     }
 
@@ -111,31 +112,38 @@ const query = function getQueryForm(data) {
         return _toggle_btn;
      }
 
+    function fixed(){
+       _parentNode.addClass('header-float');
+       _parentNode.css('top',0);
+    }
+
     // form fixed
     function parentNodeFloat() {
         _parentNode_top = _parentNode.offset().top;
         let height = _parentNode.height();
         let dom = _this.appendDom ? $("#" + _this.appendDom + "") : null;
-        $(window).scroll(function () {
-            let scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
-            if(isSmallScreen()){
-                return;
-            }
-            if (scrollTop > _parentNode_top) {
-                _form.addClass('fixed-top');
-                if (dom) {
-                    dom.css('position', 'fixed');
-                    dom.css('background', 'rgb(255, 255, 255)');
-                    dom.css('top', height);
-                    dom.css('z-index', 1000);
-                }
-            } else {
-                _form.removeClass('fixed-top');
-                if (dom) {
-                    dom.attr('style', '');
-                }
-            }
-        });
+
+
+        // $(window).scroll(function () {
+        //     let scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
+        //     if(isSmallScreen()){
+        //         return;
+        //     }
+        //     if (scrollTop > _parentNode_top) {
+        //         _form.addClass('fixed-top');
+        //         if (dom) {
+        //             dom.css('position', 'fixed');
+        //             dom.css('background', 'rgb(255, 255, 255)');
+        //             dom.css('top', height);
+        //             dom.css('z-index', 1000);
+        //         }
+        //     } else {
+        //         _form.removeClass('fixed-top');
+        //         if (dom) {
+        //             dom.attr('style', '');
+        //         }
+        //     }
+        // });
     }
 
     // add  hide div (on submit form )

resources/views/order/index/delivering.blade.php

@@ -423,8 +423,8 @@
                     let time = "{{$request["restrict_time"] ?? ''}}";
                     if (start && end && time){
                         this.changeURLParam("orderdate_start",start);
-                        //this.changeURLParam("orderdate_end",end);
-                        //this.changeURLParam("restrict_time",time);
+                        this.changeURLParam("orderdate_end",end);
+                        this.changeURLParam("restrict_time",time);
                     }
                 },
                 changeURLParam(name, value) {

resources/views/order/issue/index.blade.php

@@ -1164,7 +1164,7 @@
                         name: ['result_explain', 'addtime'],
                         type: 'input_select',
                         tip: ['情况说明:前或后加 百分号为单个模糊搜索，否则为多条件精确搜索', '查询范围越短，搜索速度越快'],
-                        placeholder: ['处理结果', ''],
+                        placeholder: ['情况说明', ''],
                         data: log_content_range,
                         rules: [{
                             son: {