fe / yohobuy-shop-fe2 · Commits

Go to a project

Authored by weiqingting
Commit 5382a6e9ea80e3f09746a7535db15f1c2012ca2b 2 parents 157515de fc02a557

Merge branch 'yohobuy-shop-dev-4.6-20160606' of http://git.yoho.cn/fe/yohobuy-sh… 

…op-fe2 into yohobuy-shop-dev-4.6-20160606
Inline Side-by-side
Showing 9 changed files with 158 additions and 19 deletions
... ... @@ -44,6 +44,9 @@ module.exports=function(app) {
app.post("/product/queryProductPriceListBySkn","price_queryProductPriceListBySkn");
/*删除变价记录*/
app.post("/product/deletePricePlan","price_deletePricePlan");
app.post("/product/batchUpdateProductPrice", "price_batchUpdateProductPrice");
app.post("/goods/brandCooperation/list", "price_queryBrandCooperationList");
... ...
... ... @@ -54,6 +54,13 @@ module.exports={
{name: 'cgpriceEndTime', type: 'String'}
]
},
deletePricePlan:{
title:'删除变价记录',
url: '/product/deletePricePlan',
params: [
{name: 'param', type: 'Number'}
]
},
batchUpdateProductPrice:{
title: "批量变价接口",
url: '/product/batchUpdateProductPrice',
... ...
... ... @@ -231,9 +231,11 @@
<th>价格生效-<font color="red">结束时间</font></th>
<th>变价时间</th>
<th>变价人</th>
<th>操作</th>
</tr>
</thead>
<tbody>
[[if list.length > 0]]
[[each list as item index]]
<tr>
<td>[[item.retailPrice]]</td>
... ... @@ -242,8 +244,16 @@
<td>[[item.changePriceEndTime]]</td>
<td>[[item.createTime]]</td>
<td>[[item.founderName]]</td>
<td>
[[if item.flag && item.flag == 1]]
<a data-planid="[[item.planId]]" data-skn="[[productSkn]]" href="javascript:;" class="btn btn-danger btn-xs deleteHistory">删除</a>
[[/if]]
</td>
</tr>
[[/each]]
[[else]]
<tr><td colspan="7">没有变价记录！</td></tr>
[[/if]]
</tbody>
</table>
</div>
... ...
... ... @@ -33,6 +33,9 @@
// 使用刚指定的配置项和数据显示图表。
areaTop.setOption(option);
shopTop.setOption(option);
var a = [{"agreementEndTime":1476979200,"brandId":1749,"brandName":"请勿动此品牌","brandNameCn":"请勿动此品牌","brandStatus":1,"id":626,"isFreeze":"N","method":"","status":1,"supplierId":1496,"supplierName":"请勿动此供应商","supplierStatus":300}]
var b = [{"agreementEndTime":1467216000,"brandId":1740,"brandName":"卡文","brandNameCn":"卡文","brandStatus":1,"id":611,"isFreeze":"N","method":"","status":1,"supplierId":1492,"supplierName":"卡文的供应商3：第二个JIT","supplierStatus":300}]
},
methods:{
getXOption(){
... ...
... ... @@ -84,7 +84,7 @@
normal: {
color: '#49b6d6',
label : {
show: true,
show: false,
position: 'top',
textStyle:{
color:"#585858",
... ... @@ -104,7 +104,7 @@
normal: {
color: '#999',
label : {
show: true,
show: false,
position: 'top',
textStyle:{
color:"#585858",
... ... @@ -118,7 +118,76 @@
}
]
};
return option;
var option1 = {
title : {
text: '某地区蒸发量和降水量',
subtext: '纯属虚构'
},
tooltip : {
trigger: 'axis'
},
legend: {
data:['蒸发量','降水量']
},
toolbox: {
show : true,
feature : {
mark : {show: true},
dataView : {show: true, readOnly: false},
magicType : {show: true, type: ['line', 'bar']},
restore : {show: true},
saveAsImage : {show: true}
}
},
calculable : true,
xAxis : [
{
type : 'category',
data : ['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月']
}
],
yAxis : [
{
type : 'value'
}
],
series : [
{
name:'蒸发量',
type:'bar',
data:[2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4, 3.3],
markPoint : {
data : [
{type : 'max', name: '最大值'},
{type : 'min', name: '最小值'}
]
},
markLine : {
data : [
{type : 'average', name: '平均值'}
]
}
},
{
name:'降水量',
type:'bar',
data:[2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3],
markPoint : {
data : [
{name : '年最高', value : 182.2, xAxis: 7, yAxis: 183, symbolSize:18},
{name : '年最低', value : 2.3, xAxis: 11, yAxis: 3}
]
},
markLine : {
data : [
{type : 'average', name : '平均值'}
]
}
}
]
};
return option1;
}
}
}
... ...
... ... @@ -115,6 +115,27 @@ var g = new common.grid({
});
g.init('/product/queryProductPriceList');
//获取变价记录列表并渲染
function getHistoryList(skn) {
$.ajax({
type: 'POST',
dataType: 'json',
url: '/product/queryProductPriceListBySkn',
data: {param: skn},
success: function (rs) {
var data = rs;
$('.historyDetail').html($(common.util.__template2($("#template2").html(), data.data)));
if(data.code != 200){
common.util.__tip(rs.message);
}
},
error: function (rs) {
$('.historyDetail').html($(common.util.__template2($("#template2").html(), {})));
common.util.__tip(rs.message);
}
});
}
//单个变价修改
$(document).on('click', '.modify-btn', function() {
var skn = $(this).data('skn'),
... ... @@ -224,22 +245,28 @@ $(document).on('click', '.history-btn', function () {
button:[{value:"关闭", css:"btn-primary"}]
};
new common.dialog(option);
$.ajax({
type: 'POST',
dataType: 'json',
url: '/product/queryProductPriceListBySkn',
data: {param: skn},
success: function (rs) {
var data = rs;
$('.historyDetail').html($(common.util.__template2($("#template2").html(), data.data)));
if(data.code != 200){
common.util.__tip(data.message);
}
},
error: function (rs) {
$('.historyDetail').html($(common.util.__template2($("#template2").html(), {})));
common.util.__tip(rs.data.message);
}
getHistoryList(skn);
});
//删除变价记录
$(document).on('click', '.deleteHistory', function () {
var skn = $(this).data('skn');
var planId = $(this).data('planid');
new common.dialog({
title: "删除变价记录确认",
width: "360px",
content: '确认删除该变价记录么？',
zIndex: 52,
button: [
{value: "确认", css:"btn-primary", callback: function () {
common.util.__ajax({
url: '/product/deletePricePlan',
data: {param:planId}
}, function () {
getHistoryList(skn);
});
}},
{value: "取消", css:"btn-default"}
]
});
});
//筛选
... ...
... ... @@ -44,6 +44,9 @@ module.exports=function(app) {
app.post("/product/queryProductPriceListBySkn","price_queryProductPriceListBySkn");
/*删除变价记录*/
app.post("/product/deletePricePlan","price_deletePricePlan");
app.post("/product/batchUpdateProductPrice", "price_batchUpdateProductPrice");
app.post("/goods/brandCooperation/list", "price_queryBrandCooperationList");
... ...
... ... @@ -54,6 +54,13 @@ module.exports={
{name: 'cgpriceEndTime', type: 'String'}
]
},
deletePricePlan:{
title:'删除变价记录',
url: '/product/deletePricePlan',
params: [
{name: 'param', type: 'Number'}
]
},
batchUpdateProductPrice:{
title: "批量变价接口",
url: '/product/batchUpdateProductPrice',
... ...
... ... @@ -231,9 +231,11 @@
<th>价格生效-<font color="red">结束时间</font></th>
<th>变价时间</th>
<th>变价人</th>
<th>操作</th>
</tr>
</thead>
<tbody>
[[if list.length > 0]]
[[each list as item index]]
<tr>
<td>[[item.retailPrice]]</td>
... ... @@ -242,8 +244,16 @@
<td>[[item.changePriceEndTime]]</td>
<td>[[item.createTime]]</td>
<td>[[item.founderName]]</td>
<td>
[[if item.flag && item.flag == 1]]
<a data-planid="[[item.planId]]" data-skn="[[productSkn]]" href="javascript:;" class="btn btn-danger btn-xs deleteHistory">删除</a>
[[/if]]
</td>
</tr>
[[/each]]
[[else]]
<tr><td colspan="7">没有变价记录！</td></tr>
[[/if]]
</tbody>
</table>
</div>
... ...