Merge branch 'master' into zyj

# Conflicts:
#	utils/request.js

oilAccount/page/accountRecharge/details.vue

@@ -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;
 	}

oilAccount/page/accountRecharge/index.vue

@@ -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;