fe / yohobuy-portal-fe · Commits

Go to a project

Authored by 王钱钧
Commit 7811be083cb75443cd2d36669e0158258db474ed 2 parents e9a464d3 c3a474a3

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

Inline Side-by-side
Showing 6 changed files with 125 additions and 163 deletions
... ... @@ -272,7 +272,7 @@ common.edit.ajaxfileupload(".fenmianfile", {
item.push(data);
goodsList[$(this).data("index")].goodsImagesList = item;
$(this).parents(".cover-image-item").before(common.util.__template2($("#fenmianImgTemp").html(), data));
$('#cover-color').append($($('#colorCoverTemp').html()));
$(this).parents(".form-group").next().find('.cover-color').append($($('#colorCoverTemp').html()));
} else {
common.util.__tip(response.message);
}
... ... @@ -280,8 +280,8 @@ common.edit.ajaxfileupload(".fenmianfile", {
});
$('#cover-color').on("click", ".btn-metro", function() {
var index = $(this).parents(".form-group").siblings().find('.cover-image-list').data("index");
$('.cover-color').on("click", ".btn-metro", function() {
var index = $(this).parents(".form-group").prev().find('.cover-image-list').data("index");
var index1 = $(this).parents(".cover-color-box").index();
var item = goodsList[index].goodsImagesList[index1];
var $groups = $(this).parents(".cover-color-box");
... ... @@ -290,7 +290,7 @@ $('#cover-color').on("click", ".btn-metro", function() {
if ($(this).hasClass('info')) {
$(this).removeClass('info');
} else {
$('.cover-color-box').each(function() {
$groups.siblings('.cover-color-box').each(function() {
$(this).find('.btn-metro').eq(colorIndex).removeClass('info');
});
... ... @@ -313,6 +313,7 @@ $(document).on("click", ".goods-color a", function() {
if ($(this).hasClass("info")) {
$(this).removeClass("info");
} else {
$('.goods-color a').removeClass("info");
$(this).addClass("info");
}
item.isDefault = $(this).hasClass("info") ? "Y" : "N";
... ...
var $ = require('jquery'),
common = require('../../common/common');
var searchKeys = window.NETSALEDATA.productExtBo.searchKeys || "";
$("#searchKeys").val(searchKeys);
var g = new common.grid({
el: "#search-key",
hash: false,
columns: [{
display: "ID",
name: "id"
}, {
display: "内容",
name: "content"
}, {
display: "操作",
name: "",
render: function(item) {
return '<a class="btn btn-info add" data-index="' + item.__index + '">添加</a>';
}
}]
});
g.init('/netSale/queryHotSearchTerms');
$("#searchKeys").on('change', function() {
searchKeys = $("#searchKeys").val();
});
$(document).on('click', '.add', function() {
var item = g.rows[$(this).data("index")];
var value = $("#searchKeys").val();
if (value) value += ",";
$("#searchKeys").val(value + item.content);
searchKeys = $("#searchKeys").val();
});
$("#save-searchKey").on('click', function() {
common.util.__ajax({
url: '/netSale/saveNetSaleSearchKeys',
data: {
productSkn: window.NETSALEDATA.baseProductInfo.baseProduct.productSkn,
searchKeys: searchKeys
}
}, function(res) {
});
});
\ No newline at end of file
... ... @@ -50,7 +50,7 @@ var $ = require('jquery'),
var Bll = {
toast:function(url, item, hint) {
var e = new common.edit("#baseform");
var e = new common.edit("#baseform", {bucket: "yhb-img01"});
common.dialog.confirm(hint,
common.util.__template($("#template").html(), item),
... ...
... ... @@ -16,8 +16,8 @@ var config = {
// domain: 'http://172.16.6.240:8088/platform',
// domain:'http://172.16.6.240:8088/platform',//王书生
// domain: 'http://172.16.6.252:9080',//陈超
domain:'http://172.16.6.227:8088/platform',//玛丽
// domain: 'http://192.168.102.202:8088/platform',
//domain: 'http://172.16.6.227:8088/platform', //玛丽
domain: 'http://192.168.102.202:8088/platform',
loggers: {
api: {
level: 'verbose',
... ...
... ... @@ -20,73 +20,75 @@
</div>
<div class="panel panel-default" style="margin-bottom:10px;">
<div class="panel-heading">
<a class="btn btn-success " id="add-subject"><i class="fa fa-plus"></i> 添加专题</a>
</div>
<div class="panel-body">
<div class="row">
<div class="panel-col">
<select name="sort" id="subject-type" tabindex="-1" title="" class="select2-offscreen brandBtn-group">
<option value="" selected="">类型</option>
<option value="1">奥莱</option>
<option value="2">SALE</option>
</select>
</div>
<div class="panel-col">
<select name="paltform" id="subject-paltform" tabindex="-1" title="" class="select2-offscreen brandBtn-group">
<option value="" selected="">平台</option>
<option value="1">WEB</option>
<option value="2">APP</option>
<option value="3">WAP</option>
<option value="4">IPAD</option>
</select>
</div>
<div class="panel-col">
<select name="status" id="subject-status" tabindex="-1" title="" class="select2-offscreen brandBtn-group">
<option value="" selected="">状态</option>
<option value="1">未定时</option>
<option value="2">未发布</option>
<option value="3">已发布</option>
<option value="4">已结束</option>
</select>
</div>
<a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
<a id="filter-all" href="/runManage/subjectManage/index" class="btn btn-info">全部</a>
<div class="panel-heading">
<a class="btn btn-success " id="add-subject"><i class="fa fa-plus"></i> 添加专题</a>
</div>
<div class="panel-body">
<div class="row">
<div class="panel-col">
<select name="sort" id="subject-type" tabindex="-1" title="" class="select2-offscreen brandBtn-group">
<option value="" selected="">类型</option>
<option value="1">奥莱</option>
<option value="2">SALE</option>
</select>
</div>
<div class="panel-col">
<select name="paltform" id="subject-paltform" tabindex="-1" title=""
class="select2-offscreen brandBtn-group">
<option value="" selected="">平台</option>
<option value="1">WEB</option>
<option value="2">APP</option>
<option value="3">WAP</option>
<option value="4">IPAD</option>
</select>
</div>
<div class="panel-col">
<select name="status" id="subject-status" tabindex="-1" title=""
class="select2-offscreen brandBtn-group">
<option value="" selected="">状态</option>
<option value="1">未定时</option>
<option value="2">未发布</option>
<option value="3">已发布</option>
<option value="4">已结束</option>
</select>
</div>
<a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
<a id="filter-all" href="/runManage/subjectManage/index" class="btn btn-info">全部</a>
</div>
</div>
</div>
<div class="contentpanel">
<div class="panel panel-default" style="margin-bottom: 10px">
<input type="hidden" id="url" value="/runManage/subjectManage/subjectList" />
<div id="subject-manage"></div>
</div>
<div class="panel panel-default" style="margin-bottom: 10px">
<input type="hidden" id="url" value="/runManage/subjectManage/subjectList"/>
<div id="subject-manage"></div>
</div>
</div>
<script type="text/template" id="template2">
<input type="text" name="sort" size="1" placeholder="排序" />
<input type="button" class="btn btn-xs btn-info sortsave" id="save" value="保存" />
<input type="button" class="btn btn-xs btn-info sortcancel" id="cancel" value="取消" />
<input type="text" name="sort" size="1" placeholder="排序"/>
<input type="button" class="btn btn-xs btn-info sortsave" id="save" value="保存"/>
<input type="button" class="btn btn-xs btn-info sortcancel" id="cancel" value="取消"/>
</script>
<script type="text/template" id="template">
<div class="rows" id="baseform">
<div class="form-group">
<label class="col-sm-2 control-label">分类<font color="#f00">*</font></label>
<input type="hidden" value="{id}" id="id" />
<div class="col-sm-10">
<input name="sort" type="radio" value="1" />奥莱
<input name="sort" type="radio" value="2" />SALE
</div>
<input type="hidden" id="sort" value="{sort}" for="radio" />
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="title">标题<font color="#f00">*</font></label>
<div class="col-sm-8">
<input type="text" value="{title}" class="form-control" id="title" required="required" />
</div>
</div>
<div class="form-group">
<div class="rows" id="baseform">
<div class="form-group">
<label class="col-sm-2 control-label">分类<font color="#f00">*</font></label>
<input type="hidden" value="{id}" id="id"/>
<div class="col-sm-10">
<input name="sort" type="radio" value="1"/>奥莱
<input name="sort" type="radio" value="2"/>SALE
</div>
<input type="hidden" id="sort" value="{sort}" for="radio"/>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="title">标题<font color="#f00">*</font></label>
<div class="col-sm-8">
<input type="text" value="{title}" class="form-control" id="title" required="required"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">平台</label>
<div class="col-sm-8">
<label style="cursor: pointer;"><input type="checkbox" name="plateform" value="1">WEB</label>
... ... @@ -95,62 +97,70 @@
<label style="cursor: pointer;"><input type="checkbox" name="plateform" value="4">IPAD</label>
</div>
<input type="hidden" id="plateform" value="{plateform}" for="checkbox">
</div>
<div class="form-group">
</div>
<div class="form-group">
<label class="col-sm-2 control-label">促销形式</label>
<div class="col-sm-10">
<input id="promotion1" name="promotionName" type="radio" value="1" />
<input class="smalltxt" type="text" id="promotionName1" />折起&nbsp;&nbsp;
<input id="promotion1" name="promotionName" type="radio" value="1"/>
<input class="smalltxt" type="text" id="promotionName1"/>折起&nbsp;&nbsp;
<input id="promotion2" name="promotionName" type="radio" value="2" /><input class="smalltxt" type="text" id="promotionName2" />~<input class="smalltxt" type="text" id="promotionName3" />折&nbsp;&nbsp;
<input id="promotion4" name="promotionName" type="radio" value="4" /><input class="smalltxt" type="text" id="promotionName4" />元起&nbsp;&nbsp;
<input id="promotion2" name="promotionName" type="radio" value="2"/><input class="smalltxt" type="text"
id="promotionName2"/>~<input
class="smalltxt" type="text" id="promotionName3"/>折&nbsp;&nbsp;
<input id="promotion5" name="promotionName" type="radio" value="5" /><input class="smalltxt" type="text" id="promotionName5" />%Off(大图折扣)
</div>
</div>
<div class="form-group col-sm-100">
<label class="col-sm-2 control-label">活动时间</label>
<div class="panel-col1 col-sm-4">
<input type="text" id="startTime" jsaction="time:end:endTime" class="form-control panel-input hasDatepicker " name="start_time" placeholder="开始时间" value="{startTime}">
<input id="promotion4" name="promotionName" type="radio" value="4"/><input class="smalltxt" type="text"
id="promotionName4"/>元起&nbsp;&nbsp;
<input id="promotion5" name="promotionName" type="radio" value="5"/><input class="smalltxt" type="text"
id="promotionName5"/>%Off(大图折扣)
</div>
</div>
<div class="form-group col-sm-100">
<label class="col-sm-2 control-label">活动时间</label>
<div class="panel-col1 col-sm-4">
<input type="text" id="startTime" jsaction="time:end:endTime"
class="form-control panel-input hasDatepicker " name="start_time" placeholder="开始时间"
value="{startTime}">
</div>
<div class="panel-col1 col-sm-4">
<input type="text" id="endTime" jsaction="time:start:startTime" class="form-control panel-input hasDatepicker" name="end_time" placeholder="结束时间" value="{endTime}">
<input type="text" id="endTime" jsaction="time:start:startTime"
class="form-control panel-input hasDatepicker" name="end_time" placeholder="结束时间"
value="{endTime}">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-lalbel" for="orderNum">排序</label>
<div class="col-sm-8">
<input type="text" id="orderNum" value="{orderNum}" class="form-control"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-lalbel" for="orderNum">排序</label>
<div class="col-sm-8">
<input type="text" id="orderNum" value="{orderNum}" class="form-control" />
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">LOGO图片</label>
<div class="col-sm-10">
<input type="file" id="logoUrl" name="logoUrl" value="{logoUrl}" /><!---->
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">封面图</label>
<div class="col-sm-10">
<input type="file" id="coverUrl" name="coverUrl" value="{coverUrl}" />
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">web列表页图</label>
<div class="col-sm-10">
<input type="file" id="webUrl" name="webUrl" value="{webUrl}" />
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="">添加商品<font color="#f00">*</font></label>
<div class="col-sm-10">
<select id="productPoolId" style="width: 280px;" value="{productPoolId}">
<option value="{productPoolId}">请选择商品池</option>
</select>
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">LOGO图片</label>
<div class="col-sm-10">
<input type="file" id="logoUrl" name="logoUrl" value="{logoUrl}"/><!---->
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">封面图</label>
<div class="col-sm-10">
<input type="file" id="coverUrl" name="coverUrl" value="{coverUrl}"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">web列表页图</label>
<div class="col-sm-10">
<input type="file" id="webUrl" name="webUrl" value="{webUrl}"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="">添加商品<font color="#f00">*</font></label>
<div class="col-sm-10">
<select id="productPoolId" style="width: 280px;" value="{productPoolId}">
<option value="{productPoolId}">请选择商品池</option>
</select>
</div>
</div>
</div>
</script>
\ No newline at end of file
... ...
... ... @@ -48,7 +48,7 @@
<div class="height40">颜色封面：</div>
</div>
<div class="col-sm-10">
<div id="cover-color" class="cover-color col-sm-12">
<div class="cover-color col-sm-12">
[[each item.goodsImagesList as _item _index]]
<div class="cover-color-box height40">
[[if _item.isDefault=="Y"]]
... ...