合并分支

.gitignore

@@ -36,7 +36,7 @@ pnpm-lock.yaml
 !.yarn/sdks
 !.yarn/versions
 .pnp.*
-
+.history
 # Vab
 public/video
 *.zip

src/views/login/index.vue

@@ -89,7 +89,7 @@
       </el-col>
     </el-row>
     <div class="internet-content-provider">
-      <a href="https://beian.miit.gov.cn/" target="_blank" style="color: #fff">
+      <a href="https://beian.miit.gov.cn/" style="color: #fff" target="_blank">
         桂ICP备2024040484号-1
       </a>
     </div>

src/views/product/productList/components/addProductEdit.vue

@@ -2045,8 +2045,8 @@ export default {
             }
           })
         } else {
-          if (shop_product_image) {
+          if (shop_product_image.length) {
-            let image = shop_product_image[0]
+            let image = shop_product_image?.[0]
             obj.main_color_img = image.item_image_default
             let other = image.item_image_other
             if (other) {

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