Skip to content

施宇 / icsales

Go to a project
Commit 37f512a2 by 施宇
Options

Merge branch 'sy_ic_1016' 

# Conflicts:
#	dist/js/quoteprice/releaseinquiry.js
parents 44837207 e38ea008
Expand all
Inline Side-by-side
Showing with 287 additions and 95 deletions
Application/Home/View/GoodManage/gooddetail.html
......@@ -98,17 +98,6 @@
{{# } }}
<div class=" goods_desc boxsiz">
<div class="title">
<div class="fr title_right">
{{# if(d['audit_status'] == 1){ }}
{{# if(d['status'] == 1){ }}
<span class="mark lineBlock zs"></span><span class="text">展示中</span>
{{# } else { }}
<span class="mark lineBlock xj"></span><span class="text">已下架</span>
{{# } }}
{{# } else { }}
<span class="mark lineBlock jy"></span><span class="text">禁用中</span>
{{# } }}
</div>
<div class="title_left">
<h3 class="bold fl boxsiz goods_name">{{d.goods_name}}</h3>
<div class="price fl bold boxsiz">
......
Application/Home/View/QuotePrice/releaseinquiry.html
......@@ -46,7 +46,7 @@
</div>
</div>
<div class="num input_div ">
<span class="input_title lineBlock">*库存:</span>
<span class="input_title lineBlock">*需求数量:</span>
<div class="input_parent">
<input type="text" name="number" placeholder="请输入需求数量" class="input boxsiz"
lay-verify="required|number|limitStock">
......
dist/css/goodmanage.css
......@@ -131,9 +131,18 @@
.good_manage_content .btn_group div {
padding: 0 19px;
}
.good_manage_content .btn_group div.xz {
.good_manage_content .btn_group div.more-delete {
padding: 0 25px;
}
.good_manage_content .btn_group div.xz,
.good_manage_content .btn_group div.plsc,
.good_manage_content .btn_group div.dgsc {
margin-left: 20px;
}
.good_manage_content .btn_group div.disabled {
background-color: #DAE1E7;
cursor: not-allowed;
}
.good_manage_content .gb {
height: 34px;
line-height: 34px;
......@@ -164,7 +173,7 @@
position: absolute;
top: 0;
left: 25px;
right: 140px;
right: 60px;
bottom: 0;
}
.good_manage_content .good_data .data_list .data_item .data_detail > div {
......@@ -175,8 +184,11 @@
font-size: 16px;
width: 25%;
}
.good_manage_content .good_data .data_list .data_item .type .gx-status {
margin-right: 12px;
}
.good_manage_content .good_data .data_list .data_item .type .text {
max-width: 80%;
max-width: 68%;
}
.good_manage_content .good_data .data_list .data_item .type .icon {
position: relative;
......@@ -288,3 +300,31 @@
.good_manage_content .good_data .data_list .data_item .xj_status.fb {
color: #0D84D1;
}
.good_manage_content .gx-div {
height: 100%;
width: 32px;
}
.good_manage_content .gx-status {
display: inline-block;
height: 20px;
width: 20px;
cursor: pointer;
vertical-align: sub;
}
.good_manage_content .gx-status.wxz {
background: url('../images/wxz-icon.png') no-repeat;
background-size: 100% 100%;
}
.good_manage_content .gx-status.xz {
background: url('../images/xz-icon.png') no-repeat;
background-size: 100% 100%;
}
.good_manage_content .plsc-text {
font-size: 14px;
color: #686E73;
cursor: pointer;
margin-left: 17px;
}
.good_manage_content .plsc-text:hover {
color: #0D84D1;
}
dist/css/goodmanage.less
......@@ -170,10 +170,17 @@
div {
padding: 0 19px;
&.xz {
&.more-delete{
padding:0 25px;
}
&.xz, &.plsc, &.dgsc {
margin-left: 20px;
}
&.disabled{
background-color: #DAE1E7;
cursor: not-allowed;
}
}
}
.gb {
......@@ -209,7 +216,7 @@
position: absolute;
top: 0;
left: 25px;
right: 140px;
right: 60px;
bottom: 0;
& > div {
......@@ -221,9 +228,11 @@
color: #2E3033;
font-size: 16px;
width: 25%;
.gx-status{
margin-right:12px;
}
.text {
max-width: 80%;
max-width: 68%;
}
.icon {
......@@ -370,4 +379,33 @@
}
}
}
.gx-div{
height:100%;
width:32px;
}
.gx-status{
display: inline-block;
height:20px;
width:20px;
cursor: pointer;
vertical-align: sub;
&.wxz{
background: url('../images/wxz-icon.png') no-repeat;
background-size: 100% 100%;
}
&.xz{
background: url('../images/xz-icon.png') no-repeat;
background-size: 100% 100%;
}
}
.plsc-text{
font-size: 14px;
color:#686E73;
cursor: pointer;
margin-left:17px;
&:hover{
color:#0D84D1;
}
}
}
\ No newline at end of file
dist/js/global/api.js
......@@ -198,7 +198,15 @@
/**
* 获取最新版本信息
*/
getVersion: user_url + '/get/version'
getVersion: user_url + '/get/version',
/**
* 批量删除商品
*/
goodsDelete: goods_url + '/goods/delete',
/**
* 擦亮全部商品
*/
polishAll: goods_url + '/goods/polish/all'
};
if (typeof define === "function" && define.amd) {
return apis;
......
dist/js/global/global.min.js
! function () {
window.IcController = {
isCl:true,//用户是否已经擦亮过商品 默认为已擦亮
init: function () {
this.created(this).mounted(this).handleBind(this);
},
......@@ -132,7 +133,16 @@
});
}
//判断用户是否点击了擦亮商品的按钮
if(window.location.pathname == '/goodmanage'){
if(res.data.polish_status == 2){//未刷新
opt.isCl = false;
$('.cl').addClass('btn_yellow').removeClass('disabled')
}else{//已刷新
opt.isCl = true;
$('.cl').addClass('disabled').removeClass('btn_yellow')
}
}
}
});
......
dist/js/goodmanage/index.js
!function () {
! function () {
window.GoodManageController = {
token: Util.getCookie('token') || '',
deleteGoods: [],
init: function () {
this.created(this).mounted(this).render(this, {
offset: 10,
......@@ -9,57 +11,60 @@
}, 1).handleBind(this);
},
created: function (opt) {
//日期控件初始化
layui.laydate.render({
elem: '#start_time',
theme: '#0D84D1'
theme: '#0D84D1',
});
layui.laydate.render({
elem: '#end_time',
theme: '#0D84D1'
});
return this;
},
mounted: function (opt) {
//商品数量获取
IcController.getData(apis.goodsCount, 'GET', {
token: opt.token
}, function (res) {
if (res.errcode === 0) {
var getTpl = countHtml.innerHTML;
layui.laytpl(getTpl).render(res.count, function (html) {
$(".good_total").empty().html(html);
});
}
});
return this;
},
render: function (opt, params, curr) {
opt.deleteGoods = [];
var morningTime = new Date(new Date().toLocaleDateString()).getTime()/1000;//当前时间的凌晨时间
$('.more-delete .gx-status').addClass('wxz').removeClass('xz')
//商品列表初始化
IcController.getData(apis.goodsInfo, 'GET', params, function (res) {
var getTpl = listHtml.innerHTML;
if (res.errcode === 0) {
for(var k in res.goods_list){//把凌晨数据加到列表数据中跟更新时间做比较
res.goods_list[k].morning_time = morningTime
};
layui.laytpl(getTpl).render(res.goods_list, function (html) {
$("#listData").empty().html(html);
layui.laypage.render({
elem: 'pagination',
theme: '#1080d0',
......@@ -68,35 +73,34 @@
curr: curr,
layout: ['prev', 'page', 'next', 'refresh'],
jump: function (obj, first) {
if (!first) {
//分页回调调用
var json = {
p: obj.curr
}
var param = $.extend({}, params, json);
GoodManageController.render(opt, param, obj.curr);
}
}
});
});
} else if (res.errcode === 110001 || res.errcode === 103001) {
layui.laytpl(getTpl).render([], function (html) {
$("#listData").empty().html(html);
});
}
});
return this;
},
sxj: function (id, type) {
//上下架 1上架 2下架
......@@ -115,86 +119,188 @@
});
} else {
layer.msg('操作失败')
}
})
},
//批量删除商品的接口
deleteGoodsAjax: function (opt) {
IcController.getData(apis.goodsDelete, 'GET', {
"token": Util.getCookie('token') || "",
"goods_id": JSON.stringify(opt.deleteGoods),
}, function (res) {
if (res.errcode === 0) {
opt.deleteGoods = [];
layer.msg('删除成功', {
time: 600
}, function () {
opt.mounted(opt)
$('.cx').click();
});
} else {
layer.msg('删除失败')
}
})
},
//擦亮商品的接口
clGoodsAjax: function (opt) {
IcController.getData(apis.polishAll, 'GET', {
"token": Util.getCookie('token') || "",
}, function (res) {
if (res.errcode === 0) {
layer.msg('擦亮成功', {
time: 600
}, function () {
opt.mounted(opt);
IcController.isCl = true;
$('.cl').addClass('disabled').removeClass('btn_yellow')
$('.layui-icon-refresh').click();
});
} else {
layer.msg('擦亮失败');
IcController.isCl = false;
}
})
},
handleBind: function (opt) {
//搜索
layui.form.on('submit(search)', function (data) {
var param = {
token: opt.token,
offset: 10,
p: 1
};
var params = $.extend({}, data.field, param);
opt.render(this, params, 1)
});
//上架
$('#listData').on('click', '.fb', function (e) {
e.stopPropagation();
var goodId = $(this).parent('.data_item').attr('goodid');
if ($(this).hasClass('disabled')) {
return;
} else {
opt.sxj(goodId, 1);
}
});
//下架
$('#listData').on('click', '.xj_btn', function (e) {
e.stopPropagation();
var goodId = $(this).parent('.data_item').attr('goodid');
if ($(this).hasClass('disabled')) {
return;
} else {
opt.sxj(goodId, 2)
}
});
//进入详情
$(document).on('click', '#listData .data_item', function (e) {
e.stopPropagation();
var goodId = $(this).attr('goodid');
window.location.href="/gooddetail?type=1&id="+goodId
window.location.href = "/gooddetail?type=1&id=" + goodId
});
//阻止默认事件
$(document).on('click','.data_list .disabled',function (e) {
$(document).on('click', '.data_list .disabled', function (e) {
e.stopPropagation();
});
$(document).on('click', '.gx-div', function (e) {
//单个商品勾选
e.stopPropagation();
var goodid = $(this).find('.gx-status').attr('goodid')
if ($(this).find('.gx-status').hasClass('wxz')) {
//未勾选时变成勾选
$(this).find('.gx-status').removeClass('wxz').addClass('xz');
opt.deleteGoods.push(goodid);
} else {
//勾选时变为未勾选
$(this).find('.gx-status').removeClass('xz').addClass('wxz');
var index = opt.deleteGoods.indexOf(goodid);
if (index != -1) {
opt.deleteGoods.splice(index, 1)
}
}
if (opt.deleteGoods.length == 10) {
$('.more-delete .gx-status').removeClass('wxz').addClass('xz');
} else {
$('.more-delete .gx-status').removeClass('xz').addClass('wxz');
}
});
$('.more-delete').on('click', '.gx-status', function () {
//全选
opt.deleteGoods = [];
if ($(this).hasClass('wxz')) {
//未勾选时变成勾选
$(this).removeClass('wxz').addClass('xz');
$('#listData .gx-status').each(function () {
var goodid = $(this).attr('goodid')
$(this).removeClass('wxz').addClass('xz');
opt.deleteGoods.push(goodid)
})
} else {
//勾选时变为未勾选
$(this).removeClass('xz').addClass('wxz');
$('#listData .gx-status').each(function () {
$(this).removeClass('xz').addClass('wxz');
})
}
});
//批量删除
$('.plsc-text').on('click', function () {
if (opt.deleteGoods.length) {
layer.confirm('是否确认删除当前选中的商品？', {
icon: 3,
title: '提示',
move: false
}, function (index) {
opt.deleteGoodsAjax(opt)
layer.close(index);
})
}
});
//擦亮商品
$('.cl').on('click',function(){
if(!IcController.isCl){//未刷新
opt.clGoodsAjax(opt)
}
})
return this;
},
}, $(function () {
......
dist/js/quoteprice/releaseinquiry.js
......@@ -218,9 +218,9 @@
return '品牌不能小于2个字符'
}
},
limitStock: function (value, item) {
if (value > 10000000) {
return '库存最大为10000000（一千万）'
limitStock:function(value, item){
if(value>10000000){
return '数量最大为10000000（一千万）'
}
},
limitLengthLgThree: function (value, item) {
......
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