Merge branch 'main' of https://gitlab.com/tea28/client

# Conflicts:
#	src/pagesB/my/assistant.vue

src/pagesB/my/assistant.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="iApp">
-    <div class="history">
-      <div class="btn" @click="toHistory">
-        <span>开票历史</span>
-      </div>
-    </div>
     <div class="log_list">
+      <div class="history">
+        <div class="btn" @click="toHistory">
+          <span>开票历史</span>
+        </div>
+      </div>
       <div class="list_box" v-for="(item, index) of list" :key="index">
         <div class="list_item flex_r flex_jb">
           <checkbox-group
@@ -71,7 +71,7 @@ export default {
       rows: 10,
       selectedId: [],
       selectedLi: [],
-      height: undefined,
+      // height: undefined,
       trueTotal: 0,
       money: 0,
     };
@@ -80,7 +80,7 @@ export default {
     let that = this;
     uni.getSystemInfo({
       success: function (res) {
-        that.height = res.windowHeight * 2 - 150 + "rpx";
+        // that.height = res.windowHeight * 2 - 150 + "rpx";
         that.getList();
       },
     });
@@ -129,7 +129,7 @@ export default {
         }
       }
     },
-    toHistory(){
+    toHistory() {
       this.goto("/pagesB/invoice/invoiceList");
     },
     toEditinvoice() {
@@ -160,25 +160,26 @@ export default {
 <style scoped lang='scss'>
 .iApp {
   min-height: 100vh;
-  .history {
-    display: flex;
-    justify-content: flex-end;
-    // background-color: red;
-    align-items: center;
-    margin-right: 30rpx;
-    margin-top: 30rox;
-    height: 100rpx;
-    .btn {
-      padding: 10rpx 20rpx;
-      background-color: #2db389;
-      border-radius: 10rpx;
-      span{
-        color: #fff;
+
+  .log_list {
+    padding: 0rpx 32rpx 100rpx;
+    .history {
+      display: flex;
+      justify-content: flex-end;
+      // background-color: red;
+      align-items: center;
+      margin-right: 30rpx;
+      margin-top: 30rox;
+      height: 100rpx;
+      .btn {
+        padding: 10rpx 20rpx;
+        background-color: #2db389;
+        border-radius: 10rpx;
+        span {
+          color: #fff;
+        }
       }
     }
-  }
-  .log_list {
-    padding:0rpx 32rpx 32rpx;
     overflow: scroll;
     .log_title {
       line-height: 40rpx;
@@ -259,8 +260,7 @@ export default {
 
   .bottom {
     position: fixed;
-    bottom: 0;
-    left: 0;
+    left: 0;bottom: 0;
 
     border-top: 1px solid #ddd;
     height: 100rpx;