Merge remote-tracking branch 'origin/master'

src/layouts/default/header/components/notify/index.vue

@@ -48,7 +48,7 @@
       const instance: any = getCurrentInstance();
       const userStore = useUserStore();
       const glob = useGlobSetting();
-      const websocketUrl = ref(glob.domainUrl + glob.apiUrl);
+      const websocketUrl = ref(glob.domainUrl);
       const dynamicNoticeProps = reactive({ path: '', formData: {} });
       const [registerDetail, detailModal] = useModal();
       const listData = ref(tabListData);
@@ -147,7 +147,7 @@
             message: `询盘通知`,
             icon: () => h(SmileOutlined, { style: 'color: #108ee9' }),
             description: `${data.msgTxt}`,
-            duration: 10,
+            duration: 0,
           });
         }
 
@@ -156,7 +156,7 @@
             message: `站点创建完成通知`,
             icon: () => h(SmileOutlined, { style: 'color: #108ee9' }),
             description: `${data.msgTxt}`,
-            duration: 20,
+            duration: 0,
           });
         }
       }

src/views/adweb/theme/AdwebThemeList.vue

@@ -80,13 +80,6 @@
 
   const url = reactive({
     list: '/adweb/adwebTheme/list',
-    delete: '/adweb/adwebThemeC/delete',
-    deleteBatch: '/adweb/adwebThemeC/deleteBatch',
-    createSiteUrl: 'siteManage/createSite',
-    addSiteLanguageUrl: 'siteManage/addSiteLanguage',
-    getTemplateTagsUrl: '/adweb/adwebThemeC/getTemplateTags',
-    wpSiteCreateUrl: 'wpWebSite/addWebsite',
-    getAdwebVipUrl: 'adweb/adwebSiteManage/getAdwebVip',
   });
 
   const domainUrl = ref(globSetting.apiUrl);

src/views/adweb/theme/components/AdwebCreateSite.vue

@@ -108,11 +108,11 @@
   const isWpSiteCreate = ref(false);
 
   const url = reactive({
-    createSiteUrl: 'siteManage/createSite',
-    addSiteLanguageUrl: 'siteManage/addSiteLanguage',
+    createSiteUrl: '/siteManage/createSite',
+    addSiteLanguageUrl: '/siteManage/addSiteLanguage',
     getTemplateTagsUrl: '/adweb/adwebThemeC/getTemplateTags',
-    wpSiteCreateUrl: 'wpWebSite/addWebsite',
-    getAdwebVipUrl: 'adweb/adwebSiteManage/getAdwebVip',
+    wpSiteCreateUrl: '/wpWebSite/addWebsite',
+    getAdwebVipUrl: '/adweb/adwebSiteManage/getAdwebVip',
   });
   const newCreateSiteInfo = ref('');
   let userList = reactive([{ id: '', realname: '' }]);