Merge branch 'chronic-master' of…

Merge branch 'chronic-master' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-master

src/residentWX/components/mediaPlay/Mp4.vue

@@ -10,13 +10,23 @@
                 <div v-if="item.annexFileName" class="text-12 my-1 text-ellipsis">{{ item.annexFileName }}</div>
             </div>
         </div>
-        <van-popup v-model:show="visible" :close-on-click-overlay="false" closeable
-            close-icon-position="top-right">
-            <video controls width="100%" v-if="visible">
+        <!-- <van-popup v-model:show="visible" :close-on-click-overlay="false" closeable
+            close-icon-position="top-right"
+            close-icon="clear">
+            <video controls v-if="visible" style="width: calc(100vw - var(--van-padding-md) * 2)">
                 <source :src="activeVideo.annexUrl" type="video/mp4" />
                 播放失败!
             </video>
-        </van-popup>
+        </van-popup> -->
+        <van-overlay :show="visible">
+            <div class="h-full flex items-center justify-center wrapper" @click.stop>
+                <video controls v-if="visible">
+                    <source :src="activeVideo.annexUrl" type="video/mp4" />
+                    播放失败!
+                </video>
+                <van-icon name="close" class="close-icon" @click="visible = false"/>
+            </div>
+        </van-overlay>
     </div>
 </template>
 
@@ -65,4 +75,18 @@ export default {
         padding-left: 2px;
     }
 }
+.wrapper {
+    position: relative;
+    .close-icon {
+        position: absolute;
+        top: 16px;
+        right: 16px;
+        color: #ccc;
+        font-size: 24px;
+    }
+    video {
+        width: calc(100vw - var(--van-padding-md) * 2);
+        background-color: #fff;
+    }
+}
 </style>

src/residentWX/screening/detail/FirstDetail.vue

@@ -179,6 +179,13 @@ export default {
         },
         // 折叠面板切换
         collapseChange(val) {
+            // console.log(val, this.activeCollapse)
+            // if (val && val.length) {
+            //     this.activeCollapse = val.slice(val.length - 1)
+            // } else {
+            //     this.activeCollapse = []
+            // }
+
             if (val && val.length === this.collapseList.length) {
                 this.collapseAll = true
             } else {

vue.config.js

@@ -39,11 +39,11 @@ module.exports = defineConfig({
                 }
             },
             '/chronic-resident': {
-                // target: 'http://192.168.1.145:8903',
-                target: 'https://beta-tumour.zmnyjk.com',
+                target: 'http://192.168.1.200:8903',
+                // target: 'https://beta-tumour.zmnyjk.com',
                 changOrigin: true,
                 pathRewrite: {
-                    '^/chronic-resident': '/chronic-resident'
+                    '^/chronic-resident': '/'
                 }
             }
         },