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

app/html/qa-answer-q.html

		</header>
		<div class="mui-content">
			<div class="littip-top">使用电脑登录科袖网 www.ekexiu.com<br />可以获得更好的回答体验</div>
			<div class="mui-input-group mainbox">
				<div class="infocon">
					<textarea class="textareabox simulation" id="question" placeholder="请填写回答内容"></textarea>
			<div class="mui-input-group mainbox" style="height: 80%;">
				<div class="infocon" style="height:100%;">
					<textarea class="textareabox simulation" style="height:100%;" id="question" placeholder="请填写回答内容"></textarea>
				</div>
		    </div>
		</div>

app/js/discoverNew.js

		"7": 0,
		"8": 0
	}
	var QAtime, QAid, QArows = 2,fTime,fId,fEx;
	var QAtime, QAid, QArows = 20,fTime,fId,fEx;
	$.ready(function() {
		$.plusReady(function() {
			var userid = plus.storage.getItem('userid');
						traditional: true,
						async: true,
						success: function(data) {
							console.log(JSON.stringify(data) + obj.url)
							//console.log(JSON.stringify(data) + obj.url)
							if(obj.sele) {
								obj.fun.call(obj.sele, data);
							} else {

app/js/qa-answer-show.js

		self.show("slide-in-right", 150);
		var answerId = self.anid;
		var flag=0;
		var answerTit=""
		
		var oAjax = function(url, dataS, otype, oFun) {
				mui.ajax(baseUrl + url, {
					document.getElementById("answerTime").innerHTML = commenTime($da.createTime);
					document.getElementById("snum").innerHTML = $da.agree;
					if($da.cnt) {
						answerTit=$da.cnt
						document.getElementById("answerCnt").innerHTML = ($da.cnt).replace(/\n/g,"<br />");
					}
					if(userid != $da.uid) {
						flag:flag,
						name: "answer",
						data: {
							content: document.getElementById("answerCnt").innerHTML.substring(0, 70),
							content: answerTit.substring(0, 70),
							title: document.getElementById("questTit").innerHTML,
							href: baseUrl + "/e/da.html?id=" + answerId,
							thumbs: [oUrl]

app/js/qa-question-show.js

	var ocollectBtn = document.getElementById("collectBtn"),
		oanswer = document.getElementsByClassName("go-answer")[0],
		yaoanswer = document.getElementsByClassName("invite-answer")[0];
	var rows = 2,
	var rows = 20,
		ifkong=1,
		ifAl=1,//是否是首次加载
		dataO = {
						ifAl = 0;
					}
					if($info.length > 0) {
						removeAfter(aimId)
						if(byway == 1) {
							dataO.score = $info[$info.length - 1].score;
							dataO.id = $info[$info.length - 1].id;

app/js/qa-request-da.js

mui.ready(function() {
	var qid, userid, username;
	var rows = 2,
	var rows = 20,
		pageNum=1,
		dataC = {
			count: "",

app/js/qa-waiting-a.js

mui.ready(function() {
	var rows = 2,
	var rows = 20,
		dataC = {
			time: "",
			id: ""