合并分支 'Branch_liuzhen' 到 'master'

店铺页面报错修复



查看合并请求 !103

@@ -48,7 +48,7 @@ class Shop extends Frontend
             if(!empty($user)){
             if(!empty($user)){
                 $province_ids = [];
                 $province_ids = [];
                 if($user['province_ids']) {
                 if($user['province_ids']) {
-                    $province_ids = explode(',',$user['province_ids']);
+                    $province_ids = is_array($user['province_ids']) ? $user['province_ids'] : explode(',',$user['province_ids']);
                 }
                 }
                 if($user['is_svip'] == '1' || ($user['is_vip'] == '1' && in_array($province_id,$province_ids))){
                 if($user['is_svip'] == '1' || ($user['is_vip'] == '1' && in_array($province_id,$province_ids))){
                     $encrypt = '1';
                     $encrypt = '1';