From 679c43a03e31aee072c635c2169c67559323f91b Mon Sep 17 00:00:00 2001
From: xk_guohonglei <2057494155@qq.com>
Date: Wed, 28 Oct 2020 10:47:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/home.vue                           |  70 ++--
 pages/index/index.vue                         |  39 +--
 pages/login/posLogin/posLogin.vue             |   8 +
 pages/orderList/OrderDetail/OrderDetail.vue   |  54 +---
 pages/qrcode/QrCode_xy.vue                    |  11 +-
 .../station-info/scan-camera/scan-camera.vue  | 300 +++++++++++++-----
 static/img/backBar.png                        | Bin 0 -> 1128 bytes
 static/img/scanBar.png                        | Bin 0 -> 2318 bytes
 static/img/yellow-scanBar.png                 | Bin 0 -> 2704 bytes
 utils/request.js                              |   6 +-
 10 files changed, 300 insertions(+), 188 deletions(-)
 create mode 100644 static/img/backBar.png
 create mode 100644 static/img/scanBar.png
 create mode 100644 static/img/yellow-scanBar.png

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 5aa264a..1f94fbc 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -4,6 +4,7 @@
 			<block slot="content">{{site.oilSiteName?site.oilSiteName:'星油云站'}}</block>
 		</cu-custom>
 		<view class="main-money bg-main-oil">
+			
 			<view class="padding-xs flex align-center">
 				<view class="flex-sub text-center padding-top-lg">
 					<view class="txet-xxs">
@@ -98,14 +99,14 @@
 <script>
 	import cloudSiteApi from '@/api/cloud-site.js'
 	export default {
-		props:{
-			userAccount:{
-				type:Object,
-				default(){}
+		props: {
+			userAccount: {
+				type: Object,
+				default () {}
 			},
-			site:{
-				type:Object,
-				default(){}
+			site: {
+				type: Object,
+				default () {}
 			}
 		},
 		data() {
@@ -172,40 +173,33 @@
 			}
 		},
 		methods: {
-		
+
 			scanQr() {
-				var that = this
-				uni.scanCode({
-					onlyFromCamera: true,
-					success: function(res) {
-						console.log('条码类型：' + res.scanType);
-						console.log('条码内容：' + res.result);
-						uni.setStorageSync('qrCode', res.result)
-						uni.navigateTo({
-							url: that.scanUrl,
-							fail: (err) => {
-								console.log(err)
-							},
-							success: (res) => {
-								console.log('chengg', res)
-							}
-						})
+				var scanUrl 		
+				scanUrl = '/pages/station-info/scan-camera/scan-camera'
+				uni.navigateTo({
+					url: scanUrl,
+					fail: (err) => {
+						console.log(err)
+					},
+					success: (res) => {
+						console.log('chengg', res)
 					},
-					// 方便测试
-					// complete: () => {
-					// 	uni.setStorageSync('qrCode', 'XM&1309328197641433088')
-					// 	uni.navigateTo({
-					// 		url: that.scanUrl,
-					// 		fail: (err) => {
-					// 			console.log(err)
-					// 		},
-					// 		success: (res) => {
-					// 			console.log('chengg', res)
-					// 		}
-					// 	})
-					// }
-
 				})
+				// 方便测试
+				// complete: () => {
+				// 	uni.setStorageSync('qrCode', 'XM&1309328197641433088')
+				// 	uni.navigateTo({
+				// 		url: that.scanUrl,
+				// 		fail: (err) => {
+				// 			console.log(err)
+				// 		},
+				// 		success: (res) => {
+				// 			console.log('chengg', res)
+				// 		}
+				// 	})
+				// }
+
 			},
 			// 方便开发
 			// scanQr() {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 288eb3d..eaf07c6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -3,12 +3,6 @@
 	
 		<home v-if="PageCur=='home'||PageCur=='scan'" :user-account="userAccount" :site="site"></home>
 		<setup v-if="PageCur=='setup'"></setup>
-		<view class="action text-gray add-action" @tap="scanCode1" data-cur="scan">
-			<button class="cu-btn cuIcon-scan sl shadow" :class="PageCur=='scan'?'bg-main-oil':'bg-gradual-orange'"></button>
-			<text :class="PageCur=='scan'?'text-red':'text-gray'">
-				一键扫码
-			</text>
-		</view>
 		
 		<view class="bottom-view">
 
@@ -58,6 +52,7 @@
 			this.getUserInfo()
 		},
 		onShow() {
+			uni.preloadPage({url: "/pages/station-info/scan-camera/scan-camera"});
 			const token = uni.getStorageSync('Authorization')
 			const openid = uni.getStorageSync('device')
 			if (token && openid) {
@@ -83,11 +78,7 @@
 			}
 		},
 		methods: {
-			scanCode1(){
-				uni.navigateTo({
-					url:'/pages/station-info/scan-camera/scan-camera'
-				})
-			},
+			
 			getSiteInfo() {
 				cloudSiteApi.getSiteDetail().then(res => {
 					if (res.code === 20000) {
@@ -106,7 +97,6 @@
 					uni.stopPullDownRefresh();
 					if (res.code === 20000) {
 						this.userAccount = res.data
-
 					}
 				})
 
@@ -122,22 +112,15 @@
 				var scanUrl
 				this.userMenu.forEach((item, index) => {
 					if (item.name === '扫码加油') {
-						scanUrl = item.path
-						uni.scanCode({
-							onlyFromCamera: true,
-							success: function(res) {
-								console.log('条码类型：' + res.scanType);
-								console.log('条码内容：' + res.result);
-								uni.setStorageSync('qrCode', res.result)
-								uni.navigateTo({
-									url: scanUrl,
-									fail: (err) => {
-										console.log(err)
-									},
-									success: (res) => {
-										console.log('chengg', res)
-									}
-								})
+						// scanUrl = item.path
+						scanUrl = '/pages/station-info/scan-camera/scan-camera'
+						uni.navigateTo({
+							url: scanUrl,
+							fail: (err) => {
+								console.log(err)
+							},
+							success: (res) => {
+								console.log('chengg', res)
 							}
 						})
 
diff --git a/pages/login/posLogin/posLogin.vue b/pages/login/posLogin/posLogin.vue
index 9f8d21e..d36340a 100644
--- a/pages/login/posLogin/posLogin.vue
+++ b/pages/login/posLogin/posLogin.vue
@@ -36,7 +36,9 @@
 		<view class="margin-lg  padding-lg bottom-bg">
 			<button class="bg-main-oil round" v-if="showRandom" @tap="loginRandom">登录</button>
 			<button class="bg-main-oil round" v-else @tap="loginPwd">登录</button>
+
 		</view>
+		<official-account @binderror="bindload" @bindload="binderror"></official-account>
 		<view class="bottom-part">
 			<service-hotline />
 		</view>
@@ -66,6 +68,12 @@
 			uni.showShareMenu()
 		},
 		methods: {
+			bindload(){
+				console.log('组件夹杂')
+			},
+			binderror(){
+				console.log('组件夹杂失败')
+			},	
 			loginWeixin() {
 				uni.login({
 					provider: 'weixin',
diff --git a/pages/orderList/OrderDetail/OrderDetail.vue b/pages/orderList/OrderDetail/OrderDetail.vue
index 3deaea8..366d34a 100644
--- a/pages/orderList/OrderDetail/OrderDetail.vue
+++ b/pages/orderList/OrderDetail/OrderDetail.vue
@@ -104,12 +104,12 @@
 		</view>
 		<view class="padding-lg padding-top-0 padding-bottom-xl">
 			<button v-show="formQr" @tap="scanQr" class="bg-main-oil margin-bottom">
-					<text class="cuIcon-scan padding-right-xs"></text>
+				<text class="cuIcon-scan padding-right-xs"></text>
 				继续加油</button>
-			<button  class="bg-red light margin-bottom" @tap="backHome">
+			<button class="bg-red light margin-bottom" @tap="backHome">
 				<text class="cuIcon-home padding-right-xs"></text>
 				返回首页</button>
-			
+
 		</view>
 	</view>
 </template>
@@ -120,7 +120,7 @@
 			return {
 				// orderId:'',
 				orderId: uni.getStorageSync('orderId'),
-				formQr: uni.getStorageSync('formQr')?true:false,
+				formQr: uni.getStorageSync('formQr') ? true : false,
 				orderItem: {},
 				baseURL: this.global.baseURL
 			}
@@ -128,53 +128,31 @@
 		created() {
 			this.getOrderDetail()
 		},
-		onHide(){
+		onHide() {
 			this.clearStatus()
 		},
 		onUnload() {
 			this.clearStatus()
 		},
 		methods: {
-			clearStatus(){
+			clearStatus() {
 				uni.removeStorageSync('formQr')
 			},
 			scanQr() {
-				var that = this
-				uni.scanCode({
-					onlyFromCamera: true,
-					success: function(res) {
-						console.log('条码类型：' + res.scanType);
-						console.log('条码内容：' + res.result);
-						uni.setStorageSync('qrCode', res.result)
-						uni.navigateTo({
-							url: '/pages/stationDetail/stationDetail',
-							fail: (err) => {
-								console.log(err)
-							},
-							success: (res) => {
-								console.log('chengg', res)
-							}
-						})
+				scanUrl = '/pages/station-info/scan-camera/scan-camera'
+				uni.navigateTo({
+					url: scanUrl,
+					fail: (err) => {
+						console.log(err)
 					},
-					// 方便测试
-					// complete: () => {
-					// 	uni.setStorageSync('qrCode', 'XM&1309328197641433088')
-					// 	uni.navigateTo({
-					// 		url: that.scanUrl,
-					// 		fail: (err) => {
-					// 			console.log(err)
-					// 		},
-					// 		success: (res) => {
-					// 			console.log('chengg', res)
-					// 		}
-					// 	})
-					// }
-			
+					success: (res) => {
+						console.log('chengg', res)
+					}
 				})
 			},
-			backHome(){
+			backHome() {
 				uni.navigateBack({
-					delta:2
+					delta: 2
 				})
 			},
 			copyId(id, name) {
diff --git a/pages/qrcode/QrCode_xy.vue b/pages/qrcode/QrCode_xy.vue
index f216e32..b0347b6 100644
--- a/pages/qrcode/QrCode_xy.vue
+++ b/pages/qrcode/QrCode_xy.vue
@@ -15,13 +15,13 @@
 					 @result="qrR" />
 				</view>
 			</view>
-			<view @tap="refreashQr" class="text-center padding-bottom-xs padding-bottom-xs">
+			<view @tap="refreashQr" class="text-center padding-top padding-bottom-xs padding-bottom-xs">
 				<text class="color-999 font-12">
 					<text class="cuIcon-refresh padding-right-xs"></text>
 					<!-- 付款码自动 （25s） -->
-					付款码 
+					付款码
 					<text class="oil-main-color">
-						 刷新
+						刷新
 					</text>
 				</text>
 			</view>
@@ -93,7 +93,7 @@
 	// 引入二维码库  
 	import QR from "@/utils/wxqrcode.js" // 二维码生成器  
 	import cloudSiteApi from '@/api/cloud-site.js'
-	import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue"
+	import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
 
 	export default {
 		components: {
@@ -103,6 +103,7 @@
 		data() {
 			return {
 				oilList: [],
+				xkPrice:'',
 				modalName: 'mod',
 				oilSiteName: '',
 				qrImg: "https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1102530589,2787379918&fm=11&gp=0.jpg",
@@ -183,7 +184,7 @@
 				console.log('5555')
 			},
 			qrInit() {
-				this.qrImg = QR.createQrCodeImg('我是您粑粑', {
+				this.qrImg = QR.createQrCodeImg({
 					size: parseInt(300) //二维码大小  
 				})
 				console.log('this.qrImg', this.qrImg)
diff --git a/pages/station-info/scan-camera/scan-camera.vue b/pages/station-info/scan-camera/scan-camera.vue
index 0eb04d0..4a993b6 100644
--- a/pages/station-info/scan-camera/scan-camera.vue
+++ b/pages/station-info/scan-camera/scan-camera.vue
@@ -1,96 +1,240 @@
 <template>
-	<view>
-		<view class="scan-view">
-			<view class='scan-border'>
-				<camera class='scan-camera' mode="scanCode" binderror="cameraError" bindscancode='scancode' frame-size='large'>
-					<cover-image class='cover-corner cover-left-top' src='/images/left-top.png'></cover-image>
-					<cover-image class='cover-corner cover-right-top' src='/images/right-top.png'></cover-image>
-					<cover-image class='cover-corner cover-left-bottom' src='/images/left-bottom.png'></cover-image>
-					<cover-image class='cover-corner cover-right-bottom' src='/images/right-bottom.png'></cover-image>
-
-					<!-- <cover-view class='scan-animation' animation="{{animation}}"></cover-view> -->
-				</camera>
-				<!-- 这里可以处理其他内容 -->
-			</view>
-		</view>
+	<view class="page-content">
+		<cu-custom :isBack="true" class="main-topbar bg-main-oil" bgColor="bg-main-oil">
+			<block slot="content">扫描二维码</block>
+			<block slot="backText">返回</block>
+		</cu-custom>
+		<camera class='scan-camera' :flash="flashValue" mode="scanCode" binderror="cameraError" bindscancode='scancode'
+		 @scancode="scancode" frame-size='large'>
+			<cover-view class='scan-animation' :animation="animationData2"></cover-view>
+			<cover-view class="cover-aquare">
+				<cover-view class='cover-aquare-inner'></cover-view>
+				<cover-view class='cover-corner cover-left-top'>
+					<cover-view class="w-line"></cover-view>
+					<cover-view class="h-line"></cover-view>
+				</cover-view>
+				<cover-view class='cover-corner cover-right-top'>
+					<cover-view class="w-line w1-line"></cover-view>
+					<cover-view class="h-line h1-line"></cover-view>
+				</cover-view>
+				<cover-view class='cover-corner cover-left-bottom'>
+					<cover-view class="h-line"></cover-view>
+					<cover-view class="w-line"></cover-view>
+				</cover-view>
+				<cover-view class='cover-corner cover-right-bottom'>
+					<cover-view class="h-line  h3-line"></cover-view>
+					<cover-view class="w-line w3-line"></cover-view>
+				</cover-view>
+
+			</cover-view>
+
+			<cover-view class="flash text-center">
+				<cover-view @tap="touchFlash" class=" text-white lg" v-show="flashValue!='on'">
+					打开手电筒
+				</cover-view>
+				<cover-view @tap="touchFlash" class=" text-white lg" v-show="flashValue=='on'">
+					关闭手电筒
+				</cover-view>
+			</cover-view>
+
+
+		</camera>
 	</view>
 </template>
 
 <script>
+	let diSrc = 'http://downsc.chinaz.net/Files/DownLoad/sound1/201711/9360.mp3'
+	let innerAudioContext = wx.createInnerAudioContext()
+	innerAudioContext.src = diSrc
 	export default {
 		data() {
 			return {
-
+				once: false,
+				lightOn: false,
+				animationData2: {},
+				flashValue: 'auto'
 			}
 		},
+		onShow() {
+			this.donghua()
+			setInterval(() => {
+				this.donghua()
+			}, 6000);
+		},
+		// onShow() {
+		// 	this.donghua()
+
+		// },
 		methods: {
+			touchFlash() {
+				if (this.flashValue != 'on') {
+					this.flashValue = 'on'
+				} else if (this.flashValue == 'on') {
+					this.flashValue = 'off'
+				}
+			},
+			donghua() {
+				var animation2 = uni.createAnimation({
+					duration: 1000,
+					timingFunction: 'linear',
+				})
 
+				this.animation2 = animation2
+
+				animation2.translateY(235).step({
+					duration: 3000
+				})
+
+				this.animationData2 = animation2.export()
+
+				setTimeout(() => {
+					animation2.translateY(0).step({
+						duration: 3000
+					})
+					this.animationData2 = animation2.export()
+
+				}, 3000)
+			},
+			scancode(e) {
+				if (!this.once) {
+					var scanUrl = '/pages/stationDetail/stationDetail'
+					// uni.getStorageSync('scanUrl')
+					// 提示音
+					innerAudioContext.play()
+					console.log('play滴~')
+					// 校验扫描结果，并处理
+					let res = e.detail.result
+					console.log(res)
+					console.log(e)
+					uni.setStorageSync('qrCode', res)
+					this.once = true
+					uni.redirectTo({
+						url: scanUrl,
+						fail: (err) => {
+							console.log(err)
+						},
+						success: (res) => {
+							console.log('chengg', res)
+						}
+					})
+				}
+			}
 		}
 	}
 </script>
 
 <style scoped>
-.scan-view {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  background-color: #B9BEC4;
-  position: fixed;
-  align-items: center;
-  justify-content: space-around;
-}
- 
-.scan-border {
-  width: 94%;
-  height: 94%;
-  border: 6rpx solid #08FDFE;
-  border-radius: 10rpx;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
- 
-.scan-camera {
-  width: 500rpx;
-  height: 500rpx;
-  border-radius: 6rpx;
-  margin: 30rpx;
-}
- 
-.cover-corner {
-  width: 80rpx;
-  height: 80rpx;
-  position: absolute;
-}
- 
-.cover-left-top {
-  left: 0;
-  top: 0;
-}
- 
-.cover-right-top {
-  right: 0;
-  top: 0;
-}
- 
-.cover-left-bottom {
-  left: 0;
-  bottom: 0;
-}
- 
-.cover-right-bottom {
-  right: 0;
-  bottom: 0;
-}
- 
-.scan-animation {
-  position: absolute;
-  top: -10rpx;
-  left: 10rpx;
-  width: 480rpx;
-  height: 8rpx;
-  background-color: #08FDFE;
-  border-radius: 50%;
-}
+	.page-content {
+		overflow: hidden;
+	}
+
+	.scan-camera {
+		width: 750upx;
+		height: 92vh;
+		border-radius: 6rpx;
+	}
+
+	.cover-corner {
+		position: absolute;
+		z-index: 2;
+	}
+
+	.cover-left-top {
+		left: 0upx;
+		top: 0upx;
+
+	}
+
+	.cover-right-top {
+		right: 0;
+		top: 0;
+
+	}
+
+	.cover-left-bottom {
+		left: 0;
+		bottom: 0;
+
+	}
+
+	.cover-right-bottom {
+		right: 0;
+		bottom: 0;
+
+	}
+
+	.scan-animation {
+		position: absolute;
+		width: 480rpx;
+		height: 8rpx;
+		top: 200upx;
+		left: 135upx;
+		background-color: #FE0505;
+		border-radius: 50%;
+		box-shadow: 5upx 5upx 0 10upx #FE0505;
+	}
+
+	.cover-aquare-inner {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		border: 2upx solid #f1f3f7;
+	}
+
+	.cover-aquare {
+		position: absolute;
+		width: 500upx;
+		height: 500upx;
+		overflow: inherit;
+		top: 200upx;
+		left: 125upx;
+		/* border: 1px solid #FE0505; */
+	}
+
+	.h-line {
+		width: 10upx;
+		height: 20upx;
+		background-color: #FE0505;
+	}
+
+	.w-line {
+		width: 30upx;
+		height: 10upx;
+		background-color: #FE0505;
+	}
+
+	.h1-line {
+		width: 10upx;
+		float: right;
+		height: 20upx;
+	}
+
+	.w1-line {
+		width: 30upx;
+		height: 10upx;
+	}
+
+	.h3-line {
+		right: -21upx;
+		position: relative;
+		z-index: 4;
+	}
+
+	.flash {
+		position: absolute;
+		width: 750upx;
+		top: 800upx;
+		z-index: 4;
+	}
+
+	.cu-avatar {
+		text-align: center;
+		background: transparent;
+	}
+
+	.cu-avatar [class*="cuIcon-"] {
+		padding-left: 1.5rem;
+	}
 </style>
diff --git a/static/img/backBar.png b/static/img/backBar.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b04ced2fe28e11cf1d0f922ace4d3f5999f111f
GIT binary patch
literal 1128
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrVA1z<aSW-5dpp-LOC(Ul^?kHs
z(+UqYKG`Fk(gH_fTX<yC*|~PHrAxN2Iq2ge($2?X{($R<g2k!nX0k!Y*1fy`vM%8L
z-p4zB{3}2IGWzP&MYoRZzr-2w@}*=PM?ee{i$lXBP7(R}Y_y^ylpL~i{Vz>iQtSEt
z%$r=Zc!7kLjO@3aOTJGkV{4x?>!za`r$7SZS-~IS?(b&YJg+09aDaD`_JeqjTc(?f
zSx!tkkkBXkA>Do6jGKweE@n1Zp5^-yuVQ;T<p1W2f(}91Z#ORSH`n{oCjVv12f+tY
z|JXgt-B#J^{`tgo#{OsO!|7rSKc?4)f0APOab10P5fj7z``UAZfYkrfcZ`@A>OYpx
z5du<w?xj{SHthd%tTYQq{aP=U$;$9A>qq8$W`_OzbzY1O_xbJTG8~BKuhRm`+x;;C
zno#y3n1kWZ?Zf=~3?Iy!<)auL<n!6DVK{J~@6QCLE!X5cf5m*2-1l}N{|}c7GXLB?
zzq>Vg{AGB)?O}Ts!-MJv{GWUjKGZ&F&tQ1)`{4XN3<tiq+GjFGWpC!*yMB_K&dvwb
zd1>~4l284%_xaX1;o2=}PyNRC+V`ihT1@+rl=7!N?b}`RSyHS0BO9(yio3|LPsuN`
zVfUncp1b;4>V$m48g8Db;r_r}zxC4+RtF}QAF~;JAE+OCBK;t%MCHRog&qbIMkXGA
zb{qZ;s`5^z2Og9dRId(yS^hhxv;I!_kq;3!%0xJBGMF4Jd*J_TedAu`ODuamb?x*@
zm@lx*KIngu!DGWr7ELJz&OCibEyic&-9Nf^wDG@WacDAqkzN<7bD!^*i^old7~wAm
z{lDra<fP0>*vYd}x<M`CE{iJ5gF^)|Ek;ZVj*p@buI_&KtK*ctz*ddrLA(Y#)FQrY
z-f+0))SmPOOBg<1W)w=<CwQeeYQ?YQiHCDenK3MHKFxB9JK%3g1H)&n7dEmsrkmq!
zmrvI?u5h3sq@87XTA2WA-g!I02X0=nLT^%ju@<sKd@zhuI@r1-*4X;}&k|P)Hbys%
zUXOyLw06M*-`)u_PE)xWb$fD&N@o0}nM;z5f8UkPYk4f7z@&QIR;eL*hu}1~297B*
z-#Zxk9=b(HF)9TV-BD(;Xp>INWa)4?S=i6<Kq9YYso<c{@X|ifchLluD;{@&B?yD3
LtDnm{r-UW|&|}-M

literal 0
HcmV?d00001

diff --git a/static/img/scanBar.png b/static/img/scanBar.png
new file mode 100644
index 0000000000000000000000000000000000000000..187f252b09c3e4153d5ec5e3f7ad79cf80a3903f
GIT binary patch
literal 2318
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

literal 0
HcmV?d00001

diff --git a/static/img/yellow-scanBar.png b/static/img/yellow-scanBar.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0e5d5baf925c1504ab6eb191a8567843c429318
GIT binary patch
literal 2704
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
KMNUMnLSTY7uHGF0

literal 0
HcmV?d00001

diff --git a/utils/request.js b/utils/request.js
index 87fefb8..9143190 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -2,8 +2,12 @@ import axios from 'axios'
 import utils from '@/utils/encode'
 const service = axios.create({
 	// baseURL: 'http://192.168.0.104:48080', // 小杰
-	baseURL: 'http://a27389c632.qicp.vip',
+	// baseURL: 'http://a27389c632.qicp.vip',	// 生产
+	// baseURL: 'http://121.199.72.230:2333/oil',	// 生产,yds测试网关
+	 
 	// baseURL: 'http://192.168.0.112:48080', // 龙龙
+	baseURL: 'http://31g4904724.picp.vip', // 龙龙出差
+	// baseURL:'http://datou.wicp.vip',// 龙龙// 龙龙// 龙龙
 	// baseURL: 'https://www.51xingka.net/oilApp',
 	timeout: 5000
 })