首页 探索 帮助
注册 登录
bulomakaka
/
ekexiu.app
关注 2
点赞 1
派生 0
代码 工单管理 0 合并请求 0 提交历史 1008 版本发布 0 Wiki
浏览代码

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

XMTT 7 年之前
父节点
32a5994d33 ea7b06ab7e
当前提交
5685842100
共有 9 个文件被更改，包括 67 次插入 和 26 次删除
合并视图 显示文件统计
  1. 4 4
      app/css/app.css
  2. 1 1
      app/html/qa-my-wenda.html
  3. 1 0
      app/html/qa-waiting-a_sub.html
  4. 3 1
      app/js/moreItem.js
  5. 5 3
      app/js/qa-answer-show.js
  6. 2 2
      app/js/qa-my-wenda.js
  7. 35 13
      app/js/qa-my-wendaTT.js
  8. 1 1
      app/js/qa-question-show.js
  9. 15 1
      app/js/qa-waiting-a.js

+ 4 - 4
app/css/app.css
查看文件

631 
.nodatabox .txtbox .currword{font-size: 14px;color: #999999;line-height: 14px;}
631 
.nodatabox .txtbox .currword{font-size: 14px;color: #999999;line-height: 14px;}
632 
.nodatabox .txtbox .currtip{ font-size:13px;color: #AAAAAA;}
632 
.nodatabox .txtbox .currtip{ font-size:13px;color: #AAAAAA;}
633 
.nodatabox .txtbox .keyword{ padding:0 6px;}
633 
.nodatabox .txtbox .keyword{ padding:0 6px;}
634 
.con-kong{line-height: 60px;color: #aaa;font-size: 14px;text-align: center;margin:20% auto;}
634 
.con-kong{line-height: 60px;color: #aaa;font-size: 14px;text-align: center;padding:20% 0;}
635 
/***********************缺省页面*******************/
635 
/***********************缺省页面*******************/
636
636
637 
/***********************科袖用户协议*******************/
637 
/***********************科袖用户协议*******************/
1157 
.qa-owner .owner-head.useHead{width:32px;height:32px;margin-top:-16px;background-image: url(../images/default-photo.jpg);border-radius: 50%;}
1157 
.qa-owner .owner-head.useHead{width:32px;height:32px;margin-top:-16px;background-image: url(../images/default-photo.jpg);border-radius: 50%;}
1158 
.qa-owner .owner-info{padding-left:38px;}
1158 
.qa-owner .owner-info{padding-left:38px;}
1159 
.owner-name{float: left;}
1159 
.owner-name{float: left;}
1160 
.owner-tit{margin-left:10px;float: left;max-width:52%;color:#888888}
1160 
.owner-tit{margin-left:10px;float: left;max-width:70%;color:#888888}
1161 
.qa-con{font-size:14px;line-height: 22px;color:#666;}
1161 
.qa-con{font-size:14px;line-height: 22px;color:#666;}
1162 
.mui-table-view.partLine{background: none;}
1162 
.mui-table-view.partLine{background: none;}
1163 
.mui-table-view.partLine>.mui-table-view-cell{margin-bottom: 10px;background: #fff;}
1163 
.mui-table-view.partLine>.mui-table-view-cell{margin-bottom: 10px;background: #fff;}
1195 
.item_detail .h1Font{font-weight:normal;font-size:18px;line-height:24px;color:#000}
1195 
.item_detail .h1Font{font-weight:normal;font-size:18px;line-height:24px;color:#000}
1196 
.item_detail .list_con{font-size: 15px;color: #333;line-height: 24px;margin: 6px 0;text-align:justify}
1196 
.item_detail .list_con{font-size: 15px;color: #333;line-height: 24px;margin: 6px 0;text-align:justify}
1197 
.list_image,.item-btn{overflow: hidden;}
1197 
.list_image,.item-btn{overflow: hidden;}
1198 
.list_image li,.item-btn li{display: inline-block; overflow: hidden; width: 33.3%; -webkit-box-sizing: border-box;box-sizing: border-box;position: relative;}
1198 
.list_image li,.item-btn li{display: inline-block; overflow: hidden;float:left; width: 33.3%; -webkit-box-sizing: border-box;box-sizing: border-box;position: relative;}
1199 
.list_image li>.imgspan{display: block;width: 98%;height:90px;background-size: cover;background-position: center;}
1199 
.list_image li>.imgspan{display: block;width: 98%;height:90px;background-size: cover;background-position: center;}
1200 
@media only screen and (min-width:640px) and (max-width:980px)  {
 1200 
@media only screen and (min-width:640px) and (max-width:980px)  {
1201 
	.list_image li>.imgspan{height:140px;width: 96%;}
 1201 
	.list_image li>.imgspan{height:140px;width: 96%;}
1204 
	.list_image li>.imgspan{height:200px;width: 96%;}
1204 
	.list_image li>.imgspan{height:200px;width: 96%;}
1205 
}
1205 
}
1206 
.item-btn{margin:6px -16px -15px -15px;border-top:1px solid #e5e5e5;}
1206 
.item-btn{margin:6px -16px -15px -15px;border-top:1px solid #e5e5e5;}
1207 
.item-btn li{border-right:1px solid #e5e5e5;height: 36px;}
1207 
.item-btn li{border-right:1px solid #e5e5e5;height: 46px;}
1208 
.item-btn li>span{display: inline-block;width: 100%;text-align: center;color:#666;font-size:14px;padding:8px 0;}
1208 
.item-btn li>span{display: inline-block;width: 100%;text-align: center;color:#666;font-size:14px;padding:8px 0;}
1209 
.item-btn li.answered>span{color:#FF0000}
1209 
.item-btn li.answered>span{color:#FF0000}
1210 
.item-btn li.collectBtn>span{position:absolute;width:20px;left:50%;margin-left:-10px;top:5px;}
1210 
.item-btn li.collectBtn>span{position:absolute;width:20px;left:50%;margin-left:-10px;top:5px;}

+ 1 - 1
app/html/qa-my-wenda.html
查看文件

9 
		<link href="../css/mui.min.css" rel="stylesheet" />
9 
		<link href="../css/mui.min.css" rel="stylesheet" />
10 
		<link href="../css/iconfont.css" rel="stylesheet" />
10 
		<link href="../css/iconfont.css" rel="stylesheet" />
11 
		<link href="../css/app.css" rel="stylesheet" />
11 
		<link href="../css/app.css" rel="stylesheet" />
12 
		<script src="../js/public/zepto.min.js"></script>
12 
		<script src="../js/public/jquery-1.11.1.js"></script>
13 
	</head>
13 
	</head>
14
14
15 
	<body>
15 
	<body>

+ 1 - 0
app/html/qa-waiting-a_sub.html
查看文件

10 
		<link href="../css/mui.min.css" rel="stylesheet" />
 10 
		<link href="../css/mui.min.css" rel="stylesheet" />
11 
		<link href="../css/iconfont.css" rel="stylesheet" />
 11 
		<link href="../css/iconfont.css" rel="stylesheet" />
12 
		<link href="../css/app.css" rel="stylesheet" />
 12 
		<link href="../css/app.css" rel="stylesheet" />
13 
		<script src="../js/public/jquery-1.11.1.js"></script>
13 
	</head>
 14 
	</head>
14
15
15 
	<body>
 16 
	<body>

+ 3 - 1
app/js/moreItem.js
查看文件

150 
						success: function(data) {
150 
						success: function(data) {
151 
							if(data.success) {
151 
							if(data.success) {
152 
								plus.nativeUI.toast("该回答已删除", toastStyle);
152 
								plus.nativeUI.toast("该回答已删除", toastStyle);
153 
								mui.back();
153 
								var w1 = plus.webview.getWebviewById('qa-answer-show.html');
154 
							  	plus.webview.close(self);
155 
							  	plus.webview.close(w1);
154 
							}
156 
							}
155 
						}
157 
						}
156 
					});
158 
					});

+ 5 - 3
app/js/qa-answer-show.js
查看文件

12 
		plus.nativeUI.closeWaiting();
 12 
		plus.nativeUI.closeWaiting();
13 
		self.show("slide-in-right", 150);
 13 
		self.show("slide-in-right", 150);
14 
		var answerId = self.anid;
 14 
		var answerId = self.anid;
15 
		var flag=0;
15
16
16 
		var oAjax = function(url, dataS, otype, oFun) {
 17 
		var oAjax = function(url, dataS, otype, oFun) {
17 
				mui.ajax(baseUrl + url, {
 18 
				mui.ajax(baseUrl + url, {
40 
						ifcollectionAbout($da.uid,oattenSpan, 1,1);
 41 
						ifcollectionAbout($da.uid,oattenSpan, 1,1);
41 
					}else{
 42 
					}else{
42 
						isAgree($da.uid);
 43 
						isAgree($da.uid);
44 
						flag=1
43 
					}
 45 
					}
44 
					proinfo($da.uid)
 46 
					proinfo($da.uid)
45 
					questioninfo($da.qid)
 47 
					questioninfo($da.qid)
107 
					var webviewShow = plus.webview.create("../html/moreItem.html", 'moreItem.html', {}, {
 109 
					var webviewShow = plus.webview.create("../html/moreItem.html", 'moreItem.html', {}, {
108 
						proid: answerId,
 110 
						proid: answerId,
109 
						quid:document.getElementById("questTit").getAttribute("data-id"),
 111 
						quid:document.getElementById("questTit").getAttribute("data-id"),
110 
						flag:1,
112 
						flag:flag,
111 
						name: "answer",
 113 
						name: "answer",
112 
						data: {
 114 
						data: {
113 
							content: document.getElementById("answerCnt").innerHTML.substring(0, 40),
 115 
							content: document.getElementById("answerCnt").innerHTML.substring(0, 40),
114 
							title: document.getElementById("questTit").innerHTML,
 116 
							title: document.getElementById("questTit").innerHTML,
115 
							href: baseUrl + "/e/d.html?id=" + answerId,
117 
							href: baseUrl + "/e/da.html?id=" + answerId,
116 
							thumbs: [oUrl]
 118 
							thumbs: [oUrl]
117 
						},
 119 
						},
118 
						weiboData: {
 120 
						weiboData: {
119 
							content: document.getElementById("questTit").innerHTML + baseUrl + "/e/d.html?id=" + answerId,
121 
							content: document.getElementById("questTit").innerHTML + baseUrl + "/e/da.html?id=" + answerId,
120 
						}
 122 
						}
121 
					})
 123 
					})
122 
				})
 124 
				})

+ 2 - 2
app/js/qa-my-wenda.js
查看文件

249 
			answerModule: function(dataStr, liStr) {
249 
			answerModule: function(dataStr, liStr) {
250 
				var hd = "",hl="";
250 
				var hd = "",hl="";
251 
				if(dataStr.agree > 0) {
251 
				if(dataStr.agree > 0) {
252 
					hd = '<span>'+dataStr.agree+' 赞</span>'
252 
					hd = '<span>'+dataStr.agree+'赞</span>'
253 
				}
253 
				}
254 
				if(dataStr.ballot > 0){
254 
				if(dataStr.ballot > 0){
255 
					hl='<span>'+dataStr.ballot+' 留言</span>'
255 
					hl='<span>'+dataStr.ballot+'留言</span>'
256 
				}
256 
				}
257 
				liStr.setAttribute("data-id", dataStr.id);
257 
				liStr.setAttribute("data-id", dataStr.id);
258 
				liStr.className = "mui-table-view-cell";
258 
				liStr.className = "mui-table-view-cell";

+ 35 - 13
app/js/qa-my-wendaTT.js
查看文件

245 
                    '<div class="madiaHead qa-Head" style="background-image:url(' + baImg + ')"></div>' +
 245 
                    '<div class="madiaHead qa-Head" style="background-image:url(' + baImg + ')"></div>' +
246 
                    '<div class="madiaInfo OmadiaInfo">' +
 246 
                    '<div class="madiaInfo OmadiaInfo">' +
247 
                    '<p class="mui-ellipsis-2 h1Font">' + dataStr.title + '</p>' +
 247 
                    '<p class="mui-ellipsis-2 h1Font">' + dataStr.title + '</p>' +
248 
                    '<p class="show-item mui-ellipsis h2Font">' + hd + '<span>N 关注</span></p>' +
249 
                    '</div></div>'
250 
            },
248 
                    '<p class="show-item mui-ellipsis h2Font">' + hd + '<span class="attendCount"></span></p>' +
249 
				'</div></div>'
250 
				var $str = $(liStr);
251 
				attendCount(dataStr.id, $str);
252 
	        },
253 
			attendCount=function(id, $str) {
254 
				oAjaxGet("/ajax/watch/countProfessor", {
255 
					id:id,
256 
					type: 8
257 
				}, "get", function(data) {
258 
					if(data.success) {
259 
						if(data.data > 0) {
260 
							$str.find(".attendCount").html(data.data + "关注");
261 
						}
262 
					}
263 
				})
264 
			},
251 
            answerModule = function (dataStr, liStr) {
 265 
            answerModule = function (dataStr, liStr) {
252 
                var hd = "", hl = "";
266 
                var hd = "";
253 
                if (dataStr.agree > 0) {
 267 
                if (dataStr.agree > 0) {
254 
                    hd = '<span>' + dataStr.agree + ' 赞</span>'
255 
                }
256 
                if (dataStr.ballot > 0) {
257 
                    hl = '<span>' + dataStr.ballot + ' 留言</span>'
268 
                    hd = '<span>' + dataStr.agree + '赞</span>'
258 
                }
 269 
                }
259 
                liStr.setAttribute("data-id", dataStr.id);
 270 
                liStr.setAttribute("data-id", dataStr.id);
260 
                liStr.className = "mui-table-view-cell";
 271 
                liStr.className = "mui-table-view-cell";
261 
                var str = '<div class="madiaInfo">' +
272 
                liStr.innerHTML = '<div class="madiaInfo">' +
262 
                    '<p class="h1Font mui-ellipsis-2 qa-question"></p>' +
 273 
                    '<p class="h1Font mui-ellipsis-2 qa-question"></p>' +
263 
                    '<div class="flexCenter qa-owner"></div>' +
 274 
                    '<div class="flexCenter qa-owner"></div>' +
264 
                    '<p class="qa-con mui-ellipsis-5">' + dataStr.cnt + '</p>' +
 275 
                    '<p class="qa-con mui-ellipsis-5">' + dataStr.cnt + '</p>' +
265 
                    '<div class="showli mui-ellipsis">' +
 276 
                    '<div class="showli mui-ellipsis">' +
266 
                    '<span>' + commenTime(dataStr.createTime) + '</span>' + hd + hl +
277 
                    '<span>' + commenTime(dataStr.createTime) + '</span>' + hd +'<span class="leaveMsgCount"></span>'+
267 
                    '</div>' +
 278 
                    '</div>' +
268 
                    '</div>'
 279 
                    '</div>'
269 
                var $str = $(str)
270 
                $str.appendTo(liStr);
280 
              	var $str = $(liStr);
271 
                questioninfo(dataStr.qid, $str);
 281 
                questioninfo(dataStr.qid, $str);
272 
                proinfo(dataStr.uid, $str);
 282 
                proinfo(dataStr.uid, $str);
273
283 
				leaveMsgCount(dataStr.id, $str);
274 
            },
 284 
            },
285 
			leaveMsgCount=function(id, $str) {
286 
				oAjax("/ajax/leavemsg/count", {
287 
					sid:id,
288 
					stype: "4"
289 
				}, "get", function(data) {
290 
					if(data.success) {
291 
						if(data.data > 0) {
292 
							$str.find(".leaveMsgCount").html(data.data + "留言");
293 
						}
294 
					}
295 
				})
296 
			},
275 
            insertAfter = function (newStr, targetE) {
 297 
            insertAfter = function (newStr, targetE) {
276 
                var parent = document.getElementById(targetE).parentNode;
 298 
                var parent = document.getElementById(targetE).parentNode;
277 
                var kong = document.createElement("div");
 299 
                var kong = document.createElement("div");

+ 1 - 1
app/js/qa-question-show.js
查看文件

212 
				var hd = "",
 212 
				var hd = "",
213 
					hl = "";
 213 
					hl = "";
214 
				if(dataStr.agree > 0) {
 214 
				if(dataStr.agree > 0) {
215 
					hd = '<span>' + dataStr.agree + ' 赞</span>'
215 
					hd = '<span>' + dataStr.agree + '赞</span>'
216 
				}
 216 
				}
217 
				liStr.setAttribute("data-id", dataStr.id);
 217 
				liStr.setAttribute("data-id", dataStr.id);
218 
				liStr.className = "mui-table-view-cell";
 218 
				liStr.className = "mui-table-view-cell";

+ 15 - 1
app/js/qa-waiting-a.js
查看文件

83 
				'<div class="madiaHead qa-Head" style="background-image:url(' + baImg + ')"></div>' +
83 
				'<div class="madiaHead qa-Head" style="background-image:url(' + baImg + ')"></div>' +
84 
				'<div class="madiaInfo OmadiaInfo">' +
84 
				'<div class="madiaInfo OmadiaInfo">' +
85 
				'<p class="mui-ellipsis-2 h1Font">' + dataStr.title + '</p>' +
85 
				'<p class="mui-ellipsis-2 h1Font">' + dataStr.title + '</p>' +
86 
				'<p class="show-item mui-ellipsis h2Font">' + hd + '<span>N 关注</span></p>' +
86 
				'<p class="show-item mui-ellipsis h2Font">' + hd + '<span class="attendCount"></span></p>' +
87 
				'</div></div>'
87 
				'</div></div>'
88 
			var $str = $(liStr);
89 
			attendCount(dataStr.id, $str);
90 
        },
91 
		attendCount=function(id, $str) {
92 
			oAjax("/ajax/watch/countProfessor", {
93 
				id:id,
94 
				type: 8
95 
			}, "get", function(data) {
96 
				if(data.success) {
97 
					if(data.data > 0) {
98 
						$str.find(".attendCount").html(data.data + "关注");
99 
					}
100 
				}
101 
			})
88 
		},
102 
		},
89 
		inviteStatus = function(id, $str) {
103 
		inviteStatus = function(id, $str) {
90 
			oAjax("/ajax/question/invite", {
104 
			oAjax("/ajax/question/invite", {