fe / yohobuy-portal-fe · Commits

Go to a project

Authored by uedxwg
Commit 5ad12d0a419e9b8148c7bbab0c526a43c0c75353 2 parents ce31420e b8d9159a

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

Inline Side-by-side
Showing 16 changed files with 1009 additions and 1049 deletions
/**
* Created by wangqianjun on 16/2/2.
*/
var grid=require('../common/grid');
exports.init = function() {
var g=new grid({
el:"#basicTable",
//parms:function(){
//
// return {
// id:!!~$.trim($('#supplier-name').val())?$('#supplier-name').val():"",
// status:!!~$.trim($('#status').val())?$('#status').val():"",
// timeSort:!!~$.trim($('#time-sort').val())?$('#time-sort').val():"",
// isFreeze:!!~$.trim($('#isFreeze').val())?$('#isFreeze').val():""
// };
//},
columns:[
{display:"SKN",name:"skn"},
{display:"市场价",name:"marketPrice"}
]
});
// 路由
g.init('/erpproduct/price/index1');
}
\ No newline at end of file
... ... @@ -91,9 +91,9 @@ grid.prototype={
},
__getparams:function(){
var g = this, p = this.options;
if (!p.page) p.page = 1;
//if (!p.page) p.page = 1;
var param = {};
//urlArr = location.hash.substring(1).split('&&');
urlArr = location.hash.substring(1).split('&&');
if (p.parms) {
if (typeof (p.parms) == "function") {
... ... @@ -101,28 +101,34 @@ grid.prototype={
}
}
/*$.each(urlArr, function(i, value){
//param.page = p.page;
param.size = p.size;
$.each(urlArr, function(i, value){
var result = value.split('='),
key = result[0],
value = result[1];
if (key !== '') {
if (key !== undefined) {
param[key] = value;
}
});*/
});
if (p.page) {
param.page = p.page;
}
if (p.status !== undefined) {
console.log(p.status);
param.status = p.status;
}
param.page = p.page;
param.size = p.size;
console.log(param);
var html = '';
$.each(param, function(key, value) {
if (value !== '') {
if (value !== '' && !isNaN(value)) {
html += key + '=' + value + '&&';
}
});
... ... @@ -143,6 +149,7 @@ grid.prototype={
onPageClick: function(pageNumber, event) {
p.page = pageNumber;
g.renderBody();
//g.__getparams();
return false;
}
});
... ... @@ -269,13 +276,11 @@ grid.prototype={
p[key] = value;
});
}
//p.page=1;
g.__bodyload();
}
},
}
module.exports=grid;
... ...
/**
* 商品管理列表
*/
'use strict';
var $ = require('jquery'),
Handlebars = require('yoho.handlebars'),
grid = require('../common/grid'),
dropDown = require('../common/dropDown');
require('../util/jquery.simplePagination');
require('../util/jquery.gritter');
exports.init = function() {
//下拉框
$('.select2-offscreen').select2();
new dropDown({
el:'#brand-id',
ajax:'brand'
});
var btnAuthority = JSON.parse($('#btnAuthority').val());
var g = new grid({
el: '#basicTable',
size: 10,
parms: function() {
return {
skn: $.trim($('#skn').val()) || '',
brandName: $.trim($('#brand-name').val()) || '',
storeName: $.trim($('#store-name').val()) || '',
status: $.trim($('#status').val()) || '',
jit: $.trim($('#jit').val()) || ''
};
},
columns: [
{display: 'SKN', name: 'skn'},
{display: '图片', name: "goodsIcon", render: function(item) {
return '<img src="' + item.goodsIcon + '">';
}},
{display: '商品名称', name: "goodsName"},
{display: '品牌', name: "brandName"},
{display: '吊牌价', name: "price"},
{display: '更新时间', name: "updateTime"},
{display: '操作', name:"status", render: function(items) {
var HtmArr = [];
if (btnAuthority.detail) {
HtmArr.push('<a href="supplier/baseaudit/info?product_skn='+ items.skn+'"" class="btn btn-info btn-xs">详情</a>');
}
if (items.status === 0) {
HtmArr.push('<a data-id="' + items.id + '" href="JavaScript:;" class="btn btn-warning btn-xs open-brand">开启品牌</a>');
}
if (items.status === 1) {
HtmArr.push('<a data-id="' + items.id + '" href="JavaScript:;" class="btn btn-danger btn-xs close-brand">关闭品牌</a>');
}
return HtmArr.join('');
}}
]
})
g.init($("#gridurl").val());
}
\ No newline at end of file
... ...
... ... @@ -29,4 +29,4 @@ $('.leftpanel .nav .parent>a').click(function() {
}
}
return false;
});
\ No newline at end of file
});
... ...
@import "compass";
@import "module/default", "module/list";
@import "module/default";
@import "module/datepicker";
@import "module/edit";
@import "module/supplier";
... ...
.panel-input {
display: inline-block;
width: 280px;
width: 100%;
}
.panel-col, .panel-col2 {
float: left;
width: 150px;
margin: 0 10px 0 0;
}
.panel-col2 {
width: 280px;
}
\ No newline at end of file
... ...
.list-filter {
input[type="text"], select{
display: inline-block;
width: 200px;
}
}
.list-tabs {
margin: 50px 0 0;
}
.list-table {
margin: 20px 0 0;
}
.coupon-list-table {
margin: 20px 0 0;
th {
text-align: center;
}
td {
display: table-cell;
vertical-align: middle !important;
line-height: 1;
text-align: center;
p {
margin: 0;
}
}
td.id {
width: 18%;
}
td.info {
width: 23%;
text-align: left;
}
td.time {
width: 11%;
}
td.describe {
width: 16%;
}
td.staff {
width: 7%;
}
td.state {
width: 11%;
.state-reason {
color: red;
word-break:break-all;
}
}
td.operate {
&.wait {
a.apply-success, a.apply-back, a.apply-cancel {
display: inline-block;
}
}
&.success {
a.apply-cancel {
display: inline-block;
}
}
&.back {
a.apply-modify {
display: inline-block;
}
}
p {
margin: 5px 0;
}
a {
display: none;
&.apply-detail {
display: inline-block;
}
}
}
}
.send-list {
td.time {
width: 160px;
}
td.info {
width: 352px;
}
}
.couponview{
.red{
color: #dd514c;
padding: 0 5px;
}
}
\ No newline at end of file
... ... @@ -10,74 +10,6 @@
width: 280px;
}
/*列表页操作按钮*/
.supplier-manage-operate {
.btn-freeze {
display: inline-block;
}
.btn-recovery {
display: none;
}
&.valid0 {
.btn-freeze {
display: none;
}
.btn-recovery {
display: inline-block;
}
}
&.status0 {
.btn-edit, .btn-recovery, .btn-freeze {
display: none;
}
}
}
.supplier-operate {
&.status0 {
.btn-edit, .btn-submit {
display: none;
}
}
}
.brand-operate {
&.operate1 {
.open-brand {
display: none;
}
}
&.operate0 {
.close-brand {
display: none;
}
}
}
.pact-operate {
&.operate0 {
.btn-edit {
display: none;
}
}
}
.pact-manage-operate {
&.operate0, &.operate2, &.status0 {
.renew-btn, .relieve-btn {
display: none;
}
}
}
.contentpanel td {
a {
margin: 0 3px;
... ...
@charset "UTF-8";
ul {
margin-top: 0;
}
.admin-icon-yellow {
color: #ffbe40;
}
.admin-header {
font-size: 1.4rem;
margin-bottom: 0;
}
.admin-header-list a:hover :after {
content: none;
}
.admin-main {
background: #f3f3f3;
}
.admin-menu {
position: fixed;
z-index: 10;
bottom: 30px;
right: 20px;
}
.admin-sidebar {
width: 260px;
min-height: 100%;
float: left;
border-right: 1px solid #cecece;
}
.admin-sidebar-list {
margin-bottom: 0;
}
.admin-sidebar-list li a {
color: #5c5c5c;
padding-left: 24px;
}
.admin-sidebar-list li:first-child {
border-top: none;
}
.admin-sidebar-sub {
margin-top: 0;
margin-bottom: 0;
box-shadow: 0 16px 8px -15px #e2e2e2 inset;
background: #ececec;
padding-left: 24px;
}
.admin-sidebar-sub li:first-child {
border-top: 1px solid #dedede;
}
.admin-sidebar-panel {
margin: 10px;
}
.admin-content {
width: auto;
overflow: hidden;
height: 100%;
background: #fff;
}
.admin-content-list {
border: 1px solid #e9ecf1;
margin-top: 0;
}
.admin-content-list li {
border: 1px solid #e9ecf1;
border-width: 0 1px;
margin-left: -1px;
}
.admin-content-list li:first-child {
border-left: none;
}
.admin-content-list li:last-child {
border-right: none;
}
.admin-content-table a {
color: #535353;
}
.admin-content-file {
margin-bottom: 0;
color: #666;
}
.admin-content-file p {
margin: 0 0 5px 0;
font-size: 1.4rem;
}
.admin-content-file li {
padding: 10px 0;
}
.admin-content-file li:first-child {
border-top: none;
}
.admin-content-file li:last-child {
border-bottom: none;
}
.admin-content-file li .am-progress {
margin-bottom: 4px;
}
.admin-content-file li .am-progress-bar {
line-height: 14px;
}
.admin-content-task {
margin-bottom: 0;
}
.admin-content-task li {
padding: 5px 0;
border-color: #eee;
}
.admin-content-task li:first-child {
border-top: none;
}
.admin-content-task li:last-child {
border-bottom: none;
}
.admin-task-meta {
font-size: 1.2rem;
color: #999;
}
.admin-task-bd {
font-size: 1.4rem;
margin-bottom: 5px;
}
.admin-content-comment {
margin-bottom: 0;
}
.admin-content-comment .am-comment-bd {
font-size: 1.4rem;
}
.admin-content-pagination {
margin-bottom: 0;
}
.admin-content-pagination li a {
padding: 4px 8px;
}
@media only screen and (min-width: 641px) {
.admin-sidebar {
display: block;
position: static;
background: none;
}
.admin-offcanvas-bar {
position: static;
width: auto;
background: none;
-webkit-transform: translate3d(0, 0, 0);
-ms-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
}
.admin-offcanvas-bar:after {
content: none;
}
}
@media only screen and (max-width: 640px) {
.admin-sidebar {
width: inherit;
}
.admin-offcanvas-bar {
background: #f3f3f3;
}
.admin-offcanvas-bar:after {
background: #BABABA;
}
.admin-sidebar-list a:hover, .admin-sidebar-list a:active {
-webkit-transition: background-color .3s ease;
-moz-transition: background-color .3s ease;
-ms-transition: background-color .3s ease;
-o-transition: background-color .3s ease;
transition: background-color .3s ease;
background: #E4E4E4;
}
.admin-content-list li {
padding: 10px;
border-width: 1px 0;
margin-top: -1px;
}
.admin-content-list li:first-child {
border-top: none;
}
.admin-content-list li:last-child {
border-bottom: none;
}
.admin-form-text {
text-align: left !important;
}
}
/*
* user.html css
*/
.user-info {
margin-bottom: 15px;
}
.user-info .am-progress {
margin-bottom: 4px;
}
.user-info p {
margin: 5px;
}
.user-info-order {
font-size: 1.4rem;
}
/*
* errorLog.html css
*/
.error-log .am-pre-scrollable {
max-height: 40rem;
}
/*
* table.html css
*/
.table-main {
font-size: 1.4rem;
padding: .5rem;
}
.table-main button {
background: #fff;
}
.table-check {
width: 30px;
}
.table-id {
width: 50px;
}
@media only screen and (max-width: 640px) {
.table-select {
margin-top: 10px;
margin-left: 5px;
}
}
/*
gallery.html css
*/
.gallery-list li {
padding: 10px;
}
.gallery-list a {
color: #666;
}
.gallery-list a:hover {
color: #3bb4f2;
}
.gallery-title {
margin-top: 6px;
font-size: 1.4rem;
}
.gallery-desc {
font-size: 1.2rem;
margin-top: 4px;
}
/*
404.html css
*/
.page-404 {
background: #fff;
border: none;
width: 200px;
margin: 0 auto;
}
/*
fixed-layout 固定头部和边栏布局
*/
.fixed-layout,
.fixed-layout body {
height: 100%;
overflow: hidden;
}
.fixed-layout .admin-header {
position: fixed;
top: 0;
left: 0;
right: 0;
z-index: 1500;
}
.fixed-layout .admin-main {
position: relative;
height: 100%;
padding-top: 51px;
}
.fixed-layout .admin-content,
.fixed-layout .admin-sidebar {
height: 100%;
overflow-x: hidden;
overflow-y: scroll;
}
.fixed-layout .admin-sidebar.am-active {
z-index: 1600;
}
.list-filter input[type="text"], .list-filter select {
display: inline-block;
width: 200px;
}
.list-tabs {
margin: 50px 0 0;
}
.list-table {
margin: 20px 0 0;
}
.coupon-list-table {
margin: 20px 0 0;
}
.coupon-list-table th {
text-align: center;
}
.coupon-list-table td {
display: table-cell;
vertical-align: middle !important;
line-height: 1;
text-align: center;
}
.coupon-list-table td p {
margin: 0;
}
.coupon-list-table td.id {
width: 18%;
}
.coupon-list-table td.info {
width: 23%;
text-align: left;
}
.coupon-list-table td.time {
width: 11%;
}
.coupon-list-table td.describe {
width: 16%;
}
.coupon-list-table td.staff {
width: 7%;
}
.coupon-list-table td.state {
width: 11%;
}
.coupon-list-table td.state .state-reason {
color: red;
word-break: break-all;
}
.coupon-list-table td.operate.wait a.apply-success, .coupon-list-table td.operate.wait a.apply-back, .coupon-list-table td.operate.wait a.apply-cancel {
display: inline-block;
}
.coupon-list-table td.operate.success a.apply-cancel {
display: inline-block;
}
.coupon-list-table td.operate.back a.apply-modify {
display: inline-block;
}
.coupon-list-table td.operate p {
margin: 5px 0;
}
.coupon-list-table td.operate a {
display: none;
}
.coupon-list-table td.operate a.apply-detail {
display: inline-block;
}
.send-list td.time {
width: 160px;
}
.send-list td.info {
width: 352px;
}
.couponview .red {
color: #dd514c;
padding: 0 5px;
}
.datepicker {
display: none;
position: absolute;
padding: 4px;
margin-top: 1px;
direction: ltr;
}
.datepicker.dropdown-menu {
position: absolute;
top: 100%;
left: 0;
z-index: 1000;
float: left;
display: none;
min-width: 160px;
list-style: none;
background-color: #fff;
border: 1px solid rgba(0, 0, 0, 0.2);
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
*border-right-width: 2px;
*border-bottom-width: 2px;
color: #333;
font-size: 13px;
line-height: 18px;
}
.datepicker.dropdown-menu th {
padding: 4px 5px;
}
.datepicker.dropdown-menu td {
padding: 4px 5px;
}
.datepicker table {
border: 0;
margin: 0;
width: auto;
}
.datepicker table tr td span {
display: block;
width: 23%;
height: 54px;
line-height: 54px;
float: left;
margin: 1%;
cursor: pointer;
}
.datepicker td {
text-align: center;
width: 20px;
height: 20px;
border: 0;
font-size: 12px;
padding: 4px 8px;
background: #fff;
cursor: pointer;
}
.datepicker td.active.day, .datepicker td.active.year {
background: #2ba6cb;
}
.datepicker td.old, .datepicker td.new {
color: #999;
}
.datepicker td span.active {
background: #2ba6cb;
}
.datepicker td.day.disabled {
color: #ccc;
}
.datepicker th {
text-align: center;
width: 20px;
height: 20px;
border: 0;
font-size: 12px;
padding: 4px 8px;
background: #fff;
cursor: pointer;
}
.datepicker th.active.day, .datepicker th.active.year {
background: #2ba6cb;
}
.datepicker th.date-switch {
width: 145px;
}
.datepicker th span.active {
background: #2ba6cb;
}
.datepicker .cw {
font-size: 10px;
width: 12px;
padding: 0 2px 0 5px;
vertical-align: middle;
}
.datepicker.days div.datepicker-days {
display: block;
}
.datepicker.months div.datepicker-months {
display: block;
}
.datepicker.years div.datepicker-years {
display: block;
}
.datepicker thead tr:first-child th {
cursor: pointer;
}
.datepicker thead tr:first-child th.cw {
cursor: default;
background-color: transparent;
}
.datepicker tfoot tr:first-child th {
cursor: pointer;
}
.datepicker-inline {
width: 220px;
}
.datepicker-rtl {
direction: rtl;
}
.datepicker-rtl table tr td span {
float: right;
}
.datepicker-dropdown {
top: 0;
left: 0;
}
.datepicker-dropdown:before {
content: '';
display: inline-block;
border-left: 7px solid transparent;
border-right: 7px solid transparent;
border-bottom: 7px solid #ccc;
border-bottom-color: 1px solid rgba(0, 0, 0, 0.2);
position: absolute;
top: -7px;
left: 6px;
}
.datepicker-dropdown:after {
content: '';
display: inline-block;
border-left: 6px solid transparent;
border-right: 6px solid transparent;
border-bottom: 6px solid #fff;
position: absolute;
top: -6px;
left: 7px;
}
.datepicker > div,
.datepicker-dropdown::before,
.datepicker-dropdown::after {
display: none;
}
.datepicker-close {
position: absolute;
top: -30px;
right: 0;
width: 15px;
height: 30px;
padding: 0;
display: none;
}
.table-striped .datepicker table tr td,
.table-striped .datepicker table tr th {
background-color: transparent;
}
.panel-default .panel-heading {
border-top: 1px solid #e7e7e7;
}
.red {
color: red;
font-family: bold;
}
input[type=date], input[type=time], input[type=datetime-local], input[type=month] {
line-height: 0 !important;
}
.show-grid {
padding: 10px;
}
.brandBtn-group {
width: 150px;
float: left;
margin-right: 8px;
}
.brandBtn-group-lg {
width: 280px;
}
/*列表页操作按钮*/
.supplier-manage-operate .btn-freeze {
display: inline-block;
}
.supplier-manage-operate .btn-recovery {
display: none;
}
.supplier-manage-operate.valid0 .btn-freeze {
display: none;
}
.supplier-manage-operate.valid0 .btn-recovery {
display: inline-block;
}
.supplier-manage-operate.status0 .btn-edit, .supplier-manage-operate.status0 .btn-recovery, .supplier-manage-operate.status0 .btn-freeze {
display: none;
}
.supplier-operate.status0 .btn-edit, .supplier-operate.status0 .btn-submit {
display: none;
}
.brand-operate.operate1 .open-brand {
display: none;
}
.brand-operate.operate0 .close-brand {
display: none;
}
.pact-operate.operate0 .btn-edit {
display: none;
}
.pact-manage-operate.operate0 .renew-btn, .pact-manage-operate.operate0 .relieve-btn, .pact-manage-operate.operate2 .renew-btn, .pact-manage-operate.operate2 .relieve-btn, .pact-manage-operate.status0 .renew-btn, .pact-manage-operate.status0 .relieve-btn {
display: none;
}
.contentpanel td a {
margin: 0 3px;
}
.mainwrapper .toggle-table tr {
cursor: pointer;
}
.mainwrapper .toggle-table tr.level1 td:nth-of-type(1) {
text-indent: 2px;
}
.mainwrapper .toggle-table tr.level2 td:nth-of-type(1) {
text-indent: 15px;
}
.mainwrapper .toggle-table tr.level3 td:nth-of-type(1) {
text-indent: 30px;
}
.pattrscroll {
background: #F7F7F7;
}
.pattrscroll ul {
padding-left: 0;
}
.pattrscroll li {
cursor: pointer;
}
.mainwrapper .list-group-item.level1 {
text-indent: 2px;
}
.mainwrapper .list-group-item.level2 {
text-indent: 15px;
}
.mainwrapper .list-group-item.level3 {
text-indent: 30px;
}
.attr-item-active {
background: #428bca;
color: #fff;
}
.pannel-scroll {
height: 500px;
overflow-y: scroll;
overflow-x: hidden;
}
.attr-select {
display: block;
height: 40px;
line-height: 40px;
border: 1px solid #ccc;
border-radius: 3px;
}
.panel-input {
display: inline-block;
width: 280px;
}
@charset "UTF-8";
ul {
margin-top: 0;
}
.admin-icon-yellow {
color: #ffbe40;
}
.admin-header {
font-size: 1.4rem;
margin-bottom: 0;
}
.admin-header-list a:hover :after {
content: none;
}
.admin-main {
background: #f3f3f3;
}
.admin-menu {
position: fixed;
z-index: 10;
bottom: 30px;
right: 20px;
}
.admin-sidebar {
width: 260px;
min-height: 100%;
float: left;
border-right: 1px solid #cecece;
}
.admin-sidebar-list {
margin-bottom: 0;
}
.admin-sidebar-list li a {
color: #5c5c5c;
padding-left: 24px;
}
.admin-sidebar-list li:first-child {
border-top: none;
}
.admin-sidebar-sub {
margin-top: 0;
margin-bottom: 0;
box-shadow: 0 16px 8px -15px #e2e2e2 inset;
background: #ececec;
padding-left: 24px;
}
.admin-sidebar-sub li:first-child {
border-top: 1px solid #dedede;
}
.admin-sidebar-panel {
margin: 10px;
}
.admin-content {
width: auto;
overflow: hidden;
height: 100%;
background: #fff;
}
.admin-content-list {
border: 1px solid #e9ecf1;
margin-top: 0;
}
.admin-content-list li {
border: 1px solid #e9ecf1;
border-width: 0 1px;
margin-left: -1px;
}
.admin-content-list li:first-child {
border-left: none;
}
.admin-content-list li:last-child {
border-right: none;
}
.admin-content-table a {
color: #535353;
}
.admin-content-file {
margin-bottom: 0;
color: #666;
}
.admin-content-file p {
margin: 0 0 5px 0;
font-size: 1.4rem;
}
.admin-content-file li {
padding: 10px 0;
}
.admin-content-file li:first-child {
border-top: none;
}
.admin-content-file li:last-child {
border-bottom: none;
}
.admin-content-file li .am-progress {
margin-bottom: 4px;
}
.admin-content-file li .am-progress-bar {
line-height: 14px;
}
.admin-content-task {
margin-bottom: 0;
}
.admin-content-task li {
padding: 5px 0;
border-color: #eee;
}
.admin-content-task li:first-child {
border-top: none;
}
.admin-content-task li:last-child {
border-bottom: none;
}
.admin-task-meta {
font-size: 1.2rem;
color: #999;
}
.admin-task-bd {
font-size: 1.4rem;
margin-bottom: 5px;
}
.admin-content-comment {
margin-bottom: 0;
}
.admin-content-comment .am-comment-bd {
font-size: 1.4rem;
}
.admin-content-pagination {
margin-bottom: 0;
}
.admin-content-pagination li a {
padding: 4px 8px;
}
@media only screen and (min-width: 641px) {
.admin-sidebar {
display: block;
position: static;
background: none;
}
.admin-offcanvas-bar {
position: static;
width: auto;
background: none;
-webkit-transform: translate3d(0, 0, 0);
-ms-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
}
.admin-offcanvas-bar:after {
content: none;
}
}
@media only screen and (max-width: 640px) {
.admin-sidebar {
width: inherit;
}
.admin-offcanvas-bar {
background: #f3f3f3;
}
.admin-offcanvas-bar:after {
background: #BABABA;
}
.admin-sidebar-list a:hover, .admin-sidebar-list a:active {
-webkit-transition: background-color .3s ease;
-moz-transition: background-color .3s ease;
-ms-transition: background-color .3s ease;
-o-transition: background-color .3s ease;
transition: background-color .3s ease;
background: #E4E4E4;
}
.admin-content-list li {
padding: 10px;
border-width: 1px 0;
margin-top: -1px;
}
.admin-content-list li:first-child {
border-top: none;
}
.admin-content-list li:last-child {
border-bottom: none;
}
.admin-form-text {
text-align: left !important;
}
}
/*
* user.html css
*/
.user-info {
margin-bottom: 15px;
}
.user-info .am-progress {
margin-bottom: 4px;
}
.user-info p {
margin: 5px;
}
.user-info-order {
font-size: 1.4rem;
}
/*
* errorLog.html css
*/
.error-log .am-pre-scrollable {
max-height: 40rem;
}
/*
* table.html css
*/
.table-main {
font-size: 1.4rem;
padding: .5rem;
}
.table-main button {
background: #fff;
}
.table-check {
width: 30px;
}
.table-id {
width: 50px;
}
@media only screen and (max-width: 640px) {
.table-select {
margin-top: 10px;
margin-left: 5px;
}
}
/*
gallery.html css
*/
.gallery-list li {
padding: 10px;
}
.gallery-list a {
color: #666;
}
.gallery-list a:hover {
color: #3bb4f2;
}
.gallery-title {
margin-top: 6px;
font-size: 1.4rem;
}
.gallery-desc {
font-size: 1.2rem;
margin-top: 4px;
}
/*
404.html css
*/
.page-404 {
background: #fff;
border: none;
width: 200px;
margin: 0 auto;
}
/*
fixed-layout 固定头部和边栏布局
*/
.fixed-layout,
.fixed-layout body {
height: 100%;
overflow: hidden;
}
.fixed-layout .admin-header {
position: fixed;
top: 0;
left: 0;
right: 0;
z-index: 1500;
}
.fixed-layout .admin-main {
position: relative;
height: 100%;
padding-top: 51px;
}
.fixed-layout .admin-content,
.fixed-layout .admin-sidebar {
height: 100%;
overflow-x: hidden;
overflow-y: scroll;
}
.fixed-layout .admin-sidebar.am-active {
z-index: 1600;
}
.list-filter input[type="text"], .list-filter select {
display: inline-block;
width: 200px;
}
.list-tabs {
margin: 50px 0 0;
}
.list-table {
margin: 20px 0 0;
}
.coupon-list-table {
margin: 20px 0 0;
}
.coupon-list-table th {
text-align: center;
}
.coupon-list-table td {
display: table-cell;
vertical-align: middle !important;
line-height: 1;
text-align: center;
}
.coupon-list-table td p {
margin: 0;
}
.coupon-list-table td.id {
width: 18%;
}
.coupon-list-table td.info {
width: 23%;
text-align: left;
}
.coupon-list-table td.time {
width: 11%;
}
.coupon-list-table td.describe {
width: 16%;
}
.coupon-list-table td.staff {
width: 7%;
}
.coupon-list-table td.state {
width: 11%;
}
.coupon-list-table td.state .state-reason {
color: red;
word-break: break-all;
}
.coupon-list-table td.operate.wait a.apply-success, .coupon-list-table td.operate.wait a.apply-back, .coupon-list-table td.operate.wait a.apply-cancel {
display: inline-block;
}
.coupon-list-table td.operate.success a.apply-cancel {
display: inline-block;
}
.coupon-list-table td.operate.back a.apply-modify {
display: inline-block;
}
.coupon-list-table td.operate p {
margin: 5px 0;
}
.coupon-list-table td.operate a {
display: none;
}
.coupon-list-table td.operate a.apply-detail {
display: inline-block;
}
.send-list td.time {
width: 160px;
}
.send-list td.info {
width: 352px;
}
.couponview .red {
color: #dd514c;
padding: 0 5px;
}
.datepicker {
display: none;
position: absolute;
padding: 4px;
margin-top: 1px;
direction: ltr;
}
.datepicker.dropdown-menu {
position: absolute;
top: 100%;
left: 0;
z-index: 1000;
float: left;
display: none;
min-width: 160px;
list-style: none;
background-color: #fff;
border: 1px solid rgba(0, 0, 0, 0.2);
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
*border-right-width: 2px;
*border-bottom-width: 2px;
color: #333;
font-size: 13px;
line-height: 18px;
}
.datepicker.dropdown-menu th {
padding: 4px 5px;
}
.datepicker.dropdown-menu td {
padding: 4px 5px;
}
.datepicker table {
border: 0;
margin: 0;
width: auto;
}
.datepicker table tr td span {
display: block;
width: 23%;
height: 54px;
line-height: 54px;
float: left;
margin: 1%;
cursor: pointer;
}
.datepicker td {
text-align: center;
width: 20px;
height: 20px;
border: 0;
font-size: 12px;
padding: 4px 8px;
background: #fff;
cursor: pointer;
}
.datepicker td.active.day, .datepicker td.active.year {
background: #2ba6cb;
}
.datepicker td.old, .datepicker td.new {
color: #999;
}
.datepicker td span.active {
background: #2ba6cb;
}
.datepicker td.day.disabled {
color: #ccc;
}
.datepicker th {
text-align: center;
width: 20px;
height: 20px;
border: 0;
font-size: 12px;
padding: 4px 8px;
background: #fff;
cursor: pointer;
}
.datepicker th.active.day, .datepicker th.active.year {
background: #2ba6cb;
}
.datepicker th.date-switch {
width: 145px;
}
.datepicker th span.active {
background: #2ba6cb;
}
.datepicker .cw {
font-size: 10px;
width: 12px;
padding: 0 2px 0 5px;
vertical-align: middle;
}
.datepicker.days div.datepicker-days {
display: block;
}
.datepicker.months div.datepicker-months {
display: block;
}
.datepicker.years div.datepicker-years {
display: block;
}
.datepicker thead tr:first-child th {
cursor: pointer;
}
.datepicker thead tr:first-child th.cw {
cursor: default;
background-color: transparent;
}
.datepicker tfoot tr:first-child th {
cursor: pointer;
}
.datepicker-inline {
width: 220px;
}
.datepicker-rtl {
direction: rtl;
}
.datepicker-rtl table tr td span {
float: right;
}
.datepicker-dropdown {
top: 0;
left: 0;
}
.datepicker-dropdown:before {
content: '';
display: inline-block;
border-left: 7px solid transparent;
border-right: 7px solid transparent;
border-bottom: 7px solid #ccc;
border-bottom-color: 1px solid rgba(0, 0, 0, 0.2);
position: absolute;
top: -7px;
left: 6px;
}
.datepicker-dropdown:after {
content: '';
display: inline-block;
border-left: 6px solid transparent;
border-right: 6px solid transparent;
border-bottom: 6px solid #fff;
position: absolute;
top: -6px;
left: 7px;
}
.datepicker > div,
.datepicker-dropdown::before,
.datepicker-dropdown::after {
display: none;
}
.datepicker-close {
position: absolute;
top: -30px;
right: 0;
width: 15px;
height: 30px;
padding: 0;
display: none;
}
.table-striped .datepicker table tr td,
.table-striped .datepicker table tr th {
background-color: transparent;
}
.panel-default .panel-heading {
border-top: 1px solid #e7e7e7;
}
.red {
color: red;
font-family: bold;
}
input[type=date], input[type=time], input[type=datetime-local], input[type=month] {
line-height: 0 !important;
}
.show-grid {
padding: 10px;
}
.brandBtn-group {
width: 150px;
float: left;
margin-right: 8px;
}
.brandBtn-group-lg {
width: 280px;
}
/*列表页操作按钮*/
.supplier-manage-operate .btn-freeze {
display: inline-block;
}
.supplier-manage-operate .btn-recovery {
display: none;
}
.supplier-manage-operate.valid0 .btn-freeze {
display: none;
}
.supplier-manage-operate.valid0 .btn-recovery {
display: inline-block;
}
.supplier-manage-operate.status0 .btn-edit, .supplier-manage-operate.status0 .btn-recovery, .supplier-manage-operate.status0 .btn-freeze {
display: none;
}
.supplier-operate.status0 .btn-edit, .supplier-operate.status0 .btn-submit {
display: none;
}
.brand-operate.operate1 .open-brand {
display: none;
}
.brand-operate.operate0 .close-brand {
display: none;
}
.pact-operate.operate0 .btn-edit {
display: none;
}
.pact-manage-operate.operate0 .renew-btn, .pact-manage-operate.operate0 .relieve-btn, .pact-manage-operate.operate2 .renew-btn, .pact-manage-operate.operate2 .relieve-btn, .pact-manage-operate.status0 .renew-btn, .pact-manage-operate.status0 .relieve-btn {
display: none;
}
.contentpanel td a {
margin: 0 3px;
}
.mainwrapper .toggle-table tr {
cursor: pointer;
}
.mainwrapper .toggle-table tr.level1 td:nth-of-type(1) {
text-indent: 2px;
}
.mainwrapper .toggle-table tr.level2 td:nth-of-type(1) {
text-indent: 15px;
}
.mainwrapper .toggle-table tr.level3 td:nth-of-type(1) {
text-indent: 30px;
}
.pattrscroll {
background: #F7F7F7;
}
.pattrscroll ul {
padding-left: 0;
}
.pattrscroll li {
cursor: pointer;
}
.mainwrapper .list-group-item.level1 {
text-indent: 2px;
}
.mainwrapper .list-group-item.level2 {
text-indent: 15px;
}
.mainwrapper .list-group-item.level3 {
text-indent: 30px;
}
.attr-item-active {
background: #428bca;
color: #fff;
}
.pannel-scroll {
height: 500px;
overflow-y: scroll;
overflow-x: hidden;
}
.attr-select {
display: block;
height: 40px;
line-height: 40px;
border: 1px solid #ccc;
border-radius: 3px;
}
.panel-input {
display: inline-block;
width: 280px;
}
... ...
... ... @@ -187,7 +187,7 @@
}
.select2-container--default .select2-selection--single .select2-selection__arrow {
height: 26px;
height: 36px;
position: absolute;
top: 1px;
right: 1px;
... ...
/**
* Created by wangqianjun on 16/2/2.
*/
//接口主域
var env = process.env.NODE_ENV || 'development';
// exports.domain = 'http://192.168.102.205:18025';
var domain = {
development:'http://localhost:30012',
test:'http://192.168.102.205:18025/yoho-adminportal-web',
preview:'http://192.168.81.13:8189/yoho-admin-portal',
production:'http://192.168.81.6:8189/yoho-admin-portal'
};
exports.domain = domain[env];
exports.res = [{
//创建【商品管理】页面渲染
route: '/erpproduct/price/index',
method: 'GET',
view: 'pages/commodity/index',
src:'/commodity/index'
},{
route: '/erpproduct/price/index1',
method: 'POST',
url: '/interface/commodity/list',
isJsonRaw: true
}
];
\ No newline at end of file
//接口主域
var env = process.env.NODE_ENV || 'development';
// exports.domain = 'http://192.168.102.205:18025';
var domain = {
development:'http://localhost:30012',
//development:'http://172.16.6.227:8083/yohobuy-platform-web',
//development: 'http://192.168.102.215:8080/platform',
test:'http://192.168.102.205:18025/yoho-adminportal-web',
preview:'http://192.168.81.13:8189/yoho-admin-portal',
production:'http://192.168.81.6:8189/yoho-admin-portal'
};
exports.domain = domain[env];
//路由配置
exports.res = [
{
//商品审核
route: '/supplier/baseaudit/index',
method: 'GET',
view: 'pages/goods/index',
noApi:true,
data: {
bottons:'{"detail":true}',
gridurl:'/goods/review/getList',
searchStatus: [
{name:"未审核",value:"100"},
{name:"已通过",value:"200"},
{name:"驳回",value:"300"}
],
searchJIT: true,
pageTitle:"商品审核"
},
src:'/goods/index'
},
{
route: '/goods/review/getList',
method: 'POST',
url: '/goods/review/getReviewList',
isJsonRaw:true,
params: [
{name: 'skn', type: 'String'},
{name: 'brandName', type: 'String'},
{name: 'storeName', type: 'String'},
{name: 'status', type: 'String'},
{name: 'jit', type: 'String'}
]
}
];
\ No newline at end of file
... ...
/**
* Created by wangqianjun on 16/2/2.
*/
module.exports = {
//供应商查看，修改数据
'/interface/commodity/list':function(req, res){
res.json({
code: 200,
message:'请求成功',
data: {
list: [
{
"skn":"1",
//公司名称
"marketPrice":"123.00",
}
],
page: 1,
totalpage: 142,
size: 50,
total:1000
}
})
}
}
\ No newline at end of file
module.exports = {
'/goods/review/getReviewList': function(req, res) {
res.json({
code: 200,
data: {
list: [{
skn: '51197205',
goodsIcon: 'http://img10.static.yhbimg.com/goodsimg/2016/02/01/07/019d377b10ce778c4938b3c7e2c63a229a.jpg?imageMogr2/thumbnail/60x60/extent/60x60/background/d2hpdGU=/position/center/quality/90',
goodsName: 'ceshiproductwss01',
goodsCate: '上衣 / T恤 / 长袖T恤',
brandName: '心飞扬',
price: '100.00',
updateName: '无更新',
status: 0
}, {
skn: '51197204',
goodsIcon: '',
goodsName: '长袖',
goodsCate: '上衣 / T恤 / 长袖T恤',
brandName: '心飞扬',
price: '100.00',
updateName: '16/02/03 16:57',
status: 1
}],
page: 1,
size: 10,
totalPage: 2
}
});
}
}
\ No newline at end of file
... ...
... ... @@ -26,24 +26,33 @@
</div>
<div class="panel-body">
<div class="row">
<select name="brand-id" id="brand-id" tabindex="-1" title="" class="select2-offscreen brandBtn-group">
<option value="" selected="">选择名称</option>
</select>
<select name="status" id="status" tabindex="-1" title="" class="select2-offscreen brandBtn-group">
<option value="" selected="">选择状态</option>
<option value="0">关闭</option>
<option value="1">开启</option>
</select>
<select name="brand-level" id="brand-level" tabindex="-1" title="" class="select2-offscreen brandBtn-group">
<option value="" selected="">选择级别</option>
<option value="KA">KA</option>
<option value="A">A</option>
<option value="B">B</option>
<option value="C">C</option>
</select>
<input type="text" id="starttime" class="form-control panel-input hasDatepicker" name="start_time" placeholder="开始时间" value="">
<input type="text" id="endtime" class="form-control panel-input hasDatepicker" name="end_time" placeholder="结束时间" value="">
<div class="panel-col">
<select name="brand-id" id="brand-id" tabindex="-1" title="" class="select2-offscreen brandBtn-group">
<option value="" selected="">选择名称</option>
</select>
</div>
<div class="panel-col">
<select name="status" id="status" tabindex="-1" title="" class="select2-offscreen brandBtn-group">
<option value="" selected="">选择状态</option>
<option value="0">关闭</option>
<option value="1">开启</option>
</select>
</div>
<div class="panel-col">
<select name="brand-level" id="brand-level" tabindex="-1" title="" class="select2-offscreen brandBtn-group">
<option value="" selected="">选择级别</option>
<option value="KA">KA</option>
<option value="A">A</option>
<option value="B">B</option>
<option value="C">C</option>
</select>
</div>
<div class="panel-col2">
<input type="text" id="starttime" class="form-control panel-input hasDatepicker" name="start_time" placeholder="开始时间" value="">
</div>
<div class="panel-col2">
<input type="text" id="endtime" class="form-control panel-input hasDatepicker" name="end_time" placeholder="结束时间" value="">
</div>
<a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
<a id="filter-all" href="/erpproduct/brands/index" class="btn btn-info">全部</a>
</div>
... ...
... ... @@ -6,7 +6,7 @@
<div class="media-body">
<ul class="breadcrumb">
<li><a href=""><i class="glyphicon glyphicon-home"></i></a></li>
<li><a href="">供应商管理</a></li>
<li><a href="">商品管理</a></li>
<li>{{pageTitle}}</li>
</ul>
... ... @@ -21,16 +21,56 @@
<div class="contentpanel">
<div class="panel panel-default" style="margin-bottom:10px;">
{{# iscreate}}
<div class="panel-heading">
<a href="/supplier/add" class="btn btn-success"><i class="fa fa-plus"></i> 添加供应商</a>
</div>
{{/ iscreate}}
<div class="panel-body">
<div class="row">
<div class="panel-col2">
<input id="skn" class="form-control brandBtn-group" type="text" style="width:280px;" value="" placeholder="SKN编号">
</div>
<div class="panel-col">
<select name="brand-name" id="brand-name" tabindex="-1" title="" class="select2-offscreen brandBtn-group" placeholder="请选择品牌" >
<option value="-1" selected="selected">请选择品牌</option>
</select>
</div>
<div class="panel-col">
<select name="store-name" id="store-name" tabindex="-1" title="" class="select2-offscreen brandBtn-group" placeholder="请选择店铺" >
<option value="-1" selected="selected">请选择店铺</option>
</select>
</div>
<div class="panel-col">
{{#if searchStatus}}
<select name="status" id="status" tabindex="-1" title="" class="select2-offscreen brandBtn-group">
<option value="-1" selected="">选择审核状态</option>
{{#each searchStatus}}
<option value="{{value}}">{{name}}</option>
{{/each}}
</select>
{{/ if}}
</div>
<div class="panel-col">
{{#if searchJIT}}
<select name="jit" id="jit" tabindex="-1" title="" class="select2-offscreen brandBtn-group">
<option value="-1" selected="">请选择JIT</option>
<option value="N">否</option>
<option value="Y">是</option>
</select>
{{/ if}}
</div>
<a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
<a id="all-btn" href="javascript:;" class="btn btn-info">全部</a>
</div>
</div>
</div>
<div class="panel panel-primary-head">
<div class="dataTables_wrapper no-footer" id="basicTable">
</div>
</div>
</div>
\ No newline at end of file
</div>
<input type="hidden" id="btnAuthority" value="{{bottons}}">
<input type="hidden" id="gridurl" value="{{gridurl}}">
\ No newline at end of file
... ...