ソースを参照

新需求初步完工

shaogen1995 2 週間 前
コミット
6215ac1071

+ 10 - 7
src/components/ZRichText/index.tsx

@@ -36,14 +36,17 @@ function ZRichText({ check, dirCode, isLook, myUrl, full, qianClass }: Props, re
       const dom = qianClass
         ? document.querySelector(`${qianClass} .bf-controlbar`)!
         : document.querySelector('.bf-controlbar')!
-      const div = document.createElement('div')
-      div.className = 'upImgBox'
-      // div.title = "上传图片";
-      div.innerHTML = '上传图片'
-      div.onclick = async () => {
-        myInput.current?.click()
+
+      if (dom) {
+        const div = document.createElement('div')
+        div.className = 'upImgBox'
+        // div.title = "上传图片";
+        div.innerHTML = '上传图片'
+        div.onclick = async () => {
+          myInput.current?.click()
+        }
+        dom.appendChild(div)
       }
-      dom.appendChild(div)
     }, 200)
 
     // 监听 富文本 的 class 变化,在全屏的时候会 富文本会添加上 fullscreen 的类

+ 1 - 1
src/pages/A2intro/index.tsx

@@ -26,7 +26,7 @@ function A2intro() {
 
   const getList = useCallback(async () => {
     const data = await getAboutListAPI()
-    ZRichTextRef.current?.ritxtShowFu(data[0].rtf)
+    if (data[0] && data[0].rtf) ZRichTextRef.current?.ritxtShowFu(data[0].rtf)
     dispatch({ type: 'A2/getList', payload: data })
   }, [dispatch])
 

+ 1 - 1
src/pages/B3scene/B3add/index.tsx

@@ -135,7 +135,7 @@ function B3add({ info, closeFu, addTableFu, upTableFu }: Props) {
           </div>
 
           <Form.Item
-            label='景链接'
+            label='景链接'
             name='link'
             rules={[{ required: true, message: '请输入内容' }]}
           >

+ 48 - 52
src/utils/http.ts

@@ -1,90 +1,86 @@
-import axios from "axios";
-import history from "./history";
-import { getTokenInfo, removeTokenInfo } from "./storage";
-import store from "@/store";
-import { MessageFu } from "./message";
-import { domShowFu } from "./domShow";
+import axios from 'axios'
+import history from './history'
+import { getTokenInfo, removeTokenInfo } from './storage'
+import store from '@/store'
+import { MessageFu } from './message'
+import { domShowFu } from './domShow'
 
-const envFlag = process.env.NODE_ENV === "development";
+const envFlag = process.env.NODE_ENV === 'development'
 
-// const baseUrlTemp = "https://sit-shibadong.4dage.com"; // 测试环境
-const baseUrlTemp = "http://192.168.20.61:8068"; // 线下环境
+const baseUrlTemp = 'https://sit-shibadong.4dage.com' // 测试环境
+// const baseUrlTemp = 'http://192.168.20.61:8068' // 线下环境
 
-const baseFlag = baseUrlTemp.includes("https://");
+const baseFlag = baseUrlTemp.includes('https://')
 
 // 请求基地址
-export const baseURL = envFlag
-  ? `${baseUrlTemp}${baseFlag ? "" : "/api/"}`
-  : "";
+export const baseURL = envFlag ? `${baseUrlTemp}${baseFlag ? '' : '/api/'}` : ''
 
 // 处理  类型“AxiosResponse<any, any>”上不存在属性“code”
-declare module "axios" {
+declare module 'axios' {
   interface AxiosResponse {
-    code: number;
-    timestamp: string;
+    code: number
+    timestamp: string
     // 这里追加你的参数
   }
 }
 
 // 创建 axios 实例
 const http = axios.create({
-  baseURL: `${baseURL}${baseFlag ? "/api/" : ""}`,
-  timeout: 10000,
-});
+  baseURL: `${baseURL}${baseFlag ? '/api/' : ''}`,
+  timeout: 10000
+})
 
-let axajInd = 0;
+let axajInd = 0
 
 // 请求拦截器
 http.interceptors.request.use(
   function (config: any) {
     // 发请求前打开加载提示
-    domShowFu("#AsyncSpinLoding", true);
+    domShowFu('#AsyncSpinLoding', true)
 
-    axajInd++;
+    axajInd++
 
-    const { token } = getTokenInfo();
-    if (token) config.headers.token = token;
-    return config;
+    const { token } = getTokenInfo()
+    if (token) config.headers.token = token
+    return config
   },
   function (err) {
-    return Promise.reject(err);
+    return Promise.reject(err)
   }
-);
+)
 
-let timeId = -1;
+let timeId = -1
 
 // 响应拦截器
 http.interceptors.response.use(
   function (response) {
     // 请求回来的关闭加载提示
-    axajInd--;
+    axajInd--
     if (axajInd === 0) {
-      domShowFu("#AsyncSpinLoding", false);
+      domShowFu('#AsyncSpinLoding', false)
     }
     if (response.data.code === 5001 || response.data.code === 5002) {
-      removeTokenInfo();
-      history.push("/login");
-      clearTimeout(timeId);
+      removeTokenInfo()
+      history.push('/login')
+      clearTimeout(timeId)
       timeId = window.setTimeout(() => {
-        MessageFu.warning("登录失效!");
-      }, 200);
+        MessageFu.warning('登录失效!')
+      }, 200)
     } else if (response.data.code === 0) {
       // MessageFu.success(response.data.msg);
-    } else if (response.data.code !== 3014)
-      MessageFu.warning(response.data.msg);
+    } else if (response.data.code !== 3014) MessageFu.warning(response.data.msg)
 
-    return response.data;
+    return response.data
   },
   async function (err) {
-    clearTimeout(timeId);
+    clearTimeout(timeId)
     timeId = window.setTimeout(() => {
-      axajInd = 0;
-      domShowFu("#AsyncSpinLoding", false);
+      axajInd = 0
+      domShowFu('#AsyncSpinLoding', false)
       // 如果因为网络原因,response没有,给提示消息
       if (!err.response) {
-        if (store.getState().A0Layout.closeUpFile.state)
-          MessageFu.warning("取消上传!");
-        else MessageFu.error("网络繁忙,请稍后重试!");
+        if (store.getState().A0Layout.closeUpFile.state) MessageFu.warning('取消上传!')
+        else MessageFu.error('网络繁忙,请稍后重试!')
       } else {
         if (
           err.response &&
@@ -92,19 +88,19 @@ http.interceptors.response.use(
           err.response.data.msg &&
           err.response.data.msg.length < 30
         ) {
-          MessageFu.error(err.response.data.msg);
+          MessageFu.error(err.response.data.msg)
           // 没有权限
           if (err.response.data.code === 5003) {
-            removeTokenInfo();
-            history.push("/login");
+            removeTokenInfo()
+            history.push('/login')
           }
-        } else MessageFu.error("响应错误,请联系管理员!");
+        } else MessageFu.error('响应错误,请联系管理员!')
       }
-    }, 100);
+    }, 100)
 
-    return Promise.reject(err);
+    return Promise.reject(err)
   }
-);
+)
 
 // 导出 axios 实例
-export default http;
+export default http