Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/adminChannel/channelRebate_list.jsp

@@ -37,7 +37,7 @@
 <div class="pd-20">
     <form action="${pageContext.request.contextPath }/admin/channel/listChannelRebate" method="post" style="margin-bottom: 20px;text-align: center;">
         <button name=""  class="btn btn-success" type="button" onclick="getChannel();" style="margin-left: -50px;margin-right: 100px;">
-            <i class="Hui-iconfont"></i>结算
+            结算
         </button>
         <span class="select-box" style="width: 150px">
 					<select id="rebackStatus" name="rebackStatus" class="select">
@@ -49,7 +49,7 @@
 					</select>
 		</span>
         <input name="salesOrderid" id="salesOrderid" value="${salesOrderid }" placeholder="订单编号" style="width: 150px" class="input-text" type="text">
-        日期范围： <input  id="stateDates" value="<fmt:formatDate value="${stateDate}" pattern="yyyy-MM-dd"/>" name="stateDates" class="input-text Wdate" style="width: 120px;" type="text" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',maxDate:'#F{$dp.$D(\'endDates\')||\'%y-%M-%d\'}'})" readonly>
+        创建时间： <input  id="stateDates" value="<fmt:formatDate value="${stateDate}" pattern="yyyy-MM-dd"/>" name="stateDates" class="input-text Wdate" style="width: 120px;" type="text" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',maxDate:'#F{$dp.$D(\'endDates\')||\'%y-%M-%d\'}'})" readonly>
         - <input  id="endDates" value="<fmt:formatDate value="${endDate}" pattern="yyyy-MM-dd"/>" name="endDates" class="input-text Wdate" style="width: 120px;" type="text" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'stateDates\')||\'%y-%M-%d\'}'})" readonly>
        <button name="" id="submitBtn" class="btn btn-success" type="submit">
             <i class="Hui-iconfont"></i> 搜索
@@ -61,7 +61,7 @@
         <table class="table table-border table-bordered table-bg">
             <thead>
             <tr>
-                <th scope="col" colspan="11">积分记录列表</th>
+                <th scope="col" colspan="12">积分记录列表</th>
             </tr>
             <tr class="text-c">
                 <th width="50"></th>
@@ -105,7 +105,7 @@
                 </c:forEach>
                 </c:if>
                 <c:if test="${empty page.dataList}">
-                    <tr align="center"><td colspan="10" style="text-align: center;">未查询到该类数据!</td></tr>
+                    <tr align="center"><td colspan="12" style="text-align: center;">未查询到该类数据!</td></tr>
                 </c:if>
             </tbody>
         </table>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/adminChannel/child_channel_list.jsp

@@ -80,7 +80,7 @@
                 <td>${infolist.childChannelDesc}</td>
                 <td><fmt:formatDate value="${infolist.childChannelCreateTime}" pattern="yyyy-MM-dd"/></td>
                 <td>
-                    <a onclick="toRebateList(${infolist.mainChannelId})">查看明细</a>
+                    <a onclick="toRebateList(${infolist.mainChannelId})">查看明细</a></br>
                     <a href="#" onclick="toRebateList(${infolist.mainChannelId})">结算</a>
                 </td>
                 </c:forEach>