Skip to content

杨建斌 / dy-wx2

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

pay update

1 parent 4ebea400
Inline Side-by-side
Showing 16 changed files with 539 additions and 27 deletions
.idea/encodings.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="PROJECT" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
.idea/h5wx.iml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
<excludeFolder url="file://$MODULE_DIR$/temp" />
<excludeFolder url="file://$MODULE_DIR$/tmp" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
.idea/modules.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/h5wx.iml" filepath="$PROJECT_DIR$/.idea/h5wx.iml" />
</modules>
</component>
</project>
\ No newline at end of file
.idea/vcs.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
.idea/workspace.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="f03425da-2e43-4e8a-b218-238983912f5c" name="Default" comment="">
<change beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
<change beforePath="$PROJECT_DIR$/css/app.css" afterPath="$PROJECT_DIR$/css/app.css" />
<change beforePath="$PROJECT_DIR$/html/bondPay.html" afterPath="$PROJECT_DIR$/html/bondPay.html" />
<change beforePath="$PROJECT_DIR$/html/main.html" afterPath="$PROJECT_DIR$/html/main.html" />
<change beforePath="$PROJECT_DIR$/html/prepay.html" afterPath="$PROJECT_DIR$/html/prepay.html" />
<change beforePath="$PROJECT_DIR$/js/controller/bondController.js" afterPath="$PROJECT_DIR$/js/controller/bondController.js" />
<change beforePath="$PROJECT_DIR$/js/controller/bondPayController.js" afterPath="$PROJECT_DIR$/js/controller/bondPayController.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/globalService.js" afterPath="$PROJECT_DIR$/js/service/globalService.js" />
<change beforePath="$PROJECT_DIR$/js/service/wechatPaymentService.js" afterPath="$PROJECT_DIR$/js/service/wechatPaymentService.js" />
<change beforePath="$PROJECT_DIR$/js/service/weixinConfig.js" afterPath="$PROJECT_DIR$/js/service/weixinConfig.js" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
<ignored path="$PROJECT_DIR$/tmp/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.321972">
<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" />
<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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
<caret line="1017" column="1" lean-forward="true" selection-start-line="1017" selection-start-column="1" selection-end-line="1017" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="395">
<caret line="25" column="30" lean-forward="true" selection-start-line="25" selection-start-column="30" selection-end-line="25" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="globalService.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/service/globalService.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="414">
<caret line="41" column="72" lean-forward="true" selection-start-line="41" selection-start-column="72" selection-end-line="41" selection-end-column="72" />
<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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="76">
<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>
</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="95">
<caret line="5" column="0" lean-forward="true" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
<folding>
<element signature="e#579#2039#0" expanded="false" />
</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="57">
<caret line="89" column="30" lean-forward="true" selection-start-line="89" selection-start-column="30" selection-end-line="89" selection-end-column="30" />
<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="-190">
<caret line="20" column="34" lean-forward="false" selection-start-line="20" selection-start-column="34" selection-end-line="20" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</split-second>
</splitter>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>globalService.getData(&quot;user&quot;)</find>
<find>getData</find>
<find>menuControl</find>
<find>openMenu</find>
<find>alipay</find>
</findStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<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$/html/bondPay.html" />
<option value="$PROJECT_DIR$/css/app.css" />
<option value="$PROJECT_DIR$/js/controller/bondController.js" />
<option value="$PROJECT_DIR$/js/service/dingdaService.js" />
<option value="$PROJECT_DIR$/js/controller/bondPayController.js" />
<option value="$PROJECT_DIR$/js/service/globalService.js" />
<option value="$PROJECT_DIR$/js/service/wechatPaymentService.js" />
</list>
</option>
</component>
<component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsGulpfileManager">
<detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-178" />
<option name="y" value="222" />
<option name="width" value="1932" />
<option name="height" value="1056" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
<flattenPackages />
<showMembers />
<showModules />
<showLibraryContents />
<hideEmptyPackages />
<abbreviatePackageNames />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
<manualOrder />
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scratches" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="h5wx" type="b2602c69:ProjectViewProjectNode" />
<item name="h5wx" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="h5wx" type="b2602c69:ProjectViewProjectNode" />
<item name="h5wx" type="462c0819:PsiDirectoryNode" />
<item name="html" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="h5wx" type="b2602c69:ProjectViewProjectNode" />
<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="service" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
</panes>
</component>
<component name="PropertiesComponent">
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="settings.editor.selected.configurable" value="project.propDebugger" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="HbShouldOpenHtmlAsHb" value="" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="ShelveChangesManager" show_recycled="false">
<option name="remove_strategy" value="false" />
</component>
<component name="SvnConfiguration" myUseAcceleration="nothing">
<configuration>C:\Users\enxin\AppData\Roaming\Subversion</configuration>
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="f03425da-2e43-4e8a-b218-238983912f5c" name="Default" comment="" />
<created>1534082685029</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1534082685029</updated>
<workItem from="1534082686441" duration="5120000" />
<workItem from="1534165685107" duration="4410000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="9530000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13435195" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<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="true" 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" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" 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="0" side_tool="false" content_ui="tabs" />
<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="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>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/html/bondPay.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="95">
<caret line="5" column="83" lean-forward="false" selection-start-line="5" selection-start-column="73" selection-end-line="5" selection-end-column="83" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/app.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="19380">
<caret line="1020" column="24" lean-forward="true" selection-start-line="1020" selection-start-column="24" selection-end-line="1020" selection-end-column="24" />
<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="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$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1653">
<caret line="87" column="7" lean-forward="true" selection-start-line="87" selection-start-column="7" selection-end-line="87" selection-end-column="7" />
<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="342">
<caret line="18" column="60" lean-forward="false" selection-start-line="18" selection-start-column="60" selection-end-line="18" selection-end-column="60" />
<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="-613">
<caret line="196" column="60" lean-forward="true" selection-start-line="196" selection-start-column="60" selection-end-line="196" selection-end-column="60" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/pay.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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/prepay.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="38">
<caret line="2" column="35" lean-forward="true" selection-start-line="2" selection-start-column="35" selection-end-line="2" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/login.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/freeTimes.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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/main.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57">
<caret line="3" column="57" lean-forward="false" selection-start-line="3" selection-start-column="19" selection-end-line="3" selection-end-column="57" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/controller/mainController.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="280">
<caret line="103" column="31" lean-forward="false" selection-start-line="103" selection-start-column="23" selection-end-line="103" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/app.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
<caret line="1017" column="1" lean-forward="true" selection-start-line="1017" selection-start-column="1" selection-end-line="1017" selection-end-column="1" />
<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$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57">
<caret line="89" column="30" lean-forward="true" selection-start-line="89" selection-start-column="30" selection-end-line="89" selection-end-column="30" />
<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="-190">
<caret line="20" column="34" lean-forward="false" selection-start-line="20" selection-start-column="34" selection-end-line="20" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/service/dingdaService.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="138" column="18" lean-forward="true" selection-start-line="138" selection-start-column="18" selection-end-line="138" selection-end-column="18" />
<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="395">
<caret line="25" column="30" lean-forward="true" 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/globalService.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="414">
<caret line="41" column="72" lean-forward="true" selection-start-line="41" selection-start-column="72" selection-end-line="41" selection-end-column="72" />
<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="76">
<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/service/wechatPaymentService.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="95">
<caret line="5" column="0" lean-forward="true" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
<folding>
<element signature="e#579#2039#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
css/app.css
......@@ -1017,7 +1017,9 @@ body, button, input, select, textarea {
font-size: 10px;
}
.pay-active{
background: #acacac;
}
......
html/bondPay.html
<div ng-controller="bondPayController" class="payPanel">
<div class="paywayMenu">
<div class="paywayMenuItem">
<div ng-click="payType = 100" class="paywayMenuItem" ng-class="{'pay-active': payType === 100}">
<img src="images/alipay.png" /> 支付宝
</div>
<div ng-click="payType = 101" class="paywayMenuItem" ng-class="{'pay-active': payType === 101}">
<img src="images/wechat.png" /> 微信支付
</div>
</div>
......
html/main.html
<div ng-controller="mainController">
<div id="mapContainer" class="mapContainer" ng-controller="mapController"></div>
<div id="sliderMenu" class="sliderMenu" style="display: none;"
<div id="sliderMenu" class="sliderMenu" style="display: block;"
ng-class="{true: 'menuOpen', false: 'menuClose'}[$root.openMenu]">
<img src="images/slideMenuBackground.png"/>
......
html/prepay.html
......@@ -35,7 +35,7 @@
</div>
<div id="alipayform" style="display: none">
<form action="http://lsz1.28ms.com/service/balance/alipay/h5" method="post">
<form action="http://h5api.dy.dingdachuxing.com/service/balance/alipay/h5" method="post">
<input type="hidden" name="type" value="100">
<input type="hidden" name="body" value="钱包充值">
<div class="paywayMenu">
......
js/controller/bondController.js
......@@ -15,8 +15,8 @@ angular.module('myApp')
// }
$scope.init = function(){
var latitude = $stateParams.latitude;
var longitude = $stateParams.longitude;
var latitude = $stateParams.latitude || '120.15515';
var longitude = $stateParams.longitude || '30.27415';
dingdaService.getBond(longitude,latitude)
.success(function(data){
// alert(JSON.stringify(data))
......
js/controller/bondPayController.js
angular.module('myApp')
.controller('bondPayController',['$scope', '$rootScope', '$state', 'wechatPayment',
function($scope,$rootScope,$state, wechatPayment){
.controller('bondPayController',['$scope', '$rootScope', '$state', 'wechatPayment', 'dingdaService',
function($scope,$rootScope,$state, wechatPayment, dingdaService){
$scope.payType = 100
if(!$rootScope.toPaid){
$state.go('bond');
}
......@@ -11,10 +11,9 @@ angular.module('myApp')
if(ispay) return;
ispay = true;
var IswechatPayment= window.localStorage.getItem("IswechatPayment");
if (IswechatPayment== undefined || IswechatPayment == "no") {
wechatPayment.callDepositPay($rootScope.toPaid)
wechatPayment.callDepositTypePay($rootScope.toPaid, $scope.payType)
.then(function (result) {
ispay = false;
//支付成功
......@@ -27,8 +26,20 @@ angular.module('myApp')
//支付失败
})
}
}
// wechatPayment.callDepositPay($rootScope.toPaid, $scope.payType)
// .then(function (result) {
// ispay = false;
// //支付成功
// // alert(window.localStorage.getItem("IswechatPayment"));
// window.localStorage.setItem("IswechatPayment", "yes")
// $state.go('bondSuccess');
// }, function (errMsg) {
// ispay = false;
// window.localStorage.setItem("IswechatPayment", "no")
// //支付失败
// })
// }
}
}])
\ No newline at end of file
......
js/controller/mainController.js
......@@ -39,6 +39,7 @@ angular.module('myApp')
console.log(JSON.stringify(data))
})
}
$scope.moduleList = [];
$scope.moduleList.push({
name : "行程记录",
......
js/controller/mapController.js
......@@ -239,11 +239,13 @@ angular.module('myApp')
menuControl.onclick = function() {
$scope.$apply(function() {
// alert(!globalService.getData("user"))
//alert($rootScope.openMenu);
if(!globalService.getData("user")) {
$state.go('login');
return;
}
$rootScope.openMenu = !$rootScope.openMenu;
//alert($rootScope.openMenu);
})
}
map.getContainer().appendChild(menuControl);
......@@ -289,12 +291,14 @@ angular.module('myApp')
getlocation();
function getlocation() {
wx.getLocation({
type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
success: function (res) {
onSuccess(res)
}
});
// wx.getLocation({
// type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
// success: function (res) {
// onSuccess(res)
// }
// });
onSuccess({latitude:30.2741500000,longitude:120.1551500000})
}
......@@ -307,6 +311,7 @@ angular.module('myApp')
}
var convertor = new BMap.Convertor();
var pointArr = [];
// alert(longitude, latitude);
pointArr.push(new BMap.Point(longitude, latitude));
convertor.translate(pointArr, 3, 5, function(data){
var point = data.points[0];
......@@ -576,8 +581,8 @@ angular.module('myApp')
initCustomOverlay();
initMap();
wx.ready(function() {
// wx.ready(function() {
initLocation();
})
// })
}]);
\ No newline at end of file
......
js/service/globalService.js
......@@ -54,7 +54,6 @@ angular.module('myApp.services')
loadCityConfig();
loadPathParams();
initWeixinMenu($http);
}
var loadPersistData = function() {
......
js/service/wechatPaymentService.js
angular.module('myApp.services')
.service('wechatPayment',['$http', '$q', '$rootScope','$location',function($http, $q, $rootScope,$location) {
//var host = 'http://finance.api.dingdachuxing.com/service';
var host = 'http://finance.dy.dingdatech.com/service';
var host = 'http://finance.api.dingdachuxing.com/service';
// var host = 'http://finance.dy.dingdatech.com/service';
var h5wxhost = 'http://lsz1.28ms.com/service/balance/';
var payhost = 'http://lsz1.28ms.com/service'
var h5alipayhost = 'http://lsz1.28ms.com/service/balance/';
var h5wxhost = 'http://h5api.dy.dingdachuxing.com/service/balance/';
var h5alipayhost = 'http://h5api.dy.dingdachuxing.com/service/balance/';
console.log('search:',$location.search());
......@@ -101,6 +103,17 @@ angular.module('myApp.services')
type : 101
});
return callUnifiedOrderApi(host + "/bail/wx", param);
}, /**
* 保证金充值
* @param amount
*/
callDepositTypePay : function(amount, type){
var param = Object.assign($location.search(),{
amount : amount,
body : "保证金充值",
type : type
});
return callUnifiedOrderApi(payhost + "/balance/" + (type === 100?'alipay': 'wx') +"/h5", param);
},
/**
* 钱包充值
......
js/service/weixinConfig.js
......@@ -63,7 +63,7 @@ function initWeixinMenu($http){
.success(function(data){
// alert(JSON.stringify(data) + ", with url : " + location.href.split('#')[0])
if(data){
weixinOptionMenuInit(data.appid, data.timestamp, data.noncestr, data.signature);
// weixinOptionMenuInit(data.appid, data.timestamp, data.noncestr, data.signature);
}
})
.error(function(arg1){
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!