首頁 探索 說明
註冊 登入
bulomakaka
/
ekexiu.app
關註 2
讚好 1
派生 0
代碼 問題管理 0 合併請求 0 提交歷史 649 版本發佈 0 Wiki
瀏覽代碼

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

jack 7 年之前
父節點
db26afda90 eaf11466e1
當前提交
2f20bb6de2
共有 6 個文件被更改，包括 16 次插入 和 11 次删除
統一視圖 顯示文件統計
  1. 3 3
      app/html/attentions-list.html
  2. 3 3
      app/html/attentions-list2.html
  3. 6 1
      app/html/needIssue.html
  4. 1 1
      app/index.html
  5. 1 1
      app/js/professorArticle.js
  6. 2 2
      app/js/proinfobrow.js

+ 3 - 3
app/html/attentions-list.html
查看文件

11
11
12 
</head>
12 
</head>
13 
<body>
13 
<body>
14
14
15 
	<div class="mui-content mui-scroll-wrapper" id="pullrefresh" >
15 
	<div class="mui-content mui-scroll-wrapper" id="pullrefresh" >
16 
		<div class="mui-scroll">
16 
		<div class="mui-scroll">
17 
	        <div  class="mui-card-content conblock">
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 
			    </ul>
20 
			    </ul>
21 
			    <div class="nodatabox" style="display:none; background: #f4f6f8;margin: 0; " id="nodatabox1">
21 
			    <div class="nodatabox" style="display:none; background: #f4f6f8;margin: 0; " id="nodatabox1">
22 
			        <div class="nodata">
22 
			        <div class="nodata">

+ 3 - 3
app/html/attentions-list2.html
查看文件

10 
    <link href="../css/app.css" rel="stylesheet"/>
10 
    <link href="../css/app.css" rel="stylesheet"/>
11 
</head>
11 
</head>
12 
<body>
12 
<body>
13
13
14 
	<div class="mui-content mui-scroll-wrapper" id="pullrefresh" >
14 
	<div class="mui-content mui-scroll-wrapper" id="pullrefresh" >
15 
		<div class="mui-scroll">
15 
		<div class="mui-scroll">
16 
	        <div  class="mui-card-content conblock">
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 
			    </ul>
19 
			    </ul>
20 
			    <div class="nodatabox" style="display:none; background: #f4f6f8;margin: 0; " id="nodatabox1">
20 
			    <div class="nodatabox" style="display:none; background: #f4f6f8;margin: 0; " id="nodatabox1">
21 
			        <div class="nodata">
21 
			        <div class="nodata">

+ 6 - 1
app/html/needIssue.html
查看文件

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

+ 1 - 1
app/index.html
查看文件

85 
	});
 85 
	});
86 
</script>
86 
</script>
87 
</body>
87 
</body>
88 
</html>
88 
</html>

+ 1 - 1
app/js/professorArticle.js
查看文件

545 
			}
545 
			}
546 
		});
546 
		});
547 
	}
547 
	}
548 
});
548 
});

+ 2 - 2
app/js/proinfobrow.js
查看文件

382 
						string += '<img class="resImg headRadius" src="../images/default-artical.jpg">'
 382 
						string += '<img class="resImg headRadius" src="../images/default-artical.jpg">'
383 
					}
 383 
					}
384 
					string += '</div><div class="mui-media-body centerTit">'
 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 
					string += '</div></a></li>'
 386 
					string += '</div></a></li>'
387 
					html.push(string);
 387 
					html.push(string);
388 
				}
 388 
				}
695 
	}
 695 
	}
696 
	/*图像预览*/
 696 
	/*图像预览*/
697 
	mui.previewImage();
 697 
	mui.previewImage();
698 
});
698 
});