fe / yohobuy-portal-fe · Commits

Go to a project

Authored by ping
Commit 0bd3970fc680f8f176555ec528c6dc2de0dc21f5 2 parents d5a8cf12 9a60458c

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

Inline Side-by-side
Showing 5 changed files with 215 additions and 44 deletions
... ... @@ -256,7 +256,7 @@ var successList = null,
$('#upload-input').after('<div class="file-name btn btn-default">请选择文件</div>');
common.edit.ajaxfileupload("#upload-input", {
params: {
type: "brandCooperation",
type: "price",
__type: "batch-import"
},
onStart: function() {
... ... @@ -264,6 +264,7 @@ common.edit.ajaxfileupload("#upload-input", {
$('.file-name').text($('#upload-input').val().replace("C:\\fakepath\\", ""));
},
onComplete: function(response) {
console.log(response);
if (loadModal) {
loadModal.close();
}
... ...
... ... @@ -3,54 +3,68 @@ exports.domain = require('../config/common.js').domain;
//exports.domain = 'http://172.16.6.162:8088/platform'; //品牌合作
//商品管理路由配置
exports.res = [{
//商品审核
route: '/supplier/baseaudit/index',
method: 'GET',
view: 'pages/goods/index',
data: {
bottons: '{"detail":true}',
gridurl: '/goods/review/getList',
searchStatus: [{
name: "未审核",
value: "100"
exports.res = [
/*{
//商品审核
route: '/supplier/baseaudit/index',
method: 'GET',
view: 'pages/goods/index',
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',
params: [{
name: 'skn',
type: 'String'
}, {
name: "已通过",
value: "200"
name: 'brandName',
type: 'String'
}, {
name: "驳回",
value: "300"
}],
searchJIT: true,
pageTitle: "商品审核"
},
src: '/goods/index'
}, {
route: '/goods/review/getList',
method: 'POST',
url: '/goods/review/getReviewList',
params: [{
name: 'skn',
type: 'String'
}, {
name: 'brandName',
type: 'String'
}, {
name: 'storeName',
type: 'String'
}, {
name: 'status',
type: 'String'
}, {
name: 'jit',
type: 'String'
}]
name: 'storeName',
type: 'String'
}, {
name: 'status',
type: 'String'
}, {
name: 'jit',
type: 'String'
}]
}, */
{
//网销信息 -> 网销信息页面渲染
route: '/goods/netsale/index',
method: 'GET',
view: 'pages/goods/net-sale',
src: '/goods/net-sale',
data: {
pageTitle: '网销信息',
filter: {
}
}
}, {
//价格管理 -> 代销变价页面渲染
route: '/goods/pricechange/index',
method: 'GET',
view: 'pages/goods/index',
src: '/goods/index',
view: 'pages/goods/price-mgmt',
src: '/goods/price-change',
data: {
headerTab: {
changePrice: true
... ... @@ -207,7 +221,7 @@ exports.res = [{
//价格管理 -> 品牌合作模式页面渲染
route: '/goods/brandCooperation/index',
method: 'GET',
view: 'pages/goods/index',
view: 'pages/goods/price-mgmt',
src: '/goods/brand-cooperation',
data: {
headerTab: {
... ...
<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>
{{# secondTitle}}{{.}}{{/ secondTitle}}
{{^ secondTitle}}{{pageTitle}}{{/ secondTitle}}
</li>
</ul>
<div>
<div style="width: 30%;float: left;">
<h4>{{pageTitle}}</h4>
</div>
</div>
</div>
</div>
</div>
<div class="contentpanel">
<div class="panel panel-default" style="margin-bottom:10px;">
<div class="panel-body">
<div class="row">
<div class="panel-col">
<input id="skn" class="form-control panel-input height40" type="text" placeholder="请输入SKN" onkeyup="this.value=this.value.replace(/\D/gi,'')">
</div>
<div class="panel-col">
<input id="skc" class="form-control panel-input height40" type="text" placeholder="请输入SKC" onkeyup="this.value=this.value.replace(/\D/gi,'')">
</div>
<div class="panel-col">
<input id="sku" class="form-control panel-input height40" type="text" placeholder="请输入SKU" onkeyup="this.value=this.value.replace(/\D/gi,'')">
</div>
<div class="panel-col">
<input id="productName" class="form-control panel-input height40" type="text" placeholder="商品名称">
</div>
<div class="panel-col2">
<select name="shop" id="shop" tabindex="-1" title="" class="form-control height40">
<option value="-1">请选择店铺</option>
</select>
</div>
<div class="panel-col">
<select name="brand" id="brand" tabindex="-1" title="" class="form-control height40">
<option value="-1">请选择品牌</option>
</select>
</div>
<div class="panel-col">
<select name="stock" id="stock" tabindex="-1" title="" class="form-control height40">
<option value="-1">库存情况</option>
<option value="1">有库存</option>
<option value="0">无库存</option>
</select>
</div>
<div class="panel-col">
<select name="shoot" id="shoot" tabindex="-1" title="" class="form-control height40">
<option value="-1">拍摄状态</option>
<option value="1">已拍摄</option>
<option value="0">未拍摄</option>
</select>
</div>
<div class="panel-col">
<select name="clstatus" id="clstatus" tabindex="-1" title="" class="form-control height40">
<option value="-1">测量状态</option>
<option value="1">已测量</option>
<option value="0">未测量</option>
</select>
</div>
<div class="panel-col">
<select name="gender" id="gender" tabindex="-1" title="" class="form-control height40">
<option value="-1">选择性别</option>
<option value="1">男</option>
<option value="2">女</option>
<option value="3">通用</option>
</select>
</div>
<div class="panel-col">
<select name="cate1" id="cate1" tabindex="-1" title="" class="form-control height40">
<option value="-1">请选择一级类目</option>
</select>
</div>
<div class="panel-col">
<select name="cate2" id="cate2" tabindex="-1" title="" class="form-control height40">
<option value="-1">请选择二级类目</option>
</select>
</div>
<div class="panel-col">
<select name="cate3" id="cate3" tabindex="-1" title="" class="form-control height40">
<option value="-1">请选择三级类目</option>
</select>
</div>
<div class="panel-col">
<select name="cate4" id="cate4" tabindex="-1" title="" class="form-control height40">
<option value="-1">请选择四级类目</option>
</select>
</div>
<div class="panel-col">
<select name="aolai" id="aolai" tabindex="-1" title="" class="form-control height40">
<option value="-1">是否奥莱</option>
<option value="1">奥莱</option>
<option value="0">菲奥莱</option>
</select>
</div>
<div class="panel-col">
<select name="status" id="status" tabindex="-1" title="" class="form-control height40">
<option value="-1">状态</option>
<option value="1">待上架</option>
<option value="0">待审核</option>
<option value="3">驳回</option>
<option value="0">通过</option>
<option value="1">再次上架待审核</option>
<option value="0">再次上架驳回</option>
<option value="1">再次上架通过</option>
<option value="0">已上架</option>
<option value="0">已下架</option>
</select>
</div>
<div class="panel-col">
<select name="jit" id="jit" tabindex="-1" title="" class="form-control height40">
<option value="-1">是否JIT商品</option>
<option value="Y">是</option>
<option value="N">否</option>
</select>
</div>
<div class="panel-col">
<select name="size" id="size" tabindex="-1" title="" class="form-control height40">
<option value="10">单页显示条数</option>
<option value="10">10条</option>
<option value="20">20条</option>
<option value="30">30条</option>
<option value="50">50条</option>
<option value="100">100条</option>
</select>
</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 class="row" style="margin: 0 0 0 -5px;">
<a id="" href="javascript:;" class="btn btn-default">上架</a>
<a id="" href="javascript:;" class="btn btn-default">下架</a>
<a id="" href="javascript:;" class="btn btn-default">导出</a>
<a id="import-btn" href="javascript:;" class="btn btn-info">批量（排序、款型系列）</a>
</div>
</div>
</div>
<div class="panel">
<div class="dataTables_wrapper no-footer" id="basicTable"></div>
</div>
</div>
<input type="hidden" id="btnAuthority" value="{{bottons}}">
<input type="hidden" id="gridurl" value="{{gridurl}}">
\ No newline at end of file
... ...