Merge branch 'jun' into test

app/Http/Controllers/Api/Product.php

@@ -205,7 +205,7 @@ class Product extends Api{
         if ($payCity && $payCity['city_ids']) {
             $cityIds = explode(',',$payCity['city_ids']);
             foreach ($allowCity as $item) {
-                if ($item == 1 || in_array($item,$cityIds))     $isPay                  = 1;
+                if (($item == 1 || in_array($item,$cityIds)) && in_array($custom['city_id'],$cityIds))     $isPay                  = 1;
             }
         }
         // 转数组

app/Http/Controllers/Api/ShopCart.php

@@ -353,7 +353,7 @@ class ShopCart extends Api{
             if ($payCity && $payCity['city_ids']) {
                 $cityIds = explode(',',$payCity['city_ids']);
                 foreach ($allowCity as $item) {
-                    if ($item == 1 || in_array($item,$cityIds))     $isPay                  = 1;
+                    if (($item == 1 || in_array($item,$cityIds)) && in_array($custom['city_id'],$cityIds))     $isPay                  = 1;
                 }
             }
             $value['is_pay']        = $isPay;