Skip to content

杨建斌 / dy-wx2

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

add alipay

1 parent c4caec3a
Inline Side-by-side
Showing 5 changed files with 183 additions and 77 deletions
.idea/workspace.xml
......@@ -2,18 +2,11 @@
<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$/html/tripDetail.html" afterPath="$PROJECT_DIR$/html/tripDetail.html" />
<change beforePath="$PROJECT_DIR$/js/controller/tripDetailController.js" afterPath="$PROJECT_DIR$/js/controller/tripDetailController.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/" />
......@@ -26,24 +19,14 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.321972">
<splitter split-orientation="horizontal" split-proportion="0.71272063">
<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" />
<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 />
</state>
</provider>
......@@ -83,11 +66,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="wechatPaymentService.js" pinned="false" current-in-tab="true">
<file leaf-file-name="wechatPaymentService.js" pinned="false" current-in-tab="false">
<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" />
<state relative-caret-position="399">
<caret line="97" column="23" lean-forward="false" selection-start-line="97" selection-start-column="8" selection-end-line="97" selection-end-column="23" />
<folding>
<element signature="e#579#2039#0" expanded="false" />
</folding>
......@@ -95,11 +78,31 @@
</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="tripDetail.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/html/tripDetail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
<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>
</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" />
<state relative-caret-position="76">
<caret line="90" column="34" lean-forward="true" selection-start-line="90" selection-start-column="34" selection-end-line="90" selection-end-column="34" />
<folding />
</state>
</provider>
......@@ -108,13 +111,23 @@
<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">
<state relative-caret-position="380">
<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>
<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="102">
<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>
</file>
</leaf>
</split-second>
</splitter>
......@@ -125,7 +138,11 @@
<find>getData</find>
<find>menuControl</find>
<find>openMenu</find>
<find>callRentPay</find>
<find>.wechatPay</find>
<find>alipay</find>
<find>aliPay</find>
<find>wxh5ApiCall</find>
</findStrings>
</component>
<component name="Git.Settings">
......@@ -137,13 +154,15 @@
<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" />
<option value="$PROJECT_DIR$/css/app.css" />
<option value="$PROJECT_DIR$/js/controller/tripDetailController.js" />
<option value="$PROJECT_DIR$/html/tripDetail.html" />
<option value="$PROJECT_DIR$/html/bondPay.html" />
</list>
</option>
</component>
......@@ -238,12 +257,12 @@
<option name="presentableId" value="Default" />
<updated>1534082685029</updated>
<workItem from="1534082686441" duration="5120000" />
<workItem from="1534165685107" duration="4410000" />
<workItem from="1534165685107" duration="9587000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="9530000" />
<option name="totallyTimeSpent" value="14707000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
......@@ -254,10 +273,10 @@
<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="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" />
<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="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32936078" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<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" />
......@@ -368,77 +387,93 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/app.css">
<entry file="file://$PROJECT_DIR$/js/service/dingdaService.js">
<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" />
<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$/html/bondPay.html">
<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="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="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$/index.html">
<entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js">
<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" />
<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/controller/bondController.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-190">
<state relative-caret-position="380">
<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">
<entry file="file://$PROJECT_DIR$/index.html">
<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" />
<state relative-caret-position="76">
<caret line="90" column="34" lean-forward="true" 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/bondPayController.js">
<entry file="file://$PROJECT_DIR$/css/app.css">
<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" />
<state relative-caret-position="102">
<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/globalService.js">
<entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.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" />
<state relative-caret-position="399">
<caret line="97" column="23" lean-forward="false" selection-start-line="97" selection-start-column="8" selection-end-line="97" selection-end-column="23" />
<folding>
<element signature="e#579#2039#0" expanded="false" />
</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="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>
<entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js">
<entry file="file://$PROJECT_DIR$/html/tripDetail.html">
<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" />
<state relative-caret-position="418">
<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>
<entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js">
<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="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 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 />
</state>
</provider>
</entry>
......
css/app.css
......@@ -696,7 +696,7 @@ body, button, input, select, textarea {
border-bottom: 1px solid #eee;
}
.residual,.wechatPay{
.residual,.wechatPay,.aliPay{
width:16px;
height:13px;
display: inline-block;
......@@ -712,6 +712,10 @@ body, button, input, select, textarea {
background: url(../images/wechat.png) no-repeat;
background-size: 100%;
}
.aliPay{
background: url(../images/alipay.png) no-repeat;
background-size: 100%;
}
.checkboxS{
width:20px;
height:20px;
......
html/tripDetail.html
......@@ -19,13 +19,23 @@
</div>
<ul>
<!--<li>
<span class="leftText residual"></span> <span class="leftText"> 余额支付(￥{{balance}})</span> <span class="rightText checkboxS" ng-class="{true: 'checkboxTrue', false: 'checkboxFalse'}[!isActive]" ng-click="choosePay(0)"> </span>
</li>-->
<!--ng-class="{true: 'checkboxTrue', false: 'checkboxFalse'}[isActive]"-->
<li>
<span class="leftText aliPay"></span><span class="leftText "> 支付宝</span> <span
class="rightText checkboxS"
ng-class="{'checkboxTrue': payType === 100, 'checkboxFalse': payType !== 100}"
ng-click="choosePay(100)"></span>
</li>
<li>
<span class="leftText wechatPay"></span><span class="leftText "> 微信支付</span> <span
class="rightText checkboxS" ng-class="{true: 'checkboxTrue', false: 'checkboxFalse'}[isActive]"
ng-click="choosePay(1)"></span>
class="rightText checkboxS"
ng-class="{'checkboxTrue': payType === 101, 'checkboxFalse': payType !== 101}"
ng-click="choosePay(101)"></span>
</li>
</ul>
</div>
......
js/controller/tripDetailController.js
......@@ -28,23 +28,23 @@ angular.module('myApp')
* */
var ispay = false;
$scope.isActive = true; // 这个是个关键 TODO 要更改的
$scope.payType = 1;
$scope.payType = 100;
$scope.choosePay = function (index) {
if ($($('.checkboxS')[index]).hasClass('checkboxTrue')) {
// 如果要选择的项已经选中,不处理
return
} else {
$scope.isActive = !$scope.isActive;
}
// if ($($('.checkboxS')[index]).hasClass('checkboxTrue')) {
// // 如果要选择的项已经选中,不处理
// return
// } else {
// $scope.isActive = !$scope.isActive;
// }
$scope.payType = index;
}
$scope.goPay = function () {
if (ispay) return;
if ($scope.payType == 1) { //微信支付
if ($scope.payType == 100 || $scope.payType == 101) { //手机支付
ispay = true;
wechatPayment.callRentPay($scope.tripDetail.id, $scope.tripDetail.total_fee)
wechatPayment.callRentTypePay($scope.tripDetail.id, $scope.tripDetail.total_fee, $scope.payType)
.then(function (result) {
ispay = false;
//支付成功
......
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.api.dingdachuxing.com/service';
// var host = 'http://finance.dy.dingdatech.com/service';
var payhost = 'http://lsz1.28ms.com/service'
var host = 'http://lsz1.28ms.com/service'
var h5wxhost = 'http://h5api.dy.dingdachuxing.com/service/balance/';
......@@ -93,6 +93,39 @@ angular.module('myApp.services')
return callUnifiedOrderApi(host + '/bill/wx/' + orderId, param);
},
/**
* 租车付款
*/
callRentTypePay: function (orderId, amount, type) {
switch (type) {
case 100:
var html = ' <form action="'+ host + '/bill/alipay/h5/'+ orderId
+'" method="post">' +
' <input type="text" name="amount" value="'+amount+'" />' +
' <input type="text" name="body" value="租车租金"/>' +
' <input type="text" name="type" value="100" />' +
' <input type="submit" id="ok">' +
' </input>' +
' </form>'
var form = document.createElement('div')
form.innerHTML = html
// form.querySelector('#ok').click()
document.body.appendChild(form)
document.querySelector('#ok').click()
case 101:
var param = Object.assign($location.search(),{
amount : amount,
body : "租车租金",
type : 101
});
return callUnifiedOrderApi(host + "/bill/wx/h5/" + orderId, param);
default:
return null
}
},
/**
* 保证金充值
* @param amount
*/
......@@ -108,12 +141,36 @@ angular.module('myApp.services')
* @param amount
*/
callDepositTypePay : function(amount, type){
switch (type) {
case 100:
var html = ' <form action="'+ host + '/balance/alipay/h5'
+'" method="post">' +
' <input type="text" name="amount" value="'+amount+'" />' +
' <input type="text" name="body" value="保证金充值"/>' +
' <input type="text" name="type" value="100" />' +
' <input type="submit" id="ok">\n' +
' 余额充值\n' +
' </input>\n' +
' </form>'
var form = document.createElement('div')
form.innerHTML = html
// form.querySelector('#ok').click()
document.body.appendChild(form)
document.querySelector('#ok').click()
case 101:
var param = Object.assign($location.search(),{
amount : amount,
body : "保证金充值",
type : type
});
return callUnifiedOrderApi(payhost + "/balance/" + (type === 100?'alipay': 'wx') +"/h5", param);
return callUnifiedOrderApi(payhost + "/balance/wx/h5", param);
default:
return null
}
},
/**
* 钱包充值
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!