diff --git a/common/js/conver.js b/common/js/conver.js index 3835012..dac050e 100644 --- a/common/js/conver.js +++ b/common/js/conver.js @@ -137,70 +137,146 @@ var phoneNum = function(str, startLength, endLength, replaceStr) { return str; } return str.slice(0, startLength) + replaceStr + str.slice(str.length - endLength); +} + +var repairStatusColor = function(status) { + var color = 'repair-status-yellow' + switch (status) { + case 'PENDING': + color = 'repair-status-yellow' + break + case 'APPROVED': + color = 'repair-status-green' + break + case 'REJECTED': + color = 'repair-status-red' + break + case 'CANCELED': + color = 'repair-status-gray' + break + } + return color +} +var repairStatus = function(status) { + var str = '待审核' + switch (status) { + case 'PENDING': + str = '待审核' + break + case 'APPROVED': + str = '已通过' + break + case 'REJECTED': + str = '未通过' + break + case 'CANCELED': + str = '已取消' + break + } + return str +} +var repairType = function(type) { + var str = '未知' + switch (type) { + case 'CORRECTION1': + str = '一次补正' + break + case 'CORRECTION2': + str = '二次补正' + break + } + return str +} +var repairKind = function(kind) { + var str = '未知' + switch (kind) { + case 'CODE': + str = '代码' + break + case 'MANUAL': + str = '操作手册' + break + case 'ALL': + str = '代码+操作手册' + break + } + return str +} + +var payType = function(type) { + // 充值1|支出2|提现3|系统扣款4|订单收入5|付款6) + var typeStr = '支出' + switch (type) { + case 1: + typeStr = '充值' + break + case 2: + typeStr = '支出' + break + case 3: + typeStr = '提现' + break + case 4: + typeStr = '系统\n扣款' + break + case 5: + typeStr = '订单\n收入' + break + case 6: + typeStr = '付款' + break + } + return typeStr +} +var payTypeColor = function(type) { + var typeColr = 'type-g' + switch (type) { + case 1: + case 3: + case 5: + typeColr = 'type-g' + break + case 2: + case 4: + case 6: + typeColr = 'type-z' + break + } + return typeColr } -var repairStatusColor = function (status) { - var color = 'repair-status-yellow' - switch (status) { - case 'PENDING': - color = 'repair-status-yellow' - break - case 'APPROVED': - color = 'repair-status-green' - break - case 'REJECTED': - color = 'repair-status-red' - break - case 'CANCELED': - color = 'repair-status-gray' - break - } - return color -} -var repairStatus = function (status) { - var str = '待审核' - switch (status) { - case 'PENDING': - str = '待审核' - break - case 'APPROVED': - str = '已通过' - break - case 'REJECTED': - str = '未通过' - break - case 'CANCELED': - str = '已取消' - break - } - return str -} -var repairType = function (type) { - var str = '未知' +// 充值1|支出2|提现3|系统扣款4|订单收入5|付款6) +var payTypeFontSize = function (type) { + var fSize = 'size-32' switch (type) { - case 'CORRECTION1': - str = '一次补正' + case 1: + case 2: + case 3: + case 6: + fSize = 'size-32' break - case 'CORRECTION2': - str = '二次补正' + case 4: + case 5: + fSize = 'size-24' break } - return str + return fSize } -var repairKind = function (kind) { - var str = '未知' - switch (kind) { - case 'CODE': - str = '代码' +var payTypeSign = function (type) { + var typeStr = '-' + switch (type) { + case 1: + case 5: + typeStr = '+' break - case 'MANUAL': - str = '操作手册' - break - case 'ALL': - str = '代码+操作手册' + case 2: + case 3: + case 4: + case 6: + typeStr = '-' break } - return str + return typeStr } export { isEmpty, @@ -212,9 +288,13 @@ export { timeSplit, objIsEmpty, moneyTxt, - phoneNum, - repairStatusColor, - repairKind, - repairType, - repairStatus + phoneNum, + repairStatusColor, + repairKind, + repairType, + repairStatus, + payTypeColor, + payType, + payTypeFontSize, + payTypeSign } \ No newline at end of file diff --git a/pages.json b/pages.json index 758d5cc..fb83ffc 100644 --- a/pages.json +++ b/pages.json @@ -133,6 +133,13 @@ "navigationBarTitleText": "", "enablePullDownRefresh": true } + }, + { + "path": "pages/mine/mineAccount/minePayRecord/minePayRecord", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": true + } } ], "globalStyle": { diff --git a/pages/mine/mineAccount/mineContact/mineContact.vue b/pages/mine/mineAccount/mineContact/mineContact.vue index 8633c4f..a49ff06 100644 --- a/pages/mine/mineAccount/mineContact/mineContact.vue +++ b/pages/mine/mineAccount/mineContact/mineContact.vue @@ -1,5 +1,5 @@