Merge branch 'master' of http://60.204.229.151:20080/chenkangxu/merchant-web

2025-01-24 09:51:30 +08:00 · 2025-01-24 09:51:30 +08:00 · 913ac0d8c3
parent d0c77a1131 204ae46d91
commit 913ac0d8c3
2 changed files with 3 additions and 1 deletions
--- a/src/views/modules/marketing/points-mall/popup/commodity.vue
+++ b/src/views/modules/marketing/points-mall/popup/commodity.vue
@ -20,6 +20,7 @@
        border
        ref="multipleTable"
        :data="dataList"
+        height="60vh"
        tooltip-effect="dark"
        style="width: 100%"
        @select="select"
--- a/src/views/modules/presale/products/popup/commodity.vue
+++ b/src/views/modules/presale/products/popup/commodity.vue
@ -20,6 +20,7 @@
        border
        ref="multipleTable"
        :data="dataList"
+        height="60vh"
        tooltip-effect="dark"
        style="width: 100%"
        @select="select"