feat:conflict

src/views/components/ContextMenu.vue

@@ -83,7 +83,7 @@ import { onMounted, ref } from 'vue';
 import { LockState, Pen, PenType } from '@meta2d/core';
 import { useSelection, SelectionMode } from '@/services/selections';
 import { updateC } from '@/services/updateC';
-import { rootDomain, isDownload } from '@/services/defaults';
+import { rootDomain } from '@/services/defaults';
 
 const props = defineProps({
   type: String,
@@ -197,11 +197,8 @@ const onMenu = (val: string) => {
       break;
     case 'goto3d':
       id = meta2d?.store.active[0].iframe.split("id=")[1];
-      url = `https://3d${rootDomain}/?id=`;
-      if(isDownload){
         //安装包
-        url = location.origin+ `/3d/?id=`;
-      }
+      url = location.origin+ `/3d/?id=`;
       if (window.url3D) {
         url = window.url3D;
       }
@@ -209,20 +206,12 @@ const onMenu = (val: string) => {
       break;
     case 'goto2d':
       id = meta2d?.store.active[0].iframe.split("id=")[1];
-      url = `https://2d${rootDomain}/?id=`;
-      if(isDownload){
-        //安装包
-        url = location.origin+ `/2d/?id=`;
-      }
+      url = location.origin+ `/2d/?id=`;
       window.open(url + id, '_blank');
       break;
     case 'gotov':
       id = meta2d?.store.active[0].iframe.split("id=")[1];
-      url = `https://v${rootDomain}/?id=`;
-      if(isDownload){
-        //安装包
-        url = location.origin+ `/v/?id=`;
-      }
+      url = location.origin+ `/v/?id=`;
       window.open(url + id, '_blank');
       break;
     case 'replaceScene':

src/views/components/Data.vue

@@ -665,7 +665,6 @@ import { typeOptions } from '@/services/common';
 import { MessagePlugin } from 'tdesign-vue-next';
 import { Pen, deepClone } from '@meta2d/core';
 import { useDot } from '@/services/common';
-// import { isDownload } from '@/services/defaults';
 import { cdn } from '@/services/api';
 import { importExcel, saveAsExcel } from '@/services/excel';
 import axios from 'axios';

src/views/components/Header.vue

@@ -389,7 +389,7 @@
      </div>
    </div>
 </t-dialog>
-<t-dialog
+<!-- <t-dialog
     v-if="downloadZipDialog.show"
     v-model:visible="downloadZipDialog.show"
     class="pay-dialog"
@@ -462,7 +462,7 @@
        <p>{{downloadZipDialog.checked? downloadZipDialog.price:0 }}</p>
      </div>
    </div>
-</t-dialog>
+</t-dialog> -->
   <t-dialog
     v-if="wechatPayDialog.show"
     v-model:visible="wechatPayDialog.show"

src/views/components/View.vue

@@ -2446,14 +2446,14 @@ const changeFit = () => {
   }
 }
 
-const replaceDialog = reactive({
+const replaceDialog = reactive<any>({
   show:false,
   list:[],
   current:1,
   pageSize:15,
   total:0,
   collection:'v',
-  select:''
+  select:{}
 });
 
 const replaceList = reactive([
@@ -2476,7 +2476,7 @@ const replaceScene = ()=>{
   sceneChange('v');
 }
 
-const sceneChange = async(e) => {
+const sceneChange = async(e?:any) => {
    let collection = e;
    if(!collection){
      collection = replaceDialog.collection;
@@ -2516,10 +2516,7 @@ const selectScene = (_item) => {
 
 const onReplace = ()=>{
   let id = meta2d.store.active[0].id;
-  let url = 'https://view.le5le.com'
-  if(isDownload){
-    url = location.origin+ `/view`;
-  }
+  let url =location.origin+ `/view`;
   meta2d.setValue({
     id:id,
     iframe:`${url}/${replaceDialog.select.collection}/?id=${replaceDialog.select.id}`,