liuloulou / yohobuy-portal-fe2 · Commits

Go to a project

Authored by weiqingting
Commit c72844b5b161ae8a1e82d3673ee1109c9b18648b 1 parent c198baf6

提交

Inline Side-by-side
Showing 17 changed files with 61 additions and 67 deletions
... ... @@ -3,6 +3,10 @@
<div class="contentpanel" id="form-base">
<div class="panel panel-default" style="margin-bottom:10px;">
<div class="panel-body" style="padding-bottom:0;">
<a id="add-btn" href="javascript:;" class="btn btn-success"><i class="fa fa-plus"></i> 添加品牌款型</a>
</div>
<div class="panel-body">
<div class="row">
<div class="panel-col">
... ... @@ -16,18 +20,13 @@
<option value="2">品牌系列</option>
</select>
</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="status" id="status" tabindex="-1" title="" class="form-control height40">
<option value="-1">状态</option>
... ... @@ -36,14 +35,16 @@
</select>
</div>
<a id="filter-btn" href="javascript:;" class="btn btn-info">查询</a>
<a id="all-btn" href="" class="btn btn-info">全部</a>
</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="row" style="margin-bottom:10px;">
<a id="add-btn" href="javascript:;" class="btn btn-info">添加</a>
<div class="panel-col">
<a id="filter-btn" href="javascript:;" class="btn btn-info">查询</a>
<a id="all-btn" href="" class="btn btn-info">全部</a>
</div>
</div>
</div>
</div>
... ...
... ... @@ -24,7 +24,7 @@
<div class="panel panel-default">
<div class="panel-heading noborder">
<button id="btn-add" class="btn btn-success model-attr-btn" disabled>
<i class="glyphicon-plus"></i>添加尺码
<i class="fa fa-plus"></i> 添加尺码
</button>
</div>
</div>
... ...
... ... @@ -25,7 +25,7 @@
<div class="panel panel-default">
<div class="panel-heading noborder">
<button id="btn-add" class="btn btn-success model-attr-btn" disabled>
<i class="glyphicon-plus"></i>尺码属性
<i class="fa fa-plus"></i> 尺码属性
</button>
</div>
</div>
... ...
... ... @@ -24,7 +24,7 @@
<div class="panel panel-default">
<div class="panel-heading noborder">
<button class="btn btn-success model-attr-btn" disabled data-toggle="modal" id="add-attri" data-target="#addAttr">
<i class="glyphicon-plus"></i>添加属性
<i class="fa fa-plus"></i> 添加属性
</button>
</div>
</div>
... ...
<%include '../common/__ui/header'%>
<%include '../common/__partail/ListHeader'%>
<div class="contentpanel">
<div class="panel panel-default" style="margin-bottom:10px;">
<div class="panel-body">
<div class="row">
<a class="btn btn-info" id="add">添加尺码属性</a>
</div>
</div>
<div id="size-property">
<div style="margin-bottom: 20px">
<a class="btn btn-success" id="add"><i class="fa fa-plus"></i> 添加尺码属性</a>
</div>
<div class="panel">
<div class="panel-body nopadding">
<div id="size-property"></div>
</div>
</div>
</div>
... ...
<%include '../common/__ui/header'%>
<%include '../common/__partail/ListHeader'%>
<div class="contentpanel">
<div class="panel panel-default" style="margin-bottom:10px;">
<div class="panel-body">
<div class="row">
<a class="btn btn-info" id="add">添加尺码</a>
</div>
</div>
<div id="size-list">
<div style="margin-bottom: 20px">
<a class="btn btn-success" id="add"><i class="fa fa-plus"></i> 添加尺码</a>
</div>
<div class="panel">
<div class="panel-body nopadding">
<div id="size-list"></div>
</div>
</div>
</div>
... ...
<%include '../../common/__ui/header'%>
<%include '../../common/__partail/ListHeader'%>
<div class="contentpanel">
<div class="panel panel-default" style="margin-bottom:10px;">
<div class="panel-body">
<div class="row">
<a class="btn btn-info" href="/erpproduct/product/addColor">添加颜色</a>
</div>
</div>
<input type="hidden" id="url" value="/erpproduct/product/colorList"/>
<div id="color-list" class="color">
<div style="margin-bottom: 20px">
<a class="btn btn-success" href="/erpproduct/product/addColor"><i class="fa fa-plus"></i> 添加颜色</a>
</div>
<div class="panel">
<div class="panel-body nopadding">
<input type="hidden" id="url" value="/erpproduct/product/colorList"/>
<div id="color-list" class="color"></div>
</div>
</div>
</div>
... ...
... ... @@ -237,7 +237,7 @@
<div class="row">
<div class="col-sm-8 col-sm-offset-2">
<a href="javascript:;" onclick="history.go(-1);" class="btn btn-default">取消</a>
<button id="save_brand" type="submit" data-loading-text="保存中..." class="btn btn-primary">保存</button>
<button id="save_brand" type="submit" data-loading-text="保存中..." class="btn delay-btn btn-primary">保存</button>
</div>
</div>
</div>
... ...
... ... @@ -79,7 +79,7 @@
</div>
</div>
<div class="panel panel-primary-head">
<div class="dataTab_wrapper" id="basicTab"></div>
<div class="dataTab_wrapper" id="basicTab" style="margin-bottom: 10px"></div>
<div class="dataTab_wrapper" id="basicTable" ></div>
</div>
</div>
... ...
... ... @@ -99,7 +99,7 @@
<td>说明：</td>
<td colspan="2">
1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br>
2、第一行标题栏：<span style="color: #67D267;">货品名称、厂家编号、一级分类、二级分类、三级分类、四级分类、性别、货品年、货品季、吊牌价、销售价、色系、厂家颜色、款型、尺码、条码、能否补货、SKN计数,年龄层（成人，大童，小童），重点款，预计上架时间,UPM条码,厂家编号</span><br>
2、第一行标题栏：<span style="color: #67D267;">货品名称、厂家编号、一级分类、二级分类、三级分类、四级分类、性别、货品年、货品季、吊牌价、销售价、色系、厂家颜色、款型、尺码、条码、能否补货、SKN计数,年龄层（成人，大童，小童），重点款，预计上架时间,UPM条码</span><br>
3、<a href="/ajax/link/baseproduct">下载样例</a>
</td>
</tr>
... ...
... ... @@ -3,7 +3,7 @@
<div class="contentpanel">
<div class="panel panel-default" style="margin-bottom:10px;">
<div class="panel-heading">
<div class="panel-body" style="padding-bottom:0">
<a href="/base/goods/add" class="btn btn-success"><i class="fa fa-plus"></i> 添加基础商品</a>
</div>
<div class="panel-body">
... ... @@ -90,7 +90,7 @@
</div>
</div>
<div class="panel panel-primary-head">
<div class="dataTab_wrapper" id="basicTab"></div>
<div class="dataTab_wrapper" id="basicTab" style="margin-bottom: 10px"></div>
<div class="dataTab_wrapper" id="basicTable"></div>
</div>
</div>
... ...
... ... @@ -2,12 +2,12 @@
<%include '../../common/__partail/ListHeader'%>
<div class="contentpanel">
<div>
<ul class="nav nav-pills">
<ul class="nav nav-pills" style="margin-bottom: 10px">
<li>
<a class="tag" href="/goods/special/index" style="font-size: 14px;padding:20px;color: black">特殊商品</a>
<a class="tag" href="/goods/special/index" style="font-size: 14px;padding:10px">特殊商品</a>
</li>
<li>
<a class="hand active" href="javascript:void(0)" style="font-size: 14px;padding:20px;color: #428bca">货到付款</a>
<li class="active">
<a class="hand" href="javascript:void(0)" style="font-size: 14px;padding:10px">货到付款</a>
</li>
</ul>
</div>
... ... @@ -36,20 +36,16 @@
</select>
</div>
<div class="panel-col-3">
<a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
<a id="export-btn" href="" class="btn btn-info">导出</a>
<a id="btn-input" href="/goods/cod/upload" class="btn btn-info">批量导入</a>
</div>
</div>
</div>
</div>
<div class="panel panel-primary-head">
<div class="dataTab_wrapper" id="basicTab"></div>
<div class="dataTab_wrapper" id="basicTab" style="margin-bottom: 10px"></div>
<div class="dataTab_wrapper" id="basicTable" ></div>
</div>
</div>
... ...
... ... @@ -123,7 +123,7 @@
</div>
<div class="panel">
<div class="panel-body nopadding">
<div class="dataTab_wrapper" id="basicTab"></div>
<div class="dataTab_wrapper" id="basicTab" style="margin-bottom: 10px"></div>
<div class="dataTables_wrapper no-footer" id="basicTable"></div>
</div>
</div>
... ...
... ... @@ -2,12 +2,12 @@
<%include '../../common/__partail/ListHeader'%>
<div class="contentpanel">
<div>
<ul class="nav nav-pills">
<li>
<a class="tag active" href="javascript:void(0)" style="font-size: 14px;padding:20px;color: #428bca">特殊商品</a>
<ul class="nav nav-pills" style="margin-bottom: 10px">
<li class="active">
<a class="tag" href="javascript:void(0)" style="font-size: 14px;padding:10px">特殊商品</a>
</li>
<li>
<a class="hand " href="/goods/cod/goods/index" style="font-size: 14px;padding:20px;color: black">货到付款</a>
<a class="hand" href="/goods/cod/goods/index" style="font-size: 14px;padding:10px">货到付款</a>
</li>
</ul>
</div>
... ...
... ... @@ -34,13 +34,13 @@
<input type="button" class="btn btn-default " value="返回" onclick="history.go(-1)">
</div>
<div class="moduleSubmite" style="display: none; text-align: right; margin-top: -10px">
<input id="saveModule" type="button" class="btn btn-success" value="暂存">
<input id="submitModule" type="button" class="btn btn-primary" value="提交审核">
<input id="saveModule" type="button" class="btn btn-success delay-btn" value="暂存">
<input id="submitModule" type="button" class="btn btn-primary delay-btn" value="提交审核">
<input type="button" class="btn btn-default " value="返回" onclick="history.go(-1)">
</div>
<div class="moduleCheck" style="display: none; text-align: right; margin-top: -10px">
<input id="checkOk" type="button" class="btn btn-primary" value="审核通过">
<input id="checkNo" type="button" class="btn btn-danger" value="驳回">
<input id="checkOk" type="button" class="btn btn-primary delay-btn" value="审核通过">
<input id="checkNo" type="button" class="btn btn-danger delay-btn" value="驳回">
<input type="button" class="btn btn-default " value="返回" onclick="history.go(-1)">
</div>
</div>
... ...
... ... @@ -127,8 +127,8 @@
</div>
<div style="text-align: center">
<button type="button" data-oncheck='1' class="check btn btn-success">提交审核</button>
<button type="button" data-oncheck='2' class="check btn btn-info btn-cun">暂存</button>
<button type="button" data-oncheck='1' class="check delay-btn btn btn-success">提交审核</button>
<button type="button" data-oncheck='2' class="check delay-btn btn btn-info btn-cun">暂存</button>
<button onclick="history.go(-1);" type="button" class="btn btn-danger">取消</button>
</div>
</div>
... ...
... ... @@ -225,15 +225,15 @@
<a href="javascript:;" class="btn btn-default"
onclick="javascript:history.go(-1);">取消</a>
<%if add%>
<button type="submit" class="btn btn-info" data-loading-text="暂存中..." id="btnTemporary">暂存</button>
<button type="submit" class="btn delay-btn btn-info" data-loading-text="暂存中..." id="btnTemporary">暂存</button>
<%/if%>
<%if update%>
<button type="submit" class="btn btn-success mr5" data-loading-text="提交审核中..." id="btnReview">提交审核</button>
<button type="submit" class="btn delay-btn btn-success mr5" data-loading-text="提交审核中..." id="btnReview">提交审核</button>
<%/if%>
<%if updatecheck%>
<button type="submit" class="btn btn-success mr5" data-loading-text="提交审核中..." id="updatecheck">提交审核</button>
<button type="submit" class="btn delay-btn btn-success mr5" data-loading-text="提交审核中..." id="updatecheck">提交审核</button>
<%/if%>
</div>
</div>
... ...