页面调整

src/main/resources/mappings/modules/user/CmBehaviorRecordMapper.xml

@@ -31,8 +31,11 @@
         LEFT JOIN shop s ON b.userID = s.userID
         LEFT JOIN serviceprovider sp on c.spID = sp.serviceProviderID
         <where>
+            <if test="IP != null and IP != ''">
+                b.IP = #{IP}
+            </if>
             <if test="name != null and name != ''">
-                u.name = #{name}
+                AND u.name = #{name}
             </if>
             <if test="userIdentity != null and userIdentity != ''">
                 <if test="userIdentity == 2">

src/main/webapp/WEB-INF/views/modules/user/behaviorRecordList.jsp

@@ -37,21 +37,23 @@
     <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
     <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
     <div class="ul-form">
+        <label>IP：</label>
+            <form:input path="IP" htmlEscape="false" maxlength="15" cssStyle="width: 150px" class="input-mini"/>
         <label>公司名称：</label>
-            <form:input path="name" htmlEscape="false" maxlength="11" class="input-mini"/>
+            <form:input path="name" htmlEscape="false" maxlength="11" cssStyle="width: 150px" class="input-mini"/>
         <label>公司类型：</label>
-            <form:select path="userIdentity" class="input-medium required">
+            <form:select path="userIdentity" cssStyle="width: 150px" class="input-medium required">
                 <form:option value="" label="请选择"/>
                 <form:option value="2" label="机构"/>
                 <form:option value="3" label="供应商"/>
                 <form:option value="1" label="游客"/>
             </form:select>
         <label>联系人：</label>
-            <form:input path="linkMan" htmlEscape="false" maxlength="20" class="input-small"/>
+            <form:input path="linkMan" htmlEscape="false" maxlength="20" cssStyle="width: 150px" class="input-small"/>
         <label>手机号码：</label>
-            <form:input path="contractMobile" htmlEscape="false" maxlength="20" class="input-small"/>
+            <form:input path="contractMobile" htmlEscape="false" maxlength="20" cssStyle="width: 150px" class="input-small"/>
         <label>协销：</label>
-            <form:input path="spName" htmlEscape="false" maxlength="20" class="input-small"/>
+            <form:input path="spName" htmlEscape="false" maxlength="20" cssStyle="width: 150px" class="input-small"/>
         <div class="ys-kin" style="margin-top: 20px">
             <label>访问日期：</label>
             <input name="startTime" type="text" readonly="readonly" maxlength="15" class="input-mini Wdate"

src/main/webapp/WEB-INF/views/modules/user/newCmShopForm.jsp

@@ -797,13 +797,9 @@
                     <c:forEach items="${newCmShop.splitCodes}" var="item" varStatus="varIndex">
                         <div id="paramsItem" class="paramsItem">
                             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<form:input
-                                path="splitCodes[${varIndex.index}].splitCode" id="paramsName"
-                                maxlength="15" placeholder="请输入分帐商户号" class="input-small"/>
-                            <form:input path="splitCodes[${varIndex.index}].email" id="email"
-                                        maxlength="15" placeholder="请输入对应邮箱号" class="input-small"/>
-                            <form:input path="splitCodes[${varIndex.index}].codeRemark" id="paramsContent"
-                                        maxlength="15" placeholder="请输入账户备注"
-                                        class="input-small"/>
+                                path="splitCodes[${varIndex.index}].splitCode" id="paramsName" maxlength="15" class="input-small"/>
+                            <form:input path="splitCodes[${varIndex.index}].email" id="email" cssStyle="width: 150px" class="input-small"/>
+                            <form:input path="splitCodes[${varIndex.index}].codeRemark" id="paramsContent" maxlength="15" class="input-small"/>
                             <input name="splitCodes[${varIndex.index}].weChatFlag" type="checkbox" ${item.weChatFlag eq 1 ? 'checked':''} value="1">已确认微信支付开户意愿</input>
                             <span type="button" style="cursor: pointer;color: #0B61A4"
                                   onclick="deleteParams(this)">删除</span>
@@ -1210,7 +1206,7 @@
         productParametersIndex++;
         var html = '<div id="paramsItem" class="paramsItem">';
         html += '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input name="splitCodes[' + [productParametersIndex] + '].splitCode" id="splitCode" maxlength="15" placeholder="请输入分帐商户号" type="text" class="input-small"/>&nbsp;';
-        html += '<input name="splitCodes[' + [productParametersIndex] + '].email" id="email"maxlength="15" placeholder="请输入对应邮箱号" type="text" class="input-small"/>&nbsp;'
+        html += '<input name="splitCodes[' + [productParametersIndex] + '].email" id="email" maxlength="50" placeholder="请输入对应邮箱号" type="text" style="width: 150px" class="input-small"/>&nbsp;'
         html += '<input name="splitCodes[' + [productParametersIndex] + '].codeRemark" id="codeRemark" maxlength="15" placeholder="请输入账户备注"  type="text"   class="input-small"/>&nbsp;';
         html += '<input name="splitCodes[' + [productParametersIndex] + '].weChatFlag" id="weChatFlag" type="checkbox" class="input-small" value="1">已确认微信支付开户意愿</input>&nbsp;';
         html += '<span type="button" style="cursor: pointer;color: #0B61A4" onclick="deleteParams(this)"">删除</span>';

src/main/webapp/WEB-INF/views/modules/userNew/cmAgencyForm.jsp

@@ -515,7 +515,7 @@
             <td width="13%"><form:input path="sname" name="sname" htmlEscape="false" maxlength="20"
                                         class="input-medium"  value="${newCmClub.sname}"/></td>
             <th width="12%">注册邮箱：</th>
-            <td width="13%"><form:input path="contractEmail" name="contractEmail" htmlEscape="false" maxlength="20"
+            <td width="13%"><form:input path="contractEmail" name="contractEmail" htmlEscape="false" maxlength="50"
                                         class="input-medium"/></td>
         </tr>
         <tr height="28">