Domů
Přihlásit se
872880485
/
txwx_mobile
Sledovat 1
Oblíbit 0
Rozštěpit 0
Soubory Úkoly 0 Pull Requesty 0 Wiki
Procházet zdrojové kódy

覆盖冲突重新提交名师在线

cs10086 před 2 roky
rodič
723f2a6875
revize
edcdbce2ac
12 změnil soubory, kde provedl 91 přidání a 498 odebrání
Rozdělené zobrazení Ukázat statistiku rozdílových dat
  1. binární
      teacher_classroom/assets/img/default.jpg
  2. 4 0
      teacher_classroom/assets/layui/jquery.min.js
  3. 0 25
      teacher_classroom/detail.html
  4. 0 17
      teacher_classroom/index.html
  5. 0 91
      teacher_classroom/js/app.js
  6. 0 17
      teacher_classroom/js/config.js
  7. 0 119
      teacher_classroom/js/detail.js
  8. 1 229
      teacher_classroom/js/request.js
  9. 25 0
      teacher_classroom/package.js
  10. 0 0
      teacher_classroom/src/app.js
  11. 54 0
      teacher_classroom/src/css/detail.css
  12. 7 0
      teacher_classroom/src/index.js

binární
teacher_classroom/assets/img/default.jpg
Zobrazit soubor


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 4 - 0
teacher_classroom/assets/layui/jquery.min.js


+ 0 - 25
teacher_classroom/detail.html
Zobrazit soubor 

@@ -18,18 +18,11 @@
 
 		</script>
 
 		
 		<header class="mui-bar mui-bar-nav">
 
-<<<<<<< HEAD
 
 		    <a href="./index.html" class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
 
-=======
 
-			<span id="toLastPageIcon" class="iconfont icon-fanhui" 
-			style="color:#409EFF;font-size:16px;font-weight:bold;position:relative;top:12px;"></span>
 
-		    <!--<a href="./index.html" class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>-->
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
 		    <h1 class="mui-title">名师详情</h1>
 
 		</header>
 
 		
 		<div class="mui-content" style="background:#fff;">
 
-<<<<<<< HEAD
 
 			<div id="videoModelWrapper" style="width:100%;background:rgba(0,0,0,0.7);position:fixed;top:0px;height:0px;">
 
 				<div id="closeVideo" style="position:absolute;top:60px;left:15px;color:#fff;font-size:16px;display:none;">
 
 					关闭
 
@@ -47,22 +40,4 @@
 
 	<script src="./js/request.js?v=20221118"></script>
 
 	<script src="./js/detail.js?v=20221118"></script>
 
 	
-=======
 
-			<!--<div id="videoModelWrapper" style="width:100%;background:rgba(0,0,0,0.7);position:fixed;top:44px;height:0px;z-index:10;">
 
-				<div id="closeVideo" style="position:absolute;top:20px;left:10px;color:#fff;font-size:16px;display:none;">
 
-					关闭
 
-				</div>
 
-				<div id="videoModel" style="width:100%;height:240px;position:absolute;top:10%;"></div>
 
-			</div>-->
 
-		    <div id="root" style="padding:10px;background:#fff;"></div>
 
-		</div>
 
-		
-		
-	</body>
 
-	<script src="./js/jquery.min.js"></script>
 
-	<script src="./assets/cookie/jquery.cookie.js"></script>
 
-	<script src="./js/config.js?<%=Math.random()%>"></script>
 
-	<script src="./js/request.js?<%=Math.random()%>"></script>
 
-	<script src="./js/detail.js?<%=Math.random()%>"></script>
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
 </html>

+ 0 - 17
teacher_classroom/index.html
Zobrazit soubor 

@@ -12,15 +12,9 @@
 
 </head>

 <body style="background:#fff;">

 	<header class="mui-bar mui-bar-nav headerModel">

-<<<<<<< HEAD
 
 		<div id="cancelSearch" class="cancelSearch">取消</div>

 	    <h1 class="mui-title">名师在线</h1>

 	    <div id="headerClassify" class="headerClassify">分类</div>

-=======
 
-		<div id="cancelSearch" class="cancelSearch">取消</div>
 
-	    <h1 class="mui-title">名师在线</h1>

-	    <div id="headerClassify" class="headerClassify">分类</div>
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
 	</header>

 	<div id="classifyContentModel" class="classifyContentModel"></div>

 	<div id="popularModel" class="popularModel"></div>

@@ -32,13 +26,8 @@
 
 				    <input id="searchInput" type="text" placeholder="请输入搜索关键字" 

 				    	style="font-size:14px;height:40px;padding-right:45px;">

 				</div>

-<<<<<<< HEAD
 
 				<div style="width:40px;position:absolute;top:10px;right:5px;z-index:100;text-align: center;;">

 					<span id="searchIcon" class="iconfont" style="font-size:20px;color:#606266;line-height:40px;">&#xe690;</span>

-=======
 
-				<div style="width:40px;position:absolute;top:10px;right:5px;z-index:100;text-align: center;;">
 
-					<span id="searchIcon" class="iconfont" style="font-size:20px;color:#606266;line-height:40px;">&#xe690;</span>
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
 				</div>

 			</div>

 		 	<!--数据列表-->

@@ -50,13 +39,7 @@
 
 </body>

 <script src="./js/jquery.min.js"></script>

 <script src="./assets/cookie/jquery.cookie.js"></script>

-<<<<<<< HEAD
 
 <script src="./js/config.js?v=20221118"></script>

 <script src="./js/request.js?v=20221118"></script>

 <script src="./js/app.js?v=20221118"></script>

-=======
 
-<script src="./js/config.js?<%=Math.random()%>"></script>

-<script src="./js/request.js?<%=Math.random()%>"></script>

-<script src="./js/app.js?<%=Math.random()%>"></script>

->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
 </html>

+ 0 - 91
teacher_classroom/js/app.js
Zobrazit soubor 

@@ -1,21 +1,9 @@
 
 $(function(){
 
 	gobalData.token = $.cookie("token");
 
 	gobalData.sm_id = $.cookie("sm_id");
 
-<<<<<<< HEAD
 
 	preLoadingInit();
 
 	getTableListData(appInit);
 
 	getClassifyData(headerClassifyInit);
 
-=======
 
-	//gobalData.toke="8b43OV8MTSSrtkxiT7rJmCo9gWxsh_bReyftR271RHOyNikeb";
 
-	//gobalData.sm_id = "933638";
 
-	preLoadingInit();
 
-	var requestData=new REQUESTDATA();
 
-	requestData.getUserInfo(function(data){
 
-    		window.localStorage.setItem('user_name',data.user_realname);
 
-    });
 
-	requestData.getTableListData(appInit);
 
-	requestData.getClassifyData(headerClassifyInit);
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
 	headerSearchInit();
 
 })
 
 function preLoadingInit(){
 
@@ -92,10 +80,6 @@ function appInit(data){
 
             +'</div>';*/
 
     	}
 
 	$("#root").html(text);
 
-<<<<<<< HEAD
 
-=======
 
-	var requestData=new REQUESTDATA();
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
 	mui.init({
 
   		pullRefresh : {
 
 	    container:refreshContainer,//待刷新区域标识，querySelector能定位的css选择器均可，比如：id、.class等
 
@@ -111,11 +95,7 @@ function appInit(data){
 
 	      	setTimeout(function(){
 
 	      		$("#root").empty();
 
 	      		preLoadingInit();
 
-<<<<<<< HEAD
 
 	      		getTableListData(appInit);
 
-=======
 
-	      		requestData.getTableListData(appInit);
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
 	      		mui('#refreshContainer').pullRefresh().endPulldownToRefresh();
 
 			},1500);
 
 	      }
 
@@ -133,11 +113,7 @@ function appInit(data){
 
 				var _this=this;
 
 				setTimeout(function(){
 
 					_this.endPullupToRefresh(false);
 
-<<<<<<< HEAD
 
 					getTableListData(insertMoreData);
 
-=======
 
-					requestData.getTableListData(insertMoreData);
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
 				},1500);
 
 			}else{
 
 				console.log("当前页:"+gobalData.listPage);
 
@@ -291,20 +267,12 @@ function headerClassifyInit(data){
 
 	    
 		+'</div>';
 
 	$("#classifyContentModel").append(text);
 
-<<<<<<< HEAD
 
-=======
 
-	var requestData=new REQUESTDATA();
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
 	$("#dealClasssifyBtn").on("click",function(){
 
         gobalData.listPage=1;
 
         gobalData.totalListPage=0;
 
         $("#root").empty();
 
         $("#classifyContentModel").slideUp();
 
-<<<<<<< HEAD
 
         getTableListData(appInit);
 
-=======
 
-        requestData.getTableListData(appInit);
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
         $("#root").fadeIn();
 
         $("#popularModel").hide();
 
         $("#cancelSearch").fadeOut();
 
@@ -377,10 +345,6 @@ function headerSearchInit(){
 
     });
 
     
     //点击搜索
 
-<<<<<<< HEAD
 
-=======
 
-    var requestData=new REQUESTDATA();
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
     $("#searchIcon").on("tap",function(){
 
         var searchInputVal=$("#searchInput").val();
 
         var _searchInputVal=searchInputVal.trim();
 
@@ -393,11 +357,7 @@ function headerSearchInit(){
 
         gobalData.listPage=1;
 
         gobalData.totalListPage=0;
 
         $("#root").empty();
 
-<<<<<<< HEAD
 
        	getTableListData(appInit);
 
-=======
 
-       	requestData.getTableListData(appInit);
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
     });
 
 }
 
 
@@ -419,7 +379,6 @@ function popularModelInit(){
 
 
         +'</div>';
 
     $("#popularModel").append(text);
 
-<<<<<<< HEAD
 
     getPopularRecommendData();
 
     getPopularSearchData();
 
     
@@ -501,46 +460,6 @@ function getPopularSearchData(){
 
             }
 
         });
 
     }
 
-=======
 
-    var requestData=new REQUESTDATA();
 
-    requestData.getPopularRecommendData(function(data){
 
-    		var text='';
 
-        var num=0;
 
-        for(var i in data){
 
-            var _item=data[i];
 
-            var item=_item.trim();
 
-            if(item && item!=''){
 
-            		num++;
 
-                text+='<div id="popularRecommendItem_'+num+'" class="popularItem" '
 
-                    +'onclick="handlePopularRecomend(popularRecommendItem_'+num+')">'
 
-                    +item
 
-                    +'</div>';
 
-            }
 
-            
-        }
 
-        text+='<div style="clear:both;"></div>';
 
-        $("#popularRecommendModel").html(text);
 
-    });
 
-    
-    requestData.getPopularSearchData(function(data){
 
-    		var text='';
 
-        var num=0;
 
-        for(var i in data){
 
-            var item=data[i];
 
-            var itemKeyword=item.keyword.trim();
 
-            if(itemKeyword && itemKeyword!=''){
 
-            		num++;
 
-                text+='<div id="popularSearchItem_'+num+'" class="popularItem" '
 
-                    +'onclick="handlePopularSearch(popularSearchItem_'+num+')">'
 
-                    +itemKeyword
 
-                    +'</div>';
 
-            }
 
-        }
 
-        text+='<div style="clear:both;"></div>';
 
-        $("#popularSearchModel").html(text);
 
-    });
 
-}
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
 
 
 	function handlePopularRecomend(target){
 
@@ -558,12 +477,7 @@ function getPopularSearchData(){
 
                 gobalData.totalListPage=0;
 
                 gobalData.courseLoading = false;
 
                 $("#root").empty();
 
-<<<<<<< HEAD
 
                 getTableListData(appInit);
 
-=======
 
-                var requestData=new REQUESTDATA();
 
-                requestData.getTableListData(appInit);
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
             }
 
         }
 
     }
 
@@ -583,12 +497,7 @@ function getPopularSearchData(){
 
                 gobalData.totalListPage=0;
 
                 gobalData.courseLoading = false;
 
                 $("#root").empty();
 
-<<<<<<< HEAD
 
                 getTableListData(appInit);
 
-=======
 
-                var requestData=new REQUESTDATA();
 
-                requestData.getTableListData(appInit);
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
             }
 
         }
 
     }

+ 0 - 17
teacher_classroom/js/config.js
Zobrazit soubor 

@@ -1,5 +1,4 @@
 
 var gobalData={
 
-<<<<<<< HEAD
 
     link:{
 
         course_list:"http://www.txhlwxx.com/index.php?mod=teacher_online&action=index&do=teacher_online_list&data_type=json",
 
         classify_list:"http://www.txhlwxx.com/index.php?mod=teacher_online&action=index&do=cate&data_type=json",
 
@@ -9,16 +8,6 @@ var gobalData={
 
         popular_recommend:"http://www.txhlwxx.com/index.php?mod=teacher_online&action=index&do=teacher_online_label&data_type=json",
 
         popular_search:"http://www.txhlwxx.com/index.php?mod=teacher_online&action=index&do=teacher_online_keyword&data_type=json"
 
     },
 
-=======
 
-	/*配置说明
 
-     * 南山：ns
 
-     * 济南：jn
 
-     * 蒙阴: my
 
-     */
 
-    classify:'my',
 
-    IMclassify:'my', // cs=测试用，正式部署时设置成和上面的classify一样
 
-    IM_appkey: "b9968e467474f7c7bb9840a1", //IM的appkey
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
     courseLoading:false,
 
     listPage:1,
 
     totalListPage:0,
 
@@ -32,11 +21,5 @@ var gobalData={
 
     chapterData:[],
 
     activePopularRecommend:"",
 
     activePopularSearch:"",
 
-<<<<<<< HEAD
 
     activeSearchVal:""
 
-=======
 
-    activeSearchVal:"",
 
-    token:"",
 
-    sm_id:""
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
 }

+ 0 - 119
teacher_classroom/js/detail.js
Zobrazit soubor 

@@ -1,11 +1,6 @@
 
 $(function(){
 
 	gobalData.token = $.cookie("token");
 
 	gobalData.sm_id = $.cookie("sm_id");
 
-<<<<<<< HEAD
 
-=======
 
-	//gobalData.toke="8b43OV8MTSSrtkxiT7rJmCo9gWxsh_bReyftR271RHOyNikeb";
 
-	//gobalData.sm_id = "933638";
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
 	var searchVal=window.location.search;
 
     if(searchVal && searchVal!=''){
 
         var tag=searchVal.indexOf("id=");
 
@@ -13,22 +8,9 @@ $(function(){
 
             var idArr=searchVal.split("=");
 
             var active_id=idArr[1];
 
             preLoadingInit();
 
-<<<<<<< HEAD
 
             getCourseDetailData(active_id);
 
         }
 
     }
 
-=======
 
-            var requestData=new REQUESTDATA();
 
-            requestData.getCourseDetailData(active_id,function(data){
 
-            		courseDetailInit(data);
 
-            });
 
-        }
 
-    }
 
-    
-    $("#toLastPageIcon").on('tap',function(){
 
-    		window.location.href='./index.html';
 
-    });
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
 })
 
 
 function preLoadingInit(){
 
@@ -43,7 +25,6 @@ function preLoadingInit(){
 
 	$("#root").html(text);
 
 }
 
 
-<<<<<<< HEAD
 
 function getCourseDetailData(target){
 
     var totalURL=gobalData.link;
 
     var requestURL=totalURL.course_detail;
 
@@ -69,25 +50,13 @@ function getCourseDetailData(target){
 
 
 function courseDetailInit(target,data){
 
         $("#root").empty();
 
-=======
 
-
 
-function courseDetailInit(data){
 
-		console.log(data);
 
-		/**IM需要设置的值*/
 
-        window.localStorage.setItem('vtype','8');
 
-        window.localStorage.setItem('data_id',data.spec_id);
 
-        window.localStorage.setItem('zj_name',data.course_name);
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
         var deatilBrief='';
 
         if(data.brief!=''){
 
             deatilBrief=data.brief;
 
         }else{
 
             deatilBrief='<div style="width:100%;text-align:center;font-size:14px;color:#606266;">暂无简介</div>';
 
         }
 
-<<<<<<< HEAD
 
         //console.log(data);
 
-=======
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
         
         var text='<div style="padding-bottom:10px;border-bottom:solid #DCDFE6 1px;">'
 
             +'<div style="margin-bottom:5px;width:100%;height:160px;border:solid #EBEEF5 1px;">'
 
@@ -121,14 +90,8 @@ function courseDetailInit(data){
 
             +'</div>'
 
             +'<div style="clear:both;"></div>';
 
         $("#root").html(text);
 
-<<<<<<< HEAD
 
         getCompanyData(target);
 
         getChapterData(target);
 
-=======
 
-        var requestData=new REQUESTDATA();
 
-        requestData.getCompanyData(data.spec_id,detailCompanyInit);
 
-        requestData.getChapterData(data.spec_id,detailChapterInit);
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
         
         $("#closeVideo").on("tap",function(){
 
         		$("#videoModel").empty();
 
@@ -139,7 +102,6 @@ function courseDetailInit(data){
 
         });
 
     }
 
 
-<<<<<<< HEAD
 
 function getChapterData(target){
 
         var totalURL=gobalData.link;
 
         var requestURL=totalURL.course_chapter;
 
@@ -243,72 +205,6 @@ function getCompanyData(target){
 
             }
 
         });
 
     }
 
-=======
 
-
 
-function detailCompanyInit(data){
 
-	var len=data.length;
 
-    var text='';
 
-    if(len>0){
 
-        for(var i=0;i<len;i++){
 
-            var item=data[i];
 
-            text+='<tr style="width:100%;font-size:13px;color:#606266;">'
 
-                +'<td style="width:18%;text-align:center;">'+item.shijian+'</td>'
 
-                +'<td style="width:64%;text-align:center;">'+item.shouke_content+'</td>'
 
-                +'<td style="width:18%;text-align:center;">'+item.shouke_teacher+'</td>'
 
-                +'</tr>';
 
-            if(i==len-1){
 
-                $("#companyModel").append(text);
 
-            }
 
-        }
 
-    }else{
 
-        text='<tr style="width:100%;font-size:13px;color:#606266;">'
 
-        		+'<td colspan=3 align="center">'
 
-            	+'暂无数据'
 
-            	+'</td>'
 
-            	+'</tr>';
 
-        $("#companyModel").append(text);
 
-    }
 
-}
 
-
 
-function detailChapterInit(data){
 
-	var text='';
 
-    var len=data.length;
 
-    gobalData.chapterData=data;
 
-    if(len>0){
 
-        for(var i=0;i<len;i++){
 
-        		var num=i+1;
 
-            var chapterItem=data[i];
 
-            var chapterTitle=chapterItem.zj_name;
 
-            text+='<div style="width:50%;float:left;padding:5px 0px 5px 0px;">'
 
-                +'<div id="chapterItem_'+chapterItem.zj_id+'" '
 
-                +'onclick="handleChapterItem(chapterItem_'+chapterItem.zj_id+')"'
 
-                +'style="width:96%;margin:0 auto;">'
 
-                +'<div style="width:100%;height:100px;border:solid #DCDFE6 1px;position:relative;">'
 
-                +'<img src="'+chapterItem.zj_img+'" alt="" '
 
-                +'style="width:100%;height:100px;"/>'
 
-                +'</div>'
 
-                +'<div style="padding-top:5px;font-size:13px;color:#606266;">'
 
-                +chapterTitle
 
-                +'</div>'
 
-                +'</div>'
 
-                +'</div>';
 
-            if(num%2==0){
 
-            		text+='<div style="clear:both;"></div>';
 
-            }
 
-            
-            if(i==len-1){
 
-                $("#chapterModel").append(text);
 
-            }
 
-        }
 
-    }else{
 
-        gobalData.chapterLoading = false;
 
-        text='<div style="width:100%;text-align:center;font-size:14px;color:#606266;padding-top:10px;">'
 
-            +'暂无章节'
 
-            +'</div>';
 
-        $("#chapterModel").append(text);
 
-    }
 
-}
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
 
 function handleChapterItem(target){
 
         var _id=target.id;
 
@@ -320,14 +216,8 @@ function handleChapterItem(target){
 
             for(var i in _chapterData){
 
                 var item=_chapterData[i];
 
                 if(item.zj_id==activeId){
 
-<<<<<<< HEAD
 
                 		//console.log(item);
 
                 		$("#videoModel").empty();
 
-=======
 
-                		window.localStorage.setItem('video',JSON.stringify(item));
 
-                		window.location.href='./video.html';
 
-                		/*$("#videoModel").empty();
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
                 		var videoLink=item.zj_video;
 
                 		var _videoLink=videoLink.trim();
 
                 		if(_videoLink!=''){
 
@@ -346,18 +236,9 @@ function handleChapterItem(target){
 
                         $("#closeVideo").show();
 
                 		}else{
 
                 			mui.toast('此章节暂无视频',{ duration:'short', type:'div' });
 
-<<<<<<< HEAD
 
                 		}
 
-=======
 
-                		}*/
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
                 		
                 }
 
             }
 
         }
 
 }
 
-<<<<<<< HEAD
 
-=======
 
-
 
-
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c

+ 1 - 229
teacher_classroom/js/request.js
Zobrazit soubor 

@@ -1,4 +1,3 @@
 
-<<<<<<< HEAD
 
 function getTableListData(callback){
 
 	var totalURL=gobalData.link;
 
     var requestURL=totalURL.course_list;
 
@@ -66,231 +65,4 @@ function getClassifyData(callback){
 
             }
 
         }
 
     });
 
-}
 
-=======
 
-function REQUESTDATA(){
 
-	/*配置说明
 
-     * 南山：http://43.240.249.122:81
 
-     * 济南：http://120.226.248.90:81
 
-     * 蒙阴：http://120.226.248.52:81
 
-     */
 
-	var classify=gobalData.classify;
 
-	var prefix='';
 
-	switch(classify){
 
-		case 'ns':
 
-			prefix='http://43.240.249.122:81';
 
-			domain='http://43.240.249.76:81';
 
-			break;
 
-		case 'jn':
 
-			prefix='http://112.33.253.81:81';
 
-			domain='http://120.227.10.75:81';
 
-			break;
 
-		case 'my':
 
-			prefix='http://120.226.248.52:81';
 
-			domain='http://120.227.3.238:81';
 
-	}
 
-	this.url={
 
-		user_info:prefix+'/index.php?mod=user&action=main&do=token&api=json',
 
-		course_list:prefix+'/index.php?mod=teacher_online&action=index&do=teacher_online_list&data_type=json',
 
-		classify_list:prefix+'/index.php?mod=teacher_online&action=index&do=cate&data_type=json',
 
-        course_detail:prefix+'/index.php?mod=teacher_online&action=index&do=txwx_teacher_online_detail&data_type=json',
 
-        course_chapter:prefix+'/index.php?mod=teacher_online&action=index&do=teacher_online_chapter&data_type=json',
 
-        course_company:prefix+'/index.php?mod=teacher_online&action=index&do=teacher_online_team',
 
-        popular_recommend:prefix+'/index.php?mod=teacher_online&action=index&do=teacher_online_label&data_type=json',
 
-        popular_search:prefix+'/index.php?mod=teacher_online&action=index&do=teacher_online_keyword&data_type=json'
 
-	}
 
-}
 
-
 
-REQUESTDATA.prototype={
 
-	getURL:function(){
 
-		var totalURL=this.url;
 
-		return totalURL;
 
-	},
 
-	getUserInfo:function(callback){
 
-		var requestURL=this.url.user_info;
 
-	    $.ajax({
 
-	        url:requestURL,
 
-	        type:'POST',
 
-	        dataType:'json',
 
-	        data:{
 
-	            token:'0adef54vzorgRCvGA5hbiqrdzn7BLYBfk9dyrAcliHS5hGw',
 
-	        },
 
-	        success:function(res){
 
-	            if(res.code=='1'){
 
-	                var _data=res.data;
 
-	                callback(_data);
 
-	            }
 
-	        }
 
-	    });
 
-	},
 
-	getTableListData:function(callback){
 
-	    var requestURL=this.url.course_list;
 
-	    $.ajax({
 
-	        url:requestURL,
 
-	        type:'POST',
 
-	        dataType:'json',
 
-	        data:{
 
-	            page:gobalData.listPage,
 
-	            limit:'12',
 
-	            type1:gobalData.selectedType1,
 
-	            type2:gobalData.selectedType2,
 
-	            course_label:gobalData.activePopularRecommend,
 
-	            course_keyword:gobalData.activePopularSearch,
 
-	            search_name:gobalData.activeSearchVal,
 
-	            token:gobalData.token,
 
-	            sm_id:gobalData.sm_id
 
-	        },
 
-	        success:function(res){
 
-	            if(res.code=='1'){
 
-	                var _data=res.data;
 
-	                var totalRows=Number(res.count);
 
-	                if(totalRows>12){
 
-	                    var _decimalNum=totalRows%12;
 
-	                    if(_decimalNum==0){
 
-	                        gobalData.totalListPage=parseInt(totalRows/12);
 
-	                    }else{
 
-	                        gobalData.totalListPage=parseInt(totalRows/12)+1;
 
-	                    }
 
-	                }else{
 
-	                    gobalData.totalListPage=1;
 
-	                }
 
-	                callback(_data);
 
-	            }else{
 
-	            		var errerArr=[];
 
-	        			callback(errerArr);
 
-	        			errorLoadingInit();
 
-	            }
 
-	        },
 
-	        error: function (XMLHttpRequest, textStatus, errorThrown) {
 
-	        		var errerArr=[];
 
-	        		callback(errerArr);
 
-	        		errorLoadingInit();
 
-	        }
 
-	    });
 
-	},
 
-	/**分类弹窗内容 */
 
-	getClassifyData:function(callback){
 
-	    var requestURL=this.url.classify_list;
 
-	    $.ajax({
 
-	        url:requestURL,
 
-	        type:'POST',
 
-	        dataType:'json',
 
-	        data:{
 
-	            token:gobalData.token,
 
-	            sm_id:gobalData.sm_id
 
-	        },
 
-	        success:function(res){
 
-	            if(res.code=='1'){
 
-	                var _data=res.data;
 
-	                callback(_data);
 
-	            }
 
-	        }
 
-	    });
 
-	},
 
-	/**获取热门标签数据 */
 
-	getPopularRecommendData:function(callback){
 
-        var requestURL=this.url.popular_recommend;
 
-        $.ajax({
 
-            url:requestURL,
 
-            type:'POST',
 
-            dataType:'json',
 
-            data:{
 
-                limit:10,
 
-	            token:gobalData.token,
 
-	            sm_id:gobalData.sm_id,
 
-	            token:gobalData.token,
 
-	            sm_id:gobalData.sm_id
 
-            },
 
-            success:function(res){
 
-                if(res.code=="1"){
 
-                    var _data=res.data;
 
-                    callback(_data);
 
-                }
 
-            }
 
-        });
 
-   },
 
-   getPopularSearchData:function(callback){
 
-        var requestURL=this.url.popular_search;
 
-        $.ajax({
 
-            url:requestURL,
 
-            type:'POST',
 
-            dataType:'json',
 
-            data:{
 
-                limit:10,
 
-	            token:gobalData.token,
 
-	            sm_id:gobalData.sm_id
 
-            },
 
-            success:function(res){
 
-                if(res.code=="1"){
 
-                    var _data=res.data;
 
-                    callback(_data);
 
-                }
 
-            }
 
-        });
 
-   },
 
-   //获取详情
 
-   getCourseDetailData:function(target,callback){
 
-	    var requestURL=this.url.course_detail;
 
-	    $.ajax({
 
-	        url:requestURL,
 
-	        type:'POST',
 
-	        dataType:'json',
 
-	        data:{
 
-	            spec_id:target,
 
-	            token:gobalData.token,
 
-	            sm_id:gobalData.sm_id
 
-	        },
 
-	        success:function(res){
 
-	            if(res.code=='1'){
 
-	                var _data=res.data;
 
-	                callback(_data);
 
-	            }
 
-	        }
 
-	    });
 
-	},
 
-	getCompanyData:function(target,callback){
 
-        var requestURL=this.url.course_company;
 
-        $.ajax({
 
-            url:requestURL,
 
-            type:'POST',
 
-            dataType:'json',
 
-            data:{
 
-                spec_id:target,
 
-                data_type:"json",
 
-                page:1,
 
-                limit:10000,
 
-	            token:gobalData.token,
 
-	            sm_id:gobalData.sm_id
 
-            },
 
-            success:function(res){
 
-                if(res.code=='1'){
 
-                    var _data=res.data;
 
-                    callback(_data);
 
-                }
 
-            }
 
-        });
 
-   },
 
-   getChapterData:function(target,callback){
 
-        var requestURL=this.url.course_chapter;
 
-        $.ajax({
 
-            url:requestURL,
 
-            type:'POST',
 
-            dataType:'json',
 
-            data:{
 
-                spec_id:target,
 
-                page:1,
 
-                limit:10000,
 
-	            token:gobalData.token,
 
-	            sm_id:gobalData.sm_id
 
-            },
 
-            success:function(res){
 
-                if(res.code=='1'){
 
-                    var _data=res.data;
 
-                    callback(_data);
 
-                }
 
-            }
 
-        });
 
-   }
 
-
 
-}
 
->>>>>>> 0abfbfa5cbbe661725ce59d6e6b914e2906fa37c
 
+}

+ 25 - 0
teacher_classroom/package.js
Zobrazit soubor 

@@ -0,0 +1,25 @@
 
+var gobalData={
 
+    link:{
 
+        course_list:"http://www.txhlwxx.com/index.php?mod=teacher_online&action=index&do=teacher_online_list&data_type=json",
 
+        classify_list:"http://www.txhlwxx.com/index.php?mod=teacher_online&action=index&do=cate&data_type=json",
 
+        course_detail:"http://www.txhlwxx.com/index.php?mod=teacher_online&action=index&do=txwx_teacher_online_detail&data_type=json",
 
+        course_chapter:"http://www.txhlwxx.com/index.php?mod=teacher_online&action=index&do=teacher_online_chapter&data_type=json",
 
+        course_company:"http://www.txhlwxx.com/index.php?mod=teacher_online&action=index&do=teacher_online_team",
 
+        popular_recommend:"http://www.txhlwxx.com/index.php?mod=teacher_online&action=index&do=teacher_online_label&data_type=json",
 
+        popular_search:"http://www.txhlwxx.com/index.php?mod=teacher_online&action=index&do=teacher_online_keyword&data_type=json"
 
+    },
 
+    courseLoading:false,
 
+    listPage:1,
 
+    totalListPage:0,
 
+    classifyType1:[],
 
+    classifyType2:[],
 
+    selectedType1:"",
 
+    selectedType2:"",
 
+    chapterLoading:false,
 
+    chapterPage:1,
 
+    totalChapterPage:0,
 
+    chapterData:[],
 
+    activePopularRecommend:"",
 
+    activePopularSearch:"",
 
+    activeSearchVal:""
 
+}

+ 0 - 0
teacher_classroom/src/app.js
Zobrazit soubor


+ 54 - 0
teacher_classroom/src/css/detail.css
Zobrazit soubor 

@@ -0,0 +1,54 @@
 
+.headerModel{
 
+    width:100%;
 
+    height:50px;
 
+    line-height:50px;
 
+    text-align: center;
 
+    background:#f8f8f8;
 
+    border-bottom:solid #DCDFE6 1px;
 
+    font-size:18px;
 
+    color:#303133;
 
+    position:fixed;
 
+    top:0px;
 
+    left:0px;
 
+    z-index:80;
 
+}
 
+.courseInfoItem{
 
+    font-size:14px;
 
+    color:#303133;
 
+    line-height:25px;
 
+}
 
+
 
+#noMore{
 
+    width:100%;
 
+    color:#606266;
 
+    font-size:13px;
 
+    text-align:center;
 
+    position:absolute;
 
+    top:0px;
 
+    left:0px;
 
+    padding-top:20px;
 
+    padding-bottom:20px;
 
+}
 
+.noData{
 
+    width:100%;
 
+    text-align:center;
 
+    font-size:14px;
 
+    color:#606266;
 
+    padding:15px 0px 15px 0px;
 
+}
 
+
 
+.videoWrapper{
 
+    width:100%;
 
+    height:0px;
 
+    position:fixed;
 
+    top:0px;
 
+    left:0px;
 
+    z-index:120;
 
+    background:rgba(0,0,0,0.9);
 
+}
 
+.videoContentWrapper{
 
+    width:100%;
 
+    height:0px;
 
+    position:relative;
 
+    left:0px;
 
+}

+ 7 - 0
teacher_classroom/src/index.js
Zobrazit soubor 

@@ -0,0 +1,7 @@
 
+$(function(){
 
+    
+})
 
+
 
+function clickSearch(){
 
+    console.log("输入");
 
+}