Merge branch '悬浮按钮改为底部按钮' into 楚楚/楚楚master

packageA/orderForm/index.scss

@@ -84,4 +84,26 @@ page {
 			margin-top: 20rpx;
 		}
 	}
+}
+
+.footer {
+	display: flex;
+	justify-content: center;
+	position: fixed;
+	bottom: 0;
+	width: 100vw;
+	min-height: 130rpx;
+	background-color: #fff;
+	box-shadow: 0px -2px 6px 1px rgba(0, 0, 0, 0.16);
+
+	.but {
+		width: 690rpx;
+		height: 90rpx;
+		background: #FA8C16;
+		border-radius: 16rpx;
+		font-size: 28rpx;
+		font-weight: 600;
+		color: #FFFFFF;
+		margin-top: 10rpx;
+	}
 }

packageA/orderForm/index.wxml

@@ -22,7 +22,11 @@
         <view style="height:150rpx;" />
     </Yl_ListBox>
     <!-- <Float wx:if="{{isInsert}}" /> -->
-    <Yl_FloatingButton wx:if="{{isInsert}}" bindtap="createOrder" />
+    <!-- <Yl_FloatingButton wx:if="{{isInsert}}" bindtap="createOrder" /> -->
+
+    <view class="footer" wx:if="{{isInsert}}">
+        <van-button custom-class='but' bindtap="createOrder">新建订单</van-button>
+    </view>
 </view>
 
 <view class="DrawerClose {{modalName=='viewModal'?'show':''}}" bindtap="hideModal">

packageA/remitVoucher/index.scss

@@ -1 +1,38 @@
-@import "./index.skeleton.wxss";
+@import "./index.skeleton.wxss";
+/* 
+.total {
+	display: flex;
+	justify-content: space-between;
+	padding: 10px 20px;
+
+	.text {
+		font-size: 24rpx;
+	}
+
+	.to {
+		font-weight: bold;
+		color: #3874F6;
+	}
+} */
+
+.footer {
+	display: flex;
+	justify-content: center;
+	position: fixed;
+	bottom: 0;
+	width: 100vw;
+	min-height: 130rpx;
+	background-color: #fff;
+	box-shadow: 0px -2px 6px 1px rgba(0, 0, 0, 0.16);
+
+	.but {
+		width: 690rpx;
+		height: 90rpx;
+		background: #FA8C16;
+		border-radius: 16rpx;
+		font-size: 28rpx;
+		font-weight: 600;
+		color: #FFFFFF;
+		margin-top: 10rpx;
+	}
+}

packageA/remitVoucher/index.wxml

@@ -7,11 +7,20 @@
 	<van-tab title="提交" name='提交' />
 	<van-tab title="审核" name='审核' />
 </van-tabs>
-<view class="total" style="height: 20rpx;" />
+<!-- <view class="total">
+	<view class="text">共{{content.total}}条</view>
+	<view class="to" bindtap="toAdd">去新建</view>
+</view> -->
+
+<view class="total" style="height: 20rpx;"></view>
 <Yl_ListBox id='ListBox' bind:getlist='getList'>
 	<List list="{{list}}" />
+	<view style="height: 150rpx;"></view>
 </Yl_ListBox>
 <!-- 新建浮动按钮 -->
-<Yl_FloatingButton bindtap="toAdd" />
+<!-- <Yl_FloatingButton bindtap="toAdd" /> -->
+<view class="footer">
+	<van-button custom-class='but' bindtap="toAdd">新建凭证</van-button>
+</view>
 <!-- 筛选条件 -->
 <Yl_Filtrate id='Filtrate' list="{{filter}}" bind:handle="handleFilter" dateRange='{{true}}' />