fe / yohobuy-portal-fe · Commits

Go to a project

Authored by weiqingting
Commit e04d4e1c8a5f4d52cf08fca605a21509288ae09c 2 parents 756443fe 9db3195c

Merge branch 'release/qqtest' of http://git.dev.yoho.cn/platform/yohobuy-portal-… 

…fe into release/qqtest
Inline Side-by-side
Showing 10 changed files with 699 additions and 421 deletions
... ... @@ -6,9 +6,8 @@ require('../common/zh-cn');
var baidu;
/*获取数据ViewModel*/
var ViewModel = {articleGender:"3"};
var ViewModel = {articleGender: "3"};
var param = location.href.slice(location.href.indexOf("contentEdit")).match(/\/\d+/g);
if (param && param.length == 1) {
param[0] = param[0].replace(/\//, '');
... ... @@ -22,11 +21,16 @@ if (param && param.length == 1) {
ViewModel = res.data;
}, true);
}
/**
* 验证
* @type {common.components}
*/
var components = new common.components(".modal-body", {
bucket: "goodsimg"
});
/**
* 通用
*/
var Bll = {
d: null,
moduleimgs: [],
... ... @@ -36,24 +40,24 @@ var Bll = {
getBrands: function () {
var Brand = {};
$.get("/ajax/yohosearch", function (res) {
if(!res.data||!res.data.brands){
if (!res.data || !res.data.brands) {
return;
}
for(var key in res.data.brands){
var name=key;
if (/^[0-9]$/.test(name)) {
name = "0-9";
}
if (name==="") {
name = "#";
}
for(var key2 in res.data.brands[key]){
var item=res.data.brands[key][key2];
Brand[name] = Brand[name] || [];
Brand[name].push(item);
Bll.Brands1[item.id] = item;
}
}
for (var key in res.data.brands) {
var name = key;
if (/^[0-9]$/.test(name)) {
name = "0-9";
}
if (name === "") {
name = "#";
}
for (var key2 in res.data.brands[key]) {
var item = res.data.brands[key][key2];
Brand[name] = Brand[name] || [];
Brand[name].push(item);
Bll.Brands1[item.id] = item;
}
}
for (var i in Brand) {
Brand[i].sort(function (a, b) {
var aName = a.brand_name.toLowerCase(),
... ... @@ -78,7 +82,6 @@ var Bll = {
for (var key in map2) {
Brdata.push(map2[key]);
}
var Brands2 = [];
Brdata.forEach(function (item, index) {
if (!item.brandIco) {
... ... @@ -100,24 +103,24 @@ var Bll = {
contentDatas: [],
module: null,
toast: function (index, module) {
if (!module.contentData.dialog||!module.contentData.template_intro) {
if (!module.contentData.dialog || !module.contentData.template_intro) {
Button.forEach(function (item, index) {
if (module.contentData.template_name == item.template_name) {
module.contentData.dialog = item.dialog;
module.contentData.template_intro=item.template_intro;
module.contentData.template_intro = item.template_intro;
return;
}
});
}
Bll.d = new common.dialog({
title: (!!~index ? "修改" : "添加") + module.contentData.template_intro.replace("添加",''),
title: (!!~index ? "修改" : "添加") + module.contentData.template_intro.replace("添加", ''),
content: common.util.__template2($("#" + module.contentData.dialog).html(), module),
width: '70%',
button: [{
value: "保存",
callback: function () {
if(module.contentData.dialog=="template_dialog_text"){
module.contentData.data.text=baidu.getContent();
if (module.contentData.dialog == "template_dialog_text") {
module.contentData.data.text = baidu.getContent();
}
if (components.validate()) {
//TODO
... ... @@ -131,13 +134,11 @@ var Bll = {
}]
});
Bll.__editRender();
if(module.contentData.dialog=="template_dialog_text"){
baidu&&baidu.destroy();
baidu=UM.getEditor('baidueditor');
if (module.contentData.dialog == "template_dialog_text") {
baidu && baidu.destroy();
baidu = UM.getEditor('baidueditor');
baidu.setContent(module.contentData.data.text);
}
}
},
renderDialog: function (templater) {
Bll.__render(".modal-body", templater, Bll.module);
... ... @@ -150,23 +151,6 @@ var Bll = {
Bll.module.contentData.data = common.util.__buildobj(names, '.', Bll.module.contentData.data, function (o, name) {
o[name] = obj.data;
});
// var names=obj.field;
// if(obj.datas.length>0){
// for(var i in obj.datas){
// names=names.replace(/^\d+/,i);
// if(i>0){
// Bll.module.contentData.data.push(Bll.module.contentData.data[0]);
// }
// Bll.module.contentData.data=common.util.__buildobj(names, '.', Bll.module.contentData.data, function(o, name) {
// o[name] = obj.data;
// });
// }
// }
// console.log("Bll.module.contentData.data",Bll.module.contentData.data);
// Bll.renderDialog(Bll.module.contentData.dialog);
});
},
rendContent: function () {
... ... @@ -176,8 +160,6 @@ var Bll = {
},
__render: function (selecter, templater, data) {
$(selecter).html(common.util.__template2($("#" + templater).html(), data));
},
Tags: []
};
... ... @@ -193,21 +175,18 @@ Bll.renderBrandPic(Bll.Brdata);
/*渲染标签*/
Bll.Tags = ViewModel.tag ? ViewModel.tag.split(',') : [];
Bll.__render("#taglist", "template4", {tags: Bll.Tags});
/*内容渲染->对象转数组*/
// Bll.contentDatas=ENUM.articleContent;
if (ViewModel.articleContent) {
ViewModel.articleContent.forEach(function (item, index) {
item.contentData = item.contentData.replace(/(gif|png|jpg|jpeg)\?[^"]*/g, '$1');
item.contentData = common.util.__ObjToArray(JSON.parse(item.contentData));
console.log(item);
//console.log(item);
Bll.contentDatas.push(item);
});
}
/*第三部解析楼层*/
Bll.__render("#add-content", "template_content", {modules: Bll.contentDatas});
new common.dropDown({
el: "#authorId",
ajax: "guangGetAuthorList"
... ... @@ -272,7 +251,6 @@ $(document).on("click", ".tag a", function () {
});
$(document).on("click", "#addBrands", function () {
///goods/brands/queryBrandsByStatus
var e = new common.edit("#brandForm");
common.dialog.confirm("选择品牌", common.util.__template2($("#template5").html(), {
Brands: Bll.Brands,
... ... @@ -353,12 +331,7 @@ var Button = [
template_intro: "添加商品",
dialog: "template_dialog_goods",
template_name: "goods",
data: [
// {
// src:"",
// id:""
// }
]
data: []
},
{
template_intro: "推荐商品组",
... ... @@ -369,13 +342,7 @@ var Button = [
cover: "",
maxSortId: ""
},
list: [
// {
// src:"",
// id:"",
// maxSortId:""
// }
]
list: []
}]
},
{
... ... @@ -394,7 +361,6 @@ $("#content_btns").html(common.util.__template2($("#template_content_btns").html
btns: Button
}));
$(document).on("click", ".add_btn", function () {
var item = Button[$(this).data("index")];
Bll.module = {templateKey: item.template_name};
... ... @@ -424,181 +390,10 @@ $(document).on("click", ".edit", function () {
Bll.toast(index, Bll.module);
});
$(document).on("dblclick","#add-content>li.custom-group",function(){
$(document).on("dblclick", "#add-content>li.custom-group", function () {
$(this).find(".edit").click();
});
/*选择商品表格*/
var goodsgird = new common.grid({
el: '#goodsgird',
parms: function () {
var price = "";
if (common.util.__input('beginPrice')&&common.util.__input('endPrice')) {
price = common.util.__input('beginPrice')+","+common.util.__input('endPrice');
}
return {
status:1,
sales:"Y",
stocknumber:"1",
attribute_not:"2",
query: common.util.__input('skns'),
price: price
};
},
columns: [
{
display: "选择",
type: "checkbox"
}, {
display: "产品图片",
render: function (item) {
console.log("item",item);
if (item.images_url) {
item.images_url = common.util.__joinImg("goodsimg", item.images_url);
}
else {
if(item.default_images){
item.images_url = common.util.__joinImg("goodsimg", item.default_images);
}
else{
item.images_url=""
}
}
if(item.images_url){
return "<img width=120 height=60 src='" + item.images_url + "?imageMogr2/thumbnail/320x320/extent/320x320/background/d2hpdGU=/position/center/quality/90'/>";
}else{
return "";
}
}
}, {
display: "产品名称",
name: "product_name"
}, {
display: "品牌",
name: "brand_name"
}, {
display: "现价",
name: "sales_price"
}, {
display: "吊牌价",
name: "market_price"
}, {
display: "预售",
name: "stock_number"
}, {
display: "库存",
name: "storage_num"
}]
});
//搜索按钮
$(document).on("click", "#search", function () {
if($.trim($("#skns").val()).length<5){
common.util.__tip("请输入超过5个字符后再搜索","warning");
return;
}
if(goodsgird.grid){
goodsgird.reload(1);
}else{
goodsgird.init('/yohosearch/search');
}
});
//点击“选择标签”按钮（添加商品）
$(document).on("click", "#goodsSelectBtn", function () {
new common.dialog({
title: "选择商品",
content: $("#template_dialog_goodsgird").html(),
width: '80%',
button: [{
value: "确定",
callback: function () {
var gs=goodsgird.selected.map(function (item, index) {
return {
src: item.images_url,
id: item.product_skn,
product_skc: item.product_skc
}
})
Bll.module.contentData.data=Bll.module.contentData.data.concat(gs);
Bll.module.contentData.data=Unique(Bll.module.contentData.data)
Bll.__render("#goodspic", "template_dialog_goodsimgs", {
datas: Bll.module.contentData.data
});
},
css: "btn-primary"
}]
});
goodsgird.grid=null;
//goodsgird.init('/yohosearch/search');
});
//点击“添加组”按钮（添加商品组）
$(document).on("click", "#goodsaddBtn", function () {
var item = $.extend(true, {}, Button[4].data[0]);
if (Bll.module.contentData.data[0].list.length) {
Bll.module.contentData.data.push(item);
}
Bll.__render("#groupsgoods", "template_dialog_remgoodsgroup", Bll.module);
});
//点击“选择标签”按钮（添加商品组）
$(document).on("click", ".goodsSelectBtn", function () {
var index = $(this).data("index");
new common.dialog({
title: "选择商品",
content: $("#template_dialog_goodsgird").html(),
width: '80%',
button: [{
value: "确定",
callback: function () {
if(goodsgird.selected){
goodsgird.selected.forEach(function (item, i) {
Bll.module.contentData.data[index].list.push({
src: item.images_url,//+'?imageMogr2/thumbnail/{width}x{height}/extent/{width}x{height}/background/d2hpdGU=/position/center/quality/90'
id: item.product_skn,
product_skc: item.product_skc,
maxSortId: item.max_sort_id
});
});
Bll.module.contentData.data[index].list=Unique(Bll.module.contentData.data[index].list);
Bll.module.contentData.data[index].cover = {
cover: Bll.module.contentData.data[index].list[0].src,
maxSortId: Bll.module.contentData.data[index].list[0].maxSortId
};
}
Bll.__render("#groupsgoods", "template_dialog_remgoodsgroup", Bll.module);
},
css: "btn-primary"
}]
});
//goodsgird.init('/yohosearch/search');
goodsgird.grid=null;
});
//删除图片按钮
$(document).on("click", ".removepic", function () {
var $parent = $(this).parents("ul.imagegroup");
var i = $parent.data("i");//组标志
var isg = typeof(i) === "number" ? true : false;
//推荐商品组
if (isg) {
Bll.module.contentData.data[i].list.splice($(this).data("index"), 1);
Bll.module.contentData.data[i].cover = {};
if (Bll.module.contentData.data[i].list.length == 0) {
Bll.module.contentData.data[i].cover.cover = "";
Bll.module.contentData.data[i].cover.maxSortId = "";
}
else {
Bll.module.contentData.data[i].cover.cover = Bll.module.contentData.data[i].list[0].src;
Bll.module.contentData.data[i].cover.maxSortId = Bll.module.contentData.data[i].list[0].maxSortId;
}
}
//商品
else {
Bll.module.contentData.data.splice($(this).data("index"), 1);
}
$parent.html(common.util.__template2($("#template_dialog_goodsimgs").html(), {
datas: isg ? Bll.module.contentData.data[i].list : Bll.module.contentData.data
}));
});
/********************************/
var e = new common.edit("#panel-body", {
... ... @@ -610,7 +405,7 @@ e.on("validate", function () {
return "链接和内容不能同时为空";
}
});
var imgsTem="?imageMogr2/thumbnail/{width}x{height}/extent/{width}x{height}/background/d2hpdGU=/position/center/quality/90";
var imgsTem = "?imageMogr2/thumbnail/{width}x{height}/extent/{width}x{height}/background/d2hpdGU=/position/center/quality/90";
$(document).on("click", "#submit", function () {
e.submit($("#panel-body").attr("action"), function (option) {
if (param && param.length == 1) {
... ... @@ -618,15 +413,15 @@ $(document).on("click", "#submit", function () {
}
option.data.minSortId = option.data.minSortId == "-1" ? "" : option.data.minSortId;
option.data.contentData =Bll.contentDatas.concat();
option.data.contentData=option.data.contentData.map(function (item, index) {
var item=$.extend(true,{},item);
option.data.contentData = Bll.contentDatas.concat();
option.data.contentData = option.data.contentData.map(function (item, index) {
var item = $.extend(true, {}, item);
if ({}.toString.call(item.contentData.data) == "[object Array]") {
item.contentData.data.map(function (item1) {
if (item1.src) {
if(item.contentData.template_name==="goods"){
if (item.contentData.template_name === "goods") {
item1.src = item1.src + imgsTem;
}else{
} else {
item1.src = item1.src + "?imageView/{mode}/w/{width}/h/{height}";
}
... ... @@ -634,9 +429,9 @@ $(document).on("click", "#submit", function () {
if (item1.cover) {
item1.cover.cover = item1.cover.cover + imgsTem;
}
if (item1.list&&{}.toString.call(item1.list) == "[object Array]"){
item1.list.map(function(item2){
item2.src=item2.src+imgsTem;
if (item1.list && {}.toString.call(item1.list) == "[object Array]") {
item1.list.map(function (item2) {
item2.src = item2.src + imgsTem;
return item2;
});
}
... ... @@ -657,14 +452,14 @@ $(document).on("click", "#submit", function () {
res = res.data;
if (res.code == "200") {
e.$tip("提交成功", function () {
location.href="/guang/article/index";
location.href = "/guang/article/index";
}, 'growl-success');
} else {
e.$tip(res.message);
}
},
option.error = function (res) {
e.$tip(res.message||"接口异常报错");
e.$tip(res.message || "接口异常报错");
}
});
});
... ... @@ -692,19 +487,19 @@ $(document).on("change", "#maxSortId", function () {
});
});
function Unique(Array) {
var res = [], hash = {};
for(var i=0, elem; (elem = Array[i]) != null; i++) {
if (!hash[elem.id])
{
for (var i = 0, elem; (elem = Array[i]) != null; i++) {
if (!hash[elem.id]) {
res.push(elem);
hash[elem.id] = true;
}
}
return res;
}
/**
* 自动获取品牌
*/
$(document).on("click", "#brandAutoBtn", function () {
var product_skc = [];
Bll.contentDatas.forEach(function (item, index) {
... ... @@ -749,17 +544,8 @@ $(document).on("click", "#brandAutoBtn", function () {
b.push(map[item]);
}
});
Bll.Brdata = (Bll.Brdata||ViewModel.brandList || []).concat(b);
Bll.Brdata=Unique(Bll.Brdata);
// Bll.Brdata=Bll.Brdata.unique5()
// var map2={};
// Bll.Brdata.forEach(function(item){
// map2[item.id]=item;
// });
// Bll.Brdata=[];
// for(var key in map2){
// Bll.Brdata.push(map2[key]);
// }
Bll.Brdata = (Bll.Brdata || ViewModel.brandList || []).concat(b);
Bll.Brdata = Unique(Bll.Brdata);
Bll.Brdata = Bll.renderBrandPic(Bll.Brdata);
}
}, true);
... ... @@ -865,4 +651,348 @@ $(document).on("mouseover", ".dragItem", function () {
$(document).on("mouseleave", ".dragItem", function () {
new common.drag("#add-content").destroy();
});
/************************************商品相关****************************************************/
/**
* 选择商品表格
*/
var goodsgird = new common.grid({
el: '#goodsgird',
parms: function () {
var price = "";
if (common.util.__input('min-price') && common.util.__input('max-price')) {
price = common.util.__input('min-price') + "," + common.util.__input('max-price');
}
return {
status: 1,
sales: "Y",
stocknumber: "1",
attribute_not: "2",
query: common.util.__input('skns') || common.util.__input('skns2'),
price: price,
color: colorArray.join(','),
//style: styleArray.join(','),//风格先不管
msort: typeArray.join(','),
brand: brandArray.join(','),
gender: genderArray.join(',')
};
},
columns: [
{
display: "选择",
type: "checkbox"
}, {
display: "产品图片",
render: function (item) {
if (item.images_url) {
item.images_url = common.util.__joinImg("goodsimg", item.images_url);
}
else {
if (item.default_images) {
item.images_url = common.util.__joinImg("goodsimg", item.default_images);
}
else {
item.images_url = ""
}
}
if (item.images_url) {
return "<img width=120 height=60 src='" + item.images_url + "?imageMogr2/thumbnail/320x320/extent/320x320/background/d2hpdGU=/position/center/quality/90'/>";
} else {
return "";
}
}
}, {
display: "产品名称",
name: "product_name"
}, {
display: "品牌",
name: "brand_name"
}, {
display: "现价",
name: "sales_price"
}, {
display: "吊牌价",
name: "market_price"
}, {
display: "预售",
name: "stock_number"
}, {
display: "库存",
name: "storage_num"
}]
});
/**
* 手动输入
*/
$(document).on("click", ".hand", function () {
$(this).css("color", 'red');
$("#skns").val("");
$(".tag").css("color", 'black');
$(".search-con1").show();
$(".search-con2").hide();
$(".tag-con").hide();
$(".goods-list").hide();
});
/**
* 手动输入中“搜索商品”按钮
*/
$(document).on("click", "#search", function () {
if ($.trim($("#skns").val()).length < 5) {
common.util.__tip("请输入超过5个字符后再搜索", "warning");
return;
}
else {
$(".goods-list").show();
if (goodsgird.grid) {
goodsgird.reload(1);
} else {
goodsgird.init('/yohosearch/search');
}
}
});
/**
* 标签搜索
*/
$(document).on("click", ".tag", function () {
$(this).css("color", 'red');
$(".hand").css("color", 'black');
$(".search-con1").hide();
$(".search-con2").show();
$(".tag-con").hide();
$(".goods-list").hide();
});
/**
* 标签搜索中 “搜索商品”按钮
*/
$(document).on("click", "#search2", function () {
$(".goods-list").show();
goodsgird.init('/yohosearch/search');
});
/**
* 标签搜索中“搜索标签”按钮
* @type {Array}
*/
var sorts = [];//所选分类
var colors = [], colorArray = [];//颜色
var styles = [{stylename: "街头"}, {stylename: "趣味"}, {stylename: "运动"}], styleArray = [];//风格
var types = [], typeArray = [];//品类
var brands = [], brandArray = [];//品牌
var genders = [{id: 1, gendername: "男"}, {id: 2, gendername: "女"}, {id: 3, gendername: "通用"}], genderArray = [];//性别
common.util.__ajax({
url: "/erpproduct/product/colorList"
}, function (res) {
colors = res.data.list;
}, true);
common.util.__ajax({
url: "/product/class/queryAllProductSortList",
data: {
booleanStatus: true
}
}, function (res) {
types = res.data;
}, true);
$(document).on("click", "#search-tag", function () {
$(".tag-con").show();
$(".sort").html(common.util.__template2($("#tag-template").html(), {
sorts: sorts
}));
$(".orther").html(common.util.__template2($("#sorts-template").html(), {
colors: colors,
styles: styles,
types: types,
brands: Bll.Brands,
genders: genders
}));
if($("#skns2").val()!=''){
$(".goods-list").show();
if (goodsgird.grid) {
goodsgird.reload(1);
} else {
goodsgird.init('/yohosearch/search');
}
}
});
/**
* 价格筛选
*/
$(document).on("click", "#price-search", function () {
if (goodsgird.grid) {
goodsgird.reload(1);
} else {
goodsgird.init('/yohosearch/search');
}
});
//点击“选择标签”按钮（添加商品）
$(document).on("click", "#goodsSelectBtn", function () {
new common.dialog({
title: "选择商品",
content: $("#template_dialog_goodsgird").html(),
width: '80%',
button: [{
value: "确定",
callback: function () {
var gs = goodsgird.selected.map(function (item, index) {
return {
src: item.images_url,
id: item.product_skn,
product_skc: item.product_skc
}
})
Bll.module.contentData.data = Bll.module.contentData.data.concat(gs);
Bll.module.contentData.data = Unique(Bll.module.contentData.data)
Bll.__render("#goodspic", "template_dialog_goodsimgs", {
datas: Bll.module.contentData.data
});
},
css: "btn-primary"
}]
});
goodsgird.grid = null;
//goodsgird.init('/yohosearch/search');
});
//点击“添加组”按钮（添加商品组）
$(document).on("click", "#goodsaddBtn", function () {
var item = $.extend(true, {}, Button[4].data[0]);
if (Bll.module.contentData.data[0].list.length) {
Bll.module.contentData.data.push(item);
}
Bll.__render("#groupsgoods", "template_dialog_remgoodsgroup", Bll.module);
});
//点击“选择标签”按钮（添加商品组）
$(document).on("click", ".goodsSelectBtn", function () {
var index = $(this).data("index");
new common.dialog({
title: "选择商品",
content: $("#template_dialog_goodsgird").html(),
width: '80%',
button: [{
value: "确定",
callback: function () {
if (goodsgird.selected) {
goodsgird.selected.forEach(function (item, i) {
Bll.module.contentData.data[index].list.push({
src: item.images_url,//+'?imageMogr2/thumbnail/{width}x{height}/extent/{width}x{height}/background/d2hpdGU=/position/center/quality/90'
id: item.product_skn,
product_skc: item.product_skc,
maxSortId: item.max_sort_id
});
});
Bll.module.contentData.data[index].list = Unique(Bll.module.contentData.data[index].list);
Bll.module.contentData.data[index].cover = {
cover: Bll.module.contentData.data[index].list[0].src,
maxSortId: Bll.module.contentData.data[index].list[0].maxSortId
};
}
Bll.__render("#groupsgoods", "template_dialog_remgoodsgroup", Bll.module);
},
css: "btn-primary"
}]
});
//goodsgird.init('/yohosearch/search');
goodsgird.grid = null;
});
//删除图片按钮
$(document).on("click", ".removepic", function () {
var $parent = $(this).parents("ul.imagegroup");
var i = $parent.data("i");//组标志
var isg = typeof(i) === "number" ? true : false;
//推荐商品组
if (isg) {
Bll.module.contentData.data[i].list.splice($(this).data("index"), 1);
Bll.module.contentData.data[i].cover = {};
if (Bll.module.contentData.data[i].list.length == 0) {
Bll.module.contentData.data[i].cover.cover = "";
Bll.module.contentData.data[i].cover.maxSortId = "";
}
else {
Bll.module.contentData.data[i].cover.cover = Bll.module.contentData.data[i].list[0].src;
Bll.module.contentData.data[i].cover.maxSortId = Bll.module.contentData.data[i].list[0].maxSortId;
}
}
//商品
else {
Bll.module.contentData.data.splice($(this).data("index"), 1);
}
$parent.html(common.util.__template2($("#template_dialog_goodsimgs").html(), {
datas: isg ? Bll.module.contentData.data[i].list : Bll.module.contentData.data
}));
});
//勾选标签
var checkSort = function (name, array) {
$(document).on("click", "input[name='" + name + "']", function () {
if ($(this).is(':checked')) {
array.push($(this).val());
}
else {
var i = array.indexOf($(this).val());
if (i > -1) {
array.splice(i, 1);
}
}
});
};
checkSort("color", colorArray);
checkSort("style", styleArray);
checkSort("type", typeArray);
checkSort("brand", brandArray);
checkSort("gender", genderArray);
Array.prototype.indexOf = function (val) {
for (var i = 0; i < this.length; i++) {
if (this[i] == val) return i;
}
return -1;
};
//$(document).on("click", "#search-tag", function () {
// $(".tag-con").show();
// var txt = $("#tags").val();
// var regex = new RegExp(txt);
// var bs = [];
// var colors1=[],types1=[],genders1=[];
// colors.forEach(function(color){
// if (regex.test(color.colorName)) {
// colors1.push(color);
// }
// });
// types.forEach(function(type){
// if (regex.test(type.sortName)) {
// types1.push(type);
// }
// });
// genders.forEach(function(gender){
// if (regex.test(gender.gendername)) {
// genders1.push(gender);
// }
// });
// //Bll.Brands.forEach(function (brands) {
// // brands.items.forEach(function (item) {
// // if (regex.test(item.brand_name)) {
// // console.log(item.brand_name);
// // bs.push(' <input type="checkbox" name="brand" value="'+item.id+'">'+item.brand_name+'');
// // }
// // });
// //});
// $(".orther").html(common.util.__template2($("#sorts-template").html(), {
// colors: colors1,
// //styles: styles1,
// types: types1,
// //brands: Bll.Brands,
// genders: genders1
// }));
//});
... ...
... ... @@ -5,18 +5,24 @@ var editBean = require('./partials/limitcode-edit-bean');
var e = new common.edit2("#basicForm");
var type = $("#basicForm").attr("role"),
action = $("#basicForm").data("action");
var isFirst = true;
var Bll = {
__render:function() {
editBean.currTime = common.util.__dateFormat(new Date(), "yyyy-MM-dd hh:mm:ss");
if(new Date(editBean.currTime).getTime() > new Date(editBean.limitDateFrom)) {
editBean.useCurrTime = true;
}
$("#basicForm").html(common.util.__template2($("#limitcodeEdit-template").html(), editBean));
e.init();
if(type == "edit") {
$('input[name="skn_sku"]').prop('disabled', true);
$(".noEdit").prop("disabled", true);
$('input[name="userTypeLimit"]').prop('disabled', true);
if(editBean.limitDateFrom <= new Date()) {
if((new Date(editBean.limitDateFrom).getTime() <= new Date().getTime()) && isFirst) {
$("#limitDateFrom").prop("disabled", true);
}
isFirst = false;
}
},
__checkSkn:function(callback) {
... ... @@ -89,6 +95,14 @@ $(document).on("change", ".observe", function () {
editBean = common.util.__buildobj(name, '.', editBean, function (obj, name) {
obj[name] = $this.val();
});
if($this.prop("id") == "limitDateFrom" && new Date($this.val()).getTime() ) {
if(new Date(editBean.currTime).getTime() > new Date(editBean.limitDateFrom)) {
editBean.useCurrTime = true;
} else {
editBean.useCurrTime = false;
}
Bll.__render();
}
//console.log(editBean);
});
... ...
... ... @@ -14,119 +14,90 @@ require('../common/zh-cn');
var baidu;
var ENUM = {
AuditEnum: {
'0': '待审核',
'1': '审核通过',
'2': '审核失败',
},
RecommendEnum: {
true: '已推荐',
false: '未推荐'
},
RewardEnum: {
false: '未发送奖励',
true: '奖励已发放'
FileTypeEnum: {
'1': '频道',
'2': '专题',
'3': '邮件',
'4': '推广'
}
};
new common.dropDown({
el: "#sel-type"
});
//日期插件
$('.hasDatepicker').fdatepicker({
format: 'yyyy-mm-dd'
});
var g = new common.grid({
el: '#basicTable',
size: 10,
parms: function () {
return {
status: $('#status').val(),
recomReward: $('#recomReward').val(),
hasImage: $('#hasImage').val(),
fileType: $('#sel-type').val(),
beginTime: common.util.__input('beginTime'),
endTime: common.util.__input('endTime'),
uid: common.util.__input('uid'),
productName: common.util.__input('productName'),
productSkn: common.util.__input('productSkn'),
orderCode: common.util.__input('orderCode')
endTime: common.util.__input('endTime')
};
},
columns: [{
display: '订单号',
name: "orderId"
}, {
display: '商品名称',
render: function (item) {
var goods = item.goods;
if (goods != null) {
productHref = "http://item.yohobuy.com/product/pro_" + item.productId + "_" + goods.goodsId + "/" + goods.cnAlphabet + ".html";
}
return '<a href="' + item.productHref + '">' + item.productName + '</a>'
}
}, {
display: '用户id',
name: "uid"
}, {
display: '商品图片',
render: function (item) {
var goods = item.goods;
var goodImgUrl = "";
if (goods != null && goods.goodsImg != null && goods.goodsImg.length > 0) {
goodImgUrl = goods.goodsImg[0].imageUrl;
}
return '<img src="' + goodImgUrl + '" width="100" height="60"/>'
}
}, {
display: "评价图片",
render: function (item) {
//item.url = common.util.__template(item.url,{mode:2,width:100,height:100});
return '<img src="' + item.url + '" width="100" height="60"/>'
}
}, {
display: '评价内容',
name: "content",
//width:'15%',
style: "width:15%; word-break:break-all;"
}
, {
display: '评价星级',
name: "satisfied"
}, {
display: '审核状态',
render: function (item) {
return "<p>" + ENUM.AuditEnum[item.status] + "</p>";
}
},
display: 'ID',
name: "id"
}, {
display: '标题',
name: "pageTitle"
},
{
display: '审核返币',
display: '类型',
render: function (item) {
return "<p>" + ENUM.RewardEnum[item.shareReward] + "</p>";
return "<p>" + ENUM.FileTypeEnum[item.fileType] + "</p>";
}
},
//{
// display: '审核返币',
// render: function (item) {
// return "<p>" + ENUM.RewardEnum[item.shareReward] + "</p>";
// }
//},
//{
// display: '推荐状态',
// render: function (item) {
// return "<p>" + ENUM.RecommendEnum[item.recomReward] + "</p>";
// }
//},
{
display: '推荐状态',
display: "添加时间",
render: function (item) {
return "<p>" + ENUM.RecommendEnum[item.recomReward] + "</p>";
var t = new Date(item.createTime * 1000);
var formatted = common.util.__dateFormat(t, "yyyy-MM-dd hh:mm:ss");
return "<p>" + formatted + "</p>";
}
}, {
display: "创建时间",
},{
display: "修改时间",
render: function (item) {
var t = new Date(item.createTime * 1000);
var t = new Date(item.updateTime * 1000);
var formatted = common.util.__dateFormat(t, "yyyy-MM-dd hh:mm:ss");
return "<p>" + formatted + "</p>";
}
}, {
display: '备注',
name: "remark"
}, {
},
{
display: '操作',
//}
render: function (items) {
var HtmArr = [];
HtmArr.push('<a data-index="' + items.__index + '" style="margin-bottom:10px;" href="JavaScript:;" class="btn btn-info btn-xs info-modify">编辑</a>');
HtmArr.push('<a data-index="' + items.__index + '" href="JavaScript:;" class="btn btn-info btn-xs info-modify">编辑</a>');
HtmArr.push('<a data-index="' + items.__index + '" href="JavaScript:;" class="btn btn-danger btn-xs info-del">删除</a>');
return HtmArr.join('');
... ... @@ -134,12 +105,12 @@ var g = new common.grid({
}
]
});
g.init('/shareOrder/shareOrderList');
g.init('/staticFileManage/queryByCondition');
//添加
$(document).on('click', '#add', function () {
staticFileOP("新增", '', {});
staticFileOP("新增", '/staticFileManage/add', {});
});
... ... @@ -149,9 +120,9 @@ $(document).on('click', '.info-del', function () {
common.dialog.confirm("温馨提示", "确定要删除吗？", function () {
common.util.__ajax({
url: '',
url: '/staticFileManage/deleteById',
data: {
uid: item.uid,
id: item.id
}
}, function (res) {
if (res.code == 200) {
... ... @@ -163,19 +134,16 @@ $(document).on('click', '.info-del', function () {
});
});
// 查询
$(document).on('click', '#filter', function () {
g.reload();
});
$(document).on('click', '#add', function () {
g.reload();
});
//编辑
$(document).on('click', '.info-modify', function () {
var item = g.rows[$(this).data("index")];
staticFileOP("编辑", '/guang/relationship/updateRel', item);
staticFileOP("编辑", '/staticFileManage/update', item);
});
function staticFileOP(prefix, url, item) {
... ... @@ -184,29 +152,32 @@ function staticFileOP(prefix, url, item) {
//"bucket" : "author"
});
//下拉框
new common.dropDown({
el: "#type"
});
var dialog = new common.dialog({
width: '70%',
title: prefix + '静态文件',
content: common.util.__template2($("#template").html(), item),
button: [{
value: '提交',
callback: function () {
a.submit(url, function (option) {
//option.data.
option.success = function (res) {
res = res.data;
if (res.code == 200) {
a.$tip('提交成功', function () {
g.reload();
})
} else {
a.$tip(res.message);
}
common.util.__ajax({
url:url,
data:{
id: $('#id').val(),
fileType: $('#fileType').val(),
pageTitle: $('#pageTitle').val(),
keyWord: $('#keyWord').val(),
pageDesc: $('#pageDesc').val(),
content: baidu.getContent()
}
}, function (res) {
//res=res.data;
if(res.code=="200"){
dialog.close();
g.reload();
return true;
}else{
return false;
}
});
... ... @@ -216,9 +187,23 @@ function staticFileOP(prefix, url, item) {
});
////下拉框
//new common.dropDown({
// el: "#fileType"
//});
baidu && baidu.destroy();
baidu = UM.getEditor('baidueditor');
//baidu.setContent(module.contentData.data.text);
baidu = UM.getEditor('content');
if (prefix == '编辑') {
baidu.setContent(item.content);
//$("#fileType option").each(function() {
// return this.text == ENUM.FileTypeEnum[item.fileType];
//}).prop('selected', true);
}
a.init();
}
\ No newline at end of file
... ...
... ... @@ -979,7 +979,7 @@ function editorTipInit(id){
tipHtml = "<span>提示：【品牌一览】由PC端【品牌集合】适配，修改请到PC端【品牌集合】修改。</span>";
break;
case "editor-recommend":
tipHtml = "<span>提示：请上传像素50*50的图片，图片和标题会适配到APP的【热门品类】中。</span>";
tipHtml = "<span>提示：请上传像素150*150的图片，图片和标题会适配到APP的【热门品类】中。</span>";
break;
case "editor-recommend-app":
tipHtml = "<span>提示：【热门品类】由PC端【经典推荐】适配，修改请到PC端【经典推荐】修改。</span>";
... ...
... ... @@ -137,7 +137,7 @@ pc端店铺模板css
display: block;
float: right;
height: 50px;
width: 40%;
width: 50px;
}
/*------------------------热销推荐--------------------------*/
... ...
... ... @@ -642,6 +642,25 @@ exports.res = [
route:'/guang/tags/getTags',
method:'POST',
url:'/guang/tags/getTags'
},
{
//标签搜索，所有
route: '/guang/queryAllGoodsSort',
method: 'POST',
apis: {
colorList: {
url: '/erpproduct/product/colorList'
},
materialList: {
url: '/erpproduct/attribute/index',
params: [{
name: 'status',
type: 'String',
def:1
}],
isJsonRaw: true
}
}
}
];
... ...
... ... @@ -12,6 +12,47 @@ exports.res = [
data: {
iscreate: true
}
}, { // 新增
route: '/staticFileManage/add',
method: 'POST',
url: '/staticFileManage/add',
params: [
{name: 'fileType', type: 'Number'},
{name: 'pageTitle', type: 'String'},
{name: 'keyWord', type: 'String'},
{name: 'pageDesc', type: 'String'},
{name: 'content', type: 'String'}
]
}, { // 删除
route: '/staticFileManage/deleteById',
method: 'POST',
url: '/staticFileManage/deleteById',
params: [
{name: 'id', type: 'Number'}
]
}, { // 修改
route: '/staticFileManage/update',
method: 'POST',
url: '/staticFileManage/update',
params: [
{name: 'id', type: 'Number'},
{name: 'fileType', type: 'Number'},
{name: 'pageTitle', type: 'String'},
{name: 'keyWord', type: 'String'},
{name: 'pageDesc', type: 'String'},
{name: 'content', type: 'String'}
]
}, { // 查询
route: '/staticFileManage/queryByCondition',
method: 'POST',
url: '/staticFileManage/queryByCondition',
params: [
{name: 'fileType', type: 'Number'},
{name: 'beginTime', type: 'String'},
{name: 'endTime', type: 'String'},
{name: 'page', type: 'Number'},
{name: 'size', type: 'Number'}
]
}
];
... ...
... ... @@ -466,35 +466,67 @@
<!--添加商品/商品组--选择标签界面模板-->
<script type="text/template" id="template_dialog_goodsgird">
<div class="rows">
<h4>1、搜索商品或标签</h4>
<nav>
<a class="hand select" href="javascript:void(0)" style="font-size: 14px;padding:20px;color: red">手动输入</a>
<a class="tag" href="javascript:void(0)" style="font-size: 14px;padding:20px;color: #000000">标签筛选</a>
</nav>
<div class="search-con1 form-group">
<div class="col-sm-3">
<input type="text" id="skns" class="form-control" placeholder="输入skn,多个skn以逗号分隔">
</div>
<div class="col-sm-1">
<a id="search" class="go-search form-control btn btn-primary">搜索商品</a>
</div>
</div>
<div class="search-con2 form-group" hidden="hidden">
<div class="col-sm-3">
<input type="text" id="tags" class="form-control" placeholder="输入关键字搜索标签">
</div>
<div class="col-sm-1">
<span style="line-height: 300%;margin-left: 50px">或</span>
</div>
　
<div class="col-sm-3">
<input type="text" id="skns2" class="form-control" placeholder="输入skn搜索标签">
</div>
<div class="col-sm-1">
<a type="button" id="search-tag" class="go-search btn btn-primary">搜索标签</a>
</div>
</div>
<div class="tag-con" style="border: 1px solid rgb(0, 0, 0); padding: 10px; margin-top: 10px;" hidden="hidden">
<div class="sort">
[[layout tag-template]]
</div>
<div class="orther">
[[layout sorts-template]]
</div>
<p style="margin-top:40px;">
<a class="go-search tag-goods btn btn-primary" id="search2">搜索商品</a>
</p>
</div>
<div class="goods-list form-group" style="display: none">
<h4>2、选择商品</h4>
<div class="form-group">
<div class="panel-col2">
<input class="form-control" id="skns" placeholder="输入SKN(多个skn以逗号分隔)或产品名称"/>
<label class="col-sm-1" for="min-price">价格筛选：</label>
<div class="col-sm-2">
<input type="text" id="min-price" class="form-control">
</div>
<div class="panel-col">
<input type="number" id="beginPrice" name="begin_price" class="form-control"
placeholder="起始价" value="">
<div class="col-sm-1">
<span>-</span>
</div>
<div class="panel-col">
<input type="number" id="endPrice" name="end_price" class="form-control"
placeholder="结束价" value="">
<div class="col-sm-2">
<input type="text" id="max-price" class="form-control">
</div>
<div class="col-sm-1">
<input type="button" id="search" class="btn btn-primary mr5" value="搜索"/>
<a class="go-search price btn btn-primary" id="price-search">筛选</a>
</div>
</div>
<div class="form-group">
<div class="gird" id="goodsgird">
<div class="row">
<div class="form-group">
<div class="col-sm-12">
<i class="col-sm-1 fa fa-star" style="text-align: right"></i>
<p class="col-sm-10">请在搜索框内输入SKN(多个skn以逗号分隔)或产品名称，然后点击搜索按钮</p>
</div>
</div>
</div>
</div>
<div class="gird" id="goodsgird">
</div>
</div>
</script>
... ... @@ -597,3 +629,55 @@
<option value="go.discountmarket">折扣专区</option>
<option value="go.discountmarketpro">折扣专区详情页</option>
</script>
<script type="text/template" id="sorts-template">
<div class="form-group">
颜色：
[[each colors as item index]]
<input type="checkbox" name="color" data-index="[[index]]" value="[[item.id]]">[[item.colorName]]
[[/each]]
<input type="hidden" id="colors1" for="checkbox">
</div>
<div class="form-group">
风格：
[[each styles as item index]]
<input type="checkbox" name="style" value="[[item.stylename]]">[[item.stylename]]
[[/each]]
<input type="hidden" for="checkbox" id="styles1">
</div>
<div class="form-group">
品类：
[[each types as item index]]
<input type="checkbox" name="type" value="[[item.id]]">[[item.sortName]]
[[/each]]
<input type="hidden" for="checkbox" id="types1">
</div>
<div class="form-group">
品牌：
[[each brands as item index]]
[[each item.items as _item _index]]
<input type="checkbox" name="brand" value="[[_item.id]]">[[_item.brand_name]]
[[/each]]
[[/each]]
<input type="hidden" for="checkbox" id="brands1">
</div>
<div class="form-group">
性别：
[[each genders as item index]]
<input type="checkbox" name="gender" value="[[item.id]]">[[item.gendername]]
[[/each]]
<input type="hidden" for="checkbox" id="genders1">
</div>
</script>
<script type="text/template" id="tag-template">
<div class="form-group">
所有标签：
[[each sorts as item index]]
<input type="checkbox" name="color" value="[[item.id]]">[[item.id]]
[[/each]]
<input type="hidden" id="sorts1" for="checkbox">
</div>
</script>
... ...
... ... @@ -57,9 +57,10 @@
<input type="text" class="form-control observe" data-field="limitDateFrom" jsaction="time:end:limitDateTo" id="limitDateFrom" placeholder="开始时间" value="[[limitDateFrom]]" readonly required>
</div>
<div class="col-sm-6">
<input type="text" class="form-control observe" data-field="limitDateTo" jsaction="time:start:limitDateFrom" id="limitDateTo" placeholder="结束时间" value="[[limitDateTo]]" readonly required>
<input type="text" class="form-control observe" data-field="limitDateTo" jsaction="time:start:[[useCurrTime?'limitDateCurr':'limitDateFrom']]" id="limitDateTo" placeholder="结束时间" value="[[limitDateTo]]" readonly required>
</div>
</div>
<input type="hidden" jsaction="time" id="limitDateCurr" value="[[currTime]]" readonly>
</div>
<div class="form-group">
... ...
... ... @@ -28,8 +28,10 @@
<div class="form-group">
<select id="sel-type" class="form-control" style="width:120px">
<option value="">选择类型</option>
<option value="0">专题</option>
<option value="1">有图</option>
<option value="1">频道</option>
<option value="2">专题</option>
<option value="3">邮件</option>
<option value="4">推广</option>
</select>
</div>
... ... @@ -44,7 +46,7 @@
</div>
<button type="submit" id="filter" class="btn btn-info">查询</button>
<button type="submit" id="all" class="btn btn-info">全部</button>
<a type="submit" href="" id="all" class="btn btn-info">全部</a>
<button type="submit" id="add" class="btn btn-info">新增</button>
</div>
... ... @@ -64,43 +66,45 @@
<script type="text/template" id="template">
<input type="text" hidden="true" id="id" value="[[id]]"/>
<div class="form-group">
<label for="type" class="col-sm-2 control-label">静态文件类型：</label>
<label for="fileType" class="col-sm-2 control-label">静态文件类型：</label>
<div class="col-sm-8">
<select class="form-control" value="[[adsImgSize]]" id="type">
<select class="form-control" value="[[fileType]]" id="fileType">
<option value="">选择类型</option>
<option value="10881088">1088X1088</option>
<option value="1088680">1088X680</option>
<option value="1088340">1088X340</option>
<option value="1">频道</option>
<option value="2">专题</option>
<option value="3">邮件</option>
<option value="4">推广</option>
</select>
</div>
</div>
<div class="form-group">
<label for="authorDesc" class="col-sm-2 control-label">页面标题：</label>
<label for="pageTitle" class="col-sm-2 control-label">页面标题：</label>
<div class="col-sm-10">
<input type="text" value="[[authorDesc]]" name="content" id="authorDesc" placeholder="页面标题" required="required" class="form-control">
<input type="text" value="[[pageTitle]]" name="pageTitle" id="pageTitle" placeholder="页面标题" required="required" class="form-control">
</div>
</div>
<div class="form-group">
<label for="authorDesc" class="col-sm-2 control-label">页面关键词：</label>
<label for="keyWord" class="col-sm-2 control-label">页面关键词：</label>
<div class="col-sm-10">
<input type="text" value="[[authorDesc]]" name="content" id="authorDesc" placeholder="页面关键词" required="required" class="form-control">
<input type="text" value="[[keyWord]]" name="keyWord" id="keyWord" placeholder="页面关键词" required="required" class="form-control">
</div>
</div>
<div class="form-group">
<label for="authorDesc" class="col-sm-2 control-label">页面介绍：</label>
<label for="pageDesc" class="col-sm-2 control-label">页面介绍：</label>
<div class="col-sm-10">
<input type="text" value="[[authorDesc]]" name="content" id="authorDesc" placeholder="页面介绍" required="required" class="form-control">
<input type="text" value="[[pageDesc]]" name="pageDesc" id="pageDesc" placeholder="页面介绍" required="required" class="form-control">
</div>
</div>
<div class="rows">
<label for="baidueditor" class="col-sm-2 control-label">内容：</label>
<script id="baidueditor" style="width: 100%;" name="content" type="text/plain"></script>
<label for="content" class="col-sm-2 control-label">内容：</label>
<script id="content" style="width: 100%;" name="content" type="text/plain"></script>
</div>
... ...