caoliancun/wx_oms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
xiaozhiyong
2024-01-10 17:05:40 +08:00
parent def9eac156
commit b1726eba38
3 changed files with 76 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
oilAccount/components/accountListItem.vue
View File

@@ -8,7 +8,7 @@
<view :style="{background:typeBackground(item.auditMark),color:typeColor(item.auditMark)}"
class="listCard_header_Type">
<view :style="{background:typeColor(item.auditMark)}" class="garden"></view>
<text>{{item.auditMark|typeText}}</text>
<text>{{item.auditMark|typeText(item)}}</text>
</view>
</view>
<view class="listCard_footer flex jb an">
@@ -18,7 +18,8 @@
</view>
<view style="text-align: center;">
<view style="width: 180rpx;display: flex;justify-content: flex-end;">
<view :style="{color: transactionType(item.transactionType).color,background:transactionType(item.transactionType).bg}"
<view
:style="{color: transactionType(item.transactionType).color,background:transactionType(item.transactionType).bg}"
class="genres">{{ transactionType(item.transactionType).text}}</view>
</view>
<view class="price">
@@ -60,11 +61,12 @@
return '---'
}
},
typeText: function(e) {
console.log(e, '----')
typeText: (e, item) => {
switch (Number(e)) {
case 0:
return '等待审核'
return ['RECHARGE_REBETE', 'CONSUME_REBATE', 'CALIBRATION_BALANCE'].includes(item
.transactionType) ? '待运营组长审核' : '等待审核'
case 1:
return '审核通过'
case -1:
@@ -75,6 +77,8 @@
return '付款完成'
case 4:
return '取消充值'
case 5:
return '待数据中心审核'
default:
return '---'
}
@@ -120,6 +124,12 @@
color: '#EC4545',
bg: 'rgba(236, 69, 69, 0.1)'
}
case 'CALIBRATION_BALANCE':
return {
text: '结算校准',
color: '#2866FF',
bg: 'rgba(40, 102, 255, 0.1)'
}
default:
return {
text: '---',
@@ -155,7 +165,7 @@
}
},
typeBackground: function(e) {
console.log(e, '-----')
// console.log(e, '-----')
switch (Number(e)) {
case 0:
return '#E8CD3026'
@@ -169,12 +179,14 @@
return '#13ce66'
case 4:
return '#ff4949'
case 5:
return '#E8CD3026'
default:
return ''
}
},
typeColor: function(e) {
console.log(e, '-----')
// console.log(e, '-----')
switch (Number(e)) {
case 0:
return '#E8CD30'
@@ -188,6 +200,8 @@
return '#ffffff'
case 4:
return '#ffffff'
case 5:
return '#E8CD30'
default:
return ''
}
@@ -201,13 +215,14 @@
<style scoped>
.genres {
width: 88rpx;
/* width: 88rpx; */
height: 40rpx;
font-size: 24rpx;
display: flex;
justify-content: center;
align-items: center;
margin-bottom: 10rpx;
margin-bottom: 15rpx;
padding: 0 10rpx;
}
.flexGrow {
@@ -297,22 +312,23 @@
border-radius: 50%;
width: 20rpx;
height: 20rpx;
margin-right: 16rpx;
margin-right: 12rpx;
}
.listCard_header_Type {
background: rgba(232, 205, 48, 0.15);
border-radius: 40rpx;
color: #E8CD30;
/* padding: 10rpx 20rpx; */
padding: 0 25rpx;
font-size: 24rpx;
display: flex;
justify-content: center;
align-items: center;
Width:
180rpx;
Height:
54rpx;
/* Width:
240rpx; */
Height: 54rpx;
}
.listCard_header_Order {

41
oilAccount/page/accountRecharge/details.vue
View File

@@ -9,7 +9,7 @@
<view :style="{background:typeBackground(details.auditMark),color:typeColor(details.auditMark)}"
class="listCard_header_Type">
<view :style="{background:typeColor(details.auditMark)}" class="garden"></view>
<text>{{details.auditMark|typeText}}</text>
<text>{{details.auditMark|typeText(details)}}</text>
</view>
</view>
<view
@@ -99,7 +99,7 @@
</view>
<view class="footerButten felx">
<view @click="goBack" class="backButten felx justifyContent alignItems">返回</view>
<button v-if="details.auditMark==0" @click="iShow.examine = true"
<button v-if="details.auditMark==0 || details.auditMark==5" @click="examineiPre"
class="forwardButten felx justifyContent alignItems">审核</button>
</view>
<popup :butten='butten' @confirmFn='confirmFn' @closeFn='closeFn' :show="show" v-model="iShow.examine">
@@ -160,10 +160,10 @@
}
},
filters: {
typeText: function(e) {
typeText: function(e,details) {
switch (Number(e)) {
case 0:
return '等待审核'
return ['RECHARGE_REBETE', 'CONSUME_REBATE', 'CALIBRATION_BALANCE'].includes(details.transactionType) ? '待运营组长审核' : '等待审核'
case 1:
return '审核通过'
case -1:
@@ -174,6 +174,8 @@
return '付款完成'
case 4:
return '取消充值'
case 5:
return '待数据中心审核'
default:
return '---'
}
@@ -181,6 +183,31 @@
},
methods: {
examineiPre() {
let {
auditMark,
transactionType
} = this.details
let authList = uni.getStorageSync('user').authList
if (auditMark == 0 && ['RECHARGE_REBETE', 'CONSUME_REBATE', 'CALIBRATION_BALANCE'].includes(
transactionType) &&
!authList.includes('finance:site:recharge:operateLeader')) {
uni.showToast({
title: '无运营组长审核权限！',
icon: 'none'
})
return
}
if (this.details.auditMark == 5 && !authList.includes('finance:site:recharge:dataCenter')) {
uni.showToast({
title: '无数据中心审核权限！',
icon: 'none'
})
return
}
this.iShow.examine = true
},
transactionType(e) {
switch (e) {
case 'RECHARGE':
@@ -394,13 +421,13 @@
background: rgba(232, 205, 48, 0.15);
border-radius: 40rpx;
color: #E8CD30;
/* padding: 10rpx 20rpx; */
padding: 0 25rpx;
font-size: 24rpx;
display: flex;
justify-content: center;
align-items: center;
Width:
180rpx;
/* Width:
180rpx; */
Height:
54rpx;
}

9
oilAccount/page/accountRecharge/index.vue
View File

@@ -24,7 +24,7 @@
</view>
<view class="Navigation">
<view @tap="seleFn(item);seleindex=index"
:class="seleindex==index?'navigation_seleitem':'navigation_item'"
:class="[seleindex==index?'navigation_seleitem':'navigation_item',item.index == 5 ? 'navigation_item_special' : '']"
v-for="(item,index) in navigation">
{{item.text}}
<uni-icons :animation="animationData" class="icoon" v-if="index==0" type="refreshempty"
@@ -127,6 +127,9 @@
{
text: '已审核',
index: '1'
},{
text: '待数据中心审核',
index: '5'
}
],
listData: []
@@ -525,7 +528,9 @@
transition: all 0.3s;
bottom: -2px;
}
.navigation_item_special {
width: 200rpx;
}
.Navigation {
display: flex;
position: absolute;