浏览代码

修正bug

li 7 年之前
父节点
当前提交
7747b3f51c
共有 4 个文件被更改,包括 33 次插入20 次删除
  1. 1 1
      app/html/discoverNew.html
  2. 12 3
      app/html/inform-sub.html
  3. 17 13
      app/js/discoverNew.js
  4. 3 3
      app/js/inform.js

+ 1 - 1
app/html/discoverNew.html

@ -158,7 +158,7 @@
158 158
						<div class="mui-scroll-wrapper">
159 159
							<div class="mui-scroll">
160 160
								<div class="scroll-view">
161
									<div class="btnLinkBox qa-btnlink mui-clearfix">
161
									<div class="btnLinkBox qa-btnlink mui-clearfix"style="position:relative;">
162 162
										<div class="qa-top">
163 163
											<div class="unlogin displayNone">马上登录,参与问答</div>
164 164
											<div class="onlogin mui-navigate-right displayNone" id="my-q&a">

+ 12 - 3
app/html/inform-sub.html

@ -9,9 +9,18 @@
9 9
		<link rel="stylesheet" type="text/css" href="../css/iconfont.css" />
10 10
		<link href="../css/app.css" rel="stylesheet" />
11 11
		<style>
12
			.h2Font.mui-ellipsis-2>span{
12
			.h2Font>span{
13 13
				color:#FF9900;
14 14
			}
15
			.sty {
16
				background-image: url(../images/default-photo.jpg);
17
				width: 50px;
18
    			height: 50px;
19
    			border-radius: 50%;
20
    			position:absolute;
21
    			background-position: center;
22
    			background-size: cover;
23
			}
15 24
		</style>
16 25
	</head>
17 26

@ -20,11 +29,11 @@
20 29
			<div class="mui-scroll">
21 30
				<div class="infocon madiaBlock">
22 31
					<ul class="mui-table-view consultList" id="consultList">
23
						<!--<li class="mui-table-view-cell" style="height:80px;">
32
						<!--<li class="mui-table-view-cell" style="height:100%;">
24 33
							<div class="madiaHead useHead" style="background-image:url(../images/default-photo.jpg)"></div>
25 34
							<div class="madiaInfo">
26 35

27
								<div class="h2Font mui-ellipsis-2" style="color: #333;font-weight: 400;">这里显示对话的最后一条消息,天个人似乎突然今天个人似<span style="color:#ff9900">记得记得就到家</span>乎突然今天跟顶顶顶顶付付毒贩夫妇付付i</div>
36
								<div class="h2Font" style="color: #333;font-weight: 400;">这里显示对话的最后一条消息,天个人似乎突然今天个人似<span style="color:#ff9900">记得记得就到家</span>乎突然今天跟顶顶顶顶付付毒贩夫妇付付i</div>
28 37
								<div class="h3Font" style="margin: 5px 0;">
29 38
									8月17日 18:00
30 39
								</div>

+ 17 - 13
app/js/discoverNew.js

@ -501,7 +501,19 @@
501 501
                                }
502 502
                            }
503 503
						}
504
504
						if(m == 0) {
505
								if(!arguments[1]) {
506
									if(pullObj["0"] == 1) {
507
										key1[m].endPullDownToRefresh();
508
										pullObj[m] = 0;
509
									}
510
								}
511
							} else {
512
								if(pullObj[m] == 1) {
513
									key1[m].endPullDownToRefresh();
514
									pullObj[m] = 0;
515
								}
516
							}
505 517
						for(var i = 0; i < $data.length; i++) {
506 518
							var of ;
507 519
                            if ($data[i].articleType == 1 || $data[i].ctype == "1") {
@ -528,22 +540,13 @@
528 540
529 541
									colSpan = '<span class="column">置顶</span>'
530 542
								} else {
531
									if(pullObj["0"] == 1) {
532
533
										key1[m].endPullDownToRefresh();
534
										pullObj[m] = 0;
535
									}
543
									
536 544
									if($data[i].ctype == "3"){
537 545
                                        colSpan = "<span class='column columnOther'>问答</span>"
538 546
									}else if($data[i].col != 0) {
539 547
                                        colSpan = "<span class='column columnOther'>" + columnType[$data[i].col].shortName + "</span>"
540 548
                                    }
541 549
								}
542
							} else {
543
								if(pullObj[m] == 1) {
544
									key1[m].endPullDownToRefresh();
545
									pullObj[m] = 0;
546
								}
547 550
							}
548 551
							var li = document.createElement("li");
549 552
                            if (m == 0 && !arguments[1]) {
@ -696,11 +699,12 @@
696 699
								$data.length = 1;
697 700
							}
698 701
						}
699
						for(var i = 0; i < $data.length; i++) {
700
							if(pullObj[m] == 1) {
702
						if(pullObj[m] == 1) {
701 703
								key1[m].endPullDownToRefresh();
702 704
								pullObj[m] = 0;
703 705
							}
706
						for(var i = 0; i < $data.length; i++) {
707
							
704 708
							var liStr = document.createElement("li");
705 709
							liStr.className = "mui-table-view-cell";
706 710
							liStr.setAttribute("data-id", $data[i].id);

+ 3 - 3
app/js/inform.js

@ -108,10 +108,10 @@ function informHtml($data) {
108 108
		console.log($data[i].readed);
109 109
		var li = document.createElement("li");
110 110
		li.className = "mui-table-view-cell";
111
		li.style.height = "80px";
112
		li.innerHTML = '<div class="madiaHead useHead" style="../images/default-photo.jpg" data-id="' + $data[i].uid + '"></div>' +
111
		li.style.height = "100%";
112
		li.innerHTML = '<div class="sty" data-id="' + $data[i].uid + '"></div>' +
113 113
			'<div class="madiaInfo">' +
114
			'<div class="h2Font mui-ellipsis-2" style="color: #333;font-weight: 400;">' + $data[i].cnt + '</div>' +
114
			'<div class="h2Font" style="color: #333;font-weight: 400;">' + $data[i].cnt + '</div>' +
115 115
			'<div class="h3Font" style="margin: 5px 0;">' + commenTime($data[i].createTime) + '</div></div>'
116 116
		li.getElementsByClassName("madiaInfo")[0].setAttribute("data-obj", par);
117 117
		document.getElementById("consultList").appendChild(li);