From 49fc0e553108c761bca51b9c731089f336c6c69a Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Thu, 7 Sep 2023 09:40:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                   |  26 ---
 BagMoney/components/oil-card/oil-card.vue | 204 +++++++++++++++-------
 BagSetup/setup/setup.vue                  |  38 ++--
 BagStation/pages/oilQRcode/index.vue      |  62 +++++++
 pages.json                                |   8 +-
 pages/tabbar/user/user.vue                |  26 ++-
 static/img/back.png                       | Bin 0 -> 621 bytes
 static/img/erweima-grey.png               | Bin 0 -> 791 bytes
 static/img/erweima-white.png              | Bin 0 -> 573 bytes
 9 files changed, 253 insertions(+), 111 deletions(-)
 create mode 100644 BagStation/pages/oilQRcode/index.vue
 create mode 100644 static/img/back.png
 create mode 100644 static/img/erweima-grey.png
 create mode 100644 static/img/erweima-white.png

diff --git a/App.vue b/App.vue
index 9ed7e68..c04481a 100644
--- a/App.vue
+++ b/App.vue
@@ -38,10 +38,6 @@
 			})
 			this.onShareAppMessage(option.query.scene);
 			
-		},
-		onLoad(e) {
-			console.log(e,'666666666666666666666666666666')
-			
 		},
 		methods: {
 		
@@ -131,28 +127,9 @@
 		onShow: function(option) {
 			const token = uni.getStorageSync('Authorization')
 			const openid = uni.getStorageSync('openid')
-			let key = ''
 			if (token && openid) {
 				this.getAmount()
-				key = '真在线'
-			} else {
-				key = '离线'
-			}
-			if (key == '在线') {
-
 			}
-			setTimeout(() => {
-				console.log(key)
-				if (key == '在线') {
-
-				} else {
-					// uni.redirectTo({
-					// 	url: '/BagAuth/pages/login/login'
-					// })
-				}
-			}, 2000)
-			// uni.showShareMenu()
-			// console.log('App Show')
 			uni.getLocation({
 				type: 'wgs84',
 				success: function(res) {
@@ -163,9 +140,6 @@
 				}
 			});
 		},
-		onHide: function() {
-			// console.log('App Hide')
-		}
 	}
 </script>
 <style lang="scss">
diff --git a/BagMoney/components/oil-card/oil-card.vue b/BagMoney/components/oil-card/oil-card.vue
index 1211fd9..be63dda 100644
--- a/BagMoney/components/oil-card/oil-card.vue
+++ b/BagMoney/components/oil-card/oil-card.vue
@@ -1,5 +1,5 @@
 <template>
-	<view >
+	<view>
 		<view class="bg-img boxsingForCard  flex align-center swi-bg"
 			:style="'background-image: url('+imgURL+ (card.oilCardType==2?'card-zs.png':'card-other.png')+');'">
 			<view class="padding-xl text-white">
@@ -13,8 +13,10 @@
 					<text v-show="card.oilCardType==1">
 						个人油卡
 					</text>
-					<text style="margin-left: 15rpx;padding: 10rpx 15rpx;border-radius: 15rpx;color: #FF6700;background-color: #FFFFFF;font-size: 20rpx;">{{card.companyType|companyType}}</text>
-					<text v-show="card.plateNumberCompany" style="margin-left: 15rpx;padding: 10rpx 15rpx;border-radius: 15rpx;color: #FF6700;background-color: #FFFFFF;font-size: 20rpx;">{{card.plateNumberCompany?card.plateNumberCompany:''}}</text>
+					<text
+						style="margin-left: 15rpx;padding: 10rpx 15rpx;border-radius: 15rpx;color: #FF6700;background-color: #FFFFFF;font-size: 20rpx;">{{card.companyType|companyType}}</text>
+					<text v-show="card.plateNumberCompany"
+						style="margin-left: 15rpx;padding: 10rpx 15rpx;border-radius: 15rpx;color: #FF6700;background-color: #FFFFFF;font-size: 20rpx;">{{card.plateNumberCompany?card.plateNumberCompany:''}}</text>
 				</view>
 				<view class="padding-xs padding-top-lg padding-bottom text-xxl">
 					{{card.accountCardCode|cardNoFormat}}
@@ -22,18 +24,32 @@
 				<view class="padding-xs" v-if="card.companyId">
 					{{card.companyName}}
 				</view>
-				
+
 				<view class="padding-xs text-lg">
 					<text class="text-df">账户余额:</text>
 					<text class="text-xl text-bold padding-left-xs" v-if="card.shareCompanyQuota==1">
-						共享余额  
+						共享余额
 					</text>
 					<text class="text-xl text-bold padding-left-xs" v-else>
 						{{card.balance|moneyFormat}} 元
 					</text>
 				</view>
-				<view class="inCard" v-if="card.oilCardType==3" @tap='gotocard'>
-					 <text>转卡</text>
+
+				<view v-show="!isTransfer" class="card-container first">
+					<view class="inCard" v-if="card.oilCardType==3" @tap="transfer">
+						<text>转卡</text>
+					</view>
+				</view>
+
+				<view v-show="isTransfer" :class="isTransfer?'active':''" class="card-container second">
+					<view class="inCard" @click="sweepCard">
+						<text>扫码</text>
+					</view>
+					<view class="inCard phone" @tap='gotocard'>
+						<text>手机号码</text>
+					</view>
+					<view class="back" @click="transfer">
+					</view>
 				</view>
 			</view>
 		</view>
@@ -42,48 +58,22 @@
 
 <script>
 	export default {
-		props: {
-			card: {
-				type: Object,
-				default () {}
-			}
-		},
-		data() {
-			return {
-				imgURL: this.global.imgURL,
-			}
-		},
-		methods: {
-			gotocard(){
-				if(this.card.oilCardType==3&&this.card.shareCompanyQuota==0){
-									let card = JSON.stringify(this.card)
-									uni.redirectTo({
-										 url:'../../pages/oilCards/oliout?card='+card
-									})
-								}else{
-										uni.showToast({
-											title: '当前油卡为共享企业余额，不能进行此操作！',
-											icon: "none"
-										})
-								}
-			}
-		},
-		filters:{
-			companyType(e){
-				if(e) e=Number(e)
-				switch(e){
+		filters: {
+			companyType(e) {
+				if (e) e = Number(e)
+				switch (e) {
 					case 0:
-					return '柴油账户'
-					break;
+						return '柴油账户'
+						break;
 					case 1:
-					return '汽油账户'
-					break;
+						return '汽油账户'
+						break;
 					case 2:
-					return 'LNG账户'
-					break;
+						return 'LNG账户'
+						break;
 					case 3:
-					return '尿素'
-					break;
+						return '尿素'
+						break;
 				}
 			},
 			moneyFormat(value) {
@@ -95,38 +85,126 @@
 			},
 			cardNoFormat(value) {
 				if (value) {
-					return value.replace(/(.{4})/g,'$1 ')
+					return value.replace(/(.{4})/g, '$1 ')
 				}
 			}
-		}
+		},
+		props: {
+			card: {
+				type: Object,
+				default () {}
+			}
+		},
+		data() {
+			return {
+				imgURL: this.global.imgURL,
+				isTransfer: false
+			}
+		},
+		methods: {
+			transfer() {
+				this.isTransfer = !this.isTransfer
+			},
+			sweepCard() {
+				uni.scanCode({
+					success: res => {
+						console.log(res)
+						let {} = res.result
+					}
+				})
+			},
+			gotocard() {
+				if (this.card.oilCardType == 3 && this.card.shareCompanyQuota == 0) {
+					let card = JSON.stringify(this.card)
+					uni.redirectTo({
+						url: '../../pages/oilCards/oliout?card=' + card
+					})
+				} else {
+					uni.showToast({
+						title: '当前油卡为共享企业余额，不能进行此操作！',
+						icon: "none"
+					})
+				}
+			}
+		},
+
 	}
 </script>
 
-<style scoped>
-	.boxsingForCard{
+<style lang="scss" scoped>
+	.boxsingForCard {
 		position: relative;
 	}
-	.inCard{
-		  position: absolute;
-		  right: 11%;
-		  bottom: 17%;
-		  width: 140rpx;
-		  height: 55rpx;
-		  background-color: #FFFFFF;
-		  border-radius: 20rpx;
-		  color: red; 
-		  display: flex;
-		  justify-content: center;
-		  align-items: center;
+
+	.card-container {
+		position: absolute;
+		bottom: 13%;
+
+		&.first {
+			right: 11%;
+		}
+
+		&.second {
+			right: 9%;
+			padding-right: 65rpx;
+		}
+
+		&.active {
+			animation: slide-in-right .6s cubic-bezier(0.250, 0.460, 0.450, 0.940) both;
+		}
+
+		.back {
+			position: absolute;
+			right: 0;
+			bottom: 4rpx;
+			width: 48rpx;
+			height: 48rpx;
+			background: url(../../../static/img/back.png) 100%/100% no-repeat;
+		}
+	}
+
+	.inCard {
+		width: 140rpx;
+		height: 55rpx;
+		background-color: #FFF;
+		border-radius: 20rpx;
+		color: red;
+		text-align: center;
+		line-height: 55rpx;
+
+		&.phone {
+			margin-top: 20rpx;
+		}
 	}
+
+
+
 	.bg-img {
 		background-position: inherit;
 		background-size: cover;
 	}
-	.hidden-2{
+
+	.hidden-2 {
 		opacity: 0;
 	}
-	.swi-bg{
+
+	.swi-bg {
 		background-size: 770rpx;
 	}
+
+
+
+	@keyframes slide-in-right {
+		0% {
+			-webkit-transform: translateX(30rpx);
+			transform: translateX(30rpx);
+			opacity: 0;
+		}
+
+		100% {
+			-webkit-transform: translateX(0);
+			transform: translateX(0);
+			opacity: 1;
+		}
+	}
 </style>
diff --git a/BagSetup/setup/setup.vue b/BagSetup/setup/setup.vue
index ded31b0..2873340 100644
--- a/BagSetup/setup/setup.vue
+++ b/BagSetup/setup/setup.vue
@@ -23,14 +23,6 @@
 			</view>
 		</view>
 		<view class="cu-list menu ">
-			<!-- <view class="cu-item arrow">
-				<view class="content">
-					微信账号
-				</view>
-				<view class="value">
-					{{userInfo.userWeChatAccount ?'已':'未'}}绑定
-				</view>
-			</view> -->
 			<view class="cu-item arrow" @tap="resMsg">
 				<view class="content">
 					订单状态通知
@@ -39,14 +31,6 @@
 					订阅
 				</view>
 			</view>
-			<!-- <view class="cu-item arrow">
-				<view class="content">
-					支付宝账号
-				</view>
-				<view class="value">
-					{{userInfo.userAliPayAccount?'已':'未'}}绑定
-				</view>
-			</view> -->
 		</view>
 		<view class="cu-list menu ">
 			<view class="cu-item arrow">
@@ -65,6 +49,14 @@
 					{{userInfo.userPayPwdState?'已':'未'}}设置
 				</view>
 			</view>
+			<view class="cu-item arrow" @tap="jumpQRcode">
+				<view class="content">
+					收油码
+				</view>
+				<view class="value">
+					<image class="qrcode" src="../../static/img/erweima-grey.png"></image>
+				</view>
+			</view>
 		</view>
 		<view class="cu-list menu ">
 			<view class="cu-item arrow">
@@ -103,12 +95,17 @@
 				userInfo: {
 
 				}
-			}
+			} 
 		},
 		onShow() {
 			this.getUserInfo()
 		},
 		methods: {
+			jumpQRcode() {
+				uni.navigateTo({ 
+					url:'/BagStation/pages/oilQRcode/index'
+				})
+			},
 			resMsg() {
 				wx.requestSubscribeMessage({
 					tmplIds: ['ZXdtqtVmzbJY0_A2Va6MBHDrRIKN99o5lSg8fU7f77c'],
@@ -162,4 +159,11 @@
 	.value {
 		color: #777;
 	}
+
+	.qrcode {
+		position: relative;
+		top: 4rpx;
+		width: 42rpx;
+		height: 42rpx;
+	}
 </style>
diff --git a/BagStation/pages/oilQRcode/index.vue b/BagStation/pages/oilQRcode/index.vue
new file mode 100644
index 0000000..54f2905
--- /dev/null
+++ b/BagStation/pages/oilQRcode/index.vue
@@ -0,0 +1,62 @@
+<template>
+	<view>
+		<cu-custom class="main-totextbar bg-main-oil" :isBack="true" bgColor="bg-main-oil">
+			<block slot="backText">返回</block>
+		</cu-custom>
+		<view class="oil-qrcode">
+			<view class="info">
+				<view>肖师傅</view>
+				<view>13216655221</view>
+				<image></image>
+			</view>
+			<tki-qrcode ref="qrcode" cid="2" :val="qrcodeText" :size="400" onval  showLoading loadMake />
+		</view>
+	</view>
+</template>
+
+<script>
+	import tkiQrcode from '@/BagStation/pages/components/tki-qrcode/tki-qrcode.vue'
+	export default {
+		components: {
+			tkiQrcode
+		},
+		data() {
+			return {
+				qrcodeText:'13216655221'
+			}
+		}
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	.oil-qrcode {
+		height: 100vh;
+		padding-top: 200rpx;
+		text-align: center;
+
+		.info {
+			position: relative;
+			display: inline-block;
+			text-align: left;
+			width: 400rpx;
+			padding: 20rpx 20rpx 20rpx 100rpx;
+
+			view {
+				&:nth-of-type(1) {}
+
+				&:nth-of-type(2) {
+					margin-top: 15rpx;
+				}
+			}
+
+			image {
+				position: absolute;
+				left: 0;
+				top: 0;
+				width: 50rpx;
+				height: 50rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages.json b/pages.json
index 60f70d6..95c93ec 100644
--- a/pages.json
+++ b/pages.json
@@ -322,6 +322,13 @@
 						"enablePullDownRefresh": false
 					}
 
+				},
+				{
+					"path": "pages/oilQRcode/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
 				}
 			]
 		},
@@ -333,7 +340,6 @@
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": false
 					}
-
 				}
 
 			]
diff --git a/pages/tabbar/user/user.vue b/pages/tabbar/user/user.vue
index 6702f75..2e32550 100644
--- a/pages/tabbar/user/user.vue
+++ b/pages/tabbar/user/user.vue
@@ -26,6 +26,7 @@
 							</view>
 							<view class="action" @tap="onTapUserInfo">
 								<text class="cuIcon-right text-lg"></text>
+								<image class="qrcode" src="../../../static/img/erweima-white.png"></image>
 							</view>
 						</view>
 					</view>
@@ -40,7 +41,10 @@
 						<!-- <text class="icon-company cuIcon-crownfill padding-right-xs"></text> -->
 						<!-- <my-icon iconName="wd-qy-hy.png" class="padding-right-xs"></my-icon> -->
 						<text class="icon-company text-xs">{{companyCard.name}}</text>
-						<view :class="company_tag===1?'company_tag company_tag_SelfOperated':'company_tag company_tag_externalOperated'">{{companyCard.companyNature===1?'自营':'外请'}}</view>
+						<view
+							:class="company_tag===1?'company_tag company_tag_SelfOperated':'company_tag company_tag_externalOperated'">
+							{{companyCard.companyNature===1?'自营':'外请'}}
+						</view>
 					</view>
 
 				</view>
@@ -128,7 +132,8 @@
 				</view>
 			</view>
 		</view>
-		<SwitchEnterprises @submit='upadteCompanyCard' @logout='logout' :is-show.sync="isSwitchEnterprises"></SwitchEnterprises>
+		<SwitchEnterprises @submit='upadteCompanyCard' @logout='logout' :is-show.sync="isSwitchEnterprises">
+		</SwitchEnterprises>
 	</view>
 
 </template>
@@ -167,7 +172,7 @@
 			this.upadteCompanyCard()
 		},
 		methods: {
-			logout(){
+			logout() {
 				this.isSwitchEnterprises = false
 			},
 			upadteCompanyCard() {
@@ -305,6 +310,19 @@
 </script>
 
 <style scoped>
+	.action {
+		position: relative;
+	}
+
+	.qrcode {
+		position: absolute;
+		left: -3rpx;
+		top: 50%;
+		transform: translateY(-50%);
+		width: 34rpx;
+		height: 34rpx;
+	}
+
 	.company_tag_externalOperated {
 		background: #FDDBDB;
 		color: #FE0505;
@@ -424,4 +442,4 @@
 	.cu-avatar {
 		background-color: transparent !important;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/static/img/back.png b/static/img/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9f71515c27d72305bdff8a25967bcb18e84768a
GIT binary patch
literal 621
zcmV-z0+RiSP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px%CrLy>RA@u(ne9!(Kn#ZMP3R=hNuZO^PC}W4G6~(p=&df&>0;kkn$#zVgz|&t
z?tSd@M;xZXFCJV!{Y?N7c_E@#BEo&o%-2VGve^Sc{8uFS!p!?202J}iJqCaw9soE(
z7uO!}Djr5F#(-z>MF8*Ovj8KAHvvWwuL6k36A}Ham{q2thdZ*@_mV6&3t|!ZAfmSw
z0kow7b7tmK>%JNQ!~^0H7eG$Te6HPG1HchNtAKlY-J|Ex)=l?0)_Oy&10fDHi0XxN
z77Xj75q!=ZR~)HB$rENFTN`2$7WP4BdsM_0A+nWtD+mbh-K(aRuwvpa$0@dYfItGl
z@tQ8g-N8z=MSvyNDV<;K|Ar^bmc0s~00HY%r@a~|qnN5~do@4?;>ygs8euKJQ3|T+
zg(d(4qL?XKgeTc4ZfR6QH3LKtNPSdWa5^DSi{gNu9iuLQ9x*-7h)CMj%)IR#0M^e=
zK)eH_t^F*JT?2%8lenm*8P7F<QV+)RfbwcPTo4bRh0;1OYg^pLfYuK&^GvU2fYkbG
z%i<Eim`g41Mtj<U)@O`X+H4qIdBAuhgAI1pS0Fb4z2nS>0|cwT8{?JY+ur5?K`@#$
z%!JTw#{GUAGF3x^+*}9?V?t0fNo$SO-0!nfi1fi60AA;|7LVc9XUk{X96(w~?rG(C
zt=nX}Rrs_(X|%Y;5rW|9Z_&4b+dKJMX5DJte}JtlZSC_5g4zo}<KF{300000NkvXX
Hu0mjfP)Qf8

literal 0
HcmV?d00001

diff --git a/static/img/erweima-grey.png b/static/img/erweima-grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..100dd9ab18414b1c265b4813d13b92f757c7b73b
GIT binary patch
literal 791
zcmV+y1L*vTP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px%(Md!>RA@u(S<7|XFc8GDk;s);t|W330&lTzgqnz4iIqx1H$vnMgXLRM0I~2B
z^?TGs2Y`$Hac2f3bLT(0bN|f}z_ly**cGVjdewE^Ph^>hR+?;k@7t=XKANU!WBa$;
z?Juo8BKl*DIizg$c2Z8&b-ni9e`=hL>}iSUy=j`gT(j1~-n!5xY`r#3bBH~c3_u*#
zdhhpDRej|S?z-*=5p9eys1^=>;p|y!e;Z@4rm{D-<(zv`2OzUgL{C#C92-U3h03i$
z=K3mFYyTp!5L7gq30rs$EsSKGJQuA%UDq4$Ju-H1&b{O^KVC<l6VaRZ{%yD0y@voi
z{+)A0gM&NassV(mAd_vX6;erB0yswtEfp|ky}Sb@lW07JmKIuCsHA`Xqi#<d7|3J`
zNqV6%n?vvv5)VYK1p3(_Yi*CZ@>#*H_RhIirSr_6k_fIMbD$KU$(ln!A;P{R8Y1Wk
zmNm8p`Yt)u*oP@PJ&-bu<D)%M3LJufzR*(Yp1CrgQnOLsh~C9vptjl|K)c5}AjUFt
z_OuMRh#BS%y~g@u2f&(`h}1m`9h+;Rb5?3jO+3iSoWn?zw&&GThyg@sSlkdy{<^Mv
z7Ml2E-UomKvm6A!kgrE#C*TIl(xe2<Ny=ggm~tq{%3c>6V}{_E_({1bkQ-o#8;PUa
z4VlGU0BY2fMj466`ZtEgcNGBRip=O;1rU3IVgX<uP#XX`g~C1GiWwEW<*Y4K5<qTX
z@cKmq2-)6@rVuz6UhZ$*L0vQeF`BcL<zRF7NH-Ax-&o6j7n<Ux#^?zSi1%#(vRlT1
zivbx+%Hq3BnY{>*T`T~e3`X8C=SEv_9y%86_2fn6nJ=}n2>56U2`)5A3X^P90!+^F
zsMIU?t}qK5g;OC2WK*pN!q=SSH?r>}W9pg5R%GYS)*SYh3e1t!5}Qi}O0qS_-hb(2
VSza?Cwub-!002ovPDHLkV1j>CXkY*U

literal 0
HcmV?d00001

diff --git a/static/img/erweima-white.png b/static/img/erweima-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..10436e677a39603d547d3736bea64639f29b8bbf
GIT binary patch
literal 573
zcmV-D0>b@?P)<h;3K|Lk000e1NJLTq001HY001Hg1^@s6I!6n_00001b5ch_0Itp)
z=>Px$_en%SR9HvtmyK-#F${(6NeYt`CTW?ZFiGhog-J>$arH$`bQkgiC)8f0i-ZJR
z?7TS7@8wixGIS<5Wd1<RY$YOmibGXTwP$9wxi{{rA`ak9L|!|`b`g=IsvhDzGb3)_
zi93qOK~;%QqXgvLL6Gp=Nc!xHZmEt};nV-C#Zh6vo>X<$17g0@(ZmuUGh^WkNzE*5
zKvkQ(^Qtj#eG8ENu;dLc<Um%cx@{dzJiZ)o>1e3P0wh(_%$ACbxHY$m(C1C|gWf?S
zYP2r`h(@3*Be5Fp)LWkJ>b7r8h=f-Yy67QLQPB8KJ2Pr=QTjtnPe(}jA|eD;J;N76
zs*&t4+#ZOnc@zLYN)`Jz?pqbf77se6S9bG?huq?#l(|XFdjR#^_q&k{urg$SZfM>i
z%n2Rnzu`#YRm@)k@>R0w9FP-}xv2wup-nV2Z*SarJ(wTbJ<nG&y<G`)rU!HeK+;^l
zlb{h{$A1Q-P&IrjRK$UyQHbT0&OEvzEc6ubGQ*2gkGPKpg0c=d!ZD@Y`z`K#D_JS$
zRF338g5=XRzfIO0NaDy8Aanu*>)k!!0~h9A`vxbU0wgZL+16g7Xk83(bY1YpIEuiF
z!f$TxS7H{9uOd_|!h1{gP0vB3m#bb^^q$Y(eS152^z)@6c}0H!l}ENRE?!d_00000
LNkvXXu0mjfXpsM5

literal 0
HcmV?d00001