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

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

@@ -143,7 +143,6 @@ function H1detail() {
     pageNum: 1,
     pageSize: 10,
     searchKey: '',
-    searchTagName: '',
     level: undefined as string | undefined,
     typeDictId: undefined as (string | number)[] | undefined,
     region: undefined as string | undefined,
@@ -200,7 +199,6 @@ function H1detail() {
       pageNum: 1,
       pageSize: 10,
       searchKey: '',
-      searchTagName: '',
       level: undefined,
       typeDictId: undefined,
       region: undefined,

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://')
 

src/utils/tableData.ts

@@ -117,7 +117,7 @@ export const I8tableC = [
 export const storyTableC = [
   ['txt', '故事标题', 'name'],
   ['txt', '关联藏品', 'goodName'],
-  ['txt', '藏品类别', 'tagName', '藏品'],
+  ['txtCTag', '藏品类别', 'tagDictId', '藏品'],
   ['txt', '录入人', 'creatorName'],
   ['txt', '录入日期', 'createTime']
 ]
@@ -125,7 +125,7 @@ export const storyTableC = [
 export const storyAndGoodsTableC = [
   ['txt', '藏品登记号', 'num'],
   ['img', '封面', 'thumb'],
-  ['txt', '藏品类别', 'tagName', '藏品'],
+  ['txtCTag', '藏品类别', 'tagDictId', '藏品'],
   ['txt', '藏品名称', 'name']
 ]
 
@@ -293,7 +293,7 @@ export const staffTableC = [
 export const showGoodTableC = [
   ['txt', '藏品登记号', 'goodNum'],
   ['img', '封面', 'goodThumb'],
-  ['txtCTag', '藏品类别', 'goodTag', '藏品'],
+  ['txtCTag', '藏品类别', 'tagDictId', '藏品'],
   ['txt', '藏品名称', 'goodName'],
   ['txt', '展区', 'region'],
   ['txt', '具体位置', 'address'],