Skip to content

施宇 / icsales

Go to a project
Commit b431a011 by 施宇
Options

Merge branch 'master' of http://119.23.72.7/shiyu/icsales

parents ff4b5e97 00729cb8
Inline Side-by-side
Showing with 128 additions and 87 deletions
Application/Home/View/GoodManage/index.html
...@@ -80,34 +80,34 @@ ...@@ -80,34 +80,34 @@
</div> </div>
</div> </div>
<div class="good_data" id='listData'> <div class="good_data" id='listData'>
<!-- <div class="data_list"> <!-- <div class="data_list">
<div class="data_item"> <div class="data_item">
<div class="data_detail"> <div class="data_detail">
<div class="type fl ellipsis boxsiz"> <div class="type fl ellipsis boxsiz">
<span class="bold">STM32F103ZET6STM32F103ZET6</span> <span class="bold">STM32F103ZET6STM32F103ZET6</span>
<span class="icon iconfont iconjuxing17"></span> <span class="icon iconfont iconjuxing17"></span>
</div> </div>
<div class="brand fl ellipsis boxsiz"> <div class="brand fl ellipsis boxsiz">
品牌：<span>Texas Instrument</span> 品牌：<span>Texas Instrument</span>
</div> </div>
<div class="num fl ellipsis boxsiz">库存： <div class="num fl ellipsis boxsiz">库存：
<span>PCS10,000</span> <span>PCS10,000</span>
</div> </div>
<div class="price fl ellipsis boxsiz bold">￥1.8835</div> <div class="price fl ellipsis boxsiz bold">￥1.8835</div>
<div class="data_status fl boxsiz zs"> <div class="data_status fl boxsiz zs">
<span class="mark lineBlock"></span> <span class="mark lineBlock"></span>
<span class="text">展示中</span> <span class="text">展示中</span>
</div> </div>
<div class="time fr ellipsis boxsiz">2019-05-22 15:35</div> <div class="time fr ellipsis boxsiz">2019-05-22 15:35</div>
</div> </div>
<a class="xj fr">下架</a> <a class="xj fr">下架</a>
<a class="edit fr">编辑</a> <a class="edit fr">编辑</a>
</div> </div>
</div> </div>
<div class="no_data" style="display: none"> <div class="no_data" style="display: none">
<img src="__PUBLIC__/images/nosearchdata.png" alt=""> <img src="__PUBLIC__/images/nosearchdata.png" alt="">
<p class="bold">未搜索到询价信息</p> <p class="bold">未搜索到询价信息</p>
</div>--> </div>-->
</div> </div>
</div> </div>
</div> </div>
...@@ -119,62 +119,63 @@ ...@@ -119,62 +119,63 @@
<script type="text/html" id="listHtml"> <script type="text/html" id="listHtml">
<div class="data_list"> <div class="data_list">
{{# layui.each(d, function(index, item){ }} {{# layui.each(d, function(index, item){ }}
<div class="data_item" goodid="{{item.goods_id}}"> <div class="data_item" goodid="{{item.goods_id}}">
<div class="data_detail"> <div class="data_detail">
<div class="type fl ellipsis boxsiz"> <div class="type fl ellipsis boxsiz">
<span class="bold">{{item.goods_name}}</span> <span class="bold">{{item.goods_name}}</span>
<span class="icon iconfont iconjuxing17"></span> <span class="icon iconfont iconjuxing17"></span>
</div> </div>
<div class="brand fl ellipsis boxsiz"> <div class="brand fl ellipsis boxsiz">
品牌：<span>{{item.brand_name}}</span> 品牌：<span>{{item.brand_name}}</span>
</div> </div>
<div class="num fl ellipsis boxsiz">库存： <div class="num fl ellipsis boxsiz">库存：
<span>{{item.stock}}</span> <span>{{item.stock}}</span>
</div> </div>
<div class="price fl ellipsis boxsiz bold">￥{{item.price}}</div> <div class="price fl ellipsis boxsiz bold">￥{{item.price}}</div>
{{# if(item['audit_status'] == 1){ }} {{# if(item['audit_status'] == 1){ }}
{{# if(item['status'] == 1){ }} {{# if(item['status'] == 1){ }}
<div class="data_status fl boxsiz zs"> <div class="data_status fl boxsiz zs">
<span class="mark lineBlock"></span><span class="text">展示中</span> <span class="mark lineBlock"></span><span class="text">展示中</span>
</div> </div>
{{# } else { }} {{# } else { }}
<div class="data_status fl boxsiz xj"> <div class="data_status fl boxsiz xj">
<span class="mark lineBlock"></span><span class="text">已下架</span> <span class="mark lineBlock"></span><span class="text">已下架</span>
</div> </div>
{{# } }} {{# } }}
{{# } else { }} {{# } else { }}
<div class="data_status fl boxsiz jy"> <div class="data_status fl boxsiz jy">
<span class="mark lineBlock"></span><span class="text">禁用中</span> <span class="mark lineBlock"></span><span class="text">禁用中</span>
</div>
{{# } }}
<div class="time fr ellipsis boxsiz">{{ layui.util.toDateString(item.update_time * 1000)}}</div>
</div> </div>
{{# if(item['status'] == 1){ }} {{# } }}
{{# if(item['audit_status'] == 1){ }} <div class="time fr ellipsis boxsiz">{{ layui.util.toDateString(item.update_time * 1000)}}</div>
</div>
{{# if(item['status'] == 1){ }}
{{# if(item['audit_status'] == 1){ }}
<a class="xj xj_status fr">下架</a> <a class="xj xj_status fr">下架</a>
{{# } else { }} {{# } else { }}
<a class="xj xj_status fr disabled">下架</a> <a class="xj xj_status fr disabled">下架</a>
{{# } }} {{# } }}
{{# } else { }} {{# } else { }}
{{# if(item['audit_status'] == 1){ }}
<a class="fb xj_status fr">发布</a> {{# if(item['audit_status'] == 1){ }}
{{# } else { }} <a class="fb xj_status fr">发布</a>
{{# } else { }}
<a class="fb xj_status fr disabled">发布</a> <a class="fb xj_status fr disabled">发布</a>
{{# } }} {{# } }}
{{# } }} {{# } }}
{{# if(item['audit_status'] == 1){ }} {{# if(item['audit_status'] == 1){ }}
<a class="edit fr">编辑</a> <a class="edit fr" href="/uploadsingle?id={{item.goods_id}}">编辑</a>
{{# } else { }} {{# } else { }}
<a class="edit fr disabled">编辑</a> <a class="edit fr disabled" href="/uploadsingle?id={{item.goods_id}}">编辑</a>
{{# } }} {{# } }}
</div> </div>
{{# }); }} {{# }); }}
{{# if(d.length === 0){ }} {{# if(d.length === 0){ }}
<div class="no_data"> <div class="no_data">
<img src="__PUBLIC__/images/nosearchdata.png" alt=""> <img src="__PUBLIC__/images/nosearchdata.png" alt="">
<p class="bold">无商品信息</p> <p class="bold">无商品信息</p>
</div> </div>
{{# } }} {{# } }}
</div> </div>
<div class="pagination-with" id="pagination" style="text-align: right;margin-top: 25px;"></div> <div class="pagination-with" id="pagination" style="text-align: right;margin-top: 25px;"></div>
</script> </script>
...@@ -195,18 +196,18 @@ ...@@ -195,18 +196,18 @@
<div class="center_line line2"></div> <div class="center_line line2"></div>
</script> </script>
<script> <script>
$('.dgsc').click(function () { $('.dgsc').click(function () {
window.location.href = '/uploadsingle' window.location.href = '/uploadsingle'
}) })
$('.plsc').click(function () { $('.plsc').click(function () {
window.location.href = '/bulkupload' window.location.href = '/bulkupload'
}) })
$('.xz').click(function () { $('.xz').click(function () {
window.location.href = '/uploadresult' window.location.href = '/uploadresult'
}) })
$('.data_item').click(function () { $('.data_item').click(function () {
window.location.href = '/gooddetail' window.location.href = '/gooddetail'
}) })
</script> </script>
</body> </body>
......
Application/Home/View/GoodManage/uploadsingle.html
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
<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"> <div class="form_content layui-form clr" lay-filter="goodsave">
<div class="form_left fl layui-form"> <div class="form_left fl">
<div class="xh input_div "> <div class="xh input_div ">
<span class="input_title lineBlock">*型号:</span> <span class="input_title lineBlock">*型号:</span>
<div class="input_parent"> <div class="input_parent">
......
dist/css/goodmanage.css
...@@ -241,3 +241,4 @@ ...@@ -241,3 +241,4 @@
.good_manage_content .good_data .data_list .data_item .xj_status.fb { .good_manage_content .good_data .data_list .data_item .xj_status.fb {
color: #0D84D1; color: #0D84D1;
} }
/*# sourceMappingURL=goodmanage.css.map */
\ No newline at end of file
dist/css/goodmanage.css.map
{"version":3,"sources":["goodmanage.less"],"names":[],"mappings":"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","file":"goodmanage.css"} {"version":3,"sources":["goodmanage.less"],"names":[],"mappings":"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","file":"goodmanage.css"}
\ No newline at end of file \ No newline at end of file
dist/js/goodmanage/uploadsingle.js
...@@ -19,6 +19,39 @@ ...@@ -19,6 +19,39 @@
}, },
mounted: function (opt) { mounted: function (opt) {
var id = Util.getRequest('id'), text = '';
//编辑
if (id) {
IcController.getData(apis.goodsInfo, 'GET', {token: opt.token, 'goods_id/eq': id}, function (res) {
if(res.errcode === 0){
layui.form.val("goodsave", {
"goods_name": res['goods_list'][id].goods_name,
"brand_name": res['goods_list'][id].brand_name,
"encap": res['goods_list'][id].encap,
"stock": res['goods_list'][id].stock,
"price": res['goods_list'][id].price,
"day": res['goods_list'][id].delivery_time,
"currency": res['goods_list'][id].currency,
"delivery_time": res['goods_list'][id].delivery_time
});
setTimeout(function () {
$('.hq').find('.layui-form-radioed').trigger('click');
},500)
}
});
}
return this; return this;
}, },
...@@ -55,13 +88,18 @@ ...@@ -55,13 +88,18 @@
$(data.elem).addClass("layui-btn-disabled"); $(data.elem).addClass("layui-btn-disabled");
var id = Util.getRequest('id'), params = {}, url = '';
if (!opt.isClick) { if (!opt.isClick) {
opt.isClick = true; opt.isClick = true;
var params = $.extend({}, data.field, {token: opt.token}); id ? params = $.extend({}, data.field, {token: opt.token, 'goods_id': id}) : $.extend({}, data.field, {token: opt.token});
id ? url = apis.goodsSave : url = apis.goodsAdd;
IcController.getData(apis.goodsAdd, 'POST', params, function (res) { IcController.getData(url, 'GET', params, function (res) {
if (res.errcode === 0) { if (res.errcode === 0) {
......
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