Skip to content

杨建斌 / dy-wx2

Go to a project
Toggle navigation
Toggle navigation pinning
44a749ef by unknown
Options

'host'

1 parent f8d6a901
Inline Side-by-side
Showing 2 changed files with 188 additions and 95 deletions
.idea/workspace.xml
...@@ -2,10 +2,6 @@ ...@@ -2,10 +2,6 @@
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="$PROJECT_DIR$/css/app.css" afterPath="$PROJECT_DIR$/css/app.css" />
6 <change beforePath="$PROJECT_DIR$/html/bondPay.html" afterPath="$PROJECT_DIR$/html/bondPay.html" />
7 <change beforePath="$PROJECT_DIR$/html/tripDetail.html" afterPath="$PROJECT_DIR$/html/tripDetail.html" />
8 <change beforePath="$PROJECT_DIR$/js/controller/tripDetailController.js" afterPath="$PROJECT_DIR$/js/controller/tripDetailController.js" />
9 <change beforePath="$PROJECT_DIR$/js/service/wechatPaymentService.js" afterPath="$PROJECT_DIR$/js/service/wechatPaymentService.js" /> 5 <change beforePath="$PROJECT_DIR$/js/service/wechatPaymentService.js" afterPath="$PROJECT_DIR$/js/service/wechatPaymentService.js" />
10 </list> 6 </list>
11 <ignored path="$PROJECT_DIR$/.tmp/" /> 7 <ignored path="$PROJECT_DIR$/.tmp/" />
...@@ -19,14 +15,14 @@ ...@@ -19,14 +15,14 @@
19 <option name="LAST_RESOLUTION" value="IGNORE" /> 15 <option name="LAST_RESOLUTION" value="IGNORE" />
20 </component> 16 </component>
21 <component name="FileEditorManager"> 17 <component name="FileEditorManager">
22 <splitter split-orientation="horizontal" split-proportion="0.71272063"> 18 <splitter split-orientation="horizontal" split-proportion="0.29823494">
23 <split-first> 19 <split-first>
24 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 20 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
25 <file leaf-file-name="bondPay.html" pinned="false" current-in-tab="true"> 21 <file leaf-file-name="bondPay.html" pinned="false" current-in-tab="true">
26 <entry file="file://$PROJECT_DIR$/html/bondPay.html"> 22 <entry file="file://$PROJECT_DIR$/html/bondPay.html">
27 <provider selected="true" editor-type-id="text-editor"> 23 <provider selected="true" editor-type-id="text-editor">
28 <state relative-caret-position="38"> 24 <state relative-caret-position="437">
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" /> 25 <caret line="23" column="6" lean-forward="true" selection-start-line="23" selection-start-column="6" selection-end-line="23" selection-end-column="6" />
30 <folding /> 26 <folding />
31 </state> 27 </state>
32 </provider> 28 </provider>
...@@ -39,18 +35,8 @@ ...@@ -39,18 +35,8 @@
39 <file leaf-file-name="bondPayController.js" pinned="false" current-in-tab="false"> 35 <file leaf-file-name="bondPayController.js" pinned="false" current-in-tab="false">
40 <entry file="file://$PROJECT_DIR$/js/controller/bondPayController.js"> 36 <entry file="file://$PROJECT_DIR$/js/controller/bondPayController.js">
41 <provider selected="true" editor-type-id="text-editor"> 37 <provider selected="true" editor-type-id="text-editor">
42 <state relative-caret-position="395"> 38 <state relative-caret-position="92">
43 <caret line="25" column="30" lean-forward="true" selection-start-line="25" selection-start-column="30" selection-end-line="25" selection-end-column="30" /> 39 <caret line="25" column="30" lean-forward="false" selection-start-line="25" selection-start-column="30" selection-end-line="25" selection-end-column="30" />
44 <folding />
45 </state>
46 </provider>
47 </entry>
48 </file>
49 <file leaf-file-name="globalService.js" pinned="false" current-in-tab="false">
50 <entry file="file://$PROJECT_DIR$/js/service/globalService.js">
51 <provider selected="true" editor-type-id="text-editor">
52 <state relative-caret-position="414">
53 <caret line="41" column="72" lean-forward="true" selection-start-line="41" selection-start-column="72" selection-end-line="41" selection-end-column="72" />
54 <folding /> 40 <folding />
55 </state> 41 </state>
56 </provider> 42 </provider>
...@@ -59,18 +45,18 @@ ...@@ -59,18 +45,18 @@
59 <file leaf-file-name="weixinConfig.js" pinned="false" current-in-tab="false"> 45 <file leaf-file-name="weixinConfig.js" pinned="false" current-in-tab="false">
60 <entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js"> 46 <entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js">
61 <provider selected="true" editor-type-id="text-editor"> 47 <provider selected="true" editor-type-id="text-editor">
62 <state relative-caret-position="76"> 48 <state relative-caret-position="190">
63 <caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" /> 49 <caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
64 <folding /> 50 <folding />
65 </state> 51 </state>
66 </provider> 52 </provider>
67 </entry> 53 </entry>
68 </file> 54 </file>
69 <file leaf-file-name="wechatPaymentService.js" pinned="false" current-in-tab="false"> 55 <file leaf-file-name="wechatPaymentService.js" pinned="false" current-in-tab="true">
70 <entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js"> 56 <entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js">
71 <provider selected="true" editor-type-id="text-editor"> 57 <provider selected="true" editor-type-id="text-editor">
72 <state relative-caret-position="399"> 58 <state relative-caret-position="263">
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" /> 59 <caret line="113" column="57" lean-forward="true" selection-start-line="113" selection-start-column="57" selection-end-line="113" selection-end-column="57" />
74 <folding> 60 <folding>
75 <element signature="e#579#2039#0" expanded="false" /> 61 <element signature="e#579#2039#0" expanded="false" />
76 </folding> 62 </folding>
...@@ -88,31 +74,51 @@ ...@@ -88,31 +74,51 @@
88 </provider> 74 </provider>
89 </entry> 75 </entry>
90 </file> 76 </file>
91 <file leaf-file-name="tripDetail.html" pinned="false" current-in-tab="true"> 77 <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
92 <entry file="file://$PROJECT_DIR$/html/tripDetail.html"> 78 <entry file="file://$PROJECT_DIR$/index.html">
93 <provider selected="true" editor-type-id="text-editor"> 79 <provider selected="true" editor-type-id="text-editor">
94 <state relative-caret-position="418"> 80 <state relative-caret-position="1710">
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" /> 81 <caret line="90" column="34" lean-forward="false" selection-start-line="90" selection-start-column="34" selection-end-line="90" selection-end-column="34" />
96 <folding /> 82 <folding />
97 </state> 83 </state>
98 </provider> 84 </provider>
99 </entry> 85 </entry>
100 </file> 86 </file>
101 <file leaf-file-name="index.html" pinned="false" current-in-tab="false"> 87 <file leaf-file-name="bondController.js" pinned="false" current-in-tab="false">
102 <entry file="file://$PROJECT_DIR$/index.html"> 88 <entry file="file://$PROJECT_DIR$/js/controller/bondController.js">
103 <provider selected="true" editor-type-id="text-editor"> 89 <provider selected="true" editor-type-id="text-editor">
104 <state relative-caret-position="76"> 90 <state relative-caret-position="266">
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" /> 91 <caret line="17" column="44" lean-forward="false" selection-start-line="17" selection-start-column="36" selection-end-line="17" selection-end-column="44" />
106 <folding /> 92 <folding />
107 </state> 93 </state>
108 </provider> 94 </provider>
109 </entry> 95 </entry>
110 </file> 96 </file>
111 <file leaf-file-name="bondController.js" pinned="false" current-in-tab="false"> 97 <file leaf-file-name="app.js" pinned="false" current-in-tab="false">
112 <entry file="file://$PROJECT_DIR$/js/controller/bondController.js"> 98 <entry file="file://$PROJECT_DIR$/js/app.js">
113 <provider selected="true" editor-type-id="text-editor"> 99 <provider selected="true" editor-type-id="text-editor">
114 <state relative-caret-position="380"> 100 <state relative-caret-position="-801">
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" /> 101 <caret line="14" column="27" lean-forward="true" selection-start-line="14" selection-start-column="27" selection-end-line="14" selection-end-column="27" />
102 <folding />
103 </state>
104 </provider>
105 </entry>
106 </file>
107 <file leaf-file-name="mainController.js" pinned="false" current-in-tab="false">
108 <entry file="file://$PROJECT_DIR$/js/controller/mainController.js">
109 <provider selected="true" editor-type-id="text-editor">
110 <state relative-caret-position="-321">
111 <caret line="104" column="40" lean-forward="true" selection-start-line="104" selection-start-column="40" selection-end-line="104" selection-end-column="40" />
112 <folding />
113 </state>
114 </provider>
115 </entry>
116 </file>
117 <file leaf-file-name="mapController.js" pinned="false" current-in-tab="false">
118 <entry file="file://$PROJECT_DIR$/js/controller/mapController.js">
119 <provider selected="true" editor-type-id="text-editor">
120 <state relative-caret-position="264">
121 <caret line="38" column="12" lean-forward="true" selection-start-line="38" selection-start-column="12" selection-end-line="38" selection-end-column="12" />
116 <folding /> 122 <folding />
117 </state> 123 </state>
118 </provider> 124 </provider>
...@@ -121,7 +127,7 @@ ...@@ -121,7 +127,7 @@
121 <file leaf-file-name="app.css" pinned="false" current-in-tab="false"> 127 <file leaf-file-name="app.css" pinned="false" current-in-tab="false">
122 <entry file="file://$PROJECT_DIR$/css/app.css"> 128 <entry file="file://$PROJECT_DIR$/css/app.css">
123 <provider selected="true" editor-type-id="text-editor"> 129 <provider selected="true" editor-type-id="text-editor">
124 <state relative-caret-position="102"> 130 <state relative-caret-position="13262">
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" /> 131 <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 /> 132 <folding />
127 </state> 133 </state>
...@@ -158,11 +164,11 @@ ...@@ -158,11 +164,11 @@
158 <option value="$PROJECT_DIR$/js/service/dingdaService.js" /> 164 <option value="$PROJECT_DIR$/js/service/dingdaService.js" />
159 <option value="$PROJECT_DIR$/js/controller/bondPayController.js" /> 165 <option value="$PROJECT_DIR$/js/controller/bondPayController.js" />
160 <option value="$PROJECT_DIR$/js/service/globalService.js" /> 166 <option value="$PROJECT_DIR$/js/service/globalService.js" />
161 <option value="$PROJECT_DIR$/js/service/wechatPaymentService.js" />
162 <option value="$PROJECT_DIR$/css/app.css" /> 167 <option value="$PROJECT_DIR$/css/app.css" />
163 <option value="$PROJECT_DIR$/js/controller/tripDetailController.js" /> 168 <option value="$PROJECT_DIR$/js/controller/tripDetailController.js" />
164 <option value="$PROJECT_DIR$/html/tripDetail.html" /> 169 <option value="$PROJECT_DIR$/html/tripDetail.html" />
165 <option value="$PROJECT_DIR$/html/bondPay.html" /> 170 <option value="$PROJECT_DIR$/html/bondPay.html" />
171 <option value="$PROJECT_DIR$/js/service/wechatPaymentService.js" />
166 </list> 172 </list>
167 </option> 173 </option>
168 </component> 174 </component>
...@@ -193,8 +199,6 @@ ...@@ -193,8 +199,6 @@
193 <foldersAlwaysOnTop value="true" /> 199 <foldersAlwaysOnTop value="true" />
194 </navigator> 200 </navigator>
195 <panes> 201 <panes>
196 <pane id="Scratches" />
197 <pane id="Scope" />
198 <pane id="ProjectPane"> 202 <pane id="ProjectPane">
199 <subPane> 203 <subPane>
200 <expand> 204 <expand>
...@@ -205,23 +209,20 @@ ...@@ -205,23 +209,20 @@
205 <path> 209 <path>
206 <item name="h5wx" type="b2602c69:ProjectViewProjectNode" /> 210 <item name="h5wx" type="b2602c69:ProjectViewProjectNode" />
207 <item name="h5wx" type="462c0819:PsiDirectoryNode" /> 211 <item name="h5wx" type="462c0819:PsiDirectoryNode" />
208 <item name="html" type="462c0819:PsiDirectoryNode" />
209 </path>
210 <path>
211 <item name="h5wx" type="b2602c69:ProjectViewProjectNode" />
212 <item name="h5wx" type="462c0819:PsiDirectoryNode" />
213 <item name="js" type="462c0819:PsiDirectoryNode" /> 212 <item name="js" type="462c0819:PsiDirectoryNode" />
214 </path> 213 </path>
215 <path> 214 <path>
216 <item name="h5wx" type="b2602c69:ProjectViewProjectNode" /> 215 <item name="h5wx" type="b2602c69:ProjectViewProjectNode" />
217 <item name="h5wx" type="462c0819:PsiDirectoryNode" /> 216 <item name="h5wx" type="462c0819:PsiDirectoryNode" />
218 <item name="js" type="462c0819:PsiDirectoryNode" /> 217 <item name="js" type="462c0819:PsiDirectoryNode" />
219 <item name="service" type="462c0819:PsiDirectoryNode" /> 218 <item name="controller" type="462c0819:PsiDirectoryNode" />
220 </path> 219 </path>
221 </expand> 220 </expand>
222 <select /> 221 <select />
223 </subPane> 222 </subPane>
224 </pane> 223 </pane>
224 <pane id="Scope" />
225 <pane id="Scratches" />
225 </panes> 226 </panes>
226 </component> 227 </component>
227 <component name="PropertiesComponent"> 228 <component name="PropertiesComponent">
...@@ -258,11 +259,12 @@ ...@@ -258,11 +259,12 @@
258 <updated>1534082685029</updated> 259 <updated>1534082685029</updated>
259 <workItem from="1534082686441" duration="5120000" /> 260 <workItem from="1534082686441" duration="5120000" />
260 <workItem from="1534165685107" duration="9587000" /> 261 <workItem from="1534165685107" duration="9587000" />
262 <workItem from="1534255280738" duration="1341000" />
261 </task> 263 </task>
262 <servers /> 264 <servers />
263 </component> 265 </component>
264 <component name="TimeTrackingManager"> 266 <component name="TimeTrackingManager">
265 <option name="totallyTimeSpent" value="14707000" /> 267 <option name="totallyTimeSpent" value="16048000" />
266 </component> 268 </component>
267 <component name="ToolWindowManager"> 269 <component name="ToolWindowManager">
268 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 270 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
...@@ -272,11 +274,10 @@ ...@@ -272,11 +274,10 @@
272 <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" /> 274 <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" />
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" /> 275 <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" />
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" /> 276 <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" />
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" />
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" /> 277 <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" />
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" /> 278 <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" />
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" /> 279 <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" />
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" /> 280 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32827735" sideWeight="0.5" order="7" side_tool="false" 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" /> 281 <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" />
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" /> 282 <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" />
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" /> 283 <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" />
...@@ -284,6 +285,7 @@ ...@@ -284,6 +285,7 @@
284 <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" /> 285 <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" />
285 <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" /> 286 <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" />
286 <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" /> 287 <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" />
288 <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" />
287 <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" /> 289 <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" />
288 </layout> 290 </layout>
289 </component> 291 </component>
...@@ -300,6 +302,88 @@ ...@@ -300,6 +302,88 @@
300 <component name="editorHistoryManager"> 302 <component name="editorHistoryManager">
301 <entry file="file://$PROJECT_DIR$/html/bondPay.html"> 303 <entry file="file://$PROJECT_DIR$/html/bondPay.html">
302 <provider selected="true" editor-type-id="text-editor"> 304 <provider selected="true" editor-type-id="text-editor">
305 <state relative-caret-position="38">
306 <caret line="2" column="101" lean-forward="true" selection-start-line="2" selection-start-column="101" selection-end-line="2" selection-end-column="101" />
307 <folding />
308 </state>
309 </provider>
310 </entry>
311 <entry file="file://$PROJECT_DIR$/js/controller/bondPayController.js">
312 <provider selected="true" editor-type-id="text-editor">
313 <state relative-caret-position="475">
314 <caret line="25" column="30" lean-forward="false" selection-start-line="25" selection-start-column="30" selection-end-line="25" selection-end-column="30" />
315 <folding />
316 </state>
317 </provider>
318 </entry>
319 <entry file="file://$PROJECT_DIR$/js/service/globalService.js">
320 <provider selected="true" editor-type-id="text-editor">
321 <state relative-caret-position="779">
322 <caret line="41" column="72" lean-forward="true" selection-start-line="41" selection-start-column="72" selection-end-line="41" selection-end-column="72" />
323 <folding />
324 </state>
325 </provider>
326 </entry>
327 <entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js">
328 <provider selected="true" editor-type-id="text-editor">
329 <state relative-caret-position="1083">
330 <caret line="97" column="23" lean-forward="false" selection-start-line="97" selection-start-column="8" selection-end-line="97" selection-end-column="23" />
331 <folding>
332 <element signature="e#579#2039#0" expanded="false" />
333 </folding>
334 </state>
335 </provider>
336 </entry>
337 <entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js">
338 <provider selected="true" editor-type-id="text-editor">
339 <state relative-caret-position="190">
340 <caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
341 <folding />
342 </state>
343 </provider>
344 </entry>
345 <entry file="file://$PROJECT_DIR$/js/controller/tripDetailController.js">
346 <provider selected="true" editor-type-id="text-editor">
347 <state relative-caret-position="570">
348 <caret line="30" column="26" lean-forward="false" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="26" />
349 <folding />
350 </state>
351 </provider>
352 </entry>
353 <entry file="file://$PROJECT_DIR$/index.html">
354 <provider selected="true" editor-type-id="text-editor">
355 <state relative-caret-position="1710">
356 <caret line="90" column="34" lean-forward="true" selection-start-line="90" selection-start-column="34" selection-end-line="90" selection-end-column="34" />
357 <folding />
358 </state>
359 </provider>
360 </entry>
361 <entry file="file://$PROJECT_DIR$/js/controller/bondController.js">
362 <provider selected="true" editor-type-id="text-editor">
363 <state relative-caret-position="380">
364 <caret line="20" column="34" lean-forward="false" selection-start-line="20" selection-start-column="34" selection-end-line="20" selection-end-column="34" />
365 <folding />
366 </state>
367 </provider>
368 </entry>
369 <entry file="file://$PROJECT_DIR$/css/app.css">
370 <provider selected="true" editor-type-id="text-editor">
371 <state relative-caret-position="13262">
372 <caret line="698" column="28" lean-forward="false" selection-start-line="698" selection-start-column="22" selection-end-line="698" selection-end-column="28" />
373 <folding />
374 </state>
375 </provider>
376 </entry>
377 <entry file="file://$PROJECT_DIR$/html/tripDetail.html">
378 <provider selected="true" editor-type-id="text-editor">
379 <state relative-caret-position="646">
380 <caret line="34" column="96" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="96" />
381 <folding />
382 </state>
383 </provider>
384 </entry>
385 <entry file="file://$PROJECT_DIR$/html/bondPay.html">
386 <provider selected="true" editor-type-id="text-editor">
303 <state relative-caret-position="95"> 387 <state relative-caret-position="95">
304 <caret line="5" column="83" lean-forward="false" selection-start-line="5" selection-start-column="73" selection-end-line="5" selection-end-column="83" /> 388 <caret line="5" column="83" lean-forward="false" selection-start-line="5" selection-start-column="73" selection-end-line="5" selection-end-column="83" />
305 <folding /> 389 <folding />
...@@ -338,13 +422,6 @@ ...@@ -338,13 +422,6 @@
338 </state> 422 </state>
339 </provider> 423 </provider>
340 </entry> 424 </entry>
341 <entry file="file://$PROJECT_DIR$/js/controller/mapController.js">
342 <provider selected="true" editor-type-id="text-editor">
343 <state relative-caret-position="-613">
344 <caret line="196" column="60" lean-forward="true" selection-start-line="196" selection-start-column="60" selection-end-line="196" selection-end-column="60" />
345 </state>
346 </provider>
347 </entry>
348 <entry file="file://$PROJECT_DIR$/html/pay.html"> 425 <entry file="file://$PROJECT_DIR$/html/pay.html">
349 <provider selected="true" editor-type-id="text-editor"> 426 <provider selected="true" editor-type-id="text-editor">
350 <state relative-caret-position="0"> 427 <state relative-caret-position="0">
...@@ -380,32 +457,16 @@ ...@@ -380,32 +457,16 @@
380 </state> 457 </state>
381 </provider> 458 </provider>
382 </entry> 459 </entry>
383 <entry file="file://$PROJECT_DIR$/js/controller/mainController.js">
384 <provider selected="true" editor-type-id="text-editor">
385 <state relative-caret-position="280">
386 <caret line="103" column="31" lean-forward="false" selection-start-line="103" selection-start-column="23" selection-end-line="103" selection-end-column="31" />
387 </state>
388 </provider>
389 </entry>
390 <entry file="file://$PROJECT_DIR$/js/service/dingdaService.js"> 460 <entry file="file://$PROJECT_DIR$/js/service/dingdaService.js">
391 <provider selected="true" editor-type-id="text-editor"> 461 <provider selected="true" editor-type-id="text-editor">
392 <state relative-caret-position="247"> 462 <state relative-caret-position="247">
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" /> 463 <caret line="138" column="18" lean-forward="true" selection-start-line="138" selection-start-column="18" selection-end-line="138" selection-end-column="18" />
394 <folding />
395 </state>
396 </provider>
397 </entry>
398 <entry file="file://$PROJECT_DIR$/js/controller/bondPayController.js">
399 <provider selected="true" editor-type-id="text-editor">
400 <state relative-caret-position="395">
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" />
402 <folding />
403 </state> 464 </state>
404 </provider> 465 </provider>
405 </entry> 466 </entry>
406 <entry file="file://$PROJECT_DIR$/js/service/globalService.js"> 467 <entry file="file://$PROJECT_DIR$/js/service/globalService.js">
407 <provider selected="true" editor-type-id="text-editor"> 468 <provider selected="true" editor-type-id="text-editor">
408 <state relative-caret-position="414"> 469 <state relative-caret-position="779">
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" /> 470 <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 /> 471 <folding />
411 </state> 472 </state>
...@@ -413,43 +474,41 @@ ...@@ -413,43 +474,41 @@
413 </entry> 474 </entry>
414 <entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js"> 475 <entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js">
415 <provider selected="true" editor-type-id="text-editor"> 476 <provider selected="true" editor-type-id="text-editor">
416 <state relative-caret-position="76"> 477 <state relative-caret-position="190">
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" /> 478 <caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
418 <folding /> 479 <folding />
419 </state> 480 </state>
420 </provider> 481 </provider>
421 </entry> 482 </entry>
422 <entry file="file://$PROJECT_DIR$/js/controller/bondController.js"> 483 <entry file="file://$PROJECT_DIR$/index.html">
423 <provider selected="true" editor-type-id="text-editor"> 484 <provider selected="true" editor-type-id="text-editor">
424 <state relative-caret-position="380"> 485 <state relative-caret-position="1710">
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" /> 486 <caret line="90" column="34" lean-forward="false" selection-start-line="90" selection-start-column="34" selection-end-line="90" selection-end-column="34" />
426 <folding /> 487 <folding />
427 </state> 488 </state>
428 </provider> 489 </provider>
429 </entry> 490 </entry>
430 <entry file="file://$PROJECT_DIR$/index.html"> 491 <entry file="file://$PROJECT_DIR$/css/app.css">
431 <provider selected="true" editor-type-id="text-editor"> 492 <provider selected="true" editor-type-id="text-editor">
432 <state relative-caret-position="76"> 493 <state relative-caret-position="13262">
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" /> 494 <caret line="698" column="28" lean-forward="false" selection-start-line="698" selection-start-column="22" selection-end-line="698" selection-end-column="28" />
434 <folding /> 495 <folding />
435 </state> 496 </state>
436 </provider> 497 </provider>
437 </entry> 498 </entry>
438 <entry file="file://$PROJECT_DIR$/css/app.css"> 499 <entry file="file://$PROJECT_DIR$/html/bondPay.html">
439 <provider selected="true" editor-type-id="text-editor"> 500 <provider selected="true" editor-type-id="text-editor">
440 <state relative-caret-position="102"> 501 <state relative-caret-position="437">
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" /> 502 <caret line="23" column="6" lean-forward="true" selection-start-line="23" selection-start-column="6" selection-end-line="23" selection-end-column="6" />
442 <folding /> 503 <folding />
443 </state> 504 </state>
444 </provider> 505 </provider>
445 </entry> 506 </entry>
446 <entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js"> 507 <entry file="file://$PROJECT_DIR$/html/tripDetail.html">
447 <provider selected="true" editor-type-id="text-editor"> 508 <provider selected="true" editor-type-id="text-editor">
448 <state relative-caret-position="399"> 509 <state relative-caret-position="266">
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" /> 510 <caret line="26" column="94" lean-forward="true" selection-start-line="26" selection-start-column="94" selection-end-line="26" selection-end-column="94" />
450 <folding> 511 <folding />
451 <element signature="e#579#2039#0" expanded="false" />
452 </folding>
453 </state> 512 </state>
454 </provider> 513 </provider>
455 </entry> 514 </entry>
...@@ -461,21 +520,55 @@ ...@@ -461,21 +520,55 @@
461 </state> 520 </state>
462 </provider> 521 </provider>
463 </entry> 522 </entry>
464 <entry file="file://$PROJECT_DIR$/html/tripDetail.html"> 523 <entry file="file://$PROJECT_DIR$/js/controller/bondPayController.js">
465 <provider selected="true" editor-type-id="text-editor"> 524 <provider selected="true" editor-type-id="text-editor">
466 <state relative-caret-position="418"> 525 <state relative-caret-position="92">
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" /> 526 <caret line="25" column="30" lean-forward="false" selection-start-line="25" selection-start-column="30" selection-end-line="25" selection-end-column="30" />
468 <folding /> 527 <folding />
469 </state> 528 </state>
470 </provider> 529 </provider>
471 </entry> 530 </entry>
472 <entry file="file://$PROJECT_DIR$/html/bondPay.html"> 531 <entry file="file://$PROJECT_DIR$/js/controller/bondController.js">
473 <provider selected="true" editor-type-id="text-editor"> 532 <provider selected="true" editor-type-id="text-editor">
474 <state relative-caret-position="38"> 533 <state relative-caret-position="266">
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" /> 534 <caret line="17" column="44" lean-forward="false" selection-start-line="17" selection-start-column="36" selection-end-line="17" selection-end-column="44" />
535 <folding />
536 </state>
537 </provider>
538 </entry>
539 <entry file="file://$PROJECT_DIR$/js/app.js">
540 <provider selected="true" editor-type-id="text-editor">
541 <state relative-caret-position="-801">
542 <caret line="14" column="27" lean-forward="true" selection-start-line="14" selection-start-column="27" selection-end-line="14" selection-end-column="27" />
543 <folding />
544 </state>
545 </provider>
546 </entry>
547 <entry file="file://$PROJECT_DIR$/js/controller/mainController.js">
548 <provider selected="true" editor-type-id="text-editor">
549 <state relative-caret-position="-321">
550 <caret line="104" column="40" lean-forward="true" selection-start-line="104" selection-start-column="40" selection-end-line="104" selection-end-column="40" />
551 <folding />
552 </state>
553 </provider>
554 </entry>
555 <entry file="file://$PROJECT_DIR$/js/controller/mapController.js">
556 <provider selected="true" editor-type-id="text-editor">
557 <state relative-caret-position="264">
558 <caret line="38" column="12" lean-forward="true" selection-start-line="38" selection-start-column="12" selection-end-line="38" selection-end-column="12" />
476 <folding /> 559 <folding />
477 </state> 560 </state>
478 </provider> 561 </provider>
479 </entry> 562 </entry>
563 <entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js">
564 <provider selected="true" editor-type-id="text-editor">
565 <state relative-caret-position="263">
566 <caret line="113" column="57" lean-forward="true" selection-start-line="113" selection-start-column="57" selection-end-line="113" selection-end-column="57" />
567 <folding>
568 <element signature="e#579#2039#0" expanded="false" />
569 </folding>
570 </state>
571 </provider>
572 </entry>
480 </component> 573 </component>
481 </project> 574 </project>
...\ No newline at end of file ...\ No newline at end of file
......
js/service/wechatPaymentService.js
...@@ -165,7 +165,7 @@ angular.module('myApp.services') ...@@ -165,7 +165,7 @@ angular.module('myApp.services')
165 body : "保证金充值", 165 body : "保证金充值",
166 type : type 166 type : type
167 }); 167 });
168 return callUnifiedOrderApi(payhost + "/balance/wx/h5", param); 168 return callUnifiedOrderApi(host + "/balance/wx/h5", param);
169 169
170 default: 170 default:
171 return null 171 return null
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!