rabin 3 years ago
parent
commit
86c27011a8

+ 10 - 0
app/course/database/info.php

@@ -117,6 +117,16 @@ return array
 			'desc' 		=> '',
 		),
 
+		'link'		=> array
+		(
+			'type' 		=> 'varchar-500',
+			'name' 		=> '链接-填写链接后,将直接跳转到链接,下面的内容无效',
+			'default' 	=> '',
+			'desc' 		=> '链接',
+			'match' 	=> 'is_string',
+			'update'	=> 'textarea',
+		),
+
 		'content'		=> array
 		(
 			'type' 		=> 'text-255',

+ 23 - 0
main/assets/default/index.html

@@ -23,6 +23,8 @@
 <script src="js/jquery-2.2.3.min.js"></script>
 <script type="text/javascript" src="js/modernizr-2.6.2.min.js"></script>
 <script src="js/bootstrap.js"></script>
+<script src="js/layer/layer.js"></script>
+
 <style>
 	.modal-header .close {
     margin-top: -25px;
@@ -527,6 +529,27 @@
 			$('.modal-body').html(content);
 			$('.modal-titles').html(title);
 		    $("#myModal").modal('show');
+
+		    /*
+		    layer.open({
+			  type: 0,
+			  shade: false,
+			  title: title,
+			  content: content,
+			});
+			*/
+		}
+
+		function jump(title, link)
+		{
+			layer.open({
+			  type: 2,
+			  shadeClose: true,
+			  title : title,
+			  shade: 0.8,
+			  area: ['580px', '90%'],
+			  content: link//iframe的url
+			}); 
 		}
 
 		function submit()

File diff suppressed because it is too large
+ 1 - 0
main/assets/default/js/layer/layer.js


File diff suppressed because it is too large
+ 1 - 0
main/assets/default/js/layer/mobile/layer.js


File diff suppressed because it is too large
+ 0 - 0
main/assets/default/js/layer/mobile/need/layer.css


BIN
main/assets/default/js/layer/theme/default/icon-ext.png


BIN
main/assets/default/js/layer/theme/default/icon.png


File diff suppressed because it is too large
+ 0 - 0
main/assets/default/js/layer/theme/default/layer.css


BIN
main/assets/default/js/layer/theme/default/loading-0.gif


BIN
main/assets/default/js/layer/theme/default/loading-1.gif


BIN
main/assets/default/js/layer/theme/default/loading-2.gif


+ 7 - 2
main/src/Content.php

@@ -124,13 +124,18 @@ class Content extends Core
 
         if ($data) {
             foreach ($data as $k => $v) {
-                $data[$k] = $this->modal($data[$k], $v['name'], 'course_' . $v['id']);
+                
                 if ($k %2 == 1) {
                     $data[$k]['class'] = 'agileits-banner-grid ';
                 } else {
                     $data[$k]['class'] = 'agileits-banner-grid bg-w3ls-active';
                 }
-                
+                if (!$v['link']) {
+                    $data[$k] = $this->modal($data[$k], $v['name'], 'course_' . $v['id']);
+                } else {
+                    $data[$k]['modal'] = 'jump(\''.$v['name'].'\',\''.$v['link'].'\')';
+                    $data[$k]['modal_content'] = 'course_' . $v['id'];
+                }
             }
         }
         return $data;

Some files were not shown because too many files changed in this diff