作者 张关杰

Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -260,6 +260,7 @@ class ImageController @@ -260,6 +260,7 @@ class ImageController
260 break; 260 break;
261 case 'hash': 261 case 'hash':
262 $data['image_link'] = url('/b/image/' . $v); 262 $data['image_link'] = url('/b/image/' . $v);
  263 + $data['url_link'] = url('public/upload/images/' . basename($v));
263 break; 264 break;
264 } 265 }
265 } 266 }