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 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="f03425da-2e43-4e8a-b218-238983912f5c" name="Default" comment="">
<change beforePath="" afterPath="$PROJECT_DIR$/js/JSBridge.js" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change beforePath="$PROJECT_DIR$/index.html" afterPath="$PROJECT_DIR$/index.html" />
<change beforePath="$PROJECT_DIR$/js/compress.js" afterPath="$PROJECT_DIR$/js/compress.js" />
<change beforePath="$PROJECT_DIR$/js/controller/mainController.js" afterPath="$PROJECT_DIR$/js/controller/mainController.js" />
<change beforePath="$PROJECT_DIR$/js/controller/mapController.js" afterPath="$PROJECT_DIR$/js/controller/mapController.js" />
<change beforePath="$PROJECT_DIR$/js/service/wechatPaymentService.js" afterPath="$PROJECT_DIR$/js/service/wechatPaymentService.js" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
......@@ -15,14 +21,14 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.29823494">
<splitter split-orientation="horizontal" split-proportion="0.32684115">
<split-first>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="bondPay.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/html/bondPay.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="437">
<caret line="23" column="6" lean-forward="true" selection-start-line="23" selection-start-column="6" selection-end-line="23" selection-end-column="6" />
<state relative-caret-position="380">
<caret line="20" column="17" lean-forward="true" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" />
<folding />
</state>
</provider>
......@@ -32,83 +38,31 @@
</split-first>
<split-second>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="bondPayController.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/controller/bondPayController.js">
<file leaf-file-name="compress.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/compress.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="92">
<caret line="25" column="30" lean-forward="false" selection-start-line="25" selection-start-column="30" selection-end-line="25" selection-end-column="30" />
<state relative-caret-position="114">
<caret line="2078" column="40" lean-forward="true" selection-start-line="2078" selection-start-column="12" selection-end-line="2078" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="weixinConfig.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js">
<file leaf-file-name="JSBridge.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/JSBridge.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
<state relative-caret-position="453">
<caret line="62" column="19" lean-forward="false" selection-start-line="62" selection-start-column="7" selection-end-line="62" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="wechatPaymentService.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="263">
<caret line="113" column="57" lean-forward="true" selection-start-line="113" selection-start-column="57" selection-end-line="113" selection-end-column="57" />
<folding>
<element signature="e#579#2039#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="tripDetailController.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/controller/tripDetailController.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="171">
<caret line="30" column="26" lean-forward="false" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1710">
<caret line="90" column="34" lean-forward="false" selection-start-line="90" selection-start-column="34" selection-end-line="90" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="bondController.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/controller/bondController.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="17" column="44" lean-forward="false" selection-start-line="17" selection-start-column="36" selection-end-line="17" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="app.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-801">
<caret line="14" column="27" lean-forward="true" selection-start-line="14" selection-start-column="27" selection-end-line="14" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="mainController.js" pinned="false" current-in-tab="false">
<file leaf-file-name="mainController.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/js/controller/mainController.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-321">
<caret line="104" column="40" lean-forward="true" selection-start-line="104" selection-start-column="40" selection-end-line="104" selection-end-column="40" />
<state relative-caret-position="359">
<caret line="116" column="72" lean-forward="true" selection-start-line="116" selection-start-column="72" selection-end-line="116" selection-end-column="72" />
<folding />
</state>
</provider>
......@@ -117,18 +71,18 @@
<file leaf-file-name="mapController.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/controller/mapController.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="38" column="12" lean-forward="true" selection-start-line="38" selection-start-column="12" selection-end-line="38" selection-end-column="12" />
<state relative-caret-position="207">
<caret line="157" column="43" lean-forward="false" selection-start-line="157" selection-start-column="35" selection-end-line="157" selection-end-column="43" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="app.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/app.css">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="13262">
<caret line="698" column="28" lean-forward="false" selection-start-line="698" selection-start-column="22" selection-end-line="698" selection-end-column="28" />
<state relative-caret-position="361">
<caret line="123" column="95" lean-forward="true" selection-start-line="123" selection-start-column="95" selection-end-line="123" selection-end-column="95" />
<folding />
</state>
</provider>
......@@ -138,6 +92,13 @@
</split-second>
</splitter>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="JavaScript File" />
</list>
</option>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>globalService.getData(&quot;user&quot;)</find>
......@@ -149,6 +110,11 @@
<find>alipay</find>
<find>aliPay</find>
<find>wxh5ApiCall</find>
<find>getSign</find>
<find>$rootScope.$watch(&quot;openScan&quot;</find>
<find>scanControlContainer</find>
<find>openScan</find>
<find>alert</find>
</findStrings>
</component>
<component name="Git.Settings">
......@@ -157,8 +123,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/js/controller/mapController.js" />
<option value="$PROJECT_DIR$/html/main.html" />
<option value="$PROJECT_DIR$/js/controller/bondController.js" />
<option value="$PROJECT_DIR$/js/service/dingdaService.js" />
......@@ -169,6 +133,11 @@
<option value="$PROJECT_DIR$/html/tripDetail.html" />
<option value="$PROJECT_DIR$/html/bondPay.html" />
<option value="$PROJECT_DIR$/js/service/wechatPaymentService.js" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/js/compress.js" />
<option value="$PROJECT_DIR$/js/controller/mapController.js" />
<option value="$PROJECT_DIR$/js/JSBridge.js" />
<option value="$PROJECT_DIR$/js/controller/mainController.js" />
</list>
</option>
</component>
......@@ -199,6 +168,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
......@@ -211,17 +181,10 @@
<item name="h5wx" type="462c0819:PsiDirectoryNode" />
<item name="js" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="h5wx" type="b2602c69:ProjectViewProjectNode" />
<item name="h5wx" type="462c0819:PsiDirectoryNode" />
<item name="js" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="Scratches" />
</panes>
</component>
......@@ -259,12 +222,14 @@
<updated>1534082685029</updated>
<workItem from="1534082686441" duration="5120000" />
<workItem from="1534165685107" duration="9587000" />
<workItem from="1534255280738" duration="1341000" />
<workItem from="1534255280738" duration="2338000" />
<workItem from="1534425373942" duration="708000" />
<workItem from="1534601161748" duration="2864000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="16048000" />
<option name="totallyTimeSpent" value="20617000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
......@@ -274,6 +239,7 @@
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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 @@
<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" />
<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" />
<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" />
<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" />
<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" />
</layout>
</component>
......@@ -302,6 +267,104 @@
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/html/bondPay.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/bondPay.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="437">
<caret line="23" column="6" lean-forward="true" selection-start-line="23" selection-start-column="6" selection-end-line="23" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/controller/bondPayController.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
<caret line="25" column="30" lean-forward="false" selection-start-line="25" selection-start-column="30" selection-end-line="25" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/controller/tripDetailController.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570">
<caret line="30" column="26" lean-forward="false" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1710">
<caret line="90" column="34" lean-forward="false" selection-start-line="90" selection-start-column="34" selection-end-line="90" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/controller/bondController.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="17" column="44" lean-forward="false" selection-start-line="17" selection-start-column="36" selection-end-line="17" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="14" column="27" lean-forward="true" selection-start-line="14" selection-start-column="27" selection-end-line="14" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/controller/mainController.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1976">
<caret line="104" column="40" lean-forward="true" selection-start-line="104" selection-start-column="40" selection-end-line="104" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/controller/mapController.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="722">
<caret line="38" column="12" lean-forward="true" selection-start-line="38" selection-start-column="12" selection-end-line="38" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/app.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="13262">
<caret line="698" column="28" lean-forward="false" selection-start-line="698" selection-start-column="22" selection-end-line="698" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1463">
<caret line="117" column="40" lean-forward="true" selection-start-line="117" selection-start-column="40" selection-end-line="117" selection-end-column="40" />
<folding>
<element signature="e#579#2039#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/bondPay.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="38">
<caret line="2" column="101" lean-forward="true" selection-start-line="2" selection-start-column="101" selection-end-line="2" selection-end-column="101" />
<folding />
......@@ -378,7 +441,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="646">
<caret line="34" column="96" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="96" />
<folding />
</state>
</provider>
</entry>
......@@ -472,101 +534,116 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/tripDetail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="26" column="94" lean-forward="true" selection-start-line="26" selection-start-column="94" selection-end-line="26" selection-end-column="94" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
<caret line="10" column="19" lean-forward="false" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<entry file="file://$PROJECT_DIR$/js/controller/tripDetailController.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1710">
<caret line="90" column="34" lean-forward="false" selection-start-line="90" selection-start-column="34" selection-end-line="90" selection-end-column="34" />
<state relative-caret-position="570">
<caret line="30" column="26" lean-forward="false" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/app.css">
<entry file="file://$PROJECT_DIR$/js/controller/bondController.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="13262">
<caret line="698" column="28" lean-forward="false" selection-start-line="698" selection-start-column="22" selection-end-line="698" selection-end-column="28" />
<state relative-caret-position="323">
<caret line="17" column="44" lean-forward="false" selection-start-line="17" selection-start-column="36" selection-end-line="17" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/bondPay.html">
<entry file="file://$PROJECT_DIR$/js/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="437">
<caret line="23" column="6" lean-forward="true" selection-start-line="23" selection-start-column="6" selection-end-line="23" selection-end-column="6" />
<state relative-caret-position="266">
<caret line="14" column="27" lean-forward="true" selection-start-line="14" selection-start-column="27" selection-end-line="14" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/tripDetail.html">
<entry file="file://$PROJECT_DIR$/css/app.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="26" column="94" lean-forward="true" selection-start-line="26" selection-start-column="94" selection-end-line="26" selection-end-column="94" />
<state relative-caret-position="13262">
<caret line="698" column="28" lean-forward="false" selection-start-line="698" selection-start-column="22" selection-end-line="698" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/controller/tripDetailController.js">
<entry file="file://$PROJECT_DIR$/js/controller/bondPayController.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="171">
<caret line="30" column="26" lean-forward="false" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="26" />
<state relative-caret-position="19">
<caret line="19" column="82" lean-forward="false" selection-start-line="19" selection-start-column="24" selection-end-line="19" selection-end-column="82" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/controller/bondPayController.js">
<entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="92">
<caret line="25" column="30" lean-forward="false" selection-start-line="25" selection-start-column="30" selection-end-line="25" selection-end-column="30" />
<state relative-caret-position="605">
<caret line="110" column="41" lean-forward="true" selection-start-line="110" selection-start-column="41" selection-end-line="110" selection-end-column="41" />
<folding>
<element signature="e#579#2039#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/bondPay.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="380">
<caret line="20" column="17" lean-forward="true" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/controller/bondController.js">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="17" column="44" lean-forward="false" selection-start-line="17" selection-start-column="36" selection-end-line="17" selection-end-column="44" />
<state relative-caret-position="361">
<caret line="123" column="95" lean-forward="true" selection-start-line="123" selection-start-column="95" selection-end-line="123" selection-end-column="95" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/app.js">
<entry file="file://$PROJECT_DIR$/js/compress.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-801">
<caret line="14" column="27" lean-forward="true" selection-start-line="14" selection-start-column="27" selection-end-line="14" selection-end-column="27" />
<state relative-caret-position="114">
<caret line="2078" column="40" lean-forward="true" selection-start-line="2078" selection-start-column="12" selection-end-line="2078" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/controller/mainController.js">
<entry file="file://$PROJECT_DIR$/js/JSBridge.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-321">
<caret line="104" column="40" lean-forward="true" selection-start-line="104" selection-start-column="40" selection-end-line="104" selection-end-column="40" />
<state relative-caret-position="453">
<caret line="62" column="19" lean-forward="false" selection-start-line="62" selection-start-column="7" selection-end-line="62" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/controller/mapController.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="38" column="12" lean-forward="true" selection-start-line="38" selection-start-column="12" selection-end-line="38" selection-end-column="12" />
<state relative-caret-position="207">
<caret line="157" column="43" lean-forward="false" selection-start-line="157" selection-start-column="35" selection-end-line="157" selection-end-column="43" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js">
<entry file="file://$PROJECT_DIR$/js/controller/mainController.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="263">
<caret line="113" column="57" lean-forward="true" selection-start-line="113" selection-start-column="57" selection-end-line="113" selection-end-column="57" />
<folding>
<element signature="e#579#2039#0" expanded="false" />
</folding>
<state relative-caret-position="359">
<caret line="116" column="72" lean-forward="true" selection-start-line="116" selection-start-column="72" selection-end-line="116" selection-end-column="72" />
<folding />
</state>
</provider>
</entry>
......
index.html
......@@ -98,6 +98,7 @@
<link href="css/app.css" rel="stylesheet"/>
<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
<script type="text/javascript" src="js/jquery-1.9.1.js"></script>
<script type="text/javascript" src="js/JSBridge.js"></script>
<script type="text/javascript" src="js/angularjs/angular.min.js"></script>
<script type="text/javascript" src="js/angularjs/angular-local-storage.js"></script>
<script type="text/javascript" src="js/angularjs/angular-ui-router.js"></script>
......
js/JSBridge.js 0 → 100644
function AppClient(appObj, isAndroid) {
this.appObj = appObj;
this.isAndroid = isAndroid;
};
AppClient.prototype.closePage = function() {
if (this.isAndroid) {
this.appObj.closePageAction();
} else {
this.appObj.callHandler("closePageAction");
}
}
function isJson(str) {
try {
JSON.parse(str);
} catch (e) {
return false;
}
return true;
}
// window.invokeJsPassCompanyCodeAndName = function(_params) {
// companyCode = _params.companyCode;
// companyName = _params.companyName;
// var jsonStr = "";
// getSign(jsonStr);
// }
AppClient.prototype.getERCode = function (callbackName, callback, jsonStr) {
var dataParams = "";
if(isJson(jsonStr)){
dataParams = JSON.parse(jsonStr);
}
var iOSData = {
from: 'H5',
params: dataParams
};
if (this.isAndroid) {
this.appObj.getERCode('H5', jsonStr);
} else {
this.appObj.callHandler("getERCode", iOSData, callback);
}
};
if(window.android) {
appClient = new AppClient(window.android, true);
// 此处可以调用一些init的方法
} else {
function setupWebViewJavascriptBridge(callback) {
if (window.WebViewJavascriptBridge) { return callback(WebViewJavascriptBridge); }
if (window.WVJBCallbacks) { return window.WVJBCallbacks.push(callback); }
window.WVJBCallbacks = [callback];
var WVJBIframe = document.createElement('iframe');
WVJBIframe.style.display = 'none';
WVJBIframe.src = 'https://__bridge_loaded__';
document.documentElement.appendChild(WVJBIframe);
setTimeout(function() { document.documentElement.removeChild(WVJBIframe) }, 0)
}
setupWebViewJavascriptBridge(function(bridge) {
appClient = new AppClient(bridge, false);
// 此处可以调用一些init的方法
});
}
window.getIOSERCode = function (_params) {
alert(JSON.parse(_params))
}
js/compress.js
///<jscompress sourcefile="app.js" />
///<jscompress sourcefile="app.js" />
angular.module('myApp.services', ['LocalStorageModule']);
angular.module('myApp.directives', []);
var app = angular.module('myApp', [ "ui.router",'myApp.services', 'myApp.directives']);
......@@ -79,8 +79,8 @@ app.run(['globalService', function(globalService) {
}])
//$(window).bind("load resize",function(){
// $("body").css({zoom:$(window).width()/320,visibility:"visible"});
//});
///<jscompress sourcefile="weixinConfig.js" />
//});
///<jscompress sourcefile="weixinConfig.js" />
/**
* Created by zhanghong on 15/3/8.
*/
......@@ -164,8 +164,8 @@ function initWeixinMenu($http){
// alert(arg1);
});
}
///<jscompress sourcefile="globalService.js" />
///<jscompress sourcefile="globalService.js" />
angular.module('myApp.services')
.service('globalService',
......@@ -300,8 +300,8 @@ angular.module('myApp.services')
return globalConfig;
}
]
);
///<jscompress sourcefile="dingdaService.js" />
);
///<jscompress sourcefile="dingdaService.js" />
angular.module('myApp.services')
.service( 'dingdaService', [ '$http','globalService',
function($http,globalService) {
......@@ -466,8 +466,8 @@ angular.module('myApp.services')
return res;
}
}
}])
///<jscompress sourcefile="wechatPaymentService.js" />
}])
///<jscompress sourcefile="wechatPaymentService.js" />
angular.module('myApp.services')
.service('wechatPayment',['$http', '$q', '$rootScope',function($http, $q, $rootScope) {
......@@ -573,8 +573,8 @@ angular.module('myApp.services')
}
}
}]);
///<jscompress sourcefile="mapController.js" />
///<jscompress sourcefile="mapController.js" />
angular.module('myApp')
.controller('mapController',['$scope','$rootScope','dingdaService','globalService','$state',function($scope,$rootScope,dingdaService,globalService,$state){
var myMarker;
......@@ -1157,8 +1157,8 @@ angular.module('myApp')
initLocation();
})
}]);
///<jscompress sourcefile="opinionController.js" />
}]);
///<jscompress sourcefile="opinionController.js" />
angular.module('myApp')
.controller('opinionController',['$scope','$rootScope','dingdaService','$state','globalService','$stateParams',
function($scope,$rootScope,dingdaService,$state,globalService,$stateParams){
......@@ -1211,8 +1211,8 @@ angular.module('myApp')
}
}
}]);
///<jscompress sourcefile="payController.js" />
}]);
///<jscompress sourcefile="payController.js" />
angular.module('myApp')
.controller('payController',['$scope','$rootScope','dingdaService','$state','globalService',function($scope,$rootScope,dingdaService,$state,globalService){
......@@ -1226,8 +1226,8 @@ angular.module('myApp')
$scope.pay = function() {
alert("充值")
}
}]);
///<jscompress sourcefile="prepayController.js" />
}]);
///<jscompress sourcefile="prepayController.js" />
angular.module('myApp')
.controller('prepayController',['$scope','$rootScope','dingdaService','$state','globalService','wechatPayment',function($scope,$rootScope,dingdaService,$state,globalService,wechatPayment){
......@@ -1273,8 +1273,8 @@ angular.module('myApp')
// alert("充值 : " + $scope.account + "元")
}
}]);
///<jscompress sourcefile="rechargeListController.js" />
}]);
///<jscompress sourcefile="rechargeListController.js" />
angular.module('myApp')
.controller('rechargeListController',function($scope,$rootScope,$state){
$scope.rechargeList = [
......@@ -1289,8 +1289,8 @@ angular.module('myApp')
rechargeMoney:200
}
]
})
///<jscompress sourcefile="rentDetailController.js" />
})
///<jscompress sourcefile="rentDetailController.js" />
angular.module('myApp')
.controller('rentDetailController',['$scope','$rootScope','$state','dingdaService' ,function($scope,$rootScope,$state,dingdaService){
......@@ -1378,8 +1378,8 @@ angular.module('myApp')
$state.go('unusual' , { id : $scope.datail.id});
}
}])
///<jscompress sourcefile="tripController.js" />
}])
///<jscompress sourcefile="tripController.js" />
angular.module('myApp')
.controller('tripController',['$scope','$rootScope','$state','dingdaService' ,function($scope,$rootScope,$state,dingdaService){
......@@ -1422,8 +1422,8 @@ angular.module('myApp')
$scope.viewTripDetail = function(index){
$state.go('tripDetail' , { orderId : $scope.tripList[index].id });
}
}])
///<jscompress sourcefile="tripDetailController.js" />
}])
///<jscompress sourcefile="tripDetailController.js" />
angular.module('myApp')
.controller('tripDetailController', ['$scope', '$rootScope', '$state', 'dingdaService', '$stateParams', 'wechatPayment',
function ($scope, $rootScope, $state, dingdaService, $stateParams, wechatPayment) {
......@@ -1547,8 +1547,8 @@ angular.module('myApp')
}
init();
}])
///<jscompress sourcefile="unusualController.js" />
}])
///<jscompress sourcefile="unusualController.js" />
angular.module('myApp')
.controller('unusualController',['$scope','dingdaService','$state','$stateParams',function($scope,dingdaService,$state,$stateParams){
......@@ -1582,8 +1582,8 @@ angular.module('myApp')
});
}
}])
///<jscompress sourcefile="walletController.js" />
}])
///<jscompress sourcefile="walletController.js" />
angular.module('myApp')
.controller('walletController',['$scope','$rootScope','dingdaService','$state','globalService',function($scope,$rootScope,dingdaService,$state,globalService){
......@@ -1602,8 +1602,8 @@ angular.module('myApp')
$scope.prepay = function() {
$state.go('prepay', { }, { reload: false });
}
}]);
///<jscompress sourcefile="bondController.js" />
}]);
///<jscompress sourcefile="bondController.js" />
angular.module('myApp')
.controller('bondController',['$scope' , '$rootScope', '$state' , 'dingdaService' , '$stateParams' ,
function($scope,$rootScope,$state,dingdaService,$stateParams){
......@@ -1674,8 +1674,8 @@ angular.module('myApp')
})
}
}])
///<jscompress sourcefile="bondPayController.js" />
}])
///<jscompress sourcefile="bondPayController.js" />
angular.module('myApp')
.controller('bondPayController',['$scope', '$rootScope', '$state', 'wechatPayment',
function($scope,$rootScope,$state, wechatPayment){
......@@ -1701,8 +1701,8 @@ angular.module('myApp')
}])
///<jscompress sourcefile="bondSuccessController.js" />
}])
///<jscompress sourcefile="bondSuccessController.js" />
angular.module('myApp')
.controller('bondSuccessController',[ '$scope' , '$rootScope' , '$state' , function($scope,$rootScope,$state){
......@@ -1712,8 +1712,8 @@ angular.module('myApp')
$state.go('main');
}
}])
///<jscompress sourcefile="contactController.js" />
}])
///<jscompress sourcefile="contactController.js" />
angular.module('myApp')
.controller('contactController',['$scope','$rootScope','dingdaService','$state','globalService',function($scope,$rootScope,dingdaService,$state,globalService){
......@@ -1769,8 +1769,8 @@ angular.module('myApp')
// mui.init();
init();
}]);
///<jscompress sourcefile="loginController.js" />
}]);
///<jscompress sourcefile="loginController.js" />
angular.module('myApp')
.controller('loginController',[ '$scope','$rootScope','dingdaService','globalService' ,function($scope,$rootScope,dingdaService,globalService){
var init = function(){
......@@ -1970,8 +1970,8 @@ angular.module('myApp')
///<jscompress sourcefile="mainController.js" />
///<jscompress sourcefile="mainController.js" />
angular.module('myApp')
.controller('mainController',['$scope','$rootScope','dingdaService','$state','globalService',function($scope,$rootScope,dingdaService,$state,globalService){
......@@ -2097,16 +2097,16 @@ angular.module('myApp')
// alert(JSON.stringify(data))
if(data.meta.code == 200) {
if(data.data.orderDetail.id) {
layer.open({
content: "租车成功，订单号为：" + data.data.orderDetail.id,
time:2
});
// alert("租车成功，订单号为：" + data.data.orderDetail.id);
$rootScope.isRendBike = true;
$state.go('rentDetail', {}, {reload: true});
}
} else if(data.meta.code == 202) {
layer.open({
......@@ -2178,4 +2178,4 @@ angular.module('myApp')
}]);
......
js/controller/mainController.js
......@@ -4,7 +4,6 @@ angular.module('myApp')
$rootScope.isRendBike = false;
$rootScope.isLoadFinish = false;
$scope.unfinishOrder = {};
var init = function() {
// globalService.init();
$scope.userinfo = globalService.getData("user");
......@@ -105,56 +104,60 @@ angular.module('myApp')
$rootScope.openRing = false;
$rootScope.$watch("openScan",function(newVal, oldVal){
if(newVal !== oldVal && newVal) {
if(!$scope.checkLogin()) {
return;
}
// if(!$scope.checkLogin()) {
// return;
// }
if($scope.unfinishOrder.status == 200) {
$state.go('tripDetail' , { orderId : $scope.unfinishOrder.id});
return;
}
// if($scope.unfinishOrder.status == 200) {
// $state.go('tripDetail' , { orderId : $scope.unfinishOrder.id});
// return;
// }
$rootScope.openScan = false;
wx.scanQRCode({
needResult: 1, // 默认为1，扫描结果由微信处理，1则直接返回扫描结果，
scanType: ["qrCode","barCode"], // 可以指定扫二维码还是一维码，默认二者都有
success: function (res) {
var result = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
// alert(result);
dingdaService.verifyScanCode(result).success(function(data , status){
// alert(JSON.stringify(data))
if(data.meta.code == 200) {
if(data.data.orderDetail.id) {
layer.open({
content: "租车成功，订单号为：" + data.data.orderDetail.id,
time:2
});
// alert("租车成功，订单号为：" + data.data.orderDetail.id);
$rootScope.isRendBike = true;
$state.go('rentDetail', {}, {reload: true});
}
} else if(data.meta.code == 202) {
layer.open({
content: data.meta.message,
time:2
});
$state.go('bond', {longitude: $rootScope.currentPoint.longitude , latitude: $rootScope.currentPoint.latitude });
} else {
layer.open({
content: data.meta.message,
time:2
});
}
}).error(function(data , status){
layer.open({
content: "租车失败" + JSON.stringify(data),
time:2
});
});
}
});
console.log(appClient)
appClient.getERCode('getIOSERCode', function (res) {
alert(JSON.parse(res))
}, '')
// wx.scanQRCode({
// needResult: 1, // 默认为1，扫描结果由微信处理，1则直接返回扫描结果，
// scanType: ["qrCode","barCode"], // 可以指定扫二维码还是一维码，默认二者都有
// success: function (res) {
// var result = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
// // alert(result);
// dingdaService.verifyScanCode(result).success(function(data , status){
// // alert(JSON.stringify(data))
// if(data.meta.code == 200) {
// if(data.data.orderDetail.id) {
//
// layer.open({
// content: "租车成功，订单号为：" + data.data.orderDetail.id,
// time:2
// });
// // alert("租车成功，订单号为：" + data.data.orderDetail.id);
// $rootScope.isRendBike = true;
//
// $state.go('rentDetail', {}, {reload: true});
//
// }
// } else if(data.meta.code == 202) {
// layer.open({
// content: data.meta.message,
// time:2
// });
// $state.go('bond', {longitude: $rootScope.currentPoint.longitude , latitude: $rootScope.currentPoint.latitude });
// } else {
// layer.open({
// content: data.meta.message,
// time:2
// });
// }
// }).error(function(data , status){
// layer.open({
// content: "租车失败" + JSON.stringify(data),
// time:2
// });
// });
// }
// });
}
})
$rootScope.$watch("openDetail",function(newVal, oldVal){
......
js/controller/mapController.js
......@@ -9,7 +9,6 @@ angular.module('myApp')
var map;
var endPosition;
var polyline;
$rootScope.currentPoint = {};
var rendBike = function() {
......@@ -154,7 +153,6 @@ angular.module('myApp')
img.src = "images/scancode.png";
scanControlContent.innerHTML = img.outerHTML + " 扫码租车";
scanControlContainer.onclick = function() {
$scope.$apply(function() {
$rootScope.openScan = true;
......
js/service/wechatPaymentService.js
......@@ -116,7 +116,7 @@ angular.module('myApp.services')
case 101:
var param = Object.assign($location.search(),{
amount : amount,
body : "租车租金",
body : "租车租git金",
type : 101
});
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!