ホーム エスクプローラ ヘルプ
登録 サインイン
bulomakaka
/
ekexiu.app
Watch 2
Star 1
Fork 0
コード 課題 0 プルリクエスト 0 コミット 746 リリース 0 Wiki
ソースを参照

Merge branch 'dev' of
http://121.42.53.174:3000/bulomakaka/ekexiu.app.git into dev

Conflicts:
app/html/paperShow.html

luyanan 7 年 前
親
4b0ca74cb3 4c426c6d0d
コミット
efa22d1170
共有3 個のファイルを変更した、100 個の追加 と 8 個の削除を含む
分割表示 差分情報を表示
  1. 3 2
      app/css/app.css
  2. 38 1
      app/html/paperShow.html
  3. 59 5
      app/html/patentShow.html

+ 3 - 2
app/css/app.css
ファイルの表示 

@ -331,7 +331,8 @@ ul.boxnav li.set span:before{font-family:"iconfont";content: "\e733";font-size:1
331 331 
.peocount:before{position: absolute;right: 0; top: 0;left: 15px; height: 1px; content: ''; -webkit-transform: scaleY(.5); transform: scaleY(.5);background-color: #c8c7cc;}
332 332 
.levelbox{margin: auto; overflow: hidden; }
333 333 
.levelbox .mui-icon{ font-size: 14px; color: #CCCCCC;}
334 
.levelbox .icon-favorfill{ color:#F4C600;}
334 
.icon-favorfill{ color:#F4C600;}
335 
.starShow{position: absolute;right: 0;top:50%; margin-top:-8px;overflow: hidden;}
335 336 
/*专家相关信息*/
336 337 
.infocontit{font-size:16px;line-height: 40px;min-height:40px;border-bottom: 1px solid #E5E5E5; position: relative;padding-left: 26px;color:#333}
337 338 
.infocontit:before{position:absolute;top:50%;margin-top:-10px;left: 15px;;display:inline-block;content:"";width:4px;height:18px;border-radius:10px;background:#ff9900;}

@ -1095,7 +1096,7 @@ ul.tagList>li .h2Font{color: #666; -webkit-user-select:text;}
1095 1096 
.madiaBlock .madiaHead.useHead{width: 50px;height:50px;margin-top:-25px;background-image: url(../images/default-photo.jpg);border-radius: 50%;}
1096 1097 
.madiaBlock .madiaHead.resouseHead{background-image: url(../images/default-resource.jpg);}
1097 1098 
.madiaBlock .madiaHead.artHead{background-image: url(../images/default-artical.jpg);}
1098 
.madiaBlock .madiaHead.cmpHead{width: 50px;height:50px;margin-top:-25px;background:#FFFFFF;border-radius:0;}
1099 
.madiaBlock .madiaHead.cmpHead{width:90px;height:60px;margin-top:-30px;background:#FFFFFF;border-radius:0;}
1099 1100 
.madiaBlock .madiaHead.paperHead{background-image: url(../images/default-paper.jpg);}
1100 1101 
.madiaBlock .madiaHead.patentHead{background-image: url(../images/default-patent.jpg);}
1101 1102 
.madiaBlock .madiaInfo{padding-left:62px; width: 100%;padding-right:6px;}

+ 38 - 1
app/html/paperShow.html
ファイルの表示 

@ -87,6 +87,43 @@
87 87
88 88 
				    </ul>
89 89 
				</div>
90 
				<div class="madiaBlock " id="patentModule">
91 
						<div class="madiaTit">相关专利</div>
92 
						<ul class="mui-table-view" id="patentList">
93 
					       <li class="mui-table-view-cell">
94 
						       	<div class="flexCenter OflexCenter mui-clearfix">
95 
									<div class="madiaHead patentHead"></div>
96 
									<div class="madiaInfo OmadiaInfo">
97 
										<p class="mui-ellipsis h1Font">CdS/CdSSe轴向异质结纳米线的非对称光波导及双波长激射</p>
98 
										<p class="mui-ellipsis h2Font">作者：李丹,梁君武,刘华伟,张学红,万强,张清林,潘安练</p>
99 
									</div>
100 
								</div>
101 
					       </li>
102 
					    </ul>
103 
				</div>
104 
				<div class="thumbBlock">
105 
						<span class="thumbBtn">赞 <span id="snum"></span></span><!-- thumbedBtn 已赞 201-->
106 
				</div>
107 
				<div class="madiaBlock " id="paperModule">
108 
						<div class="madiaTit">您可能感兴趣的论文</div>
109 
						<ul class="mui-table-view" id="paperList">
110 
							<li class="mui-table-view-cell">
111 
						       	<div class="flexCenter OflexCenter mui-clearfix">
112 
									<div class="madiaHead paperHead"></div>
113 
									<div class="madiaInfo OmadiaInfo">
114 
										<p class="mui-ellipsis h1Font">CdS/CdSSe轴向异质结纳米线的非对称光波导及双波长激射</p>
115 
										<p class="mui-ellipsis h2Font">作者：李丹,梁君武,刘华伟,张学红,万强,张清林,潘安练</p>
116 
									</div>
117 
								</div>
118 
					      </li>
119 
					    </ul>
120 
				</div>
121 
				<div class="madiaBlock" style="padding-bottom:50px;">
122 
						<div class="madiaTit" id="olisten">留言</div>
123 
						<ul class="mui-table-view commentBlock noactiveTab">
124
125 
					   </ul>
126 
				</div>
90 127 
		    </div>
91 128 
		</div>
92 129 
		
@ -152,4 +189,4 @@
152 189 
		</script>
153 190 
	</body>
154 191
155 
</html>
192 
</html>

+ 59 - 5
app/html/patentShow.html
ファイルの表示 

@ -23,9 +23,18 @@
23 23 
			<a class="mui-icon iconfont icon-moreandroid mui-pull-right button topmore" id="BtnMore"></a>
24 24 
		</header>
25 25 
		<nav class="mui-bar mui-bar-tab footbox">
26 
			<div class="mui-row artfoot">
27 
				<div class="mui-col-xs-9">
28 
					<div class="consultdiv notopen">更多功能即将开放</div>
26 
			<div class="mui-row artfoot displayNone" id="textInput">
27 
				<div class="mui-col-xs-12">
28 
					<textarea name="" placeholder="说点什么吧…" id="textInputThis"></textarea>
29 
					<button class="mui-btn" disabled>发表</button>
30 
				</div>
31 
			</div>
32 
			<div class="mui-row artfoot" id="operCol">
33 
				<div class="mui-col-xs-8">
34 
					<div class="inputShow"><span>说点什么吧…</span></div>
35 
				</div>
36 
				<div class="mui-col-xs-1" id="listenClick">
37 
					<span class="mui-icon iconfontnew icon-liuyan"><em class="mui-badge"></em></span>
29 38 
				</div>
30 39 
				<div class="mui-col-xs-2" id="collectBtn">
31 40 
					<span class="mui-icon iconfontnew icon-shoucang" id="ifCollect"></span><!--已收藏 icon-yishoucang-->
 
@ -85,6 +94,43 @@
85 94
86 95 
				    </ul>
87 96 
				</div>
97 
				<div class="madiaBlock " id="paperModule">
98 
						<div class="madiaTit">相关论文</div>
99 
						<ul class="mui-table-view" id="paperList">
100 
					       <li class="mui-table-view-cell">
101 
						       	<div class="flexCenter OflexCenter mui-clearfix">
102 
									<div class="madiaHead paperHead"></div>
103 
									<div class="madiaInfo OmadiaInfo">
104 
										<p class="mui-ellipsis h1Font">CdS/CdSSe轴向异质结纳米线的非对称光波导及双波长激射</p>
105 
										<p class="mui-ellipsis h2Font">作者：李丹,梁君武,刘华伟,张学红,万强,张清林,潘安练</p>
106 
									</div>
107 
								</div>
108 
					      </li>
109 
					    </ul>
110 
				</div>
111 
				<div class="thumbBlock">
112 
						<span class="thumbBtn">赞 <span id="snum"></span></span><!-- thumbedBtn 已赞 201-->
113 
				</div>
114 
				<div class="madiaBlock " id="patentModule">
115 
						<div class="madiaTit">您可能感兴趣的专利</div>
116 
						<ul class="mui-table-view" id="patentList">
117 
							<li class="mui-table-view-cell">
118 
						       	<div class="flexCenter OflexCenter mui-clearfix">
119 
									<div class="madiaHead patentHead"></div>
120 
									<div class="madiaInfo OmadiaInfo">
121 
										<p class="mui-ellipsis h1Font">CdS/CdSSe轴向异质结纳米线的非对称光波导及双波长激射</p>
122 
										<p class="mui-ellipsis h2Font">作者：李丹,梁君武,刘华伟,张学红,万强,张清林,潘安练</p>
123 
									</div>
124 
								</div>
125 
					      </li>
126 
					    </ul>
127 
				</div>
128 
				<div class="madiaBlock" style="padding-bottom:50px;">
129 
						<div class="madiaTit" id="olisten">留言</div>
130 
						<ul class="mui-table-view commentBlock noactiveTab">
131
132 
					   </ul>
133 
				</div>
88 134 
		    </div>
89 135 
		</div>
90 136 
		
@ -110,19 +156,27 @@
110 156 
		<script src="../js/public/mui.zoom.js" type="text/javascript" charset="utf-8"></script>
111 157 
		<script src="../js/public/mui.previewimage.js" type="text/javascript" charset="utf-8"></script>
112 158 
		<script src="../js/public/base.js"></script>
159 
		<script src="../js/public/jquery-1.11.1.js"></script>
113 160 
		<script src="../js/patentShow.js"></script>
114 161 
		<script type="text/javascript">
162 
			document.getElementById("listenClick").addEventListener("tap",function(){
163 
				$(".mui-content").animate({"scrollTop": document.getElementById("olisten").offsetTop-20+"px"}, 400);
164 
			})
115 165 
			//处理iOS下弹出软键盘后头部会随页面的滚动条消失问题
116 166 
		    iosheader();
167 
		    mui("body").on("tap",".mui-content",function(){
168 
		    	document.getElementById("textInput").style.display="none";
169 
		    	document.getElementById("operCol").style.display="block";
170 
		    })
117 171
118 
		   // var BtnMore=document.getElementById("BtnMore");
172 
		    //var BtnMore=document.getElementById("BtnMore");
119 173 
		    var shareOut=document.getElementById("shareOut");
120 174 
		    var cancelShare=document.getElementById("cancelShare");
121 175 
		    var maskBlack=document.getElementById("maskBlack");
122 176 
		    var shareBlock=document.getElementById("shareBlock");
123 177
124 178
125 
		    /*BtnMore.addEventListener("tap",function(){
179 
		   /* BtnMore.addEventListener("tap",function(){
126 180 
		    	maskBlack.style.display="block";
127 181 
		    	shareBlock.style.display="block";
128 182 
		    })*/