From fbf5daf538ec779fb24ebffbb67af14d223ed19d Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Wed, 18 Oct 2023 14:28:05 +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

---
 BagStation/orderDetail/orderDetail.vue        |   2 +-
 BagStation/orderDetail/orderDetailUrea.vue    |   2 +-
 .../pages/SeparateProcess/payResult.vue       |   2 +-
 BagStation/pages/makeOrder/payResult.vue      |   2 +-
 BagStation/pages/oilQRcode/index.vue          |   4 +-
 BagStation/pages/stationDetail/stieQr.vue     |   6 +-
 .../ureaOrderDetail/ureaOrderDetail.vue       |   2 +-
 api/oil-site.js                               |  13 +-
 components/three-sites.vue                    | 160 +++++++-----------
 .../tki-qrcode/qrcode.js                      |   0
 .../tki-qrcode/tki-qrcode.vue                 |   1 -
 utils/request.js                              |   6 +-
 12 files changed, 87 insertions(+), 113 deletions(-)
 rename {BagStation/pages/components => components}/tki-qrcode/qrcode.js (100%)
 rename {BagStation/pages/components => components}/tki-qrcode/tki-qrcode.vue (99%)

diff --git a/BagStation/orderDetail/orderDetail.vue b/BagStation/orderDetail/orderDetail.vue
index 9625806..6049f7d 100644
--- a/BagStation/orderDetail/orderDetail.vue
+++ b/BagStation/orderDetail/orderDetail.vue
@@ -161,7 +161,7 @@
 
 <script>
 	import orderApi from '@/api/oil-order.js'
-	import tkiQrcode from "../pages/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
+	import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
 
 	import oilSiteApi from '@/api/oil-site.js'
 	export default {
diff --git a/BagStation/orderDetail/orderDetailUrea.vue b/BagStation/orderDetail/orderDetailUrea.vue
index 1429448..b6ea6ed 100644
--- a/BagStation/orderDetail/orderDetailUrea.vue
+++ b/BagStation/orderDetail/orderDetailUrea.vue
@@ -164,7 +164,7 @@
 
 <script>
 	import orderApi from '@/api/oil-order.js'
-	import tkiQrcode from "../pages/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
+	import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
 	import oilSiteApi from '@/api/oil-site.js'
 	import ureaFinanceApi from '../../api/urea_finance.js'
 	export default {
diff --git a/BagStation/pages/SeparateProcess/payResult.vue b/BagStation/pages/SeparateProcess/payResult.vue
index adbe6f2..e189997 100644
--- a/BagStation/pages/SeparateProcess/payResult.vue
+++ b/BagStation/pages/SeparateProcess/payResult.vue
@@ -135,7 +135,7 @@
 	import toilApi from '@/api/toil.js'
 	import ThirdPartyVoucher from '../components/third-party-voucher/third-party-voucher.vue'
 	import oilSiteApi from '@/api/oil-site.js'
-	import tkiQrcode from "../components/tki-qrcode/tki-qrcode.vue" //二维码生成器
+	import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
 	export default {
 		components: {
 			ThirdPartyVoucher,
diff --git a/BagStation/pages/makeOrder/payResult.vue b/BagStation/pages/makeOrder/payResult.vue
index 17b29f2..fc793a7 100644
--- a/BagStation/pages/makeOrder/payResult.vue
+++ b/BagStation/pages/makeOrder/payResult.vue
@@ -144,7 +144,7 @@
 	import toilApi from '@/api/toil.js'
 	import ThirdPartyVoucher from '../components/third-party-voucher/third-party-voucher.vue'
 	import oilSiteApi from '@/api/oil-site.js'
-	import tkiQrcode from "../components/tki-qrcode/tki-qrcode.vue" //二维码生成器
+	import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
 	export default {
 		components: {
 			ThirdPartyVoucher,
diff --git a/BagStation/pages/oilQRcode/index.vue b/BagStation/pages/oilQRcode/index.vue
index 4331b72..fd906a5 100644
--- a/BagStation/pages/oilQRcode/index.vue
+++ b/BagStation/pages/oilQRcode/index.vue
@@ -22,7 +22,7 @@
 
 <script>
 	import serve from '@/api/account.js'
-	import tkiQrcode from '@/BagStation/pages/components/tki-qrcode/tki-qrcode.vue'
+	import tkiQrcode from '@/components/tki-qrcode/tki-qrcode.vue'
 	export default {
 		components: {
 			tkiQrcode
@@ -39,14 +39,12 @@
 		computed: {
 			phoneHandle() {
 				let phone = this.user.userPhone
-				console.log('user',this.user)
 				if(!phone) return ''
 				return `${phone.substr(0,3)}****${phone.substr(-4)}`
 			}
 		},
 		methods: {
 			getQrStr(reset = 0) {
-				console.log('this.user', this.user)
 				if (this.user.id) {
 					serve.getQrStr(this.user.id, reset).then(res => {
 						if (!res.data) return
diff --git a/BagStation/pages/stationDetail/stieQr.vue b/BagStation/pages/stationDetail/stieQr.vue
index 6e5a2ca..c90ef11 100644
--- a/BagStation/pages/stationDetail/stieQr.vue
+++ b/BagStation/pages/stationDetail/stieQr.vue
@@ -172,7 +172,7 @@
 	import accountApi from '@/api/account.js'
 	import priceTab from '../components/price-tab.vue'
 	import threeSites from '@/components/three-sites.vue'
-	import tkiQrcode from "../components/tki-qrcode/tki-qrcode.vue" //二维码生成器
+	import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
 	export default {
 		components: {
 			priceTab,
@@ -215,10 +215,10 @@
 				if (this.activeChannelCode) {
 					if (this.secondChannelCode) {
 						this.posName = '壳牌'
-						return `../../../static/img/YDJY.png`
+						return `../../BagStation/static/img/YDJY.png`
 					} else {
 						this.posName = '星油云站'
-						return `../../../static/img/${this.activeChannelCode}.png`
+						return `../../BagStation/static/img/${this.activeChannelCode}.png`
 					}
 				}
 			},
diff --git a/BagStation/ureaOrderDetail/ureaOrderDetail.vue b/BagStation/ureaOrderDetail/ureaOrderDetail.vue
index 45b6958..5106bf3 100644
--- a/BagStation/ureaOrderDetail/ureaOrderDetail.vue
+++ b/BagStation/ureaOrderDetail/ureaOrderDetail.vue
@@ -127,7 +127,7 @@
 
 <script>
 	import orderApi from '@/api/oil-order.js'
-	import tkiQrcode from "../pages/components/tki-qrcode/tki-qrcode.vue" //二维码生成器 
+	import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue" //二维码生成器 
 	import oilSiteApi from '@/api/oil-site.js'
 	import ureaFinanceApi from '../../api/urea_finance.js'
 	export default {
diff --git a/api/oil-site.js b/api/oil-site.js
index b632a2d..b009c19 100644
--- a/api/oil-site.js
+++ b/api/oil-site.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'
 const service_name = "oil-site"
 const group_name = "oilSiteAppInfo"
 const order_name = 'oilSiteOrderInfo'
-export default { 
+export default {
 	getOrderDiscountInfo(data) {
 		return request({
 			url: `/${service_name}/${order_name}/getBOrderDiscountInfo`,
@@ -175,11 +175,18 @@ export default {
 			}
 		})
 	},
-//检测在线状态
+	//检测在线状态
 	isLoginSuccess() {
 		return request({
 			url: `/oil-identity/operationUser/isLoginSuccess`,
-			method: 'POST', 
+			method: 'POST',
+		})
+	},
+	getOilDriverQrCode(params) {
+		return request({
+			url: '/oil-site/qrCode/getOilDriverQrCode',
+			method:'post',
+			data:params
 		})
 	},
 }
diff --git a/components/three-sites.vue b/components/three-sites.vue
index 450c497..2e2e903 100644
--- a/components/three-sites.vue
+++ b/components/three-sites.vue
@@ -1,27 +1,19 @@
 <template>
-	<!-- 三个最近的油站弹窗 --> 
+	<!-- 三个最近的油站弹窗 -->
 	<view>
-		<view class="cu-modal" :class="showThreeSites?'show':''">
+		<view class="cu-modal" :class="showThreeSites?'show':''" @touchmove.stop>
 			<view class="cu-dialog">
 				<view class="cu-bar bg-white justify-end">
-					<view class="content">选择油站</view>
-					<view class="action" @tap="hideModal('sites')">
+					<!-- <view class="content">选择油站</view> -->
+					<view class="action" @tap="hideModal">
 						<text class="cuIcon-close text-red"></text>
 					</view>
 				</view>
-				<view class="padding-xl bg-white">
-					<view class="" v-if="siteList.length>0">
-						<three-item v-for="(item,index) in siteList" :key="item.id" :site-item="item" :first="index==0"
-							class="cu-list menu-avatar cu-item " @tap="toDetail(item)">
-						</three-item>
-					</view>
-					<view class="" v-else>
-						<my-empty></my-empty>
-					</view>
-					<view class="btn-box padding-top">
-						<button @tap="toSitePage" class="cu-tn bg-red round margin-bottom lg" color="#3982F6"
-							size="large">前往油站列表查找
-						</button>
+				<view class="bg-white pb30">
+					<tki-qrcode ref="qrcode" cid="2" :val="qrcodeText" :size="400" :isHaveBg="true" pdground="#000"
+						foreground="#000" background="#fff" onval showLoading loadMake />
+					<view class="text-center padding-top text-sm margin-bottom">
+						提示：该二维码每隔<text style="color: #ff0000;">3分钟</text>自动刷新一次
 					</view>
 				</view>
 			</view>
@@ -31,11 +23,13 @@
 </template>
 
 <script>
-	import oilSiteApi from '@/api/oil-site.js'
-	import threeItem from './three-item.vue'
+	import serve from '@/api/oil-site.js'
+	import accountApi from '@/api/account.js'
+
+	import tkiQrcode from '@/components/tki-qrcode/tki-qrcode.vue'
 	export default {
 		components: {
-			threeItem
+			tkiQrcode
 		},
 		props: {
 			showThreeSites: {
@@ -45,91 +39,63 @@
 		},
 		data() {
 			return {
-				siteList: [],
-				imgURL: this.global.baseURL,
+				qrcodeText: '',
+				user: uni.getStorageSync('user'),
+				timerInstance: null
 			}
 		},
-		created() {
-			this.getSiteList()
-		},
-		watch:{
-			showThreeSites:{
-				handler(newval){
-					if(newval==true){
-						this.getSiteList()
+
+		watch: {
+			showThreeSites: {
+				handler(newval) {
+					if (newval) { 
+						this.initQRCode()
 					}
-				}
+				},
+				immediate: true
 			}
 		},
 		methods: {
-			toSitePage(){
-				// uni.setStorageSync('activeCur','station')
-				uni.switchTab({
-				    url: '/pages/tabbar/station/stationList'
-				});
-			},
-			refreshLocation(){
-				uni.getLocation({
-				    type: 'wgs84',
-				    success: function (res) {
-						uni.setStorageSync('location',res)
-				    }
-				});
-			},
-			getSiteList() {
-				this.refreshLocation()
-				let data1 = {
-					currentPage: 1,
-					pageSize: 3,
-					params: { //类型：Object  必有字段  备注：// 筛选对象
-						sort: "juli", //类型：String  必有字段  备注：// 智能排序 ( price：价格最低 juli：距离最近 ) 默认距离排序
-						...uni.getStorageSync('location'),
-						...this.filterData
-						// siteBrand: "", //   备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
-						// channelCode: "", //   备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
-						// oilProductCode: "" //   备注：// 油号选择 ( 0# 92# 92#)
-					}
-			
+
+			async initQRCode() {
+				if (this.timerInstance) {
+					clearInterval(this.timerInstance)
+					this.timerInstance = null
 				}
-				// readOnlySites
-				oilSiteApi.getSiteList(data1).then(res => {
-					if (res.code == 20000) {
-						this.siteList = res.data.list
-					}
-				})
-			},
-			toDetail(item) {
-				let itemS = JSON.stringify(item)
-				console.log(itemS)
-				uni.navigateTo({
-					url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,
-					fail: (err) => {
-						// console.log(err)
-					},
-					success: () => {
-						// console.log('err')
-					}
-				})
-			},
-			callShipper() {
-				uni.makePhoneCall({
-					phoneNumber: this.waybillData.shippePhone
+
+				let accountResult = await accountApi.getUserAccount()
+				if (!accountResult.data.length) return
+
+				let params = {
+					companyId: accountResult.data[0].companyId,
+					orderSource: "WECHAT_MINIAPPS",
+					customerId: this.user.id,
+					channelCode: 'XOIL',
+					oilCardNature: accountResult.data[0].oilCardType, //油卡性质
+					accountCardCode: accountResult.data[0].accountCardCode //油卡卡号
+				}
+
+				serve.getOilDriverQrCode(params).then(res => {
+					if (!res.data) return
+					this.qrcodeText = res.data.codeStr
 				})
+
+
+				this.timerInstance = setInterval(() => {
+					serve.getOilDriverQrCode(params).then(res => {
+						if (!res.data) return
+						this.qrcodeText = res.data.codeStr
+					})
+				}, 1000 * 60 * 3)
 			},
-			hideModal(name) {
-				this.$emit('hideOneModal', name)
-			},
-			registerContracts() {
-				this.$emit('registerContracts')
-			},
-			toSetLocation() {
-				this.$emit('toSetLocation')
+			hideModal() {
+				clearInterval(this.timerInstance)
+				this.timerInstance = null
+				this.$refs.qrcode._clearCode()
+				this.$emit('hideOneModal')
 			},
-			toAuth() {
-				uni.navigateTo({
-					url: '认证路径'
-				})
-			}
+
+
 		}
 	}
 </script>
@@ -154,4 +120,8 @@
 		left: 0.2rem;
 		min-width: 100%;
 	}
+
+	.pb30 {
+		padding-bottom: 30rpx;
+	}
 </style>
diff --git a/BagStation/pages/components/tki-qrcode/qrcode.js b/components/tki-qrcode/qrcode.js
similarity index 100%
rename from BagStation/pages/components/tki-qrcode/qrcode.js
rename to components/tki-qrcode/qrcode.js
diff --git a/BagStation/pages/components/tki-qrcode/tki-qrcode.vue b/components/tki-qrcode/tki-qrcode.vue
similarity index 99%
rename from BagStation/pages/components/tki-qrcode/tki-qrcode.vue
rename to components/tki-qrcode/tki-qrcode.vue
index b8e5c5a..1cf3e23 100644
--- a/BagStation/pages/components/tki-qrcode/tki-qrcode.vue
+++ b/components/tki-qrcode/tki-qrcode.vue
@@ -91,7 +91,6 @@
 		},
 		methods: {
 			_makeCode() {
-
 				let that = this
 				if (!this._empty(this.val)) {
 					qrcode = new QRCode({
diff --git a/utils/request.js b/utils/request.js
index dd7714e..96a27f2 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -5,10 +5,10 @@ import utils from '@/utils/encode'
 // const env = 'test' 
 const env = 'production'
 // 45
-const testUrl = 'http://192.168.1.132:38080' 
-const productUrl = 'https://www.xingoil.com/adminapi'
+const testUrl = 'http://192.168.1.83:38080' 
+// const productUrl = 'https://www.xingoil.com/adminapi'
 
-// const productUrl = 'http://uat.xingoil.com/adminapi'
+const productUrl = 'http://uat.xingoil.com/adminapi'
 // const productUrl = 'http://192.168.0.191:38080'
 // const productUrl = 'http://121.196.213.68/adminapi'
 const service = axios.create({