Skip to content

施宇 / icsales

Go to a project
Commit 6656efcd by 施宇
Options

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

parents 38b60c08 61062eda
Inline Side-by-side
Showing with 148 additions and 58 deletions
Application/Home/View/Account/index.html
......@@ -97,7 +97,7 @@
</div>
</div>
</li>
<li class="clr">
<!-- <li class="clr">
<div class="fl l">
<i class="lineBlock iconfont iconjuxing7 va-m"></i>
<div class="lineBlock va-m ml-50">
......@@ -110,7 +110,7 @@
<input type="checkbox" name="business_msg" lay-skin="switch" lay-filter="business_msg">
</div>
</div>
</li>
</li>-->
<li class="clr">
<div class="fl l">
<i class="lineBlock iconfont iconjuxing19 va-m"></i>
......
Application/Home/View/GoodManage/bulkupload.html
......@@ -51,7 +51,7 @@
<div class="btn_div">
<a class="btn sc lineBlock nohover btn_blue">上传商品</a>
<a class="btn btn_border xz lineBlock">下载商品模板</a>
<a class="btn btn_border xz lineBlock" href="__PUBLIC__/ic_templet.xls">下载商品模板</a>
</div>
<div class="upload_text">
<p>1、请保证文件名后缀为xls、xlsx </p>
......
Application/Home/View/GoodManage/uploadresult.html
......@@ -2,98 +2,83 @@
<html lang="zh-CN">
<head>
<include file="public/header" />
<include file="public/header"/>
<link rel="stylesheet" type="text/css" href="__PUBLIC__/css/uploadresult.css">
</head>
<body>
<div class="wrapper">
<include file="public/navleft" />
<div class="wrapper">
<include file="public/navleft"/>
<div class="wrapper_right">
<include file="public/top" />
<include file="public/top"/>
<div class="right_content upload_result_content">
<div class="content">
<div class="nav_title">商品管理 > 发布商品 > 上传结果</div>
<div class="filter_section clr">
<div class="filter_section clr layui-form">
<div class="date_div fl">
<span class="fl">日期选择：</span>
<div class="start_date_div fl">
<div class="icon_div fl icon iconfont iconjuxing13">
</div>
<input type="text" placeholder="开始日期" class="fl boxsiz" id="start_date">
<input type="text" placeholder="开始日期" class="fl boxsiz" id="start_time" name="start_time">
</div>
<div class="fl heng"></div>
<div class="end_date_div fl">
<div class="icon_div fl icon iconfont iconjuxing13">
</div>
<input type="text" placeholder="结束日期" class="fl boxsiz" id="end_date">
<input type="text" placeholder="结束日期" class="fl boxsiz" id="end_time" name="end_time">
</div>
</div>
<div class="btn_div fl">
<a class="cx lineBlock btn nohover">查询</a>
<a class="cx lineBlock btn btn_blue nohover" lay-submit lay-filter="search">查询</a>
</div>
</div>
<div class="result_data">
<div class="data_list">
<div class="data_item">
<div class="data_detail">
<div class="text fl ellipsis boxsiz">
<span class="sort">1.</span>
更新成功 <span class="num">13</span> 条，
更新失败 <span class="num">2</span> 条
<div class="data_list"></div>
</div>
<div class="fl ellipsis boxsiz time">2019-05-22 15:35</div>
<div class="fl ellipsis boxsiz status cg">
<span class="lineBlock"></span>
成功
</div>
</div>
<a class="ck fr">查看</a>
</div>
</div>
<include file="public/foot"/>
<script src="__PUBLIC__/js/goodmanage/uploadresult.js"></script>
<script type="text/html" id="listHtml">
<div class="data_list">
{{# layui.each(d, function(index, item){ }}
<div class="data_item">
<div class="data_detail">
<div class="text fl ellipsis boxsiz">
<span class="sort">1.</span>
更新成功 <span class="num">13</span> 条，
更新失败 <span class="num">2</span> 条
{{item.loginfo}}
</div>
<div class="fl ellipsis boxsiz time">2019-05-22 15:35</div>
<div class="fl ellipsis boxsiz time">{{item.update_time}}</div>
{{# if (item.status== '处理失败') { }}
<div class="fl ellipsis boxsiz status sb">
<span class="lineBlock"></span>
失败
</div>
</div>
<a class="ck fr">查看</a>
<span class="lineBlock"></span> {{item.status}}
</div>
{{# } else { }}
<div class="fl ellipsis boxsiz status cg">
<span class="lineBlock"></span> {{item.status}}
</div>
{{# } }}
</div>
{{# if (item.file_info) { }}
<a class="ck fr" href="{{item.file_info.down_url}}">查看</a>
{{# } }}
</div>
{{# }); }}
</div>
{{# if(d.length === 0){ }}
<div class="no_data">
<img src="__PUBLIC__/images/nosearchdata.png" alt="">
<p class="bold">无上传信息</p>
</div>
{{# } }}
<div class="pagination-with" id="pagination" style="text-align: right;margin-top: 25px;"></div>
</div>
<include file="public/foot" />
<script>
layui.use('laydate', function () {
var laydate = layui.laydate;
//执行一个laydate实例
laydate.render({
elem: '#start_date', //指定元素
theme: '#0D84D1'
});
laydate.render({
elem: '#end_date', //指定元素
theme: '#0D84D1'
});
});
</script>
</script>
</body>
</html>
\ No newline at end of file
Application/Home/View/GoodManage/uploadsingle.html
......@@ -76,7 +76,7 @@
</div>
</div>
<div class="btn_div">
<span class="lineBlock fb btn" lay-submit lay-filter="add">发布</span>
<span class="lineBlock fb btn btn_blue" lay-submit lay-filter="add">发布</span>
<span class="lineBlock cz btn btn_border">重置</span>
</div>
</div>
......
Application/Home/View/Notice/index.html
......@@ -20,11 +20,11 @@
<span class="title fl">系统通知</span>
<span class="num fr">23</span>
</div>
<div class="notice_classify clr">
<!-- <div class="notice_classify clr">
<span class="icon iconfont iconjuxing7 fl"></span>
<span class="title fl">业务通知</span>
<span class="num fr">23</span>
</div>
</div>-->
<div class="notice_classify clr">
<span class="icon iconfont iconjuxing19 fl"></span>
<span class="title fl">活动通知</span>
......
dist/css/home.css
......@@ -256,3 +256,4 @@
.home_content .new_xj .new_xj_list .new_xj_item:hover {
box-shadow: 0px 5px 10px 0px rgba(216, 223, 230, 0.5);
}
/*# sourceMappingURL=home.css.map */
\ No newline at end of file
dist/ic_templet.xls 0 → 100644
No preview for this file type
dist/js/global/api.js
......@@ -150,10 +150,18 @@
* 获取省市区
*/
regionPcd: user_url + "/region/pcd",
/**环信通讯记录添加 */
/**
* 环信通讯记录添加
*/
addrecord: user_url + '/im/add/record',
/**环信通讯记录列表（最多显示30条最新的聊天记录） */
/**
* 环信通讯记录列表（最多显示30条最新的聊天记录）
*/
listrecord: user_url + '/im/list/record',
/**
* 批量上传商品列表
*/
uploadList: goods_url + '/goods/upload/list'
};
if (typeof define === "function" && define.amd) {
return apis;
......
dist/js/goodmanage/uploadresult.js 0 → 100644
!function () {
window.UploadResultController = {
token: Util.getCookie('token') || '',
init: function () {
this.created(this).mounted(this).render(this, {limit: 10, page: 1, token: this.token}, 1).handleBind(this);
},
created: function (opt) {
return this;
},
render:function(opt, params, curr){
IcController.getData(apis.uploadList, 'GET', params, function (res) {
var getTpl = listHtml.innerHTML;
if (res.errcode === 0) {
layui.laytpl(getTpl).render(res.data, function (html) {
$(".result_data").empty().html(html);
layui.laypage.render({
elem: 'pagination',
theme: '#1080d0',
count: res.total,
limit: 10,
curr: curr,
jump: function (obj, first) {
if (!first) {
//分页回调调用
var json = {
page: obj.curr
};
var param = $.extend({}, params, json);
UploadResultController.render(opt, param, obj.curr);
}
}
});
});
}else{
layer.msg(res.errmsg);
}
});
return this;
},
mounted: function (opt) {
layui.laydate.render({
elem: '#start_time',
theme: '#0D84D1'
});
layui.laydate.render({
elem: '#end_time',
theme: '#0D84D1'
});
return this;
},
handleBind: function (opt) {
//搜索
layui.form.on('submit(search)', function (data) {
var param = {
token: opt.token,
limit: 10,
page: 1
};
var params = $.extend({}, data.field, param);
opt.render(this, params, 1)
});
return this;
},
}, $(function () {
UploadResultController.init();
})
}();
\ No newline at end of file
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