Skip to content

T
tl_estate
Commit d2e3b81e authored by hujun's avatar hujun
Browse files
Options

Merge remote-tracking branch 'origin/0702-v.2.2.0' into 0702-v.2.2.0

parents 10871e65 6af34f65
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 3 deletions
application/api_broker/service/UploadFileService.php
View file @ d2e3b81e
......@@ -56,18 +56,23 @@ class UploadFileService
switch ($type) {
case 'chat':
$path .= 'static/chat_image/';
$internet_path = CHAT_IMG_URL;
break;
case 'user_header' :
$path .= 'static/user_header/';
$internet_path = '';
break;
case 'agent_header' :
$path .= 'static/head_portrait/';
$internet_path = '';
break;
case 'house_img':
$path .= 'resource/lib/Attachments/images/';
$internet_path = '';
break;
case 'business_school' :
$path .= 'static/business_school/';
$internet_path = '';
break;
default :
$data['code'] = 101;
......@@ -88,6 +93,7 @@ class UploadFileService
if ($info) {
$data['code'] = 200;
$data["msg"][$k]['img_path'] = $date .'/'. $info->getSaveName(); //生成的图片路径
$data["msg"][$k]['internet_img_name'] = $internet_path . $data["msg"][$k]['img_path'];
$data["msg"][$k]['img_ext'] = $info->getExtension();
} else {
$data['code'] = 101;
......@@ -103,6 +109,7 @@ class UploadFileService
if ($info) {
$data['code'] = 200;
$data["msg"]['img_path'] = $date .'/'. $info->getSaveName(); //生成的图片路径
$data["msg"]['internet_img_name'] = $internet_path . $data["msg"]['img_path'];
$data["msg"]['img_ext'] = $info->getExtension();
} else {
$data['code'] = 101;
......
application/index/view/collection/getCollection.html
View file @ d2e3b81e
......@@ -331,6 +331,7 @@
<label>请选择一个图像文件：</label>
<button type="button btn2" class="btn btn-default">上传图片</button>
<input type="file" id="file_input"/>
<div id="container_body_img_area"></div>
</div>
</div>
<ul class="img-pre-ul" id="xiangqing_pic_ul">
......
application/index/view/news/index.html
View file @ d2e3b81e
......@@ -248,7 +248,7 @@
<div class="pull-right">
<ul class="bread_btn">
<li>
<a href="new_text.html" class="btn btn-default add_alert" target="_blank"><i class="icon-plus"></i> 新增文章
<a href="new_text.html" class="btn btn-default add_alert" target="_self"><i class="icon-plus"></i> 新增文章
</a>
</li>
</ul>
......
public/app/dist/index.html
View file @ d2e3b81e
......@@ -23,4 +23,4 @@
if(!doc.addEventListener) return;
win.addEventListener(resizeEvt, recalc, false);
doc.addEventListener('DOMContentLoaded', recalc, false);
})(document, window);</script><script type=text/javascript src=./vconsole.min.js></script><script type=text/javascript>if(~location.origin.indexOf('api.tonglianjituan.com')){console.log('正式服')}else{var vConsole=new VConsole()};</script><link href=./static/css/app.2f68450ee9131bc7966b2a9be394fa22.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.94d51f6620cb57f6116c.js></script><script type=text/javascript src=./static/js/app.d7d3f9bca7c902a57aa7.js></script></body></html>
\ No newline at end of file
})(document, window);</script><script type=text/javascript src=./vconsole.min.js></script><script type=text/javascript>if(~location.origin.indexOf('api.tonglianjituan.com')){console.log('正式服')}else{var vConsole=new VConsole()};</script><link href=./static/css/app.0384396bacb087bd73b7dac32b95f8cc.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.94d51f6620cb57f6116c.js></script><script type=text/javascript src=./static/js/app.861267062f5d7aa4508f.js></script></body></html>
\ No newline at end of file
public/app/dist/static/css/app.0384396bacb087bd73b7dac32b95f8cc.css.map 0 → 100644
View file @ d2e3b81e
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/css/app.2f68450ee9131bc7966b2a9be394fa22.css.map deleted 100644 → 0
View file @ 10871e65
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.861267062f5d7aa4508f.js 0 → 100644
View file @ d2e3b81e
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.861267062f5d7aa4508f.js.map 0 → 100644
View file @ d2e3b81e
This diff is collapsed.
public/app/dist/static/js/app.d7d3f9bca7c902a57aa7.js deleted 100644 → 0
View file @ 10871e65
This diff is collapsed.
public/resource/js/getCollection.js
View file @ d2e3b81e
This diff is collapsed.
public/resource/js/public.js
View file @ d2e3b81e
This diff is collapsed.
public/resource/js/schoolBusiness.js
View file @ d2e3b81e
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment