冲突合并

src/components/PagingComponent/index.vue

@@ -21,8 +21,8 @@
     {
         page: 1,
         size: 10,
-            total: 0
+        total: 0,
-        }
+    },
 )
 
 const emit = defineEmits(['getListChange', 'update:pageSize', 'update:pageNum'])
@@ -33,7 +33,7 @@
     },
     set: (val: number) => {
         emit('update:pageNum', val)
-        }
+    },
 })
 const pageSize = computed({
     get: () => {
@@ -41,7 +41,7 @@
     },
     set: (val: number) => {
         emit('update:pageSize', val)
-        }
+    },
 })
 
 // const paginationData = reactive({
@@ -69,11 +69,18 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
         @size-change="handleSizeChange"
-        @current-change="handleCurrentChange" />
+        @current-change="handleCurrentChange"
+    />
 </template>
 
-<style>
+<style scoped lang="scss">
 .el-pagination {
-        margin-top: 15px;
+    justify-content: flex-end;
+    padding: 5px 0;
+}
+
+:deep.el-pagination.is-background .el-pager li.is-active {
+    background-color: #3cb4a6;
+    // 代码提交
 }
 </style>

src/style/scss/common.scss

@@ -0,0 +1,11 @@
+.primary-lease {
+    --el-color-primary:#00a288;
+    --el-color-primary-light-3:#00ad9d;
+    --el-color-primary-dark-2:#00ad9d;
+    --el-color-primary-light-5:#78d3cb
+}
+
+:root {
+    --el-color-primary:#00a288;
+    
+}

src/views/user/goodsManagement/index.vue

@@ -689,6 +689,7 @@ const handleRemove = (list: any, index: Number) => {
 </script>
 
 <template>
+    <!-- 样式修改 -->
     <!-- 商品管理 -->
 
     <el-form :model="queryParams" ref="queryFormRef" :inline="true" size="small" label-width="auto">