冲突合并

src/components/PagingComponent/index.vue

@@ -1,61 +1,61 @@
 <script setup lang="ts">
-    // 每页数量值改变
-    const handleSizeChange = (val: Number) => {
-        emit('update:pageSize', val)
-        // 传递每页数量
-        emit('getListChange')
-    }
-    // 页码值改变
-    const handleCurrentChange = (val: Number) => {
+// 每页数量值改变
+const handleSizeChange = (val: Number) => {
+    emit('update:pageSize', val)
+    // 传递每页数量
+    emit('getListChange')
+}
+// 页码值改变
+const handleCurrentChange = (val: Number) => {
+    emit('update:pageNum', val)
+    // 传递页码值
+    emit('getListChange')
+}
+
+const props = withDefaults(
+    defineProps<{
+        page?: number
+        size?: number
+        total?: number
+    }>(),
+    {
+        page: 1,
+        size: 10,
+        total: 0,
+    },
+)
+
+const emit = defineEmits(['getListChange', 'update:pageSize', 'update:pageNum'])
+
+const currentPage = computed({
+    get: () => {
+        return props.page
+    },
+    set: (val: number) => {
         emit('update:pageNum', val)
-        // 传递页码值
-        emit('getListChange')
-    }
+    },
+})
+const pageSize = computed({
+    get: () => {
+        return props.size
+    },
+    set: (val: number) => {
+        emit('update:pageSize', val)
+    },
+})
 
-    const props = withDefaults(
-        defineProps<{
-            page?: number
-            size?: number
-            total?: number
-        }>(),
-        {
-            page: 1,
-            size: 10,
-            total: 0
-        }
-    )
+// const paginationData = reactive({
+//     pageSize: Props.pageSize,
+//     pageNumber: Props.pageNumber
+// })
 
-    const emit = defineEmits(['getListChange', 'update:pageSize', 'update:pageNum'])
-
-    const currentPage = computed({
-        get: () => {
-            return props.page
-        },
-        set: (val: number) => {
-            emit('update:pageNum', val)
-        }
-    })
-    const pageSize = computed({
-        get: () => {
-            return props.size
-        },
-        set: (val: number) => {
-            emit('update:pageSize', val)
-        }
-    })
-
-    // const paginationData = reactive({
-    //     pageSize: Props.pageSize,
-    //     pageNumber: Props.pageNumber
-    // })
-
-    // const handleTotalText = () => {
-    //     const targetDom: any = document.querySelector('.el-pagination__total')
-    //     targetDom.innerText = `数量${total.value}`
-    // }
-    // onMounted(() => {
-    //     // handleTotalText()
-    // })
+// const handleTotalText = () => {
+//     const targetDom: any = document.querySelector('.el-pagination__total')
+//     targetDom.innerText = `数量${total.value}`
+// }
+// onMounted(() => {
+//     // handleTotalText()
+// })
 </script>
 
 <template>
@@ -69,11 +69,18 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
         @size-change="handleSizeChange"
-        @current-change="handleCurrentChange" />
+        @current-change="handleCurrentChange"
+    />
 </template>
 
-<style>
-    .el-pagination {
-        margin-top: 15px;
-    }
+<style scoped lang="scss">
+.el-pagination {
+    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">