Merge branch 'test'

a00949ca · zw · 9a3a6875 · 3cea16de · a00949ca
Commit a00949ca authored Jun 02, 2018 by zw
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

GHouses.php application/model/GHouses.php +3 -1

No files found.
--- a/application/model/GHouses.php
+++ b/application/model/GHouses.php
@@ -358,6 +358,8 @@ class GHouses extends BaseModel
        //剩余商铺为0下架
        if (empty($params['residue_num'])) {
            $params['status'] = 2;
+        } else {
+            $params['status'] = 1;
        }

        //新增或编辑
@@ -838,7 +840,7 @@ class GHouses extends BaseModel
            if (!empty($internal_title)) {

                //剩余商铺为0下架
-                if (empty($params['residue_num'])) {
+                if (empty($params['residue_num']) && isset($params['residue_num'])) {
                    $params['status'] = 2;
                } else {
                    $params['status'] = 1;