Browse Source

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

jack 7 years ago
parent
commit
2f20bb6de2

+ 3 - 3
app/html/attentions-list.html

@ -11,12 +11,12 @@
11 11
    
12 12
</head>
13 13
<body>
14
	
14
	
15 15
	<div class="mui-content mui-scroll-wrapper" id="pullrefresh" >
16 16
		<div class="mui-scroll"> 
17 17
	        <div  class="mui-card-content conblock">
18
		      	<ul class="mui-table-view protable list">
19
			           
18
		      	<ul class="mui-table-view protable list">
19
			           
20 20
			    </ul>
21 21
			    <div class="nodatabox" style="display:none; background: #f4f6f8;margin: 0; " id="nodatabox1">
22 22
			        <div class="nodata">

+ 3 - 3
app/html/attentions-list2.html

@ -10,12 +10,12 @@
10 10
    <link href="../css/app.css" rel="stylesheet"/>
11 11
</head>
12 12
<body>
13
	
13
	
14 14
	<div class="mui-content mui-scroll-wrapper" id="pullrefresh" >
15 15
		<div class="mui-scroll"> 
16 16
	        <div  class="mui-card-content conblock">
17
		      	<ul class="mui-table-view protable list">
18
			           
17
		      	<ul class="mui-table-view protable list">
18
			           
19 19
			    </ul>
20 20
			    <div class="nodatabox" style="display:none; background: #f4f6f8;margin: 0; " id="nodatabox1">
21 21
			        <div class="nodata">

+ 6 - 1
app/html/needIssue.html

@ -34,8 +34,13 @@
34 34
						<li><label>请选择您的需求类型<em class="requiredcon"></em></label></li>
35 35
						<li class="divideSpace" id="navsubTo" style="padding-left:0">
36 36
							<ul class="boxnav boxnavTo chooseBox">
37
<<<<<<< HEAD
38
								<li><span class='checkNow'>个人需求</span></li><!--选中状态checkNow-->
39
								<li><span class='checkNo'>企业需求</span></li><!--不可用状态checkNo-->
40
=======
37 41
								<li><span id="oGe">个人需求</span></li><!--选中状态checkNow-->
38 42
								<li><span id="oQi">企业需求</span></li><!--不可用状态checkNo-->
43
>>>>>>> refs/remotes/origin/dev
39 44
							</ul>
40 45
							<div class="littipCh">
41 46
								<div class="littip">注:当企业入驻科袖后,企业的关联用户将可以发布企业需求</div>
@ -87,4 +92,4 @@
87 92
		<script type="text/javascript" src="../js/needIssue.js"></script>
88 93
	</body>
89 94
90
</html>
95
</html>

+ 1 - 1
app/index.html

@ -85,4 +85,4 @@
85 85
	});
86 86
</script>
87 87
</body>
88
</html>
88
</html>

+ 1 - 1
app/js/professorArticle.js

@ -545,4 +545,4 @@ mui.plusReady(function() {
545 545
			}
546 546
		});
547 547
	}
548
});
548
});

+ 2 - 2
app/js/proinfobrow.js

@ -382,7 +382,7 @@ mui.plusReady(function() {
382 382
						string += '<img class="resImg headRadius" src="../images/default-artical.jpg">'
383 383
					}
384 384
					string += '</div><div class="mui-media-body centerTit">'
385
					string += '<span class="listtit mui-ellipsis-2" >' + $data[i].articleTitle + '</span>'
385
					string += '<span class="listtit mui-ellipsis-2">' + $data[i].articleTitle + '</span>'
386 386
					string += '</div></a></li>'
387 387
					html.push(string);
388 388
				}
@ -695,4 +695,4 @@ mui.plusReady(function() {
695 695
	}
696 696
	/*图像预览*/
697 697
	mui.previewImage();
698
});
698
});