From 03f2d55a04d086e49a0a0ef484b0984887615650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Thu, 25 Sep 2025 17:18:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../image-preview/preview-detail-ios.vue      | 301 ++++++++++++++++++
 src/pages/index/dialog.vue                    |   9 +-
 2 files changed, 309 insertions(+), 1 deletion(-)
 create mode 100644 src/components/image-preview/preview-detail-ios.vue

diff --git a/src/components/image-preview/preview-detail-ios.vue b/src/components/image-preview/preview-detail-ios.vue
new file mode 100644
index 00000000..837b7ed4
--- /dev/null
+++ b/src/components/image-preview/preview-detail-ios.vue
@@ -0,0 +1,301 @@
+<template>
+  <!-- <uni-popup ref="PopupRef" class="popup" mask-background-color="rgba(0,0,0,.2)" @change="changeShow">
+		<view class="overlay-box" @click="playEnded" v-if="fileType === 'video'">
+			<video class="video-cont-center"
+				:id="`video`+ fileId"
+				ref="playerRef"
+				 v-if="showModel && fileUrlShow"
+				:src="fileUrlShow"
+				:controls="true"
+				 @error="playError" 
+				 @ended="playEnded"
+				 object-fit="contain"></video>
+		</view>
+		<view class="overlay-box" @click="playEnded"  @touchmove.stop v-if="fileType === 'image'">
+			<image class="detail-img" :src="fileUrlShow" mode="aspectFill"></image>
+		</view>
+	</uni-popup> -->
+  <uv-overlay :show="showModel" opacity=".6" @click="showModel = false">
+    <view class="overlay-box" @click="playEnded" v-if="fileType === 'video'">
+      <video class="video-cont-center" :id="`video` + fileId" ref="playerRef" v-if="showModel && fileUrlShow" :src="fileUrlShow" :controls="true" @error="playError" @ended="playEnded" object-fit="contain"></video>
+    </view>
+    <view class="overlay-box" @click="playEnded" @touchmove.stop v-if="fileType === 'image'">
+      <image class="detail-img" :src="fileUrlShow" mode="aspectFill"></image>
+    </view>
+  </uv-overlay>
+</template>
+
+<script>
+import { downloadFile, getPreviewFileUrl } from '@/api/common.js'
+import { useStorageStore } from '@/store/storage.js'
+import { get_base_url } from '@/api/request.js'
+import imagePreviewVue from './image-preview.vue'
+export default {
+  name: 'video-preview',
+  components: { imagePreviewVue },
+  props: {
+    // fileId:{
+    // 	default:'',
+    // 	type:String
+    // },
+    // src:{
+    // 	default:'',
+    // 	type:String
+    // },
+    // fileType:{
+    // 	default:'image',
+    // 	type:String
+    // }
+  },
+  data() {
+    return {
+      showModel: false,
+      fileUrlShow: '',
+      watching: false,
+      videoContext: null,
+      base_url: get_base_url()
+    }
+  },
+  computed: {
+    storageStore: () => useStorageStore(),
+    videoObj() {
+      return this.storageStore?.videoObj || {}
+    },
+    imageObj() {
+      return this.storageStore?.imgObj || {}
+    },
+    showPreviewDetail() {
+      return !!this.storageStore?.getShowPreviewDetail
+    },
+    fileType() {
+      return this.storageStore?.getFileType
+    },
+    fileId() {
+      return this.storageStore?.getFileId
+    },
+    src() {
+      return this.storageStore?.getFileSrc
+    }
+  },
+  watch: {
+    fileId: {
+      handler(newval, oldval) {
+        if (this.fileType === 'image') {
+          if (newval.indexOf('/') === 0) {
+            this.fileUrlShow = this.base_url + newval
+            return
+          }
+          if (newval.indexOf('http') === 0) {
+            this.fileUrlShow = newval
+            return
+          }
+          if (newval && this.watching) {
+            this.getImagePreviewUrlBlob(newval)
+          }
+        }
+        if (this.fileType === 'video') {
+          if (newval.indexOf('http') === 0) {
+            this.fileUrlShow = newval
+          } else {
+            if (newval && this.watching) {
+              this.getPreviewUrlBlob(newval)
+            }
+          }
+        }
+        this.videoContext = uni.createVideoContext(`video` + this.fileId)
+      },
+      immediate: true,
+      deep: true
+    },
+    src: {
+      handler(newval, oldval) {
+        if (newval.indexOf('http') === 0) {
+          this.fileUrlShow = newval
+        } else {
+          this.fileUrlShow = this.base_url + newval
+        }
+      },
+      immediate: true,
+      deep: true
+    },
+    showPreviewDetail(val) {
+      if (val) {
+        this.showModelNow()
+      } else {
+        this.$refs.PopupRef.close()
+        this.showModel = false
+      }
+    }
+  },
+  methods: {
+    getImagePreviewUrlBlob(id) {
+      if (!id) {
+        this.fileUrlShow = ''
+        return
+      }
+      if (this.isCache) {
+        let _cache = this.imageObj[`/${id}/${this.width}/${this.height}`] || ''
+        if (_cache) {
+          this.fileUrlShow = _cache
+          return
+        }
+        previewCacheThumbImage(id, this.width, this.height).then(res => {
+          this.fileUrlShow = res
+          this.storageStore.setStorage('image', `/${id}/${this.width}/${this.height}`, res)
+        })
+      } else {
+        let _cache = this.imageObj[`${id}`] || ''
+        if (_cache) {
+          this.fileUrlShow = _cache
+          return
+        }
+        previewFile(id).then(result => {
+          //#ifdef APP-PLUS
+          let _header = result.header['Content-Type'].split(';')[0]
+          // #endif
+          //#ifndef APP-PLUS
+          let _header = result.header['content-type'].split(';')[0]
+          // #endif
+          let base64 = `data:${_header};base64,` + uni.arrayBufferToBase64(result.data)
+          this.fileUrlShow = base64
+          this.storageStore.setStorage('image', id, base64)
+        })
+      }
+    },
+    changeShow(data) {
+      if (!data.show) {
+        this.storageStore.setTouchBtnZIndex(12)
+      } else {
+        this.storageStore.setTouchBtnZIndex(-1)
+      }
+    },
+    showModelNow() {
+      this.$refs.PopupRef.open()
+      this.showModel = true
+      if (this.fileType === 'image') {
+        if (this.fileId) {
+          if (this.fileId.indexOf('/') === 0) {
+            this.fileUrlShow = this.base_url + this.fileId
+          } else if (this.fileId.indexOf('http') === 0) {
+            this.fileUrlShow = this.fileId
+          } else {
+            this.getPreviewUrlBlob(this.fileId)
+          }
+        }
+        this.watching = true
+        if (this.src) {
+          this.fileUrlShow = this.base_url + this.src
+        }
+      }
+      if (this.fileType === 'video') {
+        if (this.fileId) {
+          let _newDate = new Date().getTime()
+          if (this.fileId.indexOf('http') === 0) {
+            this.fileUrlShow = this.fileId + '?t=' + _newDate
+          } else {
+            this.getPreviewUrlBlob(this.fileId)
+          }
+          this.videoContext = uni.createVideoContext(`video` + this.fileId)
+        }
+      }
+    },
+    playError(info) {
+      console.log('err：', info)
+    },
+    playEnded() {
+      this.storageStore.setShowPreviewDetail({
+        status: false,
+        fileType: '',
+        fileId: '',
+        fileSrc: ''
+      })
+    },
+    getPreviewUrlBlob(id) {
+      if (!id) {
+        this.fileUrlShow = ''
+        return
+      }
+      let _cache = this.videoObj[id] || ''
+      if (_cache) {
+        this.fileUrlShow = _cache
+        return
+      }
+      let _newDate = new Date().getTime()
+      this.fileUrlShow = getPreviewFileUrl(this.fileId) + '?t=' + _newDate
+      // downloadFile(id).then(res=>{
+      // 	this.fileUrlShow = res.tempFilePath
+      // 	this.storageStore.setStorage('video', id, this.fileUrlShow)
+      // })
+    },
+    getPreviewFileUrlNow(id) {
+      let _newDate = new Date().getTime()
+      if (id.indexOf('http') === 0) {
+        this.fileUrlShow = id + '?t=' + _newDate
+        return
+      }
+      if (id && this.watching) {
+        this.getPreviewUrlBlob(id)
+      }
+    }
+  },
+  mounted() {
+    this.watching = true
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.video-view-box {
+  width: 100%;
+  height: 100%;
+  background-color: #fafafa !important;
+  position: relative;
+}
+.img-box {
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  width: 100rpx;
+  height: 100rpx;
+  transform: translate(-50%, -50%);
+}
+.preview-pic {
+  width: 100%;
+  height: 100%;
+}
+.overlay-box .video-cont-center {
+  width: 100vw;
+  max-height: 100%;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+}
+.overlay-box {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100vw;
+  height: 100vh;
+  z-index: 999;
+  // background-color: rgba(0, 0, 0, 0.65);
+}
+
+.overlay-box {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100vw;
+  height: 100vh;
+  z-index: 999;
+  // background-color: rgba(0, 0, 0, 0.65);
+  .detail-img {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    width: 100vw;
+    max-height: 100%;
+    transform: translate(-50%, -50%);
+  }
+}
+</style>
diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue
index cccefe25..c4a56fe3 100644
--- a/src/pages/index/dialog.vue
+++ b/src/pages/index/dialog.vue
@@ -403,6 +403,7 @@
 		talkingList.value[talkingList.value.length - 1].talkingText = answerText.value;
 	};
 
+	const isDownloading = ref(false)
 	const stopAnswerCallBack = ref(null);
 	const talkItemEvents = ({ type, data, id, info = {} }) => {
 		switch (type) {
@@ -482,9 +483,11 @@
 				if (getPhoneEnvBool('AND')) {
 					common.navigateTo('/pages/index/preview?fileId=' + info.docId);
 				} else {
+					if(isDownloading.value) return
 					const base_url = get_base_url('/traask/traFilePreview/');
 					let fileUrl = base_url + '/traask/traFilePreview/' + info.docId + userParams;
 					const localFilePath = '_doc/pdf_view/' + info.docName + '.pdf';
+					isDownloading.value = true
 					downloadAndSaveAvatar(fileUrl, localFilePath).then((res) => {
 						uni.openDocument({
 							filePath: res,
@@ -492,7 +495,11 @@
 							success: function () {
 								console.log('打开文档成功');
 							}
-						});
+						})
+					}).finally(()=>{
+						setTimeout(()=>{
+							isDownloading.value = false
+						},1000)
 					});
 					//   uni.downloadFile({
 					//     url: fileUrl,

From e911b2cb8212f5ff46ff80128a3f156844b57b67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Thu, 25 Sep 2025 18:46:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=20bugf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development            | 2 +-
 src/pages/index/dialog.vue  | 2 +-
 src/pages/index/preview.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.env.development b/.env.development
index bc0a284c..7c92ace5 100644
--- a/.env.development
+++ b/.env.development
@@ -25,6 +25,6 @@ VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
 
 # VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601'
 # VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602'
-# VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605'
+VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605'
 
 
diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue
index c4a56fe3..da26415d 100644
--- a/src/pages/index/dialog.vue
+++ b/src/pages/index/dialog.vue
@@ -175,7 +175,7 @@
 	const watermarkRef = ref();
 	const userInfo = ref(getUserInfo());
 	const luimgAddr = computed(()=> unref(userInfo)?.mascotInfo?.imgAddr || '')
-	const userParams = '/' + (unref(userInfo)?.userName??'') + ' ' + (unref(userInfo)?.loginName??'');
+	const userParams = '/' + (unref(userInfo)?.userName??'') + '/' + (unref(userInfo)?.loginName??'');
 	const questionList = ref([
 		// '对公小程序开户流程？',
 		// '厅堂服务经理2025年管理办法？',
diff --git a/src/pages/index/preview.vue b/src/pages/index/preview.vue
index f3c8e8b2..d64637f0 100644
--- a/src/pages/index/preview.vue
+++ b/src/pages/index/preview.vue
@@ -37,7 +37,7 @@ export default {
   onLoad(params) {
     this.fileId = params.fileId || ''
 		const userInfo = getUserInfo();
-		this.userParams = '/' + (userInfo?.userName??'') + ' ' + (userInfo?.loginName??'');
+		this.userParams = '/' + (userInfo?.userName??'') + '/' + (userInfo?.loginName??'');
   },
   onShow() {
 		if (getPhoneEnvBool('AND')) {