From 1dd0ab783def8491806534d1c05e2835c23d33ec Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Mon, 29 Jan 2024 10:04:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/stationDetail/ZYSite.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/stationDetail/ZYSite.vue b/pages/stationDetail/ZYSite.vue
index afcc596..7f8eda6 100644
--- a/pages/stationDetail/ZYSite.vue
+++ b/pages/stationDetail/ZYSite.vue
@@ -689,7 +689,7 @@
 						});
 						this.shake = null
 					}
-				}, 500)
+				}, 3000)
 
 			},
 			//福佑

From a5be993aba84fc73de60e40a5b4196db866fd471 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Fri, 22 Mar 2024 10:43:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageQr/components/OrderOil.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packageQr/components/OrderOil.vue b/packageQr/components/OrderOil.vue
index b345568..9ec34dc 100644
--- a/packageQr/components/OrderOil.vue
+++ b/packageQr/components/OrderOil.vue
@@ -12,7 +12,7 @@
 			<view class="padding-bottom-sm">
 				油号选择：
 			</view>
-			<view class="grid col-5 justify-start">
+			<view style="display:flex">
 				<view class="padding-xs" v-for="(item,index) in oilList" :key="index">
 					<button class="cu-btn" @tap="oilNameSel(item)" :class="[selected.otherOilsName===item.otherOilsName?'bg-main-oil':'line-gray']">{{item.otherOilsName}}</button>
 				</view>
@@ -30,7 +30,6 @@
 				油枪选择：
 			</view>
 			<view class="grid col-5 justify-start">
-
 				<view class="padding-xs" v-for="(item,index) in ColorList" :key="index">
 					<button @tap="gunIdSel(index)" class="cu-btn" :class="[gunId===index?'bg-main-oil':'line-gray']">{{index+1}}</button>
 				</view>