Browse Source

Merge remote-tracking branch 'origin/dev' into dev

XMTT 7 years ago
parent
commit
ea2ff1c31a
6 changed files with 54 additions and 40 deletions
  1. 44 32
      js/answerLeaveW.js
  2. 3 1
      js/inform.js
  3. 6 1
      js/leaveWord.js
  4. 0 1
      js/qa-show.js
  5. 1 1
      qa-show.html
  6. 0 4
      userInforShow.html

+ 44 - 32
js/answerLeaveW.js

@ -18,8 +18,9 @@
18 18
	}
19 19
	var LeaveWord = function() {
20 20
		var self = this;
21
		self.bindEvent();
22 21
		self.addHtml();
22
		self.bindEvent();
23
		
23 24
	}
24 25

25 26
	function lgin() {
@ -36,14 +37,13 @@
36 37
	}
37 38
	LeaveWord.prototype.init = function(selecter,obj) {
38 39
		obj.rows=5;
39
		var id = $.cookie('userid');
40 40
		var self = this;
41 41
		ajaxRequist("/ajax/leavemsg/subject",obj, "GET", function(data) {
42
			if(!self.id) {
42
			if(!obj.id) {
43 43
			var strer='<div class="ifLogin">' +
44 44
					    '<form class="ifLoginOn clearfix">' +
45 45
					    	'<div class="msgContbox">' +
46
					    		'<textarea class="msgCont" placeholder="请输入您的留言内容..."></textarea>' +
46
					    		'<textarea class="msgCont" placeholder="请输入您的留言内容..."  maxlength="200"></textarea>' +
47 47
					    		'<span class="msgconNum"><em>0</em>/200</span>'+
48 48
					    	'</div>'+
49 49
					    	'<input type="button" class="frmconbtn btnModel floatR" disabled="" value="留言">' +
@ -51,13 +51,15 @@
51 51
				'</div>' +
52 52
				'<div class="form-item commentsArea">'+
53 53
					'<ul class="commentList">' +
54
					'</ul>' +
54
					'</ul><div class="con-kong displayNone">暂无留言</div>' +
55 55
					'<button class="frmconbtn btnCancel displayNone">查看更多留言</button>' +
56 56
				'</div>'
57 57
				var $strer=$(strer);
58
				selecter.append(strer);
58
				selecter.append($strer);
59
				if(data.length==0) {
60
					$strer.find(".con-kong").removeClass("displayNone");
61
				}
59 62
				$strer.find("input").data("ouse",obj);
60
				//self.LwordTotal()
61 63
				(data.length>4)?$strer.find(".btnCancel").removeClass("displayNone").data("obj",{
62 64
					sid:obj.sid,
63 65
					sType:4,
@ -65,30 +67,31 @@
65 67
					id:data[data.length-1].id
66 68
				}):"";
67 69
			}else{
68
				(data.length>4)?selector.siblings("button").removeClass("displayNone").data("obj",{
70
				(data.length>4)?selecter.siblings("button").removeClass("displayNone").data("obj",{
69 71
					sid:obj.sid,
70 72
					sType:4,
71 73
					time:data[data.length-1].createTime,
72 74
					id:data[data.length-1].id
73
				}):selector.siblings("button").addClass("displayNone");
75
				}):selecter.siblings("button").addClass("displayNone");
74 76
			}
75 77
			if(data.length == 0) {
76 78
				return;
77 79
			}
78
			if(selector.siblings()[0]=="button") {
80
			if(selecter[0].className!="commentList") {
79 81
				self.topHtml($strer.find("ul"),data);
80 82
			}else{
81
				self.topHtml(selector,data);
83
				self.topHtml(selecter,data);
82 84
			}
83 85
			
84 86
		})
85 87
	}
86 88
	LeaveWord.prototype.topHtml=function(selector,data) {
89
		var id = $.cookie('userid');
87 90
		var self = this;
88 91
		for(var i = 0; i < data.length; i++) {
89 92
				var reply="";
90 93
				if(data[i].reciver) {
91
					reply = '<span style="margin:0px 10px;">回复 </span><a href="userInforShow.html?professorId='+data[i].reciver+'" class="userhref"><span class="h1Font messageName">张某某</span></a><em class="authiconNew" title="科袖认证专家"></em>'
94
					reply = '<span style="margin:0px 10px;font-size:16px;">回复 </span><a href="userInforShow.html?professorId='+data[i].reciver+'" class="userhref"><span class="h1Font messageName">张某某</span></a><em class="authiconNew" title="科袖认证专家"></em>'
92 95
				}
93 96
				var itemlist = '<li class="flexCenter">';
94 97
				itemlist += '<a href class="userhref"> <div class="madiaHead useHead useHeadMsg"></div></a>';
@ -96,7 +99,7 @@
96 99
				itemlist += '<p><a href="userInforShow.html?professorId='+data[i].sender+'" class="userhref"><span class="h1Font messageName">张某某</span></a><em class="authiconNew" title="科袖认证专家"></em>'+reply+'<span class="commenttime" style="float:right;">'+commenTime(data[i].createTime)+'</span></p>';
97 100
				itemlist += '<p class="h2Font messageContent">'+data[i].cnt+'</p>';
98 101
				itemlist += '<div class="operateSpan"><em class="noMy"><span class="dzthumb"></span><span class="thNum">赞0</span><span class="callBack">回复</span></em><span class="messageDel displayNone">删除</span></div>';
99
				itemlist += '<div class="displayNone replyLeword"><textarea class="txtArea"></textarea><p class="pTxt"><span class="qCancel">取消</span><button class="hReply btnModel" disabled>回复</button></p></div></div></li>';
102
				itemlist += '<div class="displayNone replyLeword"><textarea class="txtArea" style="font-size:12px"></textarea><p class="pTxt"><span class="qCancel">取消</span><button class="hReply btnModel" disabled style="font-size:12px">回复</button></p></div></div></li>';
100 103
				$itemlist = $(itemlist);
101 104
				selector.append($itemlist); 
102 105
				$itemlist.attr('data-obj',JSON.stringify(data[i]));
@ -138,14 +141,14 @@
138 141
			return;
139 142
		}
140 143
		ajaxRequist("/ajax/leavemsg", {
141
			cnt: $($this).siblings(".msgContbox").find("textarea"),
144
			cnt: $($this).siblings(".msgContbox").find("textarea").val(),
142 145
			refId: $($this).data("ouse").sid,
143 146
			refType: $($this).data("ouse").stype,
144 147
			sender: $.cookie('userid'),
145 148
			uname: $.cookie('userName')
146 149
		}, "POST", function(data) {
147
			$($this).siblings(".msgContbox").find("textarea").val("");
148
			ajaxRequist("/ajax/leavemsg/qo", {id:data.data},"GET",function(data) {
150
			$($this).siblings(".msgContbox").find("textarea").val("").siblings(".msgconNum").find("em").text(0);
151
			ajaxRequist("/ajax/leavemsg/qo", {id:data},"GET",function(data) {
149 152
				self.topHtml($($this).parents(".ifLogin").siblings(".commentsArea").find("ul"),[data])
150 153
			})
151 154
		})
@ -157,13 +160,14 @@
157 160
	}
158 161
	LeaveWord.prototype.bindEvent = function() {
159 162
		var self = this;
160
		$(".ifLogin").on('click',"input",function() {
163
		$(".list-hold-list").on('click',".ifLogin input",function() {
161 164
			if(!lgin()) {
162 165
				return;
163 166
			}
164
			self.topLw($(this));
167
			self.topLw(this);
168
			self.LwordTotal($(this),$(this).data("ouse"));
165 169
		});
166
		$("#curAnswers").on("click", "li", function(e) {
170
		$(".list-hold-list").on("click", ".commentList li", function(e) {
167 171
			if(!lgin()) {
168 172
				return;
169 173
			}
@ -180,19 +184,20 @@
180 184
					break;
181 185
				case "qCancel": $(target).parent().siblings("textarea").val("").parents(".replyLeword").addClass("displayNone").siblings(".operateSpan").removeClass("displayNone")
182 186
					break;
183
				case "frmconbtn btnCancel":
184
				var $obj=$(this).data(obj);
185
				self.init($(this).siblings("ul"),{sid: $obj.sid,stype: $obj.stype,time: $obj.time,id: $obj.id});
186 187
			}
187 188
		});
188
		$("#curAnswerst").on("input",".msgCon",function(){
189
		$(".list-hold-list").on("click", ".answerWord .btnCancel", function(e) {
190
				var $obj=$(this).data('obj');
191
				self.init($(this).siblings("ul"),{sid: $obj.sid,stype: $obj.sType,time: $obj.time,id: $obj.id});
192
		})
193
		$(".list-hold-list").on("input",".ifLogin textarea",function(){
189 194
			if($.trim($(this).val()).length>0) {
190
					$(this).siblings(".msgconNum").removeAttr("disabled");
195
					$(this).siblings(".msgconNum").find("em").text($(this).val().length).parents(".msgContbox").siblings("input").removeAttr("disabled");
191 196
				}else{
192
					$(this).siblings(".msgconNum").attr("disabled","disabled");
197
					$(this).parents(".msgContbox").siblings("input").attr("disabled","disabled");
193 198
				}
194 199
		})
195
		$("#curAnswers").on("input", "textarea", function(e) {
200
		$(".list-hold-list").on("input", ".commentList textarea", function(e) {
196 201
				if($.trim($(this).val()).length>0) {
197 202
					$(this).siblings().find(".btnModel").removeAttr("disabled");
198 203
					self.autoGrow.call(this);
@ -200,6 +205,8 @@
200 205
					$(this).siblings().find(".btnModel").attr("disabled","disabled");
201 206
				}
202 207
		})
208
		
209
		
203 210
	}
204 211
	LeaveWord.prototype.referThup = function(lid, li, num) {
205 212
		ajaxRequist("/ajax/leavemsg/agree", { 
@ -233,19 +240,20 @@
233 240
			uname: $.cookie('userName')
234 241
		}, "POST", function(data) {
235 242
			$($th).parents(".pTxt").siblings("textarea").val("").parents(".replyLeword").addClass("displayNone").siblings(".operateSpan").removeClass("displayNone")
236
			ajaxRequist("/ajax/leavemsg/qo", {id:data.data},"GET",function(data) {
237
				self.topHtml($($th).parents("ul"),[data])
243
			ajaxRequist("/ajax/leavemsg/qo", {id:data},"GET",function(data) {
244
				self.topHtml($($th).parents(".commentList"),[data])
238 245
			})
239
			self.LwordTotal($th,lid);
246
			self.LwordTotal($($th),{sid:lid.refId,stype:lid.refType});
240 247
		})
241 248
	}
242 249
	LeaveWord.prototype.LwordDel = function($this, lid) {
250
		
243 251
		var self = this;
244 252
		ajaxRequist("/ajax/leavemsg/del", {
245 253
			id: lid.id
246 254
		}, "GET", function(data) {
247
			$($this).parents("li").remove();
248
			self.LwordTotal($this,lid);
255
			self.LwordTotal($($this).parents(".commentList"),{sid:lid.refId,stype:lid.refType});
256
			$($this).parents(".flexCenter").remove();
249 257
		})
250 258
	}
251 259
	LeaveWord.prototype.LwordTotal = function($th,lid) {
@ -254,7 +262,11 @@
254 262
			sid: lid.sid,
255 263
			stype: lid.stype
256 264
		}, "get", function($data) {
257
			$($th).parents(".list-qa").find(".pageview").text($data);
265
			$th.parents(".list-qa").find(".leaveMsgCount").text($data);
266
			$th.parents(".list-qa").find(".con-kong").addClass("displayNone");
267
			if($data==0) {
268
				$th.parents(".list-qa").find(".con-kong").removeClass("displayNone");
269
			}
258 270
		})
259 271
	}
260 272


+ 3 - 1
js/inform.js

@ -104,6 +104,7 @@ $(function() {
104 104
	}
105 105
	$("#curAnswers").on("click", ".cnt", function() {
106 106
		var dobj = $(this).parents("li").data("obj");
107
		alert(JSON.stringify(dobj))
107 108
		var our = "";
108 109
		if(dobj.opType == 0) {
109 110
			ourl = "userInforShow.html?professorId=" + dobj.uid;
@ -118,7 +119,8 @@ $(function() {
118 119
				}
119 120
			});
120 121
		} else if(dobj.opType == 3 || dobj.opType == 4 ) {
121
			ourl = "qa-show.html?id=" + dobj.uid+"&topid="+dobj.pid;
122
			var arr=dobj.pid.split(":")
123
			ourl = "qa-show.html?id=" + arr[1]+"&topid="+arr[0];
122 124
		}else if(dobj.opType == 5){
123 125
			ourl = "qa-show.html?id=" + dobj.pid;
124 126
		} else if(dobj.opType == 6) {

+ 6 - 1
js/leaveWord.js

@ -51,7 +51,7 @@
51 51
				return;
52 52
			}
53 53
			if(!self.id) {
54
				$(".commentList").html("");
54
				$(".commentList").html("").parent().append("<div class="con-kong displayNone"></div>");
55 55
			}
56 56
			for(var i = 0; i < data.length; i++) {
57 57
				var reply="";
@ -244,6 +244,11 @@
244 244
			stype: self.stype
245 245
		}, "get", function($data) {
246 246
			$(".message").text($data);
247
			if($data==0) {
248
				$(".con-kong").removeClass("displayNone")
249
			}else{
250
				$(".con-kong").addClass("displayNone");
251
			}
247 252
		})
248 253
	}
249 254


+ 0 - 1
js/qa-show.js

@ -452,7 +452,6 @@ $(function() {
452 452
			//留言
453 453
			$str.find(".leaveWo").on('click', function() {
454 454
				if(userid && userid != null && userid != "null") {
455
					alert("ppp")
456 455
					module.lWord.init($(this).parents(".list-qa").find(".answerWord"),{sid:anid,stype:4});
457 456
				}else{
458 457
					quickLog();

+ 1 - 1
qa-show.html

@ -128,7 +128,7 @@
128 128
												</div>
129 129
												<div class="operateBlock bottomShow floatL">
130 130
								            		<ul class="clearfix">
131
								            			<li><span>留言</span> <span class="pageview">1000</span></li>
131
								            			<li><span>留言</span> <span class="leaveMsgCount">1000</span></li>
132 132
								            			<li class="attention"><span>收藏</span> <em class="operateicon operateicon2 icon-collect" id="collectBtn"></em></li>
133 133
														<li>
134 134
															<span>分享到</span>

+ 0 - 4
userInforShow.html

@ -12,10 +12,6 @@
12 12
<link type="text/css" href="css/popup.css" rel="stylesheet">
13 13
<link type="text/css" href="css/genindex.css" rel="stylesheet">
14 14
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
15
<style type="text/css">
16
	#item7user>.coninfobox{display: none;}
17
	#item7user>.coninfobox:first-child{display:block;}
18
</style>
19 15
</head>
20 16
21 17
<body>