Skip to content

杨建斌 / dy-wx2

Go to a project
Toggle navigation
Toggle navigation pinning
32faa890 by unknown
Options

change pay

1 parent 764ef11a
Inline Side-by-side
Showing 3 changed files with 127 additions and 92 deletions
.idea/workspace.xml
...@@ -2,12 +2,8 @@ ...@@ -2,12 +2,8 @@
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$/js/JSBridge.js" />
6 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
7 <change beforePath="$PROJECT_DIR$/index.html" afterPath="$PROJECT_DIR$/index.html" /> 6 <change beforePath="$PROJECT_DIR$/js/JSBridge.js" afterPath="$PROJECT_DIR$/js/JSBridge.js" />
8 <change beforePath="$PROJECT_DIR$/js/compress.js" afterPath="$PROJECT_DIR$/js/compress.js" />
9 <change beforePath="$PROJECT_DIR$/js/controller/mainController.js" afterPath="$PROJECT_DIR$/js/controller/mainController.js" />
10 <change beforePath="$PROJECT_DIR$/js/controller/mapController.js" afterPath="$PROJECT_DIR$/js/controller/mapController.js" />
11 <change beforePath="$PROJECT_DIR$/js/service/wechatPaymentService.js" afterPath="$PROJECT_DIR$/js/service/wechatPaymentService.js" /> 7 <change beforePath="$PROJECT_DIR$/js/service/wechatPaymentService.js" afterPath="$PROJECT_DIR$/js/service/wechatPaymentService.js" />
12 </list> 8 </list>
13 <ignored path="$PROJECT_DIR$/.tmp/" /> 9 <ignored path="$PROJECT_DIR$/.tmp/" />
...@@ -21,14 +17,24 @@ ...@@ -21,14 +17,24 @@
21 <option name="LAST_RESOLUTION" value="IGNORE" /> 17 <option name="LAST_RESOLUTION" value="IGNORE" />
22 </component> 18 </component>
23 <component name="FileEditorManager"> 19 <component name="FileEditorManager">
24 <splitter split-orientation="horizontal" split-proportion="0.32684115"> 20 <splitter split-orientation="horizontal" split-proportion="0.567255">
25 <split-first> 21 <split-first>
26 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 22 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
27 <file leaf-file-name="bondPay.html" pinned="false" current-in-tab="true"> 23 <file leaf-file-name="bondPay.html" pinned="false" current-in-tab="false">
28 <entry file="file://$PROJECT_DIR$/html/bondPay.html"> 24 <entry file="file://$PROJECT_DIR$/html/bondPay.html">
29 <provider selected="true" editor-type-id="text-editor"> 25 <provider selected="true" editor-type-id="text-editor">
30 <state relative-caret-position="380"> 26 <state relative-caret-position="437">
31 <caret line="20" column="17" lean-forward="true" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" /> 27 <caret line="23" column="6" lean-forward="false" selection-start-line="23" selection-start-column="6" selection-end-line="23" selection-end-column="6" />
28 <folding />
29 </state>
30 </provider>
31 </entry>
32 </file>
33 <file leaf-file-name="globalService.js" pinned="false" current-in-tab="true">
34 <entry file="file://$PROJECT_DIR$/js/service/globalService.js">
35 <provider selected="true" editor-type-id="text-editor">
36 <state relative-caret-position="19">
37 <caret line="25" column="27" lean-forward="false" selection-start-line="25" selection-start-column="27" selection-end-line="25" selection-end-column="27" />
32 <folding /> 38 <folding />
33 </state> 39 </state>
34 </provider> 40 </provider>
...@@ -41,8 +47,8 @@ ...@@ -41,8 +47,8 @@
41 <file leaf-file-name="compress.js" pinned="false" current-in-tab="false"> 47 <file leaf-file-name="compress.js" pinned="false" current-in-tab="false">
42 <entry file="file://$PROJECT_DIR$/js/compress.js"> 48 <entry file="file://$PROJECT_DIR$/js/compress.js">
43 <provider selected="true" editor-type-id="text-editor"> 49 <provider selected="true" editor-type-id="text-editor">
44 <state relative-caret-position="114"> 50 <state relative-caret-position="39482">
45 <caret line="2078" column="40" lean-forward="true" selection-start-line="2078" selection-start-column="12" selection-end-line="2078" selection-end-column="40" /> 51 <caret line="2078" column="40" lean-forward="false" selection-start-line="2078" selection-start-column="12" selection-end-line="2078" selection-end-column="40" />
46 <folding /> 52 <folding />
47 </state> 53 </state>
48 </provider> 54 </provider>
...@@ -51,18 +57,18 @@ ...@@ -51,18 +57,18 @@
51 <file leaf-file-name="JSBridge.js" pinned="false" current-in-tab="false"> 57 <file leaf-file-name="JSBridge.js" pinned="false" current-in-tab="false">
52 <entry file="file://$PROJECT_DIR$/js/JSBridge.js"> 58 <entry file="file://$PROJECT_DIR$/js/JSBridge.js">
53 <provider selected="true" editor-type-id="text-editor"> 59 <provider selected="true" editor-type-id="text-editor">
54 <state relative-caret-position="453"> 60 <state relative-caret-position="684">
55 <caret line="62" column="19" lean-forward="false" selection-start-line="62" selection-start-column="7" selection-end-line="62" selection-end-column="19" /> 61 <caret line="36" column="25" lean-forward="false" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="25" />
56 <folding /> 62 <folding />
57 </state> 63 </state>
58 </provider> 64 </provider>
59 </entry> 65 </entry>
60 </file> 66 </file>
61 <file leaf-file-name="mainController.js" pinned="false" current-in-tab="true"> 67 <file leaf-file-name="mainController.js" pinned="false" current-in-tab="false">
62 <entry file="file://$PROJECT_DIR$/js/controller/mainController.js"> 68 <entry file="file://$PROJECT_DIR$/js/controller/mainController.js">
63 <provider selected="true" editor-type-id="text-editor"> 69 <provider selected="true" editor-type-id="text-editor">
64 <state relative-caret-position="359"> 70 <state relative-caret-position="529">
65 <caret line="116" column="72" lean-forward="true" selection-start-line="116" selection-start-column="72" selection-end-line="116" selection-end-column="72" /> 71 <caret line="77" column="24" lean-forward="false" selection-start-line="77" selection-start-column="24" selection-end-line="77" selection-end-column="24" />
66 <folding /> 72 <folding />
67 </state> 73 </state>
68 </provider> 74 </provider>
...@@ -71,18 +77,40 @@ ...@@ -71,18 +77,40 @@
71 <file leaf-file-name="mapController.js" pinned="false" current-in-tab="false"> 77 <file leaf-file-name="mapController.js" pinned="false" current-in-tab="false">
72 <entry file="file://$PROJECT_DIR$/js/controller/mapController.js"> 78 <entry file="file://$PROJECT_DIR$/js/controller/mapController.js">
73 <provider selected="true" editor-type-id="text-editor"> 79 <provider selected="true" editor-type-id="text-editor">
74 <state relative-caret-position="207"> 80 <state relative-caret-position="2983">
75 <caret line="157" column="43" lean-forward="false" selection-start-line="157" selection-start-column="35" selection-end-line="157" selection-end-column="43" /> 81 <caret line="157" column="43" lean-forward="false" selection-start-line="157" selection-start-column="35" selection-end-line="157" selection-end-column="43" />
76 <folding /> 82 <folding />
77 </state> 83 </state>
78 </provider> 84 </provider>
79 </entry> 85 </entry>
80 </file> 86 </file>
81 <file leaf-file-name="index.html" pinned="false" current-in-tab="false"> 87 <file leaf-file-name="weixinConfig.js" pinned="false" current-in-tab="false">
88 <entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js">
89 <provider selected="true" editor-type-id="text-editor">
90 <state relative-caret-position="1083">
91 <caret line="57" column="41" lean-forward="false" selection-start-line="57" selection-start-column="41" selection-end-line="57" selection-end-column="41" />
92 <folding />
93 </state>
94 </provider>
95 </entry>
96 </file>
97 <file leaf-file-name="wechatPaymentService.js" pinned="false" current-in-tab="false">
98 <entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js">
99 <provider selected="true" editor-type-id="text-editor">
100 <state relative-caret-position="228">
101 <caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
102 <folding>
103 <element signature="e#638#2098#0" expanded="false" />
104 </folding>
105 </state>
106 </provider>
107 </entry>
108 </file>
109 <file leaf-file-name="index.html" pinned="false" current-in-tab="true">
82 <entry file="file://$PROJECT_DIR$/index.html"> 110 <entry file="file://$PROJECT_DIR$/index.html">
83 <provider selected="true" editor-type-id="text-editor"> 111 <provider selected="true" editor-type-id="text-editor">
84 <state relative-caret-position="361"> 112 <state relative-caret-position="190">
85 <caret line="123" column="95" lean-forward="true" selection-start-line="123" selection-start-column="95" selection-end-line="123" selection-end-column="95" /> 113 <caret line="109" column="52" lean-forward="false" selection-start-line="109" selection-start-column="52" selection-end-line="109" selection-end-column="52" />
86 <folding /> 114 <folding />
87 </state> 115 </state>
88 </provider> 116 </provider>
...@@ -132,12 +160,12 @@ ...@@ -132,12 +160,12 @@
132 <option value="$PROJECT_DIR$/js/controller/tripDetailController.js" /> 160 <option value="$PROJECT_DIR$/js/controller/tripDetailController.js" />
133 <option value="$PROJECT_DIR$/html/tripDetail.html" /> 161 <option value="$PROJECT_DIR$/html/tripDetail.html" />
134 <option value="$PROJECT_DIR$/html/bondPay.html" /> 162 <option value="$PROJECT_DIR$/html/bondPay.html" />
135 <option value="$PROJECT_DIR$/js/service/wechatPaymentService.js" />
136 <option value="$PROJECT_DIR$/index.html" /> 163 <option value="$PROJECT_DIR$/index.html" />
137 <option value="$PROJECT_DIR$/js/compress.js" /> 164 <option value="$PROJECT_DIR$/js/compress.js" />
138 <option value="$PROJECT_DIR$/js/controller/mapController.js" /> 165 <option value="$PROJECT_DIR$/js/controller/mapController.js" />
139 <option value="$PROJECT_DIR$/js/JSBridge.js" />
140 <option value="$PROJECT_DIR$/js/controller/mainController.js" /> 166 <option value="$PROJECT_DIR$/js/controller/mainController.js" />
167 <option value="$PROJECT_DIR$/js/JSBridge.js" />
168 <option value="$PROJECT_DIR$/js/service/wechatPaymentService.js" />
141 </list> 169 </list>
142 </option> 170 </option>
143 </component> 171 </component>
...@@ -148,10 +176,10 @@ ...@@ -148,10 +176,10 @@
148 <sorting>DEFINITION_ORDER</sorting> 176 <sorting>DEFINITION_ORDER</sorting>
149 </component> 177 </component>
150 <component name="ProjectFrameBounds" extendedState="6"> 178 <component name="ProjectFrameBounds" extendedState="6">
151 <option name="x" value="-178" /> 179 <option name="x" value="349" />
152 <option name="y" value="222" /> 180 <option name="y" value="433" />
153 <option name="width" value="1932" /> 181 <option name="width" value="1380" />
154 <option name="height" value="1056" /> 182 <option name="height" value="788" />
155 </component> 183 </component>
156 <component name="ProjectView"> 184 <component name="ProjectView">
157 <navigator currentView="ProjectPane" proportions="" version="1"> 185 <navigator currentView="ProjectPane" proportions="" version="1">
...@@ -176,11 +204,6 @@ ...@@ -176,11 +204,6 @@
176 <item name="h5wx" type="b2602c69:ProjectViewProjectNode" /> 204 <item name="h5wx" type="b2602c69:ProjectViewProjectNode" />
177 <item name="h5wx" type="462c0819:PsiDirectoryNode" /> 205 <item name="h5wx" type="462c0819:PsiDirectoryNode" />
178 </path> 206 </path>
179 <path>
180 <item name="h5wx" type="b2602c69:ProjectViewProjectNode" />
181 <item name="h5wx" type="462c0819:PsiDirectoryNode" />
182 <item name="js" type="462c0819:PsiDirectoryNode" />
183 </path>
184 </expand> 207 </expand>
185 <select /> 208 <select />
186 </subPane> 209 </subPane>
...@@ -225,11 +248,14 @@ ...@@ -225,11 +248,14 @@
225 <workItem from="1534255280738" duration="2338000" /> 248 <workItem from="1534255280738" duration="2338000" />
226 <workItem from="1534425373942" duration="708000" /> 249 <workItem from="1534425373942" duration="708000" />
227 <workItem from="1534601161748" duration="2864000" /> 250 <workItem from="1534601161748" duration="2864000" />
251 <workItem from="1534679299177" duration="665000" />
252 <workItem from="1534681139208" duration="4852000" />
253 <workItem from="1534775785739" duration="19000" />
228 </task> 254 </task>
229 <servers /> 255 <servers />
230 </component> 256 </component>
231 <component name="TimeTrackingManager"> 257 <component name="TimeTrackingManager">
232 <option name="totallyTimeSpent" value="20617000" /> 258 <option name="totallyTimeSpent" value="26153000" />
233 </component> 259 </component>
234 <component name="ToolWindowManager"> 260 <component name="ToolWindowManager">
235 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 261 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
...@@ -239,7 +265,6 @@ ...@@ -239,7 +265,6 @@
239 <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" /> 265 <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" />
240 <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" /> 266 <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" />
241 <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" /> 267 <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" />
242 <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" />
243 <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" /> 268 <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" />
244 <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" /> 269 <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" />
245 <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" /> 270 <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" />
...@@ -251,6 +276,7 @@ ...@@ -251,6 +276,7 @@
251 <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" /> 276 <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" />
252 <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" /> 277 <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" />
253 <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" /> 278 <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" />
279 <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" />
254 <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" /> 280 <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" />
255 </layout> 281 </layout>
256 </component> 282 </component>
...@@ -265,6 +291,30 @@ ...@@ -265,6 +291,30 @@
265 <watches-manager /> 291 <watches-manager />
266 </component> 292 </component>
267 <component name="editorHistoryManager"> 293 <component name="editorHistoryManager">
294 <entry file="file://$PROJECT_DIR$/js/controller/mapController.js">
295 <provider selected="true" editor-type-id="text-editor">
296 <state relative-caret-position="2983">
297 <caret line="157" column="43" lean-forward="false" selection-start-line="157" selection-start-column="35" selection-end-line="157" selection-end-column="43" />
298 <folding />
299 </state>
300 </provider>
301 </entry>
302 <entry file="file://$PROJECT_DIR$/index.html">
303 <provider selected="true" editor-type-id="text-editor">
304 <state relative-caret-position="2337">
305 <caret line="123" column="95" lean-forward="true" selection-start-line="123" selection-start-column="95" selection-end-line="123" selection-end-column="95" />
306 <folding />
307 </state>
308 </provider>
309 </entry>
310 <entry file="file://$PROJECT_DIR$/js/controller/mainController.js">
311 <provider selected="true" editor-type-id="text-editor">
312 <state relative-caret-position="2204">
313 <caret line="116" column="72" lean-forward="true" selection-start-line="116" selection-start-column="72" selection-end-line="116" selection-end-column="72" />
314 <folding />
315 </state>
316 </provider>
317 </entry>
268 <entry file="file://$PROJECT_DIR$/html/bondPay.html"> 318 <entry file="file://$PROJECT_DIR$/html/bondPay.html">
269 <provider selected="true" editor-type-id="text-editor"> 319 <provider selected="true" editor-type-id="text-editor">
270 <state relative-caret-position="0"> 320 <state relative-caret-position="0">
...@@ -285,7 +335,6 @@ ...@@ -285,7 +335,6 @@
285 <provider selected="true" editor-type-id="text-editor"> 335 <provider selected="true" editor-type-id="text-editor">
286 <state relative-caret-position="475"> 336 <state relative-caret-position="475">
287 <caret line="25" column="30" lean-forward="false" selection-start-line="25" selection-start-column="30" selection-end-line="25" selection-end-column="30" /> 337 <caret line="25" column="30" lean-forward="false" selection-start-line="25" selection-start-column="30" selection-end-line="25" selection-end-column="30" />
288 <folding />
289 </state> 338 </state>
290 </provider> 339 </provider>
291 </entry> 340 </entry>
...@@ -301,7 +350,6 @@ ...@@ -301,7 +350,6 @@
301 <provider selected="true" editor-type-id="text-editor"> 350 <provider selected="true" editor-type-id="text-editor">
302 <state relative-caret-position="570"> 351 <state relative-caret-position="570">
303 <caret line="30" column="26" lean-forward="false" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="26" /> 352 <caret line="30" column="26" lean-forward="false" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="26" />
304 <folding />
305 </state> 353 </state>
306 </provider> 354 </provider>
307 </entry> 355 </entry>
...@@ -317,7 +365,6 @@ ...@@ -317,7 +365,6 @@
317 <provider selected="true" editor-type-id="text-editor"> 365 <provider selected="true" editor-type-id="text-editor">
318 <state relative-caret-position="323"> 366 <state relative-caret-position="323">
319 <caret line="17" column="44" lean-forward="false" selection-start-line="17" selection-start-column="36" selection-end-line="17" selection-end-column="44" /> 367 <caret line="17" column="44" lean-forward="false" selection-start-line="17" selection-start-column="36" selection-end-line="17" selection-end-column="44" />
320 <folding />
321 </state> 368 </state>
322 </provider> 369 </provider>
323 </entry> 370 </entry>
...@@ -325,7 +372,6 @@ ...@@ -325,7 +372,6 @@
325 <provider selected="true" editor-type-id="text-editor"> 372 <provider selected="true" editor-type-id="text-editor">
326 <state relative-caret-position="266"> 373 <state relative-caret-position="266">
327 <caret line="14" column="27" lean-forward="true" selection-start-line="14" selection-start-column="27" selection-end-line="14" selection-end-column="27" /> 374 <caret line="14" column="27" lean-forward="true" selection-start-line="14" selection-start-column="27" selection-end-line="14" selection-end-column="27" />
328 <folding />
329 </state> 375 </state>
330 </provider> 376 </provider>
331 </entry> 377 </entry>
...@@ -349,7 +395,6 @@ ...@@ -349,7 +395,6 @@
349 <provider selected="true" editor-type-id="text-editor"> 395 <provider selected="true" editor-type-id="text-editor">
350 <state relative-caret-position="13262"> 396 <state relative-caret-position="13262">
351 <caret line="698" column="28" lean-forward="false" selection-start-line="698" selection-start-column="22" selection-end-line="698" selection-end-column="28" /> 397 <caret line="698" column="28" lean-forward="false" selection-start-line="698" selection-start-column="22" selection-end-line="698" selection-end-column="28" />
352 <folding />
353 </state> 398 </state>
354 </provider> 399 </provider>
355 </entry> 400 </entry>
...@@ -358,7 +403,7 @@ ...@@ -358,7 +403,7 @@
358 <state relative-caret-position="1463"> 403 <state relative-caret-position="1463">
359 <caret line="117" column="40" lean-forward="true" selection-start-line="117" selection-start-column="40" selection-end-line="117" selection-end-column="40" /> 404 <caret line="117" column="40" lean-forward="true" selection-start-line="117" selection-start-column="40" selection-end-line="117" selection-end-column="40" />
360 <folding> 405 <folding>
361 <element signature="e#579#2039#0" expanded="false" /> 406 <element signature="e#638#2098#0" expanded="false" />
362 </folding> 407 </folding>
363 </state> 408 </state>
364 </provider> 409 </provider>
...@@ -375,7 +420,6 @@ ...@@ -375,7 +420,6 @@
375 <provider selected="true" editor-type-id="text-editor"> 420 <provider selected="true" editor-type-id="text-editor">
376 <state relative-caret-position="475"> 421 <state relative-caret-position="475">
377 <caret line="25" column="30" lean-forward="false" selection-start-line="25" selection-start-column="30" selection-end-line="25" selection-end-column="30" /> 422 <caret line="25" column="30" lean-forward="false" selection-start-line="25" selection-start-column="30" selection-end-line="25" selection-end-column="30" />
378 <folding />
379 </state> 423 </state>
380 </provider> 424 </provider>
381 </entry> 425 </entry>
...@@ -392,7 +436,7 @@ ...@@ -392,7 +436,7 @@
392 <state relative-caret-position="1083"> 436 <state relative-caret-position="1083">
393 <caret line="97" column="23" lean-forward="false" selection-start-line="97" selection-start-column="8" selection-end-line="97" selection-end-column="23" /> 437 <caret line="97" column="23" lean-forward="false" selection-start-line="97" selection-start-column="8" selection-end-line="97" selection-end-column="23" />
394 <folding> 438 <folding>
395 <element signature="e#579#2039#0" expanded="false" /> 439 <element signature="e#638#2098#0" expanded="false" />
396 </folding> 440 </folding>
397 </state> 441 </state>
398 </provider> 442 </provider>
...@@ -409,7 +453,6 @@ ...@@ -409,7 +453,6 @@
409 <provider selected="true" editor-type-id="text-editor"> 453 <provider selected="true" editor-type-id="text-editor">
410 <state relative-caret-position="570"> 454 <state relative-caret-position="570">
411 <caret line="30" column="26" lean-forward="false" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="26" /> 455 <caret line="30" column="26" lean-forward="false" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="26" />
412 <folding />
413 </state> 456 </state>
414 </provider> 457 </provider>
415 </entry> 458 </entry>
...@@ -425,7 +468,6 @@ ...@@ -425,7 +468,6 @@
425 <provider selected="true" editor-type-id="text-editor"> 468 <provider selected="true" editor-type-id="text-editor">
426 <state relative-caret-position="380"> 469 <state relative-caret-position="380">
427 <caret line="20" column="34" lean-forward="false" selection-start-line="20" selection-start-column="34" selection-end-line="20" selection-end-column="34" /> 470 <caret line="20" column="34" lean-forward="false" selection-start-line="20" selection-start-column="34" selection-end-line="20" selection-end-column="34" />
428 <folding />
429 </state> 471 </state>
430 </provider> 472 </provider>
431 </entry> 473 </entry>
...@@ -433,7 +475,6 @@ ...@@ -433,7 +475,6 @@
433 <provider selected="true" editor-type-id="text-editor"> 475 <provider selected="true" editor-type-id="text-editor">
434 <state relative-caret-position="13262"> 476 <state relative-caret-position="13262">
435 <caret line="698" column="28" lean-forward="false" selection-start-line="698" selection-start-column="22" selection-end-line="698" selection-end-column="28" /> 477 <caret line="698" column="28" lean-forward="false" selection-start-line="698" selection-start-column="22" selection-end-line="698" selection-end-column="28" />
436 <folding />
437 </state> 478 </state>
438 </provider> 479 </provider>
439 </entry> 480 </entry>
...@@ -456,7 +497,6 @@ ...@@ -456,7 +497,6 @@
456 <provider selected="true" editor-type-id="text-editor"> 497 <provider selected="true" editor-type-id="text-editor">
457 <state relative-caret-position="19380"> 498 <state relative-caret-position="19380">
458 <caret line="1020" column="24" lean-forward="true" selection-start-line="1020" selection-start-column="24" selection-end-line="1020" selection-end-column="24" /> 499 <caret line="1020" column="24" lean-forward="true" selection-start-line="1020" selection-start-column="24" selection-end-line="1020" selection-end-column="24" />
459 <folding />
460 </state> 500 </state>
461 </provider> 501 </provider>
462 </entry> 502 </entry>
...@@ -464,7 +504,6 @@ ...@@ -464,7 +504,6 @@
464 <provider selected="true" editor-type-id="text-editor"> 504 <provider selected="true" editor-type-id="text-editor">
465 <state relative-caret-position="0"> 505 <state relative-caret-position="0">
466 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 506 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
467 <folding />
468 </state> 507 </state>
469 </provider> 508 </provider>
470 </entry> 509 </entry>
...@@ -480,7 +519,6 @@ ...@@ -480,7 +519,6 @@
480 <provider selected="true" editor-type-id="text-editor"> 519 <provider selected="true" editor-type-id="text-editor">
481 <state relative-caret-position="342"> 520 <state relative-caret-position="342">
482 <caret line="18" column="60" lean-forward="false" selection-start-line="18" selection-start-column="60" selection-end-line="18" selection-end-column="60" /> 521 <caret line="18" column="60" lean-forward="false" selection-start-line="18" selection-start-column="60" selection-end-line="18" selection-end-column="60" />
483 <folding />
484 </state> 522 </state>
485 </provider> 523 </provider>
486 </entry> 524 </entry>
...@@ -526,14 +564,6 @@ ...@@ -526,14 +564,6 @@
526 </state> 564 </state>
527 </provider> 565 </provider>
528 </entry> 566 </entry>
529 <entry file="file://$PROJECT_DIR$/js/service/globalService.js">
530 <provider selected="true" editor-type-id="text-editor">
531 <state relative-caret-position="779">
532 <caret line="41" column="72" lean-forward="true" selection-start-line="41" selection-start-column="72" selection-end-line="41" selection-end-column="72" />
533 <folding />
534 </state>
535 </provider>
536 </entry>
537 <entry file="file://$PROJECT_DIR$/html/tripDetail.html"> 567 <entry file="file://$PROJECT_DIR$/html/tripDetail.html">
538 <provider selected="true" editor-type-id="text-editor"> 568 <provider selected="true" editor-type-id="text-editor">
539 <state relative-caret-position="266"> 569 <state relative-caret-position="266">
...@@ -541,19 +571,10 @@ ...@@ -541,19 +571,10 @@
541 </state> 571 </state>
542 </provider> 572 </provider>
543 </entry> 573 </entry>
544 <entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js">
545 <provider selected="true" editor-type-id="text-editor">
546 <state relative-caret-position="190">
547 <caret line="10" column="19" lean-forward="false" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
548 <folding />
549 </state>
550 </provider>
551 </entry>
552 <entry file="file://$PROJECT_DIR$/js/controller/tripDetailController.js"> 574 <entry file="file://$PROJECT_DIR$/js/controller/tripDetailController.js">
553 <provider selected="true" editor-type-id="text-editor"> 575 <provider selected="true" editor-type-id="text-editor">
554 <state relative-caret-position="570"> 576 <state relative-caret-position="570">
555 <caret line="30" column="26" lean-forward="false" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="26" /> 577 <caret line="30" column="26" lean-forward="false" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="26" />
556 <folding />
557 </state> 578 </state>
558 </provider> 579 </provider>
559 </entry> 580 </entry>
...@@ -561,7 +582,6 @@ ...@@ -561,7 +582,6 @@
561 <provider selected="true" editor-type-id="text-editor"> 582 <provider selected="true" editor-type-id="text-editor">
562 <state relative-caret-position="323"> 583 <state relative-caret-position="323">
563 <caret line="17" column="44" lean-forward="false" selection-start-line="17" selection-start-column="36" selection-end-line="17" selection-end-column="44" /> 584 <caret line="17" column="44" lean-forward="false" selection-start-line="17" selection-start-column="36" selection-end-line="17" selection-end-column="44" />
564 <folding />
565 </state> 585 </state>
566 </provider> 586 </provider>
567 </entry> 587 </entry>
...@@ -569,7 +589,6 @@ ...@@ -569,7 +589,6 @@
569 <provider selected="true" editor-type-id="text-editor"> 589 <provider selected="true" editor-type-id="text-editor">
570 <state relative-caret-position="266"> 590 <state relative-caret-position="266">
571 <caret line="14" column="27" lean-forward="true" selection-start-line="14" selection-start-column="27" selection-end-line="14" selection-end-column="27" /> 591 <caret line="14" column="27" lean-forward="true" selection-start-line="14" selection-start-column="27" selection-end-line="14" selection-end-column="27" />
572 <folding />
573 </state> 592 </state>
574 </provider> 593 </provider>
575 </entry> 594 </entry>
...@@ -577,7 +596,6 @@ ...@@ -577,7 +596,6 @@
577 <provider selected="true" editor-type-id="text-editor"> 596 <provider selected="true" editor-type-id="text-editor">
578 <state relative-caret-position="13262"> 597 <state relative-caret-position="13262">
579 <caret line="698" column="28" lean-forward="false" selection-start-line="698" selection-start-column="22" selection-end-line="698" selection-end-column="28" /> 598 <caret line="698" column="28" lean-forward="false" selection-start-line="698" selection-start-column="22" selection-end-line="698" selection-end-column="28" />
580 <folding />
581 </state> 599 </state>
582 </provider> 600 </provider>
583 </entry> 601 </entry>
...@@ -585,64 +603,79 @@ ...@@ -585,64 +603,79 @@
585 <provider selected="true" editor-type-id="text-editor"> 603 <provider selected="true" editor-type-id="text-editor">
586 <state relative-caret-position="19"> 604 <state relative-caret-position="19">
587 <caret line="19" column="82" lean-forward="false" selection-start-line="19" selection-start-column="24" selection-end-line="19" selection-end-column="82" /> 605 <caret line="19" column="82" lean-forward="false" selection-start-line="19" selection-start-column="24" selection-end-line="19" selection-end-column="82" />
588 <folding />
589 </state> 606 </state>
590 </provider> 607 </provider>
591 </entry> 608 </entry>
592 <entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js"> 609 <entry file="file://$PROJECT_DIR$/js/controller/mapController.js">
593 <provider selected="true" editor-type-id="text-editor"> 610 <provider selected="true" editor-type-id="text-editor">
594 <state relative-caret-position="605"> 611 <state relative-caret-position="2983">
595 <caret line="110" column="41" lean-forward="true" selection-start-line="110" selection-start-column="41" selection-end-line="110" selection-end-column="41" /> 612 <caret line="157" column="43" lean-forward="false" selection-start-line="157" selection-start-column="35" selection-end-line="157" selection-end-column="43" />
596 <folding> 613 <folding />
597 <element signature="e#579#2039#0" expanded="false" />
598 </folding>
599 </state> 614 </state>
600 </provider> 615 </provider>
601 </entry> 616 </entry>
602 <entry file="file://$PROJECT_DIR$/html/bondPay.html"> 617 <entry file="file://$PROJECT_DIR$/html/bondPay.html">
603 <provider selected="true" editor-type-id="text-editor"> 618 <provider selected="true" editor-type-id="text-editor">
604 <state relative-caret-position="380"> 619 <state relative-caret-position="437">
605 <caret line="20" column="17" lean-forward="true" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" /> 620 <caret line="23" column="6" lean-forward="false" selection-start-line="23" selection-start-column="6" selection-end-line="23" selection-end-column="6" />
606 <folding /> 621 <folding />
607 </state> 622 </state>
608 </provider> 623 </provider>
609 </entry> 624 </entry>
610 <entry file="file://$PROJECT_DIR$/index.html"> 625 <entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js">
611 <provider selected="true" editor-type-id="text-editor"> 626 <provider selected="true" editor-type-id="text-editor">
612 <state relative-caret-position="361"> 627 <state relative-caret-position="1083">
613 <caret line="123" column="95" lean-forward="true" selection-start-line="123" selection-start-column="95" selection-end-line="123" selection-end-column="95" /> 628 <caret line="57" column="41" lean-forward="false" selection-start-line="57" selection-start-column="41" selection-end-line="57" selection-end-column="41" />
614 <folding /> 629 <folding />
615 </state> 630 </state>
616 </provider> 631 </provider>
617 </entry> 632 </entry>
618 <entry file="file://$PROJECT_DIR$/js/compress.js"> 633 <entry file="file://$PROJECT_DIR$/js/compress.js">
619 <provider selected="true" editor-type-id="text-editor"> 634 <provider selected="true" editor-type-id="text-editor">
620 <state relative-caret-position="114"> 635 <state relative-caret-position="39482">
621 <caret line="2078" column="40" lean-forward="true" selection-start-line="2078" selection-start-column="12" selection-end-line="2078" selection-end-column="40" /> 636 <caret line="2078" column="40" lean-forward="false" selection-start-line="2078" selection-start-column="12" selection-end-line="2078" selection-end-column="40" />
622 <folding /> 637 <folding />
623 </state> 638 </state>
624 </provider> 639 </provider>
625 </entry> 640 </entry>
626 <entry file="file://$PROJECT_DIR$/js/JSBridge.js"> 641 <entry file="file://$PROJECT_DIR$/js/JSBridge.js">
627 <provider selected="true" editor-type-id="text-editor"> 642 <provider selected="true" editor-type-id="text-editor">
628 <state relative-caret-position="453"> 643 <state relative-caret-position="684">
629 <caret line="62" column="19" lean-forward="false" selection-start-line="62" selection-start-column="7" selection-end-line="62" selection-end-column="19" /> 644 <caret line="36" column="25" lean-forward="false" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="25" />
630 <folding /> 645 <folding />
631 </state> 646 </state>
632 </provider> 647 </provider>
633 </entry> 648 </entry>
634 <entry file="file://$PROJECT_DIR$/js/controller/mapController.js"> 649 <entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js">
635 <provider selected="true" editor-type-id="text-editor"> 650 <provider selected="true" editor-type-id="text-editor">
636 <state relative-caret-position="207"> 651 <state relative-caret-position="228">
637 <caret line="157" column="43" lean-forward="false" selection-start-line="157" selection-start-column="35" selection-end-line="157" selection-end-column="43" /> 652 <caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
653 <folding>
654 <element signature="e#638#2098#0" expanded="false" />
655 </folding>
656 </state>
657 </provider>
658 </entry>
659 <entry file="file://$PROJECT_DIR$/js/service/globalService.js">
660 <provider selected="true" editor-type-id="text-editor">
661 <state relative-caret-position="19">
662 <caret line="25" column="27" lean-forward="false" selection-start-line="25" selection-start-column="27" selection-end-line="25" selection-end-column="27" />
638 <folding /> 663 <folding />
639 </state> 664 </state>
640 </provider> 665 </provider>
641 </entry> 666 </entry>
642 <entry file="file://$PROJECT_DIR$/js/controller/mainController.js"> 667 <entry file="file://$PROJECT_DIR$/js/controller/mainController.js">
643 <provider selected="true" editor-type-id="text-editor"> 668 <provider selected="true" editor-type-id="text-editor">
644 <state relative-caret-position="359"> 669 <state relative-caret-position="529">
645 <caret line="116" column="72" lean-forward="true" selection-start-line="116" selection-start-column="72" selection-end-line="116" selection-end-column="72" /> 670 <caret line="77" column="24" lean-forward="false" selection-start-line="77" selection-start-column="24" selection-end-line="77" selection-end-column="24" />
671 <folding />
672 </state>
673 </provider>
674 </entry>
675 <entry file="file://$PROJECT_DIR$/index.html">
676 <provider selected="true" editor-type-id="text-editor">
677 <state relative-caret-position="190">
678 <caret line="109" column="52" lean-forward="false" selection-start-line="109" selection-start-column="52" selection-end-line="109" selection-end-column="52" />
646 <folding /> 679 <folding />
647 </state> 680 </state>
648 </provider> 681 </provider>
......
js/JSBridge.js
...@@ -39,6 +39,10 @@ AppClient.prototype.getERCode = function (callbackName, callback, jsonStr) { ...@@ -39,6 +39,10 @@ AppClient.prototype.getERCode = function (callbackName, callback, jsonStr) {
39 this.appObj.callHandler("getERCode", iOSData, callback); 39 this.appObj.callHandler("getERCode", iOSData, callback);
40 } 40 }
41 }; 41 };
42 window.getIOSERCode = function (_params) {
43 alert(JSON.parse(_params))
44 }
45 window.get
42 if(window.android) { 46 if(window.android) {
43 appClient = new AppClient(window.android, true); 47 appClient = new AppClient(window.android, true);
44 // 此处可以调用一些init的方法 48 // 此处可以调用一些init的方法
...@@ -60,7 +64,4 @@ if(window.android) { ...@@ -60,7 +64,4 @@ if(window.android) {
60 }); 64 });
61 65
62 } 66 }
63 window.getIOSERCode = function (_params) {
64 alert(JSON.parse(_params))
65 67
66 }
......
js/service/wechatPaymentService.js
...@@ -4,7 +4,8 @@ angular.module('myApp.services') ...@@ -4,7 +4,8 @@ angular.module('myApp.services')
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 host = 'http://lsz1.28ms.com/service' 7 // var host = 'http://lsz1.28ms.com/service'
8 var host = 'http://h5api.dy.dingdatech.com/service'
8 9
9 var h5wxhost = 'http://h5api.dy.dingdachuxing.com/service/balance/'; 10 var h5wxhost = 'http://h5api.dy.dingdachuxing.com/service/balance/';
10 11
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!