fe / yohobuy-portal-fe · Commits

Go to a project

Authored by weiqingting
Commit 06d77415c33bcd65ead3ea3d7689bd39c533751f 2 parents 8bab650d 73ee7236

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

# Conflicts:
#	client/js/product/limit-add.js
#	client/js/product/limit.js
#	server/views/pages/limit/add.html
Inline Side-by-side
Showing 10 changed files with 291 additions and 114 deletions
1 var $ = require('jquery'); 1 var $ = require('jquery');
2 2
3 -  
4 -  
5 $.fn.ajaxfileupload = function(options) { 3 $.fn.ajaxfileupload = function(options) {
6 var settings = { 4 var settings = {
7 params: {}, 5 params: {},
@@ -2,4 +2,14 @@ @@ -2,4 +2,14 @@
2 var $ = require('jquery'), 2 var $ = require('jquery'),
3 common = require('../common/common'); 3 common = require('../common/common');
4 4
5 -require('../util/custom.js');  
  5 +require('../util/custom.js');
  6 +
  7 +var e = new common.edit('#basicForm');
  8 +e.init();
  9 +
  10 +common.edit.ajaxfileupload('.goods-img', {
  11 + action: '/ajax/upload',
  12 + onComplete: function() {
  13 +
  14 + }
  15 +})
@@ -92,11 +92,15 @@ var g = new common.grid({ @@ -92,11 +92,15 @@ var g = new common.grid({
92 }, { 92 }, {
93 display: '操作', 93 display: '操作',
94 render: function(item) { 94 render: function(item) {
95 - return '<a href="javascript:;" class="btn btn-info btn-xs edit-btn">编辑</a>' + 95 + return '<a href="/goods/netsale/edit/' + item.productSkn + '" class="btn btn-info btn-xs edit-btn">编辑</a>' +
96 '<a href="javascript:;" class="btn btn-info btn-xs edit-btn">上架</a>' + 96 '<a href="javascript:;" class="btn btn-info btn-xs edit-btn">上架</a>' +
97 '<a href="javascript:;" class="btn btn-info btn-xs info-btn">查看</a>'; 97 '<a href="javascript:;" class="btn btn-info btn-xs info-btn">查看</a>';
98 } 98 }
99 }] 99 }]
100 }); 100 });
101 101
102 -g.init($("#gridurl").val());  
  102 +g.init($("#gridurl").val());
  103 +
  104 +$("#filter-btn").click(function() {
  105 + g.reload(1);
  106 +});
1 -/*  
2 - *@time: 2016/2/15  
3 - *@author: chenglong  
4 - */  
5 -  
6 -  
7 var $ = require('jquery'), 1 var $ = require('jquery'),
8 common = require('../common/common'); 2 common = require('../common/common');
9 3
@@ -144,7 +138,7 @@ e.on("validate", function() { @@ -144,7 +138,7 @@ e.on("validate", function() {
144 var limitProductType = $("#limitProductType").val(); 138 var limitProductType = $("#limitProductType").val();
145 var activityId = $.trim($("#activityId").val()); 139 var activityId = $.trim($("#activityId").val());
146 if (limitProductType == 2) { 140 if (limitProductType == 2) {
147 - if(activityId == ""){ 141 + if (activityId == "") {
148 return "请填写排队限购ID"; 142 return "请填写排队限购ID";
149 }else{ 143 }else{
150 var _m="排队限购ID接口异常"; 144 var _m="排队限购ID接口异常";
@@ -184,14 +178,25 @@ e.on("validate", function() { @@ -184,14 +178,25 @@ e.on("validate", function() {
184 } 178 }
185 }); 179 });
186 e.on("validate", function() { 180 e.on("validate", function() {
187 - var orderBy = $("#orderBy").val();  
188 - var hotFlag=$("#hotFlag").val();  
189 - if (hotFlag=="1"&&!/^(?:[1-9][0-9]*|0)$/.test(orderBy)) {  
190 - return '热门排序值输入格式不正确'; 181 + var orderBy = $.trim($("#orderBy").val());
  182 + if (orderBy && !/^(?:[1-9][0-9]*|0)$/.test(orderBy)) {
  183 + return '排序值输入格式不正确';
191 } 184 }
192 }); 185 });
193 186
194 187
  188 +function orderByIsRequired(val) {
  189 + if (val == 1) {
  190 + $('.order-by').find('.red').show().end().find('#orderBy').attr('required', true);
  191 + } else {
  192 + $('.order-by').find('.red').hide().end().find('#orderBy').attr('required', false);
  193 + };
  194 +}
  195 +orderByIsRequired($('#hotFlag').val());
  196 +$('input[name="hotFlag"]').on('click', function() {
  197 + orderByIsRequired($(this).val());
  198 +});
  199 +
195 200
196 e.init(); 201 e.init();
197 202
@@ -76,40 +76,22 @@ var tableGird = new common.grid({ @@ -76,40 +76,22 @@ var tableGird = new common.grid({
76 return obj; 76 return obj;
77 }, 77 },
78 columns: [{ 78 columns: [{
79 - display: "",  
80 - type: 'checkbox'  
81 - }, {  
82 - display: "名称",  
83 - name: "productName"  
84 - }, {  
85 - display: "限购商品code",  
86 - name: "limitProductCode"  
87 - }, {  
88 - display: "热门排序",  
89 - name: "hotSort",  
90 - render: function(item) {  
91 - if (item.hotFlag) { 79 + display: "",
  80 + type: 'checkbox'
  81 + }, {
  82 + display: "名称",
  83 + name: "productName"
  84 + }, {
  85 + display: "限购商品code",
  86 + name: "limitProductCode"
  87 + }, {
  88 + display: "排序",
  89 + render: function(item) {
92 return ('<input class="order-input width50" data-id="' + item.id + '" data-type="orderBy" type="text" value="' + item.orderBy + '"/>'); 90 return ('<input class="order-input width50" data-id="' + item.id + '" data-type="orderBy" type="text" value="' + item.orderBy + '"/>');
93 - } else {  
94 - return '-';  
95 } 91 }
96 - }  
97 - },  
98 - // {  
99 - // display: "未发售排序",  
100 - // name: "notSaleSort",  
101 - // render: function(item) {  
102 - // if (item.saleFlag == 1) {  
103 - // return '-';  
104 - // } else {  
105 - // return ('<input class="order-input width50" data-id="' + item.id + '" data-type="notSaleOrderBy" type="text" value="' + item.notSaleOrderBy + '"/>');  
106 - // }  
107 - // }  
108 - // },  
109 - { 92 + },{
110 display: "封面图", 93 display: "封面图",
111 render: function(item) { 94 render: function(item) {
112 -  
113 return ('<img class="cover-img" src="' + item.attachUrl + '" />'); 95 return ('<img class="cover-img" src="' + item.attachUrl + '" />');
114 } 96 }
115 }, { 97 }, {
@@ -127,58 +109,59 @@ var tableGird = new common.grid({ @@ -127,58 +109,59 @@ var tableGird = new common.grid({
127 return item.saleTimeStr.slice(0, 7); 109 return item.saleTimeStr.slice(0, 7);
128 } 110 }
129 } 111 }
130 - }, {  
131 - display: "是否发售",  
132 - name: "saleFlag",  
133 - render: function(item) {  
134 - if (item.saleFlag == 1) {  
135 - return '是';  
136 - } else {  
137 - return '否'; 112 + },{
  113 + display: "是否发售",
  114 + name: "saleFlag",
  115 + render: function(item) {
  116 + if (item.saleFlag == 1) {
  117 + return '是';
  118 + } else {
  119 + return '否';
  120 + }
138 } 121 }
139 - }  
140 - }, {  
141 - display: "是否热门",  
142 - name: "hotFlag",  
143 - render: function(items) {  
144 -  
145 - if (items.hotFlag) {  
146 - return '是';  
147 - } else {  
148 - return '否'; 122 + }, {
  123 + display: "是否热门",
  124 + name: "hotFlag",
  125 + render: function(items) {
  126 +
  127 + if (items.hotFlag) {
  128 + return '是';
  129 + } else {
  130 + return '否';
  131 + }
149 } 132 }
150 - }  
151 - }, {  
152 - display: "是否开启",  
153 - name: "showFlag",  
154 - render: function(items) {  
155 - if (items.showFlag) {  
156 - return '是';  
157 -  
158 - } else {  
159 - return '否'; 133 + }, {
  134 + display: "是否开启",
  135 + name: "showFlag",
  136 + render: function(items) {
  137 + if (items.showFlag) {
  138 + return '是';
  139 +
  140 + } else {
  141 + return '否';
  142 + }
160 } 143 }
161 - }  
162 - }, {  
163 - display: "操作",  
164 - render: function(items) {  
165 - var HtmArr = [];  
166 - if (items.showFlag) {  
167 - HtmArr.push('<a href="javascript:;" data-id="' + items.id + '" class="btn btn-info btn-xs close-btn">关闭</a>');  
168 - } else {  
169 - HtmArr.push('<a href="javascript:;" data-id="' + items.id + '" class="btn btn-info btn-xs open-btn">开启</a>');  
170 - }  
171 -  
172 - if (items.hotFlag) {  
173 - HtmArr.push('<a href="javascript:;" data-id="' + items.id + '" class="btn btn-warning btn-xs hot-cancel">取消热门</a>');  
174 - } else {  
175 - HtmArr.push('<a href="javascript:;" data-id="' + items.id + '" class="btn btn-warning btn-xs hot-btn">设为热门</a>'); 144 + }, {
  145 + display: "操作",
  146 + render: function(items) {
  147 + var HtmArr = [];
  148 + if (items.showFlag) {
  149 + HtmArr.push('<a href="javascript:;" data-id="' + items.id + '" class="btn btn-info btn-xs close-btn">关闭</a>');
  150 + } else {
  151 + HtmArr.push('<a href="javascript:;" data-id="' + items.id + '" class="btn btn-info btn-xs open-btn">开启</a>');
  152 + }
  153 +
  154 + if (items.hotFlag) {
  155 + HtmArr.push('<a href="javascript:;" data-id="' + items.id + '" class="btn btn-warning btn-xs hot-cancel">取消热门</a>');
  156 + } else {
  157 + HtmArr.push('<a href="javascript:;" data-id="' + items.id + '" class="btn btn-warning btn-xs hot-btn">设为热门</a>');
  158 + }
  159 + HtmArr.push('<a href="/limit/edit/' + items.id + '" data-id="' + items.id + '" class="btn btn-info btn-xs">编辑</a>');
  160 + HtmArr.push('<a href="javascript:;" data-id="' + items.id + '" class="btn btn-danger btn-xs delete-btn">删除</a>');
  161 + return HtmArr.join('');
176 } 162 }
177 - HtmArr.push('<a href="/limit/edit/' + items.id + '" data-id="' + items.id + '" class="btn btn-info btn-xs">编辑</a>');  
178 - HtmArr.push('<a href="javascript:;" data-id="' + items.id + '" class="btn btn-danger btn-xs delete-btn">删除</a>');  
179 - return HtmArr.join('');  
180 } 163 }
181 - }] 164 + ]
182 }); 165 });
183 166
184 tableGird.init('/limit/product/page'); 167 tableGird.init('/limit/product/page');
@@ -222,8 +205,7 @@ $('#export-btn').on('click', function() { @@ -222,8 +205,7 @@ $('#export-btn').on('click', function() {
222 queryConf += '|'; 205 queryConf += '|';
223 } 206 }
224 }); 207 });
225 - // queryConf="2016030711350185";  
226 - window.open("/ajax/down?queryConf="+queryConf+"&type=limitProductReminder"); 208 +window.open("/ajax/down?queryConf="+queryConf+"&type=limitProductReminder");
227 // common.util.__ajax({ 209 // common.util.__ajax({
228 // url: '/ajax/down', 210 // url: '/ajax/down',
229 // type:'GET', 211 // type:'GET',
@@ -26,3 +26,40 @@ input[type=date], input[type=time], input[type=datetime-local], input[type=month @@ -26,3 +26,40 @@ input[type=date], input[type=time], input[type=datetime-local], input[type=month
26 .tao-border{ 26 .tao-border{
27 border:1px solid #ccc; 27 border:1px solid #ccc;
28 } 28 }
  29 +
  30 +
  31 +.cover-image-list {
  32 + li {
  33 + float: left;
  34 + width: auto;
  35 + height: auto;
  36 + border: none;
  37 + }
  38 +
  39 + .btn {
  40 + padding: 2px 5px;
  41 + }
  42 +
  43 + .goods-img {
  44 + margin: 0 auto;
  45 + border: 2px dashed #CCC;
  46 + }
  47 +
  48 + input[type="file"] {
  49 + width: 100%;
  50 + height: 100%;
  51 + }
  52 +}
  53 +
  54 +.goods-img {
  55 + position: relative;
  56 + width: 110px;
  57 + height: 150px;
  58 +
  59 +
  60 + .fileinput-button-icon {
  61 + width: 100%;
  62 + height: 100%;
  63 + line-height: 150px;
  64 + }
  65 +}
@@ -122,13 +122,18 @@ exports.res = [ @@ -122,13 +122,18 @@ exports.res = [
122 }, ] 122 }, ]
123 }, { 123 }, {
124 //网销信息 -> 编辑页页面渲染 124 //网销信息 -> 编辑页页面渲染
125 - route: '/goods/netsale/edit', 125 + route: '/goods/netsale/edit/:param',
126 method: 'GET', 126 method: 'GET',
127 view: 'pages/goods/netsale-edit', 127 view: 'pages/goods/netsale-edit',
  128 + url: '/product/getNetSaleInfo',
128 src: '/goods/netsale-edit', 129 src: '/goods/netsale-edit',
129 data: { 130 data: {
130 - data: {}  
131 - } 131 + action: ''
  132 + },
  133 + params: [{
  134 + name: 'param',
  135 + type: 'number'
  136 + }]
132 }, { 137 }, {
133 //价格管理 -> 代销变价页面渲染 138 //价格管理 -> 代销变价页面渲染
134 route: '/goods/pricechange/index', 139 route: '/goods/pricechange/index',
@@ -17,25 +17,32 @@ @@ -17,25 +17,32 @@
17 </div> 17 </div>
18 18
19 <div class="contentpanel"> 19 <div class="contentpanel">
20 - <form id="basicForm" class="form-horizontal form-bordered" type="{{type}}" action="{{action}}">  
21 - {{# data}}  
22 20
  21 + {{# data}}
23 <div class="panel panel-danger"> 22 <div class="panel panel-danger">
24 <div class="panel-heading"> 23 <div class="panel-heading">
25 <div class="panel-btns" style="display: none;"> 24 <div class="panel-btns" style="display: none;">
26 - <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title="" data-original-title="Minimize Panel"><i class="fa fa-minus"></i></a> 25 + <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
27 </div> 26 </div>
28 <h2 class="panel-title">上架前必填</h2> 27 <h2 class="panel-title">上架前必填</h2>
29 </div> 28 </div>
  29 +
30 <div class="panel-body"> 30 <div class="panel-body">
  31 +
31 <div class="panel panel-default"> 32 <div class="panel panel-default">
  33 + <form id="basicForm" class="form-horizontal form-bordered" type="{{type}}" action="{{action}}">
32 <div class="panel-heading"> 34 <div class="panel-heading">
33 <div class="panel-btns" style="display: none;"> 35 <div class="panel-btns" style="display: none;">
34 - <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title="" data-original-title="Minimize Panel"><i class="fa fa-minus"></i></a> 36 + <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
35 </div> 37 </div>
36 <h2 class="panel-title">基本信息</h2> 38 <h2 class="panel-title">基本信息</h2>
37 </div> 39 </div>
38 <div class="panel-body nopadding"> 40 <div class="panel-body nopadding">
  41 + {{# baseProductInfo}}
  42 + {{# baseProduct}}
  43 + <div class="form-group">
  44 + <blockquote>基本信息：</blockquote>
  45 + </div>
39 <div class="form-group"> 46 <div class="form-group">
40 <div class="col-sm-3">店铺：{{shopName}}</div> 47 <div class="col-sm-3">店铺：{{shopName}}</div>
41 <div class="col-sm-3">品牌：{{brandName}}</div> 48 <div class="col-sm-3">品牌：{{brandName}}</div>
@@ -56,13 +63,142 @@ @@ -56,13 +63,142 @@
56 <div class="col-sm-8"><input class="form-control" placeholder="基础商品名称" type="text"></div> 63 <div class="col-sm-8"><input class="form-control" placeholder="基础商品名称" type="text"></div>
57 <div class="col-sm-12" style="color: red;"><div class="col-sm-1"></div>建议名称：【品牌英文+性别+图案纹理+版型+风格+三级类目+商家款号+（款型）】，如此可增加商品在搜索页的展示。</div> 64 <div class="col-sm-12" style="color: red;"><div class="col-sm-1"></div>建议名称：【品牌英文+性别+图案纹理+版型+风格+三级类目+商家款号+（款型）】，如此可增加商品在搜索页的展示。</div>
58 </div> 65 </div>
  66 + <div class="form-group">
  67 + <div class="col-sm-12">商品话题：{{productTag}}</div>
  68 + </div>
  69 + <div class="form-group">
  70 + <div class="col-sm-3">年龄层：{{ageLevel}}</div>
  71 + <div class="col-sm-3">性别：{{gender}}</div>
  72 + <div class="col-sm-3">重点款：{{grade}}</div>
  73 + </div>
  74 + <div class="form-group">
  75 + <div class="col-sm-3">是否奥莱：{{isOutLets}}</div>
  76 + <div class="col-sm-3">限量款：{{isLimited}}</div>
  77 + <div class="col-sm-3">促销礼品：{{isPromotionalGifts}}</div>
  78 + </div>
  79 + <div class="form-group">
  80 + <div class="col-sm-3">是否预售：{{isAdvance}}</div>
  81 + <div class="col-sm-3" style="color: #ccc;">预售库存：{{stock}}</div>
  82 + <div class="col-sm-3">预计到货时间：{{expectArrivalTime}}</div>
  83 + </div>
  84 + <div class="form-group">
  85 + <div class="col-sm-3">是否限购：{{isLimitbuy}}</div>
  86 + <div class="col-sm-3">适销季：{{seasons}}</div>
  87 + </div>
  88 + <div class="form-group">
  89 + <div class="col-sm-3">吊牌价：{{retailPrice}}</div>
  90 + <div class="col-sm-3">销售价：{{salesPrice}}</div>
  91 + </div>
  92 + <div class="form-group">
  93 + <div class="col-sm-3">是否VIP：</div>
  94 + <div class="col-sm-3">预计上架时间：{{expectShelfTime}}</div>
  95 + </div>
  96 + {{/ baseProduct}}
  97 + {{/ baseProductInfo}}
  98 + {{# goodsList}}
  99 + <div class="form-group">
  100 + <div class="col-sm-12">
  101 + <h4>能否补货：</h4>
  102 + <table class="table table-bordered">
  103 + <thead>
  104 + <tr>
  105 + <th>SKC(厂家颜色)</th>
  106 + <th>SKU(尺码)</th>
  107 + <th>能否补货</th>
  108 + </tr>
  109 + </thead>
  110 + <tbody>
  111 +
  112 + <tr>
  113 + <td>{{productSkc}}（{{goodsName}}）</td>
  114 + <td>{{# goodsSizeList}}{{productSku}}（{{sizeName}}）<br>{{/ goodsSizeList}}</td>
  115 + <td>{{# goodsSizeList}}{{isSuppled}}</br>{{/ goodsSizeList}}</td>
  116 + </tr>
  117 +
  118 + </tbody>
  119 + </table>
  120 + </div>
  121 + </div>
  122 + {{/ goodsList}}
  123 + <div class="form-group">
  124 + <blockquote>上架必填：</blockquote>
  125 + </div>
  126 + <div class="form-group">
  127 + <div class="col-sm-1 height40">商品短评<i class="red">*</i>：</div>
  128 + <div class="col-sm-8"><input class="form-control" placeholder="商品短评" type="text" required></div>
  129 + </div>
  130 + <div class="form-group">
  131 + <div class="col-sm-6">
  132 + <label>是否新品：</label>
  133 + <label class="radio-inline"><input type="radio" name="dayFlag" value="1">是</label>
  134 + <label class="radio-inline"><input type="radio" name="dayFlag" value="0">否</label>
  135 + </div>
  136 + <div class="col-sm-6">
  137 + <label>上架渠道：</label>
  138 + <label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="网站">网站</label>
  139 + <label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="手机">手机</label>
  140 + <label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="场地">场地</label>
  141 + </div>
  142 + </div>
  143 + <div class="form-group">
  144 + <div class="col-sm-12">下架时间：售罄0天下架</div>
  145 + </div>
  146 + </div>
  147 + <div class="panel-footer">
  148 + <button class="btn btn-primary">保存文本</button>
59 </div> 149 </div>
  150 + </form>
  151 + </div>
  152 + <div class="panel panel-default">
  153 + <form action="" class="form-horizontal form-bordered">
  154 + <div class="panel-heading">
  155 + <div class="panel-btns" style="display: none;">
  156 + <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
  157 + </div>
  158 + <h2 class="panel-title">封面设置</h2>
  159 + </div>
  160 + <div class="panel-body nopadding">
  161 + {{# goodsImagesList}}
  162 + <div class="form-group">
  163 + <div class="col-sm-1">
  164 + <div class="goods-img">
  165 + <p>SKC: {{productSkc}}</p>
  166 + <p>{{goodsName}}色</p>
  167 + </div>
  168 + <div class="cover-color height40">颜色封面：</div>
  169 + <div class="goods-color height40">商品封面：</div>
  170 + </div>
  171 + <div class="col-sm-11">
  172 + <ul class="cover-image-list col-sm-12">
  173 + <li class="cover-image-item fileinput-button">
  174 + <div class="goods-img">
  175 + <a class="fileinput-button-icon" href="javascript:void(0);">+</a>
  176 + <input type="file" class="goods-img-upload">
  177 + </div>
  178 + <div class="cover-color height40">
  179 + <a href="javascript:;" class="btn btn-default btn-metro">默认</a>
  180 + <a href="javascript:;" class="btn btn-default btn-metro">男封</a>
  181 + <a href="javascript:;" class="btn btn-default btn-metro">女封</a>
  182 + </div>
  183 + <div class="goods-color height40">
  184 + <a href="javascript:;" class="btn btn-default btn-metro">设置默认</a>
  185 + <a href="javascript:;" class="btn btn-default btn-metro">调用图片</a>
  186 + </div>
  187 + </li>
  188 + </ul>
  189 + </div>
  190 + </div>
  191 + {{/ goodsImagesList}}
  192 + </div>
  193 + <div class="panel-footer">
  194 + <button class="btn btn-primary">保存封面</button>
  195 + </div>
  196 + </form>
60 </div> 197 </div>
61 </div> 198 </div>
  199 +
62 </div> 200 </div>
63 -  
64 {{/ data}} 201 {{/ data}}
65 - </form>  
66 </div> 202 </div>
67 203
68 204
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 <div class="panel-body"> 27 <div class="panel-body">
28 <div class="row"> 28 <div class="row">
29 <div class="panel-col"> 29 <div class="panel-col">
30 - <input id="skn" class="form-control panel-input height40" type="text" placeholder="请输入SKN" onkeyup="this.value=this.value.replace(/\D/gi,'')"> 30 + <input id="productSkn" class="form-control panel-input height40" type="text" placeholder="请输入SKN" onkeyup="this.value=this.value.replace(/\D/gi,'')">
31 </div> 31 </div>
32 <div class="panel-col"> 32 <div class="panel-col">
33 <input id="skc" class="form-control panel-input height40" type="text" placeholder="请输入SKC" onkeyup="this.value=this.value.replace(/\D/gi,'')"> 33 <input id="skc" class="form-control panel-input height40" type="text" placeholder="请输入SKC" onkeyup="this.value=this.value.replace(/\D/gi,'')">
@@ -118,6 +118,7 @@ @@ -118,6 +118,7 @@
118 <option value="0">已下架</option> 118 <option value="0">已下架</option>
119 </select> 119 </select>
120 </div> 120 </div>
  121 +
121 <div class="panel-col"> 122 <div class="panel-col">
122 <select name="jit" id="jit" tabindex="-1" title="" class="form-control height40"> 123 <select name="jit" id="jit" tabindex="-1" title="" class="form-control height40">
123 <option value="-1">是否JIT商品</option> 124 <option value="-1">是否JIT商品</option>
@@ -135,8 +136,10 @@ @@ -135,8 +136,10 @@
135 <option value="100">100条</option> 136 <option value="100">100条</option>
136 </select> 137 </select>
137 </div> 138 </div>
138 - <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>  
139 - <a id="all-btn" href="javascript:;" class="btn btn-info">全部</a> 139 + <div class="panel-col height40">
  140 + <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
  141 + <a id="all-btn" href="javascript:;" class="btn btn-info">全部</a>
  142 + </div>
140 </div> 143 </div>
141 144
142 <div class="row" style="margin: 0 0 0 -5px;"> 145 <div class="row" style="margin: 0 0 0 -5px;">
@@ -86,15 +86,12 @@ @@ -86,15 +86,12 @@
86 <label class="radio-inline"><input type="radio" name="hotFlag" value="0">否</label> 86 <label class="radio-inline"><input type="radio" name="hotFlag" value="0">否</label>
87 <input type="hidden" value="{{hotFlag}}" id="hotFlag" for="radio"> 87 <input type="hidden" value="{{hotFlag}}" id="hotFlag" for="radio">
88 </div> 88 </div>
89 - <div class="col-md-3 height60">  
90 - <label>热门排序：</label>  
91 - <label><input id="orderBy" value="{{orderBy}}" type="text" class="form-control" placeholder="热门排序" placeholder=""></label> 89 +
  90 + <div class="col-md-3 height60 order-by">
  91 + <label>排序</label>
  92 + <label><input id="orderBy" value="{{orderBy}}" type="text" class="form-control" placeholder="排序" required></label>
92 <p>（提示：数字越大越靠前）</p> 93 <p>（提示：数字越大越靠前）</p>
93 </div> 94 </div>
94 - <!-- <div class="col-md-3">  
95 - <label>未发售排序：</label>  
96 - <label><input id="notSaleOrderBy" value="{{notSaleOrderBy}}" placeholder="未发售排序" type="text" class="form-control" placeholder=""></label>  
97 - </div> -->  
98 </div> 95 </div>
99 </div> 96 </div>
100 </div> 97 </div>