Merge branch 'master' of http://git.liuniu946.com/Kirin/zccy

app/models/store/StoreProductAttr.php

@@ -59,7 +59,7 @@ class StoreProductAttr extends BaseModel
             }
             if ($store_id && $type_id == 0) {
                 $stockinfo = SystemStoreProductStock::where('unique', $value['unique'])->where('store_id', $store_id)->find();
-                $value['price'] = $stockinfo ? $stockinfo['price'] : $value['price'];
+                $value['price'] = ($stockinfo && $stockinfo['price'] > 0) ? $stockinfo['price'] : $value['price'];
             }
             $values[$value['suk']] = $value;
         }