fe / yohobuy-portal-fe · Commits

Go to a project

Authored by liuyue
Commit 4a5a9466400b2bd8e23bbeb1d73250ded05662d1 2 parents 1d1dea42 76f19170 master ... feature/feature_v4.5_20160525 feature/feature_v4.6_20160525 yohobuy_portal_dev_v4.4_20160525 yohobuy_portal_dev_v4.5_20160601 yohobuy_portal_dev_v4.6_20160601 yohobuy_portal_dev_v4.7_20160616 4.4.0_20160531 4.3.6_20160517 4.3.3_20160512 4.3.2_20160511 4.3.1_20160509 yohobuy_portal_dev_v4.6_20160622 fixed_gray_import

网销

Inline Side-by-side
Showing 11 changed files with 316 additions and 304 deletions
... ... @@ -127,23 +127,24 @@ edit.prototype = {
}
/*初始化文件上传*/
if ($('input[type="file"]', that.el).length > 0) {
$('input[type="file"]', that.el).each(function() {
var src = $(this).attr("value");
var _id = $(this).attr("id") || $(this).attr("name");
var Temp = '<ul class="upload-image-list" id="img-' + _id + '">';
Temp += '<li class="fileinput-button">';
Temp += '<a class="fileinput-button-icon" href="javascript:void(0);">';
if (src) {
var ext = src.split('.').pop().toLowerCase();
if (ext == "mp4") {
Temp += '<video width="76" height="80" src="' + src + '"></video>';
} else {
Temp += '<img width="76" height="80" src="' + src + '">';
if($('input[type="file"]',that.el).length>0){
$('input[type="file"]',that.el).each(function(){
var src=$(this).attr("value");
var _id=$(this).attr("id")||$(this).attr("name");
var Temp='<ul class="upload-image-list" id="img-'+_id+'">';
Temp+='<li class="fileinput-button">';
Temp+='<a class="fileinput-button-icon" href="javascript:void(0);">';
if(src){
var ext = src.split('.').pop().toLowerCase();
if("mp4,rmvb,avi,mov".indexOf(ext)>-1){
Temp+='<video width="76" height="80" src="'+src+'"></video>';
}else{
Temp+='<img width="76" height="80" src="'+src+'">';
}
}else{
Temp+='+';
}
} else {
Temp += '+';
}
Temp += '</a>';
Temp += '</li>';
Temp += '</ul>';
... ...
... ... @@ -18,6 +18,7 @@ $.fn.ajaxfileupload = function(options) {
$.extend(settings, options);
}
return this.each(function() {
var $element = $(this);
if ($element.data('ajaxUploader-setup') === true) return;
... ... @@ -27,6 +28,12 @@ $.fn.ajaxfileupload = function(options) {
if (ext) {
settings.valid_extensions = ext.split(',');
}
var bucket = $element.attr("bucket");
if(bucket){
settings.params.bucket=bucket;
}
console.log(settings.params);
$element.change(function() {
uploading_file = false;
if (settings.submit_button == null) {
... ...
... ... @@ -153,13 +153,13 @@ var util = {
return "[[" + trim + "]]";
} else {
params.push(trim);
return "[[+" + trim + "+]]";
return "[[+(" + trim + ")+]]";
}
});
// console.log(params);
//.match(/(\w+)+/g)
for (var i in params) {
var aps = params[i].split(/\+|\-|\*|\/|\=|\!|\~|'|"/g);
var aps = params[i].split(/\+|\-|\*|\/|\=|\!|\~|'|"|\|/g);
for (var j in aps) {
var ap = aps[j].replace(/^\s+|\s+$/, '');
// console.log(":" + ap + ":");
... ... @@ -200,7 +200,6 @@ var util = {
}
result += "return p.join('');\n";
// console.log(result);
var fn = new Function(header + result);
var b = fn.call(source);
... ...
... ... @@ -195,12 +195,7 @@ $(document).on("click","#dapeiTable .edit",function(){
// Bll.toast("添加搭配",item,"/netSale/updateCollocation");
});
// GOLABDATA.on("bianjiqi",function(){
// // return {
// // recommend:UMrecommender.getContent(),
// // productDesc:UMdescriptioner.getContent()
// // }
// });
/*封面设置*/
var goodsImagesList={};
... ... @@ -232,6 +227,8 @@ common.edit.ajaxfileupload("#fenmianfile",{
}
}
});
$(document).on("click",".cover-color .btn-metro",function(){
var index=$(this).parents("ul").data("index");
var index1=$(this).parents(".cover-image-item").data("index");
... ... @@ -243,8 +240,8 @@ $(document).on("click",".cover-color .btn-metro",function(){
}
var groups=$(this).parent(".cover-color");
item.isDefault=groups.find("a").eq(0).hasClass("info")?"Y":"N";
item.genderCover=groups.find("a").eq(0).hasClass("info")?"1":"0";
item.genderCover=groups.find("a").eq(0).hasClass("info")?"2":"0";
item.genderCover=groups.find("a").eq(1).hasClass("info")?"1":"0";
item.genderCover=groups.find("a").eq(2).hasClass("info")?"2":"0";
console.log(item);
});
$(document).on("click",".goods-color a",function(){
... ... @@ -263,8 +260,6 @@ $(document).on("click","#fenMainSave",function(){
common.util.__ajax({
url:'/netSale/manageProductImg',
data:data
},function(data){
console.log(data);
});
return false;
});
... ...
... ... @@ -52,7 +52,8 @@ var g = new common.grid({
brandId: common.util.__input("brand"),
type: common.util.__input("models-type"),
status: common.util.__input("status"),
bannarImg: common.util.__input("bannarImg")
bannarImg: common.util.__input("bannarImg"),
id: common.util.__input("id")
};
},
columns: [{
... ... @@ -90,7 +91,7 @@ var g = new common.grid({
}, {
display: '状态',
render: function(item) {
return '<p>'+TypeEnum.enum[item.status] +'<p>';
return '<p>'+StatusEnum.enum[item.status] +'<p>';
}
}, {
display: '操作',
... ... @@ -134,7 +135,7 @@ $(document).on('click', '.edit-class-btn', function () {
function attributeOp(prefix, url, item) {
var a = new common.edit(".confirm");
common.dialog.confirm(prefix + "款型系列", common.util.__template($("#template").html(), item), function () {
common.dialog.confirm(prefix + "款型系列", common.util.__template2($("#template").html(), item), function () {
return a.submit(url, function (option) {
option.data.categoryId = item.categoryId;
... ...
... ... @@ -3,248 +3,251 @@ exports.domain = require('../config/common.js').domain;
//exports.domain = 'http://172.16.6.162:8088/platform';
//营销管理路由配置
exports.res = [{
//营销码管理 -> 页面渲染
route: '/market/coupon/index',
method: 'GET',
view: 'pages/market/index',
src: '/market/coupon',
noApi: true,
data: {
pageTitle: '优惠码列表',
filter: true,
createUrl: '/market/coupon/add',
gridurl: '/market/coupon/getPromotion'
// tabUrl: '/getCodeCount',
// sendUrl: '/sendPromotion',
// auditUrl: '/auditPromotion'
}
}, {
//营销码管理 -> 列表数据
route: '/market/coupon/getPromotion',
method: 'POST',
url: '/promotioncode/getPromotionCodeList',
isJsonRaw: true,
params: [{
name: 'status',
type: 'Number'
}, {
name: 'page',
type: 'Number'
}, {
name: 'size',
type: 'Number'
}, {
name: 'batchNo',
type: 'Number'
}, {
name: 'name',
type: 'String'
}, {
name: 'reqDepartment',
type: 'String'
}]
}, {
//营销码管理 -> 列表操作
route: '/market/coupon/auditPromotion',
method: 'POST',
url: '/promotioncode/auditPromotionCode',
isJsonRaw: true,
params: [{
name: 'id',
type: 'Number'
}, {
name: 'status',
type: 'Number'
}, {
name: 'reason',
type: 'String'
}]
}, {
//营销码管理 -> 发放列表
route: '/market/coupon/sendPromotion',
method: 'POST',
url: '/promotioncode/getPromotionCodeSendList',
isJsonRaw: true,
params: [{
name: 'auditTime',
type: 'String'
}]
}, {
//营销码管理 -> tab卡数据
route: '/market/coupon/getCodeCount',
method: 'POST',
url: '/promotioncode/getPromotionCodeCountByStatus',
isJsonRaw: true,
params: [{
name: 'reqDepartment',
type: 'String'
}, {
name: 'name',
type: 'String'
}, {
name: 'batchNo',
type: 'Number'
}]
}, {
//营销码管理 -> 添加优惠码页面渲染
route: '/market/coupon/add',
method: 'GET',
view: 'pages/market/coupon-edit',
src: '/market/coupon-edit',
data: {
action: "/market/coupon/addCode",
type: "add",
data: {
limitTimes: "0",
reqDepartment: "零售部/营销策划",
userSourceLimit: "1",
userTypeLimit: "1",
userUseLimit: "1",
staff: "admin",
status: "0"
}
}
}, {
//营销码管理 -> 添加优惠码
route: '/market/coupon/addCode',
method: 'POST',
url: '/promotioncode/addPromotionCode',
isJsonRaw: true,
params: [{
name: 'name',
type: 'String'
}, {
name: 'limitTimes',
type: 'String'
}, {
name: 'code',
type: 'String'
}, {
name: 'describe',
type: 'String'
}, {
name: 'promotionInfo',
type: 'String'
}, {
name: 'userSourceLimit',
type: 'String'
}, {
name: 'userTypeLimit',
type: 'String'
}, {
name: 'creatorId',
type: 'String'
}, {
name: 'limitDateFrom',
type: 'String'
}, {
name: 'limitDateTo',
type: 'String'
}, {
name: 'createTime',
type: 'String'
}, {
name: 'reqDepartment',
type: 'String'
}, {
name: 'status',
type: 'String'
}, {
name: 'staff',
type: 'String'
}]
}, {
//营销码管理 -> 编辑优惠码页面渲染
route: '/market/coupon/update/:id',
method: 'GET',
view: 'pages/market/coupon-edit',
url: '/promotioncode/getPromotionCode',
isJsonRaw: true,
data: {
action: "/market/coupon/updateCode",
type: "update"
},
src: '/market/coupon-edit',
params: [{
name: "id",
type: "String"
}]
}, {
//营销码管理 -> 优惠码详情
route: '/market/coupon/info/:id',
method: 'GET',
view: 'pages/market/coupon-edit',
url: '/promotioncode/getPromotionCode',
isJsonRaw: true,
src: '/market/coupon-edit',
data: {
type: "info"
},
params: [{
name: "id",
type: "String"
}]
}, {
//营销码管理 -> 验证优惠码
route: '/market/coupon/checkPromotionCode',
method: 'POST',
url: '/promotioncode/checkPromotionCode',
isJsonRaw: true,
params: [{
name: 'code',
type: 'String'
}]
}, {
//营销码管理 -> 编辑优惠码
route: '/market/coupon/updateCode',
method: 'POST',
url: '/promotioncode/updatePromotionCode',
isJsonRaw: true,
params: [{
name: 'id',
type: 'String'
}, {
name: 'name',
type: 'String'
}, {
name: 'limitTimes',
type: 'String'
}, {
name: 'code',
type: 'String'
}, {
name: 'describe',
type: 'String'
}, {
name: 'promotionInfo',
type: 'String'
}, {
name: 'userSourceLimit',
type: 'String'
}, {
name: 'userTypeLimit',
type: 'String'
}, {
name: 'creatorId',
type: 'String'
}, {
name: 'limitDateFrom',
type: 'String'
}, {
name: 'limitDateTo',
type: 'String'
}, {
name: 'createTime',
type: 'String'
}, {
name: 'reqDepartment',
type: 'String'
}, {
name: 'status',
type: 'String'
}]
}, {
exports.res = [
// {
// //营销码管理 -> 页面渲染
// route: '/market/coupon/index',
// method: 'GET',
// view: 'pages/market/index',
// src: '/market/coupon',
// noApi: true,
// data: {
// pageTitle: '优惠码列表',
// filter: true,
// createUrl: '/market/coupon/add',
// gridurl: '/market/coupon/getPromotion'
// // tabUrl: '/getCodeCount',
// // sendUrl: '/sendPromotion',
// // auditUrl: '/auditPromotion'
// }
// },
// {
// //营销码管理 -> 列表数据
// route: '/market/coupon/getPromotion',
// method: 'POST',
// url: '/promotioncode/getPromotionCodeList',
// isJsonRaw: true,
// params: [{
// name: 'status',
// type: 'Number'
// }, {
// name: 'page',
// type: 'Number'
// }, {
// name: 'size',
// type: 'Number'
// }, {
// name: 'batchNo',
// type: 'Number'
// }, {
// name: 'name',
// type: 'String'
// }, {
// name: 'reqDepartment',
// type: 'String'
// }]
// }, {
// //营销码管理 -> 列表操作
// route: '/market/coupon/auditPromotion',
// method: 'POST',
// url: '/promotioncode/auditPromotionCode',
// isJsonRaw: true,
// params: [{
// name: 'id',
// type: 'Number'
// }, {
// name: 'status',
// type: 'Number'
// }, {
// name: 'reason',
// type: 'String'
// }]
// }, {
// //营销码管理 -> 发放列表
// route: '/market/coupon/sendPromotion',
// method: 'POST',
// url: '/promotioncode/getPromotionCodeSendList',
// isJsonRaw: true,
// params: [{
// name: 'auditTime',
// type: 'String'
// }]
// }, {
// //营销码管理 -> tab卡数据
// route: '/market/coupon/getCodeCount',
// method: 'POST',
// url: '/promotioncode/getPromotionCodeCountByStatus',
// isJsonRaw: true,
// params: [{
// name: 'reqDepartment',
// type: 'String'
// }, {
// name: 'name',
// type: 'String'
// }, {
// name: 'batchNo',
// type: 'Number'
// }]
// }, {
// //营销码管理 -> 添加优惠码页面渲染
// route: '/market/coupon/add',
// method: 'GET',
// view: 'pages/market/coupon-edit',
// src: '/market/coupon-edit',
// data: {
// action: "/market/coupon/addCode",
// type: "add",
// data: {
// limitTimes: "0",
// reqDepartment: "零售部/营销策划",
// userSourceLimit: "1",
// userTypeLimit: "1",
// userUseLimit: "1",
// staff: "admin",
// status: "0"
// }
// }
// }, {
// //营销码管理 -> 添加优惠码
// route: '/market/coupon/addCode',
// method: 'POST',
// url: '/promotioncode/addPromotionCode',
// isJsonRaw: true,
// params: [{
// name: 'name',
// type: 'String'
// }, {
// name: 'limitTimes',
// type: 'String'
// }, {
// name: 'code',
// type: 'String'
// }, {
// name: 'describe',
// type: 'String'
// }, {
// name: 'promotionInfo',
// type: 'String'
// }, {
// name: 'userSourceLimit',
// type: 'String'
// }, {
// name: 'userTypeLimit',
// type: 'String'
// }, {
// name: 'creatorId',
// type: 'String'
// }, {
// name: 'limitDateFrom',
// type: 'String'
// }, {
// name: 'limitDateTo',
// type: 'String'
// }, {
// name: 'createTime',
// type: 'String'
// }, {
// name: 'reqDepartment',
// type: 'String'
// }, {
// name: 'status',
// type: 'String'
// }, {
// name: 'staff',
// type: 'String'
// }]
// }, {
// //营销码管理 -> 编辑优惠码页面渲染
// route: '/market/coupon/update/:id',
// method: 'GET',
// view: 'pages/market/coupon-edit',
// url: '/promotioncode/getPromotionCode',
// isJsonRaw: true,
// data: {
// action: "/market/coupon/updateCode",
// type: "update"
// },
// src: '/market/coupon-edit',
// params: [{
// name: "id",
// type: "String"
// }]
// }, {
// //营销码管理 -> 优惠码详情
// route: '/market/coupon/info/:id',
// method: 'GET',
// view: 'pages/market/coupon-edit',
// url: '/promotioncode/getPromotionCode',
// isJsonRaw: true,
// src: '/market/coupon-edit',
// data: {
// type: "info"
// },
// params: [{
// name: "id",
// type: "String"
// }]
// }, {
// //营销码管理 -> 验证优惠码
// route: '/market/coupon/checkPromotionCode',
// method: 'POST',
// url: '/promotioncode/checkPromotionCode',
// isJsonRaw: true,
// params: [{
// name: 'code',
// type: 'String'
// }]
// }, {
// //营销码管理 -> 编辑优惠码
// route: '/market/coupon/updateCode',
// method: 'POST',
// url: '/promotioncode/updatePromotionCode',
// isJsonRaw: true,
// params: [{
// name: 'id',
// type: 'String'
// }, {
// name: 'name',
// type: 'String'
// }, {
// name: 'limitTimes',
// type: 'String'
// }, {
// name: 'code',
// type: 'String'
// }, {
// name: 'describe',
// type: 'String'
// }, {
// name: 'promotionInfo',
// type: 'String'
// }, {
// name: 'userSourceLimit',
// type: 'String'
// }, {
// name: 'userTypeLimit',
// type: 'String'
// }, {
// name: 'creatorId',
// type: 'String'
// }, {
// name: 'limitDateFrom',
// type: 'String'
// }, {
// name: 'limitDateTo',
// type: 'String'
// }, {
// name: 'createTime',
// type: 'String'
// }, {
// name: 'reqDepartment',
// type: 'String'
// }, {
// name: 'status',
// type: 'String'
// }]
// },
{
//限购码管理 -> 页面渲染
route: '/market/limitcode/index',
method: 'GET',
... ...
// exports.domain = require('../config/common.js').domain;
exports.domain = 'http://172.16.6.227:8083/yohobuy-platform-web';
exports.domain = 'http://172.16.6.227:8084/yohobuy-platform-web';
exports.res = [
//商品描述
{
... ... @@ -71,11 +71,12 @@ exports.res = [
]
},
{//单独维护封面信息
//http://172.16.6.227:8083/yohobuy-platform-web/product/manageProductImg
route:'/netSale/manageProductImg',
method:'POST',
url: '/product/manageProductImg',
params: [
{name: 'goodsImagesReq', type: 'String'}
{name: 'goodsImagesReq', type: 'Object'}
]
}
];
\ No newline at end of file
... ...
... ... @@ -157,7 +157,7 @@
<!-- Mov， avi ，rmvb ，mp4 -->
<div class="row">
<div id="upload-wrapper1" class="col-md-3">
<input id="videofile" name="videofile" type="file" extend="mp4,rmvb,avi,mov" class="btn btn-primary ml10" value="{attachUrl}">
<input id="videofile" name="videofile" type="file" bucket="goodsvideo" extend="mp4,rmvb,avi,mov" class="btn btn-primary ml10" value="{attachUrl}">
</div>
<div class="col-md-9">
<div class="row">
... ...
... ... @@ -84,8 +84,8 @@
</label>
<div class="col-md-6">
<select name="shop" id="shopsId" value="{shopsId}" tabindex="-1" title="" class="form-control height40">
<option value="-1">{shopsName}</option>
<select name="shop" id="shopsId" value="[[shopsId]]" tabindex="-1" title="" class="form-control height40">
<option value="[[shopsId||'-1']]">[[shopsName||"请选择店铺"]]</option>
</select>
</div>
</div>
... ... @@ -96,8 +96,8 @@
</label>
<div class="col-md-6">
<select name="shop" id="brandId" value="{brandId}" tabindex="-1" title="" class="form-control height40">
<option value="-1">{brandName}</option>
<select name="shop" id="brandId" value="[[brandId]]" tabindex="-1" title="" class="form-control height40">
<option value="[[brandId||'-1']]">[[brandName||"请选择品牌"]]</option>
</select>
</div>
</div>
... ... @@ -108,7 +108,7 @@
</label>
<div class="panel-col">
<select name="type" id="type" tabindex="-1" title="" class="form-control height40">
<select name="type" id="type" value="[[type]]" tabindex="-1" title="" class="form-control height40">
<option value="-1">类型</option>
<option value="1">品牌款型</option>
<option value="2">品牌系列</option>
... ... @@ -123,7 +123,7 @@
</label>
<div class="col-md-6">
<input id="seriesName" value="{seriesName}" class="form-control width300" type="text" placeholder="款型系列名称">
<input id="seriesName" value="[[seriesName]]" class="form-control width300" type="text" placeholder="款型系列名称">
</div>
</div>
... ... @@ -131,7 +131,7 @@
<div class="form-group">
<label for="bannarImg" class="col-sm-3 control-label">banner图片:</label>
<div class="col-sm-6" id="colorUrlBox">
<input type="file" id="bannarImg" name="bannarImg">
<input type="file" id="bannarImg" name="bannarImg" value="[[bannarImg]]">
</div>
</div>
... ... @@ -142,10 +142,12 @@
</label>
<div class="col-md-6">
<input id="orderBy" value="{orderBy}" class="form-control width300" type="text" placeholder="排序">
<input id="orderBy" value="[[orderBy]]" class="form-control width300" type="text" placeholder="排序">
</div>
</div>
<input id="id" hidden="ture" value="[[id]]" />
</form>
... ...
<div class="panel panel-default">
<form action="" class="form-horizontal form-bordered">
<a href="javascript:;" name="position12" style="position: absolute;width: 100%;height: 100%;left: 0;top: -100%;"></a>
<div class="panel-heading">
<div class="panel-btns" style="display: none;">
<a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
</div>
<h2 class="panel-title">小编推荐</h2>
<a href="javascript:;" name="position12" style="position: absolute;width: 100%;height: 100%;left: 0;top: -100%;"></a>
<div class="panel-heading">
<div class="panel-btns" style="display: none;">
<a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
</div>
<div class="panel-body nopadding">
<script id="edit-recommender" type="text/plain" style="width:100%;height:500px;"></script>
<p>
<span class="red">提示：与商品相关的逛信息自动抓取到下列各模块中，若要在商品详情中展示，请将其编辑在【小编推荐】中。
</span>
</p>
</div>
<div class="panel-footer">
<button class="btn btn-primary" id="btn-recommand">保存</button>
</div>
</form>
<h2 class="panel-title">小编推荐</h2>
</div>
<div class="panel-body nopadding">
<script id="edit-recommender" type="text/plain" style="width:100%;height:500px;"></script>
<p>
<span class="red">提示：与商品相关的逛信息自动抓取到下列各模块中，若要在商品详情中展示，请将其编辑在【小编推荐】中。
</span>
</p>
</div>
<div class="panel-footer">
<button class="btn btn-primary" id="btn-recommand">保存</button>
</div>
</div>
\ No newline at end of file
... ...
... ... @@ -74,7 +74,11 @@
</div>
<div class="col-sm-11">
<div class="goods-color height40">
<a href="javascript:;" class="btn btn-default btn-metro" data-index=[[index]]>设置默认</a>
[[if item.isDefault=="Y"]]
<a href="javascript:;" class="btn btn-default btn-metro info" data-index=[[index]]>设置默认</a>
[[else]]
<a href="javascript:;" class="btn btn-default btn-metro" data-index=[[index]]>设置默认</a>
[[/if]]
<!-- <a href="javascript:;" class="btn btn-default btn-metro">调用图片</a> -->
</div>
</div>
... ...