Home Explore Help
Register Sign In
bulomakaka
/
ekexiu.app
Watch 2
Star 1
Fork 0
Code Issues 0 Pull Requests 0 Commits 756 Releases 0 Wiki
Browse Source

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

jack 7 years ago
parent
4c497e002f bb028d1134
commit
a8a507191c
7 changed files with 19 additions and 14 deletions
Unified View Show Diff Stats
  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
  7. 3 3
      app/js/public/base.js

+ 3 - 3
app/html/attentions-list.html
View File

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
View File

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
View File

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
View File

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

+ 1 - 1
app/js/professorArticle.js
View File

528 
			}
528 
			}
529 
		});
529 
		});
530 
	}
530 
	}
531 
});
531 
});

+ 2 - 2
app/js/proinfobrow.js
View File

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 
});

+ 3 - 3
app/js/public/base.js
View File

1 
//公共文件
1 
//公共文件
2 
mui.init();
2 
mui.init();
3 
//var baseUrl = "http://www.ekexiu.com",
3 
//var baseUrl = "http://www.ekexiu.com",
4 
var baseUrl = "http://192.168.3.233:81",
4 
var baseUrl = "http://192.168.3.233:81",
5 
//var baseUrl = "http:192.168.3.85:80",
5 
//var baseUrl = "http:192.168.3.85:80",
6 
	toastStyle = {
6 
	toastStyle = {
7 
		'verticalAlign': 'top',
7 
		'verticalAlign': 'top',
348 
		}
348 
		}
349 
	});
349 
	});
350
350
351 
}
351 
}