更新

Reviewed-on: #11

packageOrders/pages/orderList/orderList.vue

@@ -4,6 +4,7 @@
 			<block slot="backText">返回</block>
 			<block slot="content">加油记录</block>
 		</cu-custom>
+
 		<view class="fixed-t">
 			<view class="flex bg-main-oil padding solid-bottom">
 				<!-- <view class="flex-sub">
@@ -24,7 +25,11 @@
 						v-for="(item,index) in tabList" :key="index" @tap="tabSelect" :data-id="index">{{item}}</view>
 				</view>
 			</scroll-view>
+			<view v-if="exportShow" style="margin-top: 16rpx;text-align: right;padding-right: 30rpx;">
+				<button class="cu-btn bg-white" style="border: 1px solid #ddd;" @click="orderExport">订单导出</button>
 			</view>
+		</view>
+		<view v-if="exportShow" style="padding: 24rpx;"></view>
 		<!-- 	<view class="placeholder-hidden">
 			<view class="flex bg-main-oil padding solid-bottom">
 				<view class="flex-sub">
@@ -46,12 +51,12 @@
 				</view>
 			</scroll-view>
 		</view> -->
-		<view v-if="exportShow">
-			<view style="padding: 30upx;"></view>
-		<view style="position: fixed;width: 750upx;z-index: 5;text-align: right;top:315upx;right: 30upx;">
-			<button  class="cu-btn bg-white" @click="orderExport">订单导出</button>
-		</view>
+		<!-- 	<view v-if="exportShow">
+			<view style="padding: 30rpx;"></view>
+			<view style="position: fixed;width: 750rpx;z-index: 5;text-align: right;top:315rpx;right: 30rpx;">
+				<button class="cu-btn bg-white" style="border: 1px solid #ddd;" @click="orderExport">订单导出</button>
 			</view>
+		</view> -->
 
 		<view class="padding　 padding-bottom-0" style="padding-top: 200upx;">
 			<!-- 0 全部  1 待支付  2 已支付 3退款 -->
@@ -120,7 +125,8 @@
 					<view class="popup_card_from_item">
 						<view class="popup_card_from_item_left_text" style="margin-top: 32rpx;">结束时间：</view>
 						<view class="uni-list-cell-db">
-							<uni-datetime-picker type="datetime" :value="endDate" @change="endDateChange" :start="endStartDate" :end="endEndDate" />
+							<uni-datetime-picker type="datetime" :value="endDate" @change="endDateChange"
+								:start="endStartDate" :end="endEndDate" />
 							<!-- 	<picker mode="date" :value="endDate" @change="endDateChange" :start="endStartDate" :end="endEndDate" class="uni-picker">
 								<view class="uni-input">{{endDate}}</view>
 							</picker> -->
@@ -225,7 +231,8 @@
 				'1689183774927818752',
 				'1689184331812888576',
 				'1689185023261741056',
-				'1782596400854310912'
+				'1782596400854310912',
+				'1661994395596533760'
 			]
 			var exportFields = exportList.filter((item) => {
 				return item == uni.getStorageSync('oilSitePriceId');
@@ -559,12 +566,15 @@
 		width: 750upx;
 		z-index: 3;
 	}
+
 	.uni-input {
 		height: 25rpx;
 	}
+
 	.uni-picker {
 		height: 25rpx;
 	}
+
 	.uni-list-cell-db {
 		width: 100%;
 		height: 30rpx;

pages/login/posLogin/posLogin.vue

@@ -10,7 +10,7 @@
 				<text class>油站工作人员绑定油站</text>
 			</view>
 		</view> -->
-		<view class="banner text-lg">
+		<view v-if="!isPad" class="banner text-lg">
 			欢迎使用星油云站
 		</view>
 		<view class="pannel">
@@ -140,6 +140,7 @@
 	export default {
 		data() {
 			return {
+				isPad:false,
 				titleText: "",
 				errMsg: '',
 				checkUser: false,
@@ -162,6 +163,12 @@
 		},
 		created() {
 			uni.showShareMenu()
+			uni.getSystemInfo({
+				success:(res) => {
+					// console.log('getSystemInfoSync',res)
+					this.isPad = res.deviceType === 'pad'
+				}
+			})
 		},
 		methods: {
 			checkAgree(val) {