Merge branch 'master' into xiaozy_积分

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>

pages/stationDetail/ZYSite.vue

@@ -821,7 +821,7 @@
 						});
 						this.shake = null
 					}
-				}, 500)
+				}, 3000)
 
 			},
 			//福佑