From 161b02bc00de07207c511ddf7571364bb0fa3953 Mon Sep 17 00:00:00 2001 From: songchongxian <546803970@qq.com> Date: Thu, 21 Feb 2019 19:25:19 +0800 Subject: [PATCH] master --- js/ajax.js | 11 +++++++---- js/url.js | 37 ++++++++++--------------------------- more/.DS_Store | Bin 6148 -> 0 bytes more/VipCardtwo/Vipcard.html | 8 ++++---- more/VipCardtwo/css/Vipcard.html | 8 ++++---- more/VipCardtwo/css/minec.html | 8 ++++---- more/VipCardtwo/css/searchVip.html | 4 ++-- more/VipCardtwo/css/vcard.html | 8 ++++---- more/VipCardtwo/css/vipcardpay.html | 2 +- more/VipCardtwo/minec.html | 125 ++++++++--------------------------------------------------------------------------------------------------------------------- more/VipCardtwo/searchVip.html | 8 ++++---- more/VipCardtwo/vcard.html | 8 ++++---- more/VipCardtwo/vippay.html | 2 +- more/fanxtc/bf/fxone.html | 2 +- more/fanxtc/fxone.html | 2 +- more/self/.DS_Store | Bin 6148 -> 0 bytes more/self/Vehiclemanagement/EditCar.html | 34 ++++++++++++++++++++++++++++++++-- more/self/fapiao/Billinghistory/BhistoryInfo.html | 6 ++---- more/self/fapiao/Billinghistory/Ticketopeningrules.html | 10 +++++----- more/self/fapiao/Billinghistory/kaipiao/Viptjf.html | 354 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- more/self/fapiao/Invoiceapplication.html | 18 +++++++----------- more/self/fapiao/Ticketopeningrules.html | 10 +++++----- more/self/fapiao/kaipiao/Viptjf.html | 216 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------- more/self/fapiao/kaipiao/css/Viptjf.css | 8 ++------ more/self/fapiao/kaipiao/tjfapiao.html | 9 +++------ more/self/self.html | 4 ++-- more/self/self2.html | 6 +++--- more/share/share.html | 4 ++-- nearStop/js/tcyd.js | 2 +- nearStop/list.html | 2 +- nearStop/map.html | 2 +- nearStop/new_file.html | 4 ++-- nearStop/newmap1.html | 2 +- nearStop/parklist.html | 2 +- nearStop/parklistbf.html | 2 +- pay/confirmxc.html | 2 +- 36 files changed, 389 insertions(+), 541 deletions(-) diff --git a/js/ajax.js b/js/ajax.js index bcb2f81..a58294a 100644 --- a/js/ajax.js +++ b/js/ajax.js @@ -1,6 +1,6 @@ var jsajax = jsajax || {}; -jsajax.appID = 'wxb207fd26449b20bc';//'wxe98c8ee886986377'; -//任你2停wx1e9001e5940605b1 +jsajax.appID = 'wx1e9001e5940605b1';//'wxe98c8ee886986377'; +//任你停wx1e9001e5940605b1 //丹阳通wxb207fd26449b20bc //获取openid jsajax.getopenid = function (code,fn) { @@ -116,7 +116,7 @@ jsajax.setcss = function(strpath){ }; /* 默认请求*/ -jsajax.defaultReq=function(url, data, successfn) { +jsajax.defaultReq=function(url, data, successfn,errorfn) { data = (data==null || data=="" || typeof(data)=="undefined")? {"date": new Date().getTime()} : data; $.ajax({ type: "post", @@ -129,8 +129,11 @@ jsajax.defaultReq=function(url, data, successfn) { successfn(d); }, error: function(e){ - //alert(JSON.stringify(e)); + //alert(JSON.stringify(e)); console.log(JSON.stringify(e)); + if (typeof (errorfn) != "undefined") { + errorfn(JSON.stringify(e)); + } }, complete:function (e) {} }); diff --git a/js/url.js b/js/url.js index c710180..f11d34b 100644 --- a/js/url.js +++ b/js/url.js @@ -1,18 +1,8 @@ var mUrl = mUrl || {}; -/* - @songcxa - @2018/10/8 - @PC端测试使用 -*/ -mUrl.testtoken = "21f2ee47e3a34f93838b37fce4bbeba6";//用户登录tocken -mUrl.testdeviceInfo = "868869021179618";//当前用户设备号 -//谢建朋 -//mUrl.testtoken = "1935117c009c4efb9cee2ea9e68db42d"; -//mUrl.testdeviceInfo = "866822033228388"; -//曹郎鹏 -//mUrl.testtoken = "7551e008856e4a388d7ae8e91e1c6c55"; -//mUrl.testdeviceInfo = "99575C3E-3F7F-4521-B6FB-AEDD26350ACA";//IOS -//END + +//songcxa 15801541129 +mUrl.testtoken = "a49e4835f5184f0fb5d0aba2a30bca8b"; +mUrl.testdeviceInfo = "868869021179618";//android /*获取设置openid start*/ mUrl.GetOpenid = function(){ @@ -96,12 +86,8 @@ mUrl.getJx = function(){ } /*end*/ -//测试环境 -//var cepath = 'http://39.98.54.240:8090'; -//正式环境 -var cepath = 'http://app.api.dyszt.com:8090'; -//https://pay.service.rnting.com//'http://47.96.41.38:8090'; +var cepath = 'http://39.98.54.240:8090';//http://pay.service.renniting.cn//http://39.98.54.240:8090//http://app.api.dyszt.com:8090//var cepath = 'http://app.api.dyszt.com:8090';//https://pay.service.rnting.com//'http://47.96.41.38:8090'; /*----------------------------------------------登录登出绑定手机号 start*/ //发送验证码 mUrl.sendRandCode = cepath + '/user/sendverificode';//webPath + '/binding/sendRandCode'+mUrl.getCommonParam(); @@ -118,7 +104,7 @@ mUrl.tcgettoken =cepath+'/wxPublicUser/getTokenByOpenId'; mUrl.tcpaysuccess = cepath+'/query/Issued';//目前暂时不用//无用 //mUrl.tcwxpay = cepath+ '/weixinPublicPay/unifiedOrder'; mUrl.tcwxpay = cepath+ '/weixinpay/publicUnifiedOrder';//修改 添加字段 - mUrl.SelectCar = cepath +'/user/queryUserCars';////车辆信息查询(查看是否绑定车牌号)无用 + mUrl.SelectCar = cepath +'/user/queryUserCars';//车辆信息查询(查看是否绑定车牌号)无用 mUrl.SelectOrder = cepath +'/query/queryOrderByCarNumbers';//查询订单 (查询待支付订单)//无用 /*----------------------支付页面所需接口 end*/ @@ -169,13 +155,10 @@ mUrl.loginOut = cepath+'/user/logout';//退出登录 //个人信息目前无用 mUrl.deleteaddress = cepath+'/invoice/deleteCustMailingAddressInfoByID';//删除一条邮寄地址 mUrl.checkAddress = cepath+'/invoice/queryCustMailingAddressInfoById';//'/invoice/queryCustrMailingAddressInfoById';//根据id查询出地址详情信息 -mUrl.vipkpList = cepath+'/invoice/queryVipCardTicketList';//获取会员卡开票列表 -//mUrl.vipkpList = cepath+'/invoice/queryRntPayOrderForInvoice';//获取会员卡开票列表 -//开票列表songcx 2018-10-8 -mUrl.vipkpList2 = cepath + '/invoice/queryRntPayOrderForInvoice';//获取开票列表 -mUrl.kaipaioHistory2 = cepath + '/invoice/openTicketForCustInvoiceHisInfo';//确认提交开票 - - mUrl.kaipaioHistory = cepath+'/invoice/insertCustInvoiceHisInfo';//•记录客户开发票历史信息及开票历史详情信息 +//mUrl.vipkpList = cepath+'/invoice/queryVipCardTicketList';//获取会员卡开票列表[old] + mUrl.vipkpList = cepath + '/invoice/queryRntPayOrderForInvoice';//获取会员卡开票列表[new] + mUrl.kaipaioHistory = cepath + '/invoice/insertCustInvoiceHisInfo';//•记录客户开发票历史信息及开票历史详情信息 + mUrl.queryAppOrgs = cepath + '/appOrg/queryAppOrgs';//获取区域列表songcxa mUrl.gethistorylist = cepath+'/invoice/queryCustInvoiceHistoryList';//获取所有的历史接口 diff --git a/more/.DS_Store b/more/.DS_Store index 532fe91..62de24d 100644 Binary files a/more/.DS_Store and b/more/.DS_Store differ diff --git a/more/VipCardtwo/Vipcard.html b/more/VipCardtwo/Vipcard.html index 4b0f13c..8e186c2 100644 --- a/more/VipCardtwo/Vipcard.html +++ b/more/VipCardtwo/Vipcard.html @@ -118,7 +118,7 @@ background: -webkit-linear-gradient(-45deg, rgba(252,116,147,1),rgba(185,92,193,1)); background: linear-gradient(-45deg, rgba(185,92,193,1),rgba(252,116,147,1));/*linear-gradient(-45deg, rgba(252,116,147,1),rgba(185,92,193,1));*/ } - /*.mylistdata .list{ + .mylistdata .list{ float: left; position: relative; width: 100%; @@ -129,13 +129,13 @@ border-radius: 8px; background: url(imgs/shuiyy.png)no-repeat center center; background-size: 90% !important; - }*/ - /*.mylistdata .list .cardstype{ + } + .mylistdata .list .cardstype{ padding: 0; margin-bottom: 59.3px; background: url(imgs/ztesy.png)no-repeat top right ; background-size: 61px !important; - }*/ + } .mylistdata .list .cardstype li{ padding:0 4px; padding-left: 0; diff --git a/more/VipCardtwo/css/Vipcard.html b/more/VipCardtwo/css/Vipcard.html index 152407d..8d253bd 100644 --- a/more/VipCardtwo/css/Vipcard.html +++ b/more/VipCardtwo/css/Vipcard.html @@ -118,7 +118,7 @@ background: -webkit-linear-gradient(-45deg, rgba(252,116,147,1),rgba(185,92,193,1)); background: linear-gradient(-45deg, rgba(185,92,193,1),rgba(252,116,147,1));/*linear-gradient(-45deg, rgba(252,116,147,1),rgba(185,92,193,1));*/ } - /*.mylistdata .list{ + .mylistdata .list{ float: left; position: relative; width: 100%; @@ -129,13 +129,13 @@ border-radius: 8px; background: url(imgs/shuiyy.png)no-repeat center center; background-size: 90% !important; - }*/ - /*.mylistdata .list .cardstype{ + } + .mylistdata .list .cardstype{ padding: 0; margin-bottom: 59.3px; background: url(imgs/ztesy.png)no-repeat top right ; background-size: 61px !important; - }*/ + } .mylistdata .list .cardstype li{ padding:0 4px; padding-left: 0; diff --git a/more/VipCardtwo/css/minec.html b/more/VipCardtwo/css/minec.html index d767b29..f1f4366 100644 --- a/more/VipCardtwo/css/minec.html +++ b/more/VipCardtwo/css/minec.html @@ -65,7 +65,7 @@ background: -webkit-linear-gradient(-45deg, #bd5ebe, #fc7493); background: linear-gradient(-45deg, #bd5ebe, #fc7493); } - /*.mineclist .list{ + .mineclist .list{ float: left; position: relative; width: 100%; @@ -76,7 +76,7 @@ border-radius: 8px; background: url(imgs/shuiyy.png)no-repeat center center; background-size: 90% !important; - }*/ + } .mineclist .list>span{ position: absolute; right: 0; @@ -88,12 +88,12 @@ text-align: center; color: #fff; } - /*.mineclist .list .cardstype{ + .mineclist .list .cardstype{ padding: 0; margin-bottom: 20.3px; background: url(imgs/ztesy.png)no-repeat top right ; background-size: 61px !important; - }*/ + } .mineclist .list .cardstype li{ padding-right: 8px; padding-left: 0; diff --git a/more/VipCardtwo/css/searchVip.html b/more/VipCardtwo/css/searchVip.html index 090f003..ea31253 100644 --- a/more/VipCardtwo/css/searchVip.html +++ b/more/VipCardtwo/css/searchVip.html @@ -124,7 +124,7 @@ background: -webkit-linear-gradient(-45deg, rgba(252,116,147,1),rgba(185,92,193,1)); background: linear-gradient(-45deg, rgba(185,92,193,1),rgba(252,116,147,1));/*linear-gradient(-45deg, rgba(252,116,147,1),rgba(185,92,193,1));*/ } - /*.mylistdata .list{ + .mylistdata .list{ float: left; position: relative; width: 100%; @@ -135,7 +135,7 @@ border-radius: 8px; background: url(imgs/shuiyy.png)no-repeat center center; background-size: 90% !important; - }*/ + } .mylistdata .list .cardstype{ padding: 0; margin-bottom: 59.3px; diff --git a/more/VipCardtwo/css/vcard.html b/more/VipCardtwo/css/vcard.html index 428b106..eefbd12 100644 --- a/more/VipCardtwo/css/vcard.html +++ b/more/VipCardtwo/css/vcard.html @@ -47,7 +47,7 @@ background: -webkit-linear-gradient(-45deg, rgba(252,116,147,1),rgba(185,92,193,1)); background: linear-gradient(-45deg, rgba(185,92,193,1),rgba(252,116,147,1)); } - /*.list{ + .list{ float: left; position: relative; width: 100%; @@ -58,13 +58,13 @@ border-radius: 8px; background: url(imgs/shuiyy.png)no-repeat center center; background-size: 90% !important; - }*/ - /*.list .cardstype{ + } + .list .cardstype{ padding: 0; margin-bottom: 59.3px; background: url(imgs/ztesy.png)no-repeat top right ; background-size: 61px !important; - }*/ + } .list .cardstype li{ padding:0 4px; padding-left: 0; diff --git a/more/VipCardtwo/css/vipcardpay.html b/more/VipCardtwo/css/vipcardpay.html index 38971c2..792d274 100644 --- a/more/VipCardtwo/css/vipcardpay.html +++ b/more/VipCardtwo/css/vipcardpay.html @@ -674,7 +674,7 @@ var orderId = datas.orderId; var apporwx = mUrl.getApporWX(); if(apporwx=='wx'){ - var src = 'http://wxgzh.rnting.com/ceshi/wechatthree/Threewf/WEB-INF/pages/elsepages/cards_pages/confirmp.html?orderId='+orderId+"&orderFee="+orderFee+"&carNumber="+carNumber+"&startDate="+startd+"&endDate="+endDate+"&optType=1&openid="+func.openid+"&token="+func.token+"&"; + var src = 'http://wxgzh.renniting.cn/wechatwuxi/Threewf/WEB-INF/pages/elsepages/cards_pages/confirmp.html?orderId='+orderId+"&orderFee="+orderFee+"&carNumber="+carNumber+"&startDate="+startd+"&endDate="+endDate+"&optType=1&openid="+func.openid+"&token="+func.token+"&"; //window.location.assign(encodeURI(src)); }else{ isAndroidorios(function(data){ diff --git a/more/VipCardtwo/minec.html b/more/VipCardtwo/minec.html index b77c564..1583c8a 100644 --- a/more/VipCardtwo/minec.html +++ b/more/VipCardtwo/minec.html @@ -75,7 +75,7 @@ padding: 11px; box-sizing: border-box; border-radius: 8px; - background: url(imgs/shuiyy11.png)no-repeat center center; + background: url(imgs/shuiyy.png)no-repeat center center; background-size: 90% !important; } .mineclist .list>span{ @@ -92,7 +92,7 @@ .mineclist .list .cardstype{ padding: 0; margin-bottom: 20.3px; - background: url(imgs/ztesy9.png)no-repeat top right ; + background: url(imgs/ztesy.png)no-repeat top right ; background-size: 61px !important; } .mineclist .list .cardstype li{ @@ -153,10 +153,8 @@