Sfoglia il codice sorgente

Merge remote-tracking branch 'origin/test'

jack 7 anni fa
parent
commit
dd2a1a8016
2 ha cambiato i file con 2 aggiunte e 8 eliminazioni
  1. 2 3
      app/.gitignore
  2. 0 5
      app/html/needIssue.html

+ 2 - 3
app/.gitignore

@ -1,4 +1,3 @@
1
/.project
2
/manifest.json
1 3
/unpackage
2
/.project
3
/manifest.json
4
/unpackage

+ 0 - 5
app/html/needIssue.html

@ -34,13 +34,8 @@
34 34
						<li><label>请选择您的需求类型<em class="requiredcon"></em></label></li>
35 35
						<li class="divideSpace" id="navsubTo" style="padding-left:0">
36 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
=======
41 37
								<li><span id="oGe">个人需求</span></li><!--选中状态checkNow-->
42 38
								<li><span id="oQi">企业需求</span></li><!--不可用状态checkNo-->
43
>>>>>>> refs/remotes/origin/dev
44 39
							</ul>
45 40
							<div class="littipCh">
46 41
								<div class="littip">注:当企业入驻科袖后,企业的关联用户将可以发布企业需求</div>