Skip to content

T
tl_estate
Commit 1a35dda9 authored by zw's avatar zw
Browse files
Options

Merge branch '0213-v3.0.7' of https://gitee.com/zwyjjc/tl_estate into 0213-v3.0.7

parents 5e42330e cccd0d9d
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 17 deletions
application/api/controller/Banner.php
View file @ 1a35dda9
......@@ -46,7 +46,7 @@ class Banner extends Basic
$where_["type"] = array("in",[2,3]);
}
$field = "id,title,CONCAT('".CK_IMG_URL."' , pic_path) as pic_path, url, type,sort,is_show,create_time,update_time";
$field = "id,title,CONCAT('".CK_IMG_URL.'images/'."' , pic_path) as pic_path, url, type,sort,is_show,create_time,update_time";
$where_['is_show'] = array( "eq", 0 );
......
application/index/view/houses/houseList.html
View file @ 1a35dda9
......@@ -235,7 +235,7 @@
<div class="pull-right">
<ul class="bread_btn">
<li>
<a href="/admin.php/index/houseAdd" data-toggle="modal" class="btn btn-default"><i class="icon-plus"></i>新增商铺</a>
<a href="/admin.php/index/houseAdd" class="btn btn-default"><i class="icon-plus"></i>新增商铺</a>
</li>
</ul>
</div>
......
public/app/dist/index.html
View file @ 1a35dda9
......@@ -23,4 +23,4 @@
if(!doc.addEventListener) return;
win.addEventListener(resizeEvt, recalc, false);
doc.addEventListener('DOMContentLoaded', recalc, false);
})(document, window);</script><link href=./static/css/app.49e7068bb37112ab84a6f844f9088bbe.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.f54574412330d2feee20.js></script></body></html>
\ No newline at end of file
})(document, window);</script><link href=./static/css/app.8e7a1294243657c878b001aee61ce09a.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.b438912f1795b396e5e3.js></script></body></html>
\ No newline at end of file
public/app/dist/static/js/app.b438912f1795b396e5e3.js 0 → 100644
View file @ 1a35dda9
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.f54574412330d2feee20.js deleted 100644 → 0
View file @ 5e42330e
This source diff could not be displayed because it is too large. You can view the blob instead.
public/resource/js/banner.js
View file @ 1a35dda9
......@@ -228,7 +228,7 @@ define (['doT', 'text!temp/banner_template_tpl.html', 'ckfinder', 'ckfinderStart
console.log(" in function ");
console.log(_this)
var formData = new FormData();
formData.append('type', 'shop_image_depot');
formData.append('type', 'house_img');
formData.append('image', _this[0].files[0]);
$.ajax({
type: 'post',
......@@ -244,7 +244,7 @@ define (['doT', 'text!temp/banner_template_tpl.html', 'ckfinder', 'ckfinderStart
var _url = _data.data.internet_img_name;
var tag = '' ;
tag += '<div class="col-xs-3 pictures" id='+_data.data.img_path+'>';
tag += ' <img src="https://images.tonglianjituan.com/'+_url+'" class="" id="" width="90%">';
tag += ' <img src="https://images.tonglianjituan.com/resource/lib/Attachments/images/'+_url+'" class="" id="" width="90%">';
tag += ' <div style="text-align:center" id="'+_data.data.img_path+'"><a href="javascript:;" class="delet-pic-btn">删除</a></div>';
tag += '</div>';
$('.img_area').append(tag) ;
......
public/resource/js/schoolBusinessNew.js
View file @ 1a35dda9
......@@ -98,8 +98,8 @@ define(['doT', 'text!temp/schoolBusiness_template_tpl.html', 'ckfinder', 'ckfind
$("#upload-image-btn").change(function() {
var _this = $(this),
_spFile = _this.data('spfile'),
_limitTop = _this.data('limittop'),
_fileNum = _this.parent().next().find('.delet-pic-btn').length; //根据删除按钮的个数，确定文件的个数
_limitTop = 1,//_this.data('limittop'),
_fileNum = $('#fujian_ul').find('.delet-pic-btn').length; //根据删除按钮的个数，确定文件的个数
if(_limitTop && (_fileNum < _limitTop)) {
// BrowseServer(_this.prev().attr('id'), function(url) {
......@@ -125,9 +125,6 @@ define(['doT', 'text!temp/schoolBusiness_template_tpl.html', 'ckfinder', 'ckfind
// }
// };
// });
var formData = new FormData();
formData.append('type', 'house_img');
formData.append('image', _this[0].files[0]);
......@@ -159,7 +156,7 @@ define(['doT', 'text!temp/schoolBusiness_template_tpl.html', 'ckfinder', 'ckfind
}
} else {
if(/(\.jpg|\.jpeg|\.png|\.gif|\.bmp)$/i.test(url)) {
$('#fujian_ul').append('<li><img class="titleImg" title="点击查看大图" src="{0}" srcNmae="{1}"/><a href="javascript:;" class="delet-pic-btn">删除</a></li>'.stringFormatObj({
$('#fujian_ul').append('<li><img class="titleImg" title="点击查看大图" src="{0}" data-name="{1}"/><a href="javascript:;" class="delet-pic-btn">删除</a></li>'.stringFormatObj({
'0': url,
'1' : _data.data.img_path
}));
......@@ -329,11 +326,13 @@ define(['doT', 'text!temp/schoolBusiness_template_tpl.html', 'ckfinder', 'ckfind
$("#district_id2").val(data.data.s_label_id * 1); //商学院标签id
var _data = data['data'];
if(_data['cover_plan']) {
var nameStr = _data['cover_plan'].split("Attachments/images")[1];
var name = nameStr.substr(1,nameStr.length-1);
console.log(name);
// http://images.tonglianjituan.com/static/shop_image_depot/20190218/20190218105609841.jpg
_imgUploadLiebiao.html('<li><img title="点击查看大图" src="{0}" /><a href="javascript:;" class="delet-pic-btn">删除</a></li>'.stringFormatObj({
_imgUploadLiebiao.html('<li><img class="titleImg" data-name="'+name+'" title="点击查看大图" src="{0}" data /><a href="javascript:;" class="delet-pic-btn">删除</a></li>'.stringFormatObj({
'0': _data['cover_plan']
}));
};
......@@ -398,6 +397,9 @@ define(['doT', 'text!temp/schoolBusiness_template_tpl.html', 'ckfinder', 'ckfind
});
},
add_news: function() { //新增文章 编辑文章
if ($('.titleImg')) {
var pic = $('.titleImg').attr("data-name");
}
var _imgUploadLiebiao = $('#fujian_ul'); //列表页封面图ul
// var _liebiaoPicObj = _imgUploadLiebiao.find('li>img');
var _liebiaoPicObj = $('.titleImg');
......@@ -418,7 +420,7 @@ define(['doT', 'text!temp/schoolBusiness_template_tpl.html', 'ckfinder', 'ckfind
console.log("1232132132132112312321321")
_data.title = $("#announcement_title").val();
_data.s_label_id = $("#district_id2").val(); //商学院标签id
_data.file_img = user.titlePic;//_liebiaoPicObj[0].src.replace(_urlCut, ''); //封面图 剪切后的字符串
_data.file_img = pic//user.titlePic;//_liebiaoPicObj[0].src.replace(_urlCut, ''); //封面图 剪切后的字符串
_data.content = _dajiangtangVal;
//附件相关
......
public/resource/template/banner_template_tpl.html
View file @ 1a35dda9
......@@ -5,8 +5,8 @@
<td>[%= it[item]["title"] %]</td>
<td>
<input type="hidden" value='[%= it[item]["pic_path"] %]'>
<img src='http://images.tonglianjituan.com/static/shop_image_depot/[%= it[item]["pic_path"] %]' class="diagram-image J_preview"
data-bimg='http://images.tonglianjituan.com/static/shop_image_depot/[%= it[item]["pic_path"] %]'>
<img src='http://images.tonglianjituan.com/resource/lib/Attachments/images/[%= it[item]["pic_path"] %]' class="diagram-image J_preview"
data-bimg='http://images.tonglianjituan.com/resource/lib/Attachments/images/[%= it[item]["pic_path"] %]'>
</td>
<td>
......
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