Skip to content

杨建斌 / dy-wx2

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

add alipay

1 parent c4caec3a
Inline Side-by-side
Showing 5 changed files with 188 additions and 82 deletions
.idea/workspace.xml
...@@ -2,18 +2,11 @@ ...@@ -2,18 +2,11 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="f03425da-2e43-4e8a-b218-238983912f5c" name="Default" comment=""> 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" /> 5 <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" /> 6 <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" /> 7 <change beforePath="$PROJECT_DIR$/html/tripDetail.html" afterPath="$PROJECT_DIR$/html/tripDetail.html" />
9 <change beforePath="$PROJECT_DIR$/html/prepay.html" afterPath="$PROJECT_DIR$/html/prepay.html" /> 8 <change beforePath="$PROJECT_DIR$/js/controller/tripDetailController.js" afterPath="$PROJECT_DIR$/js/controller/tripDetailController.js" />
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" /> 9 <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> 10 </list>
18 <ignored path="$PROJECT_DIR$/.tmp/" /> 11 <ignored path="$PROJECT_DIR$/.tmp/" />
19 <ignored path="$PROJECT_DIR$/temp/" /> 12 <ignored path="$PROJECT_DIR$/temp/" />
...@@ -26,24 +19,14 @@ ...@@ -26,24 +19,14 @@
26 <option name="LAST_RESOLUTION" value="IGNORE" /> 19 <option name="LAST_RESOLUTION" value="IGNORE" />
27 </component> 20 </component>
28 <component name="FileEditorManager"> 21 <component name="FileEditorManager">
29 <splitter split-orientation="horizontal" split-proportion="0.321972"> 22 <splitter split-orientation="horizontal" split-proportion="0.71272063">
30 <split-first> 23 <split-first>
31 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 24 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
32 <file leaf-file-name="bondPay.html" pinned="false" current-in-tab="true"> 25 <file leaf-file-name="bondPay.html" pinned="false" current-in-tab="true">
33 <entry file="file://$PROJECT_DIR$/html/bondPay.html"> 26 <entry file="file://$PROJECT_DIR$/html/bondPay.html">
34 <provider selected="true" editor-type-id="text-editor"> 27 <provider selected="true" editor-type-id="text-editor">
35 <state relative-caret-position="437"> 28 <state relative-caret-position="38">
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" /> 29 <caret line="2" column="101" lean-forward="true" selection-start-line="2" selection-start-column="101" selection-end-line="2" selection-end-column="101" />
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 /> 30 <folding />
48 </state> 31 </state>
49 </provider> 32 </provider>
...@@ -83,11 +66,11 @@ ...@@ -83,11 +66,11 @@
83 </provider> 66 </provider>
84 </entry> 67 </entry>
85 </file> 68 </file>
86 <file leaf-file-name="wechatPaymentService.js" pinned="false" current-in-tab="true"> 69 <file leaf-file-name="wechatPaymentService.js" pinned="false" current-in-tab="false">
87 <entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js"> 70 <entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js">
88 <provider selected="true" editor-type-id="text-editor"> 71 <provider selected="true" editor-type-id="text-editor">
89 <state relative-caret-position="95"> 72 <state relative-caret-position="399">
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" /> 73 <caret line="97" column="23" lean-forward="false" selection-start-line="97" selection-start-column="8" selection-end-line="97" selection-end-column="23" />
91 <folding> 74 <folding>
92 <element signature="e#579#2039#0" expanded="false" /> 75 <element signature="e#579#2039#0" expanded="false" />
93 </folding> 76 </folding>
...@@ -95,11 +78,31 @@ ...@@ -95,11 +78,31 @@
95 </provider> 78 </provider>
96 </entry> 79 </entry>
97 </file> 80 </file>
81 <file leaf-file-name="tripDetailController.js" pinned="false" current-in-tab="false">
82 <entry file="file://$PROJECT_DIR$/js/controller/tripDetailController.js">
83 <provider selected="true" editor-type-id="text-editor">
84 <state relative-caret-position="171">
85 <caret line="30" column="26" lean-forward="false" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="26" />
86 <folding />
87 </state>
88 </provider>
89 </entry>
90 </file>
91 <file leaf-file-name="tripDetail.html" pinned="false" current-in-tab="true">
92 <entry file="file://$PROJECT_DIR$/html/tripDetail.html">
93 <provider selected="true" editor-type-id="text-editor">
94 <state relative-caret-position="418">
95 <caret line="34" column="96" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="96" />
96 <folding />
97 </state>
98 </provider>
99 </entry>
100 </file>
98 <file leaf-file-name="index.html" pinned="false" current-in-tab="false"> 101 <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
99 <entry file="file://$PROJECT_DIR$/index.html"> 102 <entry file="file://$PROJECT_DIR$/index.html">
100 <provider selected="true" editor-type-id="text-editor"> 103 <provider selected="true" editor-type-id="text-editor">
101 <state relative-caret-position="57"> 104 <state relative-caret-position="76">
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" /> 105 <caret line="90" column="34" lean-forward="true" selection-start-line="90" selection-start-column="34" selection-end-line="90" selection-end-column="34" />
103 <folding /> 106 <folding />
104 </state> 107 </state>
105 </provider> 108 </provider>
...@@ -108,13 +111,23 @@ ...@@ -108,13 +111,23 @@
108 <file leaf-file-name="bondController.js" pinned="false" current-in-tab="false"> 111 <file leaf-file-name="bondController.js" pinned="false" current-in-tab="false">
109 <entry file="file://$PROJECT_DIR$/js/controller/bondController.js"> 112 <entry file="file://$PROJECT_DIR$/js/controller/bondController.js">
110 <provider selected="true" editor-type-id="text-editor"> 113 <provider selected="true" editor-type-id="text-editor">
111 <state relative-caret-position="-190"> 114 <state relative-caret-position="380">
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" /> 115 <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 /> 116 <folding />
114 </state> 117 </state>
115 </provider> 118 </provider>
116 </entry> 119 </entry>
117 </file> 120 </file>
121 <file leaf-file-name="app.css" pinned="false" current-in-tab="false">
122 <entry file="file://$PROJECT_DIR$/css/app.css">
123 <provider selected="true" editor-type-id="text-editor">
124 <state relative-caret-position="102">
125 <caret line="698" column="28" lean-forward="false" selection-start-line="698" selection-start-column="22" selection-end-line="698" selection-end-column="28" />
126 <folding />
127 </state>
128 </provider>
129 </entry>
130 </file>
118 </leaf> 131 </leaf>
119 </split-second> 132 </split-second>
120 </splitter> 133 </splitter>
...@@ -125,7 +138,11 @@ ...@@ -125,7 +138,11 @@
125 <find>getData</find> 138 <find>getData</find>
126 <find>menuControl</find> 139 <find>menuControl</find>
127 <find>openMenu</find> 140 <find>openMenu</find>
141 <find>callRentPay</find>
142 <find>.wechatPay</find>
128 <find>alipay</find> 143 <find>alipay</find>
144 <find>aliPay</find>
145 <find>wxh5ApiCall</find>
129 </findStrings> 146 </findStrings>
130 </component> 147 </component>
131 <component name="Git.Settings"> 148 <component name="Git.Settings">
...@@ -137,13 +154,15 @@ ...@@ -137,13 +154,15 @@
137 <option value="$PROJECT_DIR$/index.html" /> 154 <option value="$PROJECT_DIR$/index.html" />
138 <option value="$PROJECT_DIR$/js/controller/mapController.js" /> 155 <option value="$PROJECT_DIR$/js/controller/mapController.js" />
139 <option value="$PROJECT_DIR$/html/main.html" /> 156 <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" /> 157 <option value="$PROJECT_DIR$/js/controller/bondController.js" />
143 <option value="$PROJECT_DIR$/js/service/dingdaService.js" /> 158 <option value="$PROJECT_DIR$/js/service/dingdaService.js" />
144 <option value="$PROJECT_DIR$/js/controller/bondPayController.js" /> 159 <option value="$PROJECT_DIR$/js/controller/bondPayController.js" />
145 <option value="$PROJECT_DIR$/js/service/globalService.js" /> 160 <option value="$PROJECT_DIR$/js/service/globalService.js" />
146 <option value="$PROJECT_DIR$/js/service/wechatPaymentService.js" /> 161 <option value="$PROJECT_DIR$/js/service/wechatPaymentService.js" />
162 <option value="$PROJECT_DIR$/css/app.css" />
163 <option value="$PROJECT_DIR$/js/controller/tripDetailController.js" />
164 <option value="$PROJECT_DIR$/html/tripDetail.html" />
165 <option value="$PROJECT_DIR$/html/bondPay.html" />
147 </list> 166 </list>
148 </option> 167 </option>
149 </component> 168 </component>
...@@ -238,12 +257,12 @@ ...@@ -238,12 +257,12 @@
238 <option name="presentableId" value="Default" /> 257 <option name="presentableId" value="Default" />
239 <updated>1534082685029</updated> 258 <updated>1534082685029</updated>
240 <workItem from="1534082686441" duration="5120000" /> 259 <workItem from="1534082686441" duration="5120000" />
241 <workItem from="1534165685107" duration="4410000" /> 260 <workItem from="1534165685107" duration="9587000" />
242 </task> 261 </task>
243 <servers /> 262 <servers />
244 </component> 263 </component>
245 <component name="TimeTrackingManager"> 264 <component name="TimeTrackingManager">
246 <option name="totallyTimeSpent" value="9530000" /> 265 <option name="totallyTimeSpent" value="14707000" />
247 </component> 266 </component>
248 <component name="ToolWindowManager"> 267 <component name="ToolWindowManager">
249 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 268 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
...@@ -254,10 +273,10 @@ ...@@ -254,10 +273,10 @@
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" /> 273 <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" /> 274 <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" /> 275 <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" /> 276 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" 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" /> 277 <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" /> 278 <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" /> 279 <window_info id="Terminal" 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" />
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" /> 280 <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" /> 281 <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" /> 282 <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" />
...@@ -368,77 +387,93 @@ ...@@ -368,77 +387,93 @@
368 </state> 387 </state>
369 </provider> 388 </provider>
370 </entry> 389 </entry>
371 <entry file="file://$PROJECT_DIR$/css/app.css"> 390 <entry file="file://$PROJECT_DIR$/js/service/dingdaService.js">
372 <provider selected="true" editor-type-id="text-editor"> 391 <provider selected="true" editor-type-id="text-editor">
373 <state relative-caret-position="228"> 392 <state relative-caret-position="247">
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" /> 393 <caret line="138" column="18" lean-forward="true" selection-start-line="138" selection-start-column="18" selection-end-line="138" selection-end-column="18" />
375 <folding /> 394 <folding />
376 </state> 395 </state>
377 </provider> 396 </provider>
378 </entry> 397 </entry>
379 <entry file="file://$PROJECT_DIR$/html/bondPay.html"> 398 <entry file="file://$PROJECT_DIR$/js/controller/bondPayController.js">
380 <provider selected="true" editor-type-id="text-editor"> 399 <provider selected="true" editor-type-id="text-editor">
381 <state relative-caret-position="437"> 400 <state relative-caret-position="395">
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" /> 401 <caret line="25" column="30" lean-forward="true" selection-start-line="25" selection-start-column="30" selection-end-line="25" selection-end-column="30" />
383 <folding /> 402 <folding />
384 </state> 403 </state>
385 </provider> 404 </provider>
386 </entry> 405 </entry>
387 <entry file="file://$PROJECT_DIR$/index.html"> 406 <entry file="file://$PROJECT_DIR$/js/service/globalService.js">
388 <provider selected="true" editor-type-id="text-editor"> 407 <provider selected="true" editor-type-id="text-editor">
389 <state relative-caret-position="57"> 408 <state relative-caret-position="414">
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" /> 409 <caret line="41" column="72" lean-forward="true" selection-start-line="41" selection-start-column="72" selection-end-line="41" selection-end-column="72" />
410 <folding />
411 </state>
412 </provider>
413 </entry>
414 <entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js">
415 <provider selected="true" editor-type-id="text-editor">
416 <state relative-caret-position="76">
417 <caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
391 <folding /> 418 <folding />
392 </state> 419 </state>
393 </provider> 420 </provider>
394 </entry> 421 </entry>
395 <entry file="file://$PROJECT_DIR$/js/controller/bondController.js"> 422 <entry file="file://$PROJECT_DIR$/js/controller/bondController.js">
396 <provider selected="true" editor-type-id="text-editor"> 423 <provider selected="true" editor-type-id="text-editor">
397 <state relative-caret-position="-190"> 424 <state relative-caret-position="380">
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" /> 425 <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 /> 426 <folding />
400 </state> 427 </state>
401 </provider> 428 </provider>
402 </entry> 429 </entry>
403 <entry file="file://$PROJECT_DIR$/js/service/dingdaService.js"> 430 <entry file="file://$PROJECT_DIR$/index.html">
404 <provider selected="true" editor-type-id="text-editor"> 431 <provider selected="true" editor-type-id="text-editor">
405 <state relative-caret-position="247"> 432 <state relative-caret-position="76">
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" /> 433 <caret line="90" column="34" lean-forward="true" selection-start-line="90" selection-start-column="34" selection-end-line="90" selection-end-column="34" />
407 <folding /> 434 <folding />
408 </state> 435 </state>
409 </provider> 436 </provider>
410 </entry> 437 </entry>
411 <entry file="file://$PROJECT_DIR$/js/controller/bondPayController.js"> 438 <entry file="file://$PROJECT_DIR$/css/app.css">
412 <provider selected="true" editor-type-id="text-editor"> 439 <provider selected="true" editor-type-id="text-editor">
413 <state relative-caret-position="395"> 440 <state relative-caret-position="102">
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" /> 441 <caret line="698" column="28" lean-forward="false" selection-start-line="698" selection-start-column="22" selection-end-line="698" selection-end-column="28" />
415 <folding /> 442 <folding />
416 </state> 443 </state>
417 </provider> 444 </provider>
418 </entry> 445 </entry>
419 <entry file="file://$PROJECT_DIR$/js/service/globalService.js"> 446 <entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js">
420 <provider selected="true" editor-type-id="text-editor"> 447 <provider selected="true" editor-type-id="text-editor">
421 <state relative-caret-position="414"> 448 <state relative-caret-position="399">
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" /> 449 <caret line="97" column="23" lean-forward="false" selection-start-line="97" selection-start-column="8" selection-end-line="97" selection-end-column="23" />
450 <folding>
451 <element signature="e#579#2039#0" expanded="false" />
452 </folding>
453 </state>
454 </provider>
455 </entry>
456 <entry file="file://$PROJECT_DIR$/js/controller/tripDetailController.js">
457 <provider selected="true" editor-type-id="text-editor">
458 <state relative-caret-position="171">
459 <caret line="30" column="26" lean-forward="false" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="26" />
423 <folding /> 460 <folding />
424 </state> 461 </state>
425 </provider> 462 </provider>
426 </entry> 463 </entry>
427 <entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js"> 464 <entry file="file://$PROJECT_DIR$/html/tripDetail.html">
428 <provider selected="true" editor-type-id="text-editor"> 465 <provider selected="true" editor-type-id="text-editor">
429 <state relative-caret-position="76"> 466 <state relative-caret-position="418">
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" /> 467 <caret line="34" column="96" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="96" />
431 <folding /> 468 <folding />
432 </state> 469 </state>
433 </provider> 470 </provider>
434 </entry> 471 </entry>
435 <entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js"> 472 <entry file="file://$PROJECT_DIR$/html/bondPay.html">
436 <provider selected="true" editor-type-id="text-editor"> 473 <provider selected="true" editor-type-id="text-editor">
437 <state relative-caret-position="95"> 474 <state relative-caret-position="38">
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" /> 475 <caret line="2" column="101" lean-forward="true" selection-start-line="2" selection-start-column="101" selection-end-line="2" selection-end-column="101" />
439 <folding> 476 <folding />
440 <element signature="e#579#2039#0" expanded="false" />
441 </folding>
442 </state> 477 </state>
443 </provider> 478 </provider>
444 </entry> 479 </entry>
......
css/app.css
...@@ -696,7 +696,7 @@ body, button, input, select, textarea { ...@@ -696,7 +696,7 @@ body, button, input, select, textarea {
696 border-bottom: 1px solid #eee; 696 border-bottom: 1px solid #eee;
697 } 697 }
698 698
699 .residual,.wechatPay{ 699 .residual,.wechatPay,.aliPay{
700 width:16px; 700 width:16px;
701 height:13px; 701 height:13px;
702 display: inline-block; 702 display: inline-block;
...@@ -712,6 +712,10 @@ body, button, input, select, textarea { ...@@ -712,6 +712,10 @@ body, button, input, select, textarea {
712 background: url(../images/wechat.png) no-repeat; 712 background: url(../images/wechat.png) no-repeat;
713 background-size: 100%; 713 background-size: 100%;
714 } 714 }
715 .aliPay{
716 background: url(../images/alipay.png) no-repeat;
717 background-size: 100%;
718 }
715 .checkboxS{ 719 .checkboxS{
716 width:20px; 720 width:20px;
717 height:20px; 721 height:20px;
......
html/tripDetail.html
...@@ -19,13 +19,23 @@ ...@@ -19,13 +19,23 @@
19 </div> 19 </div>
20 <ul> 20 <ul>
21 <!--<li> 21 <!--<li>
22
22 <span class="leftText residual"></span> <span class="leftText"> 余额支付(￥{{balance}})</span> <span class="rightText checkboxS" ng-class="{true: 'checkboxTrue', false: 'checkboxFalse'}[!isActive]" ng-click="choosePay(0)"> </span> 23 <span class="leftText residual"></span> <span class="leftText"> 余额支付(￥{{balance}})</span> <span class="rightText checkboxS" ng-class="{true: 'checkboxTrue', false: 'checkboxFalse'}[!isActive]" ng-click="choosePay(0)"> </span>
23 </li>--> 24 </li>-->
25 <!--ng-class="{true: 'checkboxTrue', false: 'checkboxFalse'}[isActive]"-->
26 <li>
27 <span class="leftText aliPay"></span><span class="leftText "> 支付宝</span> <span
28 class="rightText checkboxS"
29 ng-class="{'checkboxTrue': payType === 100, 'checkboxFalse': payType !== 100}"
30 ng-click="choosePay(100)"></span>
31 </li>
24 <li> 32 <li>
25 <span class="leftText wechatPay"></span><span class="leftText "> 微信支付</span> <span 33 <span class="leftText wechatPay"></span><span class="leftText "> 微信支付</span> <span
26 class="rightText checkboxS" ng-class="{true: 'checkboxTrue', false: 'checkboxFalse'}[isActive]" 34 class="rightText checkboxS"
27 ng-click="choosePay(1)"></span> 35 ng-class="{'checkboxTrue': payType === 101, 'checkboxFalse': payType !== 101}"
36 ng-click="choosePay(101)"></span>
28 </li> 37 </li>
38
29 </ul> 39 </ul>
30 </div> 40 </div>
31 41
......
js/controller/tripDetailController.js
...@@ -28,23 +28,23 @@ angular.module('myApp') ...@@ -28,23 +28,23 @@ angular.module('myApp')
28 * */ 28 * */
29 var ispay = false; 29 var ispay = false;
30 $scope.isActive = true; // 这个是个关键 TODO 要更改的 30 $scope.isActive = true; // 这个是个关键 TODO 要更改的
31 $scope.payType = 1; 31 $scope.payType = 100;
32 $scope.choosePay = function (index) { 32 $scope.choosePay = function (index) {
33 if ($($('.checkboxS')[index]).hasClass('checkboxTrue')) { 33 // if ($($('.checkboxS')[index]).hasClass('checkboxTrue')) {
34 // 如果要选择的项已经选中,不处理 34 // // 如果要选择的项已经选中,不处理
35 return 35 // return
36 } else { 36 // } else {
37 $scope.isActive = !$scope.isActive; 37 // $scope.isActive = !$scope.isActive;
38 } 38 // }
39 39
40 $scope.payType = index; 40 $scope.payType = index;
41 } 41 }
42 $scope.goPay = function () { 42 $scope.goPay = function () {
43 if (ispay) return; 43 if (ispay) return;
44 if ($scope.payType == 1) { //微信支付 44 if ($scope.payType == 100 || $scope.payType == 101) { //手机支付
45 45
46 ispay = true; 46 ispay = true;
47 wechatPayment.callRentPay($scope.tripDetail.id, $scope.tripDetail.total_fee) 47 wechatPayment.callRentTypePay($scope.tripDetail.id, $scope.tripDetail.total_fee, $scope.payType)
48 .then(function (result) { 48 .then(function (result) {
49 ispay = false; 49 ispay = false;
50 //支付成功 50 //支付成功
......
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 payhost = 'http://lsz1.28ms.com/service' 7 var host = 'http://lsz1.28ms.com/service'
8 8
9 var h5wxhost = 'http://h5api.dy.dingdachuxing.com/service/balance/'; 9 var h5wxhost = 'http://h5api.dy.dingdachuxing.com/service/balance/';
10 10
...@@ -93,6 +93,39 @@ angular.module('myApp.services') ...@@ -93,6 +93,39 @@ angular.module('myApp.services')
93 return callUnifiedOrderApi(host + '/bill/wx/' + orderId, param); 93 return callUnifiedOrderApi(host + '/bill/wx/' + orderId, param);
94 }, 94 },
95 /** 95 /**
96 * 租车付款
97 */
98 callRentTypePay: function (orderId, amount, type) {
99
100 switch (type) {
101 case 100:
102 var html = ' <form action="'+ host + '/bill/alipay/h5/'+ orderId
103 +'" method="post">' +
104 ' <input type="text" name="amount" value="'+amount+'" />' +
105 ' <input type="text" name="body" value="租车租金"/>' +
106 ' <input type="text" name="type" value="100" />' +
107 ' <input type="submit" id="ok">' +
108 ' </input>' +
109 ' </form>'
110 var form = document.createElement('div')
111 form.innerHTML = html
112 // form.querySelector('#ok').click()
113 document.body.appendChild(form)
114 document.querySelector('#ok').click()
115
116 case 101:
117 var param = Object.assign($location.search(),{
118 amount : amount,
119 body : "租车租金",
120 type : 101
121 });
122 return callUnifiedOrderApi(host + "/bill/wx/h5/" + orderId, param);
123
124 default:
125 return null
126 }
127 },
128 /**
96 * 保证金充值 129 * 保证金充值
97 * @param amount 130 * @param amount
98 */ 131 */
...@@ -108,12 +141,36 @@ angular.module('myApp.services') ...@@ -108,12 +141,36 @@ angular.module('myApp.services')
108 * @param amount 141 * @param amount
109 */ 142 */
110 callDepositTypePay : function(amount, type){ 143 callDepositTypePay : function(amount, type){
111 var param = Object.assign($location.search(),{ 144 switch (type) {
112 amount : amount, 145 case 100:
113 body : "保证金充值", 146 var html = ' <form action="'+ host + '/balance/alipay/h5'
114 type : type 147 +'" method="post">' +
115 }); 148 ' <input type="text" name="amount" value="'+amount+'" />' +
116 return callUnifiedOrderApi(payhost + "/balance/" + (type === 100?'alipay': 'wx') +"/h5", param); 149 ' <input type="text" name="body" value="保证金充值"/>' +
150 ' <input type="text" name="type" value="100" />' +
151
152 ' <input type="submit" id="ok">\n' +
153 ' 余额充值\n' +
154 ' </input>\n' +
155 ' </form>'
156 var form = document.createElement('div')
157 form.innerHTML = html
158 // form.querySelector('#ok').click()
159 document.body.appendChild(form)
160 document.querySelector('#ok').click()
161
162 case 101:
163 var param = Object.assign($location.search(),{
164 amount : amount,
165 body : "保证金充值",
166 type : type
167 });
168 return callUnifiedOrderApi(payhost + "/balance/wx/h5", param);
169
170 default:
171 return null
172 }
173
117 }, 174 },
118 /** 175 /**
119 * 钱包充值 176 * 钱包充值
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!