Authored by liuyue

Merge branch 'release/1.6' of git.dev.yoho.cn:platform/yohobuy-portal-fe into release/1.6

... ... @@ -89,7 +89,7 @@ gulp.task("buildjs",["js"],function(){
});
//发布静态资源
gulp.task('assets', function() {
gulp.src(public_dir + '/img/**')
gulp.src(public_dir + '/images/**')
.pipe(gulp.dest(dist_dir.image));
gulp.src(public_dir + '/fonts/*')
.pipe(gulp.dest(dist_dir.font));
... ...
var $=require('jquery');
(function(){
var editor = null;
UM.registerWidget('emotion',{
tpl: "<link type=\"text/css\" rel=\"stylesheet\" href=\"<%=emotion_url%>emotion.css\">" +
"<div class=\"edui-emotion-tab-Jpanel edui-emotion-wrapper\">" +
"<ul class=\"edui-emotion-Jtabnav edui-tab-nav\">" +
"<li class=\"edui-tab-item\"><a data-context=\".edui-emotion-Jtab0\" hideFocus=\"true\" class=\"edui-tab-text\"><%=lang_input_choice%></a></li>" +
"<li class=\"edui-tab-item\"><a data-context=\".edui-emotion-Jtab1\" class=\"edui-tab-text\"><%=lang_input_Tuzki%></a></li>" +
"<li class=\"edui-tab-item\"><a data-context=\".edui-emotion-Jtab2\" hideFocus=\"true\" class=\"edui-tab-text\"><%=lang_input_lvdouwa%></a></li>" +
"<li class=\"edui-tab-item\"><a data-context=\".edui-emotion-Jtab3\" hideFocus=\"true\" class=\"edui-tab-text\"><%=lang_input_BOBO%></a></li>" +
"<li class=\"edui-tab-item\"><a data-context=\".edui-emotion-Jtab4\" hideFocus=\"true\" class=\"edui-tab-text\"><%=lang_input_babyCat%></a></li>" +
"<li class=\"edui-tab-item\"><a data-context=\".edui-emotion-Jtab5\" hideFocus=\"true\" class=\"edui-tab-text\"><%=lang_input_bubble%></a></li>" +
"<li class=\"edui-tab-item\"><a data-context=\".edui-emotion-Jtab6\" hideFocus=\"true\" class=\"edui-tab-text\"><%=lang_input_youa%></a></li>" +
"<li class=\"edui-emotion-tabs\"></li>" +
"</ul>" +
"<div class=\"edui-tab-content edui-emotion-JtabBodys\">" +
"<div class=\"edui-emotion-Jtab0 edui-tab-pane\"></div>" +
"<div class=\"edui-emotion-Jtab1 edui-tab-pane\"></div>" +
"<div class=\"edui-emotion-Jtab2 edui-tab-pane\"></div>" +
"<div class=\"edui-emotion-Jtab3 edui-tab-pane\"></div>" +
"<div class=\"edui-emotion-Jtab4 edui-tab-pane\"></div>" +
"<div class=\"edui-emotion-Jtab5 edui-tab-pane\"></div>" +
"<div class=\"edui-emotion-Jtab6 edui-tab-pane\"></div>" +
"</div>" +
"<div class=\"edui-emotion-JtabIconReview edui-emotion-preview-box\">" +
"<img src=\"<%=cover_img%>\" class=\'edui-emotion-JfaceReview edui-emotion-preview-img\'/>" +
"</div>",
sourceData: {
emotion: {
tabNum:7, //切换面板数量
SmilmgName:{ 'edui-emotion-Jtab0':['j_00', 84], 'edui-emotion-Jtab1':['t_00', 40], 'edui-emotion-Jtab2':['w_00', 52], 'edui-emotion-Jtab3':['B_00', 63], 'edui-emotion-Jtab4':['C_00', 20], 'edui-emotion-Jtab5':['i_f', 50], 'edui-emotion-Jtab6':['y_00', 40] }, //图片前缀名
imageFolders:{ 'edui-emotion-Jtab0':'jx2/', 'edui-emotion-Jtab1':'tsj/', 'edui-emotion-Jtab2':'ldw/', 'edui-emotion-Jtab3':'bobo/', 'edui-emotion-Jtab4':'babycat/', 'edui-emotion-Jtab5':'face/', 'edui-emotion-Jtab6':'youa/'}, //图片对应文件夹路径
imageCss:{'edui-emotion-Jtab0':'jd', 'edui-emotion-Jtab1':'tsj', 'edui-emotion-Jtab2':'ldw', 'edui-emotion-Jtab3':'bb', 'edui-emotion-Jtab4':'cat', 'edui-emotion-Jtab5':'pp', 'edui-emotion-Jtab6':'youa'}, //图片css类名
imageCssOffset:{'edui-emotion-Jtab0':35, 'edui-emotion-Jtab1':35, 'edui-emotion-Jtab2':35, 'edui-emotion-Jtab3':35, 'edui-emotion-Jtab4':35, 'edui-emotion-Jtab5':25, 'edui-emotion-Jtab6':35}, //图片偏移
SmileyInfor:{
'edui-emotion-Jtab0':['Kiss', 'Love', 'Yeah', '啊!', '背扭', '顶', '抖胸', '88', '汗', '瞌睡', '鲁拉', '拍砖', '揉脸', '生日快乐', '大笑', '瀑布汗~', '惊讶', '臭美', '傻笑', '抛媚眼', '发怒', '打酱油', '俯卧撑', '气愤', '?', '吻', '怒', '胜利', 'HI', 'KISS', '不说', '不要', '扯花', '大心', '顶', '大惊', '飞吻', '鬼脸', '害羞', '口水', '狂哭', '来', '发财了', '吃西瓜', '套牢', '害羞', '庆祝', '我来了', '敲打', '晕了', '胜利', '臭美', '被打了', '贪吃', '迎接', '酷', '微笑', '亲吻', '调皮', '惊恐', '耍酷', '发火', '害羞', '汗水', '大哭', '', '加油', '困', '你NB', '晕倒', '开心', '偷笑', '大哭', '滴汗', '叹气', '超赞', '??', '飞吻', '天使', '撒花', '生气', '被砸', '吓傻', '随意吐'],
'edui-emotion-Jtab1':['Kiss', 'Love', 'Yeah', '啊!', '背扭', '顶', '抖胸', '88', '汗', '瞌睡', '鲁拉', '拍砖', '揉脸', '生日快乐', '摊手', '睡觉', '瘫坐', '无聊', '星星闪', '旋转', '也不行', '郁闷', '正Music', '抓墙', '撞墙至死', '歪头', '戳眼', '飘过', '互相拍砖', '砍死你', '扔桌子', '少林寺', '什么?', '转头', '我爱牛奶', '我踢', '摇晃', '晕厥', '在笼子里', '震荡'],
'edui-emotion-Jtab2':['大笑', '瀑布汗~', '惊讶', '臭美', '傻笑', '抛媚眼', '发怒', '我错了', 'money', '气愤', '挑逗', '吻', '怒', '胜利', '委屈', '受伤', '说啥呢?', '闭嘴', '不', '逗你玩儿', '飞吻', '眩晕', '魔法', '我来了', '睡了', '我打', '闭嘴', '打', '打晕了', '刷牙', '爆揍', '炸弹', '倒立', '刮胡子', '邪恶的笑', '不要不要', '爱恋中', '放大仔细看', '偷窥', '超高兴', '晕', '松口气', '我跑', '享受', '修养', '哭', '汗', '啊~', '热烈欢迎', '打酱油', '俯卧撑', '?'],
'edui-emotion-Jtab3':['HI', 'KISS', '不说', '不要', '扯花', '大心', '顶', '大惊', '飞吻', '鬼脸', '害羞', '口水', '狂哭', '来', '泪眼', '流泪', '生气', '吐舌', '喜欢', '旋转', '再见', '抓狂', '汗', '鄙视', '拜', '吐血', '嘘', '打人', '蹦跳', '变脸', '扯肉', '吃To', '吃花', '吹泡泡糖', '大变身', '飞天舞', '回眸', '可怜', '猛抽', '泡泡', '苹果', '亲', '', '骚舞', '烧香', '睡', '套娃娃', '捅捅', '舞倒', '西红柿', '爱慕', '摇', '摇摆', '杂耍', '招财', '被殴', '被球闷', '大惊', '理想', '欧打', '呕吐', '碎', '吐痰'],
'edui-emotion-Jtab4':['发财了', '吃西瓜', '套牢', '害羞', '庆祝', '我来了', '敲打', '晕了', '胜利', '臭美', '被打了', '贪吃', '迎接', '酷', '顶', '幸运', '爱心', '躲', '送花', '选择'],
'edui-emotion-Jtab5':['微笑', '亲吻', '调皮', '惊讶', '耍酷', '发火', '害羞', '汗水', '大哭', '得意', '鄙视', '困', '夸奖', '晕倒', '疑问', '媒婆', '狂吐', '青蛙', '发愁', '亲吻', '', '爱心', '心碎', '玫瑰', '礼物', '哭', '奸笑', '可爱', '得意', '呲牙', '暴汗', '楚楚可怜', '困', '哭', '生气', '惊讶', '口水', '彩虹', '夜空', '太阳', '钱钱', '灯泡', '咖啡', '蛋糕', '音乐', '爱', '胜利', '赞', '鄙视', 'OK'],
'edui-emotion-Jtab6':['男兜', '女兜', '开心', '乖乖', '偷笑', '大笑', '抽泣', '大哭', '无奈', '滴汗', '叹气', '狂晕', '委屈', '超赞', '??', '疑问', '飞吻', '天使', '撒花', '生气', '被砸', '口水', '泪奔', '吓傻', '吐舌头', '点头', '随意吐', '旋转', '困困', '鄙视', '狂顶', '篮球', '再见', '欢迎光临', '恭喜发财', '稍等', '我在线', '恕不议价', '库房有货', '货在路上']
}
}
},
initContent:function( _editor, $widget ){
var me = this,
emotion = me.sourceData.emotion,
lang = _editor.getLang( 'emotion' )['static'],
emotionUrl = UMEDITOR_CONFIG.UMEDITOR_HOME_URL + 'dialogs/emotion/',
options = $.extend( {}, lang, {
emotion_url: emotionUrl
}),
$root = me.root();
if( me.inited ) {
me.preventDefault();
this.switchToFirst();
return;
}
me.inited = true;
editor = _editor;
this.widget = $widget;
emotion.SmileyPath = _editor.options.emotionLocalization === true ? emotionUrl + 'images/' : "http://img.baidu.com/hi/";
emotion.SmileyBox = me.createTabList( emotion.tabNum );
emotion.tabExist = me.createArr( emotion.tabNum );
options['cover_img'] = emotion.SmileyPath + (editor.options.emotionLocalization ? '0.gif' : 'default/0.gif');
$root.html( $.parseTmpl( me.tpl, options ) );
me.tabs = $.eduitab({selector:".edui-emotion-tab-Jpanel"});
//缓存预览对象
me.previewBox = $root.find(".edui-emotion-JtabIconReview");
me.previewImg = $root.find(".edui-emotion-JfaceReview");
me.initImgName();
},
initEvent:function(){
var me = this;
//防止点击过后关闭popup
me.root().on('click', function(e){
return false;
});
//移动预览
me.root().delegate( 'td', 'mouseover mouseout', function( evt ){
var $td = $( this),
url = $td.attr('data-surl') || null;
if( url ) {
me[evt.type]( this, url , $td.attr('data-posflag') );
}
return false;
} );
//点击选中
me.root().delegate( 'td', 'click', function( evt ){
var $td = $( this),
realUrl = $td.attr('data-realurl') || null;
if( realUrl ) {
me.insertSmiley( realUrl.replace( /'/g, "\\'" ), evt );
}
return false;
} );
//更新模板
me.tabs.edui().on("beforeshow", function( evt ){
var contentId = $(evt.target).attr('data-context').replace( /^.*\.(?=[^\s]*$)/, '' );
evt.stopPropagation();
me.updateTab( contentId );
});
this.switchToFirst();
},
initImgName: function() {
var emotion = this.sourceData.emotion;
for ( var pro in emotion.SmilmgName ) {
var tempName = emotion.SmilmgName[pro],
tempBox = emotion.SmileyBox[pro],
tempStr = "";
if ( tempBox.length ) return;
for ( var i = 1; i <= tempName[1]; i++ ) {
tempStr = tempName[0];
if ( i < 10 ) tempStr = tempStr + '0';
tempStr = tempStr + i + '.gif';
tempBox.push( tempStr );
}
}
},
/**
* 切换到第一个tab
*/
switchToFirst: function(){
this.root().find(".edui-emotion-Jtabnav .edui-tab-text:first").trigger('click');
},
updateTab: function( contentBoxId ) {
var me = this,
emotion = me.sourceData.emotion;
me.autoHeight( contentBoxId );
if ( !emotion.tabExist[ contentBoxId ] ) {
emotion.tabExist[ contentBoxId ] = true;
me.createTab( contentBoxId );
}
},
autoHeight: function( ) {
this.widget.height(this.root() + 2);
},
createTabList: function( tabNum ) {
var obj = {};
for ( var i = 0; i < tabNum; i++ ) {
obj["edui-emotion-Jtab" + i] = [];
}
return obj;
},
mouseover: function( td, srcPath, posFlag ) {
posFlag -= 0;
$(td).css( 'backgroundColor', '#ACCD3C' );
this.previewImg.css( "backgroundImage", "url(" + srcPath + ")" );
posFlag && this.previewBox.addClass('edui-emotion-preview-left');
this.previewBox.show();
},
mouseout: function( td ) {
$(td).css( 'backgroundColor', 'transparent' );
this.previewBox.removeClass('edui-emotion-preview-left').hide();
},
insertSmiley: function( url, evt ) {
var obj = {
src: url
};
obj._src = obj.src;
editor.execCommand( 'insertimage', obj );
if ( !evt.ctrlKey ) {
//关闭预览
this.previewBox.removeClass('edui-emotion-preview-left').hide();
this.widget.edui().hide();
}
},
createTab: function( contentBoxId ) {
var faceVersion = "?v=1.1", //版本号
me = this,
$contentBox = this.root().find("."+contentBoxId),
emotion = me.sourceData.emotion,
imagePath = emotion.SmileyPath + emotion.imageFolders[ contentBoxId ], //获取显示表情和预览表情的路径
positionLine = 11 / 2, //中间数
iWidth = iHeight = 35, //图片长宽
iColWidth = 3, //表格剩余空间的显示比例
tableCss = emotion.imageCss[ contentBoxId ],
cssOffset = emotion.imageCssOffset[ contentBoxId ],
textHTML = ['<table border="1" class="edui-emotion-smileytable">'],
i = 0, imgNum = emotion.SmileyBox[ contentBoxId ].length, imgColNum = 11, faceImage,
sUrl, realUrl, posflag, offset, infor;
for ( ; i < imgNum; ) {
textHTML.push( '<tr>' );
for ( var j = 0; j < imgColNum; j++, i++ ) {
faceImage = emotion.SmileyBox[ contentBoxId ][i];
if ( faceImage ) {
sUrl = imagePath + faceImage + faceVersion;
realUrl = imagePath + faceImage;
posflag = j < positionLine ? 0 : 1;
offset = cssOffset * i * (-1) - 1;
infor = emotion.SmileyInfor[ contentBoxId ][i];
textHTML.push( '<td class="edui-emotion-' + tableCss + '" data-surl="'+ sUrl +'" data-realurl="'+ realUrl +'" data-posflag="'+ posflag +'" align="center">' );
textHTML.push( '<span>' );
textHTML.push( '<img style="background-position:left ' + offset + 'px;" title="' + infor + '" src="' + emotion.SmileyPath + (editor.options.emotionLocalization ? '0.gif" width="' : 'default/0.gif" width="') + iWidth + '" height="' + iHeight + '"></img>' );
textHTML.push( '</span>' );
} else {
textHTML.push( '<td bgcolor="#FFFFFF">' );
}
textHTML.push( '</td>' );
}
textHTML.push( '</tr>' );
}
textHTML.push( '</table>' );
textHTML = textHTML.join( "" );
$contentBox.html( textHTML );
},
createArr: function( tabNum ) {
var arr = [];
for ( var i = 0; i < tabNum; i++ ) {
arr[i] = 0;
}
return arr;
},
width:603,
height:400
});
})();
var $=require('jquery');
(function () {
var editor = null;
UM.registerWidget('formula', {
tpl: "<link type=\"text/css\" rel=\"stylesheet\" href=\"<%=formula_url%>formula.css\">" +
"<div class=\"edui-formula-wrapper\">" +
"<ul class=\"edui-tab-nav\"></ul>" +
"<div class=\"edui-tab-content\"></div>" +
"</div>",
sourceData: {
formula: {
'common': [
"{/}frac{ }{ }", "^{ }/_{ }", "x^{ }", "x_{ }", "x^{ }_{ }", "{/}bar{ }", "{/}sqrt{ }", "{/}nthroot{ }{ }",
"{/}sum^{ }_{n=}", "{/}sum", "{/}log_{ }", "{/}ln", "{/}int_{ }^{ }", "{/}oint_{ }^{ }"
],
'symbol': [
"+", "-", "{/}pm", "{/}times", "{/}ast", "{/}div", "/", "{/}bigtriangleup",
"=", "{/}ne", "{/}approx", ">", "<", "{/}ge", "{/}le", "{/}infty",
"{/}cap", "{/}cup", "{/}because", "{/}therefore", "{/}subset", "{/}supset", "{/}subseteq", "{/}supseteq",
"{/}nsubseteq", "{/}nsupseteq", "{/}in", "{/}ni", "{/}notin", "{/}mapsto", "{/}leftarrow", "{/}rightarrow",
"{/}Leftarrow", "{/}Rightarrow", "{/}leftrightarrow", "{/}Leftrightarrow"
],
'letter': [
"{/}alpha", "{/}beta", "{/}gamma", "{/}delta", "{/}varepsilon", "{/}varphi", "{/}lambda", "{/}mu",
"{/}rho", "{/}sigma", "{/}omega", "{/}Gamma", "{/}Delta", "{/}Theta", "{/}Lambda", "{/}Xi",
"{/}Pi", "{/}Sigma", "{/}Upsilon", "{/}Phi", "{/}Psi", "{/}Omega"
]
}
},
initContent: function (_editor, $widget) {
var me = this,
formula = me.sourceData.formula,
lang = _editor.getLang('formula').static,
formulaUrl = UMEDITOR_CONFIG.UMEDITOR_HOME_URL + 'dialogs/formula/',
options = $.extend({}, lang, { 'formula_url': formulaUrl }),
$root = me.root();
if (me.inited) {
me.preventDefault();
return;
}
me.inited = true;
editor = _editor;
me.$widget = $widget;
$root.html($.parseTmpl(me.tpl, options));
me.tabs = $.eduitab({selector: "#edui-formula-tab-Jpanel"});
/* 初始化popup的内容 */
var headHtml = [], xMax = 0, yMax = 0,
$tabContent = me.root().find('.edui-tab-content');
$.each(formula, function (k, v) {
var contentHtml = [];
$.each(v, function (i, f) {
contentHtml.push('<li class="edui-formula-latex-item" data-latex="' + f + '" style="background-position:-' + (xMax * 30) + 'px -' + (yMax * 30) + 'px"></li>');
if (++xMax >=8) {
++yMax; xMax = 0;
}
});
yMax++; xMax = 0;
$tabContent.append('<div class="edui-tab-pane"><ul>' + contentHtml.join('') + '</ul>');
headHtml.push('<li class="edui-tab-item"><a href="javascript:void(0);" class="edui-tab-text">' + lang['lang_tab_' + k] + '</a></li>');
});
headHtml.push('<li class="edui-formula-clearboth"></li>');
$root.find('.edui-tab-nav').html(headHtml.join(''));
$root.find('.edui-tab-content').append('<div class="edui-formula-clearboth"></div>');
/* 选中第一个tab */
me.switchTab(0);
},
initEvent: function () {
var me = this;
//防止点击过后关闭popup
me.root().on('click', function (e) {
return false;
});
//点击tab切换菜单
me.root().find('.edui-tab-nav').delegate('.edui-tab-item', 'click', function (evt) {
me.switchTab(this);
return false;
});
//点击选中公式
me.root().find('.edui-tab-pane').delegate('.edui-formula-latex-item', 'click', function (evt) {
var $item = $(this),
latex = $item.attr('data-latex') || '';
if (latex) {
me.insertLatex(latex.replace("{/}", "\\"));
}
me.$widget.edui().hide();
return false;
});
},
switchTab:function(index){
var me = this,
$root = me.root(),
index = $.isNumeric(index) ? index:$.inArray(index, $root.find('.edui-tab-nav .edui-tab-item'));
$root.find('.edui-tab-nav .edui-tab-item').removeClass('edui-active').eq(index).addClass('edui-active');
$root.find('.edui-tab-content .edui-tab-pane').removeClass('edui-active').eq(index).addClass('edui-active');
/* 自动长高 */
me.autoHeight(0);
},
autoHeight: function () {
this.$widget.height(this.root() + 2);
},
insertLatex: function (latex) {
editor.execCommand('formula', latex );
},
width: 350,
height: 400
});
})();
... ... @@ -247,13 +247,9 @@ $('#editProductName').on('click', function() {
// });
/*陈超*/
var ag = new common.grid({
el: "#attributeTable",
columns: [{
var common_columns=[{
display: "名称",
width:'10%',
name: "attributeName",
render: function(item) {
item.required = item.isMust == "Y" ? "required" : "";
... ... @@ -264,31 +260,31 @@ var ag = new common.grid({
}
return arr.join('');
}
}, {
}]
/*陈超*/
var ag = new common.grid({
el: "#attributeTable",
columns: common_columns.concat([{
display: "属性",
render: function(item) {
item.required = item.isMust == "Y" ? "required" : "";
// item.attributeValues=item.attributeValues.split(',').map(function(elem, index, arr){
// return {name:elem}
// });
var attrs = NETSALEDATA.productStandardRelationBoList;
if (attrs) {
for (var i in attrs) {
if (attrs[i].standardId == item.attributeId) {
item.val = attrs[i].standardVal;
item.val = attrs[i].parameterMakeId;
item.__val = attrs[i].parameterMakeId;
}
}
}
// item.attributeValues={name:};
item.__name="attributeTable";
return common.util.__template2($("#template33").html(), item);
}
}, {
display: "备注",
name: "remark"
}],
}]),
complete: function() {
ag.__edit.init();
}
... ... @@ -314,43 +310,24 @@ common.util.__ajax({
console.log("attributeProValuesBosOne", NETSALEDATA.attributeProValuesBosOne);
var ag2 = new common.grid({
el: "#goodsParamWrap",
columns: [{
display: "名称",
name: "attributeName",
render: function(item) {
item.required = item.isMust == "Y" ? "required" : "";
var arr = [];
arr.push(item.attributeName);
if (item.required) {
arr.push("<span class='red'>*</span>");
}
return arr.join('');
}
}, {
columns: common_columns.concat([{
display: "属性",
render: function(item) {
item.required = item.isMust == "Y" ? "required" : "";
item.id = item.parameterMakeId;
// item.attributeValues=item.attributeValues.split(',').map(function(elem, index, arr){
// return {name:elem}
// });
var attrs = NETSALEDATA.attributeProValuesBosOne;
if (attrs) {
for (var i in attrs) {
if (attrs[i].attributeId == item.attributeId) {
item.val = attrs[i].standardVal;
item.val = attrs[i].attributeValueId;
item.__val = attrs[i].attributeValueId.replace(/,/g, '|');
}
}
}
// item.attributeValues={name:};
item.__name="goodsParamWrap";
return common.util.__template2($("#template33").html(), item);
}
}, {
display: "备注",
name: "remark"
}],
}]),
complete: function() {
ag2.__edit.init();
}
... ... @@ -372,19 +349,64 @@ common.util.__ajax({
});
}, true);
// console.log(basicInfo);
var ag3 = new common.grid({
el: "#goodsParamWrap2",
columns: common_columns.concat([{
display: "属性",
render: function(item) {
item.required = item.isMust == "Y" ? "required" : "";
item.id = item.parameterMakeId;
var attrs = NETSALEDATA.specialAttrBo;
if (attrs&&attrs.materialList) {
var _arr=[];
for (var i in attrs.materialList) {
_arr.push(attrs.materialList[i].id);
}
item.__val = _arr.join('|');
}
item.__name="goodsParamWrap2";
return common.util.__template2($("#template33").html(), item);
}
}]),
complete: function() {
ag3.__edit.init();
}
});
ag3.__edit = new common.edit("#goodsParamWrap2");
common.util.__ajax({
url: '/base/goods/queryMaterialList',
data: {
categoryId: basicInfo.maxSortId
}
}, function(res) {
console.log("接口queryMaterialList",res.data);
ag3.init([res.data]);
}, true);
$(document).on("change", "#goodsParamWrap .attr_input", function() {
var item = ag2.rows[$(this).data("index")];
item.val = $(this).val();
});
$(document).on("change", "#goodsParamWrap .attr_checkobx_class", function() {
var item = ag2.rows[$(this).data("index")];
item.val = $("#attr_" + $(this).data("index")).val().replace(/\|/g, ',');
})
$(document).on("change", "#attributeTable .attr_input", function() {
var item = ag.rows[$(this).data("index")];
item.val = $(this).val();
});
$(document).on("change", "#goodsParamWrap .attr_checkobx_class", function() {
var item = ag2.rows[$(this).data("index")];
item.val = $("#goodsParamWrap_attr_" + $(this).data("index")).val().replace(/\|/g, ',');
})
$(document).on("change", "#goodsParamWrap2 .attr_checkobx_class", function() {
var item = ag3.rows[$(this).data("index")];
item.val = $("#goodsParamWrap2_attr_" + $(this).data("index")).val().replace(/\|/g, ',');
})
/*保存*/
GOLABDATA.on("TYgoodsParams", function() {
... ... @@ -393,18 +415,19 @@ GOLABDATA.on("TYgoodsParams", function() {
return ag.__edit.errMessage;
}
if (!ag2.__edit.validate(true)) {
return ag.__edit.errMessage;
return ag2.__edit.errMessage;
}
if (!ag3.__edit.validate(true)) {
return ag3.__edit.errMessage;
}
var productStandardRelationStr = [];
if (ag.rows.length > 0) {
for (var i in ag.rows) {
if (ag.rows[i].val) {
var arr = ag.rows[i].val.split('|');
var idNameList = ag.rows[i].idNameList;
for (var x in idNameList) {
for (var y in arr) {
if (arr[y] == idNameList[x].id) {
if (ag.rows[i].val == idNameList[x].id) {
productStandardRelationStr.push({
standardId: ag.rows[i].attributeId,
standardVal: idNameList[x].text,
... ... @@ -415,7 +438,6 @@ GOLABDATA.on("TYgoodsParams", function() {
}
}
}
}
data.productStandardRelationStr = JSON.stringify(productStandardRelationStr);
var goodsParamArr = [];
... ... @@ -433,8 +455,14 @@ GOLABDATA.on("TYgoodsParams", function() {
}
}
data.attributeProValuesOne = JSON.stringify(goodsParamArr);
data.productMaterial="";
if (ag3.rows.length > 0) {
data.productMaterial=ag3.rows[0].val;
}
data.productSkn = $('#productSkn').val();
console.log(data);
console.log("data",data);
return data;
});
... ...
.edui-popup-emotion .edui-emotion-jd img{
background:transparent url(images/jxface2.gif?v=1.1) no-repeat scroll left top;
cursor:pointer;width:35px;height:35px;display:block;
}
.edui-popup-emotion .edui-emotion-pp img{
background:transparent url(images/fface.gif?v=1.1) no-repeat scroll left top;
cursor:pointer;width:25px;height:25px;display:block;
}
.edui-popup-emotion .edui-emotion-ldw img{
background:transparent url(images/wface.gif?v=1.1) no-repeat scroll left top;
cursor:pointer;width:35px;height:35px;display:block;
}
.edui-popup-emotion .edui-emotion-tsj img{
background:transparent url(images/tface.gif?v=1.1) no-repeat scroll left top;
cursor:pointer;width:35px;height:35px;display:block;
}
.edui-popup-emotion .edui-emotion-cat img{
background:transparent url(images/cface.gif?v=1.1) no-repeat scroll left top;
cursor:pointer;width:35px;height:35px;display:block;
}
.edui-popup-emotion .edui-emotion-bb img{
background:transparent url(images/bface.gif?v=1.1) no-repeat scroll left top;
cursor:pointer;width:35px;height:35px;display:block;
}
.edui-popup-emotion .edui-emotion-youa img{
background:transparent url(images/yface.gif?v=1.1) no-repeat scroll left top;
cursor:pointer;width:35px;height:35px;display:block;
}
.edui-popup-emotion .edui-emotion-smileytable {
width: 100%;
border-spacing: 0;
border-collapse: collapse;
table-layout: fixed;
}
.edui-popup-emotion .edui-emotion-wrapper {
padding: 15px;
}
.edui-popup-emotion .edui-tab-nav{
height: auto;
*height: 31px;
}
.edui-popup-emotion .edui-emotion-tabs{
clear: both;
width: 0;
height: 0;
}
.edui-popup-emotion .edui-tab-content {
padding: 15px 0;
}
.edui-popup-emotion .edui-emotion-preview-box {
width:90px;
height:76px;
border:2px solid #9cb945;
background:#FFFFFF;
background-position:center;
background-repeat:no-repeat;
position: absolute;
top: 67px;
left: 494px;
display: none;
}
.edui-popup-emotion .edui-tab-text {
font-size: 12px;
}
.edui-popup-emotion .edui-emotion-preview-left {
left: 15px;
}
.edui-popup-emotion .edui-emotion-preview-img {
width: 100%;
height: 100%;
display: block;
background-repeat: no-repeat;
background-position: center center;
}
.edui-popup-formula .edui-formula-wrapper {
padding: 15px;
}
.edui-popup-formula .edui-formula-wrapper .edui-tab-nav{
height: auto;
*height: 31px;
}
.edui-popup-formula .edui-formula-wrapper .edui-tab-text {
font-size: 12px;
}
.edui-popup-formula .edui-formula-wrapper .edui-formula-clearboth {
clear: both;
width: 0;
height: 0;
}
.edui-popup-formula .edui-formula-wrapper .edui-tab-pane ul {
margin: 0px;
padding: 0px;
}
.edui-popup-formula .edui-formula-wrapper .edui-tab-content {
padding: 5px 0px 0px 0px;
}
.edui-popup-formula .edui-formula-wrapper .edui-tab-pane .edui-formula-latex-item {
display: block;
float: left;
margin: 0px 3px 3px 0px;
width: 30px;
height: 30px;
border:1px solid #cccccc;
background-image: url("images/formula.png");
cursor: pointer;
}
\ No newline at end of file
if (typeof seajs === 'undefined') {
/*
SeaJS - A Module Loader for the Web
v2.3.0 | seajs.org | MIT Licensed
*/
!function(a,b){function c(a){return function(b){return{}.toString.call(b)=="[object "+a+"]"}}function d(){return z++}function e(a){return a.match(C)[0]}function f(a){for(a=a.replace(D,"/"),a=a.replace(F,"$1/");a.match(E);)a=a.replace(E,"/");return a}function g(a){var b=a.length-1,c=a.charAt(b);return"#"===c?a.substring(0,b):".js"===a.substring(b-2)||a.indexOf("?")>0||"/"===c?a:a+".js"}function h(a){var b=u.alias;return b&&w(b[a])?b[a]:a}function i(a){var b=u.paths,c;return b&&(c=a.match(G))&&w(b[c[1]])&&(a=b[c[1]]+c[2]),a}function j(a){var b=u.vars;return b&&a.indexOf("{")>-1&&(a=a.replace(H,function(a,c){return w(b[c])?b[c]:a})),a}function k(a){var b=u.map,c=a;if(b)for(var d=0,e=b.length;e>d;d++){var f=b[d];if(c=y(f)?f(a)||a:a.replace(f[0],f[1]),c!==a)break}return c}function l(a,b){var c,d=a.charAt(0);if(I.test(a))c=a;else if("."===d)c=f((b?e(b):u.cwd)+a);else if("/"===d){var g=u.cwd.match(J);c=g?g[0]+a.substring(1):a}else c=u.base+a;return 0===c.indexOf("//")&&(c=location.protocol+c),c}function m(a,b){if(!a)return"";a=h(a),a=i(a),a=j(a),a=g(a);var c=l(a,b);return c=k(c)}function n(a){return a.hasAttribute?a.src:a.getAttribute("src",4)}function o(a,b,c){var d=K.createElement("script");if(c){var e=y(c)?c(a):c;e&&(d.charset=e)}p(d,b,a),d.async=!0,d.src=a,R=d,Q?P.insertBefore(d,Q):P.appendChild(d),R=null}function p(a,b,c){function d(){a.onload=a.onerror=a.onreadystatechange=null,u.debug||P.removeChild(a),a=null,b()}var e="onload"in a;e?(a.onload=d,a.onerror=function(){B("error",{uri:c,node:a}),d()}):a.onreadystatechange=function(){/loaded|complete/.test(a.readyState)&&d()}}function q(){if(R)return R;if(S&&"interactive"===S.readyState)return S;for(var a=P.getElementsByTagName("script"),b=a.length-1;b>=0;b--){var c=a[b];if("interactive"===c.readyState)return S=c}}function r(a){var b=[];return a.replace(U,"").replace(T,function(a,c,d){d&&b.push(d)}),b}function s(a,b){this.uri=a,this.dependencies=b||[],this.exports=null,this.status=0,this._waitings={},this._remain=0}if(!a.seajs){var t=a.seajs={version:"2.3.0"},u=t.data={},v=c("Object"),w=c("String"),x=Array.isArray||c("Array"),y=c("Function"),z=0,A=u.events={};t.on=function(a,b){var c=A[a]||(A[a]=[]);return c.push(b),t},t.off=function(a,b){if(!a&&!b)return A=u.events={},t;var c=A[a];if(c)if(b)for(var d=c.length-1;d>=0;d--)c[d]===b&&c.splice(d,1);else delete A[a];return t};var B=t.emit=function(a,b){var c=A[a],d;if(c){c=c.slice();for(var e=0,f=c.length;f>e;e++)c[e](b)}return t},C=/[^?#]*\//,D=/\/\.\//g,E=/\/[^/]+\/\.\.\//,F=/([^:/])\/+\//g,G=/^([^/:]+)(\/.+)$/,H=/{([^{]+)}/g,I=/^\/\/.|:\//,J=/^.*?\/\/.*?\//,K=document,L=location.href&&0!==location.href.indexOf("about:")?e(location.href):"",M=K.scripts,N=K.getElementById("seajsnode")||M[M.length-1],O=e(n(N)||L);t.resolve=m;var P=K.head||K.getElementsByTagName("head")[0]||K.documentElement,Q=P.getElementsByTagName("base")[0],R,S;t.request=o;var T=/"(?:\\"|[^"])*"|'(?:\\'|[^'])*'|\/\*[\S\s]*?\*\/|\/(?:\\\/|[^\/\r\n])+\/(?=[^\/])|\/\/.*|\.\s*require|(?:^|[^$])\brequire\s*\(\s*(["'])(.+?)\1\s*\)/g,U=/\\\\/g,V=t.cache={},W,X={},Y={},Z={},$=s.STATUS={FETCHING:1,SAVED:2,LOADING:3,LOADED:4,EXECUTING:5,EXECUTED:6};s.prototype.resolve=function(){for(var a=this,b=a.dependencies,c=[],d=0,e=b.length;e>d;d++)c[d]=s.resolve(b[d],a.uri);return c},s.prototype.load=function(){var a=this;if(!(a.status>=$.LOADING)){a.status=$.LOADING;var c=a.resolve();B("load",c);for(var d=a._remain=c.length,e,f=0;d>f;f++)e=s.get(c[f]),e.status<$.LOADED?e._waitings[a.uri]=(e._waitings[a.uri]||0)+1:a._remain--;if(0===a._remain)return a.onload(),b;var g={};for(f=0;d>f;f++)e=V[c[f]],e.status<$.FETCHING?e.fetch(g):e.status===$.SAVED&&e.load();for(var h in g)g.hasOwnProperty(h)&&g[h]()}},s.prototype.onload=function(){var a=this;a.status=$.LOADED,a.callback&&a.callback();var b=a._waitings,c,d;for(c in b)b.hasOwnProperty(c)&&(d=V[c],d._remain-=b[c],0===d._remain&&d.onload());delete a._waitings,delete a._remain},s.prototype.fetch=function(a){function c(){t.request(g.requestUri,g.onRequest,g.charset)}function d(){delete X[h],Y[h]=!0,W&&(s.save(f,W),W=null);var a,b=Z[h];for(delete Z[h];a=b.shift();)a.load()}var e=this,f=e.uri;e.status=$.FETCHING;var g={uri:f};B("fetch",g);var h=g.requestUri||f;return!h||Y[h]?(e.load(),b):X[h]?(Z[h].push(e),b):(X[h]=!0,Z[h]=[e],B("request",g={uri:f,requestUri:h,onRequest:d,charset:u.charset}),g.requested||(a?a[g.requestUri]=c:c()),b)},s.prototype.exec=function(){function a(b){return s.get(a.resolve(b)).exec()}var c=this;if(c.status>=$.EXECUTING)return c.exports;c.status=$.EXECUTING;var e=c.uri;a.resolve=function(a){return s.resolve(a,e)},a.async=function(b,c){return s.use(b,c,e+"_async_"+d()),a};var f=c.factory,g=y(f)?f(a,c.exports={},c):f;return g===b&&(g=c.exports),delete c.factory,c.exports=g,c.status=$.EXECUTED,B("exec",c),g},s.resolve=function(a,b){var c={id:a,refUri:b};return B("resolve",c),c.uri||t.resolve(c.id,b)},s.define=function(a,c,d){var e=arguments.length;1===e?(d=a,a=b):2===e&&(d=c,x(a)?(c=a,a=b):c=b),!x(c)&&y(d)&&(c=r(""+d));var f={id:a,uri:s.resolve(a),deps:c,factory:d};if(!f.uri&&K.attachEvent){var g=q();g&&(f.uri=g.src)}B("define",f),f.uri?s.save(f.uri,f):W=f},s.save=function(a,b){var c=s.get(a);c.status<$.SAVED&&(c.id=b.id||a,c.dependencies=b.deps||[],c.factory=b.factory,c.status=$.SAVED,B("save",c))},s.get=function(a,b){return V[a]||(V[a]=new s(a,b))},s.use=function(b,c,d){var e=s.get(d,x(b)?b:[b]);e.callback=function(){for(var b=[],d=e.resolve(),f=0,g=d.length;g>f;f++)b[f]=V[d[f]].exec();c&&c.apply(a,b),delete e.callback},e.load()},t.use=function(a,b){return s.use(a,b,u.cwd+"_use_"+d()),t},s.define.cmd={},a.define=s.define,t.Module=s,u.fetchedList=Y,u.cid=d,t.require=function(a){var b=s.get(s.resolve(a));return b.status<$.EXECUTING&&(b.onload(),b.exec()),b.exports},u.base=O,u.dir=O,u.cwd=L,u.charset="utf-8",t.config=function(a){for(var b in a){var c=a[b],d=u[b];if(d&&v(d))for(var e in c)d[e]=c[e];else x(d)?c=d.concat(c):"base"===b&&("/"!==c.slice(-1)&&(c+="/"),c=l(c)),u[b]=c}return B("config",a),t}}}(this);
/*! Seajs-css 1.0.4 */
!function(){function a(a){return function(b){return{}.toString.call(b)=="[object "+a+"]"}}function b(a){return"[object Function]"=={}.toString.call(a)}function c(a,c,e){var f=u.test(a),g=r.createElement(f?"link":"script");if(e){var h=b(e)?e(a):e;h&&(g.charset=h)}d(g,c,f,a),f?(g.rel="stylesheet",g.href=a):(g.async=!0,g.src=a),p=g,t?s.insertBefore(g,t):s.appendChild(g),p=null}function d(a,b,c,d){function f(){a.onload=a.onerror=a.onreadystatechange=null,c||seajs.data.debug||s.removeChild(a),a=null,b()}var g="onload"in a;return!c||!v&&g?(g?(a.onload=f,a.onerror=function(){seajs.emit("error",{uri:d,node:a}),f()}):a.onreadystatechange=function(){/loaded|complete/.test(a.readyState)&&f()},void 0):(setTimeout(function(){e(a,b)},1),void 0)}function e(a,b){var c,d=a.sheet;if(v)d&&(c=!0);else if(d)try{d.cssRules&&(c=!0)}catch(f){"NS_ERROR_DOM_SECURITY_ERR"===f.name&&(c=!0)}setTimeout(function(){c?b():e(a,b)},20)}function f(a){return a.match(x)[0]}function g(a){for(a=a.replace(y,"/"),a=a.replace(A,"$1/");a.match(z);)a=a.replace(z,"/");return a}function h(a){var b=a.length-1,c=a.charAt(b);return"#"===c?a.substring(0,b):".js"===a.substring(b-2)||a.indexOf("?")>0||".css"===a.substring(b-3)||"/"===c?a:a+".js"}function i(a){var b=w.alias;return b&&q(b[a])?b[a]:a}function j(a){var b,c=w.paths;return c&&(b=a.match(B))&&q(c[b[1]])&&(a=c[b[1]]+b[2]),a}function k(a){var b=w.vars;return b&&a.indexOf("{")>-1&&(a=a.replace(C,function(a,c){return q(b[c])?b[c]:a})),a}function l(a){var c=w.map,d=a;if(c)for(var e=0,f=c.length;f>e;e++){var g=c[e];if(d=b(g)?g(a)||a:a.replace(g[0],g[1]),d!==a)break}return d}function m(a,b){var c,d=a.charAt(0);if(D.test(a))c=a;else if("."===d)c=g((b?f(b):w.cwd)+a);else if("/"===d){var e=w.cwd.match(E);c=e?e[0]+a.substring(1):a}else c=w.base+a;return 0===c.indexOf("//")&&(c=location.protocol+c),c}function n(a,b){if(!a)return"";a=i(a),a=j(a),a=k(a),a=h(a);var c=m(a,b);return c=l(c)}function o(a){return a.hasAttribute?a.src:a.getAttribute("src",4)}var p,q=a("String"),r=document,s=r.head||r.getElementsByTagName("head")[0]||r.documentElement,t=s.getElementsByTagName("base")[0],u=/\.css(?:\?|$)/i,v=+navigator.userAgent.replace(/.*(?:AppleWebKit|AndroidWebKit)\/?(\d+).*/i,"$1")<536;seajs.request=c;var w=seajs.data,x=/[^?#]*\//,y=/\/\.\//g,z=/\/[^/]+\/\.\.\//,A=/([^:/])\/+\//g,B=/^([^/:]+)(\/.+)$/,C=/{([^{]+)}/g,D=/^\/\/.|:\//,E=/^.*?\/\/.*?\//,r=document,F=location.href&&0!==location.href.indexOf("about:")?f(location.href):"",G=r.scripts,H=r.getElementById("seajsnode")||G[G.length-1];f(o(H)||F),seajs.resolve=n,define("seajs/seajs-css/1.0.4/seajs-css",[],{})}();
}
if (typeof g_spm_init === 'undefined') {
(function() {
var cache = [];
var timer = null;
g_spm_init = function(entry) {
cache.push(entry);
timer && clearTimeout(timer);
timer = setTimeout(init, 100);
};
function init() {
var entry = cache.shift();
if (entry) {
seajs.use(entry, init);
}
}
})();
}
... ... @@ -17,13 +17,13 @@ var config = {
// domain:'http://172.16.6.240:8088/platform',// 王书生
// domain: 'http://172.16.6.124:8088/platform',//陈超
//http://172.16.6.124:8088/platform/product/queryAllProductAttr
//domain: 'http://172.16.6.227:8088/platform', //玛丽
// domain: 'http://172.16.6.227:8088/platform', //玛丽
// domain: 'http://192.168.102.202:8088/platform',
//domain:'http://172.16.6.197:8080/yohobuy-platform-web',//葛超
domain: 'http://192.168.102.202:8088/platform',
// domain: 'http://192.168.102.202:8088/platform',
//domain:'http://172.16.9.8:8080/yohobuy-platform-web',//葛超
// domain: 'http://192.168.102.202:8088/platform',
//domain:'http://172.16.9.8:8080/yohobuy-platform-web',//葛超
domain: 'http://192.168.102.202:8088/platform',
//domain: 'http://172.16.6.239:8080', //孙杰翔
loggers: {
api: {
... ...
... ... @@ -166,7 +166,8 @@ exports.res = [{ //基础商品列表
url: '/productColor/queryProductColors',
data: {
pageTitle: "创建基础商品",
action: "/base/goods/ajax/add"
action: "/base/goods/ajax/add",
btnText:"提交审核"
},
src: '/basegoods/edit'
}, { //添加接口
... ... @@ -265,7 +266,8 @@ exports.res = [{ //基础商品列表
src: '/basegoods/edit',
data: {
pageTitle: "修改基础商品",
action: "/base/goods/ajax/update"
action: "/base/goods/ajax/update",
btnText:"保存"
}
}, { //删除
route: '/base/goods/ajax/delete',
... ... @@ -493,6 +495,15 @@ exports.res = [{ //基础商品列表
}
]
}, {
route: '/base/goods/queryMaterialList',
method: 'POST',
url: '/product/queryMaterialList',
params: [{
name: 'categoryId',
type: 'Number'
}
]
},{
route: '/goods/query/querySortBySmallSort',
method: 'POST',
url: '/product/querySortBySmallSort',
... ...
... ... @@ -334,6 +334,9 @@ exports.res = [{
}, {
name: 'productStandardRelationStr',
type: 'string'
},{
name: 'productMaterial',
type: 'string'
}]
}, {
//网销信息 -> 保存基本信息接口
... ... @@ -701,6 +704,193 @@ exports.res = [{
name: 'brandId',
type: 'Number'
}]
},
//***********************************陶雨*******************************
{
//保存搜索顺序
route: '/netSale/saveSearchSort',
method: 'POST',
url: '/product/saveSearchSort',
params: [{
name: 'searchSortList',
type: 'string'
}]
}, {
//查找热搜词
route: '/netSale/queryHotSearchTerms',
method: 'POST',
url: '/searchWords/queryHotSearchTerms',
params: [{
name: 'page',
type: 'number'
}, {
name: 'size',
type: 'number',
def: 10
}]
}, {
//查找洗涤提示
route: '/netSale/getAll4Select',
method: 'POST',
url: '/washTips/getAll4Select/',
params: []
}, {
//查找材质参数
route: '/netSale/queryAllBySortId4Select',
method: 'POST',
url: '/productMaterial/queryAllBySortId4Select',
params: [{
name: 'param',
type: 'number'
}]
}, {
//查找所有商品参数信息 //暂时没用
route: '/netSale/queryAllGoodsParams',
method: 'POST',
apis: {
washTipsList: {
url: '/washTips/getAll4Select/'
},
materialList: {
url: 'productMaterial/queryAllBySortId4Select',
params: [{
name: 'param',
type: 'number'
}],
isJsonRaw: true
}
}
}, {
//保存搜索关键词
route: '/netSale/saveNetSaleSearchKeys',
method: 'POST',
url: '/product/saveNetSaleSearchKeys',
params: [{
name: 'productSkn',
type: 'number'
}, {
name: 'searchKeys',
type: 'string'
}]
}, {
//保存商品参数
route: '/netSale/saveProductParam',
method: 'POST',
url: '/product/saveProductParam',
params: [{
name: 'productSkn',
type: 'number'
}, {
name: 'attributeProValuesOne',
type: 'string'
}, {
name: 'productStandardRelationStr',
type: 'string'
},{
name: 'productMaterial',
type: 'string'
}]
},
//************************************weiqingting**********************
//商品描述
{
route: '/netSale/saveProductDesc',
method: 'POST',
url: '/product/saveProductDesc',
params: [{
name: 'productSkn',
type: 'Number'
}, {
name: 'productDesc',
type: 'String'
}]
},
//小编推荐
{
route: '/netSale/saveNetSaleRecommend',
method: 'POST',
url: '/product/saveNetSaleRecommend',
params: [{
name: 'productSkn',
type: 'Number'
}, {
name: 'recommend',
type: 'String'
}]
},
{ //查询搭配列表
route: "/netSale/selectCollocationListBySkn",
method: 'POST',
url: '/collocation/selectCollocationListBySkn',
params: [{
name: 'productSkn',
type: 'Number'
}, {
name: 'page',
type: 'Number'
}, {
name: 'size',
type: 'Number'
}]
}, { //获取单个商品搭配信息
route: '/netSale/selectCollocationById',
method: 'POST',
url: '/collocation/selectCollocationById',
params: [{
name: 'param',
type: 'Number'
}]
}, { //添加单个搭配
route: '/netSale/insertCollocation',
method: 'POST',
url: '/collocation/insertCollocation',
params: [{
name: 'productSkn',
type: 'Number'
}, {
name: 'imageUrl',
type: 'String'
}, {
name: 'content',
type: 'String'
}, {
name: 'infoStr',
type: 'String'
}]
}, { //更新单个搭配
route: '/netSale/updateCollocation',
method: 'POST',
url: '/collocation/updateCollocation',
params: [{
name: 'id',
type: 'Number'
}, {
name: 'imageUrl',
type: 'String'
}, {
name: 'content',
type: 'String'
}, {
name: 'infoStr',
type: 'String'
}]
}, { //删除单个搭配
route: '/netSale/delCollocationById',
method: 'POST',
url: '/collocation/delCollocationById',
params: [{
name: 'param',
type: 'Number'
}]
}, { //单独维护封面信息
//http://172.16.6.227:8083/yohobuy-platform-web/product/manageProductImg
route: '/netSale/manageProductImg',
method: 'POST',
url: '/product/manageProductImg',
params: [{
name: 'goodsImagesReq',
type: 'string'
}]
}
];
\ No newline at end of file
... ...
exports.domain = require('../config/common.js').domain;
//exports.domain = "http://172.16.6.227:8088/platform/";
//exports.domain = 'http://172.16.6.227:8088/platform'; //马力
exports.res = [{
//保存搜索顺序
route: '/netSale/saveSearchSort',
method: 'POST',
url: '/product/saveSearchSort',
params: [{
name: 'searchSortList',
type: 'string'
}]
}, {
//查找热搜词
route: '/netSale/queryHotSearchTerms',
method: 'POST',
url: '/searchWords/queryHotSearchTerms',
params: [{
name: 'page',
type: 'number'
}, {
name: 'size',
type: 'number',
def: 10
}]
}, {
//查找洗涤提示
route: '/netSale/getAll4Select',
method: 'POST',
url: '/washTips/getAll4Select/',
params: []
}, {
//查找材质参数
route: '/netSale/queryAllBySortId4Select',
method: 'POST',
url: '/productMaterial/queryAllBySortId4Select',
params: [{
name: 'param',
type: 'number'
}]
}, {
//查找所有商品参数信息 //暂时没用
route: '/netSale/queryAllGoodsParams',
method: 'POST',
apis: {
washTipsList: {
url: '/washTips/getAll4Select/'
},
materialList: {
url: 'productMaterial/queryAllBySortId4Select',
params: [{
name: 'param',
type: 'number'
}],
isJsonRaw: true
}
}
}, {
//保存搜索关键词
route: '/netSale/saveNetSaleSearchKeys',
method: 'POST',
url: '/product/saveNetSaleSearchKeys',
params: [{
name: 'productSkn',
type: 'number'
}, {
name: 'searchKeys',
type: 'string'
}]
}, {
//保存商品参数
route: '/netSale/saveProductParam',
method: 'POST',
url: '/product/saveProductParam',
params: [{
name: 'productSkn',
type: 'number'
}, {
name: 'attributeProValuesOne',
type: 'string'
}, {
name: 'productStandardRelationStr',
type: 'string'
}]
}];
\ No newline at end of file
exports.domain = require('../config/common.js').domain;
//exports.domain = 'http://172.16.6.227:8083/yohobuy-platform-web';
exports.res = [
//商品描述
{
route: '/netSale/saveProductDesc',
method: 'POST',
url: '/product/saveProductDesc',
params: [{
name: 'productSkn',
type: 'Number'
}, {
name: 'productDesc',
type: 'String'
}]
},
//小编推荐
{
route: '/netSale/saveNetSaleRecommend',
method: 'POST',
url: '/product/saveNetSaleRecommend',
params: [{
name: 'productSkn',
type: 'Number'
}, {
name: 'recommend',
type: 'String'
}]
},
{ //查询搭配列表
route: "/netSale/selectCollocationListBySkn",
method: 'POST',
url: '/collocation/selectCollocationListBySkn',
params: [{
name: 'productSkn',
type: 'Number'
}, {
name: 'page',
type: 'Number'
}, {
name: 'size',
type: 'Number'
}]
}, { //获取单个商品搭配信息
route: '/netSale/selectCollocationById',
method: 'POST',
url: '/collocation/selectCollocationById',
params: [{
name: 'param',
type: 'Number'
}]
}, { //添加单个搭配
route: '/netSale/insertCollocation',
method: 'POST',
url: '/collocation/insertCollocation',
params: [{
name: 'productSkn',
type: 'Number'
}, {
name: 'imageUrl',
type: 'String'
}, {
name: 'content',
type: 'String'
}, {
name: 'infoStr',
type: 'String'
}]
}, { //更新单个搭配
route: '/netSale/updateCollocation',
method: 'POST',
url: '/collocation/updateCollocation',
params: [{
name: 'id',
type: 'Number'
}, {
name: 'imageUrl',
type: 'String'
}, {
name: 'content',
type: 'String'
}, {
name: 'infoStr',
type: 'String'
}]
}, { //删除单个搭配
route: '/netSale/delCollocationById',
method: 'POST',
url: '/collocation/delCollocationById',
params: [{
name: 'param',
type: 'Number'
}]
}, { //单独维护封面信息
//http://172.16.6.227:8083/yohobuy-platform-web/product/manageProductImg
route: '/netSale/manageProductImg',
method: 'POST',
url: '/product/manageProductImg',
params: [{
name: 'goodsImagesReq',
type: 'string'
}]
}
];
\ No newline at end of file
... ... @@ -64,7 +64,7 @@
<div class="row">
<div class="col-sm-8 col-sm-offset-2">
<a class="btn btn-default" href="/supplier/baseproduct/index">取消</a>
<button type="submit" class="btn btn-success mr5" data-loading-text="保存中..." id="btnReview">保存</button>
<button type="submit" class="btn btn-success mr5" data-loading-text="保存中..." id="btnReview">{{btnText}}</button>
</div>
</div>
</div>
... ...
... ... @@ -6,10 +6,15 @@
</div>
<h2 class="panel-title">商品参数</h2>
</div>
<div class="panel-body">
<div id="attributeTable" class="panel-body nopadding">
</div>
<div id="goodsParamWrap" class="panel-body nopadding">
</div>
<div id="attributeTable" class="panel-body nopadding">
<div id="goodsParamWrap2" class="panel-body nopadding">
</div>
</div>
<div class="panel-footer" id="goodsParams-footer">
<a href="javascript:;" class="btn btn-primary" id="propertySave">保存</a>
</div>
... ... @@ -67,17 +72,17 @@
[[if inputType=='checkbox']]
[[each idNameList as item index ]]
<label class="radio-inline">
<input type="checkbox" name="attr_[[__index]]" data-index=[[__index]] class="attr_checkobx_class" value="[[item.id]]">[[item.text]]</label>
<input type="checkbox" name="[[__name]]_attr_[[__index]]" data-index=[[__index]] class="attr_checkobx_class" value="[[item.id]]">[[item.text]]</label>
[[/each]]
<input type="hidden" id="attr_[[__index]]" value="[[__val||'']]" [[required]] for="checkbox" placeholder="[[attributeName]]"/>
<input type="hidden" id="[[__name]]_attr_[[__index]]" value="[[__val||'']]" [[required]] for="checkbox" placeholder="[[attributeName]]"/>
[[/if]]
[[if inputType=='radio']]
[[each idNameList as item index ]]
<label class="radio-inline">
<input type="radio" name="attr_[[__index]]" data-index=[[__index]] class="attr_input" value="[[item.id]]">[[item.text]]</label>
<input type="radio" name="[[__name]]_attr_[[__index]]" data-index=[[__index]] class="attr_input" value="[[item.id]]">[[item.text]]</label>
[[/each]]
<input type="hidden" id="attr_[[__index]]" data-index='[[__index]]' value="[[__val||'']]" [[required]] for="radio" placeholder="[[attributeName]]" />
<input type="hidden" id="[[__name]]_attr_[[__index]]" data-index='[[__index]]' value="[[__val||'']]" [[required]] for="radio" placeholder="[[attributeName]]" />
[[/if]]
[[if inputType=='select']]
... ...