更新

financialCenter/business/index.vue

@@ -74,7 +74,9 @@
 				}
 				return +number.toFixed(2)
 			},
+			
 			jump(e, path,item) {
+				console.log(123)
 				switch (e) {
 					case -1:
 						uni.navigateBack()

oilDistribution/index/index.vue

@@ -5,15 +5,9 @@
 				<view class="header_seach">
 					<view class="header_seach_seach">
 						<view class="seach_input">
-							<uni-easyinput 
+							<uni-easyinput :candidate='candidate' :ejectOpen='ejectOpen' @ejectFn='ejectFn'
-							   :candidate='candidate' 
+								:letfText='letfText' confirmType='search' @confirm='seachFn'
-							   :ejectOpen='ejectOpen' 
+								placeholder-style="color:#bbbbbb;font-weight: 100;" v-model="seachValue"
-							   @ejectFn='ejectFn'
-							   :letfText='letfText' 
-							   confirmType='search' 
-							    @confirm='seachFn'
-								placeholder-style="color:#bbbbbb;font-weight: 100;" 
-								v-model="seachValue"
 								:placeholder="letfText=='企业'?'企业名,企业ID':'司机姓名,司机手机号'" @iconClick="onClick">
 							</uni-easyinput>
 						</view>
@@ -87,18 +81,20 @@
 					</view>
 				</view>
 			</scroll-view>
-			<view v-if="listData.length==0" style="width: 100vw; height: 100%; display: flex;align-items: center;justify-content: center;">
+			<view v-if="listData.length==0"
+				style="width: 100vw; height: 100%; display: flex;align-items: center;justify-content: center;">
 				<image src="@/static/qx.png" style="width: 536rpx; height: 399rpx;"></image>
 			</view>
 		</view>
-		<popup :show="showPopup"  @confirmFn='confirmFn' @closeFn='closeFn' :butten='butten'
+		<popup :show="showPopup" @confirmFn='confirmFn' @closeFn='closeFn' :butten='butten' v-model="iShow.examine">
-			 v-model="iShow.examine">
 			<view slot="coment">
 				<view class="examine_popup_body">
 					<view class="examine_popup_header">
 						<view class="examine_popup_header_top">
 							<view class="examine_popup_header_title">分发详情</view>
-							<view :style="{background:typeBackground(seledata.auditMark),color:typeColor(seledata.auditMark)}" class="listCard_header_Type">
+							<view
+								:style="{background:typeBackground(seledata.auditMark),color:typeColor(seledata.auditMark)}"
+								class="listCard_header_Type">
 								<view :style="{background:typeColor(seledata.auditMark)}" class="garden"></view>
 								<text>{{seledata.auditMark|typeText}}</text>
 							</view>
@@ -115,8 +111,10 @@
 						</view>
 					</view>
 					<view class="examine_popup_orderType">
-						<image style="width: 60rpx;height: 50rpx;"  class="form_body_item_img"  src="@/static/fy.png"></image>
+						<image style="width: 60rpx;height: 50rpx;" class="form_body_item_img" src="@/static/fy.png">
-						<view class="examine_popup_orderType_text">{{ Number(seledata.disAmount).toFixed(2)||'--' }}</view>
+						</image>
+						<view class="examine_popup_orderType_text">{{ Number(seledata.disAmount).toFixed(2)||'--' }}
+						</view>
 					</view>
 					<view class="information_item">
 						<view class="information_item_label">子公司</view>
@@ -126,11 +124,17 @@
 						</view>
 					</view>
 					<view style="margin-top: 20rpx;" class="information_item_other">
-						<view class="information_item_other_value">{{seledata.createUserName||'暂无'}}({{seledata.createUser||'--'}}) <br/> {{seledata.createTime||'--'}}</view>
+						<view class="information_item_other_value">
+							{{seledata.createUserName||'暂无'}}({{seledata.createUser||'--'}}) <br />
+							{{seledata.createTime||'--'}}
+						</view>
 						<view class="information_item_other_label">申请信息</view>
 					</view>
 					<view class="information_item_other">
-						<view class="information_item_other_value">{{seledata.auditUserName||'暂无'}}({{seledata.auditUser||'暂无'}}) <br/> {{seledata.auditTime||'--'}}</view>
+						<view class="information_item_other_value">
+							{{seledata.auditUserName||'暂无'}}({{seledata.auditUser||'暂无'}}) <br />
+							{{seledata.auditTime||'--'}}
+						</view>
 						<view class="information_item_other_label">审核信息</view>
 					</view>
 
@@ -180,9 +184,9 @@
 		},
 		data() {
 			return {
-				showPopup:{
+				showPopup: {
-					img:false,
+					img: false,
-					footer:false
+					footer: false
 				},
 				animationData: null,
 				seledata: {},
@@ -269,9 +273,9 @@
 		onShow() {
 			this.getList();
 		},
-		filters:{
+		filters: {
-			typeText:function(e){
+			typeText: function(e) {
-				switch(Number(e)){
+				switch (Number(e)) {
 					case 0:
 						return '等待审核'
 					case 1:
@@ -284,9 +288,9 @@
 			},
 		},
 		methods: {
-			typeColor:function(e){
+			typeColor: function(e) {
-				console.log(e,'-----')
+				console.log(e, '-----')
-				switch(Number(e)){
+				switch (Number(e)) {
 					case 0:
 						return '#E8CD30'
 					case 1:
@@ -297,8 +301,8 @@
 						return ''
 				}
 			},
-			typeBackground:function(e){
+			typeBackground: function(e) {
-				switch(Number(e)){
+				switch (Number(e)) {
 					case 0:
 						return '#E8CD3026'
 					case 1:
@@ -388,10 +392,10 @@
 			getList() {
 				oilDistribution.getByPageOms(this.getData).then(res => {
 					if (res.code !== 20000) return
-					if(res.data.list.length==0){
+					if (res.data.list.length == 0) {
 						uni.showToast({
-							title:'没有数据了哦',
+							title: '没有数据了哦',
-							icon:'none'
+							icon: 'none'
 						})
 					}
 					if (this.getData.currentPage !== 1) {
@@ -416,22 +420,22 @@
 						this.iShow.examine = true
 						if (item.auditMark == 0) {
 							this.showPopup.footer = true
-						}else{
+						} else {
 							this.showPopup.footer = false
 						}
 						break;
 					case 2:
-					if(uni.getStorageSync('user').authList.includes('distributeReverse:info:add')){
+						if (uni.getStorageSync('user').authList.includes('distributeReverse:info:add')) {
 							uni.redirectTo({
 								url: "../distribute/distribute",
 								fail(E) {
 									console.log(e)
 								}
 							})
-					}else{
+						} else {
 							uni.showToast({
-							title:'暂无权限请联系管理员',
+								title: '暂无权限请联系管理员',
-							icon:'none'
+								icon: 'none'
 							})
 						}
 
@@ -482,6 +486,7 @@
 
 <style>
 	@import url("./popup.css");
+
 	.icoon :active {
 		color: #007AFF;
 	}
@@ -747,14 +752,14 @@
 		border: 0px !important;
 	}
 
-	/* 	.header {
+	.header {
-		background-color: #007AFF;
+		/* background-color: #007AFF; */
 		color: white;
 		min-height: 403rpx;
-		background-image: url('https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油admin小程序/sjbj.png');
+		background: url('https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油admin小程序/sjbj.png') 100%/100%;
-		background-size: 100% 100%;
+		/* background-size: 100% 100%; */
 		position: relative;
-	} */
+	}
 
 	.uni-navbar__header-btns-right {
 		padding-right: 0 !important;

orderList/index/index.vue

@@ -8,7 +8,8 @@
 							<uni-easyinput :candidate='candidate' :ejectOpen='ejectOpen' @ejectFn='ejectFn'
 								:letfText='letfText' confirmType='search' @confirm='seachFn'
 								placeholder-style="color:#bbbbbb;font-weight: 100;" v-model="seachValue"
-								:placeholder="letfText=='订单号'? '订单编号':letfText=='司机'?'司机姓名,手机号码':letfText=='企业'?'企业名称,企业编号':'油站名称'" @iconClick="onClick">
+								:placeholder="letfText=='订单号'? '订单编号':letfText=='司机'?'司机姓名,手机号码':letfText=='企业'?'企业名称,企业编号':'油站名称'"
+								@iconClick="onClick">
 							</uni-easyinput>
 						</view>
 					</view>
@@ -29,7 +30,8 @@
 				<view v-for="(item,index) in listData" class="form_body">
 					<view @tap="jump(1,item)" class="form_body_item">
 						<view class="form_body_item_top">
-							<view :style="{backgroundColor:item.payAccountType==0?'#FD9500':'#2866FF' }" class="form_body_item_top_label">{{item.payAccountType==0?'个人':'企业'}}</view>
+							<view :style="{backgroundColor:item.payAccountType==0?'#FD9500':'#2866FF' }"
+								class="form_body_item_top_label">{{item.payAccountType==0?'个人':'企业'}}</view>
 							<view>{{item.orderSerialNumber}}</view>
 						</view>
 						<view style="padding: 0 25rpx; margin-top: 23rpx;">
@@ -39,7 +41,9 @@
 										<view>{{item.phone}}</view>
 										<view class="samll_txext" style="margin-left:23rpx;">{{item.userName}}</view>
 									</view>
-									<view style="color: ;" v-if="item.orderWfStatus==0&& String(item.siteName).indexOf('壳牌')!==-1">待核销</view>
+									<view style="color: ;"
+										v-if="item.orderWfStatus==0&& String(item.siteName).indexOf('壳牌')!==-1">待核销
+									</view>
 								</view>
 								<view style="margin-bottom:23rpx ; font-size: 26rpx;" class="text">
 									{{item.companyName?item.companyName:'暂无'}}
@@ -60,7 +64,8 @@
 						</view>
 						<view class="form_body_item_footer">
 							<view style="font-size: 22rpx;" class="samll_txext">{{item.createTime}}</view>
-							<view :style="{fontSize: '24rpx', color:option(item.orderStatus).color }">{{option(item.orderStatus).text}}</view>
+							<view :style="{fontSize: '24rpx', color:option(item.orderStatus).color }">
+								{{option(item.orderStatus).text}}</view>
 						</view>
 					</view>
 				</view>
@@ -78,12 +83,12 @@
 	export default {
 		data() {
 			return {
-				animation:null,
+				animation: null,
-				animationData:null,
+				animationData: null,
 				listData: [],
 				letfText: '订单号',
 				seleindex: 0,
-				candidate: ['企业', '司机','订单号','油站名称'],
+				candidate: ['企业', '司机', '订单号', '油站名称'],
 				ejectOpen: false,
 				seachValue: '',
 				navigation: [{
@@ -108,7 +113,7 @@
 						userName: '',
 						orderStatus: '',
 						orderWfStatus: '',
-						siteName:''
+						siteName: ''
 					}
 				},
 			}
@@ -120,63 +125,63 @@
 			this.rotateFn()
 		},
 		methods: {
-			jump(e,w){
+			jump(e, w) {
-				switch(e){
+				switch (e) {
 
 					case 1:
 						uni.navigateTo({
-						url:'../orderDetails/orderDetails?jsData=' + JSON.stringify(w)
+							url: '../orderDetails/orderDetails?jsData=' + JSON.stringify(w)
 						})
 						break;
 				}
 			},
-			scrolltolower(){
+			scrolltolower() {
 				this.getData.currentPage += 1
 				this.getlist()
 			},
-			option(e){
+			option(e) {
-				switch(e){
+				switch (e) {
 					case 0:
 						return {
-						text:'待支付',
+							text: '待支付',
-						color:'#EBC153'
+								color: '#EBC153'
 						}
 						break;
 					case 1:
 						return {
-						text:'已支付',
+							text: '已支付',
-						color:'#17A00E'
+								color: '#17A00E'
 						}
 						break;
 					case -1:
 						return {
-						text:'支付失败',
+							text: '支付失败',
-						color:'#EC4645'
+								color: '#EC4645'
 						}
 						break;
 					case 2:
 						return {
-						text:'已取消',
+							text: '已取消',
-						color:'#999999'
+								color: '#999999'
 						}
 						break;
 					case 3:
 						return {
-						text:'已退款',
+							text: '已退款',
-						color:'#999999'
+								color: '#999999'
 						}
 						break;
 					case 4:
 						return {
-						text:'退款中',
+							text: '退款中',
-						color:'#EBC153'
+								color: '#EBC153'
 						}
 						// return '退款中'
 						break;
 					case 5:
 						return {
-						text:'退款失败',
+							text: '退款失败',
-						color:'#EC4645'
+								color: '#EC4645'
 						}
 						// return '退款失败'
 						break;
@@ -248,22 +253,22 @@
 							this.navigation[0].text = '全部'
 							break
 					}
-					if(this.getData.params.orderWfStatus === 0){
+					if (this.getData.params.orderWfStatus === 0) {
 						this.getData.params.orderWfStatus = ''
 						this.getData.params.orderStatus = ''
 						this.navigation[0].text = '全部'
 					}
 				}
-				if(e.index==1){
+				if (e.index == 1) {
 					this.getData.params.orderStatus = ''
 					this.getData.params.orderWfStatus = 0
 				}
-				if(e.index == -1){
+				if (e.index == -1) {
 					this.getData.params.orderWfStatus = null
 					this.getData.params.orderStatus = 3
 				}
 				this.rotateFn()
-				console.log(this.getData.params,this.navigation[0].text )
+				console.log(this.getData.params, this.navigation[0].text)
 				this.getlist()
 			},
 			onClick() {
@@ -272,30 +277,29 @@
 			},
 			seachFn() {
 				console.log(this.seachValue)
-				this.getData.params.userName= ''
+				this.getData.params.userName = ''
-				this.getData.params.id= ''
+				this.getData.params.id = ''
-				this.getData.params.companyName= ''
+				this.getData.params.companyName = ''
-				this.getData.params.siteName= ''
+				this.getData.params.siteName = ''
-				if(this.letfText=='企业'){
+				if (this.letfText == '企业') {
-					this.getData.params.companyName= this.seachValue
+					this.getData.params.companyName = this.seachValue
-					console.log('现在是企业 companyName',this.letfText,)
+					console.log('现在是企业 companyName', this.letfText, )
-				}else if(this.letfText=='订单号') {
+				} else if (this.letfText == '订单号') {
-					this.getData.params.id= this.seachValue
+					this.getData.params.id = this.seachValue
-					console.log('现在是订单 id',this.letfText,this.getData.params.id,this.getData.params)
+					console.log('现在是订单 id', this.letfText, this.getData.params.id, this.getData.params)
-				}else if(this.letfText=='司机'){
+				} else if (this.letfText == '司机') {
-					this.getData.params.userName= this.seachValue
+					this.getData.params.userName = this.seachValue
-					console.log('现在是司机 userName',this.letfText,)
+					console.log('现在是司机 userName', this.letfText, )
-				}else
+				} else {
-				{
+					this.getData.params.siteName = this.seachValue
-					this.getData.params.siteName= this.seachValue
+					console.log('现在是其他 siteName', this.letfText, )
-					console.log('现在是其他 siteName',this.letfText,)
 				}
 				this.getData.currentPage = 1
 				this.getlist()
 			},
 			ejectFn(e) {
 				this.letfText = e
-				if(this.letfText=='企业'){
+				if (this.letfText == '企业') {
 
 				}
 				console.log(e)
@@ -306,6 +310,7 @@
 
 <style>
 	@import url("./index.css");
+
 	.icoon :active {
 		color: #007AFF;
 	}
@@ -344,7 +349,8 @@
 		justify-content: space-between;
 		align-items: baseline;
 	}
-	.bgtext{
+
+	.bgtext {
 
 
 		font-size: 28rpx;
@@ -353,19 +359,22 @@
 		color: #333333;
 
 	}
+
 	.item_price {
 		font-size: 24rpx;
 		font-family: PingFang SC;
 		font-weight: 500;
 		color: #333333;
 	}
-	.text{
+
+	.text {
 
 		font-size: 26rpx;
 		font-family: PingFang SC;
 		font-weight: 500;
 		color: #333333;
 	}
+
 	.samll_txext {
 		font-size: 24rpx;
 		font-family: PingFang SC;
@@ -414,6 +423,7 @@
 	page {
 		background-color: #F0F2FF;
 	}
+
 	.form_body_item {
 		min-height: 339rpx;
 		background: #FFFFFF;