|
@@ -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
|
|