shish 3 лет назад
Родитель
Сommit
421c47ce07
2 измененных файлов с 216 добавлено и 28 удалено
  1. 108 15
      ghsApp/src/pagesArrears/details.vue
  2. 108 13
      ghsApp/src/pagesStorehouse/allot/inSelect.vue

+ 108 - 15
ghsApp/src/pagesArrears/details.vue

@@ -22,16 +22,22 @@
 		v-if="!$util.isEmpty(unClear)" @click="goClear(unClear)">
 			<text>已有一个待结账单 ¥{{unClear.actPrice?parseFloat(unClear.actPrice):0}}</text><text style="font-weight:bold;margin-left:15upx;">查看</text>
 		</view>
+		<view :class="device == 'ios' ? 'ios-bar-view':'android-bar-view'">
+			<template>
+				<view class="info-view">
+					<view class="details-select" @click="checkFn()" >
 
+						<button class="admin-button-com blue middle" v-if="isAllCheck">全不选</button>
+						<button class="admin-button-com blue middle" v-else>全选</button>
 
-		<view class="app-footer open_btn">
-			<button class="admin-button-com blue big" style="width:160upx;" @click="checkFn()" v-if="isAllCheck">全不选</button>
-			<button class="admin-button-com blue big" style="width:160upx;" @click="checkFn()" v-else>全选</button>
-			<text style="font-size:26upx;width:300upx;text-align:center;margin-right:20upx;">已选{{ selectList.length }}笔&nbsp;¥{{ parseFloat(selectTotalAmount) }}</text>
-			<button class="admin-button-com blue big" @click="createOrder">创建账单</button>
+					</view>
+					已选 <text class="price">{{ selectList.length }}</text> 笔 <text class="unit">¥</text> <text class="price">{{ parseFloat(selectTotalAmount) }}</text>
+				</view>
+			</template>
+			<view class="btn-view">
+				<button :class="['admin-button-com', 'blue']" @click="createOrder">创建账单</button>
+			</view>
 		</view>
-
-
 	</view>
 </view>
 </template>
@@ -289,17 +295,104 @@ export default {
 		flex: 1;
 		padding-bottom: 190upx;
 	}
-	.details-select {
-		margin-right: 20upx;
-		display: inline-block;
-		.iconweixuanzhong,
-		.iconxuanzhong {
-		font-size: 40upx !important;
+	.ios-bar-view {
+		bottom: 0;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 0 30upx;
+		width: 100%;
+		height: 100upx;
+		background: #fff;
+		box-shadow: 0upx -1upx 6upx 0upx rgba(4, 0, 0, 0.06);
+		.info-view {
+			display: flex;
+			align-items: center;
+			color: #333;
+			font-size: 24upx;
+			.iconfont {
+				font-size: 32upx;
+				color: #dddddd;
+			}
+			.price {
+				margin: 0 3upx;
+				color: $redColor;
+				font-size: 30upx;
+			}
+			.unit {
+				margin: 0 3upx;
+				color: $redColor;
+				font-size: 30upx;
+			}
 		}
-		.iconxuanzhong {
-		color: $mainColor !important;
+		.btn-view {
+			display: flex;
+			.admin-button-com {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin: 0 6upx;
+				width: 200upx;
+				height: 70upx;
+				font-size: 30upx;
+			}
+		}
+	}
+	.android-bar-view {
+		position: fixed;
+		bottom: 0;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 0 30upx;
+		width: 100%;
+		height: 100upx;
+		background: #fff;
+		box-shadow: 0upx -1upx 6upx 0upx rgba(4, 0, 0, 0.06);
+		.info-view {
+			display: flex;
+			align-items: center;
+			color: #333;
+			font-size: 24upx;
+			.iconfont {
+				font-size: 32upx;
+				color: #dddddd;
+			}
+			.price {
+				margin: 0 3upx;
+				color: $redColor;
+				font-size: 30upx;
+			}
+			.unit {
+				margin: 0 3upx;
+				color: $redColor;
+				font-size: 30upx;
+			}
+		}
+		.btn-view {
+			display: flex;
+			.admin-button-com {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin: 0 6upx;
+				width: 200upx;
+				height: 70upx;
+				font-size: 30upx;
+			}
 		}
 	}
+  .details-select {
+    margin-right: 20upx;
+    display: inline-block;
+    .iconweixuanzhong,
+    .iconxuanzhong {
+      font-size: 40upx !important;
+    }
+    .iconxuanzhong {
+      color: $mainColor !important;
+    }
+  }
 	.select-cmd_bx {
 		.num_bx {
 			margin-top:30upx;

+ 108 - 13
ghsApp/src/pagesStorehouse/allot/inSelect.vue

@@ -16,11 +16,19 @@
 				<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(inOrderList)" />
 			</block>
 		</view>
-		<view class="app-footer open_btn">
-			<button class="admin-button-com blue big" style="width:160upx;" @click="checkAll()" v-if="isAllCheck">全不选</button>
-			<button class="admin-button-com blue big" style="width:160upx;" @click="checkAll()" v-else>全选</button>
-			<text style="font-size:26upx;width:300upx;text-align:center;margin-right:20upx;">已选{{ selectList.length }}笔</text>
-			<button class="admin-button-com blue big" @click="confirmData">开始盘点</button>
+		<view :class="device == 'ios' ? 'ios-bar-view':'android-bar-view'">
+			<template>
+				<view class="info-view">
+					<view class="details-select" @click="checkAll()" >
+						<button class="admin-button-com blue middle" v-if="isAllCheck">全不选</button>
+						<button class="admin-button-com blue middle" v-else>全选</button>
+					</view>
+					已选 <text class="price">{{ selectList.length }}</text>笔
+				</view>
+			</template>
+			<view class="btn-view">
+				<button class="admin-button-com blue" @click="confirmData">开始盘点</button>
+			</view>
 		</view>
 	</view>
 </view>
@@ -203,17 +211,104 @@ export default {
 		flex: 1;
 		padding-bottom: 190upx;
 	}
-	.details-select {
-		margin-right: 20upx;
-		display: inline-block;
-		.iconweixuanzhong,
-		.iconxuanzhong {
-		font-size: 40upx !important;
+	.ios-bar-view {
+		bottom: 0;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 0 30upx;
+		width: 100%;
+		height: 100upx;
+		background: #fff;
+		box-shadow: 0upx -1upx 6upx 0upx rgba(4, 0, 0, 0.06);
+		.info-view {
+			display: flex;
+			align-items: center;
+			color: #333;
+			font-size: 24upx;
+			.iconfont {
+				font-size: 32upx;
+				color: #dddddd;
+			}
+			.price {
+				margin: 0 3upx;
+				color: $redColor;
+				font-size: 30upx;
+			}
+			.unit {
+				margin: 0 3upx;
+				color: $redColor;
+				font-size: 30upx;
+			}
+		}
+		.btn-view {
+			display: flex;
+			.admin-button-com {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin: 0 6upx;
+				width: 200upx;
+				height: 90upx;
+				font-size: 30upx;
+			}
 		}
-		.iconxuanzhong {
-		color: $mainColor !important;
+	}
+	.android-bar-view {
+		position: fixed;
+		bottom: 0;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 0 30upx;
+		width: 100%;
+		height: 100upx;
+		background: #fff;
+		box-shadow: 0upx -1upx 6upx 0upx rgba(4, 0, 0, 0.06);
+		.info-view {
+			display: flex;
+			align-items: center;
+			color: #333;
+			font-size: 24upx;
+			.iconfont {
+				font-size: 32upx;
+				color: #dddddd;
+			}
+			.price {
+				margin: 0 3upx;
+				color: $redColor;
+				font-size: 30upx;
+			}
+			.unit {
+				margin: 0 3upx;
+				color: $redColor;
+				font-size: 30upx;
+			}
+		}
+		.btn-view {
+			display: flex;
+			.admin-button-com {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin: 0 6upx;
+				width: 200upx;
+				height: 90upx;
+				font-size: 30upx;
+			}
 		}
 	}
+  .details-select {
+    margin-right: 20upx;
+    display: inline-block;
+    .iconweixuanzhong,
+    .iconxuanzhong {
+      font-size: 40upx !important;
+    }
+    .iconxuanzhong {
+      color: $mainColor !important;
+    }
+  }
 	.select-cmd_bx {
 		.num_bx {
 			margin-top:30upx;