Browse Source

修改关注已关注样式,修改文章资源左右区域宽度

luyanan 7 years ago
parent
commit
5cd560da68
4 changed files with 25 additions and 12 deletions
  1. 14 11
      css/genindex.css
  2. 2 0
      index.html
  3. 4 0
      js/articalShow.js
  4. 5 1
      js/resourceShow.js

+ 14 - 11
css/genindex.css

@ -173,7 +173,7 @@ ul.loginWaySort li.liactive{border-bottom: 2px solid #ff9900;}
173 173
.searchsome{border:none;padding-right:120px;height: 40px;padding-left:20px;}
174 174
.searchgo{position:absolute;right:0;padding:0 40px;background: #FF9900;color: #FFFFFF;cursor: pointer;}
175 175
176
.filterdiv{background: #FFFFFF;margin:20px 0;}
176
.filterdiv{background: #FFFFFF;margin:20px 0 0;}
177 177
ul.choosediv{background: #E6E6E6;}
178 178
ul.choosediv>li{float: left;padding:0 20px;font-size: 14px;color:#666;line-height: 42px;border-top:4px solid transparent;cursor: pointer;}
179 179
ul.choosediv>li.liactive{border-color: #ff9900;color:#ff9900;background: #FFFFFF;}
@ -197,8 +197,8 @@ ul.filterUl.filterUlactive{height:auto;}
197 197
ul.filterUl>li{float:left;margin:0 5px 4px;padding:0 10px;cursor: pointer;color:#999;border:1px solid transparent;}
198 198
ul.filterUl>li.filterCurrent{border-color:#e1e1e1;border-radius: 20px;color:#ff9900;}
199 199
200
.listdiv{background: #FFFFFF;padding-bottom:20px;margin-bottom:20px;}
201
.listdiv ul.listitemdiv{}
200
.listdiv{background: #FFFFFF;padding-bottom:20px;margin-bottom:20px;overflow: hidden;}
201
/*.listdiv ul.listitemdiv{margin-top:20px;background: #FFFFFF;}*/
202 202
ul.listitemdiv li{position:relative;min-height:132px;padding:15px 20px;}
203 203
ul.listitemdiv li:hover{background: #EEEEEE;}
204 204
ul.listitemdiv li:after{content: "";position: absolute;left: 0;right: 0;bottom: 0;height: 2px;background: #f7f7f8;}
@ -223,11 +223,11 @@ ul.listitemdiv.listmorediv .articalhead{width: 164px;height: 110px;margin-top:-5
223 223
224 224
/*--------------新版文章--------------*/
225 225
/*文章发布*/
226
.conBlock .leftconBox{width:764px;padding:30px;position: relative;}
226
.conBlock .leftconBox{width:820px;padding:30px;position: relative;}
227 227
/*热门文章添加<span class="hotThis"></span>-->*/
228 228
.hotThis{position:absolute;top:-5px;right:-5px;display:inline-block;width:63px;height:63px;background:url(../images/g_article_bg_redu_nor.png);}
229 229
230
.conBlock .rightconBox{width: 315px;}
230
.conBlock .rightconBox{width:260px;}
231 231
.conBlock .rightconBox .conItem{padding:30px;background: #FFFFFF;margin-bottom: 20px;}
232 232
.conBlock .rightconBox .conItem:first-child{padding:30px 10px;border-top:4px #ff9900 solid;}
233 233
ul.artAbout>li{clear:both;}
@ -337,7 +337,7 @@ ul.tagList>li .h2Font{color:#666}
337 337
    -webkit-box-shadow: 1px 2px 10px 0px rgba(0, 0, 0, 0.2);}
338 338
.thumbBlock .thumbBtn.thumbedBtn:hover{background: #e0e0e0;}
339 339
/*分享操作栏*/
340
.shareBlock{background:rgba(60,62,81,.5);margin:0 -30px;padding:26px 30px;}
340
.shareBlock{background:rgba(60,62,81,.5);margin:0 -30px;padding:14px 30px;}
341 341
.shareInfo .madiaHead{border-color:#999}
342 342
.shareInfo .madiaInfo{margin-top:12px;}
343 343
.shareInfo .madiaInfo .h1Font{display:inline-block;max-width: 200px;font-size: 16px;color:#fff;}
@ -367,7 +367,8 @@ ul.tagList>li .h2Font{color:#666}
367 367
.shareWeixin{font-style: normal;position: relative;}
368 368
.shareWeixin .shareCode{display:none;position: absolute;bottom: 40px;left:-24px;background:rgba(0,0,0,.6);padding: 8px;width: 260px;}
369 369
.shareWeixin .shareCode:after{display: block;width: 0;height: 0;border:12px solid transparent;border-top-color:rgba(0,0,0,.6);position: absolute;bottom:-24px;left:22px;}
370
.shareWeixin .shareCode .shareWord {width: 126px;margin: 10px;color: #FFF;text-align: left;font-size: 14px;line-height: 20px;}
370
.shareWeixin .shareCode .shareWord {width: 140px;margin: 10px;color: #FFF;text-align: left;font-size: 14px;line-height: 20px;}
371
.shareWeixin .shareCode .shareWord p{font-size: 14px;line-height: 20px;}
371 372
.shareWeixin .shareCode img{width: 80px;height: 80px;border: 4px solid #fff;}
372 373
373 374
.ifLogin{margin:30px 0;}
@ -390,10 +391,12 @@ ul.tagList>li .h2Font{color:#666}
390 391
.rightconBox .conItem.conItemG .madiaHead.cmpHead{background-image:url(../images/default-icon.jpg);}
391 392
.rightconBox .conItem.conItemG .h2Font{font-size:16px;color:#666;line-height:26px;}
392 393
.rightconBox .conItem.conItemG .h3Font>a{color:#333}
393
.rightconBox .conItem.conItemG .goSpan span{background: #ff9900;display:inline-block;min-width:80px;cursor:pointer;color:#fff;font-size:16px;margin:20px 10px 0;}
394
.rightconBox .conItem.conItemG .attenSpan{position: relative;padding:9px 20px;padding-left:38px;}
395
.rightconBox .conItem.conItemG .attenSpan:before{position:absolute;content:url(../images/g_article_icon_jia_nor.png);top:50%;left:20px;margin-top:-8px;}
396
.rightconBox .conItem.conItemG .consultSpan{padding:9px 20px;}
394
.rightconBox .conItem.conItemG .goSpan span{background: #ff9900;display:inline-block;width:90px;cursor:pointer;color:#fff;font-size:16px;margin:20px 4px 0;}
395
.rightconBox .conItem.conItemG .goSpan .attenSpan{position: relative;padding:9px 16px;padding-left:34px;}
396
.rightconBox .conItem.conItemG .goSpan .attenSpan:before{position:absolute;content:url(../images/g_article_icon_jia_nor.png);top:50%;left:18px;margin-top:-8px;}
397
.rightconBox .conItem.conItemG .goSpan .attenedSpan{background:#acbbc6;position: relative;padding:9px 16px;}
398
.rightconBox .conItem.conItemG .goSpan .attenedSpan:before{content:"";}
399
.rightconBox .conItem.conItemG .goSpan .consultSpan{padding:9px 16px;}
397 400
/*文章列表*/
398 401
.itemListCon{background: #fff;}
399 402
.itemListBolck .searchAbout{position: relative;}

+ 2 - 0
index.html

@ -227,6 +227,8 @@
227 227
                <ul>
228 228
                    <li><a href="http://www.ecorr.org/" target="_blank">中国腐蚀与防护网</a></li>
229 229
                    <li><a href="http://www.duolingptfe.com/" target="_blank">聚四氟乙烯</a></li>
230
                    <li><a href="http://www.fangshuiol.com/" target="_blank">杭州防水施工</a></li>
231
                    <li><a href="http://www.wljlsy.com/" target="_blank">五莲红外墙干挂石材</a></li>
230 232
                </ul>
231 233
            </div>
232 234
        </div>

+ 4 - 0
js/articalShow.js

@ -554,10 +554,12 @@ function ifCollection(getid,num) {
554 554
			if(num==1){
555 555
				if(data.success && data.data != null) {
556 556
					$('.attenSpan').addClass("attenSpanyes");
557
					$('.attenSpan').addClass("attenedSpan");
557 558
					$('.attenSpan').text('已关注');
558 559
					zjreturnId = data.data.watchObject;
559 560
				} else {
560 561
					$('.attenSpan').removeClass("attenSpanyes");
562
					$('.attenSpan').removeClass("attenedSpan");
561 563
					$('.attenSpan').text('关注');
562 564
				}
563 565
			}
@ -596,6 +598,7 @@ function collectionExpert(watchObject,num) {
596 598
			if(num==1){
597 599
				if(data.success) {
598 600
					$('.attenSpan').addClass("attenSpanyes");
601
					$('.attenSpan').addClass("attenedSpan");
599 602
					$('.attenSpan').text('已关注');
600 603
					zjreturnId = data.data.watchObject;
601 604
				}
@ -632,6 +635,7 @@ function cancelCollectionExpert(watchObject,num) {
632 635
			if(num==1){
633 636
				if(data.success) {
634 637
					$('.attenSpan').removeClass("attenSpanyes");
638
					$('.attenSpan').removeClass("attenedSpan");
635 639
					$('.attenSpan').text('关注');
636 640
				}	
637 641
			}

+ 5 - 1
js/resourceShow.js

@ -52,7 +52,7 @@ $(document).ready(function() {
52 52
		$("#resourceName").text($da.resourceName); //名字
53 53
		$("#application").text($da.supportedServices); //应用用途
54 54
		if($da.editProfessor) {
55
			$("#person,#orgName").show();
55
			$("#person").show();
56 56
			if($da.orgName) { //所属机构
57 57
				$("#organizationName").text($da.orgName).parents("li").show();
58 58
			}
@ -442,10 +442,12 @@ $(document).ready(function() {
442 442
				if(num == 1) {
443 443
					if(data.success && data.data != null) {
444 444
						$('.attenSpan').addClass("attenSpanyes");
445
						$('.attenSpan').addClass("attenedSpan");
445 446
						$('.attenSpan').text('已关注');
446 447
						zjreturnId = data.data.watchObject;
447 448
					} else {
448 449
						$('.attenSpan').removeClass("attenSpanyes");
450
						$('.attenSpan').removeClass("attenedSpan");
449 451
						$('.attenSpan').text('关注');
450 452
					}
451 453
				}
@ -491,6 +493,7 @@ $(document).ready(function() {
491 493
				if(num == 1) {
492 494
					if(data.success) {
493 495
						$('.attenSpan').addClass("attenSpanyes");
496
						$('.attenSpan').addClass("attenedSpan");
494 497
						$('.attenSpan').text('已关注');
495 498
						zjreturnId = data.data.watchObject;
496 499
					}
@ -527,6 +530,7 @@ $(document).ready(function() {
527 530
				if(num == 1) {
528 531
					if(data.success) {
529 532
						$('.attenSpan').removeClass("attenSpanyes");
533
						$('.attenSpan').removeClass("attenedSpan");
530 534
						$('.attenSpan').text('关注');
531 535
					}
532 536
				}