diff --git a/.gitignore b/.gitignore index 82966e3..1bff08f 100644 --- a/.gitignore +++ b/.gitignore @@ -36,7 +36,7 @@ pnpm-lock.yaml !.yarn/sdks !.yarn/versions .pnp.* - +.history # Vab public/video *.zip diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 5d87a7d..412a05e 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -89,7 +89,7 @@
- + 桂ICP备2024040484号-1
diff --git a/src/views/product/productList/components/addProductEdit.vue b/src/views/product/productList/components/addProductEdit.vue index dba2ef6..aeb0087 100644 --- a/src/views/product/productList/components/addProductEdit.vue +++ b/src/views/product/productList/components/addProductEdit.vue @@ -2045,8 +2045,8 @@ export default { } }) } else { - if (shop_product_image) { - let image = shop_product_image[0] + if (shop_product_image.length) { + let image = shop_product_image?.[0] obj.main_color_img = image.item_image_default let other = image.item_image_other if (other) { diff --git a/src/views/settings/config/receiptMachine.vue b/src/views/settings/config/receiptMachine.vue index 267789e..f08e426 100644 --- a/src/views/settings/config/receiptMachine.vue +++ b/src/views/settings/config/receiptMachine.vue @@ -304,7 +304,7 @@ export default { this.brandName = '' this.params = { pageNum: 1, - paper_with: 20, + pageSize: 20, } this.getReceiptMachineList() }, @@ -326,6 +326,7 @@ export default { } this.isEdit = false } + this.$refs['formDialog'].resetFields() }, handleSizeChange(pageSize) { this.params.pageSize = pageSize diff --git a/src/views/settings/config/site.vue b/src/views/settings/config/site.vue index 24ae074..51a6d18 100644 --- a/src/views/settings/config/site.vue +++ b/src/views/settings/config/site.vue @@ -1,644 +1,662 @@ diff --git a/src/views/settings/config/upload.vue b/src/views/settings/config/upload.vue index f85da80..987ebdb 100644 --- a/src/views/settings/config/upload.vue +++ b/src/views/settings/config/upload.vue @@ -10,7 +10,8 @@ :model="uploadForm" size="medium" > -
- + {{ __('修改') }}
@@ -395,7 +401,12 @@
- + {{ __('修改') }}
@@ -406,378 +417,388 @@