|
@@ -420,16 +420,21 @@ class Api
|
|
|
if ($type == 1) {
|
|
|
# 城市
|
|
|
$city_price = -1;
|
|
|
- if ($city['price'] && $city['price'] >= 0) {
|
|
|
- $city_price = $city['price'];
|
|
|
- }
|
|
|
- if ($city_price < 0) {
|
|
|
- if ($level && $level['city_price']) {
|
|
|
- $city_price = $level['city_price'];
|
|
|
- } else {
|
|
|
- $city_price = 0;
|
|
|
+ if ($city['price'] && $city['price'] == -2) {
|
|
|
+ $city_price = 0;
|
|
|
+ } else {
|
|
|
+ if ($city['price'] && $city['price'] >= 0) {
|
|
|
+ $city_price = $city['price'];
|
|
|
+ }
|
|
|
+ if ($city_price < 0) {
|
|
|
+ if ($level && $level['city_price']) {
|
|
|
+ $city_price = $level['city_price'];
|
|
|
+ } else {
|
|
|
+ $city_price = 0;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
$price = $city_price * $num;
|
|
|
} elseif ($type == 2) {
|
|
|
# 区县
|