Authored by 陶雨

Merge branch 'yohobuy_portal_dev_v4.6_20160601' of http://git.yoho.cn/fe/yohobuy…

…-portal-fe into yohobuy_portal_dev_v4.6_20160601
... ... @@ -268,15 +268,44 @@ $(document).on('click', '.apply-cancel', function () {
/**
* 查看详情
*/
var item1 = {};
$(document).on('click', '.coupon-info', function () {
var item = g.rows[$(this).data("index")];
var item1 = $.extend(true, {}, item);
common.util.__ajax({
url: "/coupon/getCouponDetailById",
async:false,
data: {
couponsId: item.id
}
}, function (res) {
item1 = res.data;
}, true);
item1.createTime = Bll.getTime(item1.createTime);
item1.startTime = Bll.getTime(item1.startTime);
item1.endTime = Bll.getTime(item1.endTime);
item1.couponType = couponTypes[item1.couponType - 1];
item1.department = departments[item1.department - 1];
item1.useLimitType = useLimitTypes[item1.useLimitType];
if(item1.brandsIdName){
var brands=[];
item1.brandsIdName.forEach(function (x) {
brands.push(x.text);
});
item1.brandsList=brands.join(";")
}
if(item1.sortList){
var sorts=[],sortList=[];
for(var i=0;i<item1.sortList.length;i++){
sorts[i]=[];
for(var j=0;j<item1.sortList[i].length;j++){
sorts[i].push(item1.sortList[i][j].sortName);
}
}
for(var k=0;k<sorts.length;k++){
sortList.push(sorts[k].join("-"));
}
item1.sortsList=sortList.join(";");
}
if (item1.customType) {
item1.customType = item1.customType.split(",");
var typeLen = item1.customType.length;
... ...
... ... @@ -28,6 +28,7 @@ $(document).on("change", ".observe", function () {
*/
var Bll = {
Brands: [],//品牌数据
selectSorts: [],//分类数据
getBrands: function () {//获取品牌数据
var Brand = {};
$.get("/ajax/yohosearch", function (res) {
... ... @@ -92,6 +93,7 @@ var Bll = {
}
}
},
checkSortNum: function () {
if ($('.sort-wrap').find('.row').size() > 1) {
$('.sort-wrap').find('.row').find('.add-sort-btn').hide().end().find('.del-sort-btn').show();
... ... @@ -100,15 +102,15 @@ var Bll = {
$('.sort-wrap').find('.row:first').find('.add-sort-btn').show().end().find('.del-sort-btn').hide();
}
},
setTabTree:function () {
var data={},NUMN={};
setTabTree: function () {//分类数据,设置tabTree
var data = {}, NUMN = {};
common.util.__ajax({
url:'/product/class/queryAllProductSortList',
data:{}
},function(res){
data=res.data;
},true);
NUMN={
url: '/product/class/queryAllProductSortList',
data: {}
}, function (res) {
data = res.data;
}, true);
NUMN = {
columns: [{
state: "prov",
text: "一级分类",
... ... @@ -141,12 +143,13 @@ if (type == 'add') {
} else {
var id = location.href.substring(location.href.lastIndexOf("/") + 1);
common.util.__ajax({
url: "/coupon/queryCouponList",
data: {couponId: id}
url: "/coupon/getCouponDetailById",
data: {couponsId: id}
}, function (res) {
couponBean = res.data.list[0];
couponBean = res.data;
couponBean.startTime = Bll.getTime(couponBean.startTime);
couponBean.endTime = Bll.getTime(couponBean.endTime);
Bll.selectSorts=couponBean.sortList||[];
Bll.__render(couponBean, type)
}, true);
}
... ... @@ -205,9 +208,7 @@ $(document).on("click", "#save_brand", function () {
/********************************************************分类相关****************************************/
var tabTreeArr = [], tabTree;
//选择分类
$(document).on('click', "#addSorts", function () {
var initSort = function () {//初始化分类弹框
var data1 = {};
common.dialog({
title: "选择分类",
... ... @@ -217,10 +218,12 @@ $(document).on('click', "#addSorts", function () {
value: "保存",
callback: function () {
var ids = [];
Bll.selectSorts = [];
if (tabTreeArr.length > 0) {
for (var i = 0; i < tabTreeArr.length; i++) {
for(var j=0;j<tabTreeArr[i].selected.length;j++){
if(j<=1){
Bll.selectSorts.push(tabTreeArr[i].selected);
for (var j = 0; j < tabTreeArr[i].selected.length; j++) {
if (j <= 1) {
ids.push(tabTreeArr[i].selected[j].id);
}
}
... ... @@ -233,11 +236,42 @@ $(document).on('click', "#addSorts", function () {
value: "返回"
}]
});
tabTreeArr = [];
tabTree = new common.tabTree(".sortTree",Bll.setTabTree());
tabTree.init();
tabTreeArr.push(tabTree);
Bll.checkSortNum();
};
//选择分类
$(document).on('click', "#addSorts", function () {
if (Bll.selectSorts && Bll.selectSorts.length > 0) {
//渲染物理类目
var selectedArr = [];
for (var i = 0; i < Bll.selectSorts.length; i++) {
var arr = [];
$.each(Bll.selectSorts[i], function (i, item) {
arr.push({id: item.id, sortName: item.sortName});
});
selectedArr.push(arr);
}
if (selectedArr.length > 0) {
initSort();
$('.sort-wrap').empty();
tabTreeArr = [];
$.each(selectedArr, function (i, item) {
var $sortGroup = $($('#sortWrap').html());
$sortGroup.appendTo($('.sort-wrap'));
Bll.checkSortNum();
tabTree = new common.tabTree(".sortTree:last");
tabTreeArr.push(tabTree);
tabTree.init(item);
});
}
}
else {
initSort();
tabTreeArr = [];
tabTree = new common.tabTree(".sortTree", Bll.setTabTree());
tabTree.init();
tabTreeArr.push(tabTree);
Bll.checkSortNum();
}
});
//添加一个分类
... ... @@ -254,6 +288,7 @@ $(document).on('click', '.del-sort-btn', function () {
var sortIndex = $(this).parents('.row').index();
$(this).parents('.row').remove();
tabTreeArr.splice(sortIndex, 1);
Bll.selectSorts.splice(sortIndex, 1);
Bll.checkSortNum();
});
... ...
... ... @@ -41,9 +41,9 @@ $(document).on("click", "#sendCoupon", function() {
var msg1=[],msg2=[];
res.data.forEach(function (result) {
if(result.flag==false){
msg1.push('<p>'+result.uid+':'+result.errMsg + ';'+'</p>');
msg1.push('<p>'+result.uid+':'+result.errMsg + '</p>');
}else{
msg2.push('<p>'+result.uid+':发放成功;</p>');
msg2.push('<p>'+result.uid+':发放成功</p>');
}
});
if(msg1.length>0){
... ...
... ... @@ -455,6 +455,13 @@ exports.res = [
{name: "startTimeStr", type: "number"},
{name: "endTimeStr", type: "number"}
]
},{
route:"/coupon/getCouponDetailById",
method: "POST",
url: "/coupon/getCouponDetailById",
params: [
{name: "couponsId", type: "number"}
]
},
{
//发券页渲染
... ...
... ... @@ -144,7 +144,6 @@
</div>
<div class="panel-body">
<div class="row">
<div class="form-group">
<label class="col-sm-2 control-label">优惠类型</label>
... ... @@ -174,6 +173,24 @@
<p>面额&emsp;[[couponAmount]]</p>
</div>
</div>
[[if brandsList]]
<div class="form-group">
<label class="col-sm-2 control-label">品牌限制</label>
<div class="col-sm-10">
<p>[[brandsList]]</p>
</div>
</div>
[[/if]]
[[if sortsList]]
<div class="form-group">
<label class="col-sm-2 control-label">分类限制</label>
<div class="col-sm-10">
<p>[[sortsList]]</p>
</div>
</div>
[[/if]]
</div>
</div>
<div class="panel-heading">
... ...
... ... @@ -184,7 +184,7 @@
<label class="col-sm-2 control-label">优惠结果<i class="red">*</i></label>
<div class="col-sm-4">
<label class="col-sm-1 control-label">面额</label>
<label class="col-sm-2 control-label">面额</label>
<div class="col-sm-4">
<input type="text" match="numbers" class="form-control observe " data-field="couponAmount"
... ... @@ -259,7 +259,7 @@
<script type="text/template" id="editTemp">
<div class="panel">
<div class="panel-body nopadding">
<form id="basicForm1" role="form" action="[[action]]" class="form-horizontal form-bordered">
<form id="basicForm1" role="form" class="form-horizontal form-bordered">
<div class="form-group" style="margin-bottom: 40px">
<label class="col-sm-2 control-label">分类关联:</label>
<div class="col-sm-8 sort-wrap">
... ... @@ -274,9 +274,6 @@
</div>
</div>
</div>
<input id="categoryId" type="hidden" value="[[categoryId]]">
<input id="parentId" type="hidden" value="[[parentId]]">
<input id="orderBy" type="hidden" value="[[orderBy]]">
</form>
</div>
</div>
... ...