fe / yohobuy-portal-fe · Commits

Go to a project

Authored by weiqingting
Commit ad2a10e7585440bcebaec87dc858a169bd865323 2 parents 65e867f6 dd808d72

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

Inline Side-by-side
Showing 19 changed files with 1249 additions and 179 deletions
... ... @@ -123,7 +123,6 @@ var util = {
}
//获取参数
var params = [];
... ...
... ... @@ -3,10 +3,21 @@ var $ = require('jquery'),
common = require('../common/common');
require('../util/custom.js');
/*
<<<<<<< HEAD
* 获取业务数据
*/
window.NETSALEDATA=require('./partials/data.js');
require('./partials/search-key.js');
require('./partials/size-info.js');
require('./partials/goods-sort.js');
require('./partials/goods-params.js');
/*
* 获取业务数据
*/
window.NETSALEDATA = require('./partials/data.js');
// console.log(NETSALEDATA);
window.NETSALEEDIT = new common.edit('#netsaleAllInfo', {
bucket: 'goodsimg'
});
... ... @@ -45,4 +56,4 @@ NETSALEEDIT.init();
if ($('.contentpanel').data('type') == 'info') {
$('form').find('input').prop('disabled', true);
$('form').find('.btn').addClass('disabled');
}
\ No newline at end of file
}
... ...
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;
console.log(window.NETSALEDATA);
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])};
}
});
});
$("#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...
});
});
... ...
... ... @@ -5,34 +5,51 @@ var searchSortList = window.NETSALEDATA.searchSortList;
for(var i = 0; i < searchSortList.length; i++) {
if(searchSortList[i].modelId == 1)
$("#brand-sort").val(searchSortList[i].intValue);
$("#sort0").val(searchSortList[i].intValue);
else if(searchSortList[i].modelId == 2)
$("#aolai-sort").val(searchSortList[i].intValue);
$("#sort1").val(searchSortList[i].intValue);
else if(searchSortList[i].modelId == 3)
$("#search-sort").val(searchSortList[i].intValue);
$("#sort2").val(searchSortList[i].intValue);
}
var item = [];
for (var i = 0; i < 3; i++) {
item[i] = {
productSkn:window.NETSALEDATA.baseProductInfo.baseProduct.productSkn,
modelId:i + 1,
projectId:1,
intValue:parseInt($("#sort" + i).val())
};
}
$('#add-category').on('click', function () {
var item = window.NETSALEDATA.searchSortList;
console.log(item);
for(var i = 0; i < searchSortList.length; i++) {
if(searchSortList[i].modelId == 1)
searchSortList[i].intValue = $("#brand-sort").val();
else if(searchSortList[i].modelId == 2)
searchSortList[i].intValue = $("#aolai-sort").val();
else if(searchSortList[i].modelId == 3)
searchSortList[i].intValue = $("#search-sort").val();
for(var i = 0; i < 3; i++) {
for (var j = 0; j < searchSortList.length; j++) {
if(searchSortList[j].modelId == item[i].modelId) {
item[i].id = searchSortList[j].id;
break;
}
}
}
window.NETSALEDATA.searchSortList = item;
$('#sort-save').on('click', function () {
common.util.__ajax({
url:'/netSale/saveSearchSort',
data:{"searchSortList":searchSortList}
data:{searchSortList:JSON.stringify(window.NETSALEDATA.searchSortList)}
},function() {
});
});
});
$("#sort0").on('change', function() {
window.NETSALEDATA.searchSortList[0].intValue = parseInt($("#sort0").val());
});
$("#sort1").on('change', function() {
window.NETSALEDATA.searchSortList[1].intValue = parseInt($("#sort1").val());
});
$("#sort2").on('change', function() {
window.NETSALEDATA.searchSortList[2].intValue = parseInt($("#sort2").val());
});
\ No newline at end of file
... ...
var $ = require('jquery'),
common = require('../../common/common');
var searchKeys = window.NETSALEDATA.productExtBo.searchKeys || "";
$("#searchKeys").val(window.NETSALEDATA.productExtBo.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>';
}
}]
});
$("#searchKeys").val(searchKeys);
var g = new common.grid({
el: "#search-key",
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();
});
g.init('/netSale/queryHotSearchTerms');
$(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) {
$(document).on('click', '.add', function() {
var item = g.rows[$(this).data("index")];
var value = $("#searchKeys").val();
if (value) value += ",";
$("#searchKeys").val(value + item.content);
});
\ No newline at end of file
});
});
\ No newline at end of file
... ...
var $ = require('jquery'),
common = require('../../common/common');
// window.NETSALEDATA=require('./data.js');
// var referenceSize = "";
// for(var i = 0; i < window.NETSALEDATA.sizeInfo.sizeBoList.length; i++) {
// referenceSize += window.NETSALEDATA.sizeInfo.sizeBoList[i].sizeName + " ";
// var sec = window.NETSALEDATA.sizeInfo.sizeBoList[i].sortAttributes;
// for(var j = 0; j < window.NETSALEDATA.sizeInfo.sizeBoList[i].sortAttributes.length; j++) {
// if(j > 0
// && window.NETSALEDATA.sizeInfo.sizeBoList[i].sortAttributes[j].sizeValue != ""
// && window.NETSALEDATA.sizeInfo.sizeBoList[i].sortAttributes[j].sizeValue != null) referenceSize += "/";
// referenceSize += window.NETSALEDATA.sizeInfo.sizeBoList[i].sortAttributes[j].sizeValue;
// }
// referenceSize += "\t";
// }
// var html = "<table style='width:100%;valign:top;'>";
// for (var x = 0; x < machines.length; x++) {
// if ($(this).attr("id") == machines[x].ID.substring(0, 3))
// html += ("<tr><td><input type='checkbox' id='" + machines[x].ID + "' />" + machines[x].ID + "</td></tr>");
// }
// html += "</table>";
// $("#grid_machines td[id=" + $(this).attr("id") + "]").append(html);
// $("#reference-size").val(referenceSize);
// for(var sizeAttributeBo in window.NETSALEDATA.sizeInfo.sizeAttributeBos) {
// if(sizeAttributeBo.attributeNam == "厚") {
// $("#height").val(sizeAttributeBo.id);
// } else if(sizeAttributeBo.attributeNam == "宽") {
// $("#width").val(sizeAttributeBo.id);
// } else if(sizeAttributeBo.attributeNam == "长") {
// $("#length").val(sizeAttributeBo.id);
// }
// }
$("#body").html(common.util.__template2($("#template").html(),window.NETSALEDATA.sizeInfo));
\ No newline at end of file
$("#body").html(common.util.__template2($("#template").html(),window.NETSALEDATA.sizeInfo||{}));
\ No newline at end of file
... ...
... ... @@ -47,15 +47,15 @@ var $ = require('jquery'),
new common.dropDown({el: "#producttype"});
},
detailtoast:function(index) {
detailtoast:function(obj) {
common.dialog({
title:"商品池详情",
content:'<div id="faGrid" style="height: 600px;overflow:auto;"></div>',
button:[{value:"添加", callback:function() {
var e = new common.edit("#baseform", {bucket: "productPool"});
var e = new common.edit("#base-form", {bucket: "productPool"});
common.dialog.confirm("添加商品池",
common.util.__template($("#template1").html(), {}),
common.dialog.confirm("添加商品池记录",
common.util.__template($("#template1").html(), {poolId:obj.id,producttype:obj.producttype}),
function() {
e.submit("/market/productPool/addProductPoolDetailBo",function(option){
//option.data;
... ... @@ -75,7 +75,7 @@ var $ = require('jquery'),
var grid = new common.grid({
el:"#faGrid",
parms: function() {
return {id: index};
return {id: obj.id};
},
columns:[
{display:"ID", name:"id"},
... ... @@ -91,12 +91,17 @@ var $ = require('jquery'),
grid.init('/market/productPool/queryProductPoolDetailPage');
$(document).on('click', '.delbtn', function() {
var item = grid.rows[$(this).data("index")];
common.util.__ajax({
url:'/market/productPool/deleteProductPoolDetailBo',
data:{id:item.id}
},function(res) {
grid.reload();
});
common.dialog.confirm("警告",
"确认删除？",
function() {
common.util.__ajax({
url:'/market/productPool/deleteProductPoolDetailBo',
data:{id:item.id}
},function(res) {
grid.reload();
});
});
});
}
};
... ... @@ -107,7 +112,8 @@ var $ = require('jquery'),
$(document).on("click", ".detail", function() {
var item=g.rows[$(this).data("index")];
Bll.detailtoast(item.id);
console.log(item);
Bll.detailtoast(item);
});
$(document).on("click","#filter-btn",function () {
... ...
//店铺装修
'use strict';
var $ = require('jquery'),
common=require('../common/common');
$('.tabheader .nav-tabs li').on('click',function(){
$(this).addClass('active').siblings('li').removeClass('active');
var className = $(this).attr("data-toggle")+"-single";
$('.'+className).show().siblings('.contentpanel').hide();
});
$(".contentpanel-pc .model-editor").hover(
function () {
var _this = $(this);
var editorIcon = "<div class='editorBorder'></div>" +
"<a class='editorIcon' href='javascrip:'>编辑</a>"
_this.append(editorIcon);
editorIconEvent();
},
function () {
$(".editorIcon").remove();
$(".editorBorder").remove();
}
);
function editorIconEvent(){
$('.editorIcon').on('click',function(){
common.dialog.confirm(
"编辑",
common.util.__template2($("#template").html(),{name:""}),
function(){
//alert('ok');
},
function(){
//alert('no');
}
);
})
}
var json = {
"shopsId":1,
"platform": "APP",
"templateName": "BASE",
"resources":{
"shopTopBanner":{
"id":7,
"name":"shopTopBanner",
"data":
{
"src": "http://img10.static.yhbimg.com/taobaocms/2016/01/25/12/0155598441256e46ec285a8ea64e762394.png",
"isShowShopName": "Y"
}
},
"productDetailTopBanner":{
"id":8,
"name": "productDetailTopBanner",
"data":
{
"src": "http://img10.static.yhbimg.com/taobaocms/2016/01/25/12/015}5598441256e46ec285a8ea64e762394.png"
}
},
"oneRowTwoColImages":{
"id":9,
"name": "oneRowTwoColImages",
"data": [
{
"position": 1,
"src": "http://img10.static.yhbimg.com/taobaocms/2016/01/25/12/0155598441256e46ec285a8ea64e762394.png",
"url": {},
"startTime": 1309514897,
"endTime": 1309514967,
"publishStatus": 0
},
{
"position": 2,
"src": "http://img10.static.yhbimg.com/taobaocms/2016/01/25/12/0155598441256e46ec285a8ea64e762394.png",
"url": {},
"startTime": 1309514897,
"endTime": 1309514967,
"publishStatus": 0
}
]
},
"hotProducts":{
"id":9,
"name": "hotProducts",
"data": [
50000881,
50000882,
50000883,
50000884,
50000885,
50000886,
50000887,
50000888
]
}
}
}
var mainHtml = common.util.__template2($("#shopWeb-pc").html(),json);
$('#main').html(mainHtml);
... ...
... ... @@ -21,4 +21,6 @@
@import "module/supplier";
@import "module/product";
@import "module/brand";
@import "module/template";
\ No newline at end of file
@import "module/template";
@import "module/shop-pc";
@import "module/shop-app";
\ No newline at end of file
... ...
/*
app端店铺模板css
*/
.contentpanel-app {color: #585858; font-size: 12px; font-family:'Microsoft YaHei'}
.contentpanel-app *{margin: 0;padding: 0;box-sizing: border-box }
.contentpanel-app ul {list-style: none;}
.contentpanel-app a {color: #585858; text-decoration: none}
.contentpanel-app a:hover{text-decoration: underline}
.contentpanel-app img {border-style: none;}
/*------------------------wrap--------------------------*/
.contentpanel-app{
width: 100%;
margin: 0 auto 20px;
background: #f5f7f6;
max-width: 640px;
}
/*------------------------banner--------------------------*/
.contentpanel-app .model-banner{
width: 100%;
height: 100px;
}
.contentpanel-app .model-banner img{
width: 100%;
height: 100px;
}
/*------------------------nav--------------------------*/
.contentpanel-app .model-nav{
background: #fff;
}
.contentpanel-app .model-nav ul li{
float: left;
width: 25%;
line-height: 20px;
padding: 0 10px;
font-size: 14px;
border-right: 2px solid #ccc;
margin: 10px 0;
text-align: center;
}
.contentpanel-app .model-nav ul li a{color: #ccc; font-weight: bold}
.contentpanel-app .model-nav ul li.active a{color: #585858}
/*------------------------main--------------------------*/
.contentpanel-app .model-main{
clear: both;
width: 100%;
background: #f5f7f6;
padding-bottom: 10px;
}
/*------------------------品牌一览（多品牌商铺专有）--------------------------*/
.contentpanel-app .brand-list{
text-align: center;
margin-bottom: 5px;
}
.contentpanel-app .brand-list span{
display: block;
padding: 10px 0;
font-size: 16px;
font-weight: bold;
}
.contentpanel-app .brand-list ul{
border: solid #ccc;
border-width:1px 0 0px 0 ;
}
.contentpanel-app .brand-list ul li{
float: left;
width: 25%;
padding: 5px;
}
.contentpanel-app .brand-list ul li a{
display: block;
width: 100%;
height: 60px;
}
.contentpanel-app .brand-list ul li img{
width: 100%;
height: 60px;
}
/*------------------------大图--------------------------*/
.contentpanel-app .largePic img{
width: 100%;
height: 100px;
}
/*------------------------小图--------------------------*/
.contentpanel-app .model-smallPic{
width: 90%;
height: 80px;
margin: 10px auto;
background: #fff;
}
.contentpanel-app .model-smallPic ul li{
float: left;
width: 50%;
height: 80px;
}
.contentpanel-app .model-smallPic img{
width: 100%;
height: 100%;
border:0px solid #000;
}
.contentpanel-app .pic_2{
padding-right: 5px;
}
.contentpanel-app .pic_1{
padding-left: 5px;
}
/*------------------------热门品类--------------------------*/
.contentpanel-app .sortList{
width: 100%;
}
.contentpanel-app .sortList span{
display: block;
text-align: center;
padding: 10px;
width: 90%;
background: #fff;
margin: 0 auto;
font-size: 16px;
color: #999;
font-weight: bold;
}
.contentpanel-app .sortList .tableBorder{
border-top: 1px solid #ccc;
border-bottom: 1px solid #ccc;
position: relative;
}
.contentpanel-app .sortList .tableBorder .line{
width: 100%;
height: 1px;
background: #ccc;
position:absolute;
top: 50%;
}
.contentpanel-app .sortList table{
width: 95%;
margin-top: 10px;
border:solid #ccc;
border-width:0px 0px 0px 0px;
margin: 0 auto;
}
.contentpanel-app .sortList table td{
border:solid #ccc;
border-width:0px 1px 0px 0px;
padding: 10px 5px 5px;
width: 25%;
}
.contentpanel-app .sortList table td.noRightBorder{
border-width:0px 0px 0px 0px;
}
.contentpanel-app .sortList table td img{
width: 100%;
height: 60px;
}
.contentpanel-app .sortList table td a{
display: block;
text-align: center;
}
/*------------------------人气单品--------------------------*/
.contentpanel-app .model-show{
width: 100%;
background: #fff;
}
.contentpanel-app .showTitle{
width: 100%;
height: 50px;
line-height: 50px;
text-align: center;
position: relative;
box-sizing: content-box;
border-bottom: 1px solid #ccc;
}
.contentpanel-app .showTitle span{
font-size: 16px;
font-weight: bold;
color: #585858;
}
.contentpanel-app .showTitle a{
display: block;
position: absolute;
top:0;
right: 10px;
}
/*------------------------人气单品详情--------------------------*/
.contentpanel-app .model-showDetail{
padding: 10px 5px;
}
.contentpanel-app .model-showDetail ul li{
float: left;
width: 50%;
padding: 0 5px;
position: relative;
margin-bottom: 5px;
}
.contentpanel-app .model-showDetail ul li img{
width: 100%;
height: 150px;
}
.contentpanel-app .shadow{
width: 100%;
background: #666;
opacity: 0.5;
padding: 0 5px;
margin-top: -3px;
}
.contentpanel-app .model-showDetail ul li a{
display: block;
font-size: 14px;
color: #fff;
}
.contentpanel-app .model-showDetail ul li b{
display: block;
color: #fff;
}
... ...
/*
pc端店铺模板css
*/
.contentpanel-pc {color: #585858; font-size: 12px; font-family:'Microsoft YaHei'}
.contentpanel-pc *{margin: 0;padding: 0;box-sizing: border-box }
.contentpanel-pc ul {list-style: none;}
.contentpanel-pc a {color: #585858; text-decoration: none}
.contentpanel-pc a:hover{text-decoration: underline}
.contentpanel-pc img {border-style: none; }
/*清浮动*/
.contentpanel-pc .clear {clear: both}
/*------------------------wrap--------------------------*/
.contentpanel-pc{
width: 990px;
margin: 0 auto;
margin-bottom: 20px;
}
/*------------------------banner--------------------------*/
.contentpanel-pc .model-banner{
width: 100%;
height: 150px;
}
.contentpanel-pc .model-banner img{
width: 100%;
height: 150px;
}
/*------------------------nav--------------------------*/
.contentpanel-pc .model-nav{
background: #585858;
height: 50px;
}
.contentpanel-pc .model-nav ul li{
float: left;
width: 150px;
line-height: 50px;
padding: 0 20px;
font-size: 16px;
}
.contentpanel-pc .model-nav ul li a{
color: #fff;
font-size: 16px;
}
/*------------------------main--------------------------*/
.contentpanel-pc .model-main{
clear: both;
margin-top: 10px;
width: 100%;
}
/*------------------------main-left--------------------------*/
.contentpanel-pc .model-main-left{
float: left;
width: 20%;
padding-right: 10px;
}
/*------------------------商品分类列表--------------------------*/
.contentpanel-pc .sortList{
width: 100%;
height: 300px;
background: #f5f7f6;
}
.contentpanel-pc .sortList a{ color: #585858}
/*------------------------推荐总样式--------------------------*/
.contentpanel-pc .model-recommend{
width: 100%;
margin-top: 10px;
}
.contentpanel-pc .recommendTitle{
width: 100%;
height: 40px;
line-height: 40px;
background: #585858;
color: #fff;
text-align: center;
font-size: 16px;
}
.contentpanel-pc .recommendDetail{
padding: 5px 0;
}
.contentpanel-pc .recommendDetail ul li{
background: #f5f7f6;
margin: 5px 0;
padding: 5px 10px;
}
/*------------------------品牌集合（多品牌商铺专有）--------------------------*/
.contentpanel-pc .brandDetail ul li{
font-size: 14px;
padding: 10px 20px;
}
/*------------------------经典推荐--------------------------*/
.contentpanel-pc .typicRecommendDetail ul li a{
display: inline-block;
width: 60%;
height: 30px;
line-height: 30px;
color: #585858;
font-size: 14px;
}
.contentpanel-pc .typicRecommendDetail ul li img{
display: block;
float: right;
height: 30px;
width: 40px;
}
/*------------------------热销推荐--------------------------*/
.contentpanel-pc .hotRecommendDetail ul li{
padding: 0;
}
.contentpanel-pc .hotRecommendDetail ul li a img{
width: 100%;
height: 200px;
}
/*------------------------main-right--------------------------*/
.contentpanel-pc .model-main-right{
float: left;
width: 80%;
padding-left: 10px;
}
/*------------------------slide--------------------------*/
.contentpanel-pc .model-slide{
float: left;
width: 480px;
height: 270px;
}
.contentpanel-pc .model-slide img{
display: block;
width: 100%;
height: 270px;
}
/*------------------------资源位小图--------------------------*/
.contentpanel-pc .model-sourcePic{
float: left;
height: 270px;
padding-left: 20px;
}
.contentpanel-pc .model-sourcePic ul li{
width: 100%;
}
.contentpanel-pc .model-sourcePic img{
display: block;
width: 280px;
height: 130px;
margin-bottom: 10px;
}
.contentpanel-pc .model-sourcePic img:last{margin-bottom: 0}
/*------------------------商品展示--------------------------*/
.contentpanel-pc .model-show{
clear: both;
margin-top: 20px;
}
.contentpanel-pc .model-showTitle{
position: relative;
margin-bottom: 20px;
}
.contentpanel-pc .model-showTitle .showName{
height: 40px;
width: 200px;
padding: 0 20px;
line-height: 40px;
margin: 0 auto;
font-weight: bold;
font-size: 16px;
text-align: center;
border: 1px solid #585858;
}
.contentpanel-pc .model-showTitle .showTab{
position: absolute;
line-height: 40px;
top: 0;right: 0;
}
.contentpanel-pc .model-showDetail{
width: 792px;
}
.contentpanel-pc .model-showDetail ul li{
float: left;
width: 188px;
background: #f5f7f6;
margin-right: 10px;
margin-bottom: 10px;
}
.contentpanel-pc .model-showDetail ul li img{
display: block;
width: 100%;
height: 250px;
}
.contentpanel-pc .model-showDetail ul li a{
display: block;
text-align: center;
height: 30px;
line-height: 30px;
font-size: 14px;
font-weight: bold;
}
.contentpanel-pc .model-showDetail ul li b{
display: block;
text-align: center;
padding-bottom: 10px;
}
/*
鼠标hover编辑样式
*/
.contentpanel-pc .model-editor{
position: relative;
}
.contentpanel-pc .editorIcon{
position: absolute;
display: block;
top: 5px;
right: 5px;
width: 50px;
height: 30px;
line-height: 30px;
text-align: center;
font-size: 14px;
font-weight: bold;
background: deepskyblue;
color: #fff;
font-weight: bold;
/*opacity: 0.8;*/
}
.contentpanel-pc .model-editor .editorBorder{
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0px;
border: 5px solid lawngreen;
}
/******* showTab定制 ********/
.contentpanel-pc .showTab .editorBorder{
height: 60px;
top: -20px;
}
.contentpanel-pc .showTab .editorIcon{
top: -15px;
}
/******* showDetail定制 ********/
.contentpanel-pc .model-showDetail .editorBorder{
width: 782px;
}
.contentpanel-pc .model-showDetail .editorIcon{
right: 15px;
}
\ No newline at end of file
... ...
... ... @@ -17,5 +17,46 @@ exports.res = [
{name: 'page', type: 'number'},
{name: 'size', type: 'number', def: 10}
]
},
{
route:'/netSale/queryHotSearchTerms',
method:'POST',
url: '/searchWords/queryHotSearchTerms',
params: [
{name: 'page', type: 'number'}
]
},
{
route:'/netSale/getAll4Select',
method:'POST',
url: '/washTips/getAll4Select/',
params: []
},
{
route:'/netSale/queryAllBySortId4Select',
method:'POST',
url: 'productMaterial/queryAllBySortId4Select',
params: [
{name: 'param', type: 'number'}
]
},
{
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: 'washTips', type: 'string'},
{name: 'productMaterial', type: 'string'}
]
}
];
\ No newline at end of file
... ...
... ... @@ -4,6 +4,7 @@ exports.res = [
{
route: '/supplier/shop/decoration',
method: 'GET',
view: 'pages/store/shop'
src: '/store/shop',
view: 'pages/store/shop2'
}
]
\ No newline at end of file
... ...
... ... @@ -88,23 +88,5 @@
<input type="text" class="form-control" id="productskn" value="{productskn}" required="required" />
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="name">名称</label>
<div class="col-sm-8">
<input type="text" class="form-control" id="name" value="{name}" required="required" />
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="brandName">品牌</label>
<div class="col-sm-8">
<input type="text" class="form-control" id="brandName" value="{brandName}" required="required" />
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="sortName">分类</label>
<div class="col-sm-8">
<input type="text" class="form-control" id="sortName" value="{sortName}" required="required" />
</div>
</div>
</div>
</script>
\ No newline at end of file
... ...
<div class="tabheader">
<ul class="nav nav-tabs">
<li data-toggle="contentpanel-pc" class="active"><a href="#">店铺装修(PC端)</a></li>
<li data-toggle="contentpanel-app"><a href="#">店铺装修(移动端)</a></li>
</ul>
</div>
<div class="pageheader">
<div class="media">
<div class="pageicon pull-left">
<i class="fa fa-th-list"></i>
</div>
<div class="media-body">
<ul class="breadcrumb">
<li><a href=""><i class="glyphicon glyphicon-home"></i></a></li>
<li><a href="">店铺管理</a></li>
<li>店铺装修管理</li>
</ul>
<div>
<div class="col-sm-4">
<h4>选择模板</h4>
</div>
<div class="col-sm-8">
<label class="radio-inline"><input type="radio" name="brandLevel" value="1">基础模板</label>
<label class="radio-inline"><input type="radio" name="brandLevel" value="2">模板2</label>
</div>
</div>
</div>
</div>
</div>
<div id="main" class="contentpanel"></div>
<!--pc单品牌-->
<div class="contentpanel contentpanel-pc contentpanel-pc-single" style="display: none">
<div class="model-wrap">
<!--banner-->
<div class="model-banner model-editor"><img src="1.png"></div>
<!--nav-->
<div class="model-nav model-editor">
<ul>
<li><a href="#">店铺首页</a></li>
<li><a href="#">全部商品</a></li>
<li><a href="#">人气单品</a></li>
<li><a href="#">新品上架</a></li>
</ul>
</div>
<!--main-->
<div class="model-main">
<!--左侧main-->
<div class="model-main-left">
<!--商品列表-->
<div class="sortList">
（固定内容！）
<ul>
<li><a href="#">上衣</a></li>
<li><a href="#">下衣</a></li>
<li><a href="#">鞋子</a></li>
<li><a href="#">男装</a></li>
<li><a href="#">女装</a></li>
</ul>
</div>
<!--经典推荐-->
<div class="model-recommend model-typicRecommend model-editor">
<div class="recommendTitle">经典推荐</div>
<div class="recommendDetail typicRecommendDetail">
<ul>
<li><a href="#">军装大衣</a><img src="1.png"></li>
<li><a href="#">保暖军大衣</a><img src="1.png"></li>
<li><a href="#">Disneyskc</a><img src="1.png"></li>
<li><a href="#">耐克</a><img src="1.png"></li>
<li><a href="#">Alomar</a><img src="1.png"></li>
</ul>
</div>
</div>
<!--热门推荐-->
<div class="model-recommend model-hotRecommend model-editor">
<div class="recommendTitle">热销推荐</div>
<div class="recommendDetail hotRecommendDetail">
<ul>
<li><a href="#"><img src="1.png"></a></li>
<li><a href="#"><img src="1.png"></a></li>
</ul>
</div>
</div>
</div>
<!--右侧main-->
<div class="model-main-right">
<!--slide-->
<div class="model-slide model-editor"><img src="1.png"></div>
<!--资源位小图-->
<div class="model-sourcePic">
<ul class="model-editor">
<li class="pic_2"><img src="2.png"></li>
<li class="pic_1"><img src="2.png"></li>
</ul>
</div>
<div class="clear"></div>
<!--商品展示：新品上架-->
<div class="model-show">
<div class="model-showTitle">
<div class="showName model-editor"><span>新品上架&nbsp;&nbsp;NEW</span></div>
<div class="showTab model-editor">
<a href="#">休闲裤</a>&nbsp;|&nbsp;
<a href="#">运动鞋</a>&nbsp;|&nbsp;
<a href="#">MORE</a>
</div>
<div class="clear"></div>
</div>
<div class="model-showDetail model-editor">
<ul>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
</ul>
<div class="clear"></div>
</div>
</div>
<!--商品展示：人气单品-->
<div class="model-show">
<div class="model-showTitle">
<div class="showName model-editor"><span>人气单品&nbsp;&nbsp;HOT</span></div>
<div class="showTab model-editor">
<a href="#">休闲裤</a>&nbsp;|&nbsp;
<a href="#">运动鞋</a>&nbsp;|&nbsp;
<a href="#">MORE</a>
</div>
<div class="clear"></div>
</div>
<div class="model-showDetail model-editor">
<ul>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
</ul>
<div class="clear"></div>
</div>
</div>
</div>
<div class="clear"></div>
</div>
</div>
</div>
<!--app单品牌-->
<div class="contentpanel contentpanel-app contentpanel-app-single" style="display: none">
<div class="model-wrap">
<!--banner-->
<div class="model-banner"><img src="1.png"></div>
<!--nav-->
<div class="model-nav">
<ul>
<li class="active"><a href="#">首页</a></li>
<li><a href="#">上新</a></li>
<li><a href="#">人气</a></li>
<li style="border:0"><a href="#">全部商品</a></li>
<div class="clear"></div>
</ul>
</div>
<!--main-->
<div class="model-main">
<!--大图-->
<div class="largePic"><a href="#"><img src="1.png"></a></div>
<!--小图-->
<div class="model-smallPic">
<ul>
<li class="pic_2"><img src="2.png"></li>
<li class="pic_1"><img src="2.png"></li>
</ul>
</div>
<div class="clear"></div>
<!--热门品类-->
<div class="sortList">
<span>热门品类</span>
<div class="tableBorder">
<table border="0" cellspacing="0" cellpadding="1">
<tr>
<td><img src="3.png"><a href="#">棉羽</a></td>
<td><img src="3.png"><a href="#">夹克</a></td>
<td><img src="3.png"><a href="#">卫衣</a></td>
<td class="noRightBorder"><img src="3.png"><a href="#">毛衣</a></td>
</tr>
<tr>
<td><img src="3.png"><a href="#">休闲裤</a></td>
<td><img src="3.png"><a href="#">牛仔裤</a></td>
<td><img src="3.png"><a href="#">鞋子</a></td>
<td class="noRightBorder"><img src="3.png"><a href="#">配饰</a></td>
</tr>
</table>
<div class="line"></div>
</div>
</div>
</div>
<!--人气单品-->
<div class="model-show">
<div class="showTitle">
<span>人气单品</span>
<a href="#">MORE</a>
</div>
<div class="model-showDetail">
<ul>
<li><img src="3.png"><div class="shadow"><a href="#">商品名称</a><b>￥1790.00</b></div></li>
<li><img src="3.png"><div class="shadow"><a href="#">商品名称</a><b>￥1790.00</b></div></li>
<li><img src="3.png"><div class="shadow"><a href="#">商品名称</a><b>￥1790.00</b></div></li>
<li><img src="3.png"><div class="shadow"><a href="#">商品名称</a><b>￥1790.00</b></div></li>
<li><img src="3.png"><div class="shadow"><a href="#">商品名称</a><b>￥1790.00</b></div></li>
<li><img src="3.png"><div class="shadow"><a href="#">商品名称</a><b>￥1790.00</b></div></li>
<li><img src="3.png"><div class="shadow"><a href="#">商品名称</a><b>￥1790.00</b></div></li>
<li><img src="3.png"><div class="shadow"><a href="#">商品名称</a><b>￥1790.00</b></div></li>
</ul>
<div class="clear"></div>
</div>
</div>
</div>
</div>
<!--pc端店铺模板-->
<script type="text/template" id="shopWeb-pc">
<div class="model-wrap contentpanel-pc">
<!--banner-->
<div class="model-banner model-editor"><img src="[[resources.shopTopBanner.data.src]]"></div>
<!--nav-->
<div class="model-nav model-editor">
<ul>
<li><a href="#">店铺首页</a></li>
<li><a href="#">全部商品</a></li>
<li><a href="#">人气单品</a></li>
<li><a href="#">新品上架</a></li>
</ul>
</div>
<!--main-->
<div class="model-main">
<!--左侧main-->
<div class="model-main-left">
<!--商品列表-->
<div class="sortList">
（固定内容！）
</div>
<!--经典推荐-->
<div class="model-recommend model-typicRecommend model-editor">
<div class="recommendTitle">经典推荐</div>
<div class="recommendDetail typicRecommendDetail">
<ul>
<li><a href="#">军装大衣</a><img src="1.png"></li>
<li><a href="#">保暖军大衣</a><img src="1.png"></li>
<li><a href="#">Disneyskc</a><img src="1.png"></li>
<li><a href="#">耐克</a><img src="1.png"></li>
<li><a href="#">Alomar</a><img src="1.png"></li>
</ul>
</div>
</div>
<!--热门推荐-->
<div class="model-recommend model-hotRecommend model-editor">
<div class="recommendTitle">热销推荐</div>
<div class="recommendDetail hotRecommendDetail">
<ul>
<li><a href="#"><img src="1.png"></a></li>
<li><a href="#"><img src="1.png"></a></li>
</ul>
</div>
</div>
</div>
<!--右侧main-->
<div class="model-main-right">
<!--slide-->
<div class="model-slide model-editor"><img src="1.png"></div>
<!--资源位小图-->
<div class="model-sourcePic">
<ul class="model-editor">
[[each resources.oneRowTwoColImages.data as item _index]]
<li><img src="[[item.src]]"></li>
[[/each]]
</ul>
</div>
<div class="clear"></div>
<!--商品展示：新品上架-->
<div class="model-show">
<div class="model-showTitle">
<div class="showName model-editor"><span>新品上架&nbsp;&nbsp;NEW</span></div>
<div class="showTab model-editor">
<a href="#">休闲裤</a>&nbsp;|&nbsp;
<a href="#">运动鞋</a>&nbsp;|&nbsp;
<a href="#">MORE</a>
</div>
<div class="clear"></div>
</div>
<div class="model-showDetail model-editor">
<ul>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
</ul>
<div class="clear"></div>
</div>
</div>
<!--商品展示：人气单品-->
<div class="model-show">
<div class="model-showTitle">
<div class="showName model-editor"><span>人气单品&nbsp;&nbsp;HOT</span></div>
<div class="showTab model-editor">
<a href="#">休闲裤</a>&nbsp;|&nbsp;
<a href="#">运动鞋</a>&nbsp;|&nbsp;
<a href="#">MORE</a>
</div>
<div class="clear"></div>
</div>
<div class="model-showDetail model-editor">
<ul>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
<li><img src="3.png"><a href="#">介绍内容介绍内容</a><b>￥600</b></li>
</ul>
<div class="clear"></div>
</div>
</div>
</div>
<div class="clear"></div>
</div>
</div>
</script>
\ No newline at end of file
... ...
<div class="panel panel-default">
<form action="" class="form-horizontal form-bordered">
<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>
<div class="panel panel-default" id="taoyu1">
<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">
<div class="form-group">
<label class="col-sm-2 control-label">材质</label>
<div class="col-sm-8 height40">
<label style="cursor: pointer;"><input type="checkbox" name="material" value="1">反光</label>
<label style="cursor: pointer;"><input type="checkbox" name="material" value="2">雪纺</label>
<label style="cursor: pointer;"><input type="checkbox" name="material" value="3">太空棉</label>
<label style="cursor: pointer;"><input type="checkbox" name="material" value="4">PU</label>
<label style="cursor: pointer;"><input type="checkbox" name="material" value="5">麻</label>
<label style="cursor: pointer;"><input type="checkbox" name="material" value="6">毛呢</label>
<label style="cursor: pointer;"><input type="checkbox" name="material" value="7">羊毛/羊绒</label>
<label style="cursor: pointer;"><input type="checkbox" name="material" value="8">尼龙/棉纶</label>
<label style="cursor: pointer;"><input type="checkbox" name="material" value="9">绵</label>
<label style="cursor: pointer;"><input type="checkbox" name="material" value="10">涤纶/聚酯纤维</label>
<label style="cursor: pointer;"><input type="checkbox" name="material" value="11">丹宁</label>
</div>
<input type="hidden" id="material" value="{material}" for="checkbox">
</div>
<div class="form-group">
<label class="col-sm-2 control-label">洗涤提示</label>
<div class="col-sm-8 height40">
<label style="cursor: pointer;"><input type="checkbox" name="alert" value="1">不可熨烫</label>
<label style="cursor: pointer;"><input type="checkbox" name="alert" value="2">不可转笼翻转干燥</label>
<label style="cursor: pointer;"><input type="checkbox" name="alert" value="3">30度水温弱速洗</label>
<label style="cursor: pointer;"><input type="checkbox" name="alert" value="4">不可氯漂</label>
<label style="cursor: pointer;"><input type="checkbox" name="alert" value="5">不可干洗</label>
<label style="cursor: pointer;"><input type="checkbox" name="alert" value="6">不可拧干</label>
<label style="cursor: pointer;"><input type="checkbox" name="alert" value="7">分色洗涤</label>
</div>
<input type="hidden" id="alert" value="{alert}" for="checkbox">
</div>
<h2 class="panel-title">商品参数</h2>
</div>
<div class="panel-body nopadding">
<div class="form-group" id="material-group">
</div>
<div class="panel-footer">
<button class="btn btn-primary">保存</button>
<div class="form-group" id="washTip-group">
</div>
</form>
</div>
\ No newline at end of file
</div>
<div class="panel-footer">
<button class="btn btn-primary" id="propertySave">保存</button>
</div>
</div>
<script type="text/template" id="material-params">
<label class="col-sm-2 control-label">材质</label>
<div class="col-sm-8 height40">
[[each data as item index]]
<label style="cursor: pointer;"><input type="checkbox" name="material" class="material" value=[[item.id]]>[[item.text]]</label>
[[/each]]
</div>
<input type="hidden" id="material" value="{material}" for="checkbox">
</script>
<script type="text/template" id="washTip-params">
<label class="col-sm-2 control-label">洗涤提示</label>
<div class="col-sm-8 height40">
[[each data as item index]]
<label style="cursor: pointer;"><input type="checkbox" name="washTips" class="washTips" value=[[item.id]]>[[item.text]]</label>
[[/each]]
</div>
<input type="hidden" id="washTips" value="{washTips}" for="checkbox">
</script>
\ No newline at end of file
... ...
... ... @@ -8,17 +8,17 @@
</div>
<div class="panel-body nopadding" id="goods-sort">
<div class="form-group">
<label class="col-sm-1 control-label" for="brand-sort">品牌：</label>
<label class="col-sm-1 control-label" for="sort0">品牌</label>
<div class="col-sm-2">
<input type="text" class="form-control" id="brand-sort" value="{brand-sort}" required="required" />
<input type="text" class="form-control" id="sort0" value="0" required="required" />
</div>
<label class="col-sm-1 control-label" for="aolai-sort">奥莱</label>
<label class="col-sm-1 control-label" for="sort1">奥莱</label>
<div class="col-sm-2">
<input type="text" class="form-control" id="aolai-sort" value="{aolai-sort}" required="required" />
<input type="text" class="form-control" id="sort1" value="0" required="required" />
</div>
<label class="col-sm-1 control-label" for="search-sort">搜索</label>
<label class="col-sm-1 control-label" for="sort2">搜索</label>
<div class="col-sm-2">
<input type="text" class="form-control" id="search-sort" value="{search-sort}" required="required" />
<input type="text" class="form-control" id="sort2" value="0" required="required" />
</div>
</div>
<div class="col-sm-12" style="color: red;"><div class="col-sm-1"></div>提示：商品在品牌商品列表中的排序，数字越大越靠前</div>
... ...
... ... @@ -23,6 +23,6 @@
</div>
</div>
<div class="panel-footer">
<button class="btn btn-primary">保存</button>
<button class="btn btn-primary" id="save-searchKey">保存</button>
</div>
</div>
\ No newline at end of file
... ...
... ... @@ -12,25 +12,30 @@
</form>
</div>
<script type="text/template" id="template">
<div class="row">
<div class="panel-col">
<p>参考尺码</p>
<p>
[[each sizeBoList as item index]]
<span>[[item.sizeName]]</span>
<p>
<table class="table table-striped table-bordered responsive dataTable no-footer">
<thead>
<tr>
<td>参考尺码</td>
[[each sizeAttributeBos as item index]]
<td>[[item.attributeName]]</td>
[[/each]]
</tr>
</thead>
<tbody>
<tr>
<td>
[[each sizeBoList as item index]]
<def>[[item.sizeName]]</def>
[[each item.sortAttributes as item1 index1]]
<span>item1.sizeValue</span>
<def>[[item1.sizeValue]]</def>/
[[/each]]
</p>
[[/each]]
</td>
[[each sizeAttributeBos as item index]]
<td>[[item.id]]</td>
[[/each]]
</p>
</div>
[[each sizeAttributeBos as item index]]
<div class="panel-col">
<p>[[item.attributeName]]</p>
<p>[[item.id]]</p>
</div>
[[/each]]
</div>
</tr>
</tbody>
</table>
</script>
\ No newline at end of file
... ...