diff --git a/css/heathspecial.css b/css/heathspecial.css
index e125efde0e62c5983283eb925d0cd74659a74153..4146bf521f03639dbce26926625a00d2e5d62f3b 100644
--- a/css/heathspecial.css
+++ b/css/heathspecial.css
@@ -9,7 +9,7 @@ body{background-color: #EBEFF3;}
     width: 100%;
     height: 125px;
     border-radius: 10px;
-    background-color: #fff;
+    background-color: #EBEFF3;
     margin-bottom: 20px;
 }
 .special-banner{
diff --git a/html/collections.html b/html/collections.html
index 3b85cf962dc9dcab3b80115ababfc3bde7d56780..94de97aa830f002a09da10f6562c231ab3564f92 100644
--- a/html/collections.html
+++ b/html/collections.html
@@ -32,7 +32,7 @@
 
     <nav class="mui-bar mui-bar-tab bgcolor2 collect-btn" style="display: none;">
         <div class="mui-left center" id="delAll" style="border-right: 1px solid #f0f0f0">全部清除</div>
-        <div class="mui-left center color5">删除</div>
+        <div class="mui-left center color5" id='del'>删除</div>
     </nav>
 </div>
 </body>
@@ -97,14 +97,15 @@
 		        	 
 		 	
 		  function userData (obj){
+			  	$('#list1').empty();
 		 		mui.ajax({
 		 			header:{token:token},
 		 			type:'post',
 		 			url:ip+'/collection/pageQueryMyCollectionByCreateUserAndType',
 		 			data:obj,
 		 			success:function(res){
+	
 		 				if(res.code == 200){
-		 					
 		 					var li=''
 							if(res.data.list.length > 0 ){
 								mui.each(res.data.list,function(index,item){
@@ -113,7 +114,7 @@
 											 '<label></label>'+
 											 '<input name="checkbox1" class="rds" value="'+item.id+'" type="checkbox"></div>'+
 											 '<a href="javascript:;" id="'+item.id+'">'+
-											 '<img class="mui-media-object mui-pull-left" src="../images/bg1.png">'+
+											 '<img class="mui-media-object mui-pull-left" src="'+item.mainPath+'">'+
 											 '<div class="mui-media-body"> '+item.title+'<p class="mui-ellipsis">'+item.subTitle+'</p></div>'+
 											
 											 '</a>'+
@@ -155,6 +156,7 @@
 		 mui('header').on('tap','.edit',function(){
 		 	
 		 	var _type=this.getAttribute('data-type');
+			console.log(_type)
 		 	if(_type == '0'){
 		 		$(this).html('取消')
 		 		this.setAttribute("data-type", "1");
@@ -194,6 +196,31 @@
 		 	 }
 		 }) 
 		 
+		 //删除
+		 mui("nav").on('tap','#del',function(){
+		 	 ids=(getVals()) 
+		 	 if(ids){
+		 		 $.ajax({
+		 			 type:'post',
+		 			 data:{dataIds:JSON.stringify(ids),username:username,dataType:1,status:0},
+		 			 url:ip+'/collection/addOrCancelCollectionByUsernameEtc',
+		 			 success:function(res){
+		 			 	if(res.code == 200){
+		 			 		//重新渲染列表
+		 			 		userData (searchObj)
+		 			 		
+		 			 	}else{
+		 			 		mui.toast('操作失败');
+		 			 	}
+		 			 },
+		 			 error:function(){
+		 			 	mui.toast('系统错误');
+		 			 }
+		 		 });
+		 	 }
+		 }) 
+		 
+		 
 		 function getVals() {
 		 
 		 		var res = getCheckBoxRes('rds');
diff --git a/html/collections2.html b/html/collections2.html
index d104ff665097d39c241caa9817fc12b3893b0f01..cb5888851450e58c8e95c86367ae593668b18643 100644
--- a/html/collections2.html
+++ b/html/collections2.html
@@ -39,7 +39,7 @@
 
     <nav class="mui-bar mui-bar-tab bgcolor2 collect-btn" style="display: none;">
         <div class="mui-left center" id="delAll" style="border-right: 1px solid #f0f0f0">全部清除</div>
-        <div class="mui-left center color5">删除</div>
+        <div class="mui-left center color5" id='del'>删除</div>
     </nav>
 </div>
 </body>
@@ -111,6 +111,7 @@
 		 		  },500)
 		 	  }
 		      function userData (obj){
+				  	$('#list2').empty();
 		 			mui.ajax({
 		 				header:{'token':token},
 		 				type:'post',
@@ -225,7 +226,31 @@
 		      		 });
 		      	 }
 		      }) 
-		      
+		     mui("nav").on('tap','#del',function(){
+		     	 ids=(getVals()) 
+		     	 console.log(ids)
+		     	 if(ids){
+		     		 $.ajax({
+		     			 type:'post',
+		     			 data:{dataIds:JSON.stringify(ids),username:username,dataType:3,status:0},
+		     			 url:ip+'/collection/addOrCancelCollectionByUsernameEtc',
+		     			 success:function(res){
+		     			 	if(res.code == 200){
+		     			 		//重新渲染列表
+		     			 		userData (searchObj)
+		     			 		$('.collect-btn').hide();
+		     		 						$('.edit').html('编辑');
+		     			 	}else{
+		     			 		mui.toast('操作失败');
+		     			 	}
+		     			 },
+		     			 error:function(){
+		     			 	mui.toast('系统错误');
+		     			 }
+		     		 });
+		     	 }
+		     }) 
+			  
 		      function getVals() {
 		      
 		      		var res = getCheckBoxRes('rds');
diff --git a/html/detail1.html b/html/detail1.html
index 0abe3e3038364adb683c5a8ce2bdb1d6923752cc..0d9d3ee261f35a358f2bb174e37e5caeb342463c 100644
--- a/html/detail1.html
+++ b/html/detail1.html
@@ -10,6 +10,15 @@
     <link href="../css/common.css" rel="stylesheet" />
     <link href="../css/mine.css" rel="stylesheet" />
 </head>
+<style>
+	        .upload-item{
+	            width: 66px;
+	            height: 66px;
+	            margin-right: 10px;
+	            float: left;
+	        }
+	        .upload-item img{max-width: 100%}
+</style>
 <body style="background: #ffffff;">
 <header class="mui-bar mui-bar-nav">
   <span class="mui-icon mui-icon-back" id="back"  style="position: absolute;"></span>
@@ -19,6 +28,10 @@
 <div  class="mui-content">
 	
 	<div  id="cont" style="padding: 10px;box-sizing: border-box;"></div>
+	附件：
+		<div  id="fj" style="padding: 10px;box-sizing: border-box;">
+			
+		</div>
 	<div id="video">
 		 <span class="col color1 f14 center" data-status="" style="margin-bottom: 20px;">收藏</span>
 	</div>
@@ -29,6 +42,9 @@
 <script src="../js/jquery-3.3.1.min.js"></script>
 <script src="../js/common.js"></script>
 <script>
+	        var pic_class = ['jpg', 'png', 'gif', 'bmp', 'jpeg'];
+	        var audio_class = ['mp3', 'wav'];
+	 var video_class = ['mp4', 'rmvb', '3gp', 'avi', 'wmv'];
 	mui.init();
 	 mui.plusReady(function() {
 		 let token=plus.storage.getItem('token');
@@ -56,6 +72,50 @@
 		 		if(res.code == 200){
 		 			  $('#title').html(res.data.title);
 		 			  $('#cont').html(res.data.content);
+					 
+					    var div=''
+						   if(res.data.fileVos.length>0){
+							 $.each(res.data.fileVos,function(index,item){
+							                          var fileName = item.fileName;
+							                          var fileClass =item.fileName.split(".")[1];
+							                           if (pic_class.indexOf(fileClass) > -1) {
+							                                                                 div+= '<div lay-event="previewImg" class="upload-item  fl"  title="'+ fileName +'"  onclick="onClick(this)"  data-src="'+item.filePath+'" style="margin-right: 10px">' +
+							                                                                     '<img  src="' + item.filePath + '" width=60px;height=60px>' +
+							                                                                     '</div>'
+							                                                             } else if (audio_class.indexOf(fileClass) > -1) {
+							                                                                 div+=  '<div lay-event="previewImg" class="upload-item fl "  title="'+ fileName +'" onclick="onClick(this)" data-src="'+item.filePath+'"  style="margin-right: 10px">' +
+							                                                                     '<img src="/images/attach/file_video.png">' +
+							                                                                     '</div>'
+							                                                             } else if (video_class.indexOf(fileClass) > -1) {
+							                                                                 div+='<div lay-event="previewImg" class="upload-item fl "  title="'+ fileName +'" onclick="onClick(this)" data-src="'+item.filePath+'"  style="margin-right: 10px">' +
+							                                                                     '<img src="/images/attach/file_video.png">' +
+							                                                                     '</div>'
+							                         
+							                                                             } else if (fileClass == 'doc' || fileClass == 'docx'||fileClass == 'pdf') {
+							                                                                 div+=  '<div lay-event="previewFile" class="upload-item fl "  title="'+ fileName +'" onclick="onClick(this)" data-src="'+item.filePath+'"  style="margin-right: 10px">' +
+							                                                                     '<img src="/images/attach/file_doc.png">' +
+							                                                                     '</div>'
+							                                                             }  else if (fileClass =='xls'||fileClass == 'xlsx') {
+							                                                                 div+=  '<div lay-event="previewFile" class="upload-item fl "  title="'+ fileName +'" onclick="onClick(this)" data-src="'+item.filePath+'"  style="margin-right: 10px">' +
+							                                                                     '<img src="/images/attach/file_xls.png">' +
+							                                                                     '</div>'
+							                                                             }
+							                                                             else {
+							                                                                 div+= '<div class="upload-item fl" lay-event="previewFile"  title="'+ fileName +'" onclick="onClick(this)" data-src="'+item.filePath+'"  style="margin-right: 10px">' +
+							                                                                     '<img src="/images/attach/file_other.png">' +
+							                                                                     '</div>'
+							                                                             }
+							 					  
+							                      })  
+						   }else{
+							   div='<div  title="无附件">无附件</div>'
+						   }
+							   
+					 
+											  
+					                     
+					  $("#fj").append(div)
+					  console.log(div)
 		 			   $('#video span').attr('data-status',res.data.collectStatus)
 		 			  if(res.data.collectStatus == 1){
 		 				  $('#video span').addClass('active')
@@ -116,6 +176,13 @@
 		 	
 		 })
 	 })
+	 function onClick(e){
+	     var src=e.getAttribute("data-src");
+	     var event=e.getAttribute( "lay-event");
+	    if(event ==='previewFile'){
+	         window.open(src)
+	     }
+	 }
    
 </script>
 
diff --git a/html/heathspecial.html b/html/heathspecial.html
index 09c08671d8ba19127ef15a441a4c59767fa569f6..6972fa5b70322c987661902e76eb96f458df94e6 100644
--- a/html/heathspecial.html
+++ b/html/heathspecial.html
@@ -1,111 +1,113 @@
-<!doctype html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <title></title>
-    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
-
-    <link href="../css/mui.css" rel="stylesheet" />
-    <link href="../css/common.css" rel="stylesheet" />
-    <link href="../css/heathspecial.css" rel="stylesheet" />
-</head>
-<body>
-<header class="mui-bar mui-bar-nav">
-    <span class="mui-icon mui-icon-back" id="back"></span>
-    <h1 class="mui-title">健康专题</h1>
-</header>
-<div id="refreshContainer" class="mui-content mui-scroll-wrapper" style="margin-top: 0;">
-     <div class="mui-scroll">
-		 <div class="list">
-			
-		 </div>
-       
-    </div>
-</div>
-</body>
-<script src="../js/jquery-3.3.1.min.js"></script>
-<script src="../js/mui.min.js"></script>
-<script src="../js/common.js"></script>
-<script>
-	mui.init();
-	mui("header").on('tap','#back',function(){
-		
-	    mui.back();
-	}) 
-	var searchObj={
-	
-		size:10,//请求条数
-		page:1,//当前页码
-		id:5
-	}
-	var isOver = false; //是否加载完       
-	mui('#refreshContainer').pullRefresh({
-	    up: {
-	        height: 50,
-	        auto: true,
-	        contentrefresh: "正在加载...",
-	        contentnomore: "没有更多数据了",
-	        callback: userPullupRefresh
-	    }               
-	});
-	
-	function userPullupRefresh() {
-		  setTimeout(function(){
-			  mui('#refreshContainer').pullRefresh().endPullupToRefresh((isOver)); //参数为true代表没有更多数据了。
-			  userData(searchObj);
-		  },500)
-	}
-	
-	function userData (obj){
-			mui.ajax({
-					type:'post',
-					url:ip+'/article/getProgramaByParentId',
-					data:obj,
-					success:function(res){
-						console.log(JSON.stringify(res))
-						if(res.code == 200){
-							var div='';
-							if(res.data.length >0){
-								mui.each(res.data,function(index,item){
-									console.log(JSON.stringify(item))
-									
-								     div +='<section id="'+item.id+'" class="item" style="background-image:url('+item.mainPath+')">'+item.title+'</section>'
-									 
-								});
-														
-								$('.list').append(div);
-							}
-						   
-							
-							//判断是否还有数据,若小于每次加载条数,结束  
-							if (res.data.length < obj.size) {
-								isOver = true;
-							    mui('#refreshContainer').pullRefresh().endPullupToRefresh(true); //停止下拉显示暂无数据
-							}   
-							//每次加载结束之后，如果还有数据则++
-							if (isOver == false) {
-								
-							    obj.page++;
-							
-							    mui('#refreshContainer').pullRefresh().endPullupToRefresh(true); //停止正在加载
-							    mui('#refreshContainer').pullRefresh().enablePullupToRefresh(); //显示上拉加载文字
-							}  
-							
-						}else{
-							mui.toast("系统错误")
-							}
-					},
-					error:function(){
-							mui.toast("系统错误")
-							
-					}
-				});
-			}
-    //点击跳转详情
-	mui('.list').on('tap','section',function(){
-		let  id = this.getAttribute("id");
-		location.href='heathspecial_list.html?id='+id+''
-	})
-</script>
-</html>
+<!doctype html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+	<meta name="referrer" content="no-referrer">
+    <title></title>
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+
+    <link href="../css/mui.css" rel="stylesheet" />
+    <link href="../css/common.css" rel="stylesheet" />
+    <link href="../css/heathspecial.css" rel="stylesheet" />
+</head>
+<body>
+<header class="mui-bar mui-bar-nav">
+    <span class="mui-icon mui-icon-back" id="back"></span>
+    <h1 class="mui-title">健康专题</h1>
+</header>
+<div id="refreshContainer" class="mui-content mui-scroll-wrapper" style="margin-top: 0;">
+     <div class="mui-scroll">
+		 <div class="list">	 
           </div>
+       
+    </div>
+</div>
+</body>
+<script src="../js/jquery-3.3.1.min.js"></script>
+<script src="../js/mui.min.js"></script>
+<script src="../js/common.js"></script>
+<script>
+	mui.init();
+	mui("header").on('tap','#back',function(){
+		
+	    mui.back();
+	}) 
+	var searchObj={
+	
+		size:10,//请求条数
+		page:1,//当前页码
+		id:5
+	}
+	var isOver = false; //是否加载完       
+	mui('#refreshContainer').pullRefresh({
+	    up: {
+	        height: 50,
+	        auto: true,
+	        contentrefresh: "正在加载...",
+	        contentnomore: "没有更多数据了",
+	        callback: userPullupRefresh
+	    }               
+	});
+	
+	function userPullupRefresh() {
+		  setTimeout(function(){
+			  mui('#refreshContainer').pullRefresh().endPullupToRefresh((isOver)); //参数为true代表没有更多数据了。
+			  userData(searchObj);
+		  },500)
+	}
+	
+	function userData (obj){
+			mui.ajax({
+					type:'post',
+					url:ip+'/article/getProgramaByParentId',
+					data:obj,
+					success:function(res){
+						if(res.code == 200){
+							var div='';
+							if(res.data.length >0){
+								 mui.each(res.data,function(index,item){
+									if(item.mainPath){
+										var path="'"+item.mainPath+"'"
+									  div +='<section id="'+item.id+'" class="item" style="background-image:url('+path+')">'+item.title+'</section>'
+										
+							}else{
+										div +='<section id="'+item.id+'" class="item" style="background-image:url("/")">'+item.title+'</section>'
+										
+									}
+									 
+								}); 
+								
+								$('.list').append(div);
+}
+							
+							//判断是否还有数据,若小于每次加载条数,结束  
+							if (res.data.length < obj.size) {
+								isOver = true;
+							    mui('#refreshContainer').pullRefresh().endPullupToRefresh(true); //停止下拉显示暂无数据
+							}   
+							//每次加载结束之后，如果还有数据则++
+							if (isOver == false) {
+								
+							    obj.page++;
+							
+							    mui('#refreshContainer').pullRefresh().endPullupToRefresh(true); //停止正在加载
+							    mui('#refreshContainer').pullRefresh().enablePullupToRefresh(); //显示上拉加载文字
+							}  
+							
+						}else{
+							mui.toast("系统错误")
+							}
+					},
+					error:function(){
+							mui.toast("系统错误")
+							
+					}
+				});
+			}
+    //点击跳转详情
+	mui('.list').on('tap','section',function(){
+		let  id = this.getAttribute("id");
+		location.href='heathspecial_list.html?id='+id+''
+	})
+</script>
+</html>
diff --git a/html/heathspecial_list.html b/html/heathspecial_list.html
index b46a533a6461ede944e8264e8d86718cc75fa6d3..70f51710b5b4a4ad3bfe5621fa735ffbb61f644d 100644
--- a/html/heathspecial_list.html
+++ b/html/heathspecial_list.html
@@ -75,7 +75,7 @@
 		 		url:ip+'/article/findAllByBelongColumn',
 		 		data:obj,
 		 	    success:function(res){
-					console.log(JSON.stringify(res))
+					console.log(res)
 		 			if(res.code == 200){
 		 				$('.special-banner').css('background-image','url("'+res.headImgPath+'")')
 		 				$('.mui-title').html(res.title)
diff --git a/html/home.html b/html/home.html
index d919cf0648fa7df25dcc3b6fa8e0641746f32bfd..caf3a2440f5a2fca13fec6f0eca169b3e76e76ba 100644
--- a/html/home.html
+++ b/html/home.html
@@ -174,7 +174,8 @@
 		 							
 		 							return;
 		 						}else{
-		 							tpl1 +='<div id="'+item.id+'" class="ad-item center color4" style="background-image:url('+item.mainPath+')">'+item.title+'</div>'
+											var path="'"+item.mainPath+"'"
+		 							tpl1 +='<div id="'+item.id+'" class="ad-item center color4" style="background-image:url('+path+')">'+item.title+'</div>'
 		 						}
 		 					});
 		 				}
diff --git a/html/login.html b/html/login.html
index 98627d69316b3b366a408227b1ed775bfa5fc90f..4925063bf77f7ff9394d3c1d879acce2260db746 100644
--- a/html/login.html
+++ b/html/login.html
@@ -19,7 +19,7 @@
         </div>
         <div class="mui-input-row">
             <span class="passIco"></span>
-            <input type="text" class="mui-input-clear" placeholder="请输入密码" id="password">
+            <input type="password" class="mui-input-clear" placeholder="请输入密码" id="password">
         </div>
     </form>
     <!-- //注意：登录按钮不能和账号密码输入框放在一个form里面 -->
diff --git a/html/message.html b/html/message.html
index 4d17a17bf43840db01dd7ade733156aba1293b17..4674231d4c39441740369ef3bc801cfd4ded49fb 100644
--- a/html/message.html
+++ b/html/message.html
@@ -47,7 +47,7 @@
 		    id:4,
 			size:10,//请求条数
 			page:1,//当前页码
-			memberId:1
+			memberId:memberId
 		}		
 		var isOver = false; //是否加载完       
 		mui('#refreshContainer').pullRefresh({
diff --git a/html/myask.html b/html/myask.html
index d6aeb872d9391bcef0d5e2f5d6bb00c071d4ce19..dbf2d8c0cd1dbe67cb77547532c8ed2afbd89472 100644
--- a/html/myask.html
+++ b/html/myask.html
@@ -49,7 +49,11 @@
 			username:username,//调试用
 			memberId:memberId,
 		}
-		
+        //点击跳转
+        var back = document.getElementById('back');
+
+        var list1 = document.getElementById('list1');
+
 		 let isOver = false; //是否加载完
 		 mui('#refreshContainer').pullRefresh({
 		              up: {
@@ -60,6 +64,7 @@
 		                  callback: userPullupRefresh
 		              }
 		});
+		
 		function userPullupRefresh() {
 					  setTimeout(function(){
 						  mui('#refreshContainer').pullRefresh().endPullupToRefresh((isOver)); //参数为true代表没有更多数据了。
@@ -71,11 +76,10 @@
 			mui.ajax({
 				header:{'token':token},
 				type:'post',
-				url:ip+'/question/getQuestionByCreateUser',
+				url:ip+'/faqQuestion/getQuestionByCreateUser',
 				data:obj,
 				success:function(res){
 					if(res.code == 200){
-						
 						var li=''
 						mui.each(res.data.list,function(index,item){
 							 li +=' <li class="mui-table-view-cell ask-item" id="'+item.id+'">'+
diff --git a/html/myask_detail.html b/html/myask_detail.html
index e574de4a2d41ba87dca65e3ca1698864d774837e..f6bc91e41eee17eb519853c52a9e86961f7ac5e9 100644
--- a/html/myask_detail.html
+++ b/html/myask_detail.html
@@ -52,7 +52,7 @@
 		$.ajax({
 			header:{'token':token},
 			type:'post',
-			url:ip+'/question/getQuestionById',
+			url:ip+'/faqQuestion/getQuestionById',
 			data:searchObj,
 			success:function(res){
 				if(res.code == 200){
@@ -64,12 +64,22 @@
 						var div=''
 					    $('#num').html(data.length)
 						$.each(data,function(index,item){
+							var name=''
+							var unit=''
+							var dutyTitle=''
+							var photoPath=''
+							if(item.doctorUser){
+								name=item.doctorUser.name;
+								unit=item.doctorUser.unit;
+								dutyTitle=item.doctorUser.dutyTitle;
+								photoPath=item.doctorUser.getPhoto();
+							}
 							div +=' <div class="answer-list-item bgcolor2">'+
 									'<div class="answer-people fl">'+
-										'<span class="answer-img fl"><img width="100%" src="../images/userimg.png"/></span>'+
+										'<span class="answer-img fl"><img width="100%" src="'+photoPath+'"/></span>'+
 										'<div class="fl ml10">'+
-											'<h4>'+item.doctorUser.name+'</h4>'+
-											'<p>'+item.doctorUser.unit+'-'+item.doctorUser.dutyTitle+'</p>'+
+											'<h4>'+name+'</h4>'+
+											'<p>'+unit+'-'+dutyTitle+'</p>'+
 										'</div>'+
 									'</div>'+
 									'<div class="answer-infor fl">'+
diff --git a/html/test_evaluating.html b/html/test_evaluating.html
index 553ac3d2bf53d8dcb76527702e576bf0c460de1c..e2f786c945eded4c0a0603af6e6a83d065610551 100644
--- a/html/test_evaluating.html
+++ b/html/test_evaluating.html
@@ -42,9 +42,6 @@
 		 let token=plus.storage.getItem('token');
 		 let username=plus.storage.getItem('username');
 		 let memberId=plus.storage.getItem('memberId');
-		 console.log(11111111111)
-		 console.log(memberId)
-		 console.log(username)
 		 mui("header").on('tap','#back',function(){
 		 	
 		     mui.back();