Merge tag '2.2.1' into develop

src/modules/report/SchemeMedia.vue

@@ -91,4 +91,12 @@ function onPlay(event?: Event) {
   right: 5px;
   bottom: 5px;
 }
+
+.overflow-x-auto {
+  overflow-y: hidden;
+  /* 只允许水平滚动，垂直滚动传递给父元素 */
+  touch-action: pan-x pan-y;
+  /* 改善移动端滚动体验（iOS Safari） */
+  -webkit-overflow-scrolling: touch;
+}
 </style>

src/modules/report/scheme.page.vue

@@ -149,7 +149,7 @@ async function openGoodsScan(goods: SchemeGoodsProps) {
                 <div class="relative" :class="{ 'has-link': card.goods }">
                   <div class="text-xl text-center text-primary" v-if="card.title">{{ card.title }}</div>
                   <van-button
-                    class="!absolute top-0 right-0" v-if="card.goods"
+                    class="!absolute right-0" v-if="card.goods"
                     type="primary" icon="cart-o" size="small" plain
                     @click="openGoodsPanel(card.goods, 'T_' + card.id)"
                   >{{ card.goods.label }}</van-button>
@@ -197,9 +197,7 @@ async function openGoodsScan(goods: SchemeGoodsProps) {
     <van-dialog
       v-model:show="scanConfig.show"
       :title="scanConfig.title"
-      cancel-button-text="好的"
-      show-cancel-button
-      :show-confirm-button="false"
+      confirm-button-text="关闭"
       close-on-click-overlay
     >
       <div class="scan-content">
@@ -249,7 +247,8 @@ async function openGoodsScan(goods: SchemeGoodsProps) {
 
   img {
     padding: 10px 0;
-    object-fit: scale-down;
+    min-width: 320px;
+    object-fit: contain;
   }
 }