Merge branch 'hcb' of SH-Arbitrate/Arbitrate-FrontendH5 into master

src/views/room.vue

@@ -299,6 +299,7 @@ export default {
       filedata3: {
         annexType: 7,
         officeFlag: 0,
+        isMediaBook:1,
         caseId: null,
       },
       fileList3: [],
@@ -433,14 +434,15 @@ export default {
       this.$refs.upload3.clearFiles();
       this.selectByIdFn(this.caseId);
     },
-    preview(item, flag) {
+    preview(item, type) {
       if (item.onlyOfficeFileId) {
+        debugger
         // this.$router.push({
         //   path: "/onlyoffice",
         //   query: { id: item.onlyOfficeFileId, flag: flag },
         // });
         let flag = 1;
-        if (this.editFlag) {
+        if (this.editFlag && type != 0) {
           flag = 1;
         } else {
           flag = 0;
@@ -453,7 +455,7 @@ export default {
           "_black"
         );
       } else {
-        window.open(window.location.origin + item.annexPath, "_black");
+        window.open(window.location.origin + '/tiaojie' + item.annexPath, "_black");
       }
     },
     // 点击提交修改后的内容

vue.config.js

@@ -5,16 +5,16 @@ module.exports = defineConfig({
     proxy: {
       '/tiaojie': {
         // target: 'https://api.xayunmei.com/tiaojieapitest', // 后端服务器地址
-        target: 'http://172.16.1.26:6001',
+        target: 'http://121.40.189.20:6001',
         changeOrigin: true, // 是否改变Origin头信息
         secure : false,
         pathRewrite: {
           '^/tiaojie': '' // 将/api前缀重写为空字符串
         },
       },
-      '/tiaojiez': {
+      '/tiaojieprod': {
-        target: 'https://api.xayunmei.com/tiaojieapi', // 后端服务器地址
+        // target: 'https://api.xayunmei.com/tiaojieapi', // 后端服务器地址
-        // target: 'http://172.16.1.4:7001',
+        target: 'http://121.40.189.20:7001',
         changeOrigin: true, // 是否改变Origin头信息
         secure : false,
         pathRewrite: {