Merge branch 'master' of https://gitee.com/Qx90193/zhiyun

src/main/resources/templates/layui-v2.6.8/courseList.html

@@ -98,13 +98,18 @@
                     //获取要删除的服务的id
                     var deleteCourseId = data.id;
 
-                    //发送Ajax到后台，进行删除操作
-                    $.get("http://localhost:8080/api/course/delCourseById", { "id": deleteCourseId},
-                        function(data){
-                            if("success" == data.msg){
-                                location.reload();//重新加载当前页面
-                            }
-                        });
+                    $.get("http://localhost:8080/api/course/delCourseById",{ "id": deleteCourseId},function (result) {
+                        if (result.code==200){
+                            // 删除成功之后 弹出msg
+                            layer.msg(result.msg);
+                            // 重点：继续显示当前页
+                            $(".layui-laypage-btn").click();
+                        } else {
+                            layer.msg(result.msg, {icon: 2});
+                            layer.close(index);
+                        }
+                    });
+
                 });
             } else if(obj.event === 'edit'){
                 // layer.prompt({
@@ -116,7 +121,6 @@
                 //     });
                 //     layer.close(index);
                 // });
-
                 //layer.alert(JSON.stringify(data));
                 selectOne(data);
             }

src/main/resources/templates/layui-v2.6.8/downloadList.html

@@ -98,13 +98,18 @@
                     //获取要删除的服务的id
                     var deleteDownloadId = data.id;
 
-                    //发送Ajax到后台，进行删除操作
-                    $.get("http://localhost:8080/download/delDownload", { "id": deleteDownloadId},
-                        function(data){
-                            if("success" == data.msg){
-                                location.reload();//重新加载当前页面
-                            }
-                        });
+                    $.get("http://localhost:8080/download/delDownload",{ "id": deleteDownloadId},function (result) {
+                        if (result.code==200){
+                            // 删除成功之后 弹出msg
+                            layer.msg(result.msg);
+                            // 重点：继续显示当前页
+                            $(".layui-laypage-btn").click();
+                        } else {
+                            layer.msg(result.msg, {icon: 2});
+                            layer.close(index);
+                        }
+                    });
+
                 });
             } else if(obj.event === 'edit'){
                 // layer.prompt({
@@ -123,6 +128,7 @@
         });
 
 
+
     });
 </script>
 

src/main/resources/templates/layui-v2.6.8/index.html

@@ -11,24 +11,24 @@
     <div class="layui-header">
         <div class="layui-logo layui-hide-xs layui-bg-black">天择后台管业系统</div>
         <!-- 头部区域（可配合layui 已有的水平导航） -->
-        <ul class="layui-nav layui-layout-left">
-            <!-- 移动端显示 -->
-            <li class="layui-nav-item layui-show-xs-inline-block layui-hide-sm" lay-header-event="menuLeft">
-                <i class="layui-icon layui-icon-spread-left"></i>
-            </li>
-
-<!--            <li class="layui-nav-item layui-hide-xs"><a href="">nav 1</a></li>-->
-<!--            <li class="layui-nav-item layui-hide-xs"><a href="">nav 2</a></li>-->
-<!--            <li class="layui-nav-item layui-hide-xs"><a href="">nav 3</a></li>-->
-<!--            <li class="layui-nav-item">-->
-<!--                <a href="javascript:;">nav groups</a>-->
-<!--                <dl class="layui-nav-child">-->
-<!--                    <dd><a href="">menu 11</a></dd>-->
-<!--                    <dd><a href="">menu 22</a></dd>-->
-<!--                    <dd><a href="">menu 33</a></dd>-->
-<!--                </dl>-->
+<!--        <ul class="layui-nav layui-layout-left">-->
+<!--            &lt;!&ndash; 移动端显示 &ndash;&gt;-->
+<!--            <li class="layui-nav-item layui-show-xs-inline-block layui-hide-sm" lay-header-event="menuLeft">-->
+<!--                <i class="layui-icon layui-icon-spread-left"></i>-->
 <!--            </li>-->
-        </ul>
+
+<!--&lt;!&ndash;            <li class="layui-nav-item layui-hide-xs"><a href="">nav 1</a></li>&ndash;&gt;-->
+<!--&lt;!&ndash;            <li class="layui-nav-item layui-hide-xs"><a href="">nav 2</a></li>&ndash;&gt;-->
+<!--&lt;!&ndash;            <li class="layui-nav-item layui-hide-xs"><a href="">nav 3</a></li>&ndash;&gt;-->
+<!--&lt;!&ndash;            <li class="layui-nav-item">&ndash;&gt;-->
+<!--&lt;!&ndash;                <a href="javascript:;">nav groups</a>&ndash;&gt;-->
+<!--&lt;!&ndash;                <dl class="layui-nav-child">&ndash;&gt;-->
+<!--&lt;!&ndash;                    <dd><a href="">menu 11</a></dd>&ndash;&gt;-->
+<!--&lt;!&ndash;                    <dd><a href="">menu 22</a></dd>&ndash;&gt;-->
+<!--&lt;!&ndash;                    <dd><a href="">menu 33</a></dd>&ndash;&gt;-->
+<!--&lt;!&ndash;                </dl>&ndash;&gt;-->
+<!--&lt;!&ndash;            </li>&ndash;&gt;-->
+<!--        </ul>-->
         <ul class="layui-nav layui-layout-right">
             <li class="layui-nav-item layui-hide layui-show-md-inline-block">
                 <a href="javascript:;">
@@ -53,12 +53,8 @@
         <div class="layui-side-scroll">
             <!-- 左侧导航区域（可配合layui已有的垂直导航） -->
             <ul class="layui-nav layui-nav-tree" lay-filter="test">
-                <li class="layui-nav-item layui-nav-itemed">
-                    <a class="" href="javascript:;" onclick="openUrl('courseList.html')">课程中心</a>
-                </li>
-                <li class="layui-nav-item">
-                    <a href="javascript:;" onclick="openUrl('applicationList.html')">应用中心</a>
-                </li>
+                <li class="layui-nav-item"><a href="javascript:;"  onclick="openUrl('courseList.html')">课程中心</a></li>
+                <li class="layui-nav-item"><a href="javascript:;"  onclick="openUrl('applicationList.html')">应用中心</a></li>
                 <li class="layui-nav-item"><a href="javascript:;"  onclick="openUrl('gameList.html')">大赛中心</a></li>
                 <li class="layui-nav-item"><a href="javascript:;"  onclick="openUrl('textualList.html')">考证中心</a></li>
                 <li class="layui-nav-item"><a href="javascript:;"  onclick="openUrl('academicList.html')">学术中心</a></li>
@@ -123,6 +119,5 @@
         $("#center").load(url);
     }
 
-
 </script>
 </html>

src/main/resources/templates/layui-v2.6.8/inviteList.html

@@ -98,17 +98,34 @@
                     //获取要删除的服务的id
                     var deleteDownloadId = data.id;
 
-                    //发送Ajax到后台，进行删除操作
-                    $.get("http://localhost:8080/download/delDownload", { "id": deleteDownloadId},
-                        function(data){
-                            if("success" == data.msg){
-                                location.reload();//重新加载当前页面
-                            }
-                        });
+                    $.get("http://localhost:8080/download/delDownload",{ "id": deleteDownloadId},function (result) {
+                        if (result.code==200){
+                            // 删除成功之后 弹出msg
+                            layer.msg(result.msg);
+                            // 重点：继续显示当前页
+                            $(".layui-laypage-btn").click();
+                        } else {
+                            layer.msg(result.msg, {icon: 2});
+                            layer.close(index);
+                        }
+                    });
+
                 });
+            } else if(obj.event === 'edit'){
+                // layer.prompt({
+                //     formType: 2
+                //     ,value: data.email
+                // }, function(value, index){
+                //     obj.update({
+                //         email: value
+                //     });
+                //     layer.close(index);
+                // });
+
+                //layer.alert(JSON.stringify(data));
+                selectOne(data);
             }
         });
-
     });
 </script>
 

src/main/resources/templates/layui-v2.6.8/serveList.html

@@ -16,7 +16,7 @@
 <script type="text/html" id="toolbarDemo">
     <div class="layui-btn-container">
         <button class="layui-btn layui-btn-sm" lay-event="getCheckData">添加目录</button>
-        <button class="layui-btn layui-btn-sm" lay-event="getCheckLength">添加服务</button>
+        <button class="layui-btn layui-btn-sm" lay-event="getCheckLength">添加课程</button>
     </div>
 </script>
 <script type="text/html" id="barDemo">
@@ -40,7 +40,7 @@
             elem: '#test'
             , url: 'http://localhost:8080/api/serve/queryServe'
             , toolbar: '#toolbarDemo'
-            , title: '服务相关'
+            , title: '课程中心'
             , totalRow: true
             , parseData: function (res) {
                 console.log('data', res)
@@ -96,15 +96,20 @@
                     layer.close(index);
 
                     //获取要删除的服务的id
-                    var deleteCourseId = data.id;
+                    var delServeId = data.id;
+
+                    $.get("http://localhost:8080/api/serve/delServe",{ "id": delServeId},function (result) {
+                        if (result.code==200){
+                            // 删除成功之后 弹出msg
+                            layer.msg(result.msg);
+                            // 重点：继续显示当前页
+                            $(".layui-laypage-btn").click();
+                        } else {
+                            layer.msg(result.msg, {icon: 2});
+                            layer.close(index);
+                        }
+                    });
 
-                    //发送Ajax到后台，进行删除操作
-                    $.get("http://localhost:8080/api/course/delCourseById", { "id": deleteCourseId},
-                        function(data){
-                            if("success" == data){
-                                location.reload();//重新加载当前页面
-                            }
-                        });
                 });
             } else if(obj.event === 'edit'){
                 // layer.prompt({
@@ -121,8 +126,6 @@
                 selectOne(data);
             }
         });
-    });
-</script>
 
     });
 </script>

src/main/resources/templates/layui-v2.6.8/test.html

@@ -1,150 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>后台管理</title>
-  <link rel="stylesheet" href="https://cdn.staticfile.org/layui/2.5.7/css/layui.css">
-</head>
-<body>
-
-<!-- 顶部导航栏 -->
-<div class="layui-layout layui-layout-admin">
-  <div class="layui-header">
-    <!-- 标题 -->
-    <div class="layui-logo">后台管理</div>
-
-    <!-- 导航菜单 -->
-    <ul class="layui-nav layui-layout-left">
-      <li class="layui-nav-item"><a href="">首页</a></li>
-      <li class="layui-nav-item layui-nav-itemed">
-        <a href="javascript:;">课程中心</a>
-        <!-- 课程中心子菜单 -->
-        <dl class="layui-nav-child">
-          <dd><a href="">课程列表</a></dd>
-          <dd><a href="">添加课程</a></dd>
-        </dl>
-      </li>
-      <li class="layui-nav-item layui-nav-itemed">
-        <a href="javascript:;">应用中心</a>
-        <!-- 应用中心子菜单 -->
-        <dl class="layui-nav-child">
-          <dd><a href="">应用列表</a></dd>
-          <dd><a href="">添加应用</a></dd>
-        </dl>
-      </li>
-      <li class="layui-nav-item layui-nav-itemed">
-        <a href="javascript:;">大赛中心</a>
-        <!-- 大赛中心子菜单 -->
-        <dl class="layui-nav-child">
-          <dd><a href="">大赛列表</a></dd>
-          <dd><a href="">添加大赛</a></dd>
-        </dl>
-      </li>
-      <li class="layui-nav-item layui-nav-itemed">
-        <a href="javascript:;">考证中心</a>
-        <!-- 考证中心子菜单 -->
-        <dl class="layui-nav-child">
-          <dd><a href="">考证列表</a></dd>
-          <dd><a href="">添加考证</a></dd>
-        </dl>
-      </li>
-      <li class="layui-nav-item layui-nav-itemed">
-        <a href="javascript:;">学术中心</a>
-        <!-- 学术中心子菜单 -->
-        <dl class="layui-nav-child">
-          <dd><a href="">学术文章</a></dd>
-          <dd><a href="">添加文章</a></dd>
-        </dl>
-      </li>
-    </ul>
-
-    <!-- 右侧用户信息 -->
-    <ul class="layui-nav layui-layout-right">
-      <li class="layui-nav-item">
-        <a href="javascript:;">
-          <img src="" class="layui-nav-img">
-          用户名
-        </a>
-        <!-- 下拉菜单 -->
-        <dl class="layui-nav-child">
-          <dd><a href="">个人信息</a></dd>
-          <dd><a href="">退出</a></dd>
-        </dl>
-      </li>
-    </ul>
-  </div>
-</div>
-
-<!-- 主体内容 -->
-<div class="layui-container">
-  <div class="layui-row">
-    <div class="layui-col-md3">
-      <!-- 侧边栏 -->
-      <div class="layui-side layui-bg-black">
-        <div class="layui-side-scroll">
-          <ul class="layui-nav layui-nav-tree" lay-filter="side">
-            <li class="layui-nav-item layui-nav-itemed">
-              <a class="" href="javascript:;">课程中心</a>
-              <!-- 课程中心子菜单 -->
-              <dl class="layui-nav-child">
-                <dd><a href="">课程列表</a></dd>
-                <dd><a href="">添加课程</a></dd>
-              </dl>
-            </li>
-            <li class="layui-nav-item layui-nav-itemed">
-              <a class="" href="javascript:;">应用中心</a>
-              <!-- 应用中心子菜单 -->
-              <dl class="layui-nav-child">
-                <dd><a href="">应用列表</a></dd>
-                <dd><a href="">添加应用</a></dd>
-              </dl>
-            </li>
-            <li class="layui-nav-item layui-nav-itemed">
-              <a class="" href="javascript:;">大赛中心</a>
-              <!-- 大赛中心子菜单 -->
-              <dl class="layui-nav-child">
-                <dd><a href="">大赛列表</a></dd>
-                <dd><a href="">添加大赛</a></dd>
-              </dl>
-            </li>
-            <li class="layui-nav-item layui-nav-itemed">
-              <a class="" href="javascript:;">考证中心</a>
-              <!-- 考证中心子菜单 -->
-              <dl class="layui-nav-child">
-                <dd><a href="">考证列表</a></dd>
-                <dd><a href="">添加考证</a></dd>
-              </dl>
-            </li>
-            <li class="layui-nav-item layui-nav-itemed">
-              <a class="" href="javascript:;">学术中心</a>
-              <!-- 学术中心子菜单 -->
-              <dl class="layui-nav-child">
-                <dd><a href="">学术文章</a></dd>
-                <dd><a href="">添加文章</a></dd>
-              </dl>
-            </li>
-          </ul>
-        </div>
-      </div>
-    </div>
-    <div class="layui-col-md9">主要内容区域</div>
-  </div>
-</div>
-
-<!-- 引入Layui的JavaScript文件 -->
-<script src="https://cdn.staticfile.org/layui/2.5.7/layui.js"></script>
-<!-- 初始化Layui组件 -->
-<script>
-  layui.use(['element', 'layer'], function(){
-    var element = layui.element;
-    var layer = layui.layer;
-
-    //监听侧边栏点击事件
-    element.on('nav(side)', function(elem){
-      layer.msg(elem.text());
-    });
-  });
-</script>
-
-</body>
-</html>