diff --git a/common/common.js b/common/common.js index 3bd5b90..716701f 100644 --- a/common/common.js +++ b/common/common.js @@ -36,156 +36,166 @@ const couponRuleParkPage = serverUrl + "/business/h5/coupon/couponRuleParkPage"; //陈彪接口 +// 余额明细下拉框选择列表 +const walletKindType = serverUrl + "/business/h5/wallet/kindType"; + +// 余额明细总览 +const detailSummary = serverUrl + "/business/h5/wallet/detailSummary"; + +// 余额明细-分页 +const walletDetailsPage = serverUrl + "/business/h5/wallet/detailsPage"; + +// 钱包充值-微信 +const publicUnifiedOrder = serverUrl + "/business/h5/pay/weixinpay/publicUnifiedOrder"; + 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; + 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 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 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 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 + var time =msd - if (null != time && "" != time) { - if (time > 60 && time < 60 * 60) { - time = parseInt(time / 60.0) + "分钟" + parseInt((parseFloat(time / 60.0) - + 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) + "秒"; + parseInt(time / 60.0)) * 60) + "秒"; - } + } - else if (time >= 60 * 60 && time < 60 * 60 * 24) { - time = parseInt(time / 3600.0) + "小时" + parseInt((parseFloat(time / 3600.0) - + 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(time / 3600.0)) * 60) + "分钟" + - parseInt((parseFloat((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) + "秒"; + 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)- + } 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/24))*24) + "小时" + parseInt((parseFloat(time / 3600.0) - - parseInt(time / 3600.0)) * 60) + "分钟" + + parseInt(time / 3600.0)) * 60) + "分钟" + - parseInt((parseFloat((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) + "秒"; + parseInt((parseFloat(time / 3600.0) - parseInt(time / 3600.0)) * 60)) * 60) + "秒"; - } + } - else { - time = parseInt(time) + "秒"; + else { + time = parseInt(time) + "秒"; - } + } - } - return time; + } + return time; } export default { - // deviceInfo, - hs_wxPay_appId, - public_orgId, - appName, - ACompany, - BCompany, - appVerson, - SetToken, - requestSign, - moneyFormat, - dateFormat, - // 接口 - userLogin, - indexInfo, - userLoginout, - useraboutUs, - walletAccount, - //刘淇接口 - getBusinessParkOrderByBusIdForPage, - getPayOrderByOrderId, + // deviceInfo, + hs_wxPay_appId, + public_orgId, + appName, + ACompany, + BCompany, + appVerson, + SetToken, + requestSign, + moneyFormat, + dateFormat, + // 接口 + userLogin, + indexInfo, + userLoginout, + useraboutUs, + walletAccount, + //刘淇接口 + getBusinessParkOrderByBusIdForPage, + getPayOrderByOrderId, couponRuleParkPage, - - - //陈彪接口 - rechargeList, - - - - + //陈彪接口 + rechargeList, + walletKindType, + detailSummary, + walletDetailsPage, + publicUnifiedOrder, } diff --git a/common/filters.js b/common/filters.js index 563b008..98d6d08 100644 --- a/common/filters.js +++ b/common/filters.js @@ -31,42 +31,52 @@ const RMB = (value) => { return `￥${value}` } -// 钱保留两位小数 -const toFixed2 = num => { - return isNaN(num) ? 0.00 : parseFloat((num/100).toFixed(2)); +// 处理金额两位小数 +const toFixed2 = value => { + if (!value) { + return '0.00'; + } else { + return (value / 100).toFixed(2); + } + } // 钱保留两位小数+其他 const ortherToFixed = num => { - if(num === -1) return '其他'; - return isNaN(num) ? 0.00 : parseFloat((num/100).toFixed(2)); + if (num === '0' || num === undefined || num === null || num === '' || num === NaN) { + return '0.00'; + } else if (num === -1) { + return '其他'; + } else { + return (num / 100).toFixed(2); + } } // 数字每三位加个逗号 -const toThousands =(num)=> { - var result = [], - counter = 0; - num = (num || 0).toString().split(''); - for (var i = num.length - 1; i >= 0; i--) { - counter++; - result.unshift(num[i]); - if (!(counter % 3) && i != 0) { - result.unshift(','); - } - } - return result.join(''); - } - - // 根据身份证号码判断男女 - const sexFilter = value => { - if (!value) { - return '' - } else { - let data = value.substr(16, 1) % 2 === 1 ? '男' : '女' - return data - } - } +const toThousands = (num) => { + var result = [], + counter = 0; + num = (num || 0).toString().split(''); + for (var i = num.length - 1; i >= 0; i--) { + counter++; + result.unshift(num[i]); + if (!(counter % 3) && i != 0) { + result.unshift(','); + } + } + return result.join(''); +} + +// 根据身份证号码判断男女 +const sexFilter = value => { + if (!value) { + return '' + } else { + let data = value.substr(16, 1) % 2 === 1 ? '男' : '女' + return data + } +} export default { tranNull, diff --git a/pages/moneyRecharge/moneyRecharge.vue b/pages/moneyRecharge/moneyRecharge.vue index 7f05ea6..7b0d719 100644 --- a/pages/moneyRecharge/moneyRecharge.vue +++ b/pages/moneyRecharge/moneyRecharge.vue @@ -6,7 +6,7 @@ ¥{{acctBalance | toFixed2 }} - + @@ -16,9 +16,9 @@ - - + + @@ -54,6 +54,7 @@ currentIndex: 0, isShowInput: false, rechargeNum: '', + maxlength: 6 //默认一个长度 } }, onLoad() { @@ -104,11 +105,30 @@ console.log('1') that.isShowInput = true; that.rechargeNum = '' + } else { + that.isShowInput = false; } - that.isShowInput = false; + }, - detailCell() { + checkNum(e) { + let value = e.detail.value; + let dot = value.indexOf('.'); //包含小数点 + let reg = /^[0-9]+$/; //正整数 + if (dot > -1) { + this.maxlength = dot + 3; //长度是小数点后两位 + if (value.length > dot + 3) {} + } + if (reg.test(value)) { //如果是正整数不包含小数点 + this.maxlength = 6; + } + }, + + detailCell() { + uni.navigateTo({ + url: '../rechargeDetail/rechargeDetail' + + }); } } } @@ -227,4 +247,14 @@ margin-top: 40px; } + .payInut{ + display: flex; + box-sizing: border-box; + flex-direction: row; + align-items: center; + border: 1px solid #DCDFE6; + border-radius: 4px; + min-height: 36px; + padding-left: 10px; + } diff --git a/pages/rechargeDetail/rechargeDetail.vue b/pages/rechargeDetail/rechargeDetail.vue index 5895917..872c48c 100644 --- a/pages/rechargeDetail/rechargeDetail.vue +++ b/pages/rechargeDetail/rechargeDetail.vue @@ -1,258 +1,251 @@