diff --git a/common/common.js b/common/common.js index 764546d..8466f7c 100644 --- a/common/common.js +++ b/common/common.js @@ -1,213 +1,173 @@ import md5 from './md5.min.js'; - // 江阴正式环境 var serverUrl = "https://bus.jycrtc.com"; - //江阴微信小程序appid -const hs_wxPay_appId = 'wxfdc1af620d3ab750'; - +const hs_wxPay_appId = 'wxfdc1af620d3ab750'; // 江阴慧停车orgId const public_orgId = '10107'; const appName = '江阴慧停车'; const ACompany = '©江阴慧停车管理有限公司'; const BCompany = '由中兴智能交通股份有限公司提供技术支持'; const appVerson = '1.0.0'; - const SetToken = uni.getStorageSync("globalUser").token; - // ----江阴项目 接口---- // 商户登录 const userLogin = serverUrl + "/business/h5/index/login"; - // 获取已登录商户用户信息 const indexInfo = serverUrl + "/business/h5/index/info"; - // 商户退出登录 const userLoginout = serverUrl + "/business/h5/index/logout"; - // 商户关于我们 const useraboutUs = serverUrl + "/business/h5/index/aboutUs"; - // 商户账户余额信息 const walletAccount = serverUrl + "/business/h5/wallet/account"; - // 商户充值金额列表 const rechargeList = serverUrl + "/business/h5/wallet/rechargeList"; - // 通过商户ID查询停车记录信息 const getBusinessParkOrderByBusIdForPage = serverUrl + "/business/h5/order/getBusinessParkOrderByBusIdForPage"; - // 通过商户ID查询停车记录信息 const getPayOrderByOrderId = serverUrl + "/business/h5/order/getPayOrderByOrderId"; +//刘淇接口 + + -// -const requestSign = function(inputData) { - - var jsonList = inputData || {}; - - jsonList.orgId = public_orgId; - jsonList.sign_type = "md5"; - jsonList.app_id = "0eca8f5373ca4866aec2f8e9d9367104"; - jsonList.deviceInfo = "BC0703A4-AFB0-4B51-9089-9B7487C0CC6E"; - jsonList.salt = getSalt(); - jsonList.terminalSource = "11"; - // jsonList.token = getGlobalUser("globalUser").token; - jsonList.token = getGlobalUser("globalUser").token; - // jsonList.token = 'af7ed65335f842ee8f754e841ff940ea'; - - var arrData = []; - for (var key in jsonList) { - var obj = {}; - // console.log("key = "+key); - // // obj[key] =jsonList[key]; - obj.keyname = key; - obj.value = jsonList[key]; - // console.log(obj); - arrData.push(obj); - } - var sign = getSign(arrData); - jsonList.sign = sign; - return jsonList; -} +//陈彪接口 + + + +const requestSign = function (inputData) { + var jsonList = inputData || {}; + jsonList.orgId = public_orgId; + jsonList.sign_type = "md5"; + jsonList.app_id = "0eca8f5373ca4866aec2f8e9d9367104"; + jsonList.deviceInfo = "BC0703A4-AFB0-4B51-9089-9B7487C0CC6E"; + jsonList.salt = getSalt(); + jsonList.terminalSource = "11"; + // jsonList.token = getGlobalUser("globalUser").token; + jsonList.token = getGlobalUser("globalUser").token; + // jsonList.token = 'af7ed65335f842ee8f754e841ff940ea'; + var arrData = []; + for (var key in jsonList) { + var obj = {}; + // console.log("key = "+key); + // // obj[key] =jsonList[key]; + obj.keyname = key; + obj.value = jsonList[key]; + // console.log(obj); + arrData.push(obj); + } + var sign = getSign(arrData); + jsonList.sign = sign; + return jsonList; +} //获取sign -var getSign = function(objb) { - var compare = function(obj1, obj2) { - var val1 = obj1.keyname; - var val2 = obj2.keyname; - if (val1 < val2) { - return -1; - } else if (val1 > val2) { - return 1; - } else { - return 0; - } - } - objb.sort(compare); - var strmd5 = '14318527b13840c2a4af63fef52c2d6e'; - for (var i = 0; i < objb.length; i++) { - if (objb[i].value != null && objb[i].value != '') { - strmd5 += objb[i].keyname + objb[i].value; - } - } - strmd5 += '14318527b13840c2a4af63fef52c2d6e'; - // console.log('strmd5-------->'+strmd5); - strmd5 = md5(strmd5); - strmd5 = strmd5.toUpperCase(); - return strmd5; +var getSign = function (objb) { + var compare = function (obj1, obj2) { + var val1 = obj1.keyname; + var val2 = obj2.keyname; + if (val1 < val2) { + return -1; + } else if (val1 > val2) { + return 1; + } else { + return 0; + } + } + objb.sort(compare); + var strmd5 = '14318527b13840c2a4af63fef52c2d6e'; + for (var i = 0; i < objb.length; i++) { + if (objb[i].value != null && objb[i].value != '') { + strmd5 += objb[i].keyname + objb[i].value; + } + } + strmd5 += '14318527b13840c2a4af63fef52c2d6e'; + // console.log('strmd5-------->'+strmd5); + strmd5 = md5(strmd5); + strmd5 = strmd5.toUpperCase(); + return strmd5; } - //获取盐值 -var getSalt = function() { - var len = parseInt(32); - var $chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678'; - var maxPos = $chars.length; - var pwd = ''; - for (var i = 0; i < len; i++) { - pwd += $chars.charAt(Math.floor(Math.random() * maxPos)); - } - // console.log(pwd); - return pwd; +var getSalt = function () { + var len = parseInt(32); + var $chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678'; + var maxPos = $chars.length; + var pwd = ''; + for (var i = 0; i < len; i++) { + pwd += $chars.charAt(Math.floor(Math.random() * maxPos)); + } + // console.log(pwd); + return pwd; } - -var getGlobalUser = function(key) { - var userInfo = uni.getStorageSync("globalUser"); - if (userInfo != null && userInfo != "" && userInfo != undefined) { - return userInfo; - } else { - return ''; - } +var getGlobalUser = function (key) { + var userInfo = uni.getStorageSync("globalUser"); + if (userInfo != null && userInfo != "" && userInfo != undefined) { + return userInfo; + } else { + return ''; + } } - // 除了金额 var moneyFormat = function (val) { - return (val/100).toFixed(2) + return (val / 100).toFixed(2) } - var dateFormat = function (msd) { // 时间转换 var time = msd - if (null != time && "" != time) { - if (time > 60 && time < 60 * 60) { - time = parseInt(time / 60.0) + "分钟" + parseInt((parseFloat(time / 60.0) - - parseInt(time / 60.0)) * 60) + "秒"; - } - else if (time >= 60 * 60 && time < 60 * 60 * 24) { - time = parseInt(time / 3600.0) + "小时" + parseInt((parseFloat(time / 3600.0) - - parseInt(time / 3600.0)) * 60) + "分钟" + - parseInt((parseFloat((parseFloat(time / 3600.0) - parseInt(time / 3600.0)) * 60) - - parseInt((parseFloat(time / 3600.0) - parseInt(time / 3600.0)) * 60)) * 60) + "秒"; - } else if (time >= 60 * 60 * 24) { - time = parseInt(time / 3600.0 / 24) + "天" + parseInt((parseFloat(time / 3600.0 / 24) - - parseInt(time / 3600.0 / 24)) * 24) + "小时" + parseInt((parseFloat(time / 3600.0) - - parseInt(time / 3600.0)) * 60) + "分钟" + - parseInt((parseFloat((parseFloat(time / 3600.0) - parseInt(time / 3600.0)) * 60) - - parseInt((parseFloat(time / 3600.0) - parseInt(time / 3600.0)) * 60)) * 60) + "秒"; - } - else { - time = parseInt(time) + "秒"; - } - } - return time; } - export default { - - // deviceInfo, - hs_wxPay_appId, - public_orgId, - appName, - ACompany, - BCompany, - appVerson, - SetToken, - requestSign, - moneyFormat, - - // 接口 - userLogin, - indexInfo, - userLoginout, - useraboutUs, - walletAccount, - //刘淇接口 - getBusinessParkOrderByBusIdForPage, - getPayOrderByOrderId, - - + // deviceInfo, + hs_wxPay_appId, + public_orgId, + appName, + ACompany, + BCompany, + appVerson, + SetToken, + requestSign, + moneyFormat, + // 接口 + userLogin, + indexInfo, + userLoginout, + useraboutUs, + walletAccount, + //刘淇接口 + getBusinessParkOrderByBusIdForPage, + getPayOrderByOrderId, + //陈彪接口 + rechargeList, - //陈彪接口 - rechargeList, diff --git a/pages/parkRecordList/recordDetail.vue b/pages/parkRecordList/recordDetail.vue index 32dc4a6..f236b97 100644 --- a/pages/parkRecordList/recordDetail.vue +++ b/pages/parkRecordList/recordDetail.vue @@ -1,6 +1,6 @@