fix

src/app.js

@@ -1,4 +1,3 @@
-
 import 'taro-ui/dist/style/index.scss'
 import React, { Component, useEffect } from 'react'
 import { Provider } from 'react-redux'
@@ -6,7 +5,6 @@ import configStore from './store'
 import useUser from './store/user'
 import { getCode, setCode } from './util/getCode'
 import getCodeUrl from './util/getCodeUrl' 
-import request from './util/request'
 import './app.scss'
 
 const store = configStore()
@@ -16,24 +14,20 @@ const App = (props)=> {
   const code = getCode()
 
   useEffect(() => {
-    // if (!user || !user.userId) {
-    //   if (!code) {
-    //     // 跳转
-    //     window.location.href=getCodeUrl(); 
-    //   } else {
-    //     // 请求 user
-    //     getUser(code)
-    //   }
-    // }
-
-    // return () => setCode(code)
+    if (!user || !user.userId) {
+      if (!code) {
+        // 跳转
+        window.location.href=getCodeUrl(); 
+      } else {
+        // 请求 user
+        getUser(code)
+      }
+    }
+
+    return () => setCode(code)
 
   }, [])
 
-// console.log(getCodeUrl(),'getCodeUrl')
-
-// window.location.href=getCodeUrl(); 
-
   // 在 App 类中的 render() 函数没有实际作用
   // 请勿修改此函数
  

src/layout/IsLogin.jsx

@@ -0,0 +1,18 @@
+import React from "react";
+import { View, ScrollView } from "@tarojs/components";
+import "./index.scss";
+import useUser from "../store/user";
+
+const IsLogin = ({ children }) => {
+  const { user } = useUser();
+  console.log(user, "user");
+
+  return user 
+  ? user.personId
+    ? children
+    :<View style={{textAlign:'center'}}>您没有登录权限</View>
+  : <View style={{textAlign:'center'}}>登录中...</View>
+  ;
+};
+
+export default IsLogin;

src/pages/account/edit/index.jsx

@@ -1,138 +1,111 @@
-import React, { useEffect, useState } from 'react'
-import Taro ,{useDidShow}from "@tarojs/taro";
-import { View, Input, Text, Image, Form, Button } from '@tarojs/components'
-import Layout from '../../../layout/index'
-import Tab from '../../../compents/tab/index'
-import Container from '../../../compents/container/index'
-import './index.scss'
-import request from '../../../util/request'
-
-
-import getQueryValue from '../../../util/getQueryValue'
-
-const index = (props) => {
-
-    const { id, keeperId } = getQueryValue()
-
-    const [data, setData] = useState({})
-    const [pageState, setPageState] = useState('1')
-    const [list, setList] = useState([])
-    useDidShow(() => {
-        console.log('useDidShow')
-        if (keeperId) {
-            getShopKeeperDetail()
-        }else{
-            setData({})
-        }
-    })
-
-
-    const getShopKeeperDetail = () => {
-        request({ url: `/taShopKeeper/${keeperId}`, method: 'get' }).then((res) => {
-            console.log(res,'getDetail')
-            setData(res.data.data)
-        })
-    }
-
-    const onRegisterChange = (e) => {
-        console.log(e, '111')
-    }
-    const onSave = () => {
-        console.log(333)
-
-        // Taro.showModal({
-        //     title: '修改成功',
-        //     content: '点击确认按钮，返回上级菜单',
-        //     showCancel: false,
-        //     success: function (res) {
-        //         if (res.confirm) {
-        //             console.log('用户点击确定')
-
-        //             Taro.navigateBack({
-        //                 delta: 1
-        //             })
-        //         } else if (res.cancel) {
-        //             console.log('用户点击取消')
-        //         }
-        //     }
-        // })
+import React, { useEffect, useState } from "react";
+import Taro, { useDidShow } from "@tarojs/taro";
+import { View, Input, Text, Image, Form, Button } from "@tarojs/components";
+import Layout from "../../../layout/index";
+import Tab from "../../../compents/tab/index";
+import Container from "../../../compents/container/index";
+import "./index.scss";
+import request from "../../../util/request";
+import getQueryValue from "../../../util/getQueryValue";
+import IsLogin from "../../../layout/IsLogin";
+
+const index = props => {
+  const { id, keeperId } = getQueryValue();
+
+  const [data, setData] = useState({});
+
+  useDidShow(() => {
+    console.log("useDidShow");
+    if (keeperId) {
+      getShopKeeperDetail();
+    } else {
+      setData({});
     }
-
-    const editShopKeeper = (value) => {
-        console.log(value, 333)
-
-        if(keeperId){
-            Taro.showModal({
-                title: '确定修改该老板信息吗',
-                cancelColor: '#d2d2d2',
-                confirmColor: "#274191",
-                success: (res) => {
-                  if (res.confirm) {
-                    request({ url: `/taShopKeeper/${keeperId}`, data: {...data, ...value }, method: 'put' }).then((res) => {
-                        Taro.navigateBack({
-                            delta: 1
-                        })
-                    })
-          
-          
-                  } else if (res.cancel) {
-                    console.log('用户点击取消')
-                  }
-                }
-              })
-        }else{
-            request({ url: "/taShopKeeper", data: { ...value, shopId: id }, method: 'post' }).then((res) => {
-                Taro.navigateBack({
-                    delta: 1
-                })
-            })
+  });
+
+  const getShopKeeperDetail = () => {
+    request({ url: `/taShopKeeper/${keeperId}`, method: "get" }).then(res => {
+      console.log(res, "getDetail");
+      setData(res.data.data);
+    });
+  };
+
+  const editShopKeeper = value => {
+
+    if (keeperId) {
+      Taro.showModal({
+        title: "确定修改该老板信息吗",
+        cancelColor: "#d2d2d2",
+        confirmColor: "#274191",
+        success: res => {
+          if (res.confirm) {
+            request({
+              url: `/taShopKeeper/${keeperId}`,
+              data: { ...data, ...value },
+              method: "put"
+            }).then(res => {
+              Taro.navigateBack({
+                delta: 1
+              });
+            });
+          } else if (res.cancel) {
+            console.log("用户点击取消");
+          }
         }
-
-        
-
-    }
-    function formSubmit(e) {
-        console.log(e.detail, 'formSubmit')
-        editShopKeeper(e.detail.value)
-
-
-    }
-
-    const formReset = () => {
-        console.log('formReset')
+      });
+    } else {
+      request({
+        url: "/taShopKeeper",
+        data: { ...value, shopId: id },
+        method: "post"
+      }).then(res => {
+        Taro.navigateBack({
+          delta: 1
+        });
+      });
     }
-
-    return <View className='addnewhouse'>
-
-        {/* "createDate": "2020-12-24T11:57:16.851Z",
-  "keeperId": "string",
-  "name": "string",
-  "personId": "string",
-  "phone": "string",
-  "shopId": "string",
-  "status": 0 */}
+  };
+  function formSubmit(e) {
+    console.log(e.detail, "formSubmit");
+    editShopKeeper(e.detail.value);
+  }
+
+  const formReset = () => {
+    console.log("formReset");
+  };
+
+  return (
+    <IsLogin>
+      <View className="addnewhouse">
         <Form onSubmit={formSubmit} onReset={formReset}>
-            <Layout>
-
-                {/* <View className='inputstyle-view'>
-                    <Text className='title'>系统账号</Text>
-                    <Container className='inputstyle-view-card '  >
-                        <Input name='keeperId' placeholderClass='placeholderinput' placeholder='' className='input' />
-                    </Container>
-                </View> */}
-                <View className='inputstyle-view'>
-                    <Text className='title'>姓名</Text>
-                    <Container className='inputstyle-view-card '  >
-                        <Input name='name' value={data.name} placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
-                    </Container>
-                </View>
-                <View className='inputstyle-view'>
-                    <Text className='title'>电话</Text>
-                    <Container className='inputstyle-view-card '  >
-                        <Input name='phone'  value={data.phone} placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
-                    </Container>
-                </View>
-                {/* <View className='inputstyle-view'>
+          <Layout>
+            <View className="inputstyle-view">
+              <Text className="title">姓名</Text>
+              <Container className="inputstyle-view-card ">
+                <Input
+                  name="name"
+                  value={data.name}
+                  placeholderClass="placeholderinput"
+                  className="input"
+                  type="text"
+                  placeholder=""
+                />
+              </Container>
+            </View>
+            <View className="inputstyle-view">
+              <Text className="title">电话</Text>
+              <Container className="inputstyle-view-card ">
+                <Input
+                  name="phone"
+                  value={data.phone}
+                  placeholderClass="placeholderinput"
+                  className="input"
+                  type="text"
+                  placeholder=""
+                />
+              </Container>
+            </View>
+            {/* <View className='inputstyle-view'>
                     <Text className='title'>微信号</Text>
                     <Container className='inputstyle-view-card '  >
                         <Input name='personId' placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
@@ -150,23 +123,27 @@ const index = (props) => {
                         <Image className='guide-view-img'  style={{width:'100%',height:'100%'}} src={uploadicon || "https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=1657471424,2319316184&fm=26&gp=0.jpg"}></Image>
                     </Container>
                 </View> */}
-
-
-
-            </Layout>
-            {/* <Input formType="submit" > */}
-            <Tab formType="submit" className='addhousetab' pageState='3' value={['取消', '保存']} onClick={[(e) => {
+          </Layout>
+          <Tab
+            formType="submit"
+            className="addhousetab"
+            pageState="3"
+            value={["取消", "保存"]}
+            onClick={[
+              e => {
                 Taro.navigateBack({
-                    delta: 1
-                })
-            }, () => onSave()]}></Tab>
-
-            {/* </Input> */}
-
+                  delta: 1
+                });
+              },
+              () => {}
+            ]}
+          ></Tab>
+
+          {/* </Input> */}
         </Form>
+      </View>
+    </IsLogin>
+  );
+};
 
-
-    </View>
-}
-
-export default index
+export default index;

src/pages/account/index.jsx

@@ -1,97 +1,121 @@
-import React, { useEffect, useMemo, useState, useRef } from 'react'
-import Taro, { useDidShow, useRouter } from '@tarojs/taro'
-import './index.scss'
-import { View, Text, Input, Image } from '@tarojs/components'
-import ContainerLayout from '../../compents/container/index'
-import Tab from '../../compents/tab/index'
-import Layout from '../../layout/index'
-import request from '../../util/request'
-import getQueryValue from '../../util/getQueryValue'
-import NoData from '@/compents/NoData'
-import InifiniteList from '@/compents/InifiniteList'
+import React, { useEffect, useMemo, useState, useRef } from "react";
+import Taro, { useDidShow, useRouter } from "@tarojs/taro";
+import "./index.scss";
+import { View, Text, Input, Image } from "@tarojs/components";
+import ContainerLayout from "../../compents/container/index";
+import Tab from "../../compents/tab/index";
+import Layout from "../../layout/index";
+import request from "../../util/request";
+import getQueryValue from "../../util/getQueryValue";
+import NoData from "@/compents/NoData";
+import InifiniteList from "@/compents/InifiniteList";
+import IsLogin from "../../layout/IsLogin";
 
-const account = (props) => {
-
-  const { id } = getQueryValue()
-  const [list, setList] = useState([])
-  const [page, setPage] = useState({ total: 0, pageNum: 0 })
+const account = props => {
+  const { id } = getQueryValue();
+  const [list, setList] = useState([]);
+  const [page, setPage] = useState({ total: 0, pageNum: 0 });
 
   useDidShow(() => {
-    console.log('useDidShow')
-    getShopKepperList({ pageNum: 1, pageSize:10 })
-  })
+    console.log("useDidShow");
+    getShopKepperList({ pageNum: 1, pageSize: 10 });
+  });
 
   function getShopKepperList(params) {
-    request({ url: '/taShopKeeper',params:{shopId:id,...params}, method: 'get', }).then((res)=>{
-      const { records, ...page} = res.data.data
-      setList(list.concat(records || []))
+    request({
+      url: "/taShopKeeper",
+      params: { shopId: id, ...params },
+      method: "get"
+    }).then(res => {
+      const { records, ...page } = res.data.data;
+      setList(list.concat(records || []));
       setPage({
         ...page,
         pageNum: page.current
-      })
-    })
+      });
+    });
   }
 
-  const onDelete = (keeperId) => {
+  const onDelete = keeperId => {
     Taro.showModal({
-      title: '确定删除该老板账号吗',
-      content: '确定后，该老板房源信息将一并删除',
-      cancelColor: '#d2d2d2',
+      title: "确定删除该老板账号吗",
+      content: "确定后，该老板房源信息将一并删除",
+      cancelColor: "#d2d2d2",
       confirmColor: "#274191",
-      success: (res) => {
+      success: res => {
         if (res.confirm) {
-          console.log('用户点击确定')
-          request({ url: `/taShopKeeper/${keeperId}`, method: 'delete', }).then((res)=>{
-            setList(list.filter((x)=>x.keeperId!=keeperId))
-          })
-
+          console.log("用户点击确定");
+          request({ url: `/taShopKeeper/${keeperId}`, method: "delete" }).then(
+            res => {
+              setList(list.filter(x => x.keeperId != keeperId));
+            }
+          );
         } else if (res.cancel) {
-          console.log('用户点击取消')
+          console.log("用户点击取消");
         }
       }
-    })
-  }
-
+    });
+  };
 
   const loadMore = () => {
-    getShopKepperList({ pageNum: page.pageNum + 1 })
-  }
+    getShopKepperList({ pageNum: page.pageNum + 1 });
+  };
 
-    const renderItem = (index, key) => (
-      <View className='account-view' key={key}>
+  const renderItem = (index, key) => (
+    <View className="account-view" key={key}>
       {/* <Text className='account-view-title'>房源编号：<Text style={{fontSize:"1rem"}}>{item.keeperId}</Text></Text> */}
-      <ContainerLayout className='account-view-card'>
-        <View className='top' >
+      <ContainerLayout className="account-view-card">
+        <View className="top">
           <View>姓名：{list[index].name}</View>
           <View>电话：{list[index].phone}</View>
           {/* <View>微信号：{x.user.name}</View>
           <View>房源数：{x.user.name}</View> */}
         </View>
-        <View className='bottom'>
-          <Text onClick={() => { Taro.navigateTo({ url: `/pages/account/edit/index?keeperId=${list[index].keeperId}` }) }}>编辑</Text>
-          <Text onClick={()=>onDelete(list[index].keeperId)}>删除</Text>
+        <View className="bottom">
+          <Text
+            onClick={() => {
+              Taro.navigateTo({
+                url: `/pages/account/edit/index?keeperId=${list[index].keeperId}`
+              });
+            }}
+          >
+            编辑
+          </Text>
+          <Text onClick={() => onDelete(list[index].keeperId)}>删除</Text>
         </View>
       </ContainerLayout>
     </View>
-  )
-
-  return <View className='account'>
-    <Layout>
-      <NoData nodata={!list.length} tips="暂无老板" style={{minHeight: '200px'}}>
-
+  );
 
-      <InifiniteList
-        length={list.length}
-        total={page.total}
-        height={600}
-        itemRenderer={renderItem}
-        loadMore={loadMore}
-      />
-      </NoData>
-    </Layout>
-    {/* onClick={(e)=>(e) */}
-    <Tab value={['+新增名宿老板账号']} color='#ffffff' onClick={() => { Taro.navigateTo({ url: `/pages/account/edit/index?id=${id}` }) }} ></Tab>
-  </View>
-}
+  return (
+    <IsLogin>
+      <View className="account">
+        <Layout>
+          <NoData
+            nodata={!list.length}
+            tips="暂无老板"
+            style={{ minHeight: "200px" }}
+          >
+            <InifiniteList
+              length={list.length}
+              total={page.total}
+              height={600}
+              itemRenderer={renderItem}
+              loadMore={loadMore}
+            />
+          </NoData>
+        </Layout>
+        {/* onClick={(e)=>(e) */}
+        <Tab
+          value={["+新增民宿老板账号"]}
+          color="#ffffff"
+          onClick={() => {
+            Taro.navigateTo({ url: `/pages/account/edit/index?id=${id}` });
+          }}
+        ></Tab>
+      </View>
+    </IsLogin>
+  );
+};
 
-export default account
+export default account;

src/pages/adminUser/index.jsx

@@ -16,7 +16,7 @@ const menuList = [
     icon: usericon,
     url: '/pages/shop/index'
   },{
-//   title: '名宿老板账号管理',
+//   title: '民宿老板账号管理',
 //   icon: usericon,
 //   url: '/pages/account/index'
 // }, {

src/pages/batchimport/index.jsx

@@ -1,155 +1,165 @@
-import React, { useEffect, useMemo, useState, useRef } from 'react'
-import Taro, { useDidShow } from '@tarojs/taro'
-import './index.scss'
-import { View, Text, Input, Image } from '@tarojs/components'
-import ContainerLayout from '../../compents/container/index'
-import Tab from '../../compents/tab/index'
-import Layout from '../../layout/index'
-import Tags from '../../compents/tags/index'
-import { AtImagePicker } from 'taro-ui'
-import request, { uploadFiles } from '../../util/request'
-import uploadicon from '../../assets/uploadicon.png'
-
-const batchimport = (props) => {
-    const [pageState, setPageState] = useState('1')
-    const [labelList, setLabelList] = useState([])
-    const [imgUrl, setImgUrl] = useState({})
-    const [tagList, setTagList] = useState([])
-
-    let [arrList, setArrList] = useState({})
-    useDidShow(() => {
-        getMateTagGroupList()
-    })
-
-
-    const getMateTagGroupList = () => {
-        request({ url: '/taMateTagGroup', params: { pageSize: 1, pageSize: 9999 }}).then((res) => {
-            const { records, ...page } = res.data.data
-            setTagList(records)
-        })
-    }
-
-
-    const onSave = (e) => {
-        // console.log(labelList,imgUrl, 'onSave')
-        const data = labelList.map((x) => { return { tagId: x.tagId, imageId: imgUrl.imageId } })
-        // console.log(, 'onSave333')
-
-        request({ url: "/taMetaImageTag", data: data, method: 'post' }).then((res) => {
-            Taro.showModal({
-                title: '上传成功',
-                content: '点击确认按钮，返回上级菜单',
-                showCancel: false,
-                success: function (res) {
-                    if (res.confirm) {
-                        console.log('用户点击确定')
-                        setImgUrl({})
-                    } else if (res.cancel) {
-                        console.log('用户点击取消')
-                    }
-                }
-            })
-        })
-    }
-
-    const onFail = (e) => {
-        console.log(e, 'w')
-    }
-    const onImageClick = (e) => {
-        console.log(e, 'w')
-    }
-
-    const onLabelChange = (e, index) => {
-        console.log(e, index, 'onLabelChange')
-        let newArrArrList={
-            ...arrList,
-            [index]: e
-        }
-        setArrList(newArrArrList)
-        console.log(newArrArrList, 'arrList')
-        let newArr = Object.values(newArrArrList).reduce((pre, cur) => {
-
-            return pre.concat(cur)
-
-        }, [])
-        setLabelList(newArr)
-        // console.log(newArr, 'newArr')
-        // // arrList[index] = e
-        // // const [arrList, setArrList] = useState([[],[],[]])
-        // setLabelList(e)
-
-        // // console.log(arrList.flat(), 'labelList')
-    }
-
-
-    const onUpImage = () => {
-        Taro.chooseImage({
-            sourceType: ['album'],
-            success: (res) => {
-                const tempFilePaths = res.tempFilePaths
-                uploadFiles(tempFilePaths, '/api/mp/taMetaImage').then((res) => {
-                    console.log(res, 'uploadFiles')
-                    setImgUrl(res[0])
-                })
+import React, { useState } from "react";
+import Taro, { useDidShow } from "@tarojs/taro";
+import "./index.scss";
+import { View, Text, Input, Image } from "@tarojs/components";
+import Tab from "../../compents/tab/index";
+import Tags from "../../compents/tags/index";
+import { AtImagePicker } from "taro-ui";
+import request, { uploadFiles } from "../../util/request";
+import uploadicon from "../../assets/uploadicon.png";
+import IsLogin from "../../layout/IsLogin";
+
+const batchimport = props => {
+  const [pageState, setPageState] = useState("1");
+  const [labelList, setLabelList] = useState([]);
+  const [imgUrl, setImgUrl] = useState({});
+  const [tagList, setTagList] = useState([]);
+
+  let [arrList, setArrList] = useState({});
+  useDidShow(() => {
+    getMateTagGroupList();
+  });
+
+  const getMateTagGroupList = () => {
+    request({
+      url: "/taMateTagGroup",
+      params: { pageSize: 1, pageSize: 9999 }
+    }).then(res => {
+      const { records, ...page } = res.data.data;
+      setTagList(records);
+    });
+  };
+
+  const onSave = e => {
+    const data = labelList.map(x => {
+      return { tagId: x.tagId, imageId: imgUrl.imageId };
+    });
+
+    request({ url: "/taMetaImageTag", data: data, method: "post" }).then(
+      res => {
+        Taro.showModal({
+          title: "上传成功",
+          content: "点击确认按钮，返回上级菜单",
+          showCancel: false,
+          success: function(res) {
+            if (res.confirm) {
+              console.log("用户点击确定");
+              setImgUrl({});
+            } else if (res.cancel) {
+              console.log("用户点击取消");
             }
-        })
-    }
-
-    return <View className='batchimport'>
-        <View style={{ display: pageState == '1' ? 'none' : 'block' }}>
-            <Text>标签</Text>
-            <View style={{ padding: '0 20px' }}>
-
-                <View className='at-row  at-row--wrap at-row__justify--center' style={{ marginTop: '0.15rem' }}>
-
-                    {
-                        labelList.map((item, index) => {
-                            return <View className='at-col at-col-4' key={index}>
-                                <View className='tags-btn' >{item.name}</View>
-                            </View>
-                        })
-
-                    }
-                    {/* <View className='at-col at-col-4 ' >
+          }
+        });
+      }
+    );
+  };
+
+  const onLabelChange = (e, index) => {
+    console.log(e, index, "onLabelChange");
+    let newArrArrList = {
+      ...arrList,
+      [index]: e
+    };
+    setArrList(newArrArrList);
+    console.log(newArrArrList, "arrList");
+    let newArr = Object.values(newArrArrList).reduce((pre, cur) => {
+      return pre.concat(cur);
+    }, []);
+    setLabelList(newArr);
+  };
+
+  const onUpImage = () => {
+    Taro.chooseImage({
+      sourceType: ["album"],
+      success: res => {
+        const tempFilePaths = res.tempFilePaths;
+        uploadFiles(tempFilePaths, "/api/mp/taMetaImage").then(res => {
+          console.log(res, "uploadFiles");
+          setImgUrl(res[0]);
+        });
+      }
+    });
+  };
+
+  return (
+    <IsLogin>
+      <View className="batchimport">
+        <View style={{ display: pageState == "1" ? "none" : "block" }}>
+          <Text>标签</Text>
+          <View style={{ padding: "0 20px" }}>
+            <View
+              className="at-row  at-row--wrap at-row__justify--center"
+              style={{ marginTop: "0.15rem" }}
+            >
+              {labelList.map((item, index) => {
+                return (
+                  <View className="at-col at-col-4" key={index}>
+                    <View className="tags-btn">{item.name}</View>
+                  </View>
+                );
+              })}
+              {/* <View className='at-col at-col-4 ' >
                         <View className='tags-btn tags-btn-on' onClick={() => setPageState('1')} >添加</View>
                     </View> */}
-                </View>
-            </View>
-
-            <Text>照片</Text>
-            < View style={{ padding: '30px' }}>
-                {/* <AtImagePicker
-                    // multiple={true}
-                    length={4}
-                    files={imgList}
-                    onChange={onImgChange}
-                    onFail={onFail}
-                    onImageClick={onImageClick}
-                /> */}
-                <Image className='guide-view-img' style={{ width: imgUrl.image ? '100%' : '10%', height: '100%' }} onClick={() => onUpImage()} src={imgUrl.image || uploadicon}></Image>
             </View>
-
-            {/* <Tab value={['取消','']}  onClick={() => { Taro.navigateTo({ url: `/pages/label/edit/index` }) }} ></Tab> */}
-            <Tab pageState='3' value={['取消', '上传']} onClick={[(e) => { setLabelList([]); setPageState('1') }, (e) => onSave(e)]}></Tab>
+          </View>
+
+          <Text>照片</Text>
+          <View style={{ padding: "30px" }}>
+            <Image
+              className="guide-view-img"
+              style={{ width: imgUrl.image ? "100%" : "10%", height: "100%" }}
+              onClick={() => onUpImage()}
+              src={imgUrl.image || uploadicon}
+            ></Image>
+          </View>
+
+          {/* <Tab value={['取消','']}  onClick={() => { Taro.navigateTo({ url: `/pages/label/edit/index` }) }} ></Tab> */}
+          <Tab
+            pageState="3"
+            value={["取消", "上传"]}
+            onClick={[
+              e => {
+                setLabelList([]);
+                setPageState("1");
+              },
+              e => onSave(e)
+            ]}
+          ></Tab>
         </View>
-        
-       <View style={{ display: pageState == '2' ? 'none' : 'block' }}>
-            <View style={{ padding: '0 20px' }}>
 
-                {
-                    tagList.map((item, index) => {
-                        return <View className='material-card'>
-                            <Text>{item.name}</Text>
-                            <Tags list={item.taMateTagList} onChange={(e) => onLabelChange(e, index)} style={{ marginTop: '90rpx' }}> </Tags>
-                        </View>
-                    })
-                }
-            </View>
-            {/* <Tab value={['取消','']}  onClick={() => { Taro.navigateTo({ url: `/pages/label/edit/index` }) }} ></Tab> */}
-            <Tab pageState='3' value={['取消', '选择']} onClick={[(e) =>{ setPageState('2')}, (e) => setPageState('2')]}></Tab>
+        <View style={{ display: pageState == "2" ? "none" : "block" }}>
+          <View style={{ padding: "0 20px" }}>
+            {tagList.map((item, index) => {
+              return (
+                <View className="material-card">
+                  <Text>{item.name}</Text>
+                  <Tags
+                    list={item.taMateTagList}
+                    onChange={e => onLabelChange(e, index)}
+                    style={{ marginTop: "90rpx" }}
+                  >
+                    {" "}
+                  </Tags>
+                </View>
+              );
+            })}
+          </View>
+          {/* <Tab value={['取消','']}  onClick={() => { Taro.navigateTo({ url: `/pages/label/edit/index` }) }} ></Tab> */}
+          <Tab
+            pageState="3"
+            value={["取消", "选择"]}
+            onClick={[
+              e => {
+                setPageState("2");
+              },
+              e => setPageState("2")
+            ]}
+          ></Tab>
         </View>
-        
-    </View >
-}
+      </View>
+    </IsLogin>
+  );
+};
 
-export default batchimport
+export default batchimport;

src/pages/imglist/index.jsx

@@ -1,244 +1,226 @@
-import React, { useEffect, useMemo, useState } from 'react'
+import React, { useState } from "react";
 // import { useEffect, useLayoutEffect, useReducer, useState, useContext, useRef, useCallback, useMemo } from '@tarojs/taro'
 import Taro, { useDidShow } from "@tarojs/taro";
-import { useSelector, } from 'react-redux'
-import { View, Text, Button, Image } from '@tarojs/components'
-import Layout from '../../layout/index'
-import Tab from '../../compents/tab/index'
-import Container from '../../compents/container/index'
-import locationicon from '../../assets/locationicon.png'
-import Tags from '../../compents/tags/index'
-import './index.scss'
-import { AtFloatLayout } from "taro-ui"
-import getQueryValue from '../../util/getQueryValue';
-import request, { uploadFiles } from '../../util/request';
-import groupby from 'lodash.groupby';
-import NoData from '@/compents/NoData'
-
-// Page({
-//     data: {
-//         text: 'init data',
-//         array: [{ msg: '1' }, { msg: '2' }]
-//     }
-// })
-
-const index = (props) => {
-
-    const { query } = getQueryValue()
-
-    const [isOpened, setIsOpened] = useState(false)
-    const [labelState, setLabelState] = useState(false)
-    const [list, setList] = useState({})
-    const [labelList, setLabelList] = useState([])
-    const [data, setData] = useState({})
-    const [tagList, setTagList] = useState([])
-
-    let [arrList, setArrList] = useState({})
-    useDidShow(() => {
-        // console.log(query)
-        getImageList()
-        getMateTagGroupList()
-    })
-
-
-    const getMateTagGroupList = () => {
-        request({ url: '/taMateTagGroup', params: { pageSize: 1, pageSize: 9999 }}).then((res) => {
-            const { records, ...page } = res.data.data
-            setTagList(records)
-        })
-    }
-
-    const getImageList = () => {
-        request({ url: '/taMetaImageTag', params: { tagIds: query } }).then((res) => {
-            const { records, ...page } = res.data.data
-            console.log(groupby(records, item => item.imageId),'------')
-            // _.groupBy([6.1, 4.2, 6.3], Math.floor);
-            setList(groupby(records, item => item.imageId))
-
-        })
-
-    }
-    const updateImage = () => {
-        // console.log('onUpImage')
-
-        console.log(data, 'onUpImage')
-
-        Taro.chooseImage({
-            sourceType: ['album'],
-            success: (res) => {
-                const tempFilePaths = res.tempFilePaths
-                uploadFiles(tempFilePaths, '/api/mp/taMetaImage',).then((res) => {
-                    console.log(res, 'uploadFiles')
-                    const newInfo = {
-                        newImage: res[0].imageId,
-                        newTags: data.map((x) => x.tagId)
-                    }
-                    updatainfo(newInfo)
-
-
-                })
-            }
-        })
-
-
-        setIsOpened(false);
-    }
-
-    const ontagsClick = () => {
-        // console.log('onUpImage')
-
-     
-
-        const newInfo = {
-            newImage: data[0].imageId,
-            newTags: labelList.map((x) => x.tagId)
+import { View, Text, Image } from "@tarojs/components";
+import Tab from "../../compents/tab/index";
+import Tags from "../../compents/tags/index";
+import "./index.scss";
+import { AtFloatLayout } from "taro-ui";
+import getQueryValue from "../../util/getQueryValue";
+import request, { uploadFiles } from "../../util/request";
+import groupby from "lodash.groupby";
+import NoData from "@/compents/NoData";
+import IsLogin from "../../layout/IsLogin";
+
+
+const index = props => {
+  const { query } = getQueryValue();
+
+  const [isOpened, setIsOpened] = useState(false);
+  const [labelState, setLabelState] = useState(false);
+  const [list, setList] = useState({});
+  const [labelList, setLabelList] = useState([]);
+  const [data, setData] = useState({});
+  const [tagList, setTagList] = useState([]);
+
+  let [arrList, setArrList] = useState({});
+  useDidShow(() => {
+    getImageList();
+    getMateTagGroupList();
+  });
+
+  const getMateTagGroupList = () => {
+    request({
+      url: "/taMateTagGroup",
+      params: { pageSize: 1, pageSize: 9999 }
+    }).then(res => {
+      const { records, ...page } = res.data.data;
+      setTagList(records);
+    });
+  };
+
+  const getImageList = () => {
+    request({ url: "/taMetaImageTag", params: { tagIds: query } }).then(res => {
+      const { records, ...page } = res.data.data;
+      setList(groupby(records, item => item.imageId));
+    });
+  };
+  const updateImage = () => {
+
+
+    Taro.chooseImage({
+      sourceType: ["album"],
+      success: res => {
+        const tempFilePaths = res.tempFilePaths;
+        uploadFiles(tempFilePaths, "/api/mp/taMetaImage").then(res => {
+          console.log(res, "uploadFiles");
+          const newInfo = {
+            newImage: res[0].imageId,
+            newTags: data.map(x => x.tagId)
+          };
+          updatainfo(newInfo);
+        });
+      }
+    });
+
+    setIsOpened(false);
+  };
+
+  const ontagsClick = () => {
+    const newInfo = {
+      newImage: data[0].imageId,
+      newTags: labelList.map(x => x.tagId)
+    };
+    updatainfo(newInfo);
+  };
+
+  const updatainfo = newInfo => {
+    const oldinfo = {
+      originImage: data[0].imageId,
+      originTags: data.map(x => x.tagId)
+    };
+    request({
+      url: "/taMetaImageTag",
+      data: { ...oldinfo, ...newInfo },
+      method: "put"
+    }).then(() => {
+      getImageList();
+      setLabelState(false);
+    });
+  };
+
+  const updateLabel = e => {
+    setIsOpened(false);
+    setLabelState(true);
+  };
+  const handleClose = e => {
+    console.log(e, "111");
+
+    setIsOpened(false);
+  };
+
+  const deleteImage = e => {
+    Taro.showModal({
+      title: "确定删除该图片吗？",
+
+      cancelColor: "#d2d2d2",
+      confirmColor: "#274191",
+      success: function(res) {
+        if (res.confirm) {
+          console.log("用户点击确定");
+
+          setIsOpened(false);
+          // Taro.showModal({
+          //   title: `改标签组有${row.user.number}个标签仍在使用。请先清空标签，再删除标签组`,
+          //   showCancel: false,
+          //   // cancelColor:'#d2d2d2',
+          //   confirmColor: "#274191",
+          //   success: function (res) {
+          //     if (res.confirm) {
+          //       console.log('用户点击确定')
+
+          //     } else if (res.cancel) {
+          //       console.log('用户点击取消')
+          //     }
+          //   }
+          // })
+        } else if (res.cancel) {
+          setIsOpened(false);
         }
-        updatainfo(newInfo)
-        console.log(newInfo,labelList, 'onUpImage')
-        // setIsOpened(false);
-    }
-
-    
-
-    //     "newImage": "string",
-    //   "newTags": [
-    //     "string"
-    //   ],
-    //   "originImage": "string",
-    //   "originTags": [
-    //     "string"
-    //   ]
-
-    const updatainfo = (newInfo) => {
-        const oldinfo = {
-            originImage: data[0].imageId,
-            originTags: data.map((x) => x.tagId)
-        }
-        request({ url: "/taMetaImageTag", data: { ...oldinfo, ...newInfo }, method: "put" }).then(() => {
-            getImageList()
-            setLabelState(false)
-        })
-    }
-
-
-    const updateLabel = (e) => {
-
-        setIsOpened(false)
-        setLabelState(true)
-        // Taro.navigateTo({ url: "/pages/material/index?type=uplabel" })
-    }
-    const handleClose = (e) => {
-        console.log(e, '111')
-
-        setIsOpened(false)
-    }
-
-    const deleteImage = (e) => {
-        Taro.showModal({
-            title: '确定删除该图片吗？',
-            
-            cancelColor: '#d2d2d2',
-            confirmColor: "#274191",
-            success: function (res) {
-              if (res.confirm) {
-                console.log('用户点击确定')
-      
-                setIsOpened(false)
-                // Taro.showModal({
-                //   title: `改标签组有${row.user.number}个标签仍在使用。请先清空标签，再删除标签组`,
-                //   showCancel: false,
-                //   // cancelColor:'#d2d2d2',
-                //   confirmColor: "#274191",
-                //   success: function (res) {
-                //     if (res.confirm) {
-                //       console.log('用户点击确定')
-      
-      
-                //     } else if (res.cancel) {
-                //       console.log('用户点击取消')
-                //     }
-                //   }
-                // })
-      
-              } else if (res.cancel) {
-                setIsOpened(false)
-              }
-            }
-       
-    })
- 
-    }
-
-    const onLabelChange = (e, index) => {
-        let newArrArrList={
-            ...arrList,
-            [index]: e
-        }
-        setArrList(newArrArrList)
-        let newArr = Object.values(newArrArrList).reduce((pre, cur) => {
-
-            return pre.concat(cur)
-
-        }, [])
-        setLabelList([...newArr])
-    }
-
-    return <View className='imglist'>
-
-        
+      }
+    });
+  };
+
+  const onLabelChange = (e, index) => {
+    let newArrArrList = {
+      ...arrList,
+      [index]: e
+    };
+    setArrList(newArrArrList);
+    let newArr = Object.values(newArrArrList).reduce((pre, cur) => {
+      return pre.concat(cur);
+    }, []);
+    setLabelList([...newArr]);
+  };
+
+  return (
+    <IsLogin>
+      <View className="imglist">
         <NoData nodata={Object.keys(list).length === 0}>
-        {console.log(labelState,'-------------------')
-}
-        {!labelState&&<View style={{ padding: '0 30px' }}>
-           
-            {
-
-                Object.keys(list).map((item) => {
-
-                    return <View className='imglist-card'>
-                        <View className='imglist-card-tags' style={{ display: 'flex' }}>
-                            {/* imageimageimageimage34 */}
-                            {list[item].map((x) => {
-                                console.log(x.tagName)
-                                return <View className='tag' >{x.tagName}</View>
-                            })}
-                        </View>
-                        <Image src={list[item][0].image} style={{ width: '100%' }} onClick={() => { setData(list[item]); setIsOpened(true) }}></Image>
+          {!labelState && (
+            <View style={{ padding: "0 30px" }}>
+              {Object.keys(list).map(item => {
+                return (
+                  <View className="imglist-card">
+                    <View
+                      className="imglist-card-tags"
+                      style={{ display: "flex" }}
+                    >
+                      {/* imageimageimageimage34 */}
+                      {list[item].map(x => {
+                        console.log(x.tagName);
+                        return <View className="tag">{x.tagName}</View>;
+                      })}
                     </View>
-                })
-            }
-        </View>}
-
-        {labelState&&
-            <View style={{textAlign:'center'}}> 
-            <View style={{ padding: '0 20px' }}>
-
-                {
-                    tagList.map((item, index) => {
-                        return <View className='imglist-tagcard'>
-                            <Text>{item.name}</Text>
-                            <Tags list={item.taMateTagList} onChange={(e) => onLabelChange(e, index)} style={{ marginTop: '90rpx' }}> </Tags>
-                        </View>
-                    })
-                }
+                    <Image
+                      src={list[item][0].image}
+                      style={{ width: "100%" }}
+                      onClick={() => {
+                        setData(list[item]);
+                        setIsOpened(true);
+                      }}
+                    ></Image>
+                  </View>
+                );
+              })}
             </View>
-            {/* <Tab value={['取消','']}  onClick={() => { Taro.navigateTo({ url: `/pages/label/edit/index` }) }} ></Tab> */}
-            <Tab pageState='3' value={['取消', '选择']} onClick={[(e) => setLabelState(false), (e) => ontagsClick()]}></Tab>
-        </View>
-        }
-
+          )}
+
+          {labelState && (
+            <View style={{ textAlign: "center" }}>
+              <View style={{ padding: "0 20px" }}>
+                {tagList.map((item, index) => {
+                  return (
+                    <View className="imglist-tagcard">
+                      <Text>{item.name}</Text>
+                      <Tags
+                        list={item.taMateTagList}
+                        onChange={e => onLabelChange(e, index)}
+                        style={{ marginTop: "90rpx" }}
+                      />
+                    </View>
+                  );
+                })}
+              </View>
+              <Tab
+                pageState="3"
+                value={["取消", "选择"]}
+                onClick={[e => setLabelState(false), e => ontagsClick()]}
+              ></Tab>
+            </View>
+          )}
         </NoData>
 
-        <AtFloatLayout isOpened={isOpened} onClose={() => handleClose()} style={{ zIndex: '1000' }}>
-            <View className='floatmodel' >
-                <View onClick={() => updateLabel()}>更改标签</View>
-                <View onClick={() => updateImage()}>更换图片</View>
-                <View onClick={() => deleteImage() }>删除</View>
-                <View style={{ color: '#d2d2d2' }} onClick={() => setIsOpened(false)}>取消</View>
+        <AtFloatLayout
+          isOpened={isOpened}
+          onClose={() => handleClose()}
+          style={{ zIndex: "1000" }}
+        >
+          <View className="floatmodel">
+            <View onClick={() => updateLabel()}>更改标签</View>
+            <View onClick={() => updateImage()}>更换图片</View>
+            <View onClick={() => deleteImage()}>删除</View>
+            <View
+              style={{ color: "#d2d2d2" }}
+              onClick={() => setIsOpened(false)}
+            >
+              取消
             </View>
-
+          </View>
         </AtFloatLayout>
-    </View>
-}
+      </View>
+    </IsLogin>
+  );
+};
 
-export default index
+export default index;

src/pages/index/index.jsx

@@ -1,14 +1,18 @@
-import React, { useEffect, useMemo, useState } from 'react'
-import { View } from '@tarojs/components'
+import React, { useEffect, useMemo, useState } from "react";
+import { View } from "@tarojs/components";
+import IsLogin from "../../layout/IsLogin";
+import AdminUser from "../adminUser/index";
 
-import AdminUser from '../adminUser/index'
+import "./index.scss";
 
-import './index.scss'
+const index = props => {
+  return (
+    <IsLogin>
+      <View className="index">
+        <AdminUser></AdminUser>
+      </View>
+    </IsLogin>
+  );
+};
 
-const index = (props) => {
-  return <View className='index'>
-      <AdminUser></AdminUser>
-  </View>
-}
-
-export default index
+export default index;

src/pages/label/edit/index.jsx

@@ -1,165 +1,119 @@
-import React, { useEffect, useMemo, useState } from 'react'
+import React, { useState } from "react";
 import Taro, { useDidShow } from "@tarojs/taro";
-import { useSelector } from 'react-redux'
-import { View, Input, Text, Image, Form } from '@tarojs/components'
-import Layout from '../../../layout/index'
-import Tab from '../../../compents/tab/index'
-import Container from '../../../compents/container/index'
-import './index.scss'
-import getQueryValue from '../../../util/getQueryValue'
-import request from '../../../util/request';
-
-const index = (props) => {
-
-    const { id } = getQueryValue()
-
-    const [name, setName] = useState('')
-    const [data, setData] = useState({})
-    const [pageState, setPageState] = useState('1')
-    const [list, setList] = useState([])
-
-
-    useDidShow(() => {
-        if (id) {
-            getMateTagGroupDetail()
-        }
-
-    })
-    const getMateTagGroupDetail = () => {
-        request({ url: `/taMateTagGroup/${id}`, }).then((res) => {
-            setName(res.data.data.name)
-            setData(res.data.data)
-        })
+import { View, Input, Text } from "@tarojs/components";
+import Layout from "../../../layout/index";
+import Tab from "../../../compents/tab/index";
+import Container from "../../../compents/container/index";
+import "./index.scss";
+import getQueryValue from "../../../util/getQueryValue";
+import request from "../../../util/request";
+import IsLogin from "../../../layout/IsLogin";
+const index = props => {
+  const { id } = getQueryValue();
+
+  const [name, setName] = useState("");
+  const [data, setData] = useState({});
+
+  useDidShow(() => {
+    if (id) {
+      getMateTagGroupDetail();
     }
-
-
-    const onSave = () => {
-        console.log(333)
-
-        if (id) {
-
-            Taro.showModal({
-                title: '确定修改该标签组吗？',
-                // content: row.name,
-                cancelColor: '#d2d2d2',
-                confirmColor: "#274191",
-                success: function (res) {
+  });
+  const getMateTagGroupDetail = () => {
+    request({ url: `/taMateTagGroup/${id}` }).then(res => {
+      setName(res.data.data.name);
+      setData(res.data.data);
+    });
+  };
+
+  const onSave = () => {
+    console.log(333);
+
+    if (id) {
+      Taro.showModal({
+        title: "确定修改该标签组吗？",
+        // content: row.name,
+        cancelColor: "#d2d2d2",
+        confirmColor: "#274191",
+        success: function(res) {
+          if (res.confirm) {
+            console.log("用户点击确定");
+
+            request({
+              url: `/taMateTagGroup/${id}`,
+              data: { ...data, name: name },
+              method: "put"
+            }).then(res => {
+              Taro.showModal({
+                title: "修改成功",
+                content: "点击确认按钮，返回上级菜单",
+                showCancel: false,
+                success: function(res) {
                   if (res.confirm) {
-                    console.log('用户点击确定')
-          
-                    request({url: `/taMateTagGroup/${id}`, data: { ...data, name: name }, method: 'put' }).then((res) => {
-                        Taro.showModal({
-                            title: '修改成功',
-                            content: '点击确认按钮，返回上级菜单',
-                            showCancel: false,
-                            success: function (res) {
-                                if (res.confirm) {
-                                    console.log('用户点击确定')
-        
-                                    Taro.navigateBack({
-                                        delta: 1
-                                    })
-                                } else if (res.cancel) {
-                                    console.log('用户点击取消')
-                                }
-                            }
-                        })
-        
-                    })
-          
+                    console.log("用户点击确定");
+
+                    Taro.navigateBack({
+                      delta: 1
+                    });
                   } else if (res.cancel) {
-                    console.log('用户点击取消')
+                    console.log("用户点击取消");
                   }
                 }
-              })
-
-            
-        } else {
-            request({ url: '/taMateTagGroup', data: { name }, method: 'post' }).then((res) => {
-                Taro.navigateBack({
-                    delta: 1
-                })
-            })
+              });
+            });
+          } else if (res.cancel) {
+            console.log("用户点击取消");
+          }
         }
-
-
-
-        // Taro.showModal({
-        //     title: '修改成功',
-        //     content: '点击确认按钮，返回上级菜单',
-        //     showCancel: false,
-        //     success: function (res) {
-        //         if (res.confirm) {
-        //             console.log('用户点击确定')
-
-        //             Taro.navigateBack({
-        //                 delta: 1
-        //             })
-        //         } else if (res.cancel) {
-        //             console.log('用户点击取消')
-        //         }
-        //     }
-        // })
-    }
-
-    const onChooseLocation = () => {
-        console.log(333)
-        wx.chooseLocation({
-            success: (res) => {
-                console.log(res)
-            }
-        })
-    }
-    function handNameChange(e) {
-
-        setName(e.detail.value)
-
-
-
+      });
+    } else {
+      request({ url: "/taMateTagGroup", data: { name }, method: "post" }).then(
+        res => {
+          Taro.navigateBack({
+            delta: 1
+          });
+        }
+      );
     }
+  };
 
-    return <View className='addnewhouse'>
-
-
-        {/* <Form onSubmit={this.formSubmit} onReset={this.formReset} >
-        <View className='example-body'>
-          <Switch name='switch' className='form-switch'></Switch>
-        </View>
-      </Form> */}
+  function handNameChange(e) {
+    setName(e.detail.value);
+  }
 
+  return (
+    <IsLogin>
+      <View className="addnewhouse">
         <Layout>
-            {/* <Form onSubmit={formSubmit} onReset={formReset}> */}
-            {/* <View className='inputstyle-view'>
-                    <Text className='title'>标签组编号</Text>
-                    <Container className='inputstyle-view-card ' >
-                        <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
-                    </Container>
-                </View> */}
-            <View className='inputstyle-view'>
-                <Text className='title'>标签组名称</Text>
-                <Container className='inputstyle-view-card ' >
-                    <Input placeholderClass='placeholderinput' value={name} onInput={handNameChange} className='input' type='text' placeholder='' />
-                </Container>
-            </View>
-            {/* <View className='inputstyle-view'>
-                    <Text className='title'>标签数量</Text>
-                    <Container className='inputstyle-view-card ' >
-                        <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
-                    </Container>
-                </View> */}
-
-            {/* </Form> */}
-
+          <View className="inputstyle-view">
+            <Text className="title">标签组名称</Text>
+            <Container className="inputstyle-view-card ">
+              <Input
+                placeholderClass="placeholderinput"
+                value={name}
+                onInput={handNameChange}
+                className="input"
+                type="text"
+                placeholder=""
+              />
+            </Container>
+          </View>
         </Layout>
-        <Tab className='addhousetab' pageState='3' value={['取消', id ? '确认修改' : '确认添加']} onClick={[(e) => Taro.navigateBack({
-            delta: 1
-        }), () => onSave()]}></Tab>
-
-
-
-
-
-    </View>
-}
-
-export default index
+        <Tab
+          className="addhousetab"
+          pageState="3"
+          value={["取消", id ? "确认修改" : "确认添加"]}
+          onClick={[
+            e =>
+              Taro.navigateBack({
+                delta: 1
+              }),
+            () => onSave()
+          ]}
+        ></Tab>
+      </View>
+    </IsLogin>
+  );
+};
+
+export default index;

src/pages/label/index.jsx

@@ -1,46 +1,45 @@
-import React, { useEffect, useMemo, useState, useRef } from 'react'
-import Taro, { useDidShow } from '@tarojs/taro'
-import './index.scss'
-import { View, Text, Input, Image } from '@tarojs/components'
-import ContainerLayout from '../../compents/container/index'
-import Tab from '../../compents/tab/index'
-import Layout from '../../layout/index'
-import request from '../../util/request'
-
-const house = (props) => {
-
-  const [list, setList] = useState([])
-  const [radioHouse, setRadioHouse] = useState()
-
-  const ref = useRef();
-
+import React, { useState } from "react";
+import Taro, { useDidShow } from "@tarojs/taro";
+import "./index.scss";
+import { View, Text } from "@tarojs/components";
+import ContainerLayout from "../../compents/container/index";
+import Tab from "../../compents/tab/index";
+import Layout from "../../layout/index";
+import request from "../../util/request";
+import IsLogin from "../../layout/IsLogin";
+
+const house = props => {
+  const [list, setList] = useState([]);
 
   useDidShow(() => {
-    getMateTagGroupList()
-  })
-
+    getMateTagGroupList();
+  });
 
   const getMateTagGroupList = () => {
-    request({ url: '/taMateTagGroup', params:{pageSize:9999}}).then((res) => {
-      const { records, ...page} = res.data.data
-      setList(records)
-    })
-  }
-
+    request({ url: "/taMateTagGroup", params: { pageSize: 9999 } }).then(
+      res => {
+        const { records, ...page } = res.data.data;
+        setList(records);
+      }
+    );
+  };
 
-  const onDelete = (row) => {
+  const onDelete = row => {
     Taro.showModal({
-      title: '确定删除该标签组吗？',
+      title: "确定删除该标签组吗？",
       content: row.name,
-      cancelColor: '#d2d2d2',
+      cancelColor: "#d2d2d2",
       confirmColor: "#274191",
-      success: function (res) {
+      success: function(res) {
         if (res.confirm) {
-          console.log('用户点击确定')
-
-          request({ url: `/taMateTagGroup/${row.groupId}`, method: 'delete', }).then((res)=>{
-            getMateTagGroupList({ pageNum: 1, pageSize:10 })
-          })
+          console.log("用户点击确定");
+
+          request({
+            url: `/taMateTagGroup/${row.groupId}`,
+            method: "delete"
+          }).then(res => {
+            getMateTagGroupList({ pageNum: 1, pageSize: 10 });
+          });
           // Taro.showModal({
           //   title: `改标签组有${row.user.number}个标签仍在使用。请先清空标签，再删除标签组`,
           //   showCancel: false,
@@ -50,46 +49,64 @@ const house = (props) => {
           //     if (res.confirm) {
           //       console.log('用户点击确定')
 
-
           //     } else if (res.cancel) {
           //       console.log('用户点击取消')
           //     }
           //   }
           // })
-
         } else if (res.cancel) {
-          console.log('用户点击取消')
+          console.log("用户点击取消");
         }
       }
-    })
-  }
-
-
-
-
-  return <View className='account'>
-    <Layout>
-      {list.map((x, index) => {
-        return <View className='account-view'>
-          {/* <Text className='account-view-title'>标签组编号：{index + 1}</Text> */}
-          <ContainerLayout className='account-view-card'>
-            <View className='top' onClick={() => { Taro.navigateTo({ url: `/pages/mateTag/index?id=${x.groupId}` }) }}>
-              <View>标签组名称：{x.name}</View>
-
-            </View>
-            <View className='bottom'>
-              <Text onClick={() => { Taro.navigateTo({ url: `/pages/label/edit/index?id=${x.groupId}` }) }}>编辑</Text>
-              <Text onClick={() => onDelete(x)}>删除</Text>
-            </View>
-          </ContainerLayout>
-
-        </View>
-
-      })}
-    </Layout>
-    {/* onClick={(e)=>(e) */}
-    <Tab value={['+新增标签组']} color='#ffffff' onClick={() => { Taro.navigateTo({ url: `/pages/label/edit/index` }) }} ></Tab>
-  </View>
-}
-
-export default house
+    });
+  };
+
+  return (
+    <IsLogin>
+      <View className="account">
+        <Layout>
+          {list.map((x, index) => {
+            return (
+              <View className="account-view">
+                {/* <Text className='account-view-title'>标签组编号：{index + 1}</Text> */}
+                <ContainerLayout className="account-view-card">
+                  <View
+                    className="top"
+                    onClick={() => {
+                      Taro.navigateTo({
+                        url: `/pages/mateTag/index?id=${x.groupId}`
+                      });
+                    }}
+                  >
+                    <View>标签组名称：{x.name}</View>
+                  </View>
+                  <View className="bottom">
+                    <Text
+                      onClick={() => {
+                        Taro.navigateTo({
+                          url: `/pages/label/edit/index?id=${x.groupId}`
+                        });
+                      }}
+                    >
+                      编辑
+                    </Text>
+                    <Text onClick={() => onDelete(x)}>删除</Text>
+                  </View>
+                </ContainerLayout>
+              </View>
+            );
+          })}
+        </Layout>
+        <Tab
+          value={["+新增标签组"]}
+          color="#ffffff"
+          onClick={() => {
+            Taro.navigateTo({ url: `/pages/label/edit/index` });
+          }}
+        ></Tab>
+      </View>
+    </IsLogin>
+  );
+};
+
+export default house;

src/pages/mateTag/edit/index.jsx

@@ -1,140 +1,121 @@
-import React, { useEffect, useMemo, useState } from 'react'
+import React, { useState } from "react";
 import Taro, { useDidShow } from "@tarojs/taro";
-import { useSelector } from 'react-redux'
-import { View, Input, Text, Image, Form } from '@tarojs/components'
-import Layout from '../../../layout/index'
-import Tab from '../../../compents/tab/index'
-import Container from '../../../compents/container/index'
-import './index.scss'
-import getQueryValue from '../../../util/getQueryValue'
-import request from '../../../util/request';
-
-const index = (props) => {
-
-    const { id,tagId } = getQueryValue()
-
-    const [name, setName] = useState('')
-    const [data, setData] = useState({})
-    const [pageState, setPageState] = useState('1')
-    const [list, setList] = useState([])
-
-
-    useDidShow(() => {
-        if (tagId) {
-            getMateTagGroupDetail()
-        }
-
-    })
-    const getMateTagGroupDetail = () => {
-        request({ url: `/taMateTag/${tagId}` }).then((res) => {
-            setName(res.data.data.name)
-            setData(res.data.data)
-        })
+import { View, Input, Text } from "@tarojs/components";
+import Layout from "../../../layout/index";
+import Tab from "../../../compents/tab/index";
+import Container from "../../../compents/container/index";
+import "./index.scss";
+import getQueryValue from "../../../util/getQueryValue";
+import request from "../../../util/request";
+import IsLogin from "../../../layout/IsLogin";
+
+const index = props => {
+  const { id, tagId } = getQueryValue();
+
+  const [name, setName] = useState("");
+  const [data, setData] = useState({});
+
+  useDidShow(() => {
+    if (tagId) {
+      getMateTagGroupDetail();
     }
-
-
-    const onSave = () => {
-        console.log(333)
-
-        if (tagId) {
-
-            Taro.showModal({
-                title: '确定修改该标签吗？',
-                // content: row.name,
-                cancelColor: '#d2d2d2',
-                confirmColor: "#274191",
-                success: function (res) {
+  });
+  const getMateTagGroupDetail = () => {
+    request({ url: `/taMateTag/${tagId}` }).then(res => {
+      setName(res.data.data.name);
+      setData(res.data.data);
+    });
+  };
+
+  const onSave = () => {
+    console.log(333);
+
+    if (tagId) {
+      Taro.showModal({
+        title: "确定修改该标签吗？",
+        // content: row.name,
+        cancelColor: "#d2d2d2",
+        confirmColor: "#274191",
+        success: function(res) {
+          if (res.confirm) {
+            console.log("用户点击确定");
+
+            request({
+              url: `/taMateTag/${tagId}`,
+              data: { ...data, name: name },
+              method: "put"
+            }).then(res => {
+              Taro.showModal({
+                title: "修改成功",
+                content: "点击确认按钮，返回上级菜单",
+                showCancel: false,
+                success: function(res) {
                   if (res.confirm) {
-                    console.log('用户点击确定')
-          
-                    request({url: `/taMateTag/${tagId}`, data: { ...data, name: name }, method: 'put' }).then((res) => {
-                        Taro.showModal({
-                            title: '修改成功',
-                            content: '点击确认按钮，返回上级菜单',
-                            showCancel: false,
-                            success: function (res) {
-                                if (res.confirm) {
-                                    console.log('用户点击确定')
-        
-                                    Taro.navigateBack({
-                                        delta: 1
-                                    })
-                                } else if (res.cancel) {
-                                    console.log('用户点击取消')
-                                }
-                            }
-                        })
-        
-                    })
-          
+                    console.log("用户点击确定");
+
+                    Taro.navigateBack({
+                      delta: 1
+                    });
                   } else if (res.cancel) {
-                    console.log('用户点击取消')
+                    console.log("用户点击取消");
                   }
                 }
-              })
-
-            
-        } else {
-            request({ url: '/taMateTag', data: { name:name,groupId: id}, method: 'post' }).then((res) => {
-                Taro.navigateBack({
-                    delta: 1
-                })
-            })
+              });
+            });
+          } else if (res.cancel) {
+            console.log("用户点击取消");
+          }
         }
-
-
-
-        // Taro.showModal({
-        //     title: '修改成功',
-        //     content: '点击确认按钮，返回上级菜单',
-        //     showCancel: false,
-        //     success: function (res) {
-        //         if (res.confirm) {
-        //             console.log('用户点击确定')
-
-        //             Taro.navigateBack({
-        //                 delta: 1
-        //             })
-        //         } else if (res.cancel) {
-        //             console.log('用户点击取消')
-        //         }
-        //     }
-        // })
-    }
-
-    function handNameChange(e) {
-
-        setName(e.detail.value)
-
-
-
+      });
+    } else {
+      request({
+        url: "/taMateTag",
+        data: { name: name, groupId: id },
+        method: "post"
+      }).then(res => {
+        Taro.navigateBack({
+          delta: 1
+        });
+      });
     }
+  };
 
-    return <View className='addnewhouse'>
-
-
-        {/* <Form onSubmit={this.formSubmit} onReset={this.formReset} >
-        <View className='example-body'>
-          <Switch name='switch' className='form-switch'></Switch>
-        </View>
-      </Form> */}
+  function handNameChange(e) {
+    setName(e.detail.value);
+  }
 
+  return (
+    <IsLogin>
+      <View className="addnewhouse">
         <Layout>
-   
-            <View className='inputstyle-view'>
-                <Text className='title'>标签名称</Text>
-                <Container className='inputstyle-view-card ' >
-                    <Input placeholderClass='placeholderinput' value={name} onInput={handNameChange} className='input' type='text' placeholder='' />
-                </Container>
-            </View>
-   
+          <View className="inputstyle-view">
+            <Text className="title">标签名称</Text>
+            <Container className="inputstyle-view-card ">
+              <Input
+                placeholderClass="placeholderinput"
+                value={name}
+                onInput={handNameChange}
+                className="input"
+                type="text"
+                placeholder=""
+              /></Container>
+          </View>
         </Layout>
-        <Tab className='addhousetab' pageState='3' value={['取消', tagId ? '确认修改' : '确认添加']} onClick={[(e) => Taro.navigateBack({
-            delta: 1
-        }), () => onSave()]}></Tab>
-
-
-    </View>
-}
-
-export default index
+        <Tab
+          className="addhousetab"
+          pageState="3"
+          value={["取消", tagId ? "确认修改" : "确认添加"]}
+          onClick={[
+            e =>
+              Taro.navigateBack({
+                delta: 1
+              }),
+            () => onSave()
+          ]}
+        ></Tab>
+      </View>
+    </IsLogin>
+  );
+};
+
+export default index;

src/pages/mateTag/index.jsx

@@ -1,102 +1,97 @@
-import React, { useEffect, useMemo, useState, useRef } from 'react'
-import Taro, { useDidShow } from '@tarojs/taro'
-import './index.scss'
-import { View, Text, Input, Image } from '@tarojs/components'
-import ContainerLayout from '../../compents/container/index'
-import Tab from '../../compents/tab/index'
-import Layout from '../../layout/index'
-import request from '../../util/request'
-import getQueryValue from '../../util/getQueryValue'
-import NoData from '@/compents/NoData'
-
-const house = (props) => {
-
-  const {id} = getQueryValue()
-
-  const [list, setList] = useState([])
-
+import React, { useState } from "react";
+import Taro, { useDidShow } from "@tarojs/taro";
+import "./index.scss";
+import { View, Text } from "@tarojs/components";
+import ContainerLayout from "../../compents/container/index";
+import Tab from "../../compents/tab/index";
+import Layout from "../../layout/index";
+import request from "../../util/request";
+import getQueryValue from "../../util/getQueryValue";
+import NoData from "@/compents/NoData";
+import IsLogin from "../../layout/IsLogin";
+
+const house = props => {
+  const { id } = getQueryValue();
+
+  const [list, setList] = useState([]);
 
   useDidShow(() => {
-    getMateTagList()
-  })
+    getMateTagList();
+  });
 
-  // request({ url: '/taShopKeeper',params:{shopId:id}, method: 'get', }).then((res)=>{
-  //   const { records, ...page} = res.data.data
-  //   setList(records)
-  // })
   const getMateTagList = () => {
-    console.log(id,'getMateTagList')
-    request({ url: '/taMateTag',params:{groupId:id,pageSize:9999},method: 'get', }).then((res) => {
-      const { records, ...page} = res.data.data
-      setList(records)
-    })
-  }
-
-
-  const onDelete = (row) => {
+    console.log(id, "getMateTagList");
+    request({
+      url: "/taMateTag",
+      params: { groupId: id, pageSize: 9999 },
+      method: "get"
+    }).then(res => {
+      const { records, ...page } = res.data.data;
+      setList(records);
+    });
+  };
+
+  const onDelete = row => {
     Taro.showModal({
-      title: '确定删除该标签组吗？',
+      title: "确定删除该标签组吗？",
       content: row.name,
-      cancelColor: '#d2d2d2',
+      cancelColor: "#d2d2d2",
       confirmColor: "#274191",
-      success: function (res) {
+      success: function(res) {
         if (res.confirm) {
-          console.log('用户点击确定')
-
-          request({ url: `/taMateTag/${row.tagId}`, method: 'delete', }).then((res)=>{
-            getMateTagList({ pageNum: 1, pageSize:999 })
-          })
-          // Taro.showModal({
-          //   title: `改标签组有${row.user.number}个标签仍在使用。请先清空标签，再删除标签组`,
-          //   showCancel: false,
-          //   // cancelColor:'#d2d2d2',
-          //   confirmColor: "#274191",
-          //   success: function (res) {
-          //     if (res.confirm) {
-          //       console.log('用户点击确定')
-
-
-          //     } else if (res.cancel) {
-          //       console.log('用户点击取消')
-          //     }
-          //   }
-          // })
+          console.log("用户点击确定");
 
+          request({ url: `/taMateTag/${row.tagId}`, method: "delete" }).then(
+            res => {
+              getMateTagList({ pageNum: 1, pageSize: 999 });
+            }
+          );
         } else if (res.cancel) {
-          console.log('用户点击取消')
+          console.log("用户点击取消");
         }
       }
-    })
-  }
-
-
-
-
-  return <View className='account'>
-    <Layout>
-      <NoData nodata={!list.length} tips="暂无标签">
-      {list.map((x, index) => {
-        return <View className='account-view'>
-  
-          <ContainerLayout className='account-view-card'>
-            <View className='top' >
-              <View>标签名称：{x.name}</View>
-
-            </View>
-            <View className='bottom'>
-              <Text onClick={() => { Taro.navigateTo({ url: `/pages/mateTag/edit/index?tagId=${x.tagId}` }) }}>编辑</Text>
-              <Text onClick={() => onDelete(x)}>删除</Text>
-            </View>
-          </ContainerLayout>
-
-        </View>
-
-      })}
-      </NoData>
-    </Layout>
-    {/* onClick={(e)=>(e) */}
-    <Tab value={['+新增标签']} color='#ffffff' onClick={() => { Taro.navigateTo({ url: `/pages/mateTag/edit/index?id=${id}` }) }} ></Tab>
-  </View>
-}
-
-export default house
+    });
+  };
+
+  return (
+    <IsLogin>
+      <View className="account">
+        <Layout>
+          <NoData nodata={!list.length} tips="暂无标签">
+            {list.map((x, index) => {
+              return (
+                <View className="account-view">
+                  <ContainerLayout className="account-view-card">
+                    <View className="top">
+                      <View>标签名称：{x.name}</View>
+                    </View>
+                    <View className="bottom">
+                      <Text
+                        onClick={() => {
+                          Taro.navigateTo({
+                            url: `/pages/mateTag/edit/index?tagId=${x.tagId}`
+                          });
+                        }}
+                      >编辑</Text>
+                      <Text onClick={() => onDelete(x)}>删除</Text>
+                    </View>
+                  </ContainerLayout>
+                </View>
+              );
+            })}
+          </NoData>
+        </Layout>
+        {/* onClick={(e)=>(e) */}
+        <Tab
+          value={["+新增标签"]}
+          color="#ffffff"
+          onClick={() => {
+            Taro.navigateTo({ url: `/pages/mateTag/edit/index?id=${id}` });
+          }}
+        ></Tab>
+      </View>
+    </IsLogin>
+  );
+};
+
+export default house;

src/pages/material/index.jsx

@@ -1,120 +1,86 @@
-import React, { useEffect, useMemo, useState } from 'react'
+import React, { useState } from "react";
 // import { useEffect, useLayoutEffect, useReducer, useState, useContext, useRef, useCallback, useMemo } from '@tarojs/taro'
-import Taro, { useDidShow, useShareAppMessage } from "@tarojs/taro";
-import { useSelector, } from 'react-redux'
-import { View, Input, Text, Image } from '@tarojs/components'
-import Layout from '../../layout/index'
-import Tab from '../../compents/tab/index'
-import Container from '../../compents/container/index'
-import locationicon from '../../assets/locationicon.png'
-import Tags from '../../compents/tags/index'
-import request from '../../util/request'
-import NoData from '@/compents/NoData'
-import './index.scss'
-
-// Page({
-//     data: {
-//         text: 'init data',
-//         array: [{ msg: '1' }, { msg: '2' }]
-//     }
-// })
-
-const index = (props) => {
-
-
-
-    let [arrList, setArrList] = useState({})
-    const [labelList, setLabelList] = useState([])
-    const [list, setList] = useState([])
-    useEffect(() => {
-
-        // console.log(page, 'page')
-
-    }, [])
-
-    useDidShow(() => {
-        getMateTagGroupList()
-    })
-
-
-    const getMateTagGroupList = () => {
-        request({ url: '/taMateTagGroup', params: { pageSize: 1, pageSize: 9999 } }).then((res) => {
-            const { records, ...page } = res.data.data
-            setList(records)
-        })
-    }
-    const onTabClick = (e) => {
-        console.log(e, '111')
-        setUserRole(e)
-    }
-
-    const onLabelChange = (e, index) => {
-          
-        let newArrArrList={
-            ...arrList,
-            [index]: e
-        }
-        setArrList(newArrArrList)
-        console.log(newArrArrList, 'arrList')
-        let newArr = Object.values(newArrArrList).reduce((pre, cur) => {
-
-            return pre.concat(cur)
-
-        }, [])
-        setLabelList([...newArr])
-        console.log(newArr, 'newArr11111111')
-
-    }
-
-
-    const onClick = () => {
-        
-
-        const query = labelList.map(x=>x.tagId).join(',')
-        console.log(query, '', 'eeee')
-        Taro.navigateTo({
-            url: `/pages/imglist/index?query=${query}`
-        })
-        // Taro.showModal({
-        //     title: '修改成功',
-        //     content: '点击确认按钮，返回上级菜单',
-        //     showCancel: false,
-        //     success: function (res) {
-        //         if (res.confirm) {
-        //             console.log('用户点击确定')
-
-        //             Taro.navigateBack({
-        //                 delta: 1
-        //             })
-        //         } else if (res.cancel) {
-        //             console.log('用户点击取消')
-        //         }
-        //     }
-        // })
-    }
-
-    return <View className='material'>
-
-
-
-
+import Taro, { useDidShow } from "@tarojs/taro";
+import { View ,Text } from "@tarojs/components";
+import Layout from "../../layout/index";
+import Tab from "../../compents/tab/index";
+import Tags from "../../compents/tags/index";
+import request from "../../util/request";
+import NoData from "@/compents/NoData";
+import "./index.scss";
+import IsLogin from "../../layout/IsLogin";
+
+const index = props => {
+  let [arrList, setArrList] = useState({});
+  const [labelList, setLabelList] = useState([]);
+  const [list, setList] = useState([]);
+
+
+  useDidShow(() => {
+    getMateTagGroupList();
+  });
+
+  const getMateTagGroupList = () => {
+    request({
+      url: "/taMateTagGroup",
+      params: { pageSize: 1, pageSize: 9999 }
+    }).then(res => {
+      const { records, ...page } = res.data.data;
+      setList(records);
+    });
+  };
+
+  const onLabelChange = (e, index) => {
+    let newArrArrList = {
+      ...arrList,
+      [index]: e
+    };
+    setArrList(newArrArrList);
+    let newArr = Object.values(newArrArrList).reduce((pre, cur) => {
+      return pre.concat(cur);
+    }, []);
+    setLabelList([...newArr]);
+  };
+
+  const onClick = () => {
+    const query = labelList.map(x => x.tagId).join(",");
+    Taro.navigateTo({
+      url: `/pages/imglist/index?query=${query}`
+    });
+  };
+
+  return (
+    <IsLogin>
+      <View className="material">
         <Layout>
-            <NoData nodata={!list.length}>
-            {
-                list.map((item,index) => {
-                    return <View className='material-card' key={index}>
-                        <Text>{item.name}</Text>
-                        <Tags list={item.taMateTagList} onChange={(e) => onLabelChange(e, index)} > </Tags>
-                    </View>
-                })
-            }
-            </NoData>
+          <NoData nodata={!list.length}>
+            {list.map((item, index) => {
+              return (
+                <View className="material-card" key={index}>
+                  <Text>{item.name}</Text>
+                  <Tags
+                    list={item.taMateTagList}
+                    onChange={e => onLabelChange(e, index)}
+                  ></Tags>
+                </View>
+              );
+            })}
+          </NoData>
         </Layout>
-        {/* className='addhousetab' */}
-        <Tab pageState='3' value={['取消', '开始查询']} onClick={[(e) => Taro.navigateBack({
+        <Tab
+          pageState="3"
+          value={["取消", "开始查询"]}
+          onClick={[
+            e =>
+              Taro.navigateBack({
                 delta: 1
-            }), (e) => onClick(e)]}></Tab>
-    </View>
-}
-
-export default index
+              }),
+            e => onClick(e)
+          ]}
+        ></Tab>
+      </View>
+    </IsLogin>
+  );
+};
+
+export default index;

src/pages/shop/edit/index.jsx

@@ -1,153 +1,124 @@
-import React, { useEffect, useMemo, useState } from 'react'
+import React, { useEffect, useState } from "react";
 import Taro from "@tarojs/taro";
-import { View, Input, Text, Image, Form, Button } from '@tarojs/components'
-import Layout from '../../../layout/index'
-import Tab from '../../../compents/tab/index'
-import Container from '../../../compents/container/index'
-import locationicon from '../../../assets/locationicon.png'
-import uploadicon from '../../../assets/uploadicon.png'
-import './index.scss'
-import request, { uploadFiles } from '../../../util/request'
-const index = (props) => {
-
-
-    const [userRole, setUserRole] = useState('1')
-
-    const [name, setName] = useState('')
-    const [imgUrl, setImgUrl] = useState('')
-    useEffect(() => {
-
-
-    }, [])
-
-
-    const onTabClick = (e) => {
-        console.log(e, '111')
-        setUserRole(e)
+import { View, Input, Text, Image } from "@tarojs/components";
+import Layout from "../../../layout/index";
+import Tab from "../../../compents/tab/index";
+import Container from "../../../compents/container/index";
+import uploadicon from "../../../assets/uploadicon.png";
+import "./index.scss";
+import request, { uploadFiles } from "../../../util/request";
+import IsLogin from "../../../layout/IsLogin";
+
+const index = props => {
+  const [name, setName] = useState("");
+  const [imgUrl, setImgUrl] = useState("");
+  useEffect(() => {}, []);
+
+  const editShopKeeper = () => {
+    if (!name) {
+      Taro.showToast({
+        title: "请输入名称",
+        icon: "none",
+        duration: 2000
+      });
+      return;
     }
-
-    const onRegisterChange = (e) => {
-        console.log(e, '111')
-    }
-    const onSave = () => {
-        console.log(333)
-
-        // Taro.showModal({
-        //     title: '修改成功',
-        //     content: '点击确认按钮，返回上级菜单',
-        //     showCancel: false,
-        //     success: function (res) {
-        //         if (res.confirm) {
-        //             console.log('用户点击确定')
-
-        //             Taro.navigateBack({
-        //                 delta: 1
-        //             })
-        //         } else if (res.cancel) {
-        //             console.log('用户点击取消')
-        //         }
-        //     }
-        // })
+    if (!imgUrl) {
+      Taro.showToast({
+        title: "请上传图片",
+        icon: "none",
+        duration: 2000
+      });
+      return;
     }
-    // /api/taShopKeeper
-    const editShopKeeper = () => {
-
-
-        if (!name) {
+    request({
+      url: "/taShop",
+      data: { name: name, logo: imgUrl },
+      method: "post"
+    }).then(res => {
+      Taro.showModal({
+        title: "新增成功",
+        content: "点击确认按钮，返回上级菜单",
+        showCancel: false,
+        success: function(res) {
+          if (res.confirm) {
+            console.log("用户点击确定");
 
-            Taro.showToast({
-                title: '请输入名称',
-                icon: 'none',
-                duration: 2000
-              })
-            return
-        }
-        if (!imgUrl) {
-            Taro.showToast({
-                title: '请上传图片',
-                icon: 'none',
-                duration: 2000
-              })
-            return
+            Taro.navigateBack({
+              delta: 1
+            });
+          } else if (res.cancel) {
+            console.log("用户点击取消");
+          }
         }
-        request({ url: "/taShop", data: { name: name, logo: imgUrl }, method: 'post' }).then((res) => {
-            Taro.showModal({
-                title: '新增成功',
-                content: '点击确认按钮，返回上级菜单',
-                showCancel: false,
-                success: function (res) {
-                    if (res.confirm) {
-                        console.log('用户点击确定')
-
-                        Taro.navigateBack({
-                            delta: 1
-                        })
-                    } else if (res.cancel) {
-                        console.log('用户点击取消')
-                    }
-                }
-            })
-        })
-
-    }
-    function handNameChange(e) {
-        console.log(e.detail, 'handNameChange')
-        setName(e.detail.value)
-        // editShopKeeper(e.detail.value)
-
-
-    }
-
-    const onUpImage = () => {
-        console.log('onUpImage')
-
-
-
-        Taro.chooseImage({
-            sourceType: ['album'],
-            success: (res) => {
-                const tempFilePaths = res.tempFilePaths
-                uploadFiles(tempFilePaths).then((res) => {
-                    console.log(res, 'uploadFiles')
-                    setImgUrl(res[0])
-                })
-            }
-        })
-    }
-
-    return <View className='addnewhouse'>
-
+      });
+    });
+  };
+  function handNameChange(e) {
+    setName(e.detail.value);
+  }
+
+  const onUpImage = () => {
+    Taro.chooseImage({
+      sourceType: ["album"],
+      success: res => {
+        const tempFilePaths = res.tempFilePaths;
+        uploadFiles(tempFilePaths).then(res => {
+          setImgUrl(res[0]);
+        });
+      }
+    });
+  };
+
+  return (
+    <IsLogin>
+      <View className="addnewhouse">
         <Layout>
-
-            <View className='inputstyle-view'>
-                <Text className='title'>店铺名称</Text>
-                <Container className='inputstyle-view-card '  >
-                    <Input name='keeperId' value={name} placeholderClass='placeholderinput' onInput={handNameChange} placeholder='' className='input' />
-                </Container>
-            </View>
-
-
-            <View className='inputstyle-view'>
-                <Text className='title'>logo</Text>
-                <Container className='inputstyle-view-card ' style={{ padding: '0.6rem', width: '2rem', height: '2rem' }} >
-                    <Image className='guide-view-img' style={{ width: '100%', height: '100%' }} onClick={() => onUpImage()} src={imgUrl || uploadicon}></Image>
-                </Container>
-            </View>
-
+          <View className="inputstyle-view">
+            <Text className="title">店铺名称</Text>
+            <Container className="inputstyle-view-card ">
+              <Input
+                name="keeperId"
+                value={name}
+                placeholderClass="placeholderinput"
+                onInput={handNameChange}
+                placeholder=""
+                className="input"
+              />
+            </Container>
+          </View>
+
+          <View className="inputstyle-view">
+            <Text className="title">logo</Text>
+            <Container
+              className="inputstyle-view-card "
+              style={{ padding: "0.6rem", width: "2rem", height: "2rem" }}
+            >
+              <Image
+                className="guide-view-img"
+                style={{ width: "100%", height: "100%" }}
+                onClick={() => onUpImage()}
+                src={imgUrl || uploadicon}
+              ></Image>
+            </Container>
+          </View>
         </Layout>
-        {/* <Input formType="submit" > */}
-        <Tab className='addhousetab' pageState='3' value={['取消', '确认添加']} onClick={[(e) => {
-            Taro.navigateBack({
+        <Tab
+          className="addhousetab"
+          pageState="3"
+          value={["取消", "确认添加"]}
+          onClick={[
+            e => {
+              Taro.navigateBack({
                 delta: 1
-            })
-        }, () => editShopKeeper()]}></Tab>
-
-        {/* </Input> */}
-
-
-
-
-    </View>
-}
-
-export default index
+              });
+            },
+            () => editShopKeeper()
+          ]}
+        ></Tab>
+      </View>
+    </IsLogin>
+  );
+};
+
+export default index;

src/pages/shop/index.jsx

@@ -1,134 +1,113 @@
-import React, { useEffect, useMemo, useState, useRef } from 'react'
-import Taro, { useDidShow } from '@tarojs/taro'
-import './index.scss'
-import { View, Text, Input, Image } from '@tarojs/components'
-import ContainerLayout from '../../compents/container/index'
-import Tab from '../../compents/tab/index'
-import Layout from '../../layout/index'
-import request from '../../util/request'
-import InifiniteList from '@/compents/InifiniteList'
-
-const account = (props) => {
-
-  const [list, setList] = useState([])
-  const [page, setPage] = useState({ total: 0, pageNum: 0 })
-  const [radioHouse, setRadioHouse] = useState()
-  const [loading, setLoading] = useState(false)
-
-  const radioHouseState = useMemo(() => props.radioHouseState, [props.radioHouseState])
-
-  console.log(props, radioHouseState)
-  useEffect(() => {
-
-
-  }, [])
+import React, { useEffect, useMemo, useState } from "react";
+import Taro, { useDidShow } from "@tarojs/taro";
+import "./index.scss";
+import { View, Text } from "@tarojs/components";
+import ContainerLayout from "../../compents/container/index";
+import Tab from "../../compents/tab/index";
+import Layout from "../../layout/index";
+import request from "../../util/request";
+import InifiniteList from "@/compents/InifiniteList";
+import IsLogin from "../../layout/IsLogin";
+
+const account = props => {
+  const [list, setList] = useState([]);
+  const [page, setPage] = useState({ total: 0, pageNum: 0 });
+  const [loading, setLoading] = useState(false);
+
+  const radioHouseState = useMemo(() => props.radioHouseState, [
+    props.radioHouseState
+  ]);
+
+  console.log(props, radioHouseState);
+  useEffect(() => {}, []);
 
   useDidShow(() => {
-    getShopList({ pageNum: 1, pageSize:10 })
-  })
+    getShopList({ pageNum: 1, pageSize: 10 });
+  });
 
   function getShopList(params) {
-    // setLoading(true)
-    request({ url: "/taShop",params,  method: 'get' })
-      .then((res) => {
-        const { records, ...page} = res.data.data
-
-        // setLoading(false)
+    request({ url: "/taShop", params, method: "get" })
+      .then(res => {
+        const { records, ...page } = res.data.data;
         setPage({
           ...page,
           pageNum: page.current
-        })
-
-        setList(list.concat(records || []))
-
-      }).catch(() => setLoading(false))
+        });
+        setList(list.concat(records || []));
+      })
+      .catch(() => setLoading(false));
   }
 
-  const onDelete = (shopId) => {
+  const onDelete = shopId => {
     Taro.showModal({
-      title: '确定删除该店铺吗',
+      title: "确定删除该店铺吗",
       // content: '确定后，该老板房源信息将一并删除',
-      cancelColor: '#d2d2d2',
+      cancelColor: "#d2d2d2",
       confirmColor: "#274191",
-      success: function (res) {
+      success: function(res) {
         if (res.confirm) {
-         
-          request({ url: `/taShop/${shopId}`,  method: 'delete' })
-          .then((res) => {
-            setList(list.filter((x)=>x.shopId!=shopId))
-          })
-
-
+          request({ url: `/taShop/${shopId}`, method: "delete" }).then(res => {
+            setList(list.filter(x => x.shopId != shopId));
+          });
         } else if (res.cancel) {
-          console.log('用户点击取消')
+          console.log("用户点击取消");
         }
       }
-    })
-  }
+    });
+  };
 
   const loadMore = () => {
-    console.log('----------------')
-    getShopList({ pageNum: page.pageNum + 1 })
-  }
+    getShopList({ pageNum: page.pageNum + 1 });
+  };
 
   const renderItem = (index, key) => (
-    <View className='account-view' key={key}>
+    <View className="account-view" key={key}>
       {/* <Text className='account-view-title'>店铺编号：{index}</Text> */}
-      <ContainerLayout className='account-view-card'>
-        <View className='top' >
-          <View>店铺名称：{list[index].name||''}</View>
+      <ContainerLayout className="account-view-card">
+        <View className="top">
+          <View>店铺名称：{list[index].name || ""}</View>
           {/* <View>电话：{x.user.name}</View>
         <View>微信号：{x.user.name}</View>
         <View>房源数：{x.user.name}</View> */}
         </View>
-        <View className='bottom'>
-          <Text onClick={() => { Taro.navigateTo({ url: `/pages/account/index?id=${list[index].shopId}` }) }}>店主</Text>
-          <Text onClick={()=>onDelete(list[index].shopId)}>删除</Text>
+        <View className="bottom">
+          <Text
+            onClick={() => {
+              Taro.navigateTo({
+                url: `/pages/account/index?id=${list[index].shopId}`
+              });
+            }}
+          >
+            店主
+          </Text>
+          <Text onClick={() => onDelete(list[index].shopId)}>删除</Text>
         </View>
-      </ContainerLayout>  
+      </ContainerLayout>
     </View>
-  )
-  
-
-  return <View className='account'>
-    <Layout>
-      {/* <VirtualList
-        className='List'
-        height={500}
-        itemData={list}
-        itemCount={list.length}
-        itemSize={100}
-        width='100%'
-        onScroll={({ scrollDirection, scrollOffset }) => {
-          console.log(scrollDirection, scrollOffset, 'onScroll')
-          if (
-          
-            !loading &&
-          
-            scrollDirection === 'forward' &&
-          
-            scrollOffset > ((list.length - 6) * 100 + 50)
-          ) {
-            console.log('listReachBottom')
-            listReachBottom()
-          }
-        }}
-      >
-        {Row}
-      </VirtualList> */}
-
-      <InifiniteList
-        length={list.length}
-        total={page.total}
-        height={600}
-        itemRenderer={renderItem}
-        loadMore={loadMore}
-      />
-
-    </Layout>
-    {/* onClick={(e)=>(e) */}
-    <Tab value={['+新增店铺']} color='#ffffff' onClick={() => { Taro.navigateTo({ url: `/pages/shop/edit/index` }) }} ></Tab>
-  </View>
-}
-
-export default account
+  );
+
+  return (
+    <IsLogin>
+      <View className="account">
+        <Layout>
+          <InifiniteList
+            length={list.length}
+            total={page.total}
+            height={600}
+            itemRenderer={renderItem}
+            loadMore={loadMore}
+          />
+        </Layout>
+        <Tab
+          value={["+新增店铺"]}
+          color="#ffffff"
+          onClick={() => {
+            Taro.navigateTo({ url: `/pages/shop/edit/index` });
+          }}
+        ></Tab>
+      </View>
+    </IsLogin>
+  );
+};
+
+export default account;