fe / yohobuy-portal-fe · Commits

Go to a project

Authored by weiqingting
Commit 173453f1356cf595faafd9078711b4a5e647a8d5 1 parent c3763cb2

tijiao

Inline Side-by-side
Showing 9 changed files with 153 additions and 138 deletions
... ... @@ -364,6 +364,82 @@ var $=require('jquery');
}
};
var Product={
init: function (editor, $w) {
var me = this;
me.editor = editor;
me.dialog = $w;
me.initEvt();
},
initEvt: function () {
var me = this,
$ele = $(".edui-image-product .edui-image-content", me.dialog);
$.ajax({
url:"/goods/productPhoto/queryProductPhotoList",
data:{
productSkn:$('#productSkn').val()
},
dataType: 'json',
method:'post',
success:function(res){
var data = res.data;
if (res.code == 200 && data.data.list instanceof Array && data.data.list[0].pictureBoList instanceof Array) {
$.each(data.data.list[0].pictureBoList, function(i, value) {
var url=value.fileName;
if (url) {
// url+="?imageView/0/w/120/h/90";
$("<img src='" + url + "' class='edui-image-pic' />").on("load", function () {
var $item = $("<div class='edui-image-item'><div class='edui-image-close'></div></div>").append(this);
$(".edui-image-product .edui-image-content", me.dialog).append($item);
Base.scale(this, 120);
$item.width(120);
Base.close($(this));
});
}
});
}
}
});
// url,
// $ele = $(".edui-image-searchTxt", me.dialog);
// $(".edui-image-searchAdd", me.dialog).on("click", function () {
// url = Base.checkURL($ele.val());
// if (url) {
// $("<img src='" + url + "' class='edui-image-pic' />").on("load", function () {
// var $item = $("<div class='edui-image-item'><div class='edui-image-close'></div></div>").append(this);
// $(".edui-image-searchRes", me.dialog).append($item);
// Base.scale(this, 120);
// $item.width($(this).width());
// Base.close($(this));
// $ele.val("");
// });
// }
// })
// .hover(function () {
// $(this).toggleClass("hover");
// });
}
}
var $tab = null,
currentDialog = null;
... ... @@ -372,6 +448,7 @@ var $=require('jquery');
"<ul class=\"edui-tab-nav\">" +
"<li class=\"edui-tab-item edui-active\"><a data-context=\".edui-image-local\" class=\"edui-tab-text\"><%=lang_tab_local%></a></li>" +
"<li class=\"edui-tab-item\"><a data-context=\".edui-image-JimgSearch\" class=\"edui-tab-text\"><%=lang_tab_imgSearch%></a></li>" +
"<li class=\"edui-tab-item\"><a data-context=\".edui-image-product\" class=\"edui-tab-text\">商品图片</a></li>" +
"</ul>" +
"<div class=\"edui-tab-content\">" +
"<div class=\"edui-image-local edui-tab-pane edui-active\">" +
... ... @@ -386,6 +463,12 @@ var $=require('jquery');
"</div>" +
"<div class=\"edui-image-searchRes\"></div>" +
"</div>" +
"<div class=\"edui-image-product edui-tab-pane\">" +
"<div class=\"edui-image-content\" ></div>" +
"</div>" +
"</div>" +
"</div>",
initContent: function (editor, $dialog) {
... ... @@ -414,6 +497,8 @@ var $=require('jquery');
Upload.init(editor, $w);
NetWork.init(editor, $w);
Product.init(editor, $w);
},
buttons: {
'ok': {
... ...
... ... @@ -63,8 +63,6 @@ if (NETSALEDATA && NETSALEDATA.baseProductInfo && NETSALEDATA.baseProductInfo.ba
require('./partials/basic-info');
require('./partials/editor_recommend');
require('./partials/model');
require('./partials/video.js');
//require('./partials/brand-relation');
require('./partials/add-info');
require('./partials/netsale-ty.js');
... ...
... ... @@ -347,7 +347,6 @@ function shelveModal(title, html) {
return;
}
console.log(g.selected);
$.each(selectedArr, function(i, value) {
productSknList.push(value['productSkn']);
});
... ... @@ -369,13 +368,26 @@ function shelveModal(title, html) {
var type = $(this).data('type');
$(this).closest('.form-group').find('input').attr('required', true)
.end().siblings('.form-group').find('input').attr('required', false);
e.submit('/goods/product/updateProductSknTimingInfo', function(option) {
option.data.productSknList = JSON.stringify(productSknList);
option.data.type = type;
option.success = function(res) {
if (res.data.code == 200) {
e.$tip(res.data.message, function() {
var data={};
data.productSknList = JSON.stringify(productSknList);
if($("#shelveTime").val()){
if(type=="1"){
data.shelveTime=$("#shelveTime").val();
data.type=3;
}else{
data.onNewTime=$("#shelveTime").val();
data.type=4;
}
}else{
data.type=type;
}
common.util.__ajax({
url:'/goods/product/updateProductSknTimingInfo',
data:data
},function(res){
if (res.code == 200) {
e.$tip(res.message, function() {
shelveLayer.close();
loadtab();
g.reload();
... ... @@ -383,13 +395,32 @@ function shelveModal(title, html) {
} else {
//e.$tip(res.data.message);
var html = '';
$.each(res.data.data, function(key, value) {
$.each(res.data, function(key, value) {
html += key + ':' + value + '<br>';
});
e.$tip(html);
}
}
});
});
// e.submit('/goods/product/updateProductSknTimingInfo', function(option) {
// option.data.productSknList = JSON.stringify(productSknList);
// option.data.type = type;
// option.success = function(res) {
// if (res.data.code == 200) {
// e.$tip(res.data.message, function() {
// shelveLayer.close();
// loadtab();
// g.reload();
// }, 'growl-success');
// } else {
// //e.$tip(res.data.message);
// var html = '';
// $.each(res.data.data, function(key, value) {
// html += key + ':' + value + '<br>';
// });
// e.$tip(html);
// }
// }
// });
});
}
//批量skn上架
... ... @@ -543,15 +574,28 @@ $(document).on("click", ".btnsku", function() {
$(document).on("change", ".wqt_checkbox,.wqt_all", function() {
var _count1 = 0,
_count2 = 0;
_count2 = 0,
_isAdvance0=0,
_isAdvance1=0;
$.each(g.selected, function(index, item) {
console.log(item.isAdvance);
/*添加兼容逻辑*/
if (item.status == 8 || item.status == 3 || item.status == 2 || item.status == 0) {
_count1++; //上
} else {
_count2++; //下
}
if(item.isAdvance=="N"){
_isAdvance0++;
}
if(item.isAdvance=="Y"){
_isAdvance1++;
}
});
if(_isAdvance0&&_isAdvance1){
return;
}
if (_count1 == g.selected.length) {
$('#onshelve').removeClass('disabled');
... ...
... ... @@ -362,7 +362,6 @@ $(document).on('click', '.btn-use-img', function() {
}, function(res) {
var data = res.data;
var imgHtml = '';
if (res.code == 200 && data.list instanceof Array && data.list[0].pictureBoList instanceof Array) {
$.each(data.list[0].pictureBoList, function(i, value) {
imgHtml += '<img class="use-img" src="' + value.fileName + '" alt="" width="100" height="140" data-index="' + index + '" style="cursor:pointer;margin: 0 0 10px 10px;" />';
... ... @@ -379,8 +378,8 @@ $(document).on('click', '.btn-use-img', function() {
//点击调用的图片添加封面图
$(document).on('click', '.use-img', function() {
var data = addFengmian($(this).data("index"), $(this).attr("src"));
$('.cover-image-list[data-index="' + $(this).data("index") + '"]').find(".cover-image-item:last").before(common.util.__template2($("#fenmianImgTemp").html(), data));
addFengmian($(this).data("index"), $(this).attr("src"));
renderGoodList();
uesImgDialog.close();
});
... ...
/*var $ = require('jquery'),
common = require('../../common/common');
var specialAttrBo = window.NETSALEDATA.specialAttrBo || {
productSkn: window.NETSALEDATA.baseProductInfo.baseProduct.productSkn,
washTipsList: [],
materialList: []
};
var washTipsList = specialAttrBo.washTipsList;
var materialList = specialAttrBo.materialList;
var e = new common.edit("#taoyu1");
common.util.__ajax({
url: '/netSale/queryAllBySortId4Select',
data: {
param: window.NETSALEDATA.baseProductInfo.baseProduct.maxSortId
}
}, function(res) {
$("#material-group").html(common.util.__template2($("#material-params").html(), res || {}));
var materials = [];
for (var i = 0; i < materialList.length; i++) {
materials[i] = materialList[i].id;
}
$("#material").val(materials.join("|"));
e.init();
$(document).on('change', '.material', function() {
var items = $("#material").val().split("|");
for (var i = 0; i < items.length; i++) {
materialList[i] = {
"id": parseInt(items[i])
};
}
});
});
common.util.__ajax({
url: '/netSale/getAll4Select',
data: {}
}, function(res) {
$("#washTip-group").html(common.util.__template2($("#washTip-params").html(), res || {}));
var washTips = [];
for (var i = 0; i < washTipsList.length; i++) {
washTips[i] = washTipsList[i].sortId;
}
$("#washTips").val(washTips.join("|"));
e.init();
$(document).on('change', '.washTips', function() {
var items = $("#washTips").val().split("|");
for (var i = 0; i < items.length; i++) {
washTipsList[i] = {
"sortId": parseInt(items[i])
};
}
});
}, true);
$("#propertySave").on('click', function() {
var washTips = $("#washTips").val() || "";
var productMaterial = $("#material").val() || "";
common.util.__ajax({
url: '/netSale/saveProductParam',
data: {
productSkn: specialAttrBo.productSkn,
washTips: washTips.replace(/\|/g, ","),
productMaterial: productMaterial.replace(/\|/g, ",")
}
}, function() {
// body...
});
});*/
\ No newline at end of file
'use strict';
var $ = require('jquery'),
common = require('../../common/common');
/*NETSALEEDIT.on('validate', function() {
var val = $.trim($('#videofile').attr('value'));
if (val == '') {
return '请上传视频'
}
return true;
});
var videoTemp = '<input id="videofile" name="videofile" type="file" bucket="goodsvideo" value="[[vedioUrl]]" extend="mp4,rmvb,avi,mov">',
videoHtml = common.util.__template2(videoTemp, NETSALEDATA.productExtBo);
$('.video-file-wrap').html(videoHtml);
$('#saveVideo').on('click', function() {
NETSALEEDIT.submit('/goods/product/saveNetSaleVideo', function(option) {
option.success = function(res) {
res = res.data;
if (res.code == '200') {
NETSALEEDIT.$tip(res.message, function() {}, 'growl-success');
} else {
NETSALEEDIT.$tip(res.message);
}
return false;
}
});
});*/
\ No newline at end of file
//exports.domain =require('../config/common.js').domain;
exports.domain =require('../config/common.js').domain;
//exports.domain ='http://172.16.6.250:8081/platform';//庞洁
exports.domain = 'http://172.16.6.225:8080/platform';
// exports.domain = 'http://172.16.6.225:8080/platform';
exports.res = [
//原 supplier
... ...
... ... @@ -87,8 +87,8 @@
<div class="panel-col">
<select name="gender" id="isAdvance" class="form-control height40">
<option value="-1">是否预售</option>
<option value="1">有</option>
<option value="0">无</option>
<option value="Y">有</option>
<option value="N">无</option>
</select>
</div>
... ... @@ -165,19 +165,16 @@
<form class="shelve-form form-horizontal form-bordered">
<div class="panel panel-default">
<div class="panel-body nopadding">
<div class="form-group">
<a class="btn btn-info" data-type="2" href="javascript:;">上架上新</a>
<a class="btn btn-info" data-type="1" href="javascript:;">上架不上新</a>
</div>
<div class="form-group">
<div class="col-sm-3 height40">预上架时间：</div>
<div class="col-sm-6"><input id="shelveTime" class="form-control" jsaction="time" type="text" placeholder="预上架时间" readonly></div>
<div class="col-sm-1"><a class="btn btn-info" data-type="3" href="javascript:;">确定</a></div>
<div class="col-sm-6"><input id="shelveTime" class="form-control" jsaction="time" type="text" placeholder="预上架时间" readonly>
<span class="red">预商家请填写时间</span>
</div>
</div>
<div class="form-group">
<div class="col-sm-3 height40">预上架上新时间：</div>
<div class="col-sm-6"><input id="onNewTime" class="form-control" jsaction="time" type="text" placeholder="预上架上新时间" readonly></div>
<div class="col-sm-1"><a class="btn btn-info" data-type="4" href="javascript:;">确定</a></div>
<a class="btn btn-info" data-type="2" href="javascript:;">上架上新</a>
<a class="btn btn-info" data-type="1" href="javascript:;">上架不上新</a>
</div>
<div class="form-group">
<div class="col-sm-2 height40">预售时间：</div>
... ...