Merge branch 'master' of http://192.168.0.115:3000/shaogen1995/qingDao_goods

src/pages/Hexhibits/H1loan/H1detail/index.tsx

@@ -20,7 +20,7 @@ import dayjs from 'dayjs'
 import { baseURL } from '@/utils/http'
 import { FileListType } from '@/components/Z3upFiles/data'
 import MyTable from '@/components/MyTable'
-import { getDictFu, selectObj } from '@/utils/dataChange'
+import { selectObj } from '@/utils/dataChange'
 import { showGoodTableC } from '@/utils/tableData'
 import store from '@/store'
 import { tagApiArr } from '@/pages/ZgoodsInfo/data'
@@ -296,15 +296,6 @@ function H1detail() {
     return arr.map(v => ({ label: v, value: v }))
   }, [info.region])
 
-  const typeDictOptions = useMemo(() => {
-    // 待完善sg
-    try {
-      return getDictFu('藏品类别') || []
-    } catch {
-      return []
-    }
-  }, [])
-
   return (
     <div className={styles.H1detail}>
       <div className='H1detailMain'>

src/pages/ZgoodsInfo/index.tsx

@@ -252,7 +252,10 @@ function ZgoodsInfo() {
           )
         })
       }
+    }
 
+    if (info.artDictId) {
+      if (typeof dom === 'string') dom = []
       const txt2: string = resTagFu(info.artDictId, '文创')
 
       if (txt2) {
@@ -266,6 +269,7 @@ function ZgoodsInfo() {
         })
       }
     }
+
     return dom
   }, [info.artDictId, info.tagDictId])
 

src/utils/http.ts

@@ -10,8 +10,8 @@ export const defaultPassWord = 'Aa147852'
 
 export const envFlag = process.env.NODE_ENV === 'development'
 
-// const baseUrlTemp = 'https://sit-qingdaobeer.4dage.com' // 测试环境
-const baseUrlTemp = 'http://192.168.20.61:8112' // 线下环境
+const baseUrlTemp = 'https://sit-qingdaobeer.4dage.com' // 测试环境
+// const baseUrlTemp = 'http://192.168.20.61:8112' // 线下环境
 
 const baseFlag = baseUrlTemp.includes('https://')