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

 Conflicts:

	resources/views/transport/waybill/index.blade.php

app/Services/OrderService.php

@@ -98,13 +98,16 @@ class OrderService
             $sql .= " AND (c_tel2 like '".$c_tel2."' OR c_tel1 like '".$c_tel2."')";
         }
         if ($c_province){
-            $sql .= " AND c_province like '".$c_province."'";
+            if ($c_province=='空')$sql .= " AND c_province is null";
+            else$sql .= " AND c_province like '".$c_province."'";
         }
         if ($c_city){
-            $sql .= " AND c_city like '".$c_city."'";
+            if ($c_city=='空')$sql .= " AND c_city is null";
+            else$sql .= " AND c_city like '".$c_city."'";
         }
         if ($c_district){
-            $sql .= " AND c_district like '".$c_district."'";
+            if ($c_district=='空')$sql .= " AND c_district is null";
+            else$sql .= " AND c_district like '".$c_district."'";
         }
         if ($releasestatus){
             $sql .= " AND releasestatus = '".$releasestatus."'";

ci/executeCommand.sh

@@ -17,8 +17,8 @@ for file in `ls $update_path`
             sudo yarn install
         elif [ "resources" == "$file" ]; then
             sudo yarn run prod
-            else
-                echo "11"
+        elif [ "database" == "$file" ]; then
+            sudo php artisan migrate
         fi
     done
 

ci/judgePush.sh

@@ -7,13 +7,13 @@ path=$1
 # shellcheck disable=SC2164
 cd "$update_path"
 # shellcheck disable=SC2035
-sudo rm -rf *
-# shellcheck disable=SC2164
-cd "$path"
+rm -rf *
+
 #将项目文件中3分钟之前改动的文件存到update文件
 # shellcheck disable=SC2038
 # shellcheck disable=SC2185
-find -mmin -3 |grep -v .git|xargs -I {} cp -r {} -u -t $update_path
+#find -mmin -3 |grep -v .git|xargs -I {} cp -r {} -u -t $update_path
+#find -mtime -1 |grep -v .git|grep -v vendor|xargs -I {} cp -r {} /var/www/update/
 
 # shellcheck disable=SC2045
 # shellcheck disable=SC2006
@@ -23,3 +23,13 @@ find -mmin -3 |grep -v .git|xargs -I {} cp -r {} -u -t $update_path
 #            sudo composer install
 #        fi
 #    done
+
+for menu in `cd "$path" && find -type f -mmin -5 |grep -v .git|grep -v vendor`
+    do
+    #判断文件夹是否存在
+        if [ $(dirname "${menu#./}") != "." ]; then
+             mkdir -p $(dirname "${menu#./}") && cp "$path"/"${menu#./}" /var/www/update/$(dirname "${menu#./}")
+            else
+                cp -r "$path"/"${menu#./}" /var/www/update
+        fi
+    done

resources/views/transport/waybill/index.blade.php

@@ -85,13 +85,9 @@
                         </td>
                     @endcan
                     <td :class="[waybill.status=='已审核'?'text-success':'']"><span>@{{waybill.status}}</span></td>
-                    <td class="td-warm text-muted toptd">
-                        <div>
-                            <div v-if="waybill.remark" class="bg-light-yellow  text-danger top"  data-toggle="tooltip" style="opacity: 0.1;position: absolute;z-index: 1"
-                            >置顶备注：@{{  waybill.remark }}</div>
-                        @{{ i+1 }}
-                        </div>
-                    </td>
+                    <td class="td-warm text-muted toptd position-static">
+                        <div v-if="waybill.remark" class="bg-light-yellow  text-danger top position-absolute"  data-toggle="tooltip" style="opacity: 0.1;z-index: 1">置顶备注：@{{  waybill.remark }}</div>
+                        @{{ i+1 }}</td>
                     <td class="td-warm text-muted"><span>@{{waybill.created_at}}</span></td>
                     <td class="td-warm text-muted">
                         <div>
@@ -266,9 +262,9 @@
         .top{
             padding-top: 0;
             padding-left: 10px;
-            margin-top: -4px;
+            margin-top: -32px;
             margin-left: -5px;
-            line-height: 55px;
+            line-height: 50px;
 
 
             position: absolute;