fe / yohobuy-portal-fe · Commits

Go to a project

Authored by weiqingting
Commit 53efb601dea500788faee4738e2cde425944dab9 1 parent b5e37485

更新

Inline Side-by-side
Showing 14 changed files with 96 additions and 45 deletions
var gulp=require('gulp'),
fs=require('fs'),
ftp = require('gulp-ftp'),
gutil = require('gulp-util'),
path=require('path'),
plumber = require('gulp-plumber'),
sass = require('gulp-sass'),
... ...
... ... @@ -283,11 +283,12 @@ var g2=new common.grid({
{display:"品牌","name":"brandName"},
{display:"供应商","name":"supplierName"},
{display:"操作",render:function(item){
console.log(item.method);
return '<button type="button" data-index="'+item.__index+'" class="delete btn btn-danger btn-xs">删除</button>';
}}
]
});
g2.__rows=[];
g2.__rows=[],g2.__delrows=[];
e.on("render",function(){
... ... @@ -312,7 +313,15 @@ e.on("render",function(){
//修改
if($("#shopRelationList").val()){
var a=JSON.parse($("#shopRelationList").val());
Array.prototype.push.apply(g2.__rows, a)
//编辑的时候删除delete
$.each(a,function(index,item){
if(item.method!="delete"){
g2.__rows.push(item);
}else{
g2.__delrows.push(item);
}
});
Array.prototype.push.apply(g2.__rows, a);
g2.init(g2.__rows);
}
});
... ...
... ... @@ -36,10 +36,12 @@ var ENUM={// 审核状态；100 暂存 200 待审核 300 审核通过 900 驳
{display:"店铺名称",name:"shopName"},
{display:"包含品牌",name:"shopRelationList",render:function(item){
var str='';
$.each(item.shopRelationList,function (index,a) {
str+='<p>'+a.brandName+'</p>';
})
return str;
if(item.shopRelationList){
$.each(item.shopRelationList,function (index,a) {
str+='<p>'+a.brandName+'</p>';
});
}
return str;
}},
{display:"创建时间",name:"createTime"},
{display:"更新时间",name:"updateTime"},
... ... @@ -48,11 +50,7 @@ var ENUM={// 审核状态；100 暂存 200 待审核 300 审核通过 900 驳
}},
{display:"操作",name:"",render:function(item){
var HtmArr=[];
if(authority.info){
HtmArr.push('<a href="/supplier/store/infocmd/'+item.shopsId+'" href="javascript:void(0);" class="btn btn-info btn-xs">查看</a>');
}else{
HtmArr.push('<a href="/supplier/store/info/'+item.shopsId+'" href="javascript:void(0);" class="btn btn-info btn-xs">查看</a>');
}
HtmArr.push('<a href="/supplier/store/'+authority.info+'/'+item.shopsId+'" href="javascript:void(0);" class="btn btn-info btn-xs">查看</a>');
//创建
if(authority.create){
if(+item.checkStatus==100||+item.checkStatus==900){
... ... @@ -62,7 +60,7 @@ var ENUM={// 审核状态；100 暂存 200 待审核 300 审核通过 900 驳
if(authority.btn){
if(+item.checkStatus!=200){
HtmArr.push('<a href="/supplier/store/update/'+item.shopsId+'" href="javascript:void(0);" class="btn btn-success btn-xs">编辑</a>');
HtmArr.push('<a href="/supplier/store/update/'+item.shopsId+'" href="javascript:void(0);" class="btn btn-success btn-xs">编辑</a>');
}
if(+item.checkStatus!=900){
if(+item.status){
... ...
... ... @@ -54,7 +54,13 @@ var ENUM={
HtmArr.push('<a href="/supplier/info/'+ item.id+'" class="btn btn-info btn-xs">查看</a>');
}
if(item.status!="200"){
HtmArr.push('<a href="/supplier/update/'+ item.id+'" class="btn btn-success btn-xs btn-edit">编辑</a>');
//updatecheck
if(btnAuthority.updatecheck){
HtmArr.push('<a href="/supplier/updatecheck/'+ item.id+'" class="btn btn-success btn-xs btn-edit">编辑</a>');
}else{
HtmArr.push('<a href="/supplier/update/'+ item.id+'" class="btn btn-success btn-xs btn-edit">编辑</a>');
}
}
//暂存时，有提交
... ...
{
"name": "yohobuy-portal",
"version": "0.1.0",
"version": "0.2.0",
"description": "yohobuy-portal",
"keywords": [],
"homepage": "",
... ... @@ -30,11 +30,13 @@
"gulp-clean": "^0.3.1",
"gulp-concat": "^2.6.0",
"gulp-develop-server": "^0.5.0",
"gulp-ftp": "^1.1.0",
"gulp-md5": "^0.1.2",
"gulp-plumber": "^1.1.0",
"gulp-rename": "^1.2.2",
"gulp-sass": "^2.0.4",
"gulp-uglify": "^1.5.2",
"gulp-util": "^3.0.7",
"webpack": "^1.12.13"
},
"scripts": {
... ...
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;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-info{margin-bottom:15px}.user-info .am-progress{margin-bottom:4px}.user-info p{margin:5px}.user-info-order{font-size:1.4rem}.error-log .am-pre-scrollable{max-height:40rem}.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-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}.page-404{background:#fff;border:none;width:200px;margin:0 auto}.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}input[type=file]{display:block;opacity:0;height:60px;width:100px;position:absolute;z-index:99}.form-horizontal .form-group{margin-left:0px;margin-right:0px}.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);border-radius:5px;box-shadow:0 5px 10px rgba(0,0,0,0.2);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}.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}#limit-table-box table{vertical-align:middle}#limit-table-box table th,#limit-table-box table td{text-align:center;vertical-align:middle}#limit-table-box table div.checkbox label{height:13px}#limit-table-box table .cover-img{width:100px}#limit-table-box table .width50{width:50px;text-align:center}.height40{height:40px;line-height:40px}.edit-cover-img{width:100px;margin:0 15px;float:left}.quota-text,.quota-img,.quota-video{width:300px;margin-bottom:15px}.quota-text img,.quota-img img,.quota-video img{width:100%}#text-editor{width:100%;max-width:100%;min-width:100%;height:300px;max-height:300px;min-height:300px}.product-detail input[type="text"]{width:100px}.main-table{-display:none}.bulk-import{display:none}#upload-input{display:inline-block;position:static;opacity:1;width:auto;height:auto}.excel-model{display:inline-block;width:110px;height:48px;line-height:48px;padding:0 0 0 50px;margin:0 200px;background:url(../images/excel.png) no-repeat left center}.panel-input{display:inline-block;width:100%}.panel-col,.panel-col2{float:left;width:150px;margin:0 10px 10px}.panel-col2{width:280px}
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 0.3s ease;transition:background-color 0.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-info{margin-bottom:15px}.user-info .am-progress{margin-bottom:4px}.user-info p{margin:5px}.user-info-order{font-size:1.4rem}.error-log .am-pre-scrollable{max-height:40rem}.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-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}.page-404{background:#fff;border:none;width:200px;margin:0 auto}.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}input[type=file]{display:block;opacity:0;height:60px;width:100px;position:absolute;z-index:99}.form-horizontal .form-group{margin-left:0px;margin-right:0px}.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);border-radius:5px;box-shadow:0 5px 10px rgba(0,0,0,0.2);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}.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}#limit-table-box table{vertical-align:middle}#limit-table-box table th,#limit-table-box table td{text-align:center;vertical-align:middle}#limit-table-box table div.checkbox label{height:13px}#limit-table-box table .cover-img{width:100px}#limit-table-box table .width50{width:50px;text-align:center}.height40{height:40px;line-height:40px}.edit-cover-img{width:100px;margin:0 15px;float:left}.quota-text,.quota-img,.quota-video{width:300px;margin-bottom:15px}.quota-text img,.quota-img img,.quota-video img{width:100%}#text-editor{width:100%;max-width:100%;min-width:100%;height:300px;max-height:300px;min-height:300px}.product-detail input[type="text"]{width:100px}.main-table{-display:none}.bulk-import{display:none}#upload-input{display:inline-block;position:static;opacity:1;width:auto;height:auto}.excel-model{display:inline-block;width:110px;height:48px;line-height:48px;padding:0 0 0 50px;margin:0 200px;background:url(../images/excel.png) no-repeat left center}.panel-input{display:inline-block;width:100%}.panel-col,.panel-col2{float:left;width:150px;margin:0 10px 10px}.panel-col2{width:280px}
... ...
//exports.domain = require('../config/common.js').domain;
exports.domain = 'http://172.16.6.227:8083/yohobuy-platform-web';
exports.domain = require('../config/common.js').domain;
//exports.domain = 'http://172.16.6.227:8083/yohobuy-platform-web';
//路由配置
exports.res = [
... ...
//exports.domain = require('../config/common.js').domain;
exports.domain = 'http://172.16.6.240:8080/platform';
exports.domain = require('../config/common.js').domain;
//路由配置
exports.res = [
... ...
exports.domain = "http://172.16.6.246:8081/platform/";//require('../config/common.js').domain;
//exports.domain = require('../config/common.js').domain;
exports.domain ="http://172.16.6.246:8081/platform/";
//路由配置
exports.res = [{
// 店铺创建列表页面
... ... @@ -8,7 +9,7 @@ exports.res = [{
noApi:true,
data: {
gridurl:'/supplier/store/indexPage',
authority:'{"btn":false,"info":false,"create":true,"operationStatus":1,"checkStatusArr":"100,200,900"}',
authority:'{"btn":false,"info":"info","create":true,"operationStatus":1,"checkStatusArr":"100,200,900"}',
add:true,
pagetitle:{
level1title:"店铺管理",
... ... @@ -26,7 +27,7 @@ exports.res = [{
noApi:true,
data: {
gridurl:'/supplier/store/indexPage',
authority:'{"btn":true,"operationStatus":2,"checkStatusArr":"200,300,900"}', //300,200,900
authority:'{"btn":true,"info":"info3","operationStatus":2,"checkStatusArr":"200,300,900"}', //300,200,900
dropCheckStatus:true,
pagetitle:{
level1title:"店铺管理",
... ... @@ -43,7 +44,7 @@ exports.res = [{
noApi:true,
data: {
gridurl:'/supplier/store/indexPage',
authority:'{"btn":false,"info":true,"operationStatus":0,"checkStatusArr":"200"}',
authority:'{"btn":false,"info":"info2","operationStatus":0,"checkStatusArr":"200"}',
pagetitle:{
level1title:"店铺管理",
level2title:"店铺审核管理",
... ... @@ -87,6 +88,7 @@ exports.res = [{
}
,{
// 店铺详细信息页面渲染
//创建店铺的列表中，点击详情和编辑的url：/ShopsRest/getShopDetailById
route: '/supplier/store/info/:shopsId',
method: 'GET',
view: 'pages/store/info',
... ... @@ -100,7 +102,7 @@ exports.res = [{
}
,{
// 店铺详细信息页面渲染
route: '/supplier/store/infocmd/:shopsId',
route: '/supplier/store/info2/:shopsId',
method: 'GET',
view: 'pages/store/info',
url:"/ShopsRest/getShopDetailById",
... ... @@ -115,6 +117,19 @@ exports.res = [{
}
},
src:'/store/info'
}
,{
// 店铺详细信息页面渲染
route: '/supplier/store/info3/:shopsId',
method: 'GET',
view: 'pages/store/info',
url:"/ShopsCheckRest/getLastCheckShopInfoById",
isJsonRaw:true,
params:[{
name:'shopsId',
type:'String'
}],
src:'/store/info'
},
{//审核通过
route: '/Shops/ShopsRest/checkShopPass',
... ... @@ -136,10 +151,10 @@ exports.res = [{
}
//*******************************
,{
// 修改店铺页面渲染
//创建店铺的列表中，点击详情和编辑的url：/ShopsRest/getShopDetailById
route: '/supplier/store/update/:shopsId',
method: 'GET',
view: 'pages/store/edit',
... ... @@ -151,7 +166,7 @@ exports.res = [{
}],
data:{
pageTitel:"修改店铺",
action:'/store/update',
action:'/store/update'
},
src:'/store/edit'
},{
... ...
exports.domain ="http://172.16.6.220:8080/yohobuy-platform-web";//require('../config/common.js').domain;
exports.domain =require('../config/common.js').domain;
//"http://172.16.6.220:8080/yohobuy-platform-web";
//路由配置
exports.res = [{
//创建供应商页面渲染
... ... @@ -28,7 +28,7 @@ exports.res = [{
view: 'pages/supplier/index',
noApi:true,
data: {
bottons:'{"resetlock":true}',
bottons:'{"resetlock":true,"updatecheck":true}',
gridurl:'/supplier/create/getManageSupplierList',
searchStatus:[
{name:"审核通过",value:"300"},
... ... @@ -136,6 +136,25 @@ exports.res = [{
}
]
},
{
route: '/supplier/updatecheck/:id',
method: 'GET',
view:'pages/supplier/edit',
src:'/supplier/edit',
url: '/supplier/supplier/getSupplierCheck',
isJsonRaw: true,
data:{
action:'/brand/action/update',
pageTitle:"修改供应商",
update:true
},
params:[
{
name: 'id',
type: 'String'
}
]
},
{// 新增供应商
route: '/brand/supplier/add',
method: 'POST',
... ... @@ -231,7 +250,7 @@ exports.res = [{
route: '/supplier/infoopt/:id',
method: 'GET',
view: 'pages/supplier/info',
url:"/supplier/supplier/getSupplier",
url:"/supplier/supplier/getSupplierCheck",
isJsonRaw: true,
src:'supplier/info',
data:{
... ...
exports.staticDir = {"test":{"path":"/dist"},"preview":{"path":"http://cdn.yoho.cn/yohobuy-portal/0.1.0","md5":"-26113ff46bc61c952a8a18344e61b2c5"},"production":{"path":"http://cdn.yoho.cn/yohobuy-portal/0.1.0","md5":"-26113ff46bc61c952a8a18344e61b2c5"}}
\ No newline at end of file
exports.staticDir = {"test":{"path":"/dist"},"preview":{"path":"http://cdn.yoho.cn/yohobuy-portal/0.2.0","md5":"-01c3ed243ec9f4e90108135c4fe53959"},"production":{"path":"http://cdn.yoho.cn/yohobuy-portal/0.2.0","md5":"-01c3ed243ec9f4e90108135c4fe53959"}}
\ No newline at end of file
... ...
var request=require('request');
var fs=require('fs');
//var domain = require('../../config/common.js').domain;
var domain = 'http://172.16.6.227:8083/yohobuy-platform-web';
var domain = require('../../config/common.js').domain;
// var domain = 'http://172.16.6.227:8083/yohobuy-platform-web';
var env = process.env.NODE_ENV || 'development';
exports.uploadFile=function(req,res){
// TODO 代理上传
// 方法1
// if(env==="development"){
// res.json({
// "code":200,
// "data" : "https://ss1.baidu.com/6ONXsjip0QIZ8tyhnq/it/u=1444256491,538988776&fm=80",
// "message":"success"
// });
// }else{
if(env==="development"){
res.json({
"code":200,
"data" : "https://ss1.baidu.com/6ONXsjip0QIZ8tyhnq/it/u=1444256491,538988776&fm=80",
"message":"success"
});
}else{
if(req.is("multipart/form-data")){
req.body.file=fs.createReadStream(req.files[req.body.filename].path);
if(req.body.__type=="batch-import"){
console.log(req.body);
request.post({url:domain+'/batch/import',formData:req.body},function optionalCallback(err, httpResponse, body){
console.log(body);
res.json(JSON.parse(body));
});
}else{
... ... @@ -36,5 +34,5 @@ exports.uploadFile=function(req,res){
}else{
res.json({code:"500",message:"请求类型错误"});
}
//}
}
}
\ No newline at end of file
... ...
... ... @@ -163,7 +163,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">联系人</label>
<div class="col-sm-8">
<input type="text" id="linkman" placeholder="请填写联系人" class="form-control" value="{{linkman}}">
<input type="text" id="linkman" placeholder="请填写联系人" class="form-control" value="{{linkman}}" maxlength="10">
</div>
</div>
... ...
... ... @@ -3,6 +3,9 @@
<script src="/dist/libs.js"></script>
<script src="/dist/index.js"></script>
<script src="/dist/{{module}}.js"></script>
<!-- <script type="text/javascript" src="http://cdn.yoho.cn/yohobuy-portal/0.2.0/libs-01c3ed243ec9f4e90108135c4fe53959.js"></script>
<script type="text/javascript" src="http://cdn.yoho.cn/yohobuy-portal/0.2.0/index-01c3ed243ec9f4e90108135c4fe53959.js"></script>
<script type="text/javascript" src="http://cdn.yoho.cn/yohobuy-portal/0.2.0/{{module}}-01c3ed243ec9f4e90108135c4fe53959.js"></script> -->
{{else}}
<script src="{{_env.cur.path}}/libs{{_env.cur.md5}}.js"></script>
<script src="{{_env.cur.path}}/index{{_env.cur.md5}}.js"></script>
... ...