Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

app-ghs/controllers/ItemController.php

@@ -974,7 +974,16 @@ class ItemController extends BaseController
             Yii::$app->redis->executeCommand('DEL', ['ghs_cashier_' . $mainId . '_' . $staffId . '_may_refresh']);
         }
 
-        util::success(['list' => $list]);
+        $productList = [];
+        if (!empty($list)) {
+            foreach ($list as $key => $item) {
+                if(!empty($item)){
+                    $productList = array_merge($productList, $item);
+                }
+            }
+        }
+
+        util::success(['list' => $list, 'productList' => $productList]);
     }
 
     public function actionAdd()