Merge branch 'master' of http://18.167.157.193:1026/guanli/ngds

backendApi/modules/v1/controllers/ShopController.php

@@ -410,7 +410,7 @@ class ShopController extends BaseController {
             'PERIOD_NUM'=> 'O.PERIOD_NUM',
             'CREATED_AT'=> 'O.CREATED_AT',
         ]);
-        $filter['condition'] .= ' AND O.IS_DELETE=0';
+        $filter['condition'] .= ' 1=1 AND O.IS_DELETE=0';
         $form = new ShopExportForm();
         $result = $form->run($filter, '订单列表');
         if (!$result) {
@@ -455,7 +455,7 @@ class ShopController extends BaseController {
         ]);
         $condition = $filter['condition'];
         $params = $filter['params'];
-        $condition .= ' AND O.IS_DELETE=0';
+        $condition .= ' 1=1 AND O.IS_DELETE=0';
         $listObj = new OrderDecList();
         $data = $listObj->getList(['condition'=>$condition, 'params'=>$params]);
         return static::notice($data);

backendEle/src/components/FilterUser.vue

@@ -313,7 +313,7 @@
       handleOptionPlus() {
         if (this.filterType === '' || this.filterSymbol === '' || (this.filterValue === '' && this.filterAreaValue === [])) {
           this.$message({
-            message: '请填写完整筛选内容',
+            message: 'please complete the selection',//请填写完整筛选内容
             type: 'warning'
           });
           return false