Skip to content

杨建斌 / dy-wx2

Go to a project
Toggle navigation
Toggle navigation pinning
c4caec3a by unknown
Options

pay update

1 parent 4ebea400
Inline Side-by-side
Showing 16 changed files with 556 additions and 44 deletions
.idea/encodings.xml 0 → 100644
1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4">
3 <component name="Encoding">
4 <file url="PROJECT" charset="UTF-8" />
5 </component>
6 </project>
...\ No newline at end of file ...\ No newline at end of file
.idea/h5wx.iml 0 → 100644
1 <?xml version="1.0" encoding="UTF-8"?>
2 <module type="WEB_MODULE" version="4">
3 <component name="NewModuleRootManager">
4 <content url="file://$MODULE_DIR$">
5 <excludeFolder url="file://$MODULE_DIR$/.tmp" />
6 <excludeFolder url="file://$MODULE_DIR$/temp" />
7 <excludeFolder url="file://$MODULE_DIR$/tmp" />
8 </content>
9 <orderEntry type="inheritedJdk" />
10 <orderEntry type="sourceFolder" forTests="false" />
11 </component>
12 </module>
...\ No newline at end of file ...\ No newline at end of file
.idea/modules.xml 0 → 100644
1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4">
3 <component name="ProjectModuleManager">
4 <modules>
5 <module fileurl="file://$PROJECT_DIR$/.idea/h5wx.iml" filepath="$PROJECT_DIR$/.idea/h5wx.iml" />
6 </modules>
7 </component>
8 </project>
...\ No newline at end of file ...\ No newline at end of file
.idea/vcs.xml 0 → 100644
1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4">
3 <component name="VcsDirectoryMappings">
4 <mapping directory="$PROJECT_DIR$" vcs="Git" />
5 </component>
6 </project>
...\ No newline at end of file ...\ No newline at end of file
.idea/workspace.xml 0 → 100644
1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4">
3 <component name="ChangeListManager">
4 <list default="true" id="f03425da-2e43-4e8a-b218-238983912f5c" name="Default" comment="">
5 <change beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
6 <change beforePath="$PROJECT_DIR$/css/app.css" afterPath="$PROJECT_DIR$/css/app.css" />
7 <change beforePath="$PROJECT_DIR$/html/bondPay.html" afterPath="$PROJECT_DIR$/html/bondPay.html" />
8 <change beforePath="$PROJECT_DIR$/html/main.html" afterPath="$PROJECT_DIR$/html/main.html" />
9 <change beforePath="$PROJECT_DIR$/html/prepay.html" afterPath="$PROJECT_DIR$/html/prepay.html" />
10 <change beforePath="$PROJECT_DIR$/js/controller/bondController.js" afterPath="$PROJECT_DIR$/js/controller/bondController.js" />
11 <change beforePath="$PROJECT_DIR$/js/controller/bondPayController.js" afterPath="$PROJECT_DIR$/js/controller/bondPayController.js" />
12 <change beforePath="$PROJECT_DIR$/js/controller/mainController.js" afterPath="$PROJECT_DIR$/js/controller/mainController.js" />
13 <change beforePath="$PROJECT_DIR$/js/controller/mapController.js" afterPath="$PROJECT_DIR$/js/controller/mapController.js" />
14 <change beforePath="$PROJECT_DIR$/js/service/globalService.js" afterPath="$PROJECT_DIR$/js/service/globalService.js" />
15 <change beforePath="$PROJECT_DIR$/js/service/wechatPaymentService.js" afterPath="$PROJECT_DIR$/js/service/wechatPaymentService.js" />
16 <change beforePath="$PROJECT_DIR$/js/service/weixinConfig.js" afterPath="$PROJECT_DIR$/js/service/weixinConfig.js" />
17 </list>
18 <ignored path="$PROJECT_DIR$/.tmp/" />
19 <ignored path="$PROJECT_DIR$/temp/" />
20 <ignored path="$PROJECT_DIR$/tmp/" />
21 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
22 <option name="TRACKING_ENABLED" value="true" />
23 <option name="SHOW_DIALOG" value="false" />
24 <option name="HIGHLIGHT_CONFLICTS" value="true" />
25 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
26 <option name="LAST_RESOLUTION" value="IGNORE" />
27 </component>
28 <component name="FileEditorManager">
29 <splitter split-orientation="horizontal" split-proportion="0.321972">
30 <split-first>
31 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
32 <file leaf-file-name="bondPay.html" pinned="false" current-in-tab="true">
33 <entry file="file://$PROJECT_DIR$/html/bondPay.html">
34 <provider selected="true" editor-type-id="text-editor">
35 <state relative-caret-position="437">
36 <caret line="23" column="6" lean-forward="true" selection-start-line="23" selection-start-column="6" selection-end-line="23" selection-end-column="6" />
37 <folding />
38 </state>
39 </provider>
40 </entry>
41 </file>
42 <file leaf-file-name="app.css" pinned="false" current-in-tab="false">
43 <entry file="file://$PROJECT_DIR$/css/app.css">
44 <provider selected="true" editor-type-id="text-editor">
45 <state relative-caret-position="228">
46 <caret line="1017" column="1" lean-forward="true" selection-start-line="1017" selection-start-column="1" selection-end-line="1017" selection-end-column="1" />
47 <folding />
48 </state>
49 </provider>
50 </entry>
51 </file>
52 </leaf>
53 </split-first>
54 <split-second>
55 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
56 <file leaf-file-name="bondPayController.js" pinned="false" current-in-tab="false">
57 <entry file="file://$PROJECT_DIR$/js/controller/bondPayController.js">
58 <provider selected="true" editor-type-id="text-editor">
59 <state relative-caret-position="395">
60 <caret line="25" column="30" lean-forward="true" selection-start-line="25" selection-start-column="30" selection-end-line="25" selection-end-column="30" />
61 <folding />
62 </state>
63 </provider>
64 </entry>
65 </file>
66 <file leaf-file-name="globalService.js" pinned="false" current-in-tab="false">
67 <entry file="file://$PROJECT_DIR$/js/service/globalService.js">
68 <provider selected="true" editor-type-id="text-editor">
69 <state relative-caret-position="414">
70 <caret line="41" column="72" lean-forward="true" selection-start-line="41" selection-start-column="72" selection-end-line="41" selection-end-column="72" />
71 <folding />
72 </state>
73 </provider>
74 </entry>
75 </file>
76 <file leaf-file-name="weixinConfig.js" pinned="false" current-in-tab="false">
77 <entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js">
78 <provider selected="true" editor-type-id="text-editor">
79 <state relative-caret-position="76">
80 <caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
81 <folding />
82 </state>
83 </provider>
84 </entry>
85 </file>
86 <file leaf-file-name="wechatPaymentService.js" pinned="false" current-in-tab="true">
87 <entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js">
88 <provider selected="true" editor-type-id="text-editor">
89 <state relative-caret-position="95">
90 <caret line="5" column="0" lean-forward="true" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
91 <folding>
92 <element signature="e#579#2039#0" expanded="false" />
93 </folding>
94 </state>
95 </provider>
96 </entry>
97 </file>
98 <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
99 <entry file="file://$PROJECT_DIR$/index.html">
100 <provider selected="true" editor-type-id="text-editor">
101 <state relative-caret-position="57">
102 <caret line="89" column="30" lean-forward="true" selection-start-line="89" selection-start-column="30" selection-end-line="89" selection-end-column="30" />
103 <folding />
104 </state>
105 </provider>
106 </entry>
107 </file>
108 <file leaf-file-name="bondController.js" pinned="false" current-in-tab="false">
109 <entry file="file://$PROJECT_DIR$/js/controller/bondController.js">
110 <provider selected="true" editor-type-id="text-editor">
111 <state relative-caret-position="-190">
112 <caret line="20" column="34" lean-forward="false" selection-start-line="20" selection-start-column="34" selection-end-line="20" selection-end-column="34" />
113 <folding />
114 </state>
115 </provider>
116 </entry>
117 </file>
118 </leaf>
119 </split-second>
120 </splitter>
121 </component>
122 <component name="FindInProjectRecents">
123 <findStrings>
124 <find>globalService.getData(&quot;user&quot;)</find>
125 <find>getData</find>
126 <find>menuControl</find>
127 <find>openMenu</find>
128 <find>alipay</find>
129 </findStrings>
130 </component>
131 <component name="Git.Settings">
132 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
133 </component>
134 <component name="IdeDocumentHistory">
135 <option name="CHANGED_PATHS">
136 <list>
137 <option value="$PROJECT_DIR$/index.html" />
138 <option value="$PROJECT_DIR$/js/controller/mapController.js" />
139 <option value="$PROJECT_DIR$/html/main.html" />
140 <option value="$PROJECT_DIR$/html/bondPay.html" />
141 <option value="$PROJECT_DIR$/css/app.css" />
142 <option value="$PROJECT_DIR$/js/controller/bondController.js" />
143 <option value="$PROJECT_DIR$/js/service/dingdaService.js" />
144 <option value="$PROJECT_DIR$/js/controller/bondPayController.js" />
145 <option value="$PROJECT_DIR$/js/service/globalService.js" />
146 <option value="$PROJECT_DIR$/js/service/wechatPaymentService.js" />
147 </list>
148 </option>
149 </component>
150 <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
151 <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
152 <component name="JsGulpfileManager">
153 <detection-done>true</detection-done>
154 <sorting>DEFINITION_ORDER</sorting>
155 </component>
156 <component name="ProjectFrameBounds" extendedState="6">
157 <option name="x" value="-178" />
158 <option name="y" value="222" />
159 <option name="width" value="1932" />
160 <option name="height" value="1056" />
161 </component>
162 <component name="ProjectView">
163 <navigator currentView="ProjectPane" proportions="" version="1">
164 <flattenPackages />
165 <showMembers />
166 <showModules />
167 <showLibraryContents />
168 <hideEmptyPackages />
169 <abbreviatePackageNames />
170 <autoscrollToSource />
171 <autoscrollFromSource />
172 <sortByType />
173 <manualOrder />
174 <foldersAlwaysOnTop value="true" />
175 </navigator>
176 <panes>
177 <pane id="Scratches" />
178 <pane id="Scope" />
179 <pane id="ProjectPane">
180 <subPane>
181 <expand>
182 <path>
183 <item name="h5wx" type="b2602c69:ProjectViewProjectNode" />
184 <item name="h5wx" type="462c0819:PsiDirectoryNode" />
185 </path>
186 <path>
187 <item name="h5wx" type="b2602c69:ProjectViewProjectNode" />
188 <item name="h5wx" type="462c0819:PsiDirectoryNode" />
189 <item name="html" type="462c0819:PsiDirectoryNode" />
190 </path>
191 <path>
192 <item name="h5wx" type="b2602c69:ProjectViewProjectNode" />
193 <item name="h5wx" type="462c0819:PsiDirectoryNode" />
194 <item name="js" type="462c0819:PsiDirectoryNode" />
195 </path>
196 <path>
197 <item name="h5wx" type="b2602c69:ProjectViewProjectNode" />
198 <item name="h5wx" type="462c0819:PsiDirectoryNode" />
199 <item name="js" type="462c0819:PsiDirectoryNode" />
200 <item name="service" type="462c0819:PsiDirectoryNode" />
201 </path>
202 </expand>
203 <select />
204 </subPane>
205 </pane>
206 </panes>
207 </component>
208 <component name="PropertiesComponent">
209 <property name="last_opened_file_path" value="$PROJECT_DIR$" />
210 <property name="settings.editor.selected.configurable" value="project.propDebugger" />
211 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
212 <property name="WebServerToolWindowFactoryState" value="false" />
213 <property name="HbShouldOpenHtmlAsHb" value="" />
214 </component>
215 <component name="RunDashboard">
216 <option name="ruleStates">
217 <list>
218 <RuleState>
219 <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
220 </RuleState>
221 <RuleState>
222 <option name="name" value="StatusDashboardGroupingRule" />
223 </RuleState>
224 </list>
225 </option>
226 </component>
227 <component name="ShelveChangesManager" show_recycled="false">
228 <option name="remove_strategy" value="false" />
229 </component>
230 <component name="SvnConfiguration" myUseAcceleration="nothing">
231 <configuration>C:\Users\enxin\AppData\Roaming\Subversion</configuration>
232 </component>
233 <component name="TaskManager">
234 <task active="true" id="Default" summary="Default task">
235 <changelist id="f03425da-2e43-4e8a-b218-238983912f5c" name="Default" comment="" />
236 <created>1534082685029</created>
237 <option name="number" value="Default" />
238 <option name="presentableId" value="Default" />
239 <updated>1534082685029</updated>
240 <workItem from="1534082686441" duration="5120000" />
241 <workItem from="1534165685107" duration="4410000" />
242 </task>
243 <servers />
244 </component>
245 <component name="TimeTrackingManager">
246 <option name="totallyTimeSpent" value="9530000" />
247 </component>
248 <component name="ToolWindowManager">
249 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
250 <editor active="true" />
251 <layout>
252 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13435195" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
253 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
254 <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
255 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
256 <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
257 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32936078" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
258 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
259 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
260 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
261 <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
262 <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
263 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
264 <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
265 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
266 <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
267 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
268 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
269 </layout>
270 </component>
271 <component name="TypeScriptGeneratedFilesManager">
272 <option name="version" value="1" />
273 </component>
274 <component name="VcsContentAnnotationSettings">
275 <option name="myLimit" value="2678400000" />
276 </component>
277 <component name="XDebuggerManager">
278 <breakpoint-manager />
279 <watches-manager />
280 </component>
281 <component name="editorHistoryManager">
282 <entry file="file://$PROJECT_DIR$/html/bondPay.html">
283 <provider selected="true" editor-type-id="text-editor">
284 <state relative-caret-position="95">
285 <caret line="5" column="83" lean-forward="false" selection-start-line="5" selection-start-column="73" selection-end-line="5" selection-end-column="83" />
286 <folding />
287 </state>
288 </provider>
289 </entry>
290 <entry file="file://$PROJECT_DIR$/css/app.css">
291 <provider selected="true" editor-type-id="text-editor">
292 <state relative-caret-position="19380">
293 <caret line="1020" column="24" lean-forward="true" selection-start-line="1020" selection-start-column="24" selection-end-line="1020" selection-end-column="24" />
294 <folding />
295 </state>
296 </provider>
297 </entry>
298 <entry file="file://$PROJECT_DIR$/js/controller/bondPayController.js">
299 <provider selected="true" editor-type-id="text-editor">
300 <state relative-caret-position="0">
301 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
302 <folding />
303 </state>
304 </provider>
305 </entry>
306 <entry file="file://$PROJECT_DIR$/index.html">
307 <provider selected="true" editor-type-id="text-editor">
308 <state relative-caret-position="1653">
309 <caret line="87" column="7" lean-forward="true" selection-start-line="87" selection-start-column="7" selection-end-line="87" selection-end-column="7" />
310 <folding />
311 </state>
312 </provider>
313 </entry>
314 <entry file="file://$PROJECT_DIR$/js/controller/bondController.js">
315 <provider selected="true" editor-type-id="text-editor">
316 <state relative-caret-position="342">
317 <caret line="18" column="60" lean-forward="false" selection-start-line="18" selection-start-column="60" selection-end-line="18" selection-end-column="60" />
318 <folding />
319 </state>
320 </provider>
321 </entry>
322 <entry file="file://$PROJECT_DIR$/js/controller/mapController.js">
323 <provider selected="true" editor-type-id="text-editor">
324 <state relative-caret-position="-613">
325 <caret line="196" column="60" lean-forward="true" selection-start-line="196" selection-start-column="60" selection-end-line="196" selection-end-column="60" />
326 </state>
327 </provider>
328 </entry>
329 <entry file="file://$PROJECT_DIR$/html/pay.html">
330 <provider selected="true" editor-type-id="text-editor">
331 <state relative-caret-position="0">
332 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
333 </state>
334 </provider>
335 </entry>
336 <entry file="file://$PROJECT_DIR$/html/prepay.html">
337 <provider selected="true" editor-type-id="text-editor">
338 <state relative-caret-position="38">
339 <caret line="2" column="35" lean-forward="true" selection-start-line="2" selection-start-column="35" selection-end-line="2" selection-end-column="35" />
340 </state>
341 </provider>
342 </entry>
343 <entry file="file://$PROJECT_DIR$/html/login.html">
344 <provider selected="true" editor-type-id="text-editor">
345 <state relative-caret-position="304">
346 <caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
347 </state>
348 </provider>
349 </entry>
350 <entry file="file://$PROJECT_DIR$/html/freeTimes.html">
351 <provider selected="true" editor-type-id="text-editor">
352 <state relative-caret-position="0">
353 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
354 </state>
355 </provider>
356 </entry>
357 <entry file="file://$PROJECT_DIR$/html/main.html">
358 <provider selected="true" editor-type-id="text-editor">
359 <state relative-caret-position="57">
360 <caret line="3" column="57" lean-forward="false" selection-start-line="3" selection-start-column="19" selection-end-line="3" selection-end-column="57" />
361 </state>
362 </provider>
363 </entry>
364 <entry file="file://$PROJECT_DIR$/js/controller/mainController.js">
365 <provider selected="true" editor-type-id="text-editor">
366 <state relative-caret-position="280">
367 <caret line="103" column="31" lean-forward="false" selection-start-line="103" selection-start-column="23" selection-end-line="103" selection-end-column="31" />
368 </state>
369 </provider>
370 </entry>
371 <entry file="file://$PROJECT_DIR$/css/app.css">
372 <provider selected="true" editor-type-id="text-editor">
373 <state relative-caret-position="228">
374 <caret line="1017" column="1" lean-forward="true" selection-start-line="1017" selection-start-column="1" selection-end-line="1017" selection-end-column="1" />
375 <folding />
376 </state>
377 </provider>
378 </entry>
379 <entry file="file://$PROJECT_DIR$/html/bondPay.html">
380 <provider selected="true" editor-type-id="text-editor">
381 <state relative-caret-position="437">
382 <caret line="23" column="6" lean-forward="true" selection-start-line="23" selection-start-column="6" selection-end-line="23" selection-end-column="6" />
383 <folding />
384 </state>
385 </provider>
386 </entry>
387 <entry file="file://$PROJECT_DIR$/index.html">
388 <provider selected="true" editor-type-id="text-editor">
389 <state relative-caret-position="57">
390 <caret line="89" column="30" lean-forward="true" selection-start-line="89" selection-start-column="30" selection-end-line="89" selection-end-column="30" />
391 <folding />
392 </state>
393 </provider>
394 </entry>
395 <entry file="file://$PROJECT_DIR$/js/controller/bondController.js">
396 <provider selected="true" editor-type-id="text-editor">
397 <state relative-caret-position="-190">
398 <caret line="20" column="34" lean-forward="false" selection-start-line="20" selection-start-column="34" selection-end-line="20" selection-end-column="34" />
399 <folding />
400 </state>
401 </provider>
402 </entry>
403 <entry file="file://$PROJECT_DIR$/js/service/dingdaService.js">
404 <provider selected="true" editor-type-id="text-editor">
405 <state relative-caret-position="247">
406 <caret line="138" column="18" lean-forward="true" selection-start-line="138" selection-start-column="18" selection-end-line="138" selection-end-column="18" />
407 <folding />
408 </state>
409 </provider>
410 </entry>
411 <entry file="file://$PROJECT_DIR$/js/controller/bondPayController.js">
412 <provider selected="true" editor-type-id="text-editor">
413 <state relative-caret-position="395">
414 <caret line="25" column="30" lean-forward="true" selection-start-line="25" selection-start-column="30" selection-end-line="25" selection-end-column="30" />
415 <folding />
416 </state>
417 </provider>
418 </entry>
419 <entry file="file://$PROJECT_DIR$/js/service/globalService.js">
420 <provider selected="true" editor-type-id="text-editor">
421 <state relative-caret-position="414">
422 <caret line="41" column="72" lean-forward="true" selection-start-line="41" selection-start-column="72" selection-end-line="41" selection-end-column="72" />
423 <folding />
424 </state>
425 </provider>
426 </entry>
427 <entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js">
428 <provider selected="true" editor-type-id="text-editor">
429 <state relative-caret-position="76">
430 <caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
431 <folding />
432 </state>
433 </provider>
434 </entry>
435 <entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js">
436 <provider selected="true" editor-type-id="text-editor">
437 <state relative-caret-position="95">
438 <caret line="5" column="0" lean-forward="true" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
439 <folding>
440 <element signature="e#579#2039#0" expanded="false" />
441 </folding>
442 </state>
443 </provider>
444 </entry>
445 </component>
446 </project>
...\ No newline at end of file ...\ No newline at end of file
css/app.css
...@@ -1017,7 +1017,9 @@ body, button, input, select, textarea { ...@@ -1017,7 +1017,9 @@ body, button, input, select, textarea {
1017 font-size: 10px; 1017 font-size: 10px;
1018 } 1018 }
1019 1019
1020 1020 .pay-active{
1021 background: #acacac;
1022 }
1021 1023
1022 1024
1023 1025
......
html/bondPay.html
1 <div ng-controller="bondPayController" class="payPanel"> 1 <div ng-controller="bondPayController" class="payPanel">
2 <div class="paywayMenu"> 2 <div class="paywayMenu">
3 <div class="paywayMenuItem"> 3 <div ng-click="payType = 100" class="paywayMenuItem" ng-class="{'pay-active': payType === 100}">
4 <img src="images/alipay.png" /> 支付宝
5 </div>
6 <div ng-click="payType = 101" class="paywayMenuItem" ng-class="{'pay-active': payType === 101}">
4 <img src="images/wechat.png" /> 微信支付 7 <img src="images/wechat.png" /> 微信支付
5 </div> 8 </div>
6 </div> 9 </div>
......
html/main.html
1 <div ng-controller="mainController"> 1 <div ng-controller="mainController">
2 <div id="mapContainer" class="mapContainer" ng-controller="mapController"></div> 2 <div id="mapContainer" class="mapContainer" ng-controller="mapController"></div>
3 <div id="sliderMenu" class="sliderMenu" style="display: none;" 3 <div id="sliderMenu" class="sliderMenu" style="display: block;"
4 ng-class="{true: 'menuOpen', false: 'menuClose'}[$root.openMenu]"> 4 ng-class="{true: 'menuOpen', false: 'menuClose'}[$root.openMenu]">
5 5
6 <img src="images/slideMenuBackground.png"/> 6 <img src="images/slideMenuBackground.png"/>
......
html/prepay.html
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
35 </div> 35 </div>
36 36
37 <div id="alipayform" style="display: none"> 37 <div id="alipayform" style="display: none">
38 <form action="http://lsz1.28ms.com/service/balance/alipay/h5" method="post"> 38 <form action="http://h5api.dy.dingdachuxing.com/service/balance/alipay/h5" method="post">
39 <input type="hidden" name="type" value="100"> 39 <input type="hidden" name="type" value="100">
40 <input type="hidden" name="body" value="钱包充值"> 40 <input type="hidden" name="body" value="钱包充值">
41 <div class="paywayMenu"> 41 <div class="paywayMenu">
......
js/controller/bondController.js
...@@ -15,8 +15,8 @@ angular.module('myApp') ...@@ -15,8 +15,8 @@ angular.module('myApp')
15 // } 15 // }
16 16
17 $scope.init = function(){ 17 $scope.init = function(){
18 var latitude = $stateParams.latitude; 18 var latitude = $stateParams.latitude || '120.15515';
19 var longitude = $stateParams.longitude; 19 var longitude = $stateParams.longitude || '30.27415';
20 dingdaService.getBond(longitude,latitude) 20 dingdaService.getBond(longitude,latitude)
21 .success(function(data){ 21 .success(function(data){
22 // alert(JSON.stringify(data)) 22 // alert(JSON.stringify(data))
......
js/controller/bondPayController.js
1 angular.module('myApp') 1 angular.module('myApp')
2 .controller('bondPayController',['$scope', '$rootScope', '$state', 'wechatPayment', 2 .controller('bondPayController',['$scope', '$rootScope', '$state', 'wechatPayment', 'dingdaService',
3 function($scope,$rootScope,$state, wechatPayment){ 3 function($scope,$rootScope,$state, wechatPayment, dingdaService){
4 4 $scope.payType = 100
5 if(!$rootScope.toPaid){ 5 if(!$rootScope.toPaid){
6 $state.go('bond'); 6 $state.go('bond');
7 } 7 }
8 // 支付保证金 8 // 支付保证金
9 var ispay = false; 9 var ispay = false;
10 $scope.goPay = function(){ 10 $scope.goPay = function(){
11 if(ispay) return; 11 if(ispay) return;
12 ispay = true; 12 ispay = true;
13 var IswechatPayment= window.localStorage.getItem("IswechatPayment"); 13 var IswechatPayment= window.localStorage.getItem("IswechatPayment");
14
15 if (IswechatPayment== undefined || IswechatPayment == "no") { 14 if (IswechatPayment== undefined || IswechatPayment == "no") {
16 15
17 wechatPayment.callDepositPay($rootScope.toPaid) 16 wechatPayment.callDepositTypePay($rootScope.toPaid, $scope.payType)
18 .then(function (result) { 17 .then(function (result) {
19 ispay = false; 18 ispay = false;
20 //支付成功 19 //支付成功
21 // alert(window.localStorage.getItem("IswechatPayment")); 20 // alert(window.localStorage.getItem("IswechatPayment"));
22 window.localStorage.setItem("IswechatPayment", "yes") 21 window.localStorage.setItem("IswechatPayment", "yes")
23 $state.go('bondSuccess'); 22 $state.go('bondSuccess');
24 }, function (errMsg) { 23 }, function (errMsg) {
25 ispay = false; 24 ispay = false;
26 window.localStorage.setItem("IswechatPayment", "no") 25 window.localStorage.setItem("IswechatPayment", "no")
27 //支付失败 26 //支付失败
28 }) 27 })
29 } 28 }
30 } 29 // wechatPayment.callDepositPay($rootScope.toPaid, $scope.payType)
31 30 // .then(function (result) {
31 // ispay = false;
32 // //支付成功
33 // // alert(window.localStorage.getItem("IswechatPayment"));
34 // window.localStorage.setItem("IswechatPayment", "yes")
35 // $state.go('bondSuccess');
36 // }, function (errMsg) {
37 // ispay = false;
38 // window.localStorage.setItem("IswechatPayment", "no")
39 // //支付失败
40 // })
41 // }
32 42
43 }
33 44
34 }]) 45 }])
...\ No newline at end of file ...\ No newline at end of file
......
js/controller/mainController.js
...@@ -39,6 +39,7 @@ angular.module('myApp') ...@@ -39,6 +39,7 @@ angular.module('myApp')
39 console.log(JSON.stringify(data)) 39 console.log(JSON.stringify(data))
40 }) 40 })
41 } 41 }
42
42 $scope.moduleList = []; 43 $scope.moduleList = [];
43 $scope.moduleList.push({ 44 $scope.moduleList.push({
44 name : "行程记录", 45 name : "行程记录",
......
js/controller/mapController.js
...@@ -235,15 +235,17 @@ angular.module('myApp') ...@@ -235,15 +235,17 @@ angular.module('myApp')
235 menuControlContent.src = "images/me.png"; 235 menuControlContent.src = "images/me.png";
236 236
237 menuControl.appendChild(menuControlContent); 237 menuControl.appendChild(menuControlContent);
238 238
239 menuControl.onclick = function() { 239 menuControl.onclick = function() {
240 $scope.$apply(function() { 240 $scope.$apply(function() {
241 // alert(!globalService.getData("user")) 241 // alert(!globalService.getData("user"))
242 //alert($rootScope.openMenu);
242 if(!globalService.getData("user")) { 243 if(!globalService.getData("user")) {
243 $state.go('login'); 244 $state.go('login');
244 return; 245 return;
245 } 246 }
246 $rootScope.openMenu = !$rootScope.openMenu; 247 $rootScope.openMenu = !$rootScope.openMenu;
248 //alert($rootScope.openMenu);
247 }) 249 })
248 } 250 }
249 map.getContainer().appendChild(menuControl); 251 map.getContainer().appendChild(menuControl);
...@@ -289,12 +291,14 @@ angular.module('myApp') ...@@ -289,12 +291,14 @@ angular.module('myApp')
289 291
290 getlocation(); 292 getlocation();
291 function getlocation() { 293 function getlocation() {
292 wx.getLocation({ 294 // wx.getLocation({
293 type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02' 295 // type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
294 success: function (res) { 296 // success: function (res) {
295 onSuccess(res) 297 // onSuccess(res)
296 } 298 // }
297 }); 299 // });
300
301 onSuccess({latitude:30.2741500000,longitude:120.1551500000})
298 } 302 }
299 303
300 304
...@@ -307,6 +311,7 @@ angular.module('myApp') ...@@ -307,6 +311,7 @@ angular.module('myApp')
307 } 311 }
308 var convertor = new BMap.Convertor(); 312 var convertor = new BMap.Convertor();
309 var pointArr = []; 313 var pointArr = [];
314 // alert(longitude, latitude);
310 pointArr.push(new BMap.Point(longitude, latitude)); 315 pointArr.push(new BMap.Point(longitude, latitude));
311 convertor.translate(pointArr, 3, 5, function(data){ 316 convertor.translate(pointArr, 3, 5, function(data){
312 var point = data.points[0]; 317 var point = data.points[0];
...@@ -576,8 +581,8 @@ angular.module('myApp') ...@@ -576,8 +581,8 @@ angular.module('myApp')
576 581
577 initCustomOverlay(); 582 initCustomOverlay();
578 initMap(); 583 initMap();
579 wx.ready(function() { 584 // wx.ready(function() {
580 initLocation(); 585 initLocation();
581 }) 586 // })
582 587
583 }]); 588 }]);
...\ No newline at end of file ...\ No newline at end of file
......
js/service/globalService.js
...@@ -54,7 +54,6 @@ angular.module('myApp.services') ...@@ -54,7 +54,6 @@ angular.module('myApp.services')
54 loadCityConfig(); 54 loadCityConfig();
55 loadPathParams(); 55 loadPathParams();
56 initWeixinMenu($http); 56 initWeixinMenu($http);
57
58 } 57 }
59 58
60 var loadPersistData = function() { 59 var loadPersistData = function() {
......
js/service/wechatPaymentService.js
1 angular.module('myApp.services') 1 angular.module('myApp.services')
2 .service('wechatPayment',['$http', '$q', '$rootScope','$location',function($http, $q, $rootScope,$location) { 2 .service('wechatPayment',['$http', '$q', '$rootScope','$location',function($http, $q, $rootScope,$location) {
3 3
4 //var host = 'http://finance.api.dingdachuxing.com/service'; 4 var host = 'http://finance.api.dingdachuxing.com/service';
5 var host = 'http://finance.dy.dingdatech.com/service'; 5 // var host = 'http://finance.dy.dingdatech.com/service';
6 6
7 var h5wxhost = 'http://lsz1.28ms.com/service/balance/'; 7 var payhost = 'http://lsz1.28ms.com/service'
8 8
9 var h5alipayhost = 'http://lsz1.28ms.com/service/balance/'; 9 var h5wxhost = 'http://h5api.dy.dingdachuxing.com/service/balance/';
10
11 var h5alipayhost = 'http://h5api.dy.dingdachuxing.com/service/balance/';
10 12
11 console.log('search:',$location.search()); 13 console.log('search:',$location.search());
12 14
...@@ -101,6 +103,17 @@ angular.module('myApp.services') ...@@ -101,6 +103,17 @@ angular.module('myApp.services')
101 type : 101 103 type : 101
102 }); 104 });
103 return callUnifiedOrderApi(host + "/bail/wx", param); 105 return callUnifiedOrderApi(host + "/bail/wx", param);
106 }, /**
107 * 保证金充值
108 * @param amount
109 */
110 callDepositTypePay : function(amount, type){
111 var param = Object.assign($location.search(),{
112 amount : amount,
113 body : "保证金充值",
114 type : type
115 });
116 return callUnifiedOrderApi(payhost + "/balance/" + (type === 100?'alipay': 'wx') +"/h5", param);
104 }, 117 },
105 /** 118 /**
106 * 钱包充值 119 * 钱包充值
......
js/service/weixinConfig.js
...@@ -63,7 +63,7 @@ function initWeixinMenu($http){ ...@@ -63,7 +63,7 @@ function initWeixinMenu($http){
63 .success(function(data){ 63 .success(function(data){
64 // alert(JSON.stringify(data) + ", with url : " + location.href.split('#')[0]) 64 // alert(JSON.stringify(data) + ", with url : " + location.href.split('#')[0])
65 if(data){ 65 if(data){
66 weixinOptionMenuInit(data.appid, data.timestamp, data.noncestr, data.signature); 66 // weixinOptionMenuInit(data.appid, data.timestamp, data.noncestr, data.signature);
67 } 67 }
68 }) 68 })
69 .error(function(arg1){ 69 .error(function(arg1){
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!