浏览代码

2020-01-15修改

hugeng 4 年之前
父节点
当前提交
5cc092a400

+ 0 - 1
src/main/java/com/yc/education/controller/IndexController.java

@@ -152,7 +152,6 @@ public class IndexController {
         ModelAndView modelAndView = new ModelAndView("sechindex");
         List<Forum> forums = new ArrayList<>();
         List<Forum> reforums = new ArrayList<>();
-        List<Forum> addforums = new ArrayList<>();
         try {
             if (!StringUtils.isEmpty(title)) {
                 forums.addAll(forumService.forumListByUsersId(0, page, rows, title, types, typeid));

+ 5 - 6
src/main/java/com/yc/education/service/AdminsService.java

@@ -3,11 +3,10 @@ package com.yc.education.service;
 import com.yc.education.model.Admins;
 
 public interface AdminsService extends IService<Admins> {
-	
-	
-	//admin登录
-	Admins findadminlogin(String loginname, String password);
-	
-	
+
+
+    //admin登录
+    Admins findadminlogin(String loginname, String password);
+
 
 }

+ 7 - 2
src/main/java/com/yc/education/service/DownloadlistService.java

@@ -17,7 +17,9 @@ public interface DownloadlistService extends IService<Downloadlist> {
     /**
      * 根据用户id 或 论坛id 查询
      *
-     * @return
+     * @param usersid 用户id
+     * @param forumid 论坛id
+     * @return List<Downloadlist>
      */
     public List<Downloadlist> downloadListByUsersidOrForumid(int usersid, int forumid);
 
@@ -26,7 +28,10 @@ public interface DownloadlistService extends IService<Downloadlist> {
      *
      * @param page
      * @param rows
-     * @return
+     * @param mainame
+     * @param zuoname
+     * @param neirong
+     * @return List<Downloadlist>
      */
     public List<Downloadlist> downloadList(int page, int rows, String mainame, String zuoname, String neirong);
 

+ 3 - 1
src/main/java/com/yc/education/service/UsersService.java

@@ -29,7 +29,9 @@ public interface UsersService extends IService<Users> {
 
     Users PhoneAndEmail(Users users);
 
-    //查询全部
+    /**
+     * 查看全部
+     */
     List<Users> findall();
 
     List<Users> findall(int page, int rows, String phone, String username, String email);

+ 6 - 4
src/main/webapp/WEB-INF/jsp/collect.jsp

@@ -576,9 +576,11 @@ To change this template use File | Settings | File Templates.
                             }
                             imgurlhtml = imgurlhtml + '</ul>';
                         }
-                        for (var p = 0; p < x.htype.length; p++) {
-                            if (x.htype[p] != null && x.htype[p] != '') {
-                                htypehtml = '<a class="mess-tag select" id=' + x.htype[p].id + ' >#' + x.htype[p].title + '</a>' + htypehtml;
+                        if (x.htype != null && x.htype != '') {
+                            for (var p = 0; p < x.htype.length; p++) {
+                                if (x.htype[p] != null && x.htype[p] != '') {
+                                    htypehtml = '<a class="mess-tag select" id=' + x.htype[p].id + ' >#' + x.htype[p].title + '</a>' + htypehtml;
+                                }
                             }
                         }
                         if (x.fileurl != null && x.fileurl != '') {
@@ -590,7 +592,7 @@ To change this template use File | Settings | File Templates.
                                         vals = 2;
                                     }
                                 }
-                                if (vars = 2) {
+                                if (vals == 2) {
                                     fileurlhtml = '<a class="my-download my-downloadbtn xiaz" id="' + x.fileurl + '" title=' + x.id + '><i class="iconfont icon-xiazai"></i>下载 ' + x.counts + '</a>';
                                 } else {
                                     if (x.money == 0) {

+ 6 - 4
src/main/webapp/WEB-INF/jsp/download.jsp

@@ -576,9 +576,11 @@ To change this template use File | Settings | File Templates.
                             }
                             imgurlhtml = imgurlhtml + '</ul>';
                         }
-                        for (var p = 0; p < x.htype.length; p++) {
-                            if (x.htype[p] != null && x.htype[p] != '') {
-                                htypehtml = '<a class="mess-tag select" id=' + x.htype[p].id + ' >#' + x.htype[p].title + '</a>' + htypehtml;
+                        if (x.htype != null && x.htype != '') {
+                            for (var p = 0; p < x.htype.length; p++) {
+                                if (x.htype[p] != null && x.htype[p] != '') {
+                                    htypehtml = '<a class="mess-tag select" id=' + x.htype[p].id + ' >#' + x.htype[p].title + '</a>' + htypehtml;
+                                }
                             }
                         }
                         if (x.fileurl != null && x.fileurl != '') {
@@ -590,7 +592,7 @@ To change this template use File | Settings | File Templates.
                                         vals = 2;
                                     }
                                 }
-                                if (vars = 2) {
+                                if (vals == 2) {
                                     fileurlhtml = '<a class="my-download my-downloadbtn xiaz" id="' + x.fileurl + '" title=' + x.id + '><i class="iconfont icon-xiazai"></i>下载 ' + x.counts + '</a>';
                                 } else {
                                     if (x.money == 0) {

+ 6 - 4
src/main/webapp/WEB-INF/jsp/fenlei.jsp

@@ -576,9 +576,11 @@ To change this template use File | Settings | File Templates.
                             }
                             imgurlhtml = imgurlhtml + '</ul>';
                         }
-                        for (var p = 0; p < x.htype.length; p++) {
-                            if (x.htype[p] != null && x.htype[p] != '') {
-                                htypehtml = '<a class="mess-tag select" id=' + x.htype[p].id + ' >#' + x.htype[p].title + '</a>' + htypehtml;
+                        if (x.htype != null && x.htype != '') {
+                            for (var p = 0; p < x.htype.length; p++) {
+                                if (x.htype[p] != null && x.htype[p] != '') {
+                                    htypehtml = '<a class="mess-tag select" id=' + x.htype[p].id + ' >#' + x.htype[p].title + '</a>' + htypehtml;
+                                }
                             }
                         }
                         if (x.fileurl != null && x.fileurl != '') {
@@ -590,7 +592,7 @@ To change this template use File | Settings | File Templates.
                                         vals = 2;
                                     }
                                 }
-                                if (vars = 2) {
+                                if (vals == 2) {
                                     fileurlhtml = '<a class="my-download my-downloadbtn xiaz" id="' + x.fileurl + '" title=' + x.id + '><i class="iconfont icon-xiazai"></i>下载 ' + x.counts + '</a>';
                                 } else {
                                     if (x.money == 0) {

+ 10 - 19
src/main/webapp/WEB-INF/jsp/index.jsp

@@ -929,26 +929,17 @@ To change this template use File | Settings | File Templates.
                                 for (var j = 0; j < arr.length; j++) {
                                     var t = arr[j];
                                     imgurlhtml = imgurlhtml + '<li><img src="' + t + '" class="am-pureview am-active"></li>';
-                                    // $("li img").lazyload();
-//                                     if ($.AMUI.fullscreen.enabled) {
-//                                         $.AMUI.fullscreen.request();
-//                                     } else {
-// //Ignore or do something else
-//                                     }
                                 }
                             } else {
                                 imgurlhtml = imgurlhtml + '<li><img src="' + x.imgurl + '" class="am-pureview am-active"></li>';
-//                                 if ($.AMUI.fullscreen.enabled) {
-//                                     $.AMUI.fullscreen.request();
-//                                 } else {
-// //Ignore or do something else
-//                                 }
                             }
                             imgurlhtml = imgurlhtml + '</ul>';
                         }
-                        for (var p = 0; p < x.htype.length; p++) {
-                            if (x.htype[p] != null && x.htype[p] != '') {
-                                htypehtml = '<a class="mess-tag select htypes"  id=' + x.htype[p].id + ' >#' + x.htype[p].title + '</a>' + htypehtml;
+                        if (x.htype != null && x.htype != '') {
+                            for (var p = 0; p < x.htype.length; p++) {
+                                if (x.htype[p] != null && x.htype[p] != '') {
+                                    htypehtml = '<a class="mess-tag select htypes"  id=' + x.htype[p].id + ' >#' + x.htype[p].title + '</a>' + htypehtml;
+                                }
                             }
                         }
                         if (x.fileurl != null && x.fileurl != '') {
@@ -960,7 +951,7 @@ To change this template use File | Settings | File Templates.
                                         vals = 2;
                                     }
                                 }
-                                if (vars = 2) {
+                                if (vals == 2) {
                                     fileurlhtml = '<a class="my-download my-downloadbtn xiaz" id="' + x.fileurl + '" title=' + x.id + '><i class="iconfont icon-xiazai"></i>下载 ' + x.counts + '</a>';
                                 } else {
                                     if (x.money == 0) {
@@ -1171,6 +1162,10 @@ To change this template use File | Settings | File Templates.
     $("#mits").click(function () {
         var title = $("#title").val();
         var texts = $("#texts").val();
+        if (usersid == null || usersid == '') {
+            layer.msg("请登录后操作");
+            return false;
+        }
         if (title == null || title == '') {
             layer.msg("标题不能为空");
             return false;
@@ -1179,10 +1174,6 @@ To change this template use File | Settings | File Templates.
             layer.msg("正文不能为空");
             return false;
         }
-        if (usersid == null || usersid == '') {
-            layer.msg("请登录后操作");
-            return false;
-        }
         $("#forum").submit();
     })
 

+ 6 - 4
src/main/webapp/WEB-INF/jsp/person.jsp

@@ -856,9 +856,11 @@ To change this template use File | Settings | File Templates.
                             }
                             imgurlhtml = imgurlhtml + '</ul>';
                         }
-                        for (var p = 0; p < x.htype.length; p++) {
-                            if (x.htype[p] != null && x.htype[p] != '') {
-                                htypehtml = '<a class="mess-tag select" id=' + x.htype[p].id + ' >#' + x.htype[p].title + '</a>' + htypehtml;
+                        if (x.htype != null && x.htype != '') {
+                            for (var p = 0; p < x.htype.length; p++) {
+                                if (x.htype[p] != null && x.htype[p] != '') {
+                                    htypehtml = '<a class="mess-tag select" id=' + x.htype[p].id + ' >#' + x.htype[p].title + '</a>' + htypehtml;
+                                }
                             }
                         }
                         if (x.fileurl != null && x.fileurl != '') {
@@ -870,7 +872,7 @@ To change this template use File | Settings | File Templates.
                                         vals = 2;
                                     }
                                 }
-                                if (vars = 2) {
+                                if (vals == 2) {
                                     fileurlhtml = '<a class="my-download my-downloadbtn xiaz" id="' + x.fileurl + '" title=' + x.id + '><i class="iconfont icon-xiazai"></i>下载 ' + x.counts + '</a>';
                                 } else {
                                     if (x.money == 0) {

+ 7 - 5
src/main/webapp/WEB-INF/jsp/sechindex.jsp

@@ -531,7 +531,7 @@ To change this template use File | Settings | File Templates.
         </div>
         <i class="iconfont close"></i>
         <div class="dld-content">
-            <span>10 金币</span>
+            <span id="mibi">10 金币</span>
             <p style="color: rgb(204, 204, 204);">
                 支付后即可查看所有信息及下载附件
                 <%--,文件大小(22.31MB)--%>
@@ -700,9 +700,11 @@ To change this template use File | Settings | File Templates.
                             }
                             imgurlhtml = imgurlhtml + '</ul>';
                         }
-                        for (var p = 0; p < x.htype.length; p++) {
-                            if (x.htype[p] != null && x.htype[p] != '') {
-                                htypehtml = '<a class="mess-tag select" id=' + x.htype[p].id + ' >#' + x.htype[p].title + '</a>' + htypehtml;
+                        if (x.htype != null && x.htype != '') {
+                            for (var p = 0; p < x.htype.length; p++) {
+                                if (x.htype[p] != null && x.htype[p] != '') {
+                                    htypehtml = '<a class="mess-tag select" id=' + x.htype[p].id + ' >#' + x.htype[p].title + '</a>' + htypehtml;
+                                }
                             }
                         }
                         if (x.fileurl != null && x.fileurl != '') {
@@ -714,7 +716,7 @@ To change this template use File | Settings | File Templates.
                                         vals = 2;
                                     }
                                 }
-                                if (vars = 2) {
+                                if (vals == 2) {
                                     fileurlhtml = '<a class="my-download my-downloadbtn xiaz" id="' + x.fileurl + '" title=' + x.id + '><i class="iconfont icon-xiazai"></i>下载 ' + x.counts + '</a>';
                                 } else {
                                     if (x.money == 0) {