zlisen 4 年前
父节点
当前提交
5f3cb4ee44
共有 3 个文件被更改,包括 66 次插入30 次删除
  1. 1
    1
      config/dev.js
  2. 64
    28
      src/pages/imglist/index.jsx
  3. 1
    1
      src/util/request.js

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

24
       proxy: {
24
       proxy: {
25
         '/api': {
25
         '/api': {
26
           // target: 'https://sgl.ycjcjy.com',
26
           // target: 'https://sgl.ycjcjy.com',
27
-          target: 'http://localhost:7080',
27
+          target: 'http://192.168.211.105:7080',
28
           changeOrigin: true
28
           changeOrigin: true
29
         }
29
         }
30
       }
30
       }

+ 64
- 28
src/pages/imglist/index.jsx 查看文件

12
 import NoData from "@/compents/NoData";
12
 import NoData from "@/compents/NoData";
13
 import IsLogin from "../../layout/IsLogin";
13
 import IsLogin from "../../layout/IsLogin";
14
 
14
 
15
-
16
 const index = props => {
15
 const index = props => {
17
   const { query } = getQueryValue();
16
   const { query } = getQueryValue();
18
 
17
 
32
   const getMateTagGroupList = () => {
31
   const getMateTagGroupList = () => {
33
     request({
32
     request({
34
       url: "/taMateTagGroup",
33
       url: "/taMateTagGroup",
35
-      params: { pageSize: 1, pageSize: 9999 }
34
+      params: { pageSize: 9999 }
36
     }).then(res => {
35
     }).then(res => {
37
       const { records, ...page } = res.data.data;
36
       const { records, ...page } = res.data.data;
38
       setTagList(records);
37
       setTagList(records);
40
   };
39
   };
41
 
40
 
42
   const getImageList = () => {
41
   const getImageList = () => {
43
-    request({ url: "/taMetaImageTag", params: { tagIds: query } }).then(res => {
42
+    request({
43
+      url: "/taMetaImageTag",
44
+      params: { tagIds: query, pageSize: 9999 }
45
+    }).then(res => {
44
       const { records, ...page } = res.data.data;
46
       const { records, ...page } = res.data.data;
45
       setList(groupby(records, item => item.imageId));
47
       setList(groupby(records, item => item.imageId));
46
     });
48
     });
47
   };
49
   };
48
   const updateImage = () => {
50
   const updateImage = () => {
49
-
50
-
51
     Taro.chooseImage({
51
     Taro.chooseImage({
52
       sourceType: ["album"],
52
       sourceType: ["album"],
53
       success: res => {
53
       success: res => {
84
       data: { ...oldinfo, ...newInfo },
84
       data: { ...oldinfo, ...newInfo },
85
       method: "put"
85
       method: "put"
86
     }).then(() => {
86
     }).then(() => {
87
-      getImageList();
88
-      setLabelState(false);
87
+      Taro.showModal({
88
+        title: "修改成功",
89
+        content: "如果修改是标签请重新查询",
90
+        showCancel: false,
91
+        success: function(res) {
92
+          if (res.confirm) {
93
+            console.log("用户点击确定");
94
+            getImageList();
95
+            setLabelState(false);
96
+          } else if (res.cancel) {
97
+            console.log("用户点击取消");
98
+          }
99
+        }
100
+      });
89
     });
101
     });
90
   };
102
   };
91
 
103
 
94
     setLabelState(true);
106
     setLabelState(true);
95
   };
107
   };
96
   const handleClose = e => {
108
   const handleClose = e => {
97
-    console.log(e, "111");
109
+    // console.log(e, "111");
98
 
110
 
99
     setIsOpened(false);
111
     setIsOpened(false);
100
   };
112
   };
110
           console.log("用户点击确定");
122
           console.log("用户点击确定");
111
 
123
 
112
           setIsOpened(false);
124
           setIsOpened(false);
125
+          request({
126
+            url: `/taMetaImageTag`,
127
+            params: { ids: data.map(x => x.serialNo).join(",") },
128
+            method: "delete"
129
+          }).then(res => {
130
+            // const { records, ...page } = res.data.data;
131
+            // setList(groupby(records, item => item.imageId));
132
+            Taro.showModal({
133
+              title: "删除成功",
134
+              showCancel: false,
135
+              success: function(res) {
136
+                if (res.confirm) {
137
+                  console.log("用户点击确定");
138
+                  getImageList();
139
+                } else if (res.cancel) {
140
+                  console.log("用户点击取消");
141
+                }
142
+              }
143
+            });
144
+          });
145
+
113
           // Taro.showModal({
146
           // Taro.showModal({
114
           //   title: `改标签组有${row.user.number}个标签仍在使用。请先清空标签,再删除标签组`,
147
           //   title: `改标签组有${row.user.number}个标签仍在使用。请先清空标签,再删除标签组`,
115
           //   showCancel: false,
148
           //   showCancel: false,
177
           )}
210
           )}
178
 
211
 
179
           {labelState && (
212
           {labelState && (
180
-            <View style={{ textAlign: "center" }}>
181
-              <View style={{ padding: "0 20px" }}>
182
-                {tagList.map((item, index) => {
183
-                  return (
184
-                    <View className="imglist-tagcard">
185
-                      <Text>{item.name}</Text>
186
-                      <Tags
187
-                        list={item.taMateTagList}
188
-                        onChange={e => onLabelChange(e, index)}
189
-                        style={{ marginTop: "90rpx" }}
190
-                      />
191
-                    </View>
192
-                  );
193
-                })}
213
+            <View>
214
+              <View style={{ textAlign: "center" }}>
215
+                <View style={{}}>
216
+                  {tagList.map((item, index) => {
217
+                    return (
218
+                      <View className="imglist-tagcard">
219
+                        <Text>{item.name}</Text>
220
+                        <Tags
221
+                          list={item.taMateTagList}
222
+                          onChange={e => onLabelChange(e, index)}
223
+                          style={{ marginTop: "90rpx" }}
224
+                        />
225
+                      </View>
226
+                    );
227
+                  })}
228
+                </View>
194
               </View>
229
               </View>
195
-              <Tab
196
-                pageState="3"
197
-                value={["取消", "选择"]}
198
-                onClick={[e => setLabelState(false), e => ontagsClick()]}
199
-              ></Tab>
200
             </View>
230
             </View>
201
           )}
231
           )}
202
         </NoData>
232
         </NoData>
203
-
233
+        {labelState && (
234
+          <Tab
235
+            pageState="3"
236
+            value={["取消", "选择"]}
237
+            onClick={[e => setLabelState(false), e => ontagsClick()]}
238
+          ></Tab>
239
+        )}
204
         <AtFloatLayout
240
         <AtFloatLayout
205
           isOpened={isOpened}
241
           isOpened={isOpened}
206
           onClose={() => handleClose()}
242
           onClose={() => handleClose()}

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

31
   // console.log(user,'user')
31
   // console.log(user,'user')
32
   let api = `/api/mp${url}`
32
   let api = `/api/mp${url}`
33
 
33
 
34
-  if (method == 'get'&&JSON.stringify(params) != "{}") {
34
+  if (JSON.stringify(params) != "{}") {
35
     api = `${api}?${paramsToString(params)}`
35
     api = `${api}?${paramsToString(params)}`
36
   } 
36
   } 
37
   const token = Taro.getStorageSync('token')||''
37
   const token = Taro.getStorageSync('token')||''