Home Explore Help
Sign In
caimei365
/
caimei365-manager
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge remote-tracking branch 'origin/developerD' into developer

huangzhiguo 2 years ago
parent
a82230bffe 1b609704ab
commit
50a5dfe233
4 changed files with 7 additions and 7 deletions
Split View Show Diff Stats
  1. 1 1
      src/main/java/com/caimei/modules/user/web/CmUserBehaviorRecordController.java
  2. 1 1
      src/main/webapp/WEB-INF/views/modules/user/behaviorRecordDetailsList.jsp
  3. 4 4
      src/main/webapp/WEB-INF/views/modules/user/behaviorRecordList.jsp
  4. 1 1
      src/main/webapp/WEB-INF/views/modules/user/behaviorRecordRossList.jsp

+ 1 - 1
src/main/java/com/caimei/modules/user/web/CmUserBehaviorRecordController.java
View File 

@@ -64,7 +64,7 @@ public class CmUserBehaviorRecordController extends BaseController {
 
         model.addAttribute("page",page);
 
         model.addAttribute("cmBehaviorRecord", cmBehaviorRecord);
 
         if ("2".equals(cmBehaviorRecord.getBehaviorType())){
 
-            return "modules/user/behaviorRecordRoosList";
 
+            return "modules/user/behaviorRecordRossList";
 
         }
 
         return "modules/user/behaviorRecordList";
 
     }

+ 1 - 1
src/main/webapp/WEB-INF/views/modules/user/behaviorRecordDetailsList.jsp
View File 

@@ -24,7 +24,7 @@
 
 <body>
 
 <ul class="nav nav-tabs">
 
     <c:if test="${cmBehaviorRecord.behaviorType eq '2'}">
 
-        <li><a href="${ctx}/user/behavior/record/list?behaviorType=${cmBehaviorRecord.behaviorType}">ROOS页面统计</a></li>
 
+        <li><a href="${ctx}/user/behavior/record/list?behaviorType=${cmBehaviorRecord.behaviorType}">ROSS页面统计</a></li>
 
     </c:if>
 
     <c:if test="${cmBehaviorRecord.behaviorType eq '1'}">
 
         <li><a href="${ctx}/user/behavior/record/list?behaviorType=${cmBehaviorRecord.behaviorType}">用户行为记录</a></li>

+ 4 - 4
src/main/webapp/WEB-INF/views/modules/user/behaviorRecordList.jsp
View File 

@@ -114,13 +114,13 @@
 
             <c:if test="${cmBehaviorRecord.userID != '0'}">
 
                <td>
 
                    <c:if test="${cmBehaviorRecord.userIdentity eq 2}">
 
-                       ${cmBehaviorRecord.cSname}
 
+                       ${cmBehaviorRecord.name}
 
                    </c:if>
 
                    <c:if test="${cmBehaviorRecord.userIdentity eq 4}">
 
-                       <c:if test="${cmBehaviorRecord.cSname ne cmBehaviorRecord.userName}">
 
-                           ${cmBehaviorRecord.cSname}
 
+                       <c:if test="${cmBehaviorRecord.name ne cmBehaviorRecord.userName}">
 
+                           ${cmBehaviorRecord.name}
 
                        </c:if>
 
-                       <c:if test="${cmBehaviorRecord.cSname eq cmBehaviorRecord.userName}">
 
+                       <c:if test="${cmBehaviorRecord.name eq cmBehaviorRecord.userName}">
 
                            ---
 
                        </c:if>
 
                    </c:if>

+ 1 - 1
src/main/webapp/WEB-INF/views/modules/user/behaviorRecordRoosList.jsp → src/main/webapp/WEB-INF/views/modules/user/behaviorRecordRossList.jsp
View File 

@@ -35,7 +35,7 @@
 
 </head>
 
 <body>
 
 <ul class="nav nav-tabs">
 
-    <li class="active"><a href="${ctx}/user/behavior/record/list?behaviorType=2">ROOS页面统计</a></li>
 
+    <li class="active"><a href="${ctx}/user/behavior/record/list?behaviorType=2">ROSS页面统计</a></li>
 
 </ul>
 
 <form:form id="searchForm" modelAttribute="cmBehaviorRecord" action="${ctx}/user/behavior/record/list?behaviorType=2" method="post" class="breadcrumb form-search">
 
     <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>