zlisen 4 years ago
parent
commit
8f1276fcb8

+ 1
- 0
debug.log View File

@@ -1 +1,2 @@
1 1
 [1226/120058.409:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
2
+[1228/193358.997:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)

BIN
shigonglih5.rar View File


+ 1
- 1
src/pages/batchimport/index.jsx View File

@@ -15,7 +15,7 @@ const batchimport = (props) => {
15 15
     const [labelList, setLabelList] = useState([])
16 16
     const [imgUrl, setImgUrl] = useState({})
17 17
     const [tagList, setTagList] = useState([])
18
-    const [radioHouse, setRadioHouse] = useState()
18
+
19 19
     let [arrList, setArrList] = useState([[], [], []])
20 20
     useDidShow(() => {
21 21
         getMateTagGroupList()

+ 32
- 16
src/pages/imglist/index.jsx View File

@@ -131,25 +131,41 @@ const index = (props) => {
131 131
 
132 132
         setIsOpened(false)
133 133
     }
134
-    const onSave = () => {
135
-        console.log(333)
136 134
 
135
+    const deleteImage = (e) => {
137 136
         Taro.showModal({
138
-            title: '修改成功',
139
-            content: '点击确认按钮,返回上级菜单',
140
-            showCancel: false,
137
+            title: '确定删除该图片吗?',
138
+            
139
+            cancelColor: '#d2d2d2',
140
+            confirmColor: "#274191",
141 141
             success: function (res) {
142
-                if (res.confirm) {
143
-                    console.log('用户点击确定')
144
-
145
-                    Taro.navigateBack({
146
-                        delta: 1
147
-                    })
148
-                } else if (res.cancel) {
149
-                    console.log('用户点击取消')
150
-                }
142
+              if (res.confirm) {
143
+                console.log('用户点击确定')
144
+      
145
+                setIsOpened(false)
146
+                // Taro.showModal({
147
+                //   title: `改标签组有${row.user.number}个标签仍在使用。请先清空标签,再删除标签组`,
148
+                //   showCancel: false,
149
+                //   // cancelColor:'#d2d2d2',
150
+                //   confirmColor: "#274191",
151
+                //   success: function (res) {
152
+                //     if (res.confirm) {
153
+                //       console.log('用户点击确定')
154
+      
155
+      
156
+                //     } else if (res.cancel) {
157
+                //       console.log('用户点击取消')
158
+                //     }
159
+                //   }
160
+                // })
161
+      
162
+              } else if (res.cancel) {
163
+                setIsOpened(false)
164
+              }
151 165
             }
152
-        })
166
+       
167
+    })
168
+ 
153 169
     }
154 170
 
155 171
     const onLabelChange = (e, index) => {
@@ -208,7 +224,7 @@ const index = (props) => {
208 224
             <View className='floatmodel' >
209 225
                 <View onClick={() => updateLabel()}>更改标签</View>
210 226
                 <View onClick={() => updateImage()}>更换图片</View>
211
-                <View onClick={() => { setIsOpened(false); setRadioHouseState(true) }}>删除</View>
227
+                <View onClick={() => deleteImage() }>删除</View>
212 228
                 <View style={{ color: '#d2d2d2' }} onClick={() => setIsOpened(false)}>取消</View>
213 229
             </View>
214 230
 

+ 8
- 6
src/pages/imglist/index.scss View File

@@ -61,7 +61,7 @@
61 61
 
62 62
 
63 63
 .floatmodel {
64
-  height: 500px;
64
+  min-height: 400px;
65 65
   display: flex;
66 66
   flex-direction: column;
67 67
   justify-content: space-around;
@@ -70,16 +70,18 @@
70 70
 }
71 71
 
72 72
 .at-float-layout__container {
73
-  min-height: 100px;
73
+  min-height: 400px;
74 74
   color: #274291;
75 75
   font-weight: 600;
76 76
   border-radius: 50px 50px 0 0;
77 77
 }
78 78
 
79 79
 .at-float-layout {
80
-  .layout-page {
80
+  .layout-body {
81 81
     padding: 0;
82
+    min-height: 400px;
82 83
   }
83
-
84
-}
85
-
84
+  .layout-body__content{
85
+    min-height: 400px;
86
+  }
87
+}

+ 1
- 1
src/pages/mateTag/index.jsx View File

@@ -25,7 +25,7 @@ const house = (props) => {
25 25
   // })
26 26
   const getMateTagList = () => {
27 27
     console.log(id,'getMateTagList')
28
-    request({ url: '/api/mp/taMateTag',params:{groupId:id},method: 'get', }).then((res) => {
28
+    request({ url: '/taMateTag',params:{groupId:id},method: 'get', }).then((res) => {
29 29
       const { records, ...page} = res.data.data
30 30
       setList(records)
31 31
     })