Skip to content

施宇 / icsales

Go to a project
Commit f80e1c72 by 施宇
Options

312123

parent 1729f808
Expand all
Inline Side-by-side
Showing with 276 additions and 71 deletions
Application/Home/View/QuotePrice/inquirydetail.html
......@@ -147,6 +147,7 @@
window.location.href = '/chat'
})
</script>
<script src="__PUBLIC__/js/quoteprice/inquirydetail.js"></script>
</body>
</html>
\ No newline at end of file
Application/Home/View/QuotePrice/releaseinquiry.html
......@@ -97,34 +97,35 @@
</div>
</form>
<div class="form_right fl ">
<!-- <div class="sc">
<div class="icon iconfont iconjuxing16"></div>
<p>上传图片</p>
</div> -->
<!-- 正常浏览器使用layui的上传插件上传 -->
<!-- <div class="upload_section" id="upload_section" style="display: none">
<div class="icon iconfont iconjuxing16"></div>
<p>将商品表格拖拽或点击到此处上传</p>
</div> -->
<div class="sc" id="upload_section" style="display: none">
<div class="icon iconfont iconjuxing16"></div>
<p>上传图片</p>
</div>
<!-- 低版本ie使用form+iframe上传 -->
<form enctype="multipart/form-data" id="fileLoad" method="post" target="test"
style="display: none">
<!-- token -->
<input type="text" name="token" value="" style="display: none" id="token" />
<!-- 是否是ie8 -->
<input type="text" name="ie8" value="" style="display:none" id="ie" />
<input type="file" id="mineFiles" name="upload" class="xslfile" />
<div class="form_div">
<div class="sc">
<!-- 正常浏览器使用layui的上传插件上传 -->
<div class="sc_div" id="upload_section" style="display: none">
<div class="icon iconfont iconjuxing16"></div>
<p>点击到此处上传</p>
<p>上传图片</p>
</div>
<!-- 低版本ie使用form+iframe上传 -->
<form enctype="multipart/form-data" id="fileLoad" method="post" target="test"
style="display: none">
<!-- token -->
<input type="text" name="token" value="" style="display: none" id="token" />
<!-- source -->
<input type="text" name="source" value="2" style="display: none" id="source" />
<!-- 是否是ie8 -->
<input type="text" name="ie8" value="" style="display:none" id="ie" />
<input type="file" id="mineFiles" name="upload" class="imgfile" accept="image/jpg,image/png"/>
<div class="form_div">
<div class="icon iconfont iconjuxing16"></div>
<p>上传图片</p>
</div>
<iframe name="test" id="test" style="display: none">
</iframe>
</form>
<div class="upload_result">
<img src="__PUBLIC__/images/test.jpg" alt="">
</div>
<iframe name="test" id="test" style="display: none">
</iframe>
</form>
</div>
<p>* 支持png、jpg等图片格式</p>
</div>
</div>
......
dist/css/common/base.css
......@@ -240,7 +240,7 @@ body {
background: rgba(234, 173, 55, 0.9);
box-shadow: 0px 2px 9px 0px rgba(242, 191, 97, 0.5);
position: fixed;
bottom: 92px;
top: 160px;
right: 20px;
cursor: pointer;
text-align: center;
......
dist/css/common/base.less
......@@ -283,7 +283,7 @@ body {
background: rgba(234, 173, 55, 0.9);
box-shadow: 0px 2px 9px 0px rgba(242, 191, 97, 0.5);
position: fixed;
bottom: 92px;
top:160px;
right: 20px;
cursor: pointer;
text-align: center;
......
dist/css/inquiry.css
......@@ -272,6 +272,10 @@
.quote_content .inquiry_data .data_list .data_item .bj_status.dd {
color: #61A0F2;
}
.inquiry_content .inquiry_data .data_list .data_item .bj_status.numbj,
.quote_content .inquiry_data .data_list .data_item .bj_status.numbj {
color: #EAA217;
}
.inquiry_content .inquiry_data .data_list .data_item .data_status,
.quote_content .inquiry_data .data_list .data_item .data_status {
width: 12%;
......@@ -291,6 +295,10 @@
.quote_content .inquiry_data .data_list .data_item .data_status.xj .mark {
background-color: #D8DFE6;
}
.inquiry_content .inquiry_data .data_list .data_item .data_status.jy .mark,
.quote_content .inquiry_data .data_list .data_item .data_status.jy .mark {
background-color: #EA1717;
}
.inquiry_content .inquiry_data .data_list .data_item .data_status .text,
.quote_content .inquiry_data .data_list .data_item .data_status .text {
color: #686E73;
......
dist/css/inquiry.less
......@@ -281,7 +281,11 @@
width: 12%;
&.dd {
color: #61A0F2
color: #61A0F2;
}
&.numbj{
color:#EAA217;
}
}
......@@ -307,6 +311,11 @@
background-color: #D8DFE6;
}
}
&.jy{
.mark {
background-color: #EA1717;
}
}
.text {
color: #686E73;
......
dist/css/releaseinquiry.css
......@@ -175,12 +175,46 @@
.upload_single_content .inquiry_form .form_content .form_right .sc {
height: 220px;
width: 220px;
background-color: #F5F9FC;
text-align: center;
position: relative;
background-color: #F5F9FC;
}
.release_inquiry_content .inquiry_form .form_content .form_right .sc form,
.upload_single_content .inquiry_form .form_content .form_right .sc form {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
}
.release_inquiry_content .inquiry_form .form_content .form_right .sc form .imgfile,
.upload_single_content .inquiry_form .form_content .form_right .sc form .imgfile {
position: absolute;
display: block;
font-size: 10000px;
height: 100%;
width: 100%;
filter: alpha(opacity=0);
}
.release_inquiry_content .inquiry_form .form_content .form_right .sc form .form_div,
.upload_single_content .inquiry_form .form_content .form_right .sc form .form_div {
color: #ADB6BF;
font-size: 60px;
}
.release_inquiry_content .inquiry_form .form_content .form_right .sc form .form_div p,
.upload_single_content .inquiry_form .form_content .form_right .sc form .form_div p {
font-size: 16px;
color: #8A9299;
margin-top: 35px;
}
.release_inquiry_content .inquiry_form .form_content .form_right .sc .sc_div,
.upload_single_content .inquiry_form .form_content .form_right .sc .sc_div {
height: 100%;
width: 100%;
cursor: pointer;
}
.release_inquiry_content .inquiry_form .form_content .form_right .sc div,
.upload_single_content .inquiry_form .form_content .form_right .sc div {
.release_inquiry_content .inquiry_form .form_content .form_right .sc .icon,
.upload_single_content .inquiry_form .form_content .form_right .sc .icon {
color: #ADB6BF;
font-size: 60px;
padding-top: 67px;
......@@ -191,10 +225,23 @@
font-size: 16px;
margin-top: 23px;
}
.release_inquiry_content .inquiry_form .form_content .form_right .sc .upload_result,
.upload_single_content .inquiry_form .form_content .form_right .sc .upload_result {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
display: none;
}
.release_inquiry_content .inquiry_form .form_content .form_right .sc .upload_result img,
.upload_single_content .inquiry_form .form_content .form_right .sc .upload_result img {
height: 100%;
width: 100%;
}
.release_inquiry_content .inquiry_form .form_content .form_right p,
.upload_single_content .inquiry_form .form_content .form_right p {
font-size: 14px;
color: #ADB6BF;
margin-top: 17px;
}
/*# sourceMappingURL=releaseinquiry.css.map */
\ No newline at end of file
dist/css/releaseinquiry.less
.release_inquiry_content,.upload_single_content {
.release_inquiry_content,
.upload_single_content {
padding: 0 20px;
.nav_title {
......@@ -135,21 +136,24 @@
bottom: 7px;
border-left: 1px solid #D8DFE6;
line-height: 26px;
.layui-form-select{
height:100%;
.layui-select-title{
height:100%;
.layui-form-select {
height: 100%;
.layui-select-title {
height: 100%;
}
input{
height:100%;
border:none;
width:99%;
padding-right:0;
input {
height: 100%;
border: none;
width: 99%;
padding-right: 0;
line-height: 26px;
}
}
}
}
......@@ -158,8 +162,10 @@
.btn_div {
margin: 30px 0 0 90px;
span {
width: 120px;
&.cz {
margin-left: 40px;
......@@ -175,11 +181,46 @@
.sc {
height: 220px;
width: 220px;
background-color: #F5F9FC;
text-align: center;
cursor: pointer;
position: relative;
background-color: #F5F9FC;
form {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
.imgfile {
position: absolute;
display: block;
font-size: 10000px;
height: 100%;
width: 100%;
filter: alpha(opacity=0);
}
div {
.form_div {
color: #ADB6BF;
font-size: 60px;
p {
font-size: 16px;
color: #8A9299;
margin-top: 35px;
}
}
}
.sc_div {
height: 100%;
width: 100%;
cursor: pointer;
}
.icon {
color: #ADB6BF;
font-size: 60px;
padding-top: 67px;
......@@ -190,6 +231,20 @@
font-size: 16px;
margin-top: 23px;
}
.upload_result {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
display: none;
img {
height: 100%;
width: 100%;
}
}
}
p {
......
dist/js/chat/index.js
......@@ -391,7 +391,17 @@ $(function () {
console.log('登入成功')
self.defaultUser();
self.singleChat();
self.getHistoryData()
self.getHistoryData();
self.conn.fetchHistoryMessages({
queue:"18664936975",
count:"100",
success:function(data){
console.log(data)
},
fail:function(e){
console.log(e)
}
})
},
onTextMessage: function (message) {
self.receiveData(1, message, false)
......
dist/js/chat/websdk-1.4.8.js
This diff could not be displayed because it is too large.
dist/js/global/api.js
......@@ -78,6 +78,10 @@
* 会员中心询价列表 需要token
*/
inquiryInfo:offer_url+"/inquiry/info",
/***
* 我的询价回复
*/
inquiryMyOffer:offer_url+"/inquiry/my/offer",
/***
* 询价添加 需要token
*/
......
dist/js/index/search.js
......@@ -27,7 +27,7 @@ $(function () {
layui.laytpl(getTpl).render(list, function (html) {
$(".search_data_list").html(html);
});
} else if (res.errcode == 110001) {
} else if (res.errcode == 105001) {
$('.nav_title').find('span').text(0)
layui.laytpl(getTpl).render([], function (html) {
$(".search_data_list").html(html);
......
dist/js/quoteprice/inquiry.js
......@@ -13,9 +13,9 @@ $(function () {
this.getData(1);
},
getData: function (page) {
let self = this;
var self = this;
IcController.getData(apis.inquiryInfo, 'GET', {
'goods_name': $('#goodName').val() || "",
'goods_name/like': $('#goodName').val() || "",
"start_time": $('#start_date').val() || "",
"end_time": $('#end_date').val() || "",
"offset": 7,
......@@ -53,23 +53,55 @@ $(function () {
}
})
},
geMyXj: function (id, ele) {
//获取回复的询价
var self = this;
IcController.getData(apis.inquiryMyOffer, 'GET', {
"inquiry_items_id/eq": id,
"token": Util.getCookie('token') || "",
"limit": "5"
}, function (res) {
$(ele).parent('.data_item').find('.show_more').slideUp();
var getTpl = myxjTp.innerHTML;
if (res.errcode == 0) {
if (res.total == 0) {
layer.msg('暂无数据')
} else {
layui.laytpl(getTpl).render(res.data, function (html) {
$(ele).siblings('.show_more').empty().html(html).slideDown();
});
}
} else {
layer.msg('暂无数据')
}
})
},
bindFun: function () {
var self = this;
$('.edit_div').click(function () {
window.location.href = "/releaseinquiry"
});
$('.iconjuxing2').click(function (e) {
$('.inquiry_data').on('click', '.iconjuxing2', function (e) {
e.stopPropagation();
var userid = $(this).parent('.data_item').attr('userid')
if ($(this).siblings('.show_more').css('display') == 'none') {
$('.show_more').slideDown()
self.geMyXj(userid, this);
} else {
$('.show_more').slideUp()
$(this).siblings('.show_more').slideUp();
}
})
$('.inquiry_data').on('click', '.data_item', function () {
window.location.href = "/inquirydetail"
var userid = $(this).attr('userid');
window.location.href = "/inquirydetail?id=" + userid
});
$('.inquiry_data').on('click', '.show_more', function () {
e.stopPropagation();
});
$('.cx').on('click', function () {
self.getData(1);
......
dist/js/quoteprice/inquirydetail.js 0 → 100644
$(function(){
var inquiryDetail = {
init:function(){
this.getUserData()
},
getUserData:function(){
let self = this;
IcController.getData(apis.inquiryInfo, 'GET', {
"inquiry_items_id/eq":Util.getRequest('id')||"",
"token": Util.getCookie('token') || ""
}, function (res) {
// var getTpl = htmlTp.innerHTML;
if (res.errcode == 0) {
// $('#pagination').show();
// layui.laytpl(getTpl).render(res.inquiry_list, function (html) {
// $(".inquiry_data").empty().html(html);
// layui.laypage.render({
// elem: 'pagination',
// theme: '#1080d0',
// count: res.total,
// limit: 7,
// curr: page,
// jump: function (obj, first) {
// if (!first) {
// //分页回调调用
// self.getData(obj.curr)
// }
// }
// });
// });
} else if (res.errcode == 105001) {
// layui.laytpl(getTpl).render([], function (html) {
// $(".inquiry_data").empty().html(html);
// $('#pagination').hide();
// });
}
})
}
};
inquiryDetail.init();
})
\ No newline at end of file
dist/js/quoteprice/releaseinquiry.js
......@@ -33,12 +33,8 @@
done: function (res) {
layer.closeAll('loading');
if (res.errcode == 0) {
layer.msg('上传成功', {
time: 600
}, function () {
window.location.href = "/uploadresult";
});
$('#upload_section').hide();
$('.upload_result').show();
} else {
layer.msg(res.errmsg)
}
......@@ -55,7 +51,6 @@
if (navigator.appName == "Microsoft Internet Explorer" && (navigator.appVersion.split(";")[1].replace(/[ ]/g, "") == "MSIE8.0" || navigator.appVersion.split(";")[1].replace(/[ ]/g, "") == "MSIE9.0")) {
//ie版本
$('#fileLoad').show();
$('.sc').hide();
document.domain = cookieHostname; //设置domian跨域拿到iframe的内容
var iframe = document.getElementById("test");
if (iframe.attachEvent) {
......@@ -73,7 +68,7 @@
})
} else {
//非ie低版本
$('#upload_section').show();
$('.sc_div').show();
opt.uploadFun();
}
return this;
......@@ -105,12 +100,9 @@
}
if (json) {
layer.closeAll('loading');
if (json.errcode == 0) {
layer.msg('上传成功', {
time: 600
}, function () {
window.location.href = "/uploadresult";
});
if (json.errcode == 103200) {
console.log(json)
} else {
layer.msg(json.errmsg)
......
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 sign in to comment