lyn7568 5 years ago
parent
commit
a20108c28f
2 changed files with 14 additions and 10 deletions
  1. 8 7
      js/unPatentList.js
  2. 6 3
      js/userInforShow.js

+ 8 - 7
js/unPatentList.js

@ -71,17 +71,22 @@ $(document).ready(function () {
71 71
			var oTime, pageview = "",
72 72
				draftLable = "",
73 73
				oHtml, oLi = '',
74
				mg = '';
74
				gl = ''
75
			mg = '';
75 76
			if ($data[i].pic)
76 77
				var imgSrc = "/data/researchResult" + $data[i].pic.split(",")[0];
77 78
			if ($data[i].status == '2') {
79
				$('.deteleThis3').css('display', 'none')
78 80
				oTime = "修改于 " + TimeTr($data[i].modifyTime);
79
				draftLable = '<span class="draftLable" style="margin-left: 20px;">草稿</span>';
81
				draftLable = '<span class="draftLable " style="margin-left: 20px;">草稿</span>';
80 82
				oHtml = "unPatentIssue.html";
81 83
				oLi = "class='draftList'"
82 84
				mg = '<li><span>' + oTime + '</span>' + draftLable + '</li>'
85
83 86
			} else if ($data[i].status == '1') {
84 87
				oHtml = "unPatentShow.html"
88
				gl = '<li><span class="deteleThis3" data-id="' + $data[i].id + '">取消关联</span></li>'
89
85 90
			}
86 91
			var oStr = '<li ' + oLi + '>' +
87 92
				'<a href="' + oHtml + '?id=' + $data[i].id + '&flag=' + $data[i].state + '" target="_blank">' +
@ -96,7 +101,7 @@ $(document).ready(function () {
96 101
				'</div>' +
97 102
				'</a>' +
98 103
				'<ul class="madiaEdit">' +
99
				'<li><span class="deteleThis3" data-id="' + $data[i].id + '">取消关联</span></li>' +
104
				gl +
100 105
				'<li><span class="editThis" data-id="' + $data[i].id + '"></span></li>' +
101 106
				'<li><span class="deteleThis2" data-id="' + $data[i].id + '"></span></li>' +
102 107
				'</ul>' +
@ -108,10 +113,6 @@ $(document).ready(function () {
108 113
109 114
			}
110 115
			$oStr.find(".editThis").attr("data-state", $data[i].status);
111
			var caogao = $('.draftLable').html()
112
			if (caogao == '草稿') {
113
				$('.deteleThis3').css('display','none')
114
			}
115 116
116 117
		}
117 118
	}

+ 6 - 3
js/userInforShow.js

@ -1420,16 +1420,19 @@ $(function() {
1420 1420
				$("#"+aimId).parent().find(".js-load-more").removeAttr("disabled");
1421 1421
	        	$("#"+aimId).parent().find(".js-load-more").removeClass("active");
1422 1422
			})
1423
    	},
1423
		},
1424 1424
		collectSorts=function(type,isbind){
1425 1425
			var aimId="",newStr=""
1426 1426
			oAjax("/ajax/watch/proList",{//我关注的列表
1427 1427
				"professorId": professorId,
1428 1428
				"watchType":type,
1429 1429
				"createTime": watchO.watchTime,
1430
				"watchObject":watchO.watchObjId,
1430
				// "watchObject":watchO.watchObjId,
1431
				"watchObject":1,
1431 1432
				"rows":rows
1432 1433
			}, "GET", function(res){
1434
		console.log(professorId)
1435
				
1433 1436
				var $info = res.data;
1434 1437
				var arr=[];
1435 1438
				if($info.length > 0) {
@ -1438,6 +1441,7 @@ $(function() {
1438 1441
					watchO.watchObjId = $info[$info.length - 1].watchObject;
1439 1442
					for(var i in $info) {
1440 1443
						arr[i]=$info[i].watchObject;
1444
						console.log()
1441 1445
					}
1442 1446
				}
1443 1447
				if(type==1){
@ -2288,7 +2292,6 @@ $(function() {
2288 2292
					operatTab();
2289 2293
					closeLog();
2290 2294
				}
2291
	
2292 2295
			})
2293 2296
			
2294 2297
			//点击每个研究方向弹出研究方向详情窗口