fe / yohobuy-portal-fe · Commits

Go to a project

Authored by dongjunjie
Commit 61af626d56ce2dfef8a0476dbf2fefc80a5e3b52 1 parent d3fd5445

店铺装修修改bug

Inline Side-by-side
Showing 5 changed files with 135 additions and 90 deletions
... ... @@ -86,22 +86,23 @@ var g = new common.grid({
if (item.checkStatus) {
return ENUM.checkStatus[item.checkStatus]
} else {
return '';
return '未装修';
}
}
}, {
display: "操作",
render: function(item) {
var HtmArr = [];
if(item.checkStatus == 200){
HtmArr.push('<a href="/supplier/store/decorationDetail/'+item.id+'/'+item.templateId+'/'+item.shopsType+'/view/" class="btn btn-info btn-xs">装修查看</a>');
}else{
HtmArr.push('<a href="/supplier/store/decorationDetail/'+item.id+'/'+item.templateId+'/'+item.shopsType+'/editor/" class="btn btn-success btn-xs">装修编辑</a>');
HtmArr.push('<a href="/supplier/store/decorationDetail/'+item.shopsId+'/'+item.shopsType+'/view/'+item.id+'/" class="btn btn-info btn-xs">装修查看</a>');
}else {
HtmArr.push('<a href="/supplier/store/decorationDetail/'+item.shopsId+'/'+item.shopsType+'/editor/'+item.id+'/" class="btn btn-success btn-xs">装修编辑</a>');
}
if (item.checkStatus == 900) {
HtmArr.push('<a href="javascript:void(0)" class="btn btn-warning btn-xs commentBtn" data-comment="'+item.comment+'">驳回理由</a>');
}
return HtmArr.join('');
}
}]
... ...
... ... @@ -91,7 +91,7 @@ var t = new common.tab({
console.log(t);
if(t.active == "1"){
console.log(item);
HtmArr.push('<a href="/supplier/store/decorationDetail/'+item.id+'/'+item.templateId+'/'+item.shopsType+'/check/" class="btn btn-info btn-xs">装修查看</a>');
HtmArr.push('<a href="/supplier/store/decorationDetail/'+item.shopsId+'/'+item.shopsType+'/check/'+item.id+'/" class="btn btn-info btn-xs">装修查看</a>');
}else{
HtmArr.push('<a href="/supplier/store/'+authority.info+'/'+item.shopsId+'" href="javascript:void(0);" class="btn btn-info btn-xs">查看</a>');
}
... ...
... ... @@ -24,15 +24,15 @@ var ENUM = {
var resourcesNew = {
"shopTopBanner":{
"id":"",
"data": [{"shopSrc": "", "detailSrc": "", "isShowShopName": "Y"}]
"data": [{"shopSrc": "", "detailSrc": "", "isShowShopName": "Y"}]
},
"navigationBar":{
"id":"",
"data": [{"name":"",url:""}, {"name":"",url:""}, {"name":"",url:""}]
"data": [{"name":"",url:""}, {"name":"",url:""}, {"name":"",url:""}]
},
"largeSlideImg":{
"id":"",
"data": [
"data": [
{"position": 5, "data":[{"src": "", "url": "", "startTime": "", "endTime": "", "publishStatus": 0}]},
{"position": 4, "data":[{"src": "", "url": "", "startTime": "", "endTime": "", "publishStatus": 0}]},
{"position": 3, "data":[{"src": "", "url": "", "startTime": "", "endTime": "", "publishStatus": 0}]},
... ... @@ -42,46 +42,46 @@ var resourcesNew = {
},
"oneRowTwoColImages":{
"id":"",
"data": [
"data": [
{"position": 2, "data":[{"src": "", "url": "", "startTime": "", "endTime": "", "publishStatus": 0}]},
{"position": 1, "data":[{"src": "", "url": "", "startTime": "", "endTime": "", "publishStatus": 0}]},
{"position": 1, "data":[{"src": "", "url": "", "startTime": "", "endTime": "", "publishStatus": 0}]}
]
},
"brandBrowse":{
"id":"",
"data": [{"position":1, "name":"", "src":"", "url":""}]
"data": []
},
"recommend":{
"id":"",
"title":"经典推荐",
"data": [{"position":1, "name":"", "enName":"", "src":"", "url":"","isShowInApp":"Y"},]
"title":"经典推荐",
"data": [{"position":1, "name":"", "enName":"", "src":"", "url":"","isShowInApp":"Y"}]
},
"hotRecommend":{
"id":"",
"title":"热销推荐",
"data": [{"position":1, "src":"", "url":""},]
"title":"热销推荐",
"data": [{"position":1, "src":"", "url":""}]
},
"signboard":{
"id":"",
"data": [{"position":1, "src":"", "url":"", "startTime": "", "endTime": "", "publishStatus": 0}]
"data": [{"position":1, "src":"", "url":"", "startTime": "", "endTime": "", "publishStatus": 0}]
},
"goodsTabBar":{
"id":"",
"data": {
"new":[{"position":0, "name":"MORE", "url":""},],
"hot":[{"position":0, "name":"MORE", "url":""},]
"data": {
"new":[{"position":0, "name":"MORE", "url":""}],
"hot":[{"position":0, "name":"MORE", "url":""}]
}
},
"newProducts":{
"id":"",
"data": [{"productId":"default", "position":1, "productName":"默认商品", "productPrice":"默认价格", "src":"", "url":""},]
"data": [{"productId":"0", "position":1, "productName":"默认商品", "productPrice":"默认价格", "src":"", "url":""}]
},
"hotProducts":{
"id":"",
"data": [{"productId":"default", "position":1, "productName":"默认商品", "productPrice":"默认价格", "src":"", "url":""},]
"data": [{"productId":"0", "position":1, "productName":"默认商品", "productPrice":"默认价格", "src":"", "url":""}]
}
} //初始化装修信息json
var _id, templateId, jsonMain, jsonClone, topNewProducts, topHotProducts;
var shopsId, _id, jsonMain, jsonClone, topNewProducts, topHotProducts;
getParams();
findDecoration();
... ... @@ -95,10 +95,10 @@ function getParams(){
var paramList = param.split("/");
if(paramList){
_id = paramList[1];
templateId = paramList[2];
shopType = paramList[3];
shopOperate = paramList[4];
shopsId = paramList[1];
shopType = paramList[2];
shopOperate = paramList[3];
_id = paramList[4];
}
if(shopOperate == 'editor'){
$(".moduleTypeSelect").show().find("#templateSelect").removeAttr("disabled");
... ... @@ -166,8 +166,7 @@ function findDecoration(){
{
url:'/store/shop-decoration-find',
data: {
"id": _id,
"templateId":templateId
"shopsId": shopsId
}
},
function(rs) {
... ... @@ -175,19 +174,25 @@ function findDecoration(){
if(rs.data){
jsonMain = rs.data;
}
if(jsonMain.templateName){
curTemplateType = jsonMain.templateName;
}
//没有装修信息，初始化装修信息
if($.isEmptyObject(jsonMain.resources)){
jsonMain.resources = $.extend(true,{},resourcesNew);
}
//装修信息中品牌内容为空，初始化品牌
if(jsonMain.resources.brandBrowse.data.length < 1){
cloneArr(jsonMain.brandList,jsonMain.resources.brandBrowse.data);
}
//装修json克隆
jsonClone = $.extend(true,{},jsonMain);
if(jsonMain.templateName){
curTemplateType = jsonMain.templateName;
//最新上架，最热商品接口
if(shopOperate == 'editor'){
findTopNewProducts();
findTopHotProducts();
}
showMain();
findTopNewProducts();
findTopHotProducts();
},true);
}
//Ajax最新上架商品
... ... @@ -214,7 +219,7 @@ function findTopHotProducts(){
topHotProducts = rs.data;
},true);
}
//Ajax暂存
//Ajax保存，暂存：100，提交审核：200
function saveDecoration(submitStatus){
common.util.__ajax({
url:'/store/shop-decoration-save',
... ... @@ -227,14 +232,19 @@ function saveDecoration(submitStatus){
}
},function(rs){
if(rs.data){
console.log(rs.data);
jsonMain = rs.data;
jsonClone = $.extend(true,{},jsonMain);
showMain();
//console.log(rs.data);
if(submitStatus == 100){
jsonMain = rs.data;
jsonClone = $.extend(true,{},jsonMain);
showMain();
}else{
common.util.__tip("提交审核成功！","success");
location.href="/supplier/shop/decoration";
}
}
});
},true);
}
//Ajax审核
//Ajax审核，审核通过：300，驳回：900
function checkDecoration(checkStatus,comment){
if(comment){
common.util.__ajax({
... ... @@ -244,7 +254,10 @@ function checkDecoration(checkStatus,comment){
"checkStatus": checkStatus,
"comment": comment
}
},function(rs){});
},function(rs){
common.util.__tip("审核通过成功！","success");
location.href="/supplier/check/index";
},true);
}else{
common.util.__ajax({
url:'/store/shop-decoration-check',
... ... @@ -252,7 +265,10 @@ function checkDecoration(checkStatus,comment){
"id": _id,
"checkStatus": checkStatus
}
},function(rs){});
},function(rs){
common.util.__tip("审核驳回成功！","success");
location.href="/supplier/check/index";
},true);
}
}
... ... @@ -264,6 +280,7 @@ function gridInit(id){
//店铺顶部banner
case "editor-banner":
g = new common.grid({
hash: false,
el:"#"+id,
columns:[
{display:"店铺banner图片", render:function(item){
... ... @@ -290,6 +307,7 @@ function gridInit(id){
//店铺导航nav
case "editor-nav":
g = new common.grid({
hash: false,
el:"#"+id,
columns:[
{display:"编号", render:function(item){
... ... @@ -310,6 +328,7 @@ function gridInit(id){
//店铺大图资源位
case "editor-largePic":
g = new common.grid({
hash: false,
el:"#"+id,
columns:[
{display:"排序", render:function(item){
... ... @@ -331,6 +350,7 @@ function gridInit(id){
//店铺小图资源位
case "editor-smallPic":
g = new common.grid({
hash: false,
el:"#"+id,
columns:[
{display:"排序", render:function(item){
... ... @@ -352,6 +372,7 @@ function gridInit(id){
//品牌一览
case "editor-brand":
g = new common.grid({
hash: false,
el:"#"+id,
columns:[
{display:"排序", render:function(item){
... ... @@ -359,7 +380,7 @@ function gridInit(id){
return "<input class='form-control numInput inputChange' type=text name='position' value='"+item.position+"' data-index='"+item.__index+"' />";
}},
{display:"名称", render:function(item){
return item.name;
return item.brandName;
}},
]
});
... ... @@ -371,6 +392,7 @@ function gridInit(id){
case "editor-recommend":
$('.editorTitle').html("<div class='form-inline' style='margin-bottom: 10px'><label>标题名称编辑：</label><input class='form-control' type=text name='title' value='"+ jsonMain.resources.recommend.title +"' /></div> ");
g = new common.grid({
hash: false,
el:"#"+id,
columns:[
{display:"排序", render:function(item){
... ... @@ -378,8 +400,10 @@ function gridInit(id){
return "<input class='form-control numInput inputChange' type=text name='position' value='"+item.position+"' data-index='"+item.__index+"' />";
}},
{display:"名称", render:function(item){
return "<input class='form-control inputChange' type=text name='name' value='"+item.name+"' placeholder='中文' data-index='"+item.__index+"' />" +
"<input class='form-control inputChange' style='margin-top:10px' type=text name='enName' value='"+item.enName+"' placeholder='英文' data-index='"+item.__index+"' />";
return "<div style='width: 5%; float: left; line-height: 40px; color: #ff0000'>*</div><div style='width: 95%; float: left'>" +
"<input class='form-control inputChange' type=text name='name' value='"+item.name+"' placeholder='中文' data-index='"+item.__index+"' />" +
"<input class='form-control inputChange' style='margin-top:10px' type=text name='enName' value='"+item.enName+"' placeholder='英文' data-index='"+item.__index+"' />" +
"</div>";
}},
{display:"图片", render:function(item){
return "<input type=file name='recommendImage' id='recommendImage_"+item.__index+"' value='"+item.src+"' />";
... ... @@ -396,16 +420,21 @@ function gridInit(id){
}},
{display:"操作", render:function(item){
var htmlPic = "",i=item.__index;
if(i == (g.__rows.length-1) && g.__rows.length > 1){
htmlPic += "<input type=button class='btn btn-danger btn-xs deleteBtn' value='删除' data-index='"+item.__index+"' /><br>";
htmlPic += "<input type=button class='btn btn-info btn-xs addBtn' style='margin-top: 10px' value='添加一条' data-index='"+item.__index+"' />";
}
if(i < (g.__rows.length-1) && g.__rows.length > 1){
htmlPic += "<input type=button class='btn btn-danger btn-xs deleteBtn' value='删除' data-index='"+item.__index+"' />";
}
if(i == (g.__rows.length-1) && g.__rows.length == 1){
if(g.__rows.length == 1){
htmlPic += "<input type=button class='btn btn-info btn-xs addBtn' value='添加一条' data-index='"+item.__index+"' />";
}
if(g.__rows.length > 1){
if(i == (g.__rows.length-1) && i < 15){
htmlPic += "<input type=button class='btn btn-danger btn-xs deleteBtn' value='删除' data-index='"+item.__index+"' /><br>";
htmlPic += "<input type=button class='btn btn-info btn-xs addBtn' style='margin-top: 10px' value='添加一条' data-index='"+item.__index+"' />";
}
if(i == (g.__rows.length-1) && i >= 15){
htmlPic += "<input type=button class='btn btn-danger btn-xs deleteBtn' value='删除' data-index='"+item.__index+"' /><br>";
}
if(i < (g.__rows.length-1)){
htmlPic += "<input type=button class='btn btn-danger btn-xs deleteBtn' value='删除' data-index='"+item.__index+"' />";
}
}
return htmlPic;
}}
]
... ... @@ -418,6 +447,7 @@ function gridInit(id){
case "editor-hotRecommend":
$('.editorTitle').html("<div class='form-inline' style='margin-bottom: 10px'><label>标题名称编辑：</label><input class='form-control' type=text name='title' value='"+ jsonMain.resources.hotRecommend.title +"' /></div> ");
g = new common.grid({
hash: false,
el:"#"+id,
columns:[
{display:"排序", render:function(item){
... ... @@ -432,16 +462,21 @@ function gridInit(id){
}},
{display:"操作", render:function(item){
var htmlPic = "",i=item.__index;
if(i == (g.__rows.length-1) && g.__rows.length > 1){
htmlPic += "<input type=button class='btn btn-danger btn-xs deleteBtn' value='删除' data-index='"+item.__index+"' /><br>";
htmlPic += "<input type=button class='btn btn-info btn-xs addBtn' style='margin-top: 10px' value='添加一条' data-index='"+item.__index+"' />";
}
if(i < (g.__rows.length-1) && g.__rows.length > 1){
htmlPic += "<input type=button class='btn btn-danger btn-xs deleteBtn' value='删除' data-index='"+item.__index+"' />";
}
if(i == (g.__rows.length-1) && g.__rows.length == 1){
if(g.__rows.length == 1){
htmlPic += "<input type=button class='btn btn-info btn-xs addBtn' value='添加一条' data-index='"+item.__index+"' />";
}
if(g.__rows.length > 1){
if(i == (g.__rows.length-1) && i < 5){
htmlPic += "<input type=button class='btn btn-danger btn-xs deleteBtn' value='删除' data-index='"+item.__index+"' /><br>";
htmlPic += "<input type=button class='btn btn-info btn-xs addBtn' style='margin-top: 10px' value='添加一条' data-index='"+item.__index+"' />";
}
if(i == (g.__rows.length-1) && i >= 5){
htmlPic += "<input type=button class='btn btn-danger btn-xs deleteBtn' value='删除' data-index='"+item.__index+"' /><br>";
}
if(i < (g.__rows.length-1)){
htmlPic += "<input type=button class='btn btn-danger btn-xs deleteBtn' value='删除' data-index='"+item.__index+"' />";
}
}
return htmlPic;
}}
]
... ... @@ -453,6 +488,7 @@ function gridInit(id){
//水牌signboard
case "editor-signboard":
g = new common.grid({
hash: false,
el:"#"+id,
columns:[
{display:"排序", render:function(item){
... ... @@ -466,10 +502,10 @@ function gridInit(id){
return "<input class='form-control inputChange' type=text name='url' value='"+item.url+"' data-index='"+item.__index+"' />";
}},
{display:"开始时间", render:function(item){
return "<input type=text class='form-control inputChange' readOnly='true' jsaction='date:end:endTime_"+item.__index+"' id='startTime_"+item.__index+"' name='startTime' value='"+item.startTime+"' data-index='"+item.__index+"' />";
return "<input type=text class='form-control inputChange' readOnly='true' jsaction='time:end:endTime_"+item.__index+"' id='startTime_"+item.__index+"' name='startTime' value='"+item.startTime+"' data-index='"+item.__index+"' />";
}},
{display:"结束时间", render:function(item){
return "<input type=text class='form-control inputChange' readOnly='true' jsaction='date:start:startTime_"+item.__index+"' id='endTime_"+item.__index+"' name='endTime' value='"+item.endTime+"' data-index='"+item.__index+"' />";
return "<input type=text class='form-control inputChange' readOnly='true' jsaction='time:start:startTime_"+item.__index+"' id='endTime_"+item.__index+"' name='endTime' value='"+item.endTime+"' data-index='"+item.__index+"' />";
}},
{display:"状态", render:function(item){
return "<span style='white-space: nowrap'>" + (item.publishStatus==0?"未发布":"已发布") + "</span>";
... ... @@ -497,6 +533,7 @@ function gridInit(id){
//新品上架标签tab
case "editor-newGoodTab":
g = new common.grid({
hash: false,
el:"#"+id,
columns:[
{display:"排序", render:function(item){
... ... @@ -544,6 +581,7 @@ function gridInit(id){
//人气单品标签tab
case "editor-hotGoodTab":
g = new common.grid({
hash: false,
el:"#"+id,
columns:[
{display:"排序", render:function(item){
... ... @@ -591,9 +629,14 @@ function gridInit(id){
//新品上架
case "editor-newProduct":
$("#"+id).html("<div id='editor-newProduct-grid' style='width: 500px; float: left'></div><div class='top20List' style='float: left;margin-left: 40px'></div> ");
$("#"+id+" .top20List").html(common.util.__template2($("#top20Products").html(),topNewProducts));
if(topNewProducts){
$("#"+id+" .top20List").html(common.util.__template2($("#top20Products").html(),topNewProducts));
}else{
$("#"+id+" .top20List").html("最新上架20条加载失败，请重新加载！");
}
g = new common.grid({
hash: false,
el:"#editor-newProduct-grid",
columns:[
{display:"排序", render:function(item){
... ... @@ -617,9 +660,14 @@ function gridInit(id){
//人气单品
case "editor-hotProduct":
$("#"+id).html("<div id='editor-hotProduct-grid' style='width: 500px; float: left'></div><div class='top20List' style='float: left;margin-left: 40px'></div> ");
$("#"+id+" .top20List").html(common.util.__template2($("#top20Products").html(),topHotProducts));
if(topHotProducts){
$("#"+id+" .top20List").html(common.util.__template2($("#top20Products").html(),topHotProducts));
}else{
$("#"+id+" .top20List").html("最新上架20条加载失败，请重新加载！");
}
g = new common.grid({
hash: false,
el:"#editor-hotProduct-grid",
columns:[
{display:"排序", render:function(item){
... ... @@ -959,7 +1007,7 @@ function untilEditorEvent(id){
}
});
$("#"+id+" nav").hide();
$(".modal-dialog").css("width","900px");
$(".modal-dialog").css("width","1000px");
$(".modal-dialog .modal-body .editor-dialog").css("max-height","650px");
$(".modal-dialog .modal-body .editor-dialog").css("overflow-y","auto");
$(".modal-dialog .modal-body .editor-dialog").css("overflow-x","hidden");
... ... @@ -973,9 +1021,9 @@ function resourcesHtmlInit(item,resName){
"<div class='col-sm-2'><input type=file name='"+ resName +"Image' id='"+ resName +"Image_"+item.__index+"_"+i+"' value='"+picList[i].src+"' /></div>" +
"<div class='col-sm-3'><input type=text class='form-control inputChange' name='url' value='"+ picList[i].url +"' data-index='"+ item.__index +"_"+ i +"' /></div>" +
"<div class='col-sm-2'>" +
"<input type=text class='form-control inputChange' readOnly='true' jsaction='date:end:endTime_"+item.__index+"_"+ i +"' id='startTime_"+item.__index+"_"+ i +"' name='startTime' value='"+ picList[i].startTime +"' data-index='"+ item.__index +"_"+ i +"' /></div>" +
"<input type=text class='form-control inputChange' readOnly='true' jsaction='time:end:endTime_"+item.__index+"_"+ i +"' id='startTime_"+item.__index+"_"+ i +"' name='startTime' value='"+ picList[i].startTime +"' data-index='"+ item.__index +"_"+ i +"' /></div>" +
"<div class='col-sm-2'>" +
"<input type=text class='form-control inputChange' readOnly='true' jsaction='date:start:startTime_"+item.__index+"_"+ i +"' id='endTime_"+item.__index+"_"+ i +"' name='endTime' value='"+ picList[i].endTime +"' data-index='"+ item.__index +"_"+ i +"' /></div>" +
"<input type=text class='form-control inputChange' readOnly='true' jsaction='time:start:startTime_"+item.__index+"_"+ i +"' id='endTime_"+item.__index+"_"+ i +"' name='endTime' value='"+ picList[i].endTime +"' data-index='"+ item.__index +"_"+ i +"' /></div>" +
"<div class='col-sm-1'><span style='white-space: nowrap;'>"+ (picList[i].publishStatus==0?"未发布":"已发布") +"</span></div>" +
"<div class='col-sm-2'>";
if(i == (picList.length-1) && picList.length > 1){
... ... @@ -1177,4 +1225,4 @@ $(document).on("click",".topAdd",function(){
}else{
$(".topTip span").text("商品数量已满8个，无法继续添加商品！");
}
});
\ No newline at end of file
});
... ...
exports.domain = require('../config/common.js').domain;
//exports.domain = require('../config/common.js').domain;
//exports.domain = 'http://localhost:30012';
//exports.domain = 'http://172.16.6.115:8080/platform';
exports.domain = 'http://172.16.6.115:8080/platform';
exports.res = [
{
route: '/supplier/store/decorationDetail/:id/:templateId/:shopType/:shopName',
route: '/supplier/store/decorationDetail/:shopsId/:shopType/:shopsType/:id/',
method: 'GET',
view: 'pages/store/shop2',
src:'/store/shop'
... ... @@ -26,8 +26,7 @@ exports.res = [
method:"POST",
url:"/ShopsDecoratorRest/findShopsDecoratorDetail",
params:[
{name: 'id', type: 'Number'},
{name: 'templateId', type: 'Number'}
{name: 'shopsId', type: 'Number'}
]
},
{//审核
... ... @@ -40,6 +39,14 @@ exports.res = [
{name: 'comment', type: 'String'}
]
},
{//查询店铺品牌
route:"/store/shop-decoration-brands",
method:"POST",
url:"/ShopsDecoratorRest/findBrandsByShopsId",
params:[
{name: 'shopsId', type: 'Number'}
]
},
{//最新上架的商品
route:"/store/shop-decoration-newProducts",
method:"POST",
... ...
... ... @@ -76,17 +76,6 @@
<div class="model-main-left">
<!--商品列表-->
<div class="sortList">（固定内容！）</div>
<!--品牌集合-->
<div class="model-recommend model-brand model-editor" style="display: none" data-toggle="editor-brand" data-title="品牌一览编辑">
<div class="recommendTitle">品牌集合</div>
<div class="recommendDetail brandDetail">
<ul>
[[each resources.brandBrowse.data as item _index]]
<li><a href="[[item.url]]">[[item.name]]</a></li>
[[/each]]
</ul>
</div>
</div>
<!--水牌-->
<div class="model-recommend model-signboard model-editor" data-toggle="editor-signboard" data-title="水牌位编辑">
<div class="recommendDetail signboardDetail">
... ... @@ -141,7 +130,7 @@
<div class="recommendDetail brandDetail">
<ul>
[[each resources.brandBrowse.data as item _index]]
<li><a href="[[item.url]]">[[item.name]]</a></li>
<li><a href="javascript:void(0)">[[item.brandName]]</a></li>
[[/each]]
</ul>
</div>
... ... @@ -274,7 +263,7 @@
<span>品牌一览</span>
<ul>
[[each resources.brandBrowse.data as item _index]]
<li><a href="[[item.url]]"><img src="[[item.src]]"></a></li>
<li><a href="javascript:void(0)"><img src="[[item.brandIco]]"></a></li>
[[/each]]
<div class="clear"></div>
</ul>
... ...