Skip to content

杨建斌 / dy-wx2

Go to a project
Toggle navigation
Toggle navigation pinning
764ef11a by unknown
Options

get ercode

1 parent 44a749ef
Inline Side-by-side
Showing 7 changed files with 363 additions and 218 deletions
.idea/workspace.xml
...@@ -2,6 +2,12 @@ ...@@ -2,6 +2,12 @@
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" />
7 <change beforePath="$PROJECT_DIR$/index.html" afterPath="$PROJECT_DIR$/index.html" />
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" />
5 <change beforePath="$PROJECT_DIR$/js/service/wechatPaymentService.js" afterPath="$PROJECT_DIR$/js/service/wechatPaymentService.js" /> 11 <change beforePath="$PROJECT_DIR$/js/service/wechatPaymentService.js" afterPath="$PROJECT_DIR$/js/service/wechatPaymentService.js" />
6 </list> 12 </list>
7 <ignored path="$PROJECT_DIR$/.tmp/" /> 13 <ignored path="$PROJECT_DIR$/.tmp/" />
...@@ -15,14 +21,14 @@ ...@@ -15,14 +21,14 @@
15 <option name="LAST_RESOLUTION" value="IGNORE" /> 21 <option name="LAST_RESOLUTION" value="IGNORE" />
16 </component> 22 </component>
17 <component name="FileEditorManager"> 23 <component name="FileEditorManager">
18 <splitter split-orientation="horizontal" split-proportion="0.29823494"> 24 <splitter split-orientation="horizontal" split-proportion="0.32684115">
19 <split-first> 25 <split-first>
20 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 26 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
21 <file leaf-file-name="bondPay.html" pinned="false" current-in-tab="true"> 27 <file leaf-file-name="bondPay.html" pinned="false" current-in-tab="true">
22 <entry file="file://$PROJECT_DIR$/html/bondPay.html"> 28 <entry file="file://$PROJECT_DIR$/html/bondPay.html">
23 <provider selected="true" editor-type-id="text-editor"> 29 <provider selected="true" editor-type-id="text-editor">
24 <state relative-caret-position="437"> 30 <state relative-caret-position="380">
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" /> 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" />
26 <folding /> 32 <folding />
27 </state> 33 </state>
28 </provider> 34 </provider>
...@@ -32,83 +38,31 @@ ...@@ -32,83 +38,31 @@
32 </split-first> 38 </split-first>
33 <split-second> 39 <split-second>
34 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 40 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
35 <file leaf-file-name="bondPayController.js" pinned="false" current-in-tab="false"> 41 <file leaf-file-name="compress.js" pinned="false" current-in-tab="false">
36 <entry file="file://$PROJECT_DIR$/js/controller/bondPayController.js"> 42 <entry file="file://$PROJECT_DIR$/js/compress.js">
37 <provider selected="true" editor-type-id="text-editor"> 43 <provider selected="true" editor-type-id="text-editor">
38 <state relative-caret-position="92"> 44 <state relative-caret-position="114">
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" /> 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" />
40 <folding /> 46 <folding />
41 </state> 47 </state>
42 </provider> 48 </provider>
43 </entry> 49 </entry>
44 </file> 50 </file>
45 <file leaf-file-name="weixinConfig.js" pinned="false" current-in-tab="false"> 51 <file leaf-file-name="JSBridge.js" pinned="false" current-in-tab="false">
46 <entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js"> 52 <entry file="file://$PROJECT_DIR$/js/JSBridge.js">
47 <provider selected="true" editor-type-id="text-editor"> 53 <provider selected="true" editor-type-id="text-editor">
48 <state relative-caret-position="190"> 54 <state relative-caret-position="453">
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" /> 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" />
50 <folding /> 56 <folding />
51 </state> 57 </state>
52 </provider> 58 </provider>
53 </entry> 59 </entry>
54 </file> 60 </file>
55 <file leaf-file-name="wechatPaymentService.js" pinned="false" current-in-tab="true"> 61 <file leaf-file-name="mainController.js" pinned="false" current-in-tab="true">
56 <entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js">
57 <provider selected="true" editor-type-id="text-editor">
58 <state relative-caret-position="263">
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" />
60 <folding>
61 <element signature="e#579#2039#0" expanded="false" />
62 </folding>
63 </state>
64 </provider>
65 </entry>
66 </file>
67 <file leaf-file-name="tripDetailController.js" pinned="false" current-in-tab="false">
68 <entry file="file://$PROJECT_DIR$/js/controller/tripDetailController.js">
69 <provider selected="true" editor-type-id="text-editor">
70 <state relative-caret-position="171">
71 <caret line="30" column="26" lean-forward="false" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="26" />
72 <folding />
73 </state>
74 </provider>
75 </entry>
76 </file>
77 <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
78 <entry file="file://$PROJECT_DIR$/index.html">
79 <provider selected="true" editor-type-id="text-editor">
80 <state relative-caret-position="1710">
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" />
82 <folding />
83 </state>
84 </provider>
85 </entry>
86 </file>
87 <file leaf-file-name="bondController.js" pinned="false" current-in-tab="false">
88 <entry file="file://$PROJECT_DIR$/js/controller/bondController.js">
89 <provider selected="true" editor-type-id="text-editor">
90 <state relative-caret-position="266">
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" />
92 <folding />
93 </state>
94 </provider>
95 </entry>
96 </file>
97 <file leaf-file-name="app.js" pinned="false" current-in-tab="false">
98 <entry file="file://$PROJECT_DIR$/js/app.js">
99 <provider selected="true" editor-type-id="text-editor">
100 <state relative-caret-position="-801">
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"> 62 <entry file="file://$PROJECT_DIR$/js/controller/mainController.js">
109 <provider selected="true" editor-type-id="text-editor"> 63 <provider selected="true" editor-type-id="text-editor">
110 <state relative-caret-position="-321"> 64 <state relative-caret-position="359">
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" /> 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" />
112 <folding /> 66 <folding />
113 </state> 67 </state>
114 </provider> 68 </provider>
...@@ -117,18 +71,18 @@ ...@@ -117,18 +71,18 @@
117 <file leaf-file-name="mapController.js" pinned="false" current-in-tab="false"> 71 <file leaf-file-name="mapController.js" pinned="false" current-in-tab="false">
118 <entry file="file://$PROJECT_DIR$/js/controller/mapController.js"> 72 <entry file="file://$PROJECT_DIR$/js/controller/mapController.js">
119 <provider selected="true" editor-type-id="text-editor"> 73 <provider selected="true" editor-type-id="text-editor">
120 <state relative-caret-position="264"> 74 <state relative-caret-position="207">
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" /> 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" />
122 <folding /> 76 <folding />
123 </state> 77 </state>
124 </provider> 78 </provider>
125 </entry> 79 </entry>
126 </file> 80 </file>
127 <file leaf-file-name="app.css" pinned="false" current-in-tab="false"> 81 <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
128 <entry file="file://$PROJECT_DIR$/css/app.css"> 82 <entry file="file://$PROJECT_DIR$/index.html">
129 <provider selected="true" editor-type-id="text-editor"> 83 <provider selected="true" editor-type-id="text-editor">
130 <state relative-caret-position="13262"> 84 <state relative-caret-position="361">
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" /> 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" />
132 <folding /> 86 <folding />
133 </state> 87 </state>
134 </provider> 88 </provider>
...@@ -138,6 +92,13 @@ ...@@ -138,6 +92,13 @@
138 </split-second> 92 </split-second>
139 </splitter> 93 </splitter>
140 </component> 94 </component>
95 <component name="FileTemplateManagerImpl">
96 <option name="RECENT_TEMPLATES">
97 <list>
98 <option value="JavaScript File" />
99 </list>
100 </option>
101 </component>
141 <component name="FindInProjectRecents"> 102 <component name="FindInProjectRecents">
142 <findStrings> 103 <findStrings>
143 <find>globalService.getData(&quot;user&quot;)</find> 104 <find>globalService.getData(&quot;user&quot;)</find>
...@@ -149,6 +110,11 @@ ...@@ -149,6 +110,11 @@
149 <find>alipay</find> 110 <find>alipay</find>
150 <find>aliPay</find> 111 <find>aliPay</find>
151 <find>wxh5ApiCall</find> 112 <find>wxh5ApiCall</find>
113 <find>getSign</find>
114 <find>$rootScope.$watch(&quot;openScan&quot;</find>
115 <find>scanControlContainer</find>
116 <find>openScan</find>
117 <find>alert</find>
152 </findStrings> 118 </findStrings>
153 </component> 119 </component>
154 <component name="Git.Settings"> 120 <component name="Git.Settings">
...@@ -157,8 +123,6 @@ ...@@ -157,8 +123,6 @@
157 <component name="IdeDocumentHistory"> 123 <component name="IdeDocumentHistory">
158 <option name="CHANGED_PATHS"> 124 <option name="CHANGED_PATHS">
159 <list> 125 <list>
160 <option value="$PROJECT_DIR$/index.html" />
161 <option value="$PROJECT_DIR$/js/controller/mapController.js" />
162 <option value="$PROJECT_DIR$/html/main.html" /> 126 <option value="$PROJECT_DIR$/html/main.html" />
163 <option value="$PROJECT_DIR$/js/controller/bondController.js" /> 127 <option value="$PROJECT_DIR$/js/controller/bondController.js" />
164 <option value="$PROJECT_DIR$/js/service/dingdaService.js" /> 128 <option value="$PROJECT_DIR$/js/service/dingdaService.js" />
...@@ -169,6 +133,11 @@ ...@@ -169,6 +133,11 @@
169 <option value="$PROJECT_DIR$/html/tripDetail.html" /> 133 <option value="$PROJECT_DIR$/html/tripDetail.html" />
170 <option value="$PROJECT_DIR$/html/bondPay.html" /> 134 <option value="$PROJECT_DIR$/html/bondPay.html" />
171 <option value="$PROJECT_DIR$/js/service/wechatPaymentService.js" /> 135 <option value="$PROJECT_DIR$/js/service/wechatPaymentService.js" />
136 <option value="$PROJECT_DIR$/index.html" />
137 <option value="$PROJECT_DIR$/js/compress.js" />
138 <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" />
172 </list> 141 </list>
173 </option> 142 </option>
174 </component> 143 </component>
...@@ -199,6 +168,7 @@ ...@@ -199,6 +168,7 @@
199 <foldersAlwaysOnTop value="true" /> 168 <foldersAlwaysOnTop value="true" />
200 </navigator> 169 </navigator>
201 <panes> 170 <panes>
171 <pane id="Scope" />
202 <pane id="ProjectPane"> 172 <pane id="ProjectPane">
203 <subPane> 173 <subPane>
204 <expand> 174 <expand>
...@@ -211,17 +181,10 @@ ...@@ -211,17 +181,10 @@
211 <item name="h5wx" type="462c0819:PsiDirectoryNode" /> 181 <item name="h5wx" type="462c0819:PsiDirectoryNode" />
212 <item name="js" type="462c0819:PsiDirectoryNode" /> 182 <item name="js" type="462c0819:PsiDirectoryNode" />
213 </path> 183 </path>
214 <path>
215 <item name="h5wx" type="b2602c69:ProjectViewProjectNode" />
216 <item name="h5wx" type="462c0819:PsiDirectoryNode" />
217 <item name="js" type="462c0819:PsiDirectoryNode" />
218 <item name="controller" type="462c0819:PsiDirectoryNode" />
219 </path>
220 </expand> 184 </expand>
221 <select /> 185 <select />
222 </subPane> 186 </subPane>
223 </pane> 187 </pane>
224 <pane id="Scope" />
225 <pane id="Scratches" /> 188 <pane id="Scratches" />
226 </panes> 189 </panes>
227 </component> 190 </component>
...@@ -259,12 +222,14 @@ ...@@ -259,12 +222,14 @@
259 <updated>1534082685029</updated> 222 <updated>1534082685029</updated>
260 <workItem from="1534082686441" duration="5120000" /> 223 <workItem from="1534082686441" duration="5120000" />
261 <workItem from="1534165685107" duration="9587000" /> 224 <workItem from="1534165685107" duration="9587000" />
262 <workItem from="1534255280738" duration="1341000" /> 225 <workItem from="1534255280738" duration="2338000" />
226 <workItem from="1534425373942" duration="708000" />
227 <workItem from="1534601161748" duration="2864000" />
263 </task> 228 </task>
264 <servers /> 229 <servers />
265 </component> 230 </component>
266 <component name="TimeTrackingManager"> 231 <component name="TimeTrackingManager">
267 <option name="totallyTimeSpent" value="16048000" /> 232 <option name="totallyTimeSpent" value="20617000" />
268 </component> 233 </component>
269 <component name="ToolWindowManager"> 234 <component name="ToolWindowManager">
270 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 235 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
...@@ -274,6 +239,7 @@ ...@@ -274,6 +239,7 @@
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" /> 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" />
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" /> 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" />
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" /> 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" />
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" />
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" /> 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" />
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" /> 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" />
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" /> 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" />
...@@ -285,7 +251,6 @@ ...@@ -285,7 +251,6 @@
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" /> 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" />
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" /> 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" />
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" /> 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" />
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" />
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" /> 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" />
290 </layout> 255 </layout>
291 </component> 256 </component>
...@@ -302,6 +267,104 @@ ...@@ -302,6 +267,104 @@
302 <component name="editorHistoryManager"> 267 <component name="editorHistoryManager">
303 <entry file="file://$PROJECT_DIR$/html/bondPay.html"> 268 <entry file="file://$PROJECT_DIR$/html/bondPay.html">
304 <provider selected="true" editor-type-id="text-editor"> 269 <provider selected="true" editor-type-id="text-editor">
270 <state relative-caret-position="0">
271 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
272 <folding />
273 </state>
274 </provider>
275 </entry>
276 <entry file="file://$PROJECT_DIR$/html/bondPay.html">
277 <provider selected="true" editor-type-id="text-editor">
278 <state relative-caret-position="437">
279 <caret line="23" column="6" lean-forward="true" selection-start-line="23" selection-start-column="6" selection-end-line="23" selection-end-column="6" />
280 <folding />
281 </state>
282 </provider>
283 </entry>
284 <entry file="file://$PROJECT_DIR$/js/controller/bondPayController.js">
285 <provider selected="true" editor-type-id="text-editor">
286 <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" />
288 <folding />
289 </state>
290 </provider>
291 </entry>
292 <entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js">
293 <provider selected="true" editor-type-id="text-editor">
294 <state relative-caret-position="190">
295 <caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
296 <folding />
297 </state>
298 </provider>
299 </entry>
300 <entry file="file://$PROJECT_DIR$/js/controller/tripDetailController.js">
301 <provider selected="true" editor-type-id="text-editor">
302 <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" />
304 <folding />
305 </state>
306 </provider>
307 </entry>
308 <entry file="file://$PROJECT_DIR$/index.html">
309 <provider selected="true" editor-type-id="text-editor">
310 <state relative-caret-position="1710">
311 <caret line="90" column="34" lean-forward="false" selection-start-line="90" selection-start-column="34" selection-end-line="90" selection-end-column="34" />
312 <folding />
313 </state>
314 </provider>
315 </entry>
316 <entry file="file://$PROJECT_DIR$/js/controller/bondController.js">
317 <provider selected="true" editor-type-id="text-editor">
318 <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" />
320 <folding />
321 </state>
322 </provider>
323 </entry>
324 <entry file="file://$PROJECT_DIR$/js/app.js">
325 <provider selected="true" editor-type-id="text-editor">
326 <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" />
328 <folding />
329 </state>
330 </provider>
331 </entry>
332 <entry file="file://$PROJECT_DIR$/js/controller/mainController.js">
333 <provider selected="true" editor-type-id="text-editor">
334 <state relative-caret-position="1976">
335 <caret line="104" column="40" lean-forward="true" selection-start-line="104" selection-start-column="40" selection-end-line="104" selection-end-column="40" />
336 <folding />
337 </state>
338 </provider>
339 </entry>
340 <entry file="file://$PROJECT_DIR$/js/controller/mapController.js">
341 <provider selected="true" editor-type-id="text-editor">
342 <state relative-caret-position="722">
343 <caret line="38" column="12" lean-forward="true" selection-start-line="38" selection-start-column="12" selection-end-line="38" selection-end-column="12" />
344 <folding />
345 </state>
346 </provider>
347 </entry>
348 <entry file="file://$PROJECT_DIR$/css/app.css">
349 <provider selected="true" editor-type-id="text-editor">
350 <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" />
352 <folding />
353 </state>
354 </provider>
355 </entry>
356 <entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js">
357 <provider selected="true" editor-type-id="text-editor">
358 <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" />
360 <folding>
361 <element signature="e#579#2039#0" expanded="false" />
362 </folding>
363 </state>
364 </provider>
365 </entry>
366 <entry file="file://$PROJECT_DIR$/html/bondPay.html">
367 <provider selected="true" editor-type-id="text-editor">
305 <state relative-caret-position="38"> 368 <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" /> 369 <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 /> 370 <folding />
...@@ -378,7 +441,6 @@ ...@@ -378,7 +441,6 @@
378 <provider selected="true" editor-type-id="text-editor"> 441 <provider selected="true" editor-type-id="text-editor">
379 <state relative-caret-position="646"> 442 <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" /> 443 <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> 444 </state>
383 </provider> 445 </provider>
384 </entry> 446 </entry>
...@@ -472,101 +534,116 @@ ...@@ -472,101 +534,116 @@
472 </state> 534 </state>
473 </provider> 535 </provider>
474 </entry> 536 </entry>
537 <entry file="file://$PROJECT_DIR$/html/tripDetail.html">
538 <provider selected="true" editor-type-id="text-editor">
539 <state relative-caret-position="266">
540 <caret line="26" column="94" lean-forward="true" selection-start-line="26" selection-start-column="94" selection-end-line="26" selection-end-column="94" />
541 </state>
542 </provider>
543 </entry>
475 <entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js"> 544 <entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js">
476 <provider selected="true" editor-type-id="text-editor"> 545 <provider selected="true" editor-type-id="text-editor">
477 <state relative-caret-position="190"> 546 <state relative-caret-position="190">
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" /> 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" />
479 <folding /> 548 <folding />
480 </state> 549 </state>
481 </provider> 550 </provider>
482 </entry> 551 </entry>
483 <entry file="file://$PROJECT_DIR$/index.html"> 552 <entry file="file://$PROJECT_DIR$/js/controller/tripDetailController.js">
484 <provider selected="true" editor-type-id="text-editor"> 553 <provider selected="true" editor-type-id="text-editor">
485 <state relative-caret-position="1710"> 554 <state relative-caret-position="570">
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" /> 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" />
487 <folding /> 556 <folding />
488 </state> 557 </state>
489 </provider> 558 </provider>
490 </entry> 559 </entry>
491 <entry file="file://$PROJECT_DIR$/css/app.css"> 560 <entry file="file://$PROJECT_DIR$/js/controller/bondController.js">
492 <provider selected="true" editor-type-id="text-editor"> 561 <provider selected="true" editor-type-id="text-editor">
493 <state relative-caret-position="13262"> 562 <state relative-caret-position="323">
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" /> 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" />
495 <folding /> 564 <folding />
496 </state> 565 </state>
497 </provider> 566 </provider>
498 </entry> 567 </entry>
499 <entry file="file://$PROJECT_DIR$/html/bondPay.html"> 568 <entry file="file://$PROJECT_DIR$/js/app.js">
500 <provider selected="true" editor-type-id="text-editor"> 569 <provider selected="true" editor-type-id="text-editor">
501 <state relative-caret-position="437"> 570 <state relative-caret-position="266">
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" /> 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" />
503 <folding /> 572 <folding />
504 </state> 573 </state>
505 </provider> 574 </provider>
506 </entry> 575 </entry>
507 <entry file="file://$PROJECT_DIR$/html/tripDetail.html"> 576 <entry file="file://$PROJECT_DIR$/css/app.css">
508 <provider selected="true" editor-type-id="text-editor"> 577 <provider selected="true" editor-type-id="text-editor">
509 <state relative-caret-position="266"> 578 <state relative-caret-position="13262">
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" /> 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" />
511 <folding /> 580 <folding />
512 </state> 581 </state>
513 </provider> 582 </provider>
514 </entry> 583 </entry>
515 <entry file="file://$PROJECT_DIR$/js/controller/tripDetailController.js"> 584 <entry file="file://$PROJECT_DIR$/js/controller/bondPayController.js">
516 <provider selected="true" editor-type-id="text-editor"> 585 <provider selected="true" editor-type-id="text-editor">
517 <state relative-caret-position="171"> 586 <state relative-caret-position="19">
518 <caret line="30" column="26" lean-forward="false" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="26" /> 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" />
519 <folding /> 588 <folding />
520 </state> 589 </state>
521 </provider> 590 </provider>
522 </entry> 591 </entry>
523 <entry file="file://$PROJECT_DIR$/js/controller/bondPayController.js"> 592 <entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js">
524 <provider selected="true" editor-type-id="text-editor"> 593 <provider selected="true" editor-type-id="text-editor">
525 <state relative-caret-position="92"> 594 <state relative-caret-position="605">
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" /> 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" />
596 <folding>
597 <element signature="e#579#2039#0" expanded="false" />
598 </folding>
599 </state>
600 </provider>
601 </entry>
602 <entry file="file://$PROJECT_DIR$/html/bondPay.html">
603 <provider selected="true" editor-type-id="text-editor">
604 <state relative-caret-position="380">
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" />
527 <folding /> 606 <folding />
528 </state> 607 </state>
529 </provider> 608 </provider>
530 </entry> 609 </entry>
531 <entry file="file://$PROJECT_DIR$/js/controller/bondController.js"> 610 <entry file="file://$PROJECT_DIR$/index.html">
532 <provider selected="true" editor-type-id="text-editor"> 611 <provider selected="true" editor-type-id="text-editor">
533 <state relative-caret-position="266"> 612 <state relative-caret-position="361">
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" /> 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" />
535 <folding /> 614 <folding />
536 </state> 615 </state>
537 </provider> 616 </provider>
538 </entry> 617 </entry>
539 <entry file="file://$PROJECT_DIR$/js/app.js"> 618 <entry file="file://$PROJECT_DIR$/js/compress.js">
540 <provider selected="true" editor-type-id="text-editor"> 619 <provider selected="true" editor-type-id="text-editor">
541 <state relative-caret-position="-801"> 620 <state relative-caret-position="114">
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" /> 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" />
543 <folding /> 622 <folding />
544 </state> 623 </state>
545 </provider> 624 </provider>
546 </entry> 625 </entry>
547 <entry file="file://$PROJECT_DIR$/js/controller/mainController.js"> 626 <entry file="file://$PROJECT_DIR$/js/JSBridge.js">
548 <provider selected="true" editor-type-id="text-editor"> 627 <provider selected="true" editor-type-id="text-editor">
549 <state relative-caret-position="-321"> 628 <state relative-caret-position="453">
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" /> 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" />
551 <folding /> 630 <folding />
552 </state> 631 </state>
553 </provider> 632 </provider>
554 </entry> 633 </entry>
555 <entry file="file://$PROJECT_DIR$/js/controller/mapController.js"> 634 <entry file="file://$PROJECT_DIR$/js/controller/mapController.js">
556 <provider selected="true" editor-type-id="text-editor"> 635 <provider selected="true" editor-type-id="text-editor">
557 <state relative-caret-position="264"> 636 <state relative-caret-position="207">
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" /> 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" />
559 <folding /> 638 <folding />
560 </state> 639 </state>
561 </provider> 640 </provider>
562 </entry> 641 </entry>
563 <entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js"> 642 <entry file="file://$PROJECT_DIR$/js/controller/mainController.js">
564 <provider selected="true" editor-type-id="text-editor"> 643 <provider selected="true" editor-type-id="text-editor">
565 <state relative-caret-position="263"> 644 <state relative-caret-position="359">
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" /> 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" />
567 <folding> 646 <folding />
568 <element signature="e#579#2039#0" expanded="false" />
569 </folding>
570 </state> 647 </state>
571 </provider> 648 </provider>
572 </entry> 649 </entry>
......
index.html
...@@ -98,6 +98,7 @@ ...@@ -98,6 +98,7 @@
98 <link href="css/app.css" rel="stylesheet"/> 98 <link href="css/app.css" rel="stylesheet"/>
99 <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet"> 99 <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
100 <script type="text/javascript" src="js/jquery-1.9.1.js"></script> 100 <script type="text/javascript" src="js/jquery-1.9.1.js"></script>
101 <script type="text/javascript" src="js/JSBridge.js"></script>
101 <script type="text/javascript" src="js/angularjs/angular.min.js"></script> 102 <script type="text/javascript" src="js/angularjs/angular.min.js"></script>
102 <script type="text/javascript" src="js/angularjs/angular-local-storage.js"></script> 103 <script type="text/javascript" src="js/angularjs/angular-local-storage.js"></script>
103 <script type="text/javascript" src="js/angularjs/angular-ui-router.js"></script> 104 <script type="text/javascript" src="js/angularjs/angular-ui-router.js"></script>
......
js/JSBridge.js 0 → 100644
1 function AppClient(appObj, isAndroid) {
2 this.appObj = appObj;
3 this.isAndroid = isAndroid;
4 };
5
6 AppClient.prototype.closePage = function() {
7 if (this.isAndroid) {
8 this.appObj.closePageAction();
9 } else {
10 this.appObj.callHandler("closePageAction");
11 }
12 }
13 function isJson(str) {
14 try {
15 JSON.parse(str);
16 } catch (e) {
17 return false;
18 }
19 return true;
20 }
21 // window.invokeJsPassCompanyCodeAndName = function(_params) {
22 // companyCode = _params.companyCode;
23 // companyName = _params.companyName;
24 // var jsonStr = "";
25 // getSign(jsonStr);
26 // }
27 AppClient.prototype.getERCode = function (callbackName, callback, jsonStr) {
28 var dataParams = "";
29 if(isJson(jsonStr)){
30 dataParams = JSON.parse(jsonStr);
31 }
32 var iOSData = {
33 from: 'H5',
34 params: dataParams
35 };
36 if (this.isAndroid) {
37 this.appObj.getERCode('H5', jsonStr);
38 } else {
39 this.appObj.callHandler("getERCode", iOSData, callback);
40 }
41 };
42 if(window.android) {
43 appClient = new AppClient(window.android, true);
44 // 此处可以调用一些init的方法
45 } else {
46
47 function setupWebViewJavascriptBridge(callback) {
48 if (window.WebViewJavascriptBridge) { return callback(WebViewJavascriptBridge); }
49 if (window.WVJBCallbacks) { return window.WVJBCallbacks.push(callback); }
50 window.WVJBCallbacks = [callback];
51 var WVJBIframe = document.createElement('iframe');
52 WVJBIframe.style.display = 'none';
53 WVJBIframe.src = 'https://__bridge_loaded__';
54 document.documentElement.appendChild(WVJBIframe);
55 setTimeout(function() { document.documentElement.removeChild(WVJBIframe) }, 0)
56 }
57 setupWebViewJavascriptBridge(function(bridge) {
58 appClient = new AppClient(bridge, false);
59 // 此处可以调用一些init的方法
60 });
61
62 }
63 window.getIOSERCode = function (_params) {
64 alert(JSON.parse(_params))
65
66 }
js/compress.js
1 ///<jscompress sourcefile="app.js" /> 1 ///<jscompress sourcefile="app.js" />
2 angular.module('myApp.services', ['LocalStorageModule']); 2 angular.module('myApp.services', ['LocalStorageModule']);
3 angular.module('myApp.directives', []); 3 angular.module('myApp.directives', []);
4 var app = angular.module('myApp', [ "ui.router",'myApp.services', 'myApp.directives']); 4 var app = angular.module('myApp', [ "ui.router",'myApp.services', 'myApp.directives']);
...@@ -79,8 +79,8 @@ app.run(['globalService', function(globalService) { ...@@ -79,8 +79,8 @@ app.run(['globalService', function(globalService) {
79 }]) 79 }])
80 //$(window).bind("load resize",function(){ 80 //$(window).bind("load resize",function(){
81 // $("body").css({zoom:$(window).width()/320,visibility:"visible"}); 81 // $("body").css({zoom:$(window).width()/320,visibility:"visible"});
82 //}); 82 //});
83 ///<jscompress sourcefile="weixinConfig.js" /> 83 ///<jscompress sourcefile="weixinConfig.js" />
84 /** 84 /**
85 * Created by zhanghong on 15/3/8. 85 * Created by zhanghong on 15/3/8.
86 */ 86 */
...@@ -164,8 +164,8 @@ function initWeixinMenu($http){ ...@@ -164,8 +164,8 @@ function initWeixinMenu($http){
164 // alert(arg1); 164 // alert(arg1);
165 }); 165 });
166 } 166 }
167 167
168 ///<jscompress sourcefile="globalService.js" /> 168 ///<jscompress sourcefile="globalService.js" />
169 169
170 angular.module('myApp.services') 170 angular.module('myApp.services')
171 .service('globalService', 171 .service('globalService',
...@@ -300,8 +300,8 @@ angular.module('myApp.services') ...@@ -300,8 +300,8 @@ angular.module('myApp.services')
300 return globalConfig; 300 return globalConfig;
301 } 301 }
302 ] 302 ]
303 ); 303 );
304 ///<jscompress sourcefile="dingdaService.js" /> 304 ///<jscompress sourcefile="dingdaService.js" />
305 angular.module('myApp.services') 305 angular.module('myApp.services')
306 .service( 'dingdaService', [ '$http','globalService', 306 .service( 'dingdaService', [ '$http','globalService',
307 function($http,globalService) { 307 function($http,globalService) {
...@@ -466,8 +466,8 @@ angular.module('myApp.services') ...@@ -466,8 +466,8 @@ angular.module('myApp.services')
466 return res; 466 return res;
467 } 467 }
468 } 468 }
469 }]) 469 }])
470 ///<jscompress sourcefile="wechatPaymentService.js" /> 470 ///<jscompress sourcefile="wechatPaymentService.js" />
471 angular.module('myApp.services') 471 angular.module('myApp.services')
472 .service('wechatPayment',['$http', '$q', '$rootScope',function($http, $q, $rootScope) { 472 .service('wechatPayment',['$http', '$q', '$rootScope',function($http, $q, $rootScope) {
473 473
...@@ -573,8 +573,8 @@ angular.module('myApp.services') ...@@ -573,8 +573,8 @@ angular.module('myApp.services')
573 } 573 }
574 } 574 }
575 }]); 575 }]);
576 576
577 ///<jscompress sourcefile="mapController.js" /> 577 ///<jscompress sourcefile="mapController.js" />
578 angular.module('myApp') 578 angular.module('myApp')
579 .controller('mapController',['$scope','$rootScope','dingdaService','globalService','$state',function($scope,$rootScope,dingdaService,globalService,$state){ 579 .controller('mapController',['$scope','$rootScope','dingdaService','globalService','$state',function($scope,$rootScope,dingdaService,globalService,$state){
580 var myMarker; 580 var myMarker;
...@@ -1157,8 +1157,8 @@ angular.module('myApp') ...@@ -1157,8 +1157,8 @@ angular.module('myApp')
1157 initLocation(); 1157 initLocation();
1158 }) 1158 })
1159 1159
1160 }]); 1160 }]);
1161 ///<jscompress sourcefile="opinionController.js" /> 1161 ///<jscompress sourcefile="opinionController.js" />
1162 angular.module('myApp') 1162 angular.module('myApp')
1163 .controller('opinionController',['$scope','$rootScope','dingdaService','$state','globalService','$stateParams', 1163 .controller('opinionController',['$scope','$rootScope','dingdaService','$state','globalService','$stateParams',
1164 function($scope,$rootScope,dingdaService,$state,globalService,$stateParams){ 1164 function($scope,$rootScope,dingdaService,$state,globalService,$stateParams){
...@@ -1211,8 +1211,8 @@ angular.module('myApp') ...@@ -1211,8 +1211,8 @@ angular.module('myApp')
1211 } 1211 }
1212 } 1212 }
1213 1213
1214 }]); 1214 }]);
1215 ///<jscompress sourcefile="payController.js" /> 1215 ///<jscompress sourcefile="payController.js" />
1216 angular.module('myApp') 1216 angular.module('myApp')
1217 .controller('payController',['$scope','$rootScope','dingdaService','$state','globalService',function($scope,$rootScope,dingdaService,$state,globalService){ 1217 .controller('payController',['$scope','$rootScope','dingdaService','$state','globalService',function($scope,$rootScope,dingdaService,$state,globalService){
1218 1218
...@@ -1226,8 +1226,8 @@ angular.module('myApp') ...@@ -1226,8 +1226,8 @@ angular.module('myApp')
1226 $scope.pay = function() { 1226 $scope.pay = function() {
1227 alert("充值") 1227 alert("充值")
1228 } 1228 }
1229 }]); 1229 }]);
1230 ///<jscompress sourcefile="prepayController.js" /> 1230 ///<jscompress sourcefile="prepayController.js" />
1231 angular.module('myApp') 1231 angular.module('myApp')
1232 .controller('prepayController',['$scope','$rootScope','dingdaService','$state','globalService','wechatPayment',function($scope,$rootScope,dingdaService,$state,globalService,wechatPayment){ 1232 .controller('prepayController',['$scope','$rootScope','dingdaService','$state','globalService','wechatPayment',function($scope,$rootScope,dingdaService,$state,globalService,wechatPayment){
1233 1233
...@@ -1273,8 +1273,8 @@ angular.module('myApp') ...@@ -1273,8 +1273,8 @@ angular.module('myApp')
1273 1273
1274 // alert("充值 : " + $scope.account + "元") 1274 // alert("充值 : " + $scope.account + "元")
1275 } 1275 }
1276 }]); 1276 }]);
1277 ///<jscompress sourcefile="rechargeListController.js" /> 1277 ///<jscompress sourcefile="rechargeListController.js" />
1278 angular.module('myApp') 1278 angular.module('myApp')
1279 .controller('rechargeListController',function($scope,$rootScope,$state){ 1279 .controller('rechargeListController',function($scope,$rootScope,$state){
1280 $scope.rechargeList = [ 1280 $scope.rechargeList = [
...@@ -1289,8 +1289,8 @@ angular.module('myApp') ...@@ -1289,8 +1289,8 @@ angular.module('myApp')
1289 rechargeMoney:200 1289 rechargeMoney:200
1290 } 1290 }
1291 ] 1291 ]
1292 }) 1292 })
1293 ///<jscompress sourcefile="rentDetailController.js" /> 1293 ///<jscompress sourcefile="rentDetailController.js" />
1294 angular.module('myApp') 1294 angular.module('myApp')
1295 .controller('rentDetailController',['$scope','$rootScope','$state','dingdaService' ,function($scope,$rootScope,$state,dingdaService){ 1295 .controller('rentDetailController',['$scope','$rootScope','$state','dingdaService' ,function($scope,$rootScope,$state,dingdaService){
1296 1296
...@@ -1378,8 +1378,8 @@ angular.module('myApp') ...@@ -1378,8 +1378,8 @@ angular.module('myApp')
1378 $state.go('unusual' , { id : $scope.datail.id}); 1378 $state.go('unusual' , { id : $scope.datail.id});
1379 } 1379 }
1380 1380
1381 }]) 1381 }])
1382 ///<jscompress sourcefile="tripController.js" /> 1382 ///<jscompress sourcefile="tripController.js" />
1383 angular.module('myApp') 1383 angular.module('myApp')
1384 .controller('tripController',['$scope','$rootScope','$state','dingdaService' ,function($scope,$rootScope,$state,dingdaService){ 1384 .controller('tripController',['$scope','$rootScope','$state','dingdaService' ,function($scope,$rootScope,$state,dingdaService){
1385 1385
...@@ -1422,8 +1422,8 @@ angular.module('myApp') ...@@ -1422,8 +1422,8 @@ angular.module('myApp')
1422 $scope.viewTripDetail = function(index){ 1422 $scope.viewTripDetail = function(index){
1423 $state.go('tripDetail' , { orderId : $scope.tripList[index].id }); 1423 $state.go('tripDetail' , { orderId : $scope.tripList[index].id });
1424 } 1424 }
1425 }]) 1425 }])
1426 ///<jscompress sourcefile="tripDetailController.js" /> 1426 ///<jscompress sourcefile="tripDetailController.js" />
1427 angular.module('myApp') 1427 angular.module('myApp')
1428 .controller('tripDetailController', ['$scope', '$rootScope', '$state', 'dingdaService', '$stateParams', 'wechatPayment', 1428 .controller('tripDetailController', ['$scope', '$rootScope', '$state', 'dingdaService', '$stateParams', 'wechatPayment',
1429 function ($scope, $rootScope, $state, dingdaService, $stateParams, wechatPayment) { 1429 function ($scope, $rootScope, $state, dingdaService, $stateParams, wechatPayment) {
...@@ -1547,8 +1547,8 @@ angular.module('myApp') ...@@ -1547,8 +1547,8 @@ angular.module('myApp')
1547 } 1547 }
1548 init(); 1548 init();
1549 1549
1550 }]) 1550 }])
1551 ///<jscompress sourcefile="unusualController.js" /> 1551 ///<jscompress sourcefile="unusualController.js" />
1552 angular.module('myApp') 1552 angular.module('myApp')
1553 .controller('unusualController',['$scope','dingdaService','$state','$stateParams',function($scope,dingdaService,$state,$stateParams){ 1553 .controller('unusualController',['$scope','dingdaService','$state','$stateParams',function($scope,dingdaService,$state,$stateParams){
1554 1554
...@@ -1582,8 +1582,8 @@ angular.module('myApp') ...@@ -1582,8 +1582,8 @@ angular.module('myApp')
1582 }); 1582 });
1583 } 1583 }
1584 1584
1585 }]) 1585 }])
1586 ///<jscompress sourcefile="walletController.js" /> 1586 ///<jscompress sourcefile="walletController.js" />
1587 angular.module('myApp') 1587 angular.module('myApp')
1588 .controller('walletController',['$scope','$rootScope','dingdaService','$state','globalService',function($scope,$rootScope,dingdaService,$state,globalService){ 1588 .controller('walletController',['$scope','$rootScope','dingdaService','$state','globalService',function($scope,$rootScope,dingdaService,$state,globalService){
1589 1589
...@@ -1602,8 +1602,8 @@ angular.module('myApp') ...@@ -1602,8 +1602,8 @@ angular.module('myApp')
1602 $scope.prepay = function() { 1602 $scope.prepay = function() {
1603 $state.go('prepay', { }, { reload: false }); 1603 $state.go('prepay', { }, { reload: false });
1604 } 1604 }
1605 }]); 1605 }]);
1606 ///<jscompress sourcefile="bondController.js" /> 1606 ///<jscompress sourcefile="bondController.js" />
1607 angular.module('myApp') 1607 angular.module('myApp')
1608 .controller('bondController',['$scope' , '$rootScope', '$state' , 'dingdaService' , '$stateParams' , 1608 .controller('bondController',['$scope' , '$rootScope', '$state' , 'dingdaService' , '$stateParams' ,
1609 function($scope,$rootScope,$state,dingdaService,$stateParams){ 1609 function($scope,$rootScope,$state,dingdaService,$stateParams){
...@@ -1674,8 +1674,8 @@ angular.module('myApp') ...@@ -1674,8 +1674,8 @@ angular.module('myApp')
1674 }) 1674 })
1675 } 1675 }
1676 1676
1677 }]) 1677 }])
1678 ///<jscompress sourcefile="bondPayController.js" /> 1678 ///<jscompress sourcefile="bondPayController.js" />
1679 angular.module('myApp') 1679 angular.module('myApp')
1680 .controller('bondPayController',['$scope', '$rootScope', '$state', 'wechatPayment', 1680 .controller('bondPayController',['$scope', '$rootScope', '$state', 'wechatPayment',
1681 function($scope,$rootScope,$state, wechatPayment){ 1681 function($scope,$rootScope,$state, wechatPayment){
...@@ -1701,8 +1701,8 @@ angular.module('myApp') ...@@ -1701,8 +1701,8 @@ angular.module('myApp')
1701 1701
1702 1702
1703 1703
1704 }]) 1704 }])
1705 ///<jscompress sourcefile="bondSuccessController.js" /> 1705 ///<jscompress sourcefile="bondSuccessController.js" />
1706 angular.module('myApp') 1706 angular.module('myApp')
1707 .controller('bondSuccessController',[ '$scope' , '$rootScope' , '$state' , function($scope,$rootScope,$state){ 1707 .controller('bondSuccessController',[ '$scope' , '$rootScope' , '$state' , function($scope,$rootScope,$state){
1708 1708
...@@ -1712,8 +1712,8 @@ angular.module('myApp') ...@@ -1712,8 +1712,8 @@ angular.module('myApp')
1712 $state.go('main'); 1712 $state.go('main');
1713 } 1713 }
1714 1714
1715 }]) 1715 }])
1716 ///<jscompress sourcefile="contactController.js" /> 1716 ///<jscompress sourcefile="contactController.js" />
1717 angular.module('myApp') 1717 angular.module('myApp')
1718 .controller('contactController',['$scope','$rootScope','dingdaService','$state','globalService',function($scope,$rootScope,dingdaService,$state,globalService){ 1718 .controller('contactController',['$scope','$rootScope','dingdaService','$state','globalService',function($scope,$rootScope,dingdaService,$state,globalService){
1719 1719
...@@ -1769,8 +1769,8 @@ angular.module('myApp') ...@@ -1769,8 +1769,8 @@ angular.module('myApp')
1769 1769
1770 // mui.init(); 1770 // mui.init();
1771 init(); 1771 init();
1772 }]); 1772 }]);
1773 ///<jscompress sourcefile="loginController.js" /> 1773 ///<jscompress sourcefile="loginController.js" />
1774 angular.module('myApp') 1774 angular.module('myApp')
1775 .controller('loginController',[ '$scope','$rootScope','dingdaService','globalService' ,function($scope,$rootScope,dingdaService,globalService){ 1775 .controller('loginController',[ '$scope','$rootScope','dingdaService','globalService' ,function($scope,$rootScope,dingdaService,globalService){
1776 var init = function(){ 1776 var init = function(){
...@@ -1970,8 +1970,8 @@ angular.module('myApp') ...@@ -1970,8 +1970,8 @@ angular.module('myApp')
1970 1970
1971 1971
1972 1972
1973 1973
1974 ///<jscompress sourcefile="mainController.js" /> 1974 ///<jscompress sourcefile="mainController.js" />
1975 angular.module('myApp') 1975 angular.module('myApp')
1976 .controller('mainController',['$scope','$rootScope','dingdaService','$state','globalService',function($scope,$rootScope,dingdaService,$state,globalService){ 1976 .controller('mainController',['$scope','$rootScope','dingdaService','$state','globalService',function($scope,$rootScope,dingdaService,$state,globalService){
1977 1977
...@@ -2097,16 +2097,16 @@ angular.module('myApp') ...@@ -2097,16 +2097,16 @@ angular.module('myApp')
2097 // alert(JSON.stringify(data)) 2097 // alert(JSON.stringify(data))
2098 if(data.meta.code == 200) { 2098 if(data.meta.code == 200) {
2099 if(data.data.orderDetail.id) { 2099 if(data.data.orderDetail.id) {
2100 2100
2101 layer.open({ 2101 layer.open({
2102 content: "租车成功，订单号为：" + data.data.orderDetail.id, 2102 content: "租车成功，订单号为：" + data.data.orderDetail.id,
2103 time:2 2103 time:2
2104 }); 2104 });
2105 // alert("租车成功，订单号为：" + data.data.orderDetail.id); 2105 // alert("租车成功，订单号为：" + data.data.orderDetail.id);
2106 $rootScope.isRendBike = true; 2106 $rootScope.isRendBike = true;
2107 2107
2108 $state.go('rentDetail', {}, {reload: true}); 2108 $state.go('rentDetail', {}, {reload: true});
2109 2109
2110 } 2110 }
2111 } else if(data.meta.code == 202) { 2111 } else if(data.meta.code == 202) {
2112 layer.open({ 2112 layer.open({
...@@ -2178,4 +2178,4 @@ angular.module('myApp') ...@@ -2178,4 +2178,4 @@ angular.module('myApp')
2178 2178
2179 2179
2180 }]); 2180 }]);
2181 2181
......
js/controller/mainController.js
...@@ -4,7 +4,6 @@ angular.module('myApp') ...@@ -4,7 +4,6 @@ angular.module('myApp')
4 $rootScope.isRendBike = false; 4 $rootScope.isRendBike = false;
5 $rootScope.isLoadFinish = false; 5 $rootScope.isLoadFinish = false;
6 $scope.unfinishOrder = {}; 6 $scope.unfinishOrder = {};
7
8 var init = function() { 7 var init = function() {
9 // globalService.init(); 8 // globalService.init();
10 $scope.userinfo = globalService.getData("user"); 9 $scope.userinfo = globalService.getData("user");
...@@ -105,56 +104,60 @@ angular.module('myApp') ...@@ -105,56 +104,60 @@ angular.module('myApp')
105 $rootScope.openRing = false; 104 $rootScope.openRing = false;
106 $rootScope.$watch("openScan",function(newVal, oldVal){ 105 $rootScope.$watch("openScan",function(newVal, oldVal){
107 if(newVal !== oldVal && newVal) { 106 if(newVal !== oldVal && newVal) {
108 if(!$scope.checkLogin()) { 107 // if(!$scope.checkLogin()) {
109 return; 108 // return;
110 } 109 // }
111 110
112 if($scope.unfinishOrder.status == 200) { 111 // if($scope.unfinishOrder.status == 200) {
113 $state.go('tripDetail' , { orderId : $scope.unfinishOrder.id}); 112 // $state.go('tripDetail' , { orderId : $scope.unfinishOrder.id});
114 return; 113 // return;
115 } 114 // }
116 $rootScope.openScan = false; 115 $rootScope.openScan = false;
117 wx.scanQRCode({ 116 console.log(appClient)
118 needResult: 1, // 默认为1，扫描结果由微信处理，1则直接返回扫描结果， 117 appClient.getERCode('getIOSERCode', function (res) {
119 scanType: ["qrCode","barCode"], // 可以指定扫二维码还是一维码，默认二者都有 118 alert(JSON.parse(res))
120 success: function (res) { 119 }, '')
121 var result = res.resultStr; // 当needResult 为 1 时，扫码返回的结果 120 // wx.scanQRCode({
122 // alert(result); 121 // needResult: 1, // 默认为1，扫描结果由微信处理，1则直接返回扫描结果，
123 dingdaService.verifyScanCode(result).success(function(data , status){ 122 // scanType: ["qrCode","barCode"], // 可以指定扫二维码还是一维码，默认二者都有
124 // alert(JSON.stringify(data)) 123 // success: function (res) {
125 if(data.meta.code == 200) { 124 // var result = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
126 if(data.data.orderDetail.id) { 125 // // alert(result);
127 126 // dingdaService.verifyScanCode(result).success(function(data , status){
128 layer.open({ 127 // // alert(JSON.stringify(data))
129 content: "租车成功，订单号为：" + data.data.orderDetail.id, 128 // if(data.meta.code == 200) {
130 time:2 129 // if(data.data.orderDetail.id) {
131 }); 130 //
132 // alert("租车成功，订单号为：" + data.data.orderDetail.id); 131 // layer.open({
133 $rootScope.isRendBike = true; 132 // content: "租车成功，订单号为：" + data.data.orderDetail.id,
134 133 // time:2
135 $state.go('rentDetail', {}, {reload: true}); 134 // });
136 135 // // alert("租车成功，订单号为：" + data.data.orderDetail.id);
137 } 136 // $rootScope.isRendBike = true;
138 } else if(data.meta.code == 202) { 137 //
139 layer.open({ 138 // $state.go('rentDetail', {}, {reload: true});
140 content: data.meta.message, 139 //
141 time:2 140 // }
142 }); 141 // } else if(data.meta.code == 202) {
143 $state.go('bond', {longitude: $rootScope.currentPoint.longitude , latitude: $rootScope.currentPoint.latitude }); 142 // layer.open({
144 } else { 143 // content: data.meta.message,
145 layer.open({ 144 // time:2
146 content: data.meta.message, 145 // });
147 time:2 146 // $state.go('bond', {longitude: $rootScope.currentPoint.longitude , latitude: $rootScope.currentPoint.latitude });
148 }); 147 // } else {
149 } 148 // layer.open({
150 }).error(function(data , status){ 149 // content: data.meta.message,
151 layer.open({ 150 // time:2
152 content: "租车失败" + JSON.stringify(data), 151 // });
153 time:2 152 // }
154 }); 153 // }).error(function(data , status){
155 }); 154 // layer.open({
156 } 155 // content: "租车失败" + JSON.stringify(data),
157 }); 156 // time:2
157 // });
158 // });
159 // }
160 // });
158 } 161 }
159 }) 162 })
160 $rootScope.$watch("openDetail",function(newVal, oldVal){ 163 $rootScope.$watch("openDetail",function(newVal, oldVal){
......
js/controller/mapController.js
...@@ -9,7 +9,6 @@ angular.module('myApp') ...@@ -9,7 +9,6 @@ angular.module('myApp')
9 var map; 9 var map;
10 var endPosition; 10 var endPosition;
11 var polyline; 11 var polyline;
12
13 $rootScope.currentPoint = {}; 12 $rootScope.currentPoint = {};
14 13
15 var rendBike = function() { 14 var rendBike = function() {
...@@ -154,7 +153,6 @@ angular.module('myApp') ...@@ -154,7 +153,6 @@ angular.module('myApp')
154 img.src = "images/scancode.png"; 153 img.src = "images/scancode.png";
155 154
156 scanControlContent.innerHTML = img.outerHTML + " 扫码租车"; 155 scanControlContent.innerHTML = img.outerHTML + " 扫码租车";
157
158 scanControlContainer.onclick = function() { 156 scanControlContainer.onclick = function() {
159 $scope.$apply(function() { 157 $scope.$apply(function() {
160 $rootScope.openScan = true; 158 $rootScope.openScan = true;
......
js/service/wechatPaymentService.js
...@@ -116,7 +116,7 @@ angular.module('myApp.services') ...@@ -116,7 +116,7 @@ angular.module('myApp.services')
116 case 101: 116 case 101:
117 var param = Object.assign($location.search(),{ 117 var param = Object.assign($location.search(),{
118 amount : amount, 118 amount : amount,
119 body : "租车租金", 119 body : "租车租git金",
120 type : 101 120 type : 101
121 }); 121 });
122 return callUnifiedOrderApi(host + "/bill/wx/h5/" + orderId, param); 122 return callUnifiedOrderApi(host + "/bill/wx/h5/" + orderId, param);
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!