|
@@ -68,15 +68,6 @@
|
|
|
<form:option value="1" label="已售"/>
|
|
|
</form:select>
|
|
|
</div>
|
|
|
- <div class="item">
|
|
|
- <label>付款状态:</label>
|
|
|
- <form:select path="payStatus" class="input-medium">
|
|
|
- <form:option value="" label="请选择"/>
|
|
|
- <form:option value="1" label="待付款"/>
|
|
|
- <form:option value="2" label="已付款"/>
|
|
|
- <form:option value="3" label="无需付款"/>
|
|
|
- </form:select>
|
|
|
- </div>
|
|
|
<div class="item">
|
|
|
<label>商品品牌:</label>
|
|
|
<form:select path="brandID" class="input-medium">
|
|
@@ -99,6 +90,14 @@
|
|
|
<form:option value="4" label="小程序-协销"/>
|
|
|
</form:select>
|
|
|
</div>
|
|
|
+ <div class="item">
|
|
|
+ <label>发布者身份:</label>
|
|
|
+ <form:select path="publishIdentity" class="input-medium">
|
|
|
+ <form:option value="" label="请选择"/>
|
|
|
+ <form:option value="1" label="个人身份"/>
|
|
|
+ <form:option value="2" label="机构身份"/>
|
|
|
+ </form:select>
|
|
|
+ </div>
|
|
|
<div class="item">
|
|
|
<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询" style="margin-left:20px;"/>
|
|
|
</div>
|
|
@@ -113,6 +112,7 @@
|
|
|
<th>商品图片</th>
|
|
|
<th>商品品牌</th>
|
|
|
<th>商品名称</th>
|
|
|
+ <th>发布者身份</th>
|
|
|
<th>卖家</th>
|
|
|
<th>采美对接人</th>
|
|
|
<th>来源</th>
|
|
@@ -122,7 +122,6 @@
|
|
|
<th>分类</th>
|
|
|
<th>商品状态</th>
|
|
|
<th>交易状态</th>
|
|
|
- <th>付款状态</th>
|
|
|
<th>提交时间</th>
|
|
|
<th>审核时间</th>
|
|
|
<th>到期时间</th>
|
|
@@ -160,10 +159,22 @@
|
|
|
<div style='max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;margin: 0 auto;' title='${product.name}'>${product.name}</div>
|
|
|
</a>
|
|
|
</c:if>
|
|
|
-
|
|
|
</td>
|
|
|
<td>
|
|
|
+ <c:if test="${product.publishIdentity eq 1}">
|
|
|
+ 个人身份
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${product.publishIdentity eq 2}">
|
|
|
+ 公司身份
|
|
|
+ </c:if>
|
|
|
+ </td>
|
|
|
+ <td>
|
|
|
+ <c:if test="${product.publishIdentity eq 1}">
|
|
|
${product.contactName}
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${product.publishIdentity eq 2}">
|
|
|
+
|
|
|
+ </c:if>
|
|
|
</td>
|
|
|
<td>${product.dockingPeopleName}</td>
|
|
|
<td>
|
|
@@ -212,7 +223,7 @@
|
|
|
${product.sold eq '1'?'已售':'未售'}
|
|
|
</td>
|
|
|
<td>
|
|
|
- ${product.payStatus eq '1'?'待付款':product.payStatus eq '2'?'已付款':product.payStatus eq '3'?'无需付款':'其他'}
|
|
|
+
|
|
|
</td>
|
|
|
<td>
|
|
|
<c:if test="${empty product.submitDate}">
|