Inicio Explorar Ayuda
Registro Iniciar sesión
jiapeng
/
portal-front
Vigilar 3
Destacar 0
Fork 0
Código Incidencias 0 Pull Requests 0 Commits 510 Releases 0 Wiki
Explorar el Código

工作台，资源，文章相关

luyanan %!s(int64=7) %!d(string=hace) años
padre
2a4a2021ec
commit
91aa6534ef
Se han modificado 23 ficheros con 65 adiciones y 67 borrados
Dividir vista Mostrar estadísticas de diff
  1. 1 1
      articalIssue.html
  2. 1 1
      articalModify.html
  3. 1 1
      cmp-portal/articalIssue.html
  4. 2 2
      cmp-portal/articalModify.html
  5. 19 20
      cmp-portal/css/cmpindex.css
  6. BIN
      cmp-portal/images/g_article_button_xiugai_lan_hig.png
  7. 2 4
      cmp-portal/resourceIssue.html
  8. 30 27
      css/genindex.css
  9. 2 2
      css/workspace.css
  10. BIN
      images/g_all_icon_shoucang_hig.png
  11. BIN
      images/g_all_icon_shoucang_nor_2.png
  12. BIN
      images/g_all_icon_weixin_hig.png
  13. BIN
      images/g_all_icon_weixin_nor_2.png
  14. BIN
      images/g_all_icon_xinlang_hig.png
  15. BIN
      images/g_all_icon_xinlang_nor_2.png
  16. BIN
      images/g_article_button_shanchu_hig.png
  17. BIN
      images/g_article_button_xiugai_hig.png
  18. BIN
      images/g_article_icon_fanbu_nor.png
  19. 3 2
      js/articalShow.js
  20. 1 1
      js/resourcePreview.js
  21. 1 1
      myDemand.html
  22. 1 4
      resourceIssue.html
  23. 1 1
      workspaces.html

+ 1 - 1
articalIssue.html
Ver fichero 

@ -56,7 +56,7 @@
56 56 
	        					<!--未上传图片时-->
57 57 
	        					<div class="upFront">
58 58 
		        					<p>文章封面图片<em class="requiredcon">*</em></p>
59 
		        					<p>JPG/PNG格式，2M以内</p>
59 
		        					<p class="uploadtip">JPG/PNG格式，2M以内</p>
60 60 
		        					<span class="upbtn">上传图片</span>
61 61 
	        					</div>
62 62 
	        					<!--已上传图片时-->

+ 1 - 1
articalModify.html
Ver fichero 

@ -58,7 +58,7 @@
58 58 
	        					<!--未上传图片时-->
59 59 
	        					<div class="upFront">
60 60 
		        					<p>文章封面大图<em class="requiredcon">*</em></p>
61 
		        					<p>JPG/PNG格式，2M以内。</p>
61 
		        					<p class="uploadtip">JPG/PNG格式，2M以内</p>
62 62 
		        					<span class="upbtn">上传图片</span>
63 63 
	        					</div>
64 64 
	        					<!--已上传图片时-->

+ 1 - 1
cmp-portal/articalIssue.html
Ver fichero 

@ -56,7 +56,7 @@
56 56 
	        					<!--未上传图片时-->
57 57 
	        					<div class="upFront">
58 58 
		        					<p>文章封面图片<em class="requiredcon">*</em></p>
59 
		        					<p>JPG/PNG格式，2M以内</p>
59 
		        					<p class="uploadtip">JPG/PNG格式，2M以内</p>
60 60 
		        					<span class="upbtn">上传图片</span>
61 61 
	        					</div>
62 62 
	        					<!--已上传图片时-->

+ 2 - 2
cmp-portal/articalModify.html
Ver fichero 

@ -57,8 +57,8 @@
57 57 
       							<span class="" id="filePicker">上传图片</span>
58 58 
	        					<!--未上传图片时-->
59 59 
	        					<div class="upFront">
60 
		        					<p>文章封面大图<em class="requiredcon">*</em></p>
61 
		        					<p>JPG/PNG格式，2M以内。</p>
60 
		        					<p>文章封面图片<em class="requiredcon">*</em></p>
61 
		        					<p class="uploadtip">JPG/PNG格式，2M以内</p>
62 62 
		        					<span class="upbtn">上传图片</span>
63 63 
	        					</div>
64 64 
	        					<!--已上传图片时-->

+ 19 - 20
cmp-portal/css/cmpindex.css
Ver fichero 

@ -302,7 +302,7 @@ ul.cmpAllUl.cmpArticalul.cmpArticalul2{width: 97%;margin:10px;}
302 302 
/*热门文章*/
303 303 
.hotThis{position:absolute;top:-5px;right:-5px;display:inline-block;width:63px;height:63px;background:url(../../images/g_article_bg_redu_nor.png);}
304 304
305 
.conBlock .rightconBox{width: 260px;}
305 
.conBlock .rightconBox{width: 260px;margin-left: 20px;}
306 306 
.conBlock .rightconBox .conItem{padding:30px;background: #FFFFFF;margin-bottom: 20px;}
307 307 
.conBlock .rightconBox .conItem:first-child{padding:30px 10px;border-top:4px #28b8fa solid;}
308 308 
ul.artAbout>li{clear:both;}
 
@ -312,6 +312,7 @@ ul.artAbout .uploadFile{line-height:28px;text-align: center;font-size: 16px;colo
312 312 
ul.artAbout .uploadFile .uploadblock{position:relative;width:100%;height:190px;padding:30px;border:1px solid #E5E5E5; border-radius: 0;
313 313 
	background-position:center;background-size:cover;background-repeat:no-repeat;}
314 314 
ul.artAbout .uploadFile .upFront{position:relative;}
315 
ul.artAbout .uploadFile .uploadtip{color:#999999}
315 316 
ul.artAbout .uploadFile input.upInp[type="file"]{position:absolute;height: 46px;width:60%;bottom:30px;left:50%;margin-left:-30%;outline: none;opacity: 0;cursor: pointer;z-index:20;}
316 317 
ul.artAbout .uploadFile .upbtn{display:inline-block;padding:7px 23px;background: #E5E5E5;color:#333333;margin-top:30px;}
317 318 
ul.artAbout .uploadFile .uploadblock .upBackbtn{position:absolute;bottom:30px;left:50%;margin-left:-55px;background:rgba(0,0,0,.5);color:#FFFFFF;z-index:10;display: none;}
 
@ -321,9 +322,9 @@ ul.artAbout #filePicker{position:absolute;left:50%; bottom:25px; margin-left:-52
321 322 
ul.artAbout .frmadd{width:auto;position:absolute;right:0;top:0;background: #28b8fa;color:#fff;border:none;padding:6px 25px;}
322 323
323 324 
.conItem ul.operateBlock{overflow: hidden;margin-top:-20px;}
324 
.conItem ul.operateBlock>li{font-size:16px; color:#666666;float:left;width:33.333%;margin-top:20px;text-align: center;cursor: pointer;}
325 
.conItem ul.operateBlock>li{font-size:15px; color:#666666;float:left;width:33.333%;margin-top:20px;text-align: center;cursor: pointer;}
325 326 
.conItem ul.operateBlock>li p{margin-top:6px;}
326 
.operateicon{display:inline-block;width:22px;height:22px;background-position: center;background-repeat: no-repeat;}
327 
.operateicon{display:inline-block;width:18px;height:18px;background-position: center;background-repeat: no-repeat;background-size: cover;}
327 328 
.operateicon.icon-issue{background-image:url(../images/g_article_icon_fabu_lan_hig.png);}
328 329 
.operateicon.icon-timeissue{background-image:url(../../images/g_article_icon_dingshi_nor.png);}
329 330 
.operateicon.icon-preview{background-image:url(../../images/g_article_icon_yulan_nor.png);}
 
@ -361,7 +362,7 @@ ul.artAbout .frmadd{width:auto;position:absolute;right:0;top:0;background: #28b8
361 362
362 363 
.form-result{margin:18px -30px 0 -30px;}
363 364 
.form-result>ul>li{position:relative;padding:12px 30px;min-height: 76px;}
364 
.form-result>ul>li .deleteThis{display:none;position:absolute;top:50%;margin-top:-20px;right:28px;width:40px;height:40px;background:url(../../images/g_article_button_shanchu_hig.png);background-size:cover;cursor:pointer;}
365 
.form-result>ul>li .deleteThis{display:none;position:absolute;top:50%;margin-top:-16px;right:28px;width:32px;height:32px;background:url(../../images/g_article_button_shanchu_hig.png);background-size:cover;cursor:pointer;}
365 366 
.form-result>ul>li:hover{background: #EEEEEE;}
366 367 
.form-result>ul>li:hover .deleteThis{display:block;}
367 368 
@ -396,24 +397,22 @@ ul.tagList>li .h2Font{color:#666}
396 397 
.form-item.otherShow .aboutRes .ellipsisSty-2{height:48px;}
397 398
398 399
399 
.rightconBox .conItem.conItemG .madiaHead{width: 120px; height: 120px;border:1px solid #E5E5E5;margin:0 auto 10px;background-position:center;background-size:cover;}
400 
.rightconBox .conItem.conItemG .madiaHead{width: 100px; height: 100px;border:1px solid #E5E5E5;margin:0 auto 10px;background-position:center;background-size:cover;}
400 401 
.rightconBox .conItem.conItemG .madiaHead.useHead{background-image:url(../../images/default-photo.jpg);border-radius: 50%;}
401 402 
.rightconBox .conItem.conItemG .madiaHead.cmpHead{background-image:url(../../images/default-icon.jpg);}
402 
.rightconBox .conItem.conItemG .h2Font{font-size:16px;color:#666;line-height:26px;}
403 
.rightconBox .conItem.conItemG .h1Font{font-size:16px;}
404 
.rightconBox .conItem.conItemG .h2Font{font-size:14px;color:#666;line-height:26px;}
403 405 
.rightconBox .conItem.conItemG .h3Font>a{color:#333}
404 
.rightconBox .conItem.conItemG .goSpan span{background: #28b8fa;display:inline-block;width:100px;cursor:pointer;color:#fff;font-size:16px;margin:20px 10px 0;}
405 
.rightconBox .conItem.conItemG .attenSpan{position: relative;padding:9px 25px;padding-left:42px;}
406 
.rightconBox .conItem.conItemG .attenSpan:before{position:absolute;content:url(../images/g_article_icon_jia_nor.png);top:50%;left:20px;margin-top:-8px;}
407 
.rightconBox .conItem.conItemG .consultSpan{padding:9px 25px;}
408 406 
/*文章列表*/
409 407 
.itemListCon{background: #fff;}
410 408 
.itemListBolck .searchAbout{position: relative;}
411 
.itemListBolck .searchAbout .searchSpan{position:absolute;top:50%;margin-top:-9px;right:18px;display:inline-block;width:18px;height:18px;background: url(../../images/g_article_icon_sousuo_nor.png);cursor: pointer;}
409 
.itemListBolck .searchAbout .frmcontype{height: 36px;font-size: 14px;}
410 
.itemListBolck .searchAbout .searchSpan{position:absolute;top:50%;margin-top:-9px;right:18px;display:inline-block;width:16px;height:16px;background: url(../../images/g_article_icon_sousuo_nor.png);background-size:cover;cursor: pointer;}
412 411 
.itemListBolck .frmcontype{width:100%;border-radius: 20px;padding-left:20px;background: #f5f6f8;}
413 
.itemListBolck .topOperaBlock{padding:30px 0 10px 20px;}
412 
.itemListBolck .topOperaBlock{padding:20px 0 0 20px;}
414 413 
.itemListBolck .issueSpanBlock{text-align: right;}
415 
.itemListBolck .issueSpan{position:relative;display:inline-block;background:#e03b43;color:#fff;font-size:18px;cursor:pointer;padding:8px 25px 7px;padding-left:50px;border-radius: 20px 0 0 20px;}
416 
.itemListBolck .issueSpan:before{position:absolute;content:url(../../images/g_article_icon_fanbu_nor.png);top:50%;left:26px;margin-top:-12px;}
414 
.itemListBolck .issueSpan{position:relative;display:inline-block;background:#e03b43;color:#fff;font-size:16px;cursor:pointer;padding:7px 25px 7px;padding-left:50px;border-radius: 20px 0 0 20px;}
415 
.itemListBolck .issueSpan:before{position:absolute;content:url(../../images/g_article_icon_fanbu_nor.png);top:50%;left:26px;margin-top:-9px;}
417 416 
.itemListBolck .itemListCon .form-result>ul>li{padding:20px;cursor:pointer;}
418 417 
.itemListBolck .itemListCon .form-result>ul>li:after{content: "";position: absolute;left: 0;right: 0;bottom: 0;height: 2px;background: #f4f6f8;}
419 418 
.itemListBolck .itemListCon .form-result>ul>li:hover{background:#EEEEEE;}
 
@ -425,9 +424,9 @@ ul.tagList>li .h2Font{color:#666}
425 424 
.itemListCon.form-item ul .h1Font{font-size:18px;}
426 425 
.itemListCon .draftLable{font-size:14px; color:#e03b43;line-height:24px;}
427 426 
.itemListCon .form-result>ul>li .madiaEdit>li{float: left;margin-right: 28px;}
428 
.itemListCon .form-result>ul>li .madiaEdit .editThis{display:inline-block;width:72px;height:46px;background:url(../images/g_article_button_xiugai_lan_hig.png);background-size:cover;cursor:pointer;}
429 
.itemListCon .form-result>ul>li .madiaEdit .deteleThis2{display:inline-block;width:46px;height:46px;background:url(../../images/g_article_button_shanchu_hig.png);background-size:cover;cursor:pointer;}
430 
.itemListCon .form-result>ul>li .madiaEdit{display:none;overflow:hidden;position:absolute;top:50%;margin-top:-23px;right:0;}
427 
.itemListCon .form-result>ul>li .madiaEdit .editThis{display:inline-block;width:60px;height:32px;background:url(../images/g_article_button_xiugai_lan_hig.png);background-size:cover;cursor:pointer;}
428 
.itemListCon .form-result>ul>li .madiaEdit .deteleThis2{display:inline-block;width:32px;height:32px;background:url(../../images/g_article_button_shanchu_hig.png);background-size:cover;cursor:pointer;}
429 
.itemListCon .form-result>ul>li .madiaEdit{display:none;overflow:hidden;position:absolute;top:50%;margin-top:-16px;right:0;}
431 430 
.itemListCon .form-result>ul>li:hover .madiaEdit{display: block;}
432 431
433 432 
.itemListCon li.draftList .madiaInfo{padding-top:4px;}
 
@ -494,9 +493,9 @@ div.zoomMask{position:absolute;background:url("../images/g-resource-mask.png") r
494 493 
.conBlock .leftconBox2 .showReBasic{background: #FFFFFF;padding:30px;margin-bottom:20px;}
495 494 
.conBlock .leftconBox2 .showReOther{background: #FFFFFF;padding:30px;}
496 495 
.conBlock .leftconBox2 .resShareUl{position:absolute;bottom:0;}
497 
.conBlock .leftconBox2 .resShareUl>ul>li{float: left;margin-right:30px;font-size: 16px;color:#999;}
496 
.conBlock .leftconBox2 .resShareUl>ul>li{float: left;margin-right:30px;font-size: 14px;color:#999;}
498 497 
.conBlock .leftconBox2 .resShareUl>ul>li .operateicon{margin-left:10px;cursor: pointer;}
499 
.conBlock .leftconBox2 .resShareUl>ul>li>span{position: relative;top:-6px;}
498 
.conBlock .leftconBox2 .resShareUl>ul>li>span{position: relative;top:-3px;}
500 499
501 500 
.keydrop>ul>li.orgList{overflow: hidden;}
502 501 
.keydrop>ul>li.orgList img{width:50px;height:50px;margin-right:10px;}
 
@ -521,7 +520,7 @@ div.zoomMask{position:absolute;background:url("../images/g-resource-mask.png") r
521 520 
/*--------------新版工作台框架--------------*/
522 521 
.conBlock .workmenu{text-align: center;float: left;width:12%;background: #fff;}
523 522 
.conBlock .workmenu>ul{overflow: hidden;}
524 
.conBlock .workmenu>ul>li>a{display: inline-block;width: 100%;height:48px;line-height: 48px;color:#666;font-size:16px;background-position:14px center;background-repeat: no-repeat;}
523 
.conBlock .workmenu>ul>li>a{display: inline-block;width: 100%;height:52px;line-height: 52px;color:#666;font-size:16px;background-size:18px 18px;background-position:14px center;background-repeat: no-repeat;}
525 524 
.conBlock .workmenu>ul>li:nth-child(1)>a{background-image:url(../../images/g_article_icon_gongzuotai_nor.png);}
526 525 
.conBlock .workmenu>ul>li:nth-child(2)>a{background-image:url(../../images/g_article_icon_zixun_nor.png);}
527 526 
.conBlock .workmenu>ul>li:nth-child(3)>a{background-image:url(../../images/g_article_icon_ziyuan_nor.png);}

BIN
cmp-portal/images/g_article_button_xiugai_lan_hig.png
Ver fichero


+ 2 - 4
cmp-portal/resourceIssue.html
Ver fichero 

@ -12,9 +12,7 @@
12 12 
<link type="text/css" href="css/common.css" rel="stylesheet">
13 13 
<link type="text/css" href="css/cmpindex.css" rel="stylesheet">
14 14 
<script type="text/javascript" src="js/public/jquery-1.11.1.js"></script>
15 
<style type="text/css">
16 
	.conItem ul.operateBlock>li{width: 25%;}
17 
</style>
15
18 16 
</head>
19 17
20 18 
<body>

@ -35,7 +33,7 @@
35 33 
			        					<!--未上传图片时-->
36 34 
			        					<div class="upFront" id="uploader">
37 35 
				        					<p>资源图片<em class="requiredcon">*</em></p>
38 
				        					<p>JPG/PNG格式，2M以内</p>
36 
				        					<p class="uploadtip">JPG/PNG格式，2M以内</p>
39 37 
				            				<span class="upbtn">上传图片</span>
40 38 
			        					</div>
41 39 
				            		</div>

+ 30 - 27
css/genindex.css
Ver fichero 

@ -228,7 +228,7 @@ ul.listitemdiv.listmorediv .articalhead{width: 164px;height: 110px;margin-top:-5
228 228 
/*热门文章添加<span class="hotThis"></span>-->*/
229 229 
.hotThis{position:absolute;top:-5px;right:-5px;display:inline-block;width:63px;height:63px;background:url(../images/g_article_bg_redu_nor.png);}
230 230
231 
.conBlock .rightconBox{width:260px;}
231 
.conBlock .rightconBox{width:260px;margin-left: 20px;}
232 232 
.conBlock .rightconBox .conItem{padding:30px;background: #FFFFFF;margin-bottom: 20px;}
233 233 
.conBlock .rightconBox .conItem:first-child{padding:30px 10px;border-top:4px #ff9900 solid;}
234 234 
ul.artAbout>li{clear:both;}
 
@ -238,6 +238,7 @@ ul.artAbout .uploadFile{line-height:28px;text-align: center;font-size: 16px;colo
238 238 
ul.artAbout .uploadFile .uploadblock{position:relative;width:100%;height:190px;padding:30px;border:1px solid #E5E5E5; border-radius: 0;
239 239 
	background-position:center;background-size:cover;background-repeat:no-repeat;}
240 240 
ul.artAbout .uploadFile .upFront{position:relative;}
241 
ul.artAbout .uploadFile .uploadtip{color:#999999}
241 242 
ul.artAbout .uploadFile input.upInp[type="file"]{position:absolute;height: 46px;width:60%;bottom:30px;left:50%;margin-left:-30%;outline: none;opacity: 0;cursor: pointer;z-index:20;}
242 243 
ul.artAbout .uploadFile .upbtn{display:inline-block;padding:7px 23px;background: #E5E5E5;color:#333333;margin-top:30px;}
243 244 
ul.artAbout .uploadFile .uploadblock .upBackbtn{position:absolute;bottom:30px;left:50%;margin-left:-55px;background:rgba(0,0,0,.5);color:#FFFFFF;z-index:10;display: none;}
 
@ -246,10 +247,10 @@ ul.artAbout .uploadFile .uploadblock .upBackbtn{position:absolute;bottom:30px;le
246 247 
ul.artAbout #filePicker{position:absolute;left:50%; bottom:25px; margin-left:-52px;opacity:0; z-index:88;}
247 248 
ul.artAbout .frmadd{width:auto;position:absolute;right:0;top:0;background: #ff9900;color:#fff;border:none;padding:6px 25px;}
248 249
249 
.conItem ul.operateBlock{overflow: hidden;margin-top:-20px;}
250 
.conItem ul.operateBlock>li{font-size:16px; color:#666666;float:left;width:33.333%;margin-top:20px;text-align: center;cursor: pointer;}
250 
.conItem ul.operateBlock{overflow: hidden;margin-top:-30px;}
251 
.conItem ul.operateBlock>li{font-size:15px; color:#666666;float:left;width:33.333%;margin-top:30px;text-align: center;cursor: pointer;}
251 252 
.conItem ul.operateBlock>li p{margin-top:6px;}
252 
.operateicon{display:inline-block;width:22px;height:22px;background-position: center;background-repeat: no-repeat;}
253 
.operateicon{display:inline-block;width:18px;height:18px;background-position: center;background-repeat: no-repeat;background-size: cover;}
253 254 
.operateicon.icon-issue{background-image:url(../images/g_article_icon_fabu_hig.png);}
254 255 
.operateicon.icon-timeissue{background-image:url(../images/g_article_icon_dingshi_nor.png);}
255 256 
.operateicon.icon-preview{background-image:url(../images/g_article_icon_yulan_nor.png);}
 
@ -294,7 +295,7 @@ ul.artAbout .frmadd{width:auto;position:absolute;right:0;top:0;background: #ff99
294 295
295 296 
.form-result{margin:18px -30px 0 -30px;}
296 297 
.form-result>ul>li{position:relative;padding:12px 30px;min-height: 76px;}
297 
.form-result>ul>li .deleteThis{display:none;position:absolute;top:50%;margin-top:-20px;right:28px;width:40px;height:40px;background:url(../images/g_article_button_shanchu_hig.png);background-size:cover;cursor:pointer;}
298 
.form-result>ul>li .deleteThis{display:none;position:absolute;top:50%;margin-top:-16px;right:28px;width:32px;height:32px;background:url(../images/g_article_button_shanchu_hig.png);background-size:cover;cursor:pointer;}
298 299 
.form-result>ul>li:hover{background: #EEEEEE;}
299 300 
.form-result>ul>li:hover .deleteThis{display:block;}
300 301 
@ -349,14 +350,14 @@ ul.tagList>li .h2Font{color:#666}
349 350 
/*白色icon*/
350 351 
.operateicon.icon-message{background-image:url(../images/g_article_button_liuyan_nor.png);}
351 352 
.operateicon.icon-collect{background-image:url(../images/g_all_icon_shoucang_nor_1.png);}
352 
.operateicon.icon-wechat{width:24px;background-image:url(../images/g_all_icon_weixin_nor_1.png);}
353 
.operateicon.icon-sina{width:26px;background-image:url(../images/g_all_icon_xinlang_nor_1.png);}
353 
.operateicon.icon-wechat{width:22px;background-image:url(../images/g_all_icon_weixin_nor_1.png);}
354 
.operateicon.icon-sina{width:24px;background-image:url(../images/g_all_icon_xinlang_nor_1.png);}
354 355 
.operateicon.icon-qq{background-image:url(../images/g_article_button_liuyan_nor.png);}
355 356 
.operateicon.icon-totop{background-image:url(../images/g_article_button_dingbu_nor.png);}
356 357 
/*灰色icon*/
357 358 
.operateicon.operateicon2.icon-collect{background-image:url(../images/g_all_icon_shoucang_nor_2.png);}
358 
.operateicon.operateicon2.icon-wechat{width:24px;background-image:url(../images/g_all_icon_weixin_nor_2.png);}
359 
.operateicon.operateicon2.icon-sina{width:26px;background-image:url(../images/g_all_icon_xinlang_nor_2.png);}
359 
.operateicon.operateicon2.icon-wechat{width:22px;background-image:url(../images/g_all_icon_weixin_nor_2.png);}
360 
.operateicon.operateicon2.icon-sina{width:24px;background-image:url(../images/g_all_icon_xinlang_nor_2.png);}
360 361 
/*悬浮效果*/
361 362 
.operateicon.icon-message:hover{background-image:url(../images/g_article_button_liuyan_hig.png);}
362 363 
/*.operateicon.icon-collect:hover{background-image:url(../images/g_all_icon_shoucang_hig.png);}*/
 
@ -387,26 +388,28 @@ ul.tagList>li .h2Font{color:#666}
387 388 
.commentsArea ul.commentList>li .operateSpan .callBack{display:none;position:relative;padding-left:20px;margin-right:40px;}
388 389 
.commentsArea ul.commentList>li .operateSpan .callBack:before{position:absolute;content:url(../images/g_article_button_huifu_nor.png);top:50%;left:0;margin-top:-8px;}
389 390
390 
.rightconBox .conItem.conItemG .madiaHead{width: 120px; height: 120px;border:1px solid #E5E5E5;margin:0 auto 10px;background-position:center;background-size:cover;}
391 
.rightconBox .conItem.conItemG .madiaHead{width: 100px; height: 100px;border:1px solid #E5E5E5;margin:0 auto 10px;background-position:center;background-size:cover;}
391 392 
.rightconBox .conItem.conItemG .madiaHead.useHead{background-image:url(../images/default-photo.jpg);border-radius: 50%;}
392 393 
.rightconBox .conItem.conItemG .madiaHead.cmpHead{background-image:url(../images/default-icon.jpg);}
393 
.rightconBox .conItem.conItemG .h2Font{font-size:16px;color:#666;line-height:26px;}
394 
.rightconBox .conItem.conItemG .h1Font{font-size:16px;}
395 
.rightconBox .conItem.conItemG .h2Font{font-size:14px;color:#666;line-height:26px;}
394 396 
.rightconBox .conItem.conItemG .h3Font>a{color:#333}
395 
.rightconBox .conItem.conItemG .goSpan span{background: #ff9900;display:inline-block;width:84px;cursor:pointer;color:#fff;font-size:16px;margin:20px 4px 0;}
396 
.rightconBox .conItem.conItemG .goSpan .attenSpan{position: relative;padding:9px 16px;padding-left:34px;}
397 
.rightconBox .conItem.conItemG .goSpan .attenSpan:before{position:absolute;content:url(../images/g_article_icon_jia_nor.png);top:50%;left:18px;margin-top:-8px;}
398 
.rightconBox .conItem.conItemG .goSpan .attenedSpan{background:#acbbc6;position: relative;padding:9px 16px;}
399 
.rightconBox .conItem.conItemG .goSpan .attenedSpan:before{content:"";}
400 
.rightconBox .conItem.conItemG .goSpan .consultSpan{padding:9px 16px;}
397 
.rightconBox .conItem.conItemG .goSpan span{background: #ff9900;display:inline-block;width:84px;cursor:pointer;color:#fff;font-size:16px;margin:20px 4px 0;border-radius:4px;padding:7px 16px;}
398 
.rightconBox .conItem.conItemG .goSpan .attenSpan{position: relative;/*padding-left:34px;*/}
399 
/*.rightconBox .conItem.conItemG .goSpan .attenSpan:before{position:absolute;content:url(../images/g_article_icon_jia_nor.png);top:50%;left:18px;margin-top:-8px;}*/
400 
.rightconBox .conItem.conItemG .goSpan .attenedSpan{background:#acbbc6;position: relative;}
401 
/*.rightconBox .conItem.conItemG .goSpan .attenedSpan:before{content:"";}*/
402 
.rightconBox .conItem.conItemG .goSpan .consultSpan{}
401 403 
/*文章列表*/
402 404 
.itemListCon{background: #fff;}
403 405 
.itemListBolck .searchAbout{position: relative;}
404 
.itemListBolck .searchAbout .searchSpan{position:absolute;top:50%;margin-top:-9px;right:18px;display:inline-block;width:18px;height:18px;background: url(../images/g_article_icon_sousuo_nor.png);cursor: pointer;}
406 
.itemListBolck .searchAbout .frmcontype{height: 36px;font-size: 14px;}
407 
.itemListBolck .searchAbout .searchSpan{position:absolute;top:50%;margin-top:-9px;right:18px;display:inline-block;width:16px;height:16px;background: url(../images/g_article_icon_sousuo_nor.png);background-size:cover;cursor: pointer;}
405 408 
.itemListBolck .frmcontype{width:100%;border-radius: 20px;padding-left:20px;background: #f5f6f8;}
406 
.itemListBolck .topOperaBlock{padding:30px 0 10px 20px;}
409 
.itemListBolck .topOperaBlock{padding:20px 0 0 20px;}
407 410 
.itemListBolck .issueSpanBlock{text-align: right;}
408 
.itemListBolck .issueSpan{position:relative;display:inline-block;background:#e03b43;color:#fff;font-size:18px;cursor:pointer;padding:8px 25px 7px;padding-left:50px;border-radius: 20px 0 0 20px;}
409 
.itemListBolck .issueSpan:before{position:absolute;content:url(../images/g_article_icon_fanbu_nor.png);top:50%;left:26px;margin-top:-12px;}
411 
.itemListBolck .issueSpan{position:relative;display:inline-block;background:#e03b43;color:#fff;font-size:16px;cursor:pointer;padding:7px 25px 7px;padding-left:50px;border-radius: 20px 0 0 20px;}
412 
.itemListBolck .issueSpan:before{position:absolute;content:url(../images/g_article_icon_fanbu_nor.png);top:50%;left:26px;margin-top:-9px;}
410 413 
.itemListBolck .itemListCon .form-result>ul>li{padding:20px;cursor:pointer;	}
411 414 
.itemListBolck .itemListCon .form-result>ul>li:after{content: "";position: absolute;left: 0;right: 0;bottom: 0;height: 2px;background: #f4f6f8;}
412 415 
.itemListBolck .itemListCon .form-result>ul>li:hover{background:#EEEEEE;}
 
@ -418,9 +421,9 @@ ul.tagList>li .h2Font{color:#666}
418 421 
.itemListCon.form-item ul .h1Font{font-size:18px;}
419 422 
.itemListCon .draftLable{font-size:14px; color:#e03b43;line-height:24px;}
420 423 
.itemListCon .form-result>ul>li .madiaEdit>li{float: left;margin-right: 28px;}
421 
.itemListCon .form-result>ul>li .madiaEdit .editThis{display:inline-block;width:72px;height:46px;background:url(../images/g_article_button_xiugai_hig.png);background-size:cover;cursor:pointer;}
422 
.itemListCon .form-result>ul>li .madiaEdit .deteleThis2{display:inline-block;width:46px;height:46px;background:url(../images/g_article_button_shanchu_hig.png);background-size:cover;cursor:pointer;}
423 
.itemListCon .form-result>ul>li .madiaEdit{display:none;overflow:hidden;position:absolute;top:50%;margin-top:-23px;right:0;}
424 
.itemListCon .form-result>ul>li .madiaEdit .editThis{display:inline-block;width:60px;height:32px;background:url(../images/g_article_button_xiugai_hig.png);background-size:cover;cursor:pointer;}
425 
.itemListCon .form-result>ul>li .madiaEdit .deteleThis2{display:inline-block;width:32px;height:32px;background:url(../images/g_article_button_shanchu_hig.png);background-size:cover;cursor:pointer;}
426 
.itemListCon .form-result>ul>li .madiaEdit{display:none;overflow:hidden;position:absolute;top:50%;margin-top:-16px;right:0;}
424 427 
.itemListCon .form-result>ul>li:hover .madiaEdit{display: block;}
425 428
426 429 
.itemListCon li.draftList .madiaInfo{padding-top:4px;}
 
@ -490,9 +493,9 @@ div.zoomMask{position:absolute;background:url("../images/g-resource-mask.png") r
490 493 
.conBlock .leftconBox2 .showReBasic{background: #FFFFFF;padding:30px;margin-bottom:20px;}
491 494 
.conBlock .leftconBox2 .showReOther{background: #FFFFFF;padding:30px;}
492 495 
.conBlock .leftconBox2 .resShareUl{position:absolute;bottom:0;}
493 
.conBlock .leftconBox2 .resShareUl>ul>li{float: left;margin-right:30px;font-size: 16px;color:#999;}
496 
.conBlock .leftconBox2 .resShareUl>ul>li{float: left;margin-right:30px;font-size: 14px;color:#999;}
494 497 
.conBlock .leftconBox2 .resShareUl>ul>li .operateicon{margin-left:10px;cursor: pointer;}
495 
.conBlock .leftconBox2 .resShareUl>ul>li>span{position: relative;top:-6px;}
498 
.conBlock .leftconBox2 .resShareUl>ul>li>span{position: relative;top:-3px;}
496 499
497 500 
.keydrop>ul>li.orgList{overflow: hidden;}
498 501 
.keydrop>ul>li.orgList img{width:50px;height:50px;margin-right:10px;}
 
@ -510,7 +513,7 @@ div.zoomMask{position:absolute;background:url("../images/g-resource-mask.png") r
510 513 
/*--------------新版工作台框架--------------*/
511 514 
.conBlock .workmenu{text-align: center;float: left;width:12%;background: #fff;}
512 515 
.conBlock .workmenu>ul{overflow: hidden;}
513 
.conBlock .workmenu>ul>li>a{display: inline-block;width: 100%;height:48px;line-height: 48px;color:#666;font-size:16px;background-position:14px center;background-repeat: no-repeat;}
516 
.conBlock .workmenu>ul>li>a{display: inline-block;width: 100%;height:52px;line-height: 52px;color:#666;font-size:16px;background-size:18px 18px;background-position:14px center;background-repeat: no-repeat;}
514 517 
.conBlock .workmenu>ul>li:nth-child(1)>a{background-image:url(../images/g_article_icon_gongzuotai_nor.png);}
515 518 
.conBlock .workmenu>ul>li:nth-child(2)>a{background-image:url(../images/g_article_icon_zixun_nor.png);}
516 519 
.conBlock .workmenu>ul>li:nth-child(3)>a{background-image:url(../images/g_article_icon_ziyuan_nor.png);}

+ 2 - 2
css/workspace.css
Ver fichero 

@ -11,8 +11,8 @@ body,html{background: #f4f6f8;}
11 11
12 12 
/*左侧菜单*/
13 13 
.workmenu{text-align:center; float:left; width:12%; height:auto; background: #fff;overflow: hidden;}
14 
a.workmenutit{display: inline-block;background-position:14px center;background-repeat: no-repeat;width:100%;height:48px;font-size:16px;line-height:48px;cursor:pointer;color: #666; }
15 
a.worksubmenu{display: inline-block;background-position:14px center;background-repeat: no-repeat;width:100%; height:48px;font-size:16px;line-height:48px;color: #666; cursor:pointer;}
14 
a.workmenutit{display: inline-block;background-position:14px center;background-repeat: no-repeat;width:100%;background-size:18px 18px;height:52px;font-size:16px;line-height:52px;cursor:pointer;color: #666; }
15 
a.worksubmenu{display: inline-block;background-position:14px center;background-repeat: no-repeat;width:100%;background-size:18px 18px; height:52px;font-size:16px;line-height:52px;color: #666; cursor:pointer;}
16 16 
a.subcolor{ background-color:#ff9900; color:#fff;}
17 17 
.nohide{display:none;}
18 18 
/*a.workmenutit{background-image:url(../images/g_article_icon_gongzuotai_nor.png);}*/

BIN
images/g_all_icon_shoucang_hig.png
Ver fichero


BIN
images/g_all_icon_shoucang_nor_2.png
Ver fichero


BIN
images/g_all_icon_weixin_hig.png
Ver fichero


BIN
images/g_all_icon_weixin_nor_2.png
Ver fichero


BIN
images/g_all_icon_xinlang_hig.png
Ver fichero


BIN
images/g_all_icon_xinlang_nor_2.png
Ver fichero


BIN
images/g_article_button_shanchu_hig.png
Ver fichero


BIN
images/g_article_button_xiugai_hig.png
Ver fichero


BIN
images/g_article_icon_fanbu_nor.png
Ver fichero


+ 3 - 2
js/articalShow.js
Ver fichero 

@ -736,6 +736,7 @@ function article() {
736 736 
			if(data.success && data.data) {
737 737 
				message(5,2);
738 738 
			}
739 
			$(".msgCont").val("");
739 740 
		},
740 741 
		error: function() {
741 742 
			$.MsgBox.Alert('提示', '服务器请求失败')

@ -769,7 +770,7 @@ function message(rows,num) {
769 770 
					}
770 771 
					for(var i = 0; i < data.data.length; i++) {
771 772 
						var itemlist = '<li data-time="" data-key="">';
772 
							itemlist += '<a href class="userhref"> <div class="madiaHead useHead"></div></a>';
773 
							itemlist += '<a href class="userhref"> <div class="madiaHead useHead useHeadMsg"></div></a>';
773 774 
							itemlist += '<div class="madiaInfo">';
774 775 
							itemlist += '<p><a href class="userhref"><span class="h1Font messageName">张某某</span></a><em class="authiconNew" title="科袖认证专家"></em><span class="commenttime">9月30号 12:00</span></p>';
775 776 
							itemlist += '<p class="h2Font messageContent">sdfsdfs</p>';

@ -784,7 +785,7 @@ function message(rows,num) {
784 785 
								$itemlist.find(".authiconNew").attr("title", userType.title);
785 786 
								$itemlist.find(".authiconNew").addClass(userType.sty);
786 787 
							if(datalist.professor.hasHeadImage==1) {
787 
								$(".useHead").attr("style", "background-image: url(/images/head/" + datalist.professor.id + "_l.jpg);");
788 
								$(".useHeadMsg").attr("style", "background-image: url(/images/head/" + datalist.professor.id + "_l.jpg);");
788 789 
							}
789 790 
							if(datalist.professor.id!=userid){
790 791 
								$(".messageDel").hide();

+ 1 - 1
js/resourcePreview.js
Ver fichero 

@ -55,7 +55,7 @@ $(document).ready(function() {
55 55 
		$("#resourceName").text($da.resourceName); //名字
56 56 
		$("#application").text($da.supportedServices); //应用用途
57 57 
		if($da.editProfessor) {
58 
			$("#person,#orgName").show();
58 
			$("#person").show();
59 59 
			if($da.orgName) { //所属机构
60 60 
				$("#organizationName").text($da.orgName).parents("li").show();
61 61 
			}

+ 1 - 1
myDemand.html
Ver fichero 

@ -113,7 +113,7 @@
113 113 
        <div class="workmysrc workmysrc3" id="getReply"style="display:block;"> <!--displayNone-->
114 114 
             <div class="workmenubox clearfix">
115 115 
             	<div class="workmenufrm floatL">
116 
             		<span class="frmtype frmbtn" id="needIssueBtn" style="padding:4px 24px;">发布新需求</span>
116 
             		<span class="frmtype frmbtn" id="needIssueBtn" style="padding:6px 24px;">发布新需求</span>
117 117 
             	</div>
118 118 
                <form class="workmenufrm floatR">
119 119 
                   <div class="workselectbox floatL replySelect selcet1">

+ 1 - 4
resourceIssue.html
Ver fichero 

@ -11,9 +11,6 @@
11 11 
<link type="text/css" href="css/genindex.css" rel="stylesheet">
12 12 
<link rel="stylesheet" type="text/css" href="./css/webuploader/webuploader.css">
13 13 
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
14 
<style type="text/css">
15 
	.conItem ul.operateBlock>li{width: 25%;}
16 
</style>
17 14 
</head>
18 15
19 16 
<body>

@ -34,7 +31,7 @@
34 31 
			        					<!--未上传图片时-->
35 32 
			        					<div class="upFront" id="uploader">
36 33 
				        					<p>资源图片<em class="requiredcon">*</em></p>
37 
				        					<p>JPG/PNG格式，2M以内</p>
34 
				        					<p class="uploadtip">JPG/PNG格式，2M以内</p>
38 35 
				            				<span class="upbtn">上传图片</span>
39 36 
			        					</div>
40 37 
				            		</div>

+ 1 - 1
workspaces.html
Ver fichero 

@ -121,7 +121,7 @@
121 121 
		<div class="workcon">
122 122 
			<div class="workconitem">
123 123 
				<div class="workcontit">
124 
					<a class="worksamlltit worksamlltitnow">工作台</a>
124 
					<a class="worksamlltit worksamlltitnow">我的工作台</a>
125 125 
				</div>
126 126 
				<div class="worksubcon clearfix">
127 127 
					<div class="workconleft floatL">