Home Explore Help
Register Sign In
duhongyu
/
ShuangHui_UI
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Commits 237 Releases 0 Wiki
Browse Source

Merge branch 'master' of http://192.168.1.222:3000/duhongyu/ShuangHui_UI

weieryang 1 year ago
parent
e56391cd60 0024732551
commit
1a79258732
2 changed files with 489 additions and 241 deletions
Split View Show Diff Stats
  1. 485 241
      双汇APP-andriod/.project
  2. 4 0
      双汇APP-andriod/js/login.js

+ 485 - 241
双汇APP-andriod/.project
View File 

@@ -1,241 +1,485 @@
1 
-<?xml version="1.0" encoding="UTF-8"?>
2 
-<projectDescription>
3 
-	<name>shangqiuapp</name>
4 
-	<comment>Create By HBuilder</comment>
5 
-	<projects>
6 
-	</projects>
7 
-	<buildSpec>
8 
-		<buildCommand>
9 
-			<name>com.pandora.projects.ui.MKeyBuilder</name>
10 
-			<arguments>
11 
-			</arguments>
12 
-		</buildCommand>
13 
-		<buildCommand>
14 
-			<name>com.aptana.ide.core.unifiedBuilder</name>
15 
-			<arguments>
16 
-			</arguments>
17 
-		</buildCommand>
18 
-	</buildSpec>
19 
-	<natures>
20 
-		<nature>com.pandora.projects.ui.MKeyNature</nature>
21 
-		<nature>com.aptana.projects.webnature</nature>
22 
-	</natures>
23 
-	<filteredResources>
24 
-		<filter>
25 
-			<id>1515635430185</id>
26 
-			<name></name>
27 
-			<type>10</type>
28 
-			<matcher>
29 
-				<id>org.eclipse.ui.ide.orFilterMatcher</id>
30 
-				<arguments>
31 
-					<matcher>
32 
-						<id>org.eclipse.ui.ide.multiFilter</id>
33 
-						<arguments>1.0-projectRelativePath-matches-false-false-bin</arguments>
34 
-					</matcher>
35 
-					<matcher>
36 
-						<id>org.eclipse.ui.ide.multiFilter</id>
37 
-						<arguments>1.0-projectRelativePath-matches-false-false-setting</arguments>
38 
-					</matcher>
39 
-				</arguments>
40 
-			</matcher>
41 
-		</filter>
42 
-		<filter>
43 
-			<id>1520406370806</id>
44 
-			<name></name>
45 
-			<type>26</type>
46 
-			<matcher>
47 
-				<id>org.eclipse.ui.ide.multiFilter</id>
48 
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
49 
-			</matcher>
50 
-		</filter>
51 
-		<filter>
52 
-			<id>1520406370806</id>
53 
-			<name></name>
54 
-			<type>26</type>
55 
-			<matcher>
56 
-				<id>org.eclipse.ui.ide.multiFilter</id>
57 
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
58 
-			</matcher>
59 
-		</filter>
60 
-		<filter>
61 
-			<id>1520987770444</id>
62 
-			<name></name>
63 
-			<type>26</type>
64 
-			<matcher>
65 
-				<id>org.eclipse.ui.ide.multiFilter</id>
66 
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
67 
-			</matcher>
68 
-		</filter>
69 
-		<filter>
70 
-			<id>1522328225927</id>
71 
-			<name></name>
72 
-			<type>26</type>
73 
-			<matcher>
74 
-				<id>org.eclipse.ui.ide.multiFilter</id>
75 
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
76 
-			</matcher>
77 
-		</filter>
78 
-		<filter>
79 
-			<id>1522369426201</id>
80 
-			<name></name>
81 
-			<type>26</type>
82 
-			<matcher>
83 
-				<id>org.eclipse.ui.ide.multiFilter</id>
84 
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
85 
-			</matcher>
86 
-		</filter>
87 
-		<filter>
88 
-			<id>1522674234989</id>
89 
-			<name></name>
90 
-			<type>26</type>
91 
-			<matcher>
92 
-				<id>org.eclipse.ui.ide.multiFilter</id>
93 
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
94 
-			</matcher>
95 
-		</filter>
96 
-		<filter>
97 
-			<id>1522716525818</id>
98 
-			<name></name>
99 
-			<type>26</type>
100 
-			<matcher>
101 
-				<id>org.eclipse.ui.ide.multiFilter</id>
102 
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
103 
-			</matcher>
104 
-		</filter>
105 
-		<filter>
106 
-			<id>1522755089550</id>
107 
-			<name></name>
108 
-			<type>26</type>
109 
-			<matcher>
110 
-				<id>org.eclipse.ui.ide.multiFilter</id>
111 
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
112 
-			</matcher>
113 
-		</filter>
114 
-		<filter>
115 
-			<id>1522801615489</id>
116 
-			<name></name>
117 
-			<type>26</type>
118 
-			<matcher>
119 
-				<id>org.eclipse.ui.ide.multiFilter</id>
120 
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
121 
-			</matcher>
122 
-		</filter>
123 
-		<filter>
124 
-			<id>1523152973916</id>
125 
-			<name></name>
126 
-			<type>26</type>
127 
-			<matcher>
128 
-				<id>org.eclipse.ui.ide.multiFilter</id>
129 
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
130 
-			</matcher>
131 
-		</filter>
132 
-		<filter>
133 
-			<id>1523431087245</id>
134 
-			<name></name>
135 
-			<type>26</type>
136 
-			<matcher>
137 
-				<id>org.eclipse.ui.ide.multiFilter</id>
138 
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
139 
-			</matcher>
140 
-		</filter>
141 
-		<filter>
142 
-			<id>1523599542083</id>
143 
-			<name></name>
144 
-			<type>26</type>
145 
-			<matcher>
146 
-				<id>org.eclipse.ui.ide.multiFilter</id>
147 
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
148 
-			</matcher>
149 
-		</filter>
150 
-		<filter>
151 
-			<id>1524012284034</id>
152 
-			<name></name>
153 
-			<type>26</type>
154 
-			<matcher>
155 
-				<id>org.eclipse.ui.ide.multiFilter</id>
156 
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
157 
-			</matcher>
158 
-		</filter>
159 
-		<filter>
160 
-			<id>1525309830300</id>
161 
-			<name></name>
162 
-			<type>26</type>
163 
-			<matcher>
164 
-				<id>org.eclipse.ui.ide.multiFilter</id>
165 
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
166 
-			</matcher>
167 
-		</filter>
168 
-		<filter>
169 
-			<id>1526616137192</id>
170 
-			<name></name>
171 
-			<type>26</type>
172 
-			<matcher>
173 
-				<id>org.eclipse.ui.ide.multiFilter</id>
174 
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
175 
-			</matcher>
176 
-		</filter>
177 
-		<filter>
178 
-			<id>1572405524965</id>
179 
-			<name></name>
180 
-			<type>26</type>
181 
-			<matcher>
182 
-				<id>org.eclipse.ui.ide.multiFilter</id>
183 
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
184 
-			</matcher>
185 
-		</filter>
186 
-		<filter>
187 
-			<id>1573713417621</id>
188 
-			<name></name>
189 
-			<type>26</type>
190 
-			<matcher>
191 
-				<id>org.eclipse.ui.ide.multiFilter</id>
192 
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
193 
-			</matcher>
194 
-		</filter>
195 
-		<filter>
196 
-			<id>1577703758786</id>
197 
-			<name></name>
198 
-			<type>26</type>
199 
-			<matcher>
200 
-				<id>org.eclipse.ui.ide.multiFilter</id>
201 
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
202 
-			</matcher>
203 
-		</filter>
204 
-		<filter>
205 
-			<id>1582533010528</id>
206 
-			<name></name>
207 
-			<type>26</type>
208 
-			<matcher>
209 
-				<id>org.eclipse.ui.ide.multiFilter</id>
210 
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
211 
-			</matcher>
212 
-		</filter>
213 
-		<filter>
214 
-			<id>1586844160429</id>
215 
-			<name></name>
216 
-			<type>26</type>
217 
-			<matcher>
218 
-				<id>org.eclipse.ui.ide.multiFilter</id>
219 
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
220 
-			</matcher>
221 
-		</filter>
222 
-		<filter>
223 
-			<id>1662016130863</id>
224 
-			<name></name>
225 
-			<type>26</type>
226 
-			<matcher>
227 
-				<id>org.eclipse.ui.ide.multiFilter</id>
228 
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
229 
-			</matcher>
230 
-		</filter>
231 
-		<filter>
232 
-			<id>1713435398664</id>
233 
-			<name></name>
234 
-			<type>26</type>
235 
-			<matcher>
236 
-				<id>org.eclipse.ui.ide.multiFilter</id>
237 
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
238 
-			</matcher>
239 
-		</filter>
240 
-	</filteredResources>
241 
-</projectDescription>
1 
+<<<<<<< HEAD
2 
+<?xml version="1.0" encoding="UTF-8"?>
3 
+<projectDescription>
4 
+	<name>shangqiuapp</name>
5 
+	<comment>Create By HBuilder</comment>
6 
+	<projects>
7 
+	</projects>
8 
+	<buildSpec>
9 
+		<buildCommand>
10 
+			<name>com.pandora.projects.ui.MKeyBuilder</name>
11 
+			<arguments>
12 
+			</arguments>
13 
+		</buildCommand>
14 
+		<buildCommand>
15 
+			<name>com.aptana.ide.core.unifiedBuilder</name>
16 
+			<arguments>
17 
+			</arguments>
18 
+		</buildCommand>
19 
+	</buildSpec>
20 
+	<natures>
21 
+		<nature>com.pandora.projects.ui.MKeyNature</nature>
22 
+		<nature>com.aptana.projects.webnature</nature>
23 
+	</natures>
24 
+	<filteredResources>
25 
+		<filter>
26 
+			<id>1515635430185</id>
27 
+			<name></name>
28 
+			<type>10</type>
29 
+			<matcher>
30 
+				<id>org.eclipse.ui.ide.orFilterMatcher</id>
31 
+				<arguments>
32 
+					<matcher>
33 
+						<id>org.eclipse.ui.ide.multiFilter</id>
34 
+						<arguments>1.0-projectRelativePath-matches-false-false-bin</arguments>
35 
+					</matcher>
36 
+					<matcher>
37 
+						<id>org.eclipse.ui.ide.multiFilter</id>
38 
+						<arguments>1.0-projectRelativePath-matches-false-false-setting</arguments>
39 
+					</matcher>
40 
+				</arguments>
41 
+			</matcher>
42 
+		</filter>
43 
+		<filter>
44 
+			<id>1520406370806</id>
45 
+			<name></name>
46 
+			<type>26</type>
47 
+			<matcher>
48 
+				<id>org.eclipse.ui.ide.multiFilter</id>
49 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
50 
+			</matcher>
51 
+		</filter>
52 
+		<filter>
53 
+			<id>1520406370806</id>
54 
+			<name></name>
55 
+			<type>26</type>
56 
+			<matcher>
57 
+				<id>org.eclipse.ui.ide.multiFilter</id>
58 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
59 
+			</matcher>
60 
+		</filter>
61 
+		<filter>
62 
+			<id>1520987770444</id>
63 
+			<name></name>
64 
+			<type>26</type>
65 
+			<matcher>
66 
+				<id>org.eclipse.ui.ide.multiFilter</id>
67 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
68 
+			</matcher>
69 
+		</filter>
70 
+		<filter>
71 
+			<id>1522328225927</id>
72 
+			<name></name>
73 
+			<type>26</type>
74 
+			<matcher>
75 
+				<id>org.eclipse.ui.ide.multiFilter</id>
76 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
77 
+			</matcher>
78 
+		</filter>
79 
+		<filter>
80 
+			<id>1522369426201</id>
81 
+			<name></name>
82 
+			<type>26</type>
83 
+			<matcher>
84 
+				<id>org.eclipse.ui.ide.multiFilter</id>
85 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
86 
+			</matcher>
87 
+		</filter>
88 
+		<filter>
89 
+			<id>1522674234989</id>
90 
+			<name></name>
91 
+			<type>26</type>
92 
+			<matcher>
93 
+				<id>org.eclipse.ui.ide.multiFilter</id>
94 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
95 
+			</matcher>
96 
+		</filter>
97 
+		<filter>
98 
+			<id>1522716525818</id>
99 
+			<name></name>
100 
+			<type>26</type>
101 
+			<matcher>
102 
+				<id>org.eclipse.ui.ide.multiFilter</id>
103 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
104 
+			</matcher>
105 
+		</filter>
106 
+		<filter>
107 
+			<id>1522755089550</id>
108 
+			<name></name>
109 
+			<type>26</type>
110 
+			<matcher>
111 
+				<id>org.eclipse.ui.ide.multiFilter</id>
112 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
113 
+			</matcher>
114 
+		</filter>
115 
+		<filter>
116 
+			<id>1522801615489</id>
117 
+			<name></name>
118 
+			<type>26</type>
119 
+			<matcher>
120 
+				<id>org.eclipse.ui.ide.multiFilter</id>
121 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
122 
+			</matcher>
123 
+		</filter>
124 
+		<filter>
125 
+			<id>1523152973916</id>
126 
+			<name></name>
127 
+			<type>26</type>
128 
+			<matcher>
129 
+				<id>org.eclipse.ui.ide.multiFilter</id>
130 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
131 
+			</matcher>
132 
+		</filter>
133 
+		<filter>
134 
+			<id>1523431087245</id>
135 
+			<name></name>
136 
+			<type>26</type>
137 
+			<matcher>
138 
+				<id>org.eclipse.ui.ide.multiFilter</id>
139 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
140 
+			</matcher>
141 
+		</filter>
142 
+		<filter>
143 
+			<id>1523599542083</id>
144 
+			<name></name>
145 
+			<type>26</type>
146 
+			<matcher>
147 
+				<id>org.eclipse.ui.ide.multiFilter</id>
148 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
149 
+			</matcher>
150 
+		</filter>
151 
+		<filter>
152 
+			<id>1524012284034</id>
153 
+			<name></name>
154 
+			<type>26</type>
155 
+			<matcher>
156 
+				<id>org.eclipse.ui.ide.multiFilter</id>
157 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
158 
+			</matcher>
159 
+		</filter>
160 
+		<filter>
161 
+			<id>1525309830300</id>
162 
+			<name></name>
163 
+			<type>26</type>
164 
+			<matcher>
165 
+				<id>org.eclipse.ui.ide.multiFilter</id>
166 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
167 
+			</matcher>
168 
+		</filter>
169 
+		<filter>
170 
+			<id>1526616137192</id>
171 
+			<name></name>
172 
+			<type>26</type>
173 
+			<matcher>
174 
+				<id>org.eclipse.ui.ide.multiFilter</id>
175 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
176 
+			</matcher>
177 
+		</filter>
178 
+		<filter>
179 
+			<id>1572405524965</id>
180 
+			<name></name>
181 
+			<type>26</type>
182 
+			<matcher>
183 
+				<id>org.eclipse.ui.ide.multiFilter</id>
184 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
185 
+			</matcher>
186 
+		</filter>
187 
+		<filter>
188 
+			<id>1573713417621</id>
189 
+			<name></name>
190 
+			<type>26</type>
191 
+			<matcher>
192 
+				<id>org.eclipse.ui.ide.multiFilter</id>
193 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
194 
+			</matcher>
195 
+		</filter>
196 
+		<filter>
197 
+			<id>1577703758786</id>
198 
+			<name></name>
199 
+			<type>26</type>
200 
+			<matcher>
201 
+				<id>org.eclipse.ui.ide.multiFilter</id>
202 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
203 
+			</matcher>
204 
+		</filter>
205 
+		<filter>
206 
+			<id>1582533010528</id>
207 
+			<name></name>
208 
+			<type>26</type>
209 
+			<matcher>
210 
+				<id>org.eclipse.ui.ide.multiFilter</id>
211 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
212 
+			</matcher>
213 
+		</filter>
214 
+		<filter>
215 
+			<id>1586844160429</id>
216 
+			<name></name>
217 
+			<type>26</type>
218 
+			<matcher>
219 
+				<id>org.eclipse.ui.ide.multiFilter</id>
220 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
221 
+			</matcher>
222 
+		</filter>
223 
+		<filter>
224 
+			<id>1662016130863</id>
225 
+			<name></name>
226 
+			<type>26</type>
227 
+			<matcher>
228 
+				<id>org.eclipse.ui.ide.multiFilter</id>
229 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
230 
+			</matcher>
231 
+		</filter>
232 
+		<filter>
233 
+			<id>1710299377997</id>
234 
+			<name></name>
235 
+			<type>26</type>
236 
+			<matcher>
237 
+				<id>org.eclipse.ui.ide.multiFilter</id>
238 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
239 
+			</matcher>
240 
+		</filter>
241 
+	</filteredResources>
242 
+</projectDescription>
243 
+=======
244 
+<?xml version="1.0" encoding="UTF-8"?>
245 
+<projectDescription>
246 
+	<name>shangqiuapp</name>
247 
+	<comment>Create By HBuilder</comment>
248 
+	<projects>
249 
+	</projects>
250 
+	<buildSpec>
251 
+		<buildCommand>
252 
+			<name>com.pandora.projects.ui.MKeyBuilder</name>
253 
+			<arguments>
254 
+			</arguments>
255 
+		</buildCommand>
256 
+		<buildCommand>
257 
+			<name>com.aptana.ide.core.unifiedBuilder</name>
258 
+			<arguments>
259 
+			</arguments>
260 
+		</buildCommand>
261 
+	</buildSpec>
262 
+	<natures>
263 
+		<nature>com.pandora.projects.ui.MKeyNature</nature>
264 
+		<nature>com.aptana.projects.webnature</nature>
265 
+	</natures>
266 
+	<filteredResources>
267 
+		<filter>
268 
+			<id>1515635430185</id>
269 
+			<name></name>
270 
+			<type>10</type>
271 
+			<matcher>
272 
+				<id>org.eclipse.ui.ide.orFilterMatcher</id>
273 
+				<arguments>
274 
+					<matcher>
275 
+						<id>org.eclipse.ui.ide.multiFilter</id>
276 
+						<arguments>1.0-projectRelativePath-matches-false-false-bin</arguments>
277 
+					</matcher>
278 
+					<matcher>
279 
+						<id>org.eclipse.ui.ide.multiFilter</id>
280 
+						<arguments>1.0-projectRelativePath-matches-false-false-setting</arguments>
281 
+					</matcher>
282 
+				</arguments>
283 
+			</matcher>
284 
+		</filter>
285 
+		<filter>
286 
+			<id>1520406370806</id>
287 
+			<name></name>
288 
+			<type>26</type>
289 
+			<matcher>
290 
+				<id>org.eclipse.ui.ide.multiFilter</id>
291 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
292 
+			</matcher>
293 
+		</filter>
294 
+		<filter>
295 
+			<id>1520406370806</id>
296 
+			<name></name>
297 
+			<type>26</type>
298 
+			<matcher>
299 
+				<id>org.eclipse.ui.ide.multiFilter</id>
300 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
301 
+			</matcher>
302 
+		</filter>
303 
+		<filter>
304 
+			<id>1520987770444</id>
305 
+			<name></name>
306 
+			<type>26</type>
307 
+			<matcher>
308 
+				<id>org.eclipse.ui.ide.multiFilter</id>
309 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
310 
+			</matcher>
311 
+		</filter>
312 
+		<filter>
313 
+			<id>1522328225927</id>
314 
+			<name></name>
315 
+			<type>26</type>
316 
+			<matcher>
317 
+				<id>org.eclipse.ui.ide.multiFilter</id>
318 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
319 
+			</matcher>
320 
+		</filter>
321 
+		<filter>
322 
+			<id>1522369426201</id>
323 
+			<name></name>
324 
+			<type>26</type>
325 
+			<matcher>
326 
+				<id>org.eclipse.ui.ide.multiFilter</id>
327 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
328 
+			</matcher>
329 
+		</filter>
330 
+		<filter>
331 
+			<id>1522674234989</id>
332 
+			<name></name>
333 
+			<type>26</type>
334 
+			<matcher>
335 
+				<id>org.eclipse.ui.ide.multiFilter</id>
336 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
337 
+			</matcher>
338 
+		</filter>
339 
+		<filter>
340 
+			<id>1522716525818</id>
341 
+			<name></name>
342 
+			<type>26</type>
343 
+			<matcher>
344 
+				<id>org.eclipse.ui.ide.multiFilter</id>
345 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
346 
+			</matcher>
347 
+		</filter>
348 
+		<filter>
349 
+			<id>1522755089550</id>
350 
+			<name></name>
351 
+			<type>26</type>
352 
+			<matcher>
353 
+				<id>org.eclipse.ui.ide.multiFilter</id>
354 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
355 
+			</matcher>
356 
+		</filter>
357 
+		<filter>
358 
+			<id>1522801615489</id>
359 
+			<name></name>
360 
+			<type>26</type>
361 
+			<matcher>
362 
+				<id>org.eclipse.ui.ide.multiFilter</id>
363 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
364 
+			</matcher>
365 
+		</filter>
366 
+		<filter>
367 
+			<id>1523152973916</id>
368 
+			<name></name>
369 
+			<type>26</type>
370 
+			<matcher>
371 
+				<id>org.eclipse.ui.ide.multiFilter</id>
372 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
373 
+			</matcher>
374 
+		</filter>
375 
+		<filter>
376 
+			<id>1523431087245</id>
377 
+			<name></name>
378 
+			<type>26</type>
379 
+			<matcher>
380 
+				<id>org.eclipse.ui.ide.multiFilter</id>
381 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
382 
+			</matcher>
383 
+		</filter>
384 
+		<filter>
385 
+			<id>1523599542083</id>
386 
+			<name></name>
387 
+			<type>26</type>
388 
+			<matcher>
389 
+				<id>org.eclipse.ui.ide.multiFilter</id>
390 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
391 
+			</matcher>
392 
+		</filter>
393 
+		<filter>
394 
+			<id>1524012284034</id>
395 
+			<name></name>
396 
+			<type>26</type>
397 
+			<matcher>
398 
+				<id>org.eclipse.ui.ide.multiFilter</id>
399 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
400 
+			</matcher>
401 
+		</filter>
402 
+		<filter>
403 
+			<id>1525309830300</id>
404 
+			<name></name>
405 
+			<type>26</type>
406 
+			<matcher>
407 
+				<id>org.eclipse.ui.ide.multiFilter</id>
408 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
409 
+			</matcher>
410 
+		</filter>
411 
+		<filter>
412 
+			<id>1526616137192</id>
413 
+			<name></name>
414 
+			<type>26</type>
415 
+			<matcher>
416 
+				<id>org.eclipse.ui.ide.multiFilter</id>
417 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
418 
+			</matcher>
419 
+		</filter>
420 
+		<filter>
421 
+			<id>1572405524965</id>
422 
+			<name></name>
423 
+			<type>26</type>
424 
+			<matcher>
425 
+				<id>org.eclipse.ui.ide.multiFilter</id>
426 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
427 
+			</matcher>
428 
+		</filter>
429 
+		<filter>
430 
+			<id>1573713417621</id>
431 
+			<name></name>
432 
+			<type>26</type>
433 
+			<matcher>
434 
+				<id>org.eclipse.ui.ide.multiFilter</id>
435 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
436 
+			</matcher>
437 
+		</filter>
438 
+		<filter>
439 
+			<id>1577703758786</id>
440 
+			<name></name>
441 
+			<type>26</type>
442 
+			<matcher>
443 
+				<id>org.eclipse.ui.ide.multiFilter</id>
444 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
445 
+			</matcher>
446 
+		</filter>
447 
+		<filter>
448 
+			<id>1582533010528</id>
449 
+			<name></name>
450 
+			<type>26</type>
451 
+			<matcher>
452 
+				<id>org.eclipse.ui.ide.multiFilter</id>
453 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
454 
+			</matcher>
455 
+		</filter>
456 
+		<filter>
457 
+			<id>1586844160429</id>
458 
+			<name></name>
459 
+			<type>26</type>
460 
+			<matcher>
461 
+				<id>org.eclipse.ui.ide.multiFilter</id>
462 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
463 
+			</matcher>
464 
+		</filter>
465 
+		<filter>
466 
+			<id>1662016130863</id>
467 
+			<name></name>
468 
+			<type>26</type>
469 
+			<matcher>
470 
+				<id>org.eclipse.ui.ide.multiFilter</id>
471 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
472 
+			</matcher>
473 
+		</filter>
474 
+		<filter>
475 
+			<id>1713435398664</id>
476 
+			<name></name>
477 
+			<type>26</type>
478 
+			<matcher>
479 
+				<id>org.eclipse.ui.ide.multiFilter</id>
480 
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
481 
+			</matcher>
482 
+		</filter>
483 
+	</filteredResources>
484 
+</projectDescription>
485 
+>>>>>>> dc8886372f33ab5a85b88d764e008237f3ac82e1

+ 4 - 0
双汇APP-andriod/js/login.js
View File 

@@ -9,7 +9,11 @@ mui.plusReady(function() {
9 9 
 		document.getElementById("password").value = localStorage.getItem("psw");
10 10 
 	}
11 11 
 	document.getElementById("login").addEventListener('tap', function() {
12 
+<<<<<<< HEAD
13 
+		alert("111")
14 
+=======
12 15
16 
+>>>>>>> dc8886372f33ab5a85b88d764e008237f3ac82e1
13 17 
 		var username = document.getElementById('account').value;
14 18 
 		var password = document.getElementById('password').value;
15 19 
 		var data = {