Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev

sub-operation-service/src/views/shoppingCarts/shoppingCarts.vue

@@ -86,10 +86,10 @@
                 <el-button :disabled="data.length == 0" :type="data.length != 0 ? 'primary' : 'info'" @click="toSettlement">结算</el-button>
               </div>
             </div>
-            <!-- <div class="pagination">
+            <div class="pagination">
               <div style="color: #999999; font-size: 15px">共{{ data.total }}条</div>
-              <el-pagination :page-size="20" :pager-count="11" layout="prev, pager, next" :total="data.total" />
-            </div> -->
+              <el-pagination :page-size="20" :pager-count="11" layout="prev, pager, next" :total="data.total" @change="pagination" />
+            </div>
           </div>
         </div>
       </template>
@@ -117,7 +117,7 @@ let isAll = ref(false);
 let data = ref([]);
 let page = reactive({
   current: 1,
-  size: 100,
+  size: 20,
 });
 let ids = ref([]);
 
@@ -161,6 +161,14 @@ onMounted(() => {
   });
 });
 
+const pagination = (value) => {
+  page.current = value;
+  shoppingCart(page).then((res) => {
+    data.value = res.data.records;
+    addIsCheckProperty(data);
+  });
+};
+
 function addIsCheckProperty(data) {
   if (Array.isArray(data)) {
     data.forEach((item) => {
@@ -411,6 +419,7 @@ function removeCheckedItems(data) {
       background: $color-fff;
     }
     .fix-top {
+      z-index: 999;
       top: 0;
       display: inline-flex;
       justify-content: space-between;
@@ -461,8 +470,8 @@ function removeCheckedItems(data) {
       bottom: 38px;
     }
     .fix-bottom {
-      // bottom: 30px;
-      bottom: 0;
+      bottom: 30px;
+      // bottom: 0;
       display: inline-flex;
       justify-content: space-between;
       width: 100%;

sub-operation-service/src/views/shoppingCarts/sureOrders.vue

@@ -40,6 +40,7 @@
               </div>
             </el-scrollbar>
           </div>
+          <!-- <div style="background-color: #fff; margin-bottom: 20px">订单备注</div> -->
 
           <div class="order-info">
             <div class="order-info-top">确认订单信息</div>

sub-operation-service/src/views/userCenter/orderDetails.vue

@@ -341,6 +341,9 @@ const back = () => {
       .order-list-warp-left {
         width: 55%;
         height: 70vh;
+        overflow: hidden;
+        overflow-y: scroll;
+        scrollbar-width: none;
         .order-list-warp-left-title {
           margin-top: 20px;
           font-size: 18px;