Merge branch 'master' of http://git.ycjcjy.com/shigongli/client-s

config/dev.js

@@ -24,7 +24,7 @@ module.exports = {
       proxy: {
         '/api': {
           // target: 'https://sgl.ycjcjy.com',
-          target: 'http://localhost:7080',
+          target: 'http://192.168.211.105:7080',
           changeOrigin: true
         }
       }

src/pages/imglist/index.jsx

@@ -12,7 +12,6 @@ import groupby from "lodash.groupby";
 import NoData from "@/compents/NoData";
 import IsLogin from "../../layout/IsLogin";
 
-
 const index = props => {
   const { query } = getQueryValue();
 
@@ -20,7 +19,7 @@ const index = props => {
   const [labelState, setLabelState] = useState(false);
   const [list, setList] = useState({});
   const [labelList, setLabelList] = useState([]);
-  const [data, setData] = useState({});
+  const [data, setData] = useState([]);
   const [tagList, setTagList] = useState([]);
 
   let [arrList, setArrList] = useState({});
@@ -32,7 +31,7 @@ const index = props => {
   const getMateTagGroupList = () => {
     request({
       url: "/taMateTagGroup",
-      params: { pageSize: 1, pageSize: 9999 }
+      params: { pageSize: 9999 }
     }).then(res => {
       const { records, ...page } = res.data.data;
       setTagList(records);
@@ -40,14 +39,15 @@ const index = props => {
   };
 
   const getImageList = () => {
-    request({ url: "/taMetaImageTag", params: { tagIds: query } }).then(res => {
+    request({
+      url: "/taMetaImageTag",
+      params: { tagIds: query, pageSize: 9999 }
+    }).then(res => {
       const { records, ...page } = res.data.data;
       setList(groupby(records, item => item.imageId));
     });
   };
   const updateImage = () => {
-
-
     Taro.chooseImage({
       sourceType: ["album"],
       success: res => {
@@ -58,7 +58,7 @@ const index = props => {
             newImage: res[0].imageId,
             newTags: data.map(x => x.tagId)
           };
-          updatainfo(newInfo);
+          updatainfo(newInfo,'image');
         });
       }
     });
@@ -71,10 +71,10 @@ const index = props => {
       newImage: data[0].imageId,
       newTags: labelList.map(x => x.tagId)
     };
-    updatainfo(newInfo);
+    updatainfo(newInfo,'tag');
   };
 
-  const updatainfo = newInfo => {
+  const updatainfo = (newInfo,type) => {
     const oldinfo = {
       originImage: data[0].imageId,
       originTags: data.map(x => x.tagId)
@@ -84,8 +84,20 @@ const index = props => {
       data: { ...oldinfo, ...newInfo },
       method: "put"
     }).then(() => {
-      getImageList();
-      setLabelState(false);
+      Taro.showModal({
+        title: "修改成功",
+        content:type==='tag'? "修改标签请重新查询":'',
+        showCancel: false,
+        success: function(res) {
+          if (res.confirm) {
+            console.log("用户点击确定");
+            getImageList();
+            setLabelState(false);
+          } else if (res.cancel) {
+            console.log("用户点击取消");
+          }
+        }
+      });
     });
   };
 
@@ -94,7 +106,7 @@ const index = props => {
     setLabelState(true);
   };
   const handleClose = e => {
-    console.log(e, "111");
+    // console.log(e, "111");
 
     setIsOpened(false);
   };
@@ -109,6 +121,27 @@ const index = props => {
           console.log("用户点击确定");
 
           setIsOpened(false);
+          request({
+            url: `/taMetaImageTag`,
+            params: { ids: data.map(x => x.serialNo).join(",") },
+            method: "delete"
+          }).then(res => {
+            // const { records, ...page } = res.data.data;
+            // setList(groupby(records, item => item.imageId));
+            Taro.showModal({
+              title: "删除成功",
+              showCancel: false,
+              success: function(res) {
+                if (res.confirm) {
+                  console.log("用户点击确定");
+                  getImageList();
+                } else if (res.cancel) {
+                  console.log("用户点击取消");
+                }
+              }
+            });
+          });
+
           // Taro.showModal({
           //   title: `改标签组有${row.user.number}个标签仍在使用。请先清空标签，再删除标签组`,
           //   showCancel: false,
@@ -175,38 +208,41 @@ const index = props => {
           )}
 
           {labelState && (
-            <View style={{ textAlign: "center" }}>
-              <View style={{ padding: "0 20px" }}>
-                {tagList.map((item, index) => {
-                  return (
-                    <View className="imglist-tagcard" key={item.name}>
-                      <Text>{item.name}</Text>
-                      <Tags
-                        list={item.taMateTagList}
-                        onChange={e => onLabelChange(e, index)}
-                        style={{ marginTop: "90rpx" }}
-                      />
-                    </View>
-                  );
-                })}
+            <View>
+              <View style={{ textAlign: "center" }}>
+                <View style={{}}>
+                  {tagList.map((item, index) => {
+                    return (
+                      <View className="imglist-tagcard" key={item.name}>
+                        <Text>{item.name}</Text>
+                        <Tags
+                          list={item.taMateTagList}
+                          onChange={e => onLabelChange(e, index)}
+                          style={{ marginTop: "90rpx" }}
+                        />
+                      </View>
+                    );
+                  })}
+                </View>
               </View>
-              <Tab
-                pageState="3"
-                value={["取消", "选择"]}
-                onClick={[e => setLabelState(false), e => ontagsClick()]}
-              ></Tab>
             </View>
           )}
         </NoData>
-
+        {labelState && (
+          <Tab
+            pageState="3"
+            value={["取消", "选择"]}
+            onClick={[e => setLabelState(false), e => ontagsClick()]}
+          ></Tab>
+        )}
         <AtFloatLayout
           isOpened={isOpened}
           onClose={() => handleClose()}
           style={{ zIndex: "1000" }}
         >
           <View className="floatmodel">
-            <View onClick={() => updateLabel()}>更改标签</View>
-            <View onClick={() => updateImage()}>更换图片</View>
+            <View onClick={() => updateLabel('tag')}>更改标签</View>
+            <View onClick={() => updateImage('image')}>更换图片</View>
             <View onClick={() => deleteImage()}>删除</View>
             <View
               style={{ color: "#d2d2d2" }}

src/util/request.js

@@ -31,7 +31,7 @@ export function optionBuilder(options) {
   // console.log(user,'user')
   let api = `/api/mp${url}`
 
-  if (method == 'get'&&JSON.stringify(params) != "{}") {
+  if (JSON.stringify(params) != "{}") {
     api = `${api}?${paramsToString(params)}`
   } 
   const token = Taro.getStorageSync('token')||''