zlisen 4 年之前
父節點
當前提交
6a660f20c7
共有 6 個檔案被更改,包括 55 行新增22 行删除
  1. 1
    1
      config/index.js
  2. 8
    0
      package-lock.json
  3. 1
    2
      src/compents/tags/index.jsx
  4. 22
    10
      src/pages/batchimport/index.jsx
  5. 22
    8
      src/pages/material/index.jsx
  6. 1
    1
      src/util/request.js

+ 1
- 1
config/index.js 查看文件

@@ -68,7 +68,7 @@ const config = {
68 68
     '@/layout': path.resolve(__dirname, '..', 'src/layout'),
69 69
     '@/store': path.resolve(__dirname, '..', 'src/store'),
70 70
     '@/reducers': path.resolve(__dirname, '..', 'src/reducers'),
71
-    '@/util': path.resolve(__dirname, '..', 'src/util')
71
+    '@/util': path.resolve(__dirname, '..', 'src/util'),
72 72
   }
73 73
 }
74 74
 

+ 8
- 0
package-lock.json 查看文件

@@ -14653,6 +14653,14 @@
14653 14653
       "resolved": "https://registry.npm.taobao.org/react-is/download/react-is-16.13.1.tgz?cache=0&sync_timestamp=1608327781676&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freact-is%2Fdownload%2Freact-is-16.13.1.tgz",
14654 14654
       "integrity": "sha1-eJcppNw23imZ3BVt1sHZwYzqVqQ="
14655 14655
     },
14656
+    "react-list": {
14657
+      "version": "0.8.16",
14658
+      "resolved": "https://registry.npm.taobao.org/react-list/download/react-list-0.8.16.tgz",
14659
+      "integrity": "sha1-PxmySZmN4Ahnh9o3idNbWVU+3jo=",
14660
+      "requires": {
14661
+        "prop-types": "15"
14662
+      }
14663
+    },
14656 14664
     "react-reconciler": {
14657 14665
       "version": "0.23.0",
14658 14666
       "resolved": "https://registry.npm.taobao.org/react-reconciler/download/react-reconciler-0.23.0.tgz",

+ 1
- 2
src/compents/tags/index.jsx 查看文件

@@ -12,7 +12,7 @@ const tags = (props) => {
12 12
     const [state, setState] = useState(1)
13 13
     const [key, setKey] = useState(value)
14 14
     const [keyList, setKeyList] = useState([])
15
-    console.log(props)
15
+
16 16
     useEffect(() => {
17 17
 
18 18
     }, [])
@@ -27,7 +27,6 @@ const tags = (props) => {
27 27
             newkeyList.push(item)
28 28
         }
29 29
 
30
-console.log(newkeyList,keyList)
31 30
         setKeyList([...newkeyList])
32 31
         onChange([...newkeyList])
33 32
     }

+ 22
- 10
src/pages/batchimport/index.jsx 查看文件

@@ -16,7 +16,7 @@ const batchimport = (props) => {
16 16
     const [imgUrl, setImgUrl] = useState({})
17 17
     const [tagList, setTagList] = useState([])
18 18
 
19
-    let [arrList, setArrList] = useState([[], [], []])
19
+    let [arrList, setArrList] = useState({})
20 20
     useDidShow(() => {
21 21
         getMateTagGroupList()
22 22
     })
@@ -61,12 +61,24 @@ const batchimport = (props) => {
61 61
 
62 62
     const onLabelChange = (e, index) => {
63 63
         console.log(e, index, 'onLabelChange')
64
+        let newArrArrList={
65
+            ...arrList,
66
+            [index]: e
67
+        }
68
+        setArrList(newArrArrList)
69
+        console.log(newArrArrList, 'arrList')
70
+        let newArr = Object.values(newArrArrList).reduce((pre, cur) => {
71
+
72
+            return pre.concat(cur)
64 73
 
65
-        // arrList[index] = e
66
-        // const [arrList, setArrList] = useState([[],[],[]])
67
-        setLabelList(e)
74
+        }, [])
75
+        setLabelList(newArr)
76
+        // console.log(newArr, 'newArr')
77
+        // // arrList[index] = e
78
+        // // const [arrList, setArrList] = useState([[],[],[]])
79
+        // setLabelList(e)
68 80
 
69
-        // console.log(arrList.flat(), 'labelList')
81
+        // // console.log(arrList.flat(), 'labelList')
70 82
     }
71 83
 
72 84
 
@@ -84,7 +96,7 @@ const batchimport = (props) => {
84 96
     }
85 97
 
86 98
     return <View className='batchimport'>
87
-        {pageState == 2 && <View>
99
+        <View style={{ display: pageState == '1' ? 'none' : 'block' }}>
88 100
             <Text>标签</Text>
89 101
             <View style={{ padding: '0 20px' }}>
90 102
 
@@ -120,8 +132,8 @@ const batchimport = (props) => {
120 132
             {/* <Tab value={['取消','']}  onClick={() => { Taro.navigateTo({ url: `/pages/label/edit/index` }) }} ></Tab> */}
121 133
             <Tab pageState='3' value={['取消', '上传']} onClick={[(e) => { setLabelList([]); setPageState('1') }, (e) => onSave(e)]}></Tab>
122 134
         </View>
123
-        }
124
-        {pageState == 1 && <View>
135
+        
136
+       <View style={{ display: pageState == '2' ? 'none' : 'block' }}>
125 137
             <View style={{ padding: '0 20px' }}>
126 138
 
127 139
                 {
@@ -134,9 +146,9 @@ const batchimport = (props) => {
134 146
                 }
135 147
             </View>
136 148
             {/* <Tab value={['取消','']}  onClick={() => { Taro.navigateTo({ url: `/pages/label/edit/index` }) }} ></Tab> */}
137
-            <Tab pageState='3' value={['取消', '选择']} onClick={[(e) => setPageState('2'), (e) => setPageState('2')]}></Tab>
149
+            <Tab pageState='3' value={['取消', '选择']} onClick={[(e) =>{ setPageState('2')}, (e) => setPageState('2')]}></Tab>
138 150
         </View>
139
-        }
151
+        
140 152
     </View >
141 153
 }
142 154
 

+ 22
- 8
src/pages/material/index.jsx 查看文件

@@ -23,7 +23,7 @@ const index = (props) => {
23 23
 
24 24
 
25 25
 
26
-    let [arrList, setArrList] = useState([[]])
26
+    let [arrList, setArrList] = useState({})
27 27
     const [labelList, setLabelList] = useState([])
28 28
     const [list, setList] = useState([])
29 29
     useEffect(() => {
@@ -49,13 +49,27 @@ const index = (props) => {
49 49
     }
50 50
 
51 51
     const onLabelChange = (e, index) => {
52
-        console.log(e, index, 'onLabelChange')
53
-
54
-        arrList[index] = e
55
-        // const [arrList, setArrList] = useState([[],[],[]])
56
-        setLabelList(arrList.flat())
57
-
58
-        console.log(arrList.flat(), 'labelList')
52
+          
53
+        let newArrArrList={
54
+            ...arrList,
55
+            [index]: e
56
+        }
57
+        setArrList(newArrArrList)
58
+        console.log(newArrArrList, 'arrList')
59
+        let newArr = Object.values(newArrArrList).reduce((pre, cur) => {
60
+
61
+            return pre.concat(cur)
62
+
63
+        }, [])
64
+        setLabelList(newArr)
65
+        console.log(newArr, 'newArr')
66
+        // console.log(e, index, 'onLabelChange')
67
+
68
+        // arrList[index] = e
69
+        // // const [arrList, setArrList] = useState([[],[],[]])
70
+        // setLabelList(arrList.flat())
71
+
72
+        // console.log(arrList.flat(), 'labelList')
59 73
     }
60 74
 
61 75
 

+ 1
- 1
src/util/request.js 查看文件

@@ -41,7 +41,7 @@ export function optionBuilder(options) {
41 41
     data,
42 42
     header: {
43 43
       'content-type': 'application/json',
44
-      'authorization': `X-Authorization-JWT ${token}`,
44
+      'X-Authorization-JWT': `${token}`,
45 45
       // 'appId': appId,
46 46
       // 'x-action': 'miniapp',
47 47
       // 'x-version': Version,