Skip to content

施宇 / icsales

Go to a project
Commit debb1043 by 施宇
Options

Merge branch 'sy_191111_yxq' into development 

# Conflicts:
#	dist/js/quoteprice/releaseinquiry.js
parents d5e9d5a1 08f82585
Inline Side-by-side
Showing with 169 additions and 34 deletions
Application/Home/View/GoodManage/uploadsingle.html
......@@ -76,7 +76,7 @@
<input type="radio" name="delivery_time" lay-filter="delivery" value="期货"
title="期货" checked id="daytext">
<div class="lineBlock" id="day">
<input type="text" placeholder="输入时间" class="boxsiz day_input input"
<input type="text" placeholder="输入数字或范围" class="boxsiz day_input input"
lay-verify="required" name="day">
<i class="day">天</i>
</div>
......
Application/Home/View/Home/index.html
......@@ -118,11 +118,15 @@
<div class="fl num ellipsis">{{item.goods_name}}</div>
</div>
<div class="item_middle clr">
{{# if(item.end_time < item.current_time){ }}
<div class="fl gq">已过期</div>
{{# } else { }}
{{# if(item.offer_num){ }}
<div class="fl xjNum">{{item.offer_num}}个报价</div>
{{# } else { }}
<div class="fl xj0">等待报价</div>
{{# } }}
{{# } }}
<div class="fr time">{{layui.util.toDateString(item.add_time * 1000)}}</div>
</div>
<div class="item_bottom">
......
Application/Home/View/QuotePrice/inquiry.html
......@@ -79,11 +79,15 @@
<div class="type fl bold ellipsis boxsiz">{{item.goods_name}}</div>
<div class="brand fl ellipsis boxsiz">品牌：<span>{{item.brand_name}}</span></div>
<div class="num fl ellipsis boxsiz">数量：<span>PCS{{item.number}}</span></div>
{{# if(item.end_time < item.current_time){ }}
<div class="bj_status fl ellipsis boxsiz bold gq">已过期</div>
{{# } else { }}
{{# if(item.offer_num){ }}
<div class="bj_status fl ellipsis boxsiz numbj bold">{{item.offer_num}}个报价</div>
{{# } else { }}
<div class="bj_status fl ellipsis boxsiz dd bold">等待报价</div>
{{# } }}
{{# } }}
{{# if(item['audit_status'] == 1){ }}
{{# if(item['status'] == 1){ }}
<div class="data_status fl boxsiz zs">
......
Application/Home/View/QuotePrice/inquirydetail.html
......@@ -62,7 +62,7 @@
{{# } }}
</div>
</div>
<div class="desc inquiry_desc" style="margin-right:224px">
<div class="desc inquiry_desc" style="margin-right:35px">
<div class="brand fl boxsiz ellipsis">
品牌：<span> {{d.brand_name}}</span>
</div>
......@@ -88,6 +88,7 @@
</div>
<div class="num fl boxsiz ellipsis"> 数量：<span class="bold"> {{d.number}} PCS</span></div>
<div class="hq fl boxsiz ellipsis"> 货期：<span>{{d.delivery_time}}</span></div>
<div class="yxq fl boxsiz ellipsis"> 询价有效期：<span>{{d.end_time_date || '--'}}</span></div>
<div class="bz fl boxsiz ellipsis"> 备注：<span> {{d.remark||'--'}}</span></div>
</div>
</div>
......
Application/Home/View/QuotePrice/quotedetail.html
......@@ -134,7 +134,7 @@
</div>
</div>
<div class="desc">
<div class="desc quote_detail_desc" style="margin-right:0">
<div class="brand fl boxsiz ellipsis">
品牌：<span>{{d.brand_name}}</span>
</div>
......@@ -157,6 +157,7 @@
{{# } }}</div>
<div class="num fl boxsiz ellipsis"> 数量：<span class="bold">{{d.number}} PCS</span></div>
<div class="hq fl boxsiz ellipsis"> 货期：<span>{{d.delivery_time}}</span></div>
<div class="yxq fl boxsiz ellipsis"> 询价有效期：<span>{{d.end_time_date || '--'}}</span></div>
<div class="bz fl boxsiz ellipsis"> 备注：<span>{{d.remark||'--'}}</span></div>
</div>
</div>
......
Application/Home/View/QuotePrice/releaseinquiry.html
......@@ -65,6 +65,16 @@
</div>
</div>
</div>
<div class="yxq input_div ">
<span class="input_title lineBlock">*询价有效期:</span>
<div class="input_parent">
<input type="text" name="end_time" placeholder="请选择截止日期"
class="input boxsiz yxq_input" lay-verify="required" id="yxq">
<div class="yxq_logo layui-form">
<span class="icon iconfont iconjuxing13"></span>
</div>
</div>
</div>
<div class="hq input_div">
<span class="input_title lineBlock">*货期:</span>
<div class="input_parent" id="delivery">
......
dist/css/common/base.css
......@@ -327,6 +327,11 @@ body {
font-size: 14px;
font-weight: 600;
}
.goods_data_list .my_xj_list .my_xj_item .item_middle .gq {
color: #686E73;
font-size: 14px;
font-weight: 600;
}
.goods_data_list .my_xj_list .my_xj_item .item_middle .xj0 {
color: #61A0F2;
font-size: 14px;
......
dist/css/common/base.less
......@@ -387,6 +387,11 @@ body {
font-size: 14px;
font-weight: 600;
}
.gq {
color: #686E73;
font-size: 14px;
font-weight: 600;
}
.xj0 {
color: #61A0F2;
......
dist/css/inquiry.css
......@@ -276,6 +276,10 @@
.quote_content .inquiry_data .data_list .data_item .bj_status.numbj {
color: #EAA217;
}
.inquiry_content .inquiry_data .data_list .data_item .bj_status.gq,
.quote_content .inquiry_data .data_list .data_item .bj_status.gq {
color: #686E73;
}
.inquiry_content .inquiry_data .data_list .data_item .data_status,
.quote_content .inquiry_data .data_list .data_item .data_status {
width: 12%;
......
dist/css/inquiry.less
......@@ -287,6 +287,9 @@
&.numbj{
color:#EAA217;
}
&.gq{
color:#686E73;
}
}
......
dist/css/inquirydetail.css
......@@ -93,9 +93,37 @@
color: #515559;
}
.inquiry_detail_content .goods_detail .goods_desc .desc.inquiry_desc,
.quote_detail_content .goods_detail .goods_desc .desc.inquiry_desc {
.quote_detail_content .goods_detail .goods_desc .desc.inquiry_desc,
.inquiry_detail_content .goods_detail .goods_desc .desc.quote_detail_desc,
.quote_detail_content .goods_detail .goods_desc .desc.quote_detail_desc {
margin-right: 274px;
}
.inquiry_detail_content .goods_detail .goods_desc .desc.inquiry_desc div.brand,
.quote_detail_content .goods_detail .goods_desc .desc.inquiry_desc div.brand,
.inquiry_detail_content .goods_detail .goods_desc .desc.quote_detail_desc div.brand,
.quote_detail_content .goods_detail .goods_desc .desc.quote_detail_desc div.brand,
.inquiry_detail_content .goods_detail .goods_desc .desc.inquiry_desc div.num,
.quote_detail_content .goods_detail .goods_desc .desc.inquiry_desc div.num,
.inquiry_detail_content .goods_detail .goods_desc .desc.quote_detail_desc div.num,
.quote_detail_content .goods_detail .goods_desc .desc.quote_detail_desc div.num {
width: 45%;
}
.inquiry_detail_content .goods_detail .goods_desc .desc.inquiry_desc div.hq,
.quote_detail_content .goods_detail .goods_desc .desc.inquiry_desc div.hq,
.inquiry_detail_content .goods_detail .goods_desc .desc.quote_detail_desc div.hq,
.quote_detail_content .goods_detail .goods_desc .desc.quote_detail_desc div.hq {
width: 30%;
}
.inquiry_detail_content .goods_detail .goods_desc .desc.inquiry_desc div.yxq,
.quote_detail_content .goods_detail .goods_desc .desc.inquiry_desc div.yxq,
.inquiry_detail_content .goods_detail .goods_desc .desc.quote_detail_desc div.yxq,
.quote_detail_content .goods_detail .goods_desc .desc.quote_detail_desc div.yxq,
.inquiry_detail_content .goods_detail .goods_desc .desc.inquiry_desc div.price,
.quote_detail_content .goods_detail .goods_desc .desc.inquiry_desc div.price,
.inquiry_detail_content .goods_detail .goods_desc .desc.quote_detail_desc div.price,
.quote_detail_content .goods_detail .goods_desc .desc.quote_detail_desc div.price {
width: 25%;
}
.inquiry_detail_content .goods_detail .goods_desc .desc div,
.quote_detail_content .goods_detail .goods_desc .desc div {
font-size: 14px;
......@@ -446,7 +474,7 @@
padding: 0 90px 0 15px;
}
.from_mask .form .form_content .input_div .input_parent .input.day_input {
width: 139px;
width: 180px;
padding: 0 35px 0 15px;
}
.from_mask .form .form_content .input_div .input_parent .day {
......@@ -486,4 +514,3 @@
.from_mask .form .form_content .btn_div span.cz_mask {
margin-left: 40px;
}
/*# sourceMappingURL=inquirydetail.css.map */
\ No newline at end of file
dist/css/inquirydetail.less
......@@ -95,10 +95,26 @@
}
.desc {
&.inquiry_desc {
&.inquiry_desc,&.quote_detail_desc {
margin-right: 274px;
div {
&.brand,
&.num {
width: 45%;
}
&.hq {
width: 30%;
}
&.yxq, &.price {
width: 25%
}
}
}
div {
font-size: 14px;
color: #ADB6BF;
......@@ -349,7 +365,8 @@
.bj_btn {
width: 220px;
margin: 50px auto 0;
&.disabled{
&.disabled {
background-color: #DAE1E7;
cursor: not-allowed;
}
......@@ -466,7 +483,7 @@
}
&.day_input {
width: 139px;
width: 180px;
padding: 0 35px 0 15px;
}
......
dist/css/releaseinquiry.css
......@@ -71,12 +71,12 @@
.release_inquiry_content .inquiry_form .form_content .form_left .input_div .input_title,
.upload_single_content .inquiry_form .form_content .form_left .input_div .input_title {
color: #686E73;
width: 66px;
width: 90px;
text-align: right;
}
.release_inquiry_content .inquiry_form .form_content .form_left .input_div .layui-input-block,
.upload_single_content .inquiry_form .form_content .form_left .input_div .layui-input-block {
margin-left: 85px;
margin-left: 100px;
}
.release_inquiry_content .inquiry_form .form_content .form_left .input_div .layui-input-block .layui-textarea,
.upload_single_content .inquiry_form .form_content .form_left .input_div .layui-input-block .layui-textarea {
......@@ -87,7 +87,7 @@
.release_inquiry_content .inquiry_form .form_content .form_left .input_div .input_parent,
.upload_single_content .inquiry_form .form_content .form_left .input_div .input_parent {
position: absolute;
left: 85px;
left: 100px;
right: 0;
top: 0;
}
......@@ -116,9 +116,13 @@
.upload_single_content .inquiry_form .form_content .form_left .input_div .input_parent .input.price_input {
padding: 0 90px 0 15px;
}
.release_inquiry_content .inquiry_form .form_content .form_left .input_div .input_parent .input.yxq_input,
.upload_single_content .inquiry_form .form_content .form_left .input_div .input_parent .input.yxq_input {
padding: 0 40px 0 15px;
}
.release_inquiry_content .inquiry_form .form_content .form_left .input_div .input_parent .input.day_input,
.upload_single_content .inquiry_form .form_content .form_left .input_div .input_parent .input.day_input {
width: 139px;
width: 180px;
padding: 0 35px 0 15px;
}
.release_inquiry_content .inquiry_form .form_content .form_left .input_div .input_parent .day,
......@@ -128,7 +132,9 @@
left: -30px;
}
.release_inquiry_content .inquiry_form .form_content .form_left .input_div .input_parent .rmb,
.upload_single_content .inquiry_form .form_content .form_left .input_div .input_parent .rmb {
.upload_single_content .inquiry_form .form_content .form_left .input_div .input_parent .rmb,
.release_inquiry_content .inquiry_form .form_content .form_left .input_div .input_parent .yxq_logo,
.upload_single_content .inquiry_form .form_content .form_left .input_div .input_parent .yxq_logo {
position: absolute;
cursor: pointer;
right: 0;
......@@ -138,16 +144,37 @@
border-left: 1px solid #D8DFE6;
line-height: 26px;
}
.release_inquiry_content .inquiry_form .form_content .form_left .input_div .input_parent .rmb.yxq_logo,
.upload_single_content .inquiry_form .form_content .form_left .input_div .input_parent .rmb.yxq_logo,
.release_inquiry_content .inquiry_form .form_content .form_left .input_div .input_parent .yxq_logo.yxq_logo,
.upload_single_content .inquiry_form .form_content .form_left .input_div .input_parent .yxq_logo.yxq_logo {
border: none;
text-align: center;
color: #0D84D1;
width: 40px;
}
.release_inquiry_content .inquiry_form .form_content .form_left .input_div .input_parent .rmb.yxq_logo .icon,
.upload_single_content .inquiry_form .form_content .form_left .input_div .input_parent .rmb.yxq_logo .icon,
.release_inquiry_content .inquiry_form .form_content .form_left .input_div .input_parent .yxq_logo.yxq_logo .icon,
.upload_single_content .inquiry_form .form_content .form_left .input_div .input_parent .yxq_logo.yxq_logo .icon {
font-size: 20px;
}
.release_inquiry_content .inquiry_form .form_content .form_left .input_div .input_parent .rmb .layui-form-select,
.upload_single_content .inquiry_form .form_content .form_left .input_div .input_parent .rmb .layui-form-select {
.upload_single_content .inquiry_form .form_content .form_left .input_div .input_parent .rmb .layui-form-select,
.release_inquiry_content .inquiry_form .form_content .form_left .input_div .input_parent .yxq_logo .layui-form-select,
.upload_single_content .inquiry_form .form_content .form_left .input_div .input_parent .yxq_logo .layui-form-select {
height: 100%;
}
.release_inquiry_content .inquiry_form .form_content .form_left .input_div .input_parent .rmb .layui-form-select .layui-select-title,
.upload_single_content .inquiry_form .form_content .form_left .input_div .input_parent .rmb .layui-form-select .layui-select-title {
.upload_single_content .inquiry_form .form_content .form_left .input_div .input_parent .rmb .layui-form-select .layui-select-title,
.release_inquiry_content .inquiry_form .form_content .form_left .input_div .input_parent .yxq_logo .layui-form-select .layui-select-title,
.upload_single_content .inquiry_form .form_content .form_left .input_div .input_parent .yxq_logo .layui-form-select .layui-select-title {
height: 100%;
}
.release_inquiry_content .inquiry_form .form_content .form_left .input_div .input_parent .rmb .layui-form-select input,
.upload_single_content .inquiry_form .form_content .form_left .input_div .input_parent .rmb .layui-form-select input {
.upload_single_content .inquiry_form .form_content .form_left .input_div .input_parent .rmb .layui-form-select input,
.release_inquiry_content .inquiry_form .form_content .form_left .input_div .input_parent .yxq_logo .layui-form-select input,
.upload_single_content .inquiry_form .form_content .form_left .input_div .input_parent .yxq_logo .layui-form-select input {
height: 100%;
border: none;
width: 99%;
......
dist/css/releaseinquiry.less
......@@ -67,12 +67,12 @@
.input_title {
color: #686E73;
width: 66px;
width: 90px;
text-align: right;
}
.layui-input-block {
margin-left: 85px;
margin-left: 100px;
.layui-textarea {
min-height: 80px;
......@@ -84,7 +84,7 @@
.input_parent {
position: absolute;
left: 85px;
left: 100px;
right: 0;
top: 0;
......@@ -110,12 +110,14 @@
width: 100%;
line-height: 40px;
&.price_input {
&.price_input{
padding: 0 90px 0 15px;
}
&.yxq_input{
padding: 0 40px 0 15px;
}
&.day_input {
width: 139px;
width: 180px;
padding: 0 35px 0 15px;
}
......@@ -127,7 +129,7 @@
left: -30px;
}
.rmb {
.rmb,.yxq_logo {
position: absolute;
cursor: pointer;
right: 0;
......@@ -136,7 +138,16 @@
bottom: 7px;
border-left: 1px solid #D8DFE6;
line-height: 26px;
&.yxq_logo{
border:none;
text-align: center;
color:#0D84D1;
width:40px;
.icon{
font-size: 20px;
}
}
.layui-form-select {
height: 100%;
......
dist/js/home/index.js
......@@ -69,6 +69,11 @@ $(function () {
if (type == 1) {
arr = res.data;
} else {
var currentTime = new Date().toLocaleDateString();
var currentTimeStap =new Date(currentTime+' 23:59:59').getTime()/1000;
for(var k in res.inquiry_list){
res.inquiry_list[k].current_time = currentTimeStap
}
arr = res.inquiry_list
}
layui.laytpl(getTpl).render(arr, function (html) {
......
dist/js/quoteprice/inquiry.js
......@@ -38,6 +38,11 @@ $(function () {
var getTpl = htmlTp.innerHTML;
if (res.errcode === 0) {
$('#pagination').show();
var currentTime = new Date().toLocaleDateString();
var currentTimeStap =new Date(currentTime+' 23:59:59').getTime()/1000;
for(var k in res.inquiry_list){
res.inquiry_list[k].current_time = currentTimeStap
}
layui.laytpl(getTpl).render(res.inquiry_list, function (html) {
$(".inquiry_data").empty().html(html);
layui.laypage.render({
......
dist/js/quoteprice/releaseinquiry.js
!function () {
! function () {
window.ReleaseInquiry = {
isClick: false,
imgUrl: "",
......@@ -6,12 +6,17 @@
this.created(this).mounted(this).isIe(this).handleBind(this);
},
created: function (opt) {
//日期控件初始化
layui.laydate.render({
elem: '#yxq',
theme: '#0D84D1',
trigger: 'click',
min:1,
max:365
});
return this;
},
mounted: function (opt) {
return this;
},
uploadFun: function () {
......@@ -61,8 +66,7 @@
iframe.attachEvent("onload", opt.iframeOnload);
} else {
iframe.onload = opt.iframeOnload;
}
;
};
opt.formSubmit();
$('#mineFiles').on('change', function () {
layer.load(1, {
......@@ -150,7 +154,10 @@
//上传商品发布
layui.form.on('submit(add)', function (data) {
var date = data.field.end_time;
date = date.replace(/-/g,'/');
var timeStap =new Date(date+' 23:59:59').getTime()/1000
data.field.end_time = timeStap;//设置选中的时间变为时间戳
$(data.elem).addClass("layui-btn-disabled");
var parmas = $.extend({}, data.field, {
goods_images: opt.imgUrl
......@@ -222,10 +229,10 @@
}
},
pointLimit: function (value, item) {
if(!Util.fourPoint(value)){
if (!Util.fourPoint(value)) {
return '价格为整数或不超过4位小数'
}
if(value>1000000){
if (value > 1000000) {
return '价格最大为1000000（一百万）'
}
}
......
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