Skip to content

施宇 / icsales

Go to a project
Commit b2a45bba by 施宇
Options

Merge branch 'sy_ic_1016'

parents 23a241d6 e8c89ca2
Inline Side-by-side
Showing with 50 additions and 26 deletions
Application/Home/View/Account/index.html
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<h3 class="bold">基本设置</h3> <h3 class="bold">基本设置</h3>
<div class="gb"> <div class="gb">
<span class="icon iconfont iconjuxing19 va-m"></span> <span class="icon iconfont iconjuxing19 va-m"></span>
<span>如需更改手机账户，请联系在线客服。</span> <span>如需更改绑定手机号，请联系在线客服</span>
</div> </div>
<div class="form_content clr"> <div class="form_content clr">
<div class="form_left fl layui-form" lay-filter="account"> <div class="form_left fl layui-form" lay-filter="account">
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<div class="brand input_div"> <div class="brand input_div">
<span class="input_title lineBlock">详细地址:</span> <span class="input_title lineBlock">详细地址:</span>
<div class="input_parent"> <div class="input_parent">
<input type="text" placeholder="请输入详细地址" class="input boxsiz" <input type="text" placeholder="请输入真实详细地址，有助于使发布的信息排名靠前" class="input boxsiz"
name="detail_address" lay-verify="required"> name="detail_address" lay-verify="required">
</div> </div>
</div> </div>
......
Application/Home/View/GoodManage/bulkupload.html
...@@ -23,13 +23,13 @@ ...@@ -23,13 +23,13 @@
</div> </div>
<div class="gb"> <div class="gb">
<span class="icon iconfont iconjuxing19 va-m"></span> <span class="icon iconfont iconjuxing19 va-m"></span>
<span>上传的商品有图片，搜索排名会优先排前</span> <span>请提供真实的商品信息和图片，有助于使搜索排名靠前</span>
</div> </div>
<div class="upload_jr"> <div class="upload_jr">
<!-- 正常浏览器使用layui的上传插件上传 --> <!-- 正常浏览器使用layui的上传插件上传 -->
<div class="upload_section" id="upload_section" style="display: none"> <div class="upload_section" id="upload_section" style="display: none">
<div class="icon iconfont iconjuxing16"></div> <div class="icon iconfont iconjuxing16"></div>
<p>将商品表格拖拽或点击到此处上传</p> <p>点击“+”添加本地文件上传</p>
</div> </div>
<!-- 低版本ie使用form+iframe上传 --> <!-- 低版本ie使用form+iframe上传 -->
<form enctype="multipart/form-data" id="fileLoad" method="post" target="test" <form enctype="multipart/form-data" id="fileLoad" method="post" target="test"
...@@ -54,9 +54,9 @@ ...@@ -54,9 +54,9 @@
<a class="btn btn_border xz lineBlock" href="__PUBLIC__/ic_templet.xls">下载商品模板</a> <a class="btn btn_border xz lineBlock" href="__PUBLIC__/ic_templet.xls">下载商品模板</a>
</div> </div>
<div class="upload_text"> <div class="upload_text">
<p>1、请保证文件名后缀为xls、xlsx </p> <p>1、下载商品模板，按模板内格式要求上传</p>
<p>2、请下载模板，并根据模板格式上传 </p> <p>2、仅支持后缀为xls, xlsx的EXCEL表格文件 </p>
<p>3、为加快匹配速度，请保证每份文件型号数不超过200</p> <p>3、为保证精确匹配和加快上传，建议文件模板内商品数量不超过500个，如有更多商品，请分次上传</p>
</div> </div>
</div> </div>
......
Application/Home/View/GoodManage/uploadsingle.html
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</div> </div>
<div class="gb"> <div class="gb">
<span class="icon iconfont iconjuxing19 va-m"></span> <span class="icon iconfont iconjuxing19 va-m"></span>
<span>上传的商品有图片，搜索排名会优先排前</span> <span>请提供真实的商品信息和图片，有助于使搜索排名靠前</span>
</div> </div>
<div class="form_content layui-form clr" lay-filter="goodsave"> <div class="form_content layui-form clr" lay-filter="goodsave">
<div class="form_left fl"> <div class="form_left fl">
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<span class="input_title lineBlock">*库存:</span> <span class="input_title lineBlock">*库存:</span>
<div class="input_parent"> <div class="input_parent">
<input type="text" name="stock" placeholder="请输入需求数量" class="input boxsiz" <input type="text" name="stock" placeholder="请输入需求数量" class="input boxsiz"
lay-verify="required|number"> lay-verify="required|number|limitStock">
</div> </div>
</div> </div>
<div class="price input_div "> <div class="price input_div ">
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
<i class="icon iconfont iconjuxing18 deleteicon"></i> <i class="icon iconfont iconjuxing18 deleteicon"></i>
</div> </div>
</div> </div>
<p>* 支持png、jpg等图片格式</p> <p>* 目前仅支持png, jpg 图片格式</p>
</div> </div>
</div> </div>
</div> </div>
......
Application/Home/View/Home/index.html
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<div class="search_div clr"> <div class="search_div clr">
<div class="input_div fl"> <div class="input_div fl">
<span class="icon iconfont iconjuxing"></span> <span class="icon iconfont iconjuxing"></span>
<input type="text" placeholder="请输入要搜索的内容" class="search-input"> <input type="text" placeholder="输入型号，搜一下" class="search-input">
</div> </div>
<div class="btn fl btn_60 btn_fz_18 input_btn bold btn_blue"> <div class="btn fl btn_60 btn_fz_18 input_btn bold btn_blue">
搜索 搜索
......
Application/Home/View/QuotePrice/quotedetail.html
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<h3 class="bold">新增报价</h3> <h3 class="bold">新增报价</h3>
<div class="gb"> <div class="gb">
<span class="icon iconfont iconjuxing19 va-m"></span> <span class="icon iconfont iconjuxing19 va-m"></span>
<span>请回复真实价格，否则将会影响您的排名</span> <span>请回复真实价格，更容易被采纳</span>
</div> </div>
<div class="form_content layui-form"> <div class="form_content layui-form">
<div class="xh input_div "> <div class="xh input_div ">
...@@ -59,10 +59,10 @@ ...@@ -59,10 +59,10 @@
</div> </div>
</div> </div>
<div class="num input_div "> <div class="num input_div ">
<span class="input_title lineBlock">*需求数量:</span> <span class="input_title lineBlock">*数量:</span>
<div class="input_parent"> <div class="input_parent">
<input type="text" name="number" placeholder="请输入需求数量" class="input boxsiz" <input type="text" name="number" placeholder="请输入实际供应数量" class="input boxsiz"
lay-verify="required|number"> lay-verify="required|number|limitStock">
</div> </div>
</div> </div>
<div class="price input_div "> <div class="price input_div ">
......
Application/Home/View/QuotePrice/releaseinquiry.html
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</div> </div>
<div class="gb"> <div class="gb">
<span class="icon iconfont iconjuxing19 va-m"></span> <span class="icon iconfont iconjuxing19 va-m"></span>
<span>上传的商品有图片，搜索排名会优先排前</span> <span>请提供真实的商品信息和图片，有助于使搜索排名靠前</span>
</div> </div>
<div class="form_content clr"> <div class="form_content clr">
<form id="xj_form"> <form id="xj_form">
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<span class="input_title lineBlock">*库存:</span> <span class="input_title lineBlock">*库存:</span>
<div class="input_parent"> <div class="input_parent">
<input type="text" name="number" placeholder="请输入需求数量" class="input boxsiz" <input type="text" name="number" placeholder="请输入需求数量" class="input boxsiz"
lay-verify="required|number"> lay-verify="required|number|limitStock">
</div> </div>
</div> </div>
<div class="price input_div "> <div class="price input_div ">
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
</div> </div>
<p>* 支持png、jpg等图片格式</p> <p>* 目前仅支持png, jpg 图片格式</p>
</div> </div>
</div> </div>
</div> </div>
......
Application/Home/View/Search/index.html
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<div class="search_div clr"> <div class="search_div clr">
<div class="input_div fl"> <div class="input_div fl">
<span class="icon iconfont iconjuxing"></span> <span class="icon iconfont iconjuxing"></span>
<input type="text" placeholder="请输入要搜索的内容" class="input-search"> <input type="text" placeholder="输入型号，搜一下" class="input-search">
</div> </div>
<div class="input_btn fl btn_48 btn bold btn_blue"> <div class="input_btn fl btn_48 btn bold btn_blue">
搜索 搜索
......
Application/Index/View/Index/index.html
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<div class="search_div clr"> <div class="search_div clr">
<div class="input_div fl"> <div class="input_div fl">
<span class="icon iconfont iconjuxing"></span> <span class="icon iconfont iconjuxing"></span>
<input type="text" placeholder="请输入要搜索的型号" class="search-input"> <input type="text" placeholder="输入型号，搜一下" class="search-input">
</div> </div>
<div class="input_btn fl btn_48 btn bold btn_blue"> <div class="input_btn fl btn_48 btn bold btn_blue">
搜索 搜索
......
Application/Search/View/Index/search.html
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<div class="search_div clr"> <div class="search_div clr">
<div class="input_div fl"> <div class="input_div fl">
<span class="icon iconfont iconjuxing"></span> <span class="icon iconfont iconjuxing"></span>
<input type="text" placeholder="请输入要搜索的内容" class="input-search"> <input type="text" placeholder="输入型号，搜一下" class="input-search">
</div> </div>
<div class="input_btn fl btn_48 btn bold btn_blue"> <div class="input_btn fl btn_48 btn bold btn_blue">
搜索 搜索
......
dist/css/chat.css
...@@ -197,7 +197,7 @@ ...@@ -197,7 +197,7 @@
top: 90px; top: 90px;
left: 0; left: 0;
right: 0; right: 0;
bottom: 160px; bottom: 170px;
overflow: auto; overflow: auto;
padding: 10px 20px; padding: 10px 20px;
} }
......
dist/css/chat.less
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
top: 90px; top: 90px;
left: 0; left: 0;
right: 0; right: 0;
bottom: 160px; bottom: 170px;
overflow: auto; overflow: auto;
padding: 10px 20px; padding: 10px 20px;
......
dist/js/goodmanage/uploadsingle.js
...@@ -310,6 +310,11 @@ ...@@ -310,6 +310,11 @@
return '品牌不能小于2个字符' return '品牌不能小于2个字符'
} }
}, },
limitStock:function(value, item){
if(value>10000000){
return '库存最大为10000000（一千万）'
}
},
limitLengthLgThree: function (value, item) { limitLengthLgThree: function (value, item) {
if (value.length > 6) { if (value.length > 6) {
return '货期不能大于6个字符' return '货期不能大于6个字符'
...@@ -317,7 +322,10 @@ ...@@ -317,7 +322,10 @@
}, },
pointLimit: function (value, item) { pointLimit: function (value, item) {
if(!Util.fourPoint(value)){ if(!Util.fourPoint(value)){
return '价格为整数或不超过4位小数' return '单价为整数或不超过4位小数'
}
if(value>1000000){
return '单价最大为1000000（一百万）'
} }
}, },
}); });
......
dist/js/quoteprice/quotedetail.js
...@@ -212,6 +212,11 @@ $(function () { ...@@ -212,6 +212,11 @@ $(function () {
return '品牌不能小于2个字符' return '品牌不能小于2个字符'
} }
}, },
limitStock:function(value, item){
if(value>10000000){
return '数量最大为10000000（一千万）'
}
},
limitLengthLgThree: function (value, item) { limitLengthLgThree: function (value, item) {
if (value.length > 6) { if (value.length > 6) {
return '货期不能大于6个字符' return '货期不能大于6个字符'
...@@ -219,7 +224,10 @@ $(function () { ...@@ -219,7 +224,10 @@ $(function () {
}, },
pointLimit: function (value, item) { pointLimit: function (value, item) {
if(!Util.fourPoint(value)){ if(!Util.fourPoint(value)){
return '价格为整数或不超过4位小数' return '报价为整数或不超过4位小数'
}
if(value>1000000){
return '报价最大为1000000（一百万）'
} }
}, },
}); });
......
dist/js/quoteprice/releaseinquiry.js
...@@ -211,6 +211,11 @@ ...@@ -211,6 +211,11 @@
return '品牌不能小于2个字符' return '品牌不能小于2个字符'
} }
}, },
limitStock:function(value, item){
if(value>10000000){
return '库存最大为10000000（一千万）'
}
},
limitLengthLgThree: function (value, item) { limitLengthLgThree: function (value, item) {
if (value.length > 6) { if (value.length > 6) {
return '货期不能大于6个字符' return '货期不能大于6个字符'
...@@ -220,7 +225,10 @@ ...@@ -220,7 +225,10 @@
if(!Util.fourPoint(value)){ if(!Util.fourPoint(value)){
return '价格为整数或不超过4位小数' return '价格为整数或不超过4位小数'
} }
}, 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