Skip to content

杨建斌 / dy-wx2

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

get ercode

1 parent 44a749ef
Expand all
Inline Side-by-side
Showing 7 changed files with 165 additions and 97 deletions
index.html
...@@ -98,6 +98,7 @@ ...@@ -98,6 +98,7 @@
98 <link href="css/app.css" rel="stylesheet"/> 98 <link href="css/app.css" rel="stylesheet"/>
99 <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet"> 99 <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
100 <script type="text/javascript" src="js/jquery-1.9.1.js"></script> 100 <script type="text/javascript" src="js/jquery-1.9.1.js"></script>
101 <script type="text/javascript" src="js/JSBridge.js"></script>
101 <script type="text/javascript" src="js/angularjs/angular.min.js"></script> 102 <script type="text/javascript" src="js/angularjs/angular.min.js"></script>
102 <script type="text/javascript" src="js/angularjs/angular-local-storage.js"></script> 103 <script type="text/javascript" src="js/angularjs/angular-local-storage.js"></script>
103 <script type="text/javascript" src="js/angularjs/angular-ui-router.js"></script> 104 <script type="text/javascript" src="js/angularjs/angular-ui-router.js"></script>
......
js/JSBridge.js 0 → 100644
1 function AppClient(appObj, isAndroid) {
2 this.appObj = appObj;
3 this.isAndroid = isAndroid;
4 };
5
6 AppClient.prototype.closePage = function() {
7 if (this.isAndroid) {
8 this.appObj.closePageAction();
9 } else {
10 this.appObj.callHandler("closePageAction");
11 }
12 }
13 function isJson(str) {
14 try {
15 JSON.parse(str);
16 } catch (e) {
17 return false;
18 }
19 return true;
20 }
21 // window.invokeJsPassCompanyCodeAndName = function(_params) {
22 // companyCode = _params.companyCode;
23 // companyName = _params.companyName;
24 // var jsonStr = "";
25 // getSign(jsonStr);
26 // }
27 AppClient.prototype.getERCode = function (callbackName, callback, jsonStr) {
28 var dataParams = "";
29 if(isJson(jsonStr)){
30 dataParams = JSON.parse(jsonStr);
31 }
32 var iOSData = {
33 from: 'H5',
34 params: dataParams
35 };
36 if (this.isAndroid) {
37 this.appObj.getERCode('H5', jsonStr);
38 } else {
39 this.appObj.callHandler("getERCode", iOSData, callback);
40 }
41 };
42 if(window.android) {
43 appClient = new AppClient(window.android, true);
44 // 此处可以调用一些init的方法
45 } else {
46
47 function setupWebViewJavascriptBridge(callback) {
48 if (window.WebViewJavascriptBridge) { return callback(WebViewJavascriptBridge); }
49 if (window.WVJBCallbacks) { return window.WVJBCallbacks.push(callback); }
50 window.WVJBCallbacks = [callback];
51 var WVJBIframe = document.createElement('iframe');
52 WVJBIframe.style.display = 'none';
53 WVJBIframe.src = 'https://__bridge_loaded__';
54 document.documentElement.appendChild(WVJBIframe);
55 setTimeout(function() { document.documentElement.removeChild(WVJBIframe) }, 0)
56 }
57 setupWebViewJavascriptBridge(function(bridge) {
58 appClient = new AppClient(bridge, false);
59 // 此处可以调用一些init的方法
60 });
61
62 }
63 window.getIOSERCode = function (_params) {
64 alert(JSON.parse(_params))
65
66 }
js/compress.js
1 ///<jscompress sourcefile="app.js" /> 1 ///<jscompress sourcefile="app.js" />
2 angular.module('myApp.services', ['LocalStorageModule']); 2 angular.module('myApp.services', ['LocalStorageModule']);
3 angular.module('myApp.directives', []); 3 angular.module('myApp.directives', []);
4 var app = angular.module('myApp', [ "ui.router",'myApp.services', 'myApp.directives']); 4 var app = angular.module('myApp', [ "ui.router",'myApp.services', 'myApp.directives']);
...@@ -79,8 +79,8 @@ app.run(['globalService', function(globalService) { ...@@ -79,8 +79,8 @@ app.run(['globalService', function(globalService) {
79 }]) 79 }])
80 //$(window).bind("load resize",function(){ 80 //$(window).bind("load resize",function(){
81 // $("body").css({zoom:$(window).width()/320,visibility:"visible"}); 81 // $("body").css({zoom:$(window).width()/320,visibility:"visible"});
82 //}); 82 //});
83 ///<jscompress sourcefile="weixinConfig.js" /> 83 ///<jscompress sourcefile="weixinConfig.js" />
84 /** 84 /**
85 * Created by zhanghong on 15/3/8. 85 * Created by zhanghong on 15/3/8.
86 */ 86 */
...@@ -164,8 +164,8 @@ function initWeixinMenu($http){ ...@@ -164,8 +164,8 @@ function initWeixinMenu($http){
164 // alert(arg1); 164 // alert(arg1);
165 }); 165 });
166 } 166 }
167 167
168 ///<jscompress sourcefile="globalService.js" /> 168 ///<jscompress sourcefile="globalService.js" />
169 169
170 angular.module('myApp.services') 170 angular.module('myApp.services')
171 .service('globalService', 171 .service('globalService',
...@@ -300,8 +300,8 @@ angular.module('myApp.services') ...@@ -300,8 +300,8 @@ angular.module('myApp.services')
300 return globalConfig; 300 return globalConfig;
301 } 301 }
302 ] 302 ]
303 ); 303 );
304 ///<jscompress sourcefile="dingdaService.js" /> 304 ///<jscompress sourcefile="dingdaService.js" />
305 angular.module('myApp.services') 305 angular.module('myApp.services')
306 .service( 'dingdaService', [ '$http','globalService', 306 .service( 'dingdaService', [ '$http','globalService',
307 function($http,globalService) { 307 function($http,globalService) {
...@@ -466,8 +466,8 @@ angular.module('myApp.services') ...@@ -466,8 +466,8 @@ angular.module('myApp.services')
466 return res; 466 return res;
467 } 467 }
468 } 468 }
469 }]) 469 }])
470 ///<jscompress sourcefile="wechatPaymentService.js" /> 470 ///<jscompress sourcefile="wechatPaymentService.js" />
471 angular.module('myApp.services') 471 angular.module('myApp.services')
472 .service('wechatPayment',['$http', '$q', '$rootScope',function($http, $q, $rootScope) { 472 .service('wechatPayment',['$http', '$q', '$rootScope',function($http, $q, $rootScope) {
473 473
...@@ -573,8 +573,8 @@ angular.module('myApp.services') ...@@ -573,8 +573,8 @@ angular.module('myApp.services')
573 } 573 }
574 } 574 }
575 }]); 575 }]);
576 576
577 ///<jscompress sourcefile="mapController.js" /> 577 ///<jscompress sourcefile="mapController.js" />
578 angular.module('myApp') 578 angular.module('myApp')
579 .controller('mapController',['$scope','$rootScope','dingdaService','globalService','$state',function($scope,$rootScope,dingdaService,globalService,$state){ 579 .controller('mapController',['$scope','$rootScope','dingdaService','globalService','$state',function($scope,$rootScope,dingdaService,globalService,$state){
580 var myMarker; 580 var myMarker;
...@@ -1157,8 +1157,8 @@ angular.module('myApp') ...@@ -1157,8 +1157,8 @@ angular.module('myApp')
1157 initLocation(); 1157 initLocation();
1158 }) 1158 })
1159 1159
1160 }]); 1160 }]);
1161 ///<jscompress sourcefile="opinionController.js" /> 1161 ///<jscompress sourcefile="opinionController.js" />
1162 angular.module('myApp') 1162 angular.module('myApp')
1163 .controller('opinionController',['$scope','$rootScope','dingdaService','$state','globalService','$stateParams', 1163 .controller('opinionController',['$scope','$rootScope','dingdaService','$state','globalService','$stateParams',
1164 function($scope,$rootScope,dingdaService,$state,globalService,$stateParams){ 1164 function($scope,$rootScope,dingdaService,$state,globalService,$stateParams){
...@@ -1211,8 +1211,8 @@ angular.module('myApp') ...@@ -1211,8 +1211,8 @@ angular.module('myApp')
1211 } 1211 }
1212 } 1212 }
1213 1213
1214 }]); 1214 }]);
1215 ///<jscompress sourcefile="payController.js" /> 1215 ///<jscompress sourcefile="payController.js" />
1216 angular.module('myApp') 1216 angular.module('myApp')
1217 .controller('payController',['$scope','$rootScope','dingdaService','$state','globalService',function($scope,$rootScope,dingdaService,$state,globalService){ 1217 .controller('payController',['$scope','$rootScope','dingdaService','$state','globalService',function($scope,$rootScope,dingdaService,$state,globalService){
1218 1218
...@@ -1226,8 +1226,8 @@ angular.module('myApp') ...@@ -1226,8 +1226,8 @@ angular.module('myApp')
1226 $scope.pay = function() { 1226 $scope.pay = function() {
1227 alert("充值") 1227 alert("充值")
1228 } 1228 }
1229 }]); 1229 }]);
1230 ///<jscompress sourcefile="prepayController.js" /> 1230 ///<jscompress sourcefile="prepayController.js" />
1231 angular.module('myApp') 1231 angular.module('myApp')
1232 .controller('prepayController',['$scope','$rootScope','dingdaService','$state','globalService','wechatPayment',function($scope,$rootScope,dingdaService,$state,globalService,wechatPayment){ 1232 .controller('prepayController',['$scope','$rootScope','dingdaService','$state','globalService','wechatPayment',function($scope,$rootScope,dingdaService,$state,globalService,wechatPayment){
1233 1233
...@@ -1273,8 +1273,8 @@ angular.module('myApp') ...@@ -1273,8 +1273,8 @@ angular.module('myApp')
1273 1273
1274 // alert("充值 : " + $scope.account + "元") 1274 // alert("充值 : " + $scope.account + "元")
1275 } 1275 }
1276 }]); 1276 }]);
1277 ///<jscompress sourcefile="rechargeListController.js" /> 1277 ///<jscompress sourcefile="rechargeListController.js" />
1278 angular.module('myApp') 1278 angular.module('myApp')
1279 .controller('rechargeListController',function($scope,$rootScope,$state){ 1279 .controller('rechargeListController',function($scope,$rootScope,$state){
1280 $scope.rechargeList = [ 1280 $scope.rechargeList = [
...@@ -1289,8 +1289,8 @@ angular.module('myApp') ...@@ -1289,8 +1289,8 @@ angular.module('myApp')
1289 rechargeMoney:200 1289 rechargeMoney:200
1290 } 1290 }
1291 ] 1291 ]
1292 }) 1292 })
1293 ///<jscompress sourcefile="rentDetailController.js" /> 1293 ///<jscompress sourcefile="rentDetailController.js" />
1294 angular.module('myApp') 1294 angular.module('myApp')
1295 .controller('rentDetailController',['$scope','$rootScope','$state','dingdaService' ,function($scope,$rootScope,$state,dingdaService){ 1295 .controller('rentDetailController',['$scope','$rootScope','$state','dingdaService' ,function($scope,$rootScope,$state,dingdaService){
1296 1296
...@@ -1378,8 +1378,8 @@ angular.module('myApp') ...@@ -1378,8 +1378,8 @@ angular.module('myApp')
1378 $state.go('unusual' , { id : $scope.datail.id}); 1378 $state.go('unusual' , { id : $scope.datail.id});
1379 } 1379 }
1380 1380
1381 }]) 1381 }])
1382 ///<jscompress sourcefile="tripController.js" /> 1382 ///<jscompress sourcefile="tripController.js" />
1383 angular.module('myApp') 1383 angular.module('myApp')
1384 .controller('tripController',['$scope','$rootScope','$state','dingdaService' ,function($scope,$rootScope,$state,dingdaService){ 1384 .controller('tripController',['$scope','$rootScope','$state','dingdaService' ,function($scope,$rootScope,$state,dingdaService){
1385 1385
...@@ -1422,8 +1422,8 @@ angular.module('myApp') ...@@ -1422,8 +1422,8 @@ angular.module('myApp')
1422 $scope.viewTripDetail = function(index){ 1422 $scope.viewTripDetail = function(index){
1423 $state.go('tripDetail' , { orderId : $scope.tripList[index].id }); 1423 $state.go('tripDetail' , { orderId : $scope.tripList[index].id });
1424 } 1424 }
1425 }]) 1425 }])
1426 ///<jscompress sourcefile="tripDetailController.js" /> 1426 ///<jscompress sourcefile="tripDetailController.js" />
1427 angular.module('myApp') 1427 angular.module('myApp')
1428 .controller('tripDetailController', ['$scope', '$rootScope', '$state', 'dingdaService', '$stateParams', 'wechatPayment', 1428 .controller('tripDetailController', ['$scope', '$rootScope', '$state', 'dingdaService', '$stateParams', 'wechatPayment',
1429 function ($scope, $rootScope, $state, dingdaService, $stateParams, wechatPayment) { 1429 function ($scope, $rootScope, $state, dingdaService, $stateParams, wechatPayment) {
...@@ -1547,8 +1547,8 @@ angular.module('myApp') ...@@ -1547,8 +1547,8 @@ angular.module('myApp')
1547 } 1547 }
1548 init(); 1548 init();
1549 1549
1550 }]) 1550 }])
1551 ///<jscompress sourcefile="unusualController.js" /> 1551 ///<jscompress sourcefile="unusualController.js" />
1552 angular.module('myApp') 1552 angular.module('myApp')
1553 .controller('unusualController',['$scope','dingdaService','$state','$stateParams',function($scope,dingdaService,$state,$stateParams){ 1553 .controller('unusualController',['$scope','dingdaService','$state','$stateParams',function($scope,dingdaService,$state,$stateParams){
1554 1554
...@@ -1582,8 +1582,8 @@ angular.module('myApp') ...@@ -1582,8 +1582,8 @@ angular.module('myApp')
1582 }); 1582 });
1583 } 1583 }
1584 1584
1585 }]) 1585 }])
1586 ///<jscompress sourcefile="walletController.js" /> 1586 ///<jscompress sourcefile="walletController.js" />
1587 angular.module('myApp') 1587 angular.module('myApp')
1588 .controller('walletController',['$scope','$rootScope','dingdaService','$state','globalService',function($scope,$rootScope,dingdaService,$state,globalService){ 1588 .controller('walletController',['$scope','$rootScope','dingdaService','$state','globalService',function($scope,$rootScope,dingdaService,$state,globalService){
1589 1589
...@@ -1602,8 +1602,8 @@ angular.module('myApp') ...@@ -1602,8 +1602,8 @@ angular.module('myApp')
1602 $scope.prepay = function() { 1602 $scope.prepay = function() {
1603 $state.go('prepay', { }, { reload: false }); 1603 $state.go('prepay', { }, { reload: false });
1604 } 1604 }
1605 }]); 1605 }]);
1606 ///<jscompress sourcefile="bondController.js" /> 1606 ///<jscompress sourcefile="bondController.js" />
1607 angular.module('myApp') 1607 angular.module('myApp')
1608 .controller('bondController',['$scope' , '$rootScope', '$state' , 'dingdaService' , '$stateParams' , 1608 .controller('bondController',['$scope' , '$rootScope', '$state' , 'dingdaService' , '$stateParams' ,
1609 function($scope,$rootScope,$state,dingdaService,$stateParams){ 1609 function($scope,$rootScope,$state,dingdaService,$stateParams){
...@@ -1674,8 +1674,8 @@ angular.module('myApp') ...@@ -1674,8 +1674,8 @@ angular.module('myApp')
1674 }) 1674 })
1675 } 1675 }
1676 1676
1677 }]) 1677 }])
1678 ///<jscompress sourcefile="bondPayController.js" /> 1678 ///<jscompress sourcefile="bondPayController.js" />
1679 angular.module('myApp') 1679 angular.module('myApp')
1680 .controller('bondPayController',['$scope', '$rootScope', '$state', 'wechatPayment', 1680 .controller('bondPayController',['$scope', '$rootScope', '$state', 'wechatPayment',
1681 function($scope,$rootScope,$state, wechatPayment){ 1681 function($scope,$rootScope,$state, wechatPayment){
...@@ -1701,8 +1701,8 @@ angular.module('myApp') ...@@ -1701,8 +1701,8 @@ angular.module('myApp')
1701 1701
1702 1702
1703 1703
1704 }]) 1704 }])
1705 ///<jscompress sourcefile="bondSuccessController.js" /> 1705 ///<jscompress sourcefile="bondSuccessController.js" />
1706 angular.module('myApp') 1706 angular.module('myApp')
1707 .controller('bondSuccessController',[ '$scope' , '$rootScope' , '$state' , function($scope,$rootScope,$state){ 1707 .controller('bondSuccessController',[ '$scope' , '$rootScope' , '$state' , function($scope,$rootScope,$state){
1708 1708
...@@ -1712,8 +1712,8 @@ angular.module('myApp') ...@@ -1712,8 +1712,8 @@ angular.module('myApp')
1712 $state.go('main'); 1712 $state.go('main');
1713 } 1713 }
1714 1714
1715 }]) 1715 }])
1716 ///<jscompress sourcefile="contactController.js" /> 1716 ///<jscompress sourcefile="contactController.js" />
1717 angular.module('myApp') 1717 angular.module('myApp')
1718 .controller('contactController',['$scope','$rootScope','dingdaService','$state','globalService',function($scope,$rootScope,dingdaService,$state,globalService){ 1718 .controller('contactController',['$scope','$rootScope','dingdaService','$state','globalService',function($scope,$rootScope,dingdaService,$state,globalService){
1719 1719
...@@ -1769,8 +1769,8 @@ angular.module('myApp') ...@@ -1769,8 +1769,8 @@ angular.module('myApp')
1769 1769
1770 // mui.init(); 1770 // mui.init();
1771 init(); 1771 init();
1772 }]); 1772 }]);
1773 ///<jscompress sourcefile="loginController.js" /> 1773 ///<jscompress sourcefile="loginController.js" />
1774 angular.module('myApp') 1774 angular.module('myApp')
1775 .controller('loginController',[ '$scope','$rootScope','dingdaService','globalService' ,function($scope,$rootScope,dingdaService,globalService){ 1775 .controller('loginController',[ '$scope','$rootScope','dingdaService','globalService' ,function($scope,$rootScope,dingdaService,globalService){
1776 var init = function(){ 1776 var init = function(){
...@@ -1970,8 +1970,8 @@ angular.module('myApp') ...@@ -1970,8 +1970,8 @@ angular.module('myApp')
1970 1970
1971 1971
1972 1972
1973 1973
1974 ///<jscompress sourcefile="mainController.js" /> 1974 ///<jscompress sourcefile="mainController.js" />
1975 angular.module('myApp') 1975 angular.module('myApp')
1976 .controller('mainController',['$scope','$rootScope','dingdaService','$state','globalService',function($scope,$rootScope,dingdaService,$state,globalService){ 1976 .controller('mainController',['$scope','$rootScope','dingdaService','$state','globalService',function($scope,$rootScope,dingdaService,$state,globalService){
1977 1977
...@@ -2097,16 +2097,16 @@ angular.module('myApp') ...@@ -2097,16 +2097,16 @@ angular.module('myApp')
2097 // alert(JSON.stringify(data)) 2097 // alert(JSON.stringify(data))
2098 if(data.meta.code == 200) { 2098 if(data.meta.code == 200) {
2099 if(data.data.orderDetail.id) { 2099 if(data.data.orderDetail.id) {
2100 2100
2101 layer.open({ 2101 layer.open({
2102 content: "租车成功，订单号为：" + data.data.orderDetail.id, 2102 content: "租车成功，订单号为：" + data.data.orderDetail.id,
2103 time:2 2103 time:2
2104 }); 2104 });
2105 // alert("租车成功，订单号为：" + data.data.orderDetail.id); 2105 // alert("租车成功，订单号为：" + data.data.orderDetail.id);
2106 $rootScope.isRendBike = true; 2106 $rootScope.isRendBike = true;
2107 2107
2108 $state.go('rentDetail', {}, {reload: true}); 2108 $state.go('rentDetail', {}, {reload: true});
2109 2109
2110 } 2110 }
2111 } else if(data.meta.code == 202) { 2111 } else if(data.meta.code == 202) {
2112 layer.open({ 2112 layer.open({
...@@ -2178,4 +2178,4 @@ angular.module('myApp') ...@@ -2178,4 +2178,4 @@ angular.module('myApp')
2178 2178
2179 2179
2180 }]); 2180 }]);
2181 2181
......
js/controller/mainController.js
...@@ -4,7 +4,6 @@ angular.module('myApp') ...@@ -4,7 +4,6 @@ angular.module('myApp')
4 $rootScope.isRendBike = false; 4 $rootScope.isRendBike = false;
5 $rootScope.isLoadFinish = false; 5 $rootScope.isLoadFinish = false;
6 $scope.unfinishOrder = {}; 6 $scope.unfinishOrder = {};
7
8 var init = function() { 7 var init = function() {
9 // globalService.init(); 8 // globalService.init();
10 $scope.userinfo = globalService.getData("user"); 9 $scope.userinfo = globalService.getData("user");
...@@ -105,56 +104,60 @@ angular.module('myApp') ...@@ -105,56 +104,60 @@ angular.module('myApp')
105 $rootScope.openRing = false; 104 $rootScope.openRing = false;
106 $rootScope.$watch("openScan",function(newVal, oldVal){ 105 $rootScope.$watch("openScan",function(newVal, oldVal){
107 if(newVal !== oldVal && newVal) { 106 if(newVal !== oldVal && newVal) {
108 if(!$scope.checkLogin()) { 107 // if(!$scope.checkLogin()) {
109 return; 108 // return;
110 } 109 // }
111 110
112 if($scope.unfinishOrder.status == 200) { 111 // if($scope.unfinishOrder.status == 200) {
113 $state.go('tripDetail' , { orderId : $scope.unfinishOrder.id}); 112 // $state.go('tripDetail' , { orderId : $scope.unfinishOrder.id});
114 return; 113 // return;
115 } 114 // }
116 $rootScope.openScan = false; 115 $rootScope.openScan = false;
117 wx.scanQRCode({ 116 console.log(appClient)
118 needResult: 1, // 默认为1，扫描结果由微信处理，1则直接返回扫描结果， 117 appClient.getERCode('getIOSERCode', function (res) {
119 scanType: ["qrCode","barCode"], // 可以指定扫二维码还是一维码，默认二者都有 118 alert(JSON.parse(res))
120 success: function (res) { 119 }, '')
121 var result = res.resultStr; // 当needResult 为 1 时，扫码返回的结果 120 // wx.scanQRCode({
122 // alert(result); 121 // needResult: 1, // 默认为1，扫描结果由微信处理，1则直接返回扫描结果，
123 dingdaService.verifyScanCode(result).success(function(data , status){ 122 // scanType: ["qrCode","barCode"], // 可以指定扫二维码还是一维码，默认二者都有
124 // alert(JSON.stringify(data)) 123 // success: function (res) {
125 if(data.meta.code == 200) { 124 // var result = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
126 if(data.data.orderDetail.id) { 125 // // alert(result);
127 126 // dingdaService.verifyScanCode(result).success(function(data , status){
128 layer.open({ 127 // // alert(JSON.stringify(data))
129 content: "租车成功，订单号为：" + data.data.orderDetail.id, 128 // if(data.meta.code == 200) {
130 time:2 129 // if(data.data.orderDetail.id) {
131 }); 130 //
132 // alert("租车成功，订单号为：" + data.data.orderDetail.id); 131 // layer.open({
133 $rootScope.isRendBike = true; 132 // content: "租车成功，订单号为：" + data.data.orderDetail.id,
134 133 // time:2
135 $state.go('rentDetail', {}, {reload: true}); 134 // });
136 135 // // alert("租车成功，订单号为：" + data.data.orderDetail.id);
137 } 136 // $rootScope.isRendBike = true;
138 } else if(data.meta.code == 202) { 137 //
139 layer.open({ 138 // $state.go('rentDetail', {}, {reload: true});
140 content: data.meta.message, 139 //
141 time:2 140 // }
142 }); 141 // } else if(data.meta.code == 202) {
143 $state.go('bond', {longitude: $rootScope.currentPoint.longitude , latitude: $rootScope.currentPoint.latitude }); 142 // layer.open({
144 } else { 143 // content: data.meta.message,
145 layer.open({ 144 // time:2
146 content: data.meta.message, 145 // });
147 time:2 146 // $state.go('bond', {longitude: $rootScope.currentPoint.longitude , latitude: $rootScope.currentPoint.latitude });
148 }); 147 // } else {
149 } 148 // layer.open({
150 }).error(function(data , status){ 149 // content: data.meta.message,
151 layer.open({ 150 // time:2
152 content: "租车失败" + JSON.stringify(data), 151 // });
153 time:2 152 // }
154 }); 153 // }).error(function(data , status){
155 }); 154 // layer.open({
156 } 155 // content: "租车失败" + JSON.stringify(data),
157 }); 156 // time:2
157 // });
158 // });
159 // }
160 // });
158 } 161 }
159 }) 162 })
160 $rootScope.$watch("openDetail",function(newVal, oldVal){ 163 $rootScope.$watch("openDetail",function(newVal, oldVal){
......
js/controller/mapController.js
...@@ -9,7 +9,6 @@ angular.module('myApp') ...@@ -9,7 +9,6 @@ angular.module('myApp')
9 var map; 9 var map;
10 var endPosition; 10 var endPosition;
11 var polyline; 11 var polyline;
12
13 $rootScope.currentPoint = {}; 12 $rootScope.currentPoint = {};
14 13
15 var rendBike = function() { 14 var rendBike = function() {
...@@ -154,7 +153,6 @@ angular.module('myApp') ...@@ -154,7 +153,6 @@ angular.module('myApp')
154 img.src = "images/scancode.png"; 153 img.src = "images/scancode.png";
155 154
156 scanControlContent.innerHTML = img.outerHTML + " 扫码租车"; 155 scanControlContent.innerHTML = img.outerHTML + " 扫码租车";
157
158 scanControlContainer.onclick = function() { 156 scanControlContainer.onclick = function() {
159 $scope.$apply(function() { 157 $scope.$apply(function() {
160 $rootScope.openScan = true; 158 $rootScope.openScan = true;
......
js/service/wechatPaymentService.js
...@@ -116,7 +116,7 @@ angular.module('myApp.services') ...@@ -116,7 +116,7 @@ angular.module('myApp.services')
116 case 101: 116 case 101:
117 var param = Object.assign($location.search(),{ 117 var param = Object.assign($location.search(),{
118 amount : amount, 118 amount : amount,
119 body : "租车租金", 119 body : "租车租git金",
120 type : 101 120 type : 101
121 }); 121 });
122 return callUnifiedOrderApi(host + "/bill/wx/h5/" + orderId, param); 122 return callUnifiedOrderApi(host + "/bill/wx/h5/" + orderId, param);
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!