first commit

.editorconfig

@@ -0,0 +1,12 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

.eslintrc.js

@@ -0,0 +1,3 @@
+module.exports = {
+  'extends': ['taro/react']
+}

.gitignore

@@ -0,0 +1,6 @@
+dist/
+deploy_versions/
+.temp/
+.rn_temp/
+node_modules/
+.DS_Store

babel.config.js

@@ -0,0 +1,10 @@
+// babel-preset-taro 更多选项和默认值：
+// https://github.com/NervJS/taro/blob/next/packages/babel-preset-taro/README.md
+module.exports = {
+  presets: [
+    ['taro', {
+      framework: 'react',
+      ts: false
+    }]
+  ]
+}

config/dev.js

@@ -0,0 +1,33 @@
+module.exports = {
+  env: {
+    NODE_ENV: '"development"'
+  },
+  defineConstants: {
+    APPID:'"wx74db171e5f6524ad"'
+    // HOST: '"http://localhost:7080"',
+    // WSS_HOST: '"ws://localhost:7080"',
+    // OSS_PATH: "https://njcj.oss-cn-shanghai.aliyuncs.com/",
+    // OSS_FAST_PATH: "https://njcj.oss-accelerate.aliyuncs.com/",
+  },
+  mini: {},
+  h5: {
+    publicPath: '/',
+    staticDirectory: 'static',
+    postcss: {
+      autoprefixer: {
+        enable: true
+      }
+    },
+    // 自定义 Webpack 配置
+    // webpackChain: {},
+    devServer: {
+      proxy: {
+        '/api': {
+          // target: 'https://sgl.ycjcjy.com',
+          target: 'http://localhost:7080',
+          changeOrigin: true
+        }
+      }
+    }
+  }
+}

config/index.js

@@ -0,0 +1,70 @@
+const config = {
+  projectName: 'shigongliserverh5',
+  date: '2020-12-19',
+  designWidth: 750,
+  deviceRatio: {
+    640: 2.34 / 2,
+    750: 1,
+    828: 1.81 / 2
+  },
+  sourceRoot: 'src',
+  outputRoot: 'dist',
+  plugins: [],
+  defineConstants: {
+  },
+  copy: {
+    patterns: [
+    ],
+    options: {
+    }
+  },
+  framework: 'react',
+  mini: {
+    postcss: {
+      pxtransform: {
+        enable: true,
+        config: {
+
+        }
+      },
+      url: {
+        enable: true,
+        config: {
+          limit: 1024 // 设定转换尺寸上限
+        }
+      },
+      cssModules: {
+        enable: false, // 默认为 false，如需使用 css modules 功能，则设为 true
+        config: {
+          namingPattern: 'module', // 转换模式，取值为 global/module
+          generateScopedName: '[name]__[local]___[hash:base64:5]'
+        }
+      }
+    }
+  },
+  h5: {
+    publicPath: '/',
+    staticDirectory: 'static',
+    postcss: {
+      autoprefixer: {
+        enable: true,
+        config: {
+        }
+      },
+      cssModules: {
+        enable: false, // 默认为 false，如需使用 css modules 功能，则设为 true
+        config: {
+          namingPattern: 'module', // 转换模式，取值为 global/module
+          generateScopedName: '[name]__[local]___[hash:base64:5]'
+        }
+      }
+    }
+  }
+}
+
+module.exports = function (merge) {
+  if (process.env.NODE_ENV === 'development') {
+    return merge({}, config, require('./dev'))
+  }
+  return merge({}, config, require('./prod'))
+}

config/prod.js

@@ -0,0 +1,19 @@
+module.exports = {
+  env: {
+    NODE_ENV: '"production"'
+  },
+  defineConstants: {
+    APPID:'"wx74db171e5f6524ad"'
+  },
+  mini: {},
+  h5: {
+    /**
+     * 如果h5端编译后体积过大，可以使用webpack-bundle-analyzer插件对打包体积进行分析。
+     * 参考代码如下：
+     * webpackChain (chain) {
+     *   chain.plugin('analyzer')
+     *     .use(require('webpack-bundle-analyzer').BundleAnalyzerPlugin, [])
+     * }
+     */
+  }
+}

debug.log

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

package.json

@@ -0,0 +1,66 @@
+{
+  "name": "shigongliserverh5",
+  "version": "1.0.0",
+  "private": true,
+  "description": "十公里h5",
+  "templateInfo": {
+    "name": "taro-ui",
+    "typescript": false,
+    "css": "sass"
+  },
+  "scripts": {
+    "build:weapp": "taro build --type weapp",
+    "build:swan": "taro build --type swan",
+    "build:alipay": "taro build --type alipay",
+    "build:tt": "taro build --type tt",
+    "build:h5": "taro build --type h5",
+    "build:rn": "taro build --type rn",
+    "build:qq": "taro build --type qq",
+    "build:jd": "taro build --type jd",
+    "build:quickapp": "taro build --type quickapp",
+    "dev:weapp": "npm run build:weapp -- --watch",
+    "dev:swan": "npm run build:swan -- --watch",
+    "dev:alipay": "npm run build:alipay -- --watch",
+    "dev:tt": "npm run build:tt -- --watch",
+    "dev:h5": "npm run build:h5 -- --watch",
+    "dev:rn": "npm run build:rn -- --watch",
+    "dev:qq": "npm run build:qq -- --watch",
+    "dev:jd": "npm run build:jd -- --watch",
+    "dev:quickapp": "npm run build:quickapp -- --watch"
+  },
+  "browserslist": [
+    "last 3 versions",
+    "Android >= 4.1",
+    "ios >= 8"
+  ],
+  "author": "",
+  "dependencies": {
+    "@babel/runtime": "^7.7.7",
+    "@tarojs/cli": "3.0.13",
+    "@tarojs/components": "3.0.13",
+    "@tarojs/react": "3.0.13",
+    "@tarojs/runtime": "3.0.13",
+    "@tarojs/taro": "3.0.13",
+    "lodash": "4.17.15",
+    "lodash.groupby": "^4.6.0",
+    "react": "^16.10.0",
+    "react-dom": "^16.10.0",
+    "react-redux": "^7.2.2",
+    "redux": "^4.0.5",
+    "taro-ui": "^3.0.0-alpha.7"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.8.0",
+    "@tarojs/mini-runner": "3.0.13",
+    "@tarojs/webpack-runner": "3.0.13",
+    "@types/webpack-env": "^1.13.6",
+    "babel-preset-taro": "3.0.13",
+    "eslint": "^6.8.0",
+    "eslint-config-taro": "3.0.13",
+    "stylelint": "9.3.0",
+    "@types/react": "^16.0.0",
+    "eslint-plugin-react": "^7.8.2",
+    "eslint-plugin-import": "^2.12.0",
+    "eslint-plugin-react-hooks": "^1.6.1"
+  }
+}

project.config.json

@@ -0,0 +1,23 @@
+{
+	"miniprogramRoot": ".dist",
+	"projectname": "shigongliserverh5",
+	"description": "十公里h5",
+	"appid": "wx74db171e5f6524ad",
+	"setting": {
+		"urlCheck": true,
+		"es6": false,
+		"postcss": false,
+		"preloadBackgroundData": false,
+		"minified": false,
+		"newFeature": true,
+		"autoAudits": false,
+		"coverView": true,
+		"showShadowRootInWxmlPanel": false,
+		"scopeDataCheck": false,
+		"useCompilerModule": false
+	},
+	"compileType": "miniprogram",
+	"simulatorType": "wechat",
+	"simulatorPluginLibVersion": {},
+	"condition": {}
+}

src/app.config.js

@@ -0,0 +1,22 @@
+export default {
+  pages: [
+    'pages/index/index',
+    'pages/account/index',
+    'pages/account/edit/index',
+    'pages/material/index',
+    'pages/label/index',
+    'pages/label/edit/index',
+    'pages/imglist/index',
+    'pages/batchimport/index',
+    'pages/shop/index',
+    'pages/shop/edit/index',
+    'pages/mateTag/index',
+    'pages/mateTag/edit/index',
+  ],
+  window: {
+    backgroundTextStyle: 'light',
+    navigationBarBackgroundColor: '#fff',
+    navigationBarTitleText: 'WeChat',
+    navigationBarTextStyle: 'black'
+  }
+}

src/app.js

@@ -0,0 +1,49 @@
+
+import 'taro-ui/dist/style/index.scss'
+import React, { Component, useEffect } from 'react'
+import { Provider } from 'react-redux'
+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()
+
+const App = (props)=> {
+  const {user, getUser} = useUser()
+  const code = getCode()
+
+  useEffect(() => {
+    // 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() 函数没有实际作用
+  // 请勿修改此函数
+ 
+    return (
+      <Provider store={store}>
+        {props.children}
+      </Provider>
+    )
+  
+}
+
+export default App
+

src/app.scss

@@ -0,0 +1,58 @@
+body {
+    background-color: #f4f4f4;
+    letter-spacing: 4px;
+ 
+ 
+ }
+ .page-container {
+    padding: 0 41.3px 0;
+    width: 667.33px;
+  
+    
+  
+  
+    color: #181818;
+  }
+ 
+ 
+  .title{
+    color: #7b7b7b;
+    font-size: 30px;
+    font-weight: 500;
+    margin-left: 40px;
+  }
+ 
+ 
+  .inputstyle {
+    // padding:13.33px;
+    &-view {
+      margin: 50px 0 0;
+  
+      &-card {
+        // height: 106px;
+        // line-height: 106px;
+        padding: 0 40px;
+        // color:#181818;
+        font-size: 24px;
+        // font-weight: 600;
+        margin-top: 26.67px;
+        border-radius: 30px;
+        border-radius: 20px;
+        .input{
+          font-size: 28px;
+          padding:30px 0;
+          line-height: 106px;
+          // color: red;
+        }
+        .placeholderinput{
+          // line-height: 106px;
+          color: #d2d2d2;
+          font-size: 28px;
+        }
+      }
+      
+      // style={{width:'48.4rpx',height:'48.4rpx'}}
+    }
+  
+  }
+ 

src/compents/container/index.jsx

@@ -0,0 +1,12 @@
+import React from 'react'
+import { View,  } from '@tarojs/components'
+import './index.scss'
+
+const container = (props) => {
+    const { className,children, ...prop } = props
+    // let { className, ...prop } = props
+    return  <View className={`container ${className}`} {...prop} >{children}</View>;
+    // <view className={`container,${className}`} props >{children}</view>;
+}
+
+export default container

src/compents/container/index.scss

@@ -0,0 +1,6 @@
+.container{
+ 
+    background-color: #fff;
+    border-radius: 56px;
+    // padding: 40px;
+}

src/compents/tab/index.jsx

@@ -0,0 +1,42 @@
+import React, { useEffect, useState } from 'react'
+import Taro from "@tarojs/taro";
+import { Button, View } from '@tarojs/components'
+
+import './index.scss'
+
+// const getColor = (role) => {
+//     switch (role) {
+//         case roleList.landlord: return '#274291'
+//         case roleList.adminuser: return '#274291'
+//         // landlord: 'landlord',
+//         case roleList.customer: return '#fed12f'
+//     }
+// }
+
+
+const tab = (props) => {
+    // formType="submit"
+
+    const { value, pageState, formType, color, ...prop } = props
+
+    const [state, setState] = useState(1)
+    // console.log(props)
+    useEffect(() => {
+
+    }, [])
+    //  &-on{
+    //     color: #fed12f; style={{ backgroundColor:'#274291' ,color}}
+    // }${props.className}
+    return <View className='tab'>
+        {value.length == 1 && <View className={`tab tab1 ${props.className}`} onClick={() => props.onClick('2')}>{value[0]}
+        </View>}
+        {value.length == 2 && <View className={`tab tab2 ${props.className}`} style={{ display: 'flex', }}>
+            <View style={{ width: '50%' }} style={pageState == '2' ? { color: '#274291', width: '50%' } : { width: '50%' }} onClick={props.onClick[0]}>{value[0]}</View>
+           { !formType? 
+            <View formType={formType} style={{ width: '50%' }} style={pageState == '3' ? { color: '#274291', width: '50%' } : { width: '50%' }} onClick={props.onClick[1]}>{value[1]}</View>
+            :<Button className='tab-btn' formType={formType} plain={true} style={{ width: '50%' }} style={pageState == '3' ? { color: '#274291', width: '50%',border:'none' } : { width: '50%',border:'none' }} onClick={props.onClick[1]}>{value[1]}</Button>}
+        </View>}
+    </View>
+};
+
+export default tab

src/compents/tab/index.scss

@@ -0,0 +1,32 @@
+.tab{
+    
+    position:absolute;
+    bottom: 0;
+    width: 100%;
+    height: 173.33px;
+    border-radius:40px 40px 0 0;
+    text-align: center;
+    line-height: 173px;
+    z-index:999;
+    background-color: #274291;
+&-btn{
+    line-height: unset;
+}
+    .tab1 {
+        background-color: #274291;
+        font-size: 44px;
+        font-weight: 600;
+        letter-spacing: 14px;
+        color: #fff;
+    }
+
+    .tab2 {
+        background-color: #ffffff;
+        font-size: 34px;
+        color: #d2d2d2;
+        font-weight: 500;
+        line-height: unset;
+    }
+
+    
+}

src/compents/tags/index.jsx

@@ -0,0 +1,48 @@
+import React, { useEffect, useState } from 'react'
+import Taro from "@tarojs/taro";
+import { useSelector } from 'react-redux'
+import { View, Text } from '@tarojs/components'
+import './index.scss'
+
+const tags = (props) => {
+
+
+    const { value, list, onChange, ...prop } = props
+
+    const [state, setState] = useState(1)
+    const [key, setKey] = useState(value)
+    const [keyList, setKeyList] = useState([])
+    console.log(props)
+    useEffect(() => {
+
+    }, [])
+    const onClick = (item) => {
+       
+        
+        let  newkeyList= keyList
+        console.log(newkeyList.find(x => x.tagId === item.tagId),'333')
+        if (newkeyList.find(x => x.tagId === item.tagId)) {
+            newkeyList =  newkeyList.filter((x) => x.tagId != item.tagId )
+        } else {
+            newkeyList.push(item)
+        }
+
+console.log(newkeyList,keyList)
+        setKeyList([...newkeyList])
+        onChange([...newkeyList])
+    }
+    return <View className='tags'>
+        <View className='at-row at-row--wrap' style={{ marginTop: '10rpx' }}>
+            {
+                list.map((item) => {
+                    return <View className='at-col at-col-4 ' >
+                        <View className={`tags-btn tags-btn${keyList.find(x => x.tagId === item.tagId) ? '-on' : ''}`} onClick={() => onClick(item)} >{item.name}</View>
+                    </View>
+                })
+            }
+
+        </View>
+    </View>
+};
+
+export default tags

src/compents/tags/index.scss

@@ -0,0 +1,21 @@
+.tags {
+
+
+
+  &-btn {
+    background-color: #ffffff;
+    color: #acacac;
+    margin: 10px;
+    font-size: 22px;
+    height: 50px;
+    line-height: 50px;
+    border-radius: 25px;
+
+    &-on {
+      background-color: #274291;
+      color: #ffffff;
+    }
+  }
+
+
+}

src/index.html

@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+  <meta content="width=device-width,initial-scale=1,user-scalable=no" name="viewport">
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="apple-touch-fullscreen" content="yes">
+  <meta name="format-detection" content="telephone=no,address=no">
+  <meta name="apple-mobile-web-app-status-bar-style" content="white">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" >
+  <script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
+ 
+  <title></title>
+  <script>
+    !function(x){function w(){var v,u,t,tes,s=x.document,r=s.documentElement,a=r.getBoundingClientRect().width;if(!v&&!u){var n=!!x.navigator.appVersion.match(/AppleWebKit.*Mobile.*/);v=x.devicePixelRatio;tes=x.devicePixelRatio;v=n?v:1,u=1/v}if(a>=640){r.style.fontSize="40px"}else{if(a<=320){r.style.fontSize="20px"}else{r.style.fontSize=a/320*20+"px"}}}x.addEventListener("resize",function(){w()});w()}(window);
+  </script>
+</head>
+<body>
+  <div id="app"></div>
+</body>
+</html>

src/layout/index.jsx

@@ -0,0 +1,14 @@
+import React from 'react';
+import { View, ScrollView } from '@tarojs/components'
+import './index.scss'
+
+const Layout = ({ children }) => {
+    return <ScrollView scrollY className='scrolllayout' >
+        <View className='page-container' >
+            {children}
+        </View>
+    </ScrollView>
+}
+
+
+export default Layout;

src/layout/index.scss

@@ -0,0 +1,5 @@
+.scrolllayout{
+    
+    height: calc(100vh - 173.33px)
+    
+}

src/pages/account/edit/index.config.js

@@ -0,0 +1,3 @@
+export default {
+ 
+}

src/pages/account/edit/index.jsx

@@ -0,0 +1,172 @@
+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('用户点击取消')
+        //         }
+        //     }
+        // })
+    }
+
+    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
+                })
+            })
+        }
+
+        
+
+    }
+    function formSubmit(e) {
+        console.log(e.detail, 'formSubmit')
+        editShopKeeper(e.detail.value)
+
+
+    }
+
+    const formReset = () => {
+        console.log('formReset')
+    }
+
+    return <View className='addnewhouse'>
+
+        {/* "createDate": "2020-12-24T11:57:16.851Z",
+  "keeperId": "string",
+  "name": "string",
+  "personId": "string",
+  "phone": "string",
+  "shopId": "string",
+  "status": 0 */}
+        <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'>
+                    <Text className='title'>微信号</Text>
+                    <Container className='inputstyle-view-card '  >
+                        <Input name='personId' placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
+                    </Container>
+                </View>
+               <View className='inputstyle-view'>
+                    <Text className='title'>房源数</Text>
+                    <Container className='inputstyle-view-card '  >
+                        <Input name='nnn' placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
+                    </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%'}} 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) => {
+                Taro.navigateBack({
+                    delta: 1
+                })
+            }, () => onSave()]}></Tab>
+
+            {/* </Input> */}
+
+        </Form>
+
+
+    </View>
+}
+
+export default index

src/pages/account/edit/index.scss

@@ -0,0 +1,50 @@
+.map {
+  // padding:13.33px;
+  &-view {
+    margin: 50px 0 0;
+
+    &-card {
+      // height: 106px;
+      // line-height: 106px;
+      padding: 0 40px;
+      // color:#181818;
+      font-size: 24px;
+      // font-weight: 600;
+      margin-top: 26.67px;
+      border-radius: 30px;
+      border-radius: 20px;
+      .input{
+        font-size: 28px;
+        padding:30px 0;
+        line-height: 106px;
+        // color: red;
+      }
+      .placeholderinput{
+        // line-height: 106px;
+        color: #d2d2d2;
+        font-size: 28px;
+      }
+    }
+    &-icon {
+      margin-left: 40px;
+      // padding: 20px 30px;
+      // color:#181818;
+      width: 150px;
+      height: 106.67px;
+      // font-size: 36px;
+      // // font-weight: 600;
+      margin-top: 26.67px;
+      border-radius: 20px;
+      background-color: #274291;
+      padding: 0;
+      text-align: center;
+      line-height:120.67px;
+      .icon {
+        
+        // width: 100%;
+      }
+    }
+    // style={{width:'48.4rpx',height:'48.4rpx'}}
+  }
+
+}

src/pages/account/index.config.js

@@ -0,0 +1,4 @@
+export default {
+
+  
+}

src/pages/account/index.jsx

@@ -0,0 +1,80 @@
+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'
+
+
+const account = (props) => {
+
+  const { id } = getQueryValue()
+  const [list, setList] = useState([])
+
+
+  useDidShow(() => {
+    console.log('useDidShow')
+    getShopKepperList({ pageNum: 1, pageSize:10 })
+  })
+
+  function getShopKepperList() {
+    request({ url: '/taShopKeeper',params:{shopId:id}, method: 'get', }).then((res)=>{
+      const { records, ...page} = res.data.data
+      setList(records)
+    })
+  }
+
+  const onDelete = (keeperId) => {
+    Taro.showModal({
+      title: '确定删除该老板账号吗',
+      content: '确定后，该老板房源信息将一并删除',
+      cancelColor: '#d2d2d2',
+      confirmColor: "#274191",
+      success: (res) => {
+        if (res.confirm) {
+          console.log('用户点击确定')
+          request({ url: `/taShopKeeper/${keeperId}`, method: 'delete', }).then((res)=>{
+            getShopKepperList({ pageNum: 1, pageSize:10 })
+          })
+
+        } else if (res.cancel) {
+          console.log('用户点击取消')
+        }
+      }
+    })
+  }
+
+
+
+
+  return <View className='account'>
+    <Layout>
+      {list.map((item, index) => {
+        return <View className='account-view'>
+          {/* <Text className='account-view-title'>房源编号：<Text style={{fontSize:"1rem"}}>{item.keeperId}</Text></Text> */}
+          <ContainerLayout className='account-view-card'>
+            <View className='top' >
+              <View>姓名：{item.name}</View>
+              <View>电话：{item.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=${item.keeperId}` }) }}>编辑</Text>
+              <Text onClick={()=>onDelete(item.keeperId)}>删除</Text>
+            </View>
+          </ContainerLayout>
+
+        </View>
+
+      })}
+    </Layout>
+    {/* onClick={(e)=>(e) */}
+    <Tab value={['+新增名宿老板账号']} color='#ffffff' onClick={() => { Taro.navigateTo({ url: `/pages/account/edit/index?id=${id}` }) }} ></Tab>
+  </View>
+}
+
+export default account

src/pages/account/index.scss

@@ -0,0 +1,54 @@
+.account {
+
+  // padding: 13.33px 0;
+  &-view {
+    margin: 40px 0 0;
+
+    // padding: 0;
+    &-title {
+      color: #7b7b7b;
+      font-size: 30px;
+      font-weight: 500;
+      margin-left: 40px;
+
+    }
+
+    &-card {
+      padding: 0;
+      color: #181818;
+      font-size: 24px;
+      font-weight: 600;
+      margin-top: 26.67px;
+      position: relative;
+
+      &-radio {
+          width: 50px;
+          height: 50px;
+        background-color: #274291;
+        text-align: center;
+        line-height: 50px;
+        position: absolute;
+        border-radius: 25px;
+        top: -12.5px;
+        right: -12.5px;
+      }
+
+      .top {
+        padding: 40px 40px;
+        border-bottom: 1px solid #f4f4f4;
+        line-height: 32px;
+        font-weight: 500;
+        // font-size: ;
+        // min-height: 120px;
+      }
+
+      .bottom {
+        display: flex;
+        justify-content: space-around;
+        padding: 20px
+      }
+
+
+    }
+  }
+}

src/pages/adminUser/index.jsx

@@ -0,0 +1,98 @@
+import React, { useEffect, useMemo, useState } from 'react'
+import Taro, { } from "@tarojs/taro";
+import { View, Text, Image } from '@tarojs/components'
+import Layout from '../../layout/index'
+import ContainerLayout from '../../compents/container/index'
+import usericon from '../../assets/usericon.png'
+import editicon from '../../assets/editicon.png'
+import upload from '../../assets/upload.png'
+import menuicon from '../../assets/menuicon.png'
+
+import './index.scss'
+
+const menuList = [
+  {
+    title: '店铺管理',
+    icon: usericon,
+    url: '/pages/shop/index'
+  },{
+//   title: '名宿老板账号管理',
+//   icon: usericon,
+//   url: '/pages/account/index'
+// }, {
+  title: '素材编辑与查询',
+  icon: editicon,
+  url: '/pages/material/index'
+}, {
+  title: '素材批量录入',
+  icon: upload,
+  url: '/pages/batchimport/index'
+}, {
+  title: '素材标签管理',
+  icon: menuicon,
+  url: '/pages/label/index'
+}]
+
+const index = (props) => {
+
+  const [isOpened, setIsOpened] = useState(false)
+  const [userRole, setUserRole] = useState('1')
+  const [pageState, setPageState] = useState('1')
+  const [list, setList] = useState([])
+  const [radioHouseData, setRadioHouseData] = useState()
+  const [radioHouseState, setRadioHouseState] = useState(false)
+
+  useEffect(() => {
+
+   
+
+  }, [])
+
+
+
+  const handleClose = () => {
+    setIsOpened(false)
+  }
+  const onTabClick = (e) => {
+    console.log(e, '111')
+    setUserRole(e)
+
+  }
+
+  const onRegisterChange = (e) => {
+    console.log(e, '111')
+  }
+  const onClick = (row) => {
+
+
+    Taro.navigateTo({ url: row.url })
+
+
+
+  }
+
+
+  return <View className='adminuser'>
+
+
+
+
+    <View className='page-container'>
+      {menuList.map((row) => {
+        return <ContainerLayout className='adminuser-menu' onClick={() => onClick(row)}>
+          <Text>{row.title}</Text>
+          <View className='adminuser-menu-img' >
+            <Image className='image' src={row.icon}></Image>
+          </View>
+
+        </ContainerLayout>
+      })}
+    </View>
+
+
+
+
+  </View>
+}
+
+export default index

src/pages/adminUser/index.scss

@@ -0,0 +1,30 @@
+.adminuser{
+  
+  &-menu{
+    margin-top: 40px;
+    padding: 60px;
+    font-size: 32px;
+    font-weight: 600;
+    border-radius: 50px;
+    position: relative;
+    background-color: #fff;
+    border-radius: 56px;
+    padding: 40px;
+    &-img{
+      background-color:#274291 ;
+      position: absolute;
+      width: 60px;
+      height: 60px;
+      right: 40px;
+      top: 40px;
+      border-radius: 30px;
+      text-align: center;
+      // line-height: 0px;
+      .image{
+        margin-top: 15px;
+        width: 30px;
+        height: 30px;
+      }
+    }
+  }
+}

src/pages/batchimport/index.config.js

@@ -0,0 +1,4 @@
+export default {
+
+  
+}

src/pages/batchimport/index.jsx

@@ -0,0 +1,147 @@
+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([])
+    const [radioHouse, setRadioHouse] = 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')
+
+        arrList[index] = e
+        // const [arrList, setArrList] = useState([[],[],[]])
+        setLabelList(arrList.flat())
+
+        console.log(arrList.flat(), 'labelList')
+    }
+
+
+    const onUpImage = () => {
+        console.log('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 <View className='batchimport'>
+        {pageState == 1 && <View>
+            <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) => {
+                            return <View className='at-col at-col-4 ' >
+                                <View className='tags-btn' >{item.name}</View>
+                            </View>
+                        })
+
+                    }
+                    <View className='at-col at-col-4 ' >
+                        <View className='tags-btn tags-btn-on' onClick={() => setPageState('2')} >添加</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('2') }, (e) => onSave(e)]}></Tab>
+        </View>
+        }
+        {pageState == 2 && <View>
+            <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('1'), (e) => setPageState('1')]}></Tab>
+        </View>
+        }
+    </View >
+}
+
+export default batchimport

src/pages/batchimport/index.scss

@@ -0,0 +1,37 @@
+// @import "~taro-ui/dist/style/components/image-picker.scss";
+// @import "~taro-ui/dist/style/components/icon.scss";
+
+.batchimport {
+  padding-top: 30rpx;
+
+
+  text-align: center;
+
+  &-card {
+    background-color: #fff;
+    text-align: center;
+    color: #fff;
+    margin-top: 30px;
+    padding: 0;
+
+    &-tags {
+      font-size: 28px;
+
+      .tag {
+       
+          background-color: #ffffff;
+          color: #acacac;
+          margin: 10px;
+          font-size: 22px;
+          height: 50px;
+          line-height: 50px;
+          border-radius: 25px;
+
+      padding: 0 30px;
+            background-color: #274291;
+            color: #ffffff;
+         
+      }
+    }
+  }
+}

src/pages/imglist/index.config.js

@@ -0,0 +1,4 @@
+export default {
+
+  
+}

src/pages/imglist/index.jsx

@@ -0,0 +1,219 @@
+import React, { useEffect, useMemo, 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';
+
+// 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)
+        }
+        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 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('用户点击取消')
+                }
+            }
+        })
+    }
+
+    const onLabelChange = (e, index) => {
+        console.log(e, index, 'onLabelChange')
+
+        arrList[index] = e
+        // const [arrList, setArrList] = useState([[],[],[]])
+        setLabelList(arrList.flat())
+
+        console.log(arrList.flat(), 'labelList')
+    }
+
+    return <View className='imglist'>
+
+
+
+
+        {!labelState&&<View style={{ padding: '0 30px' }}>
+            {
+
+                Object.keys(list).map((item) => {
+                    console.log(list[item], item, 'list[item]11')
+
+                    return <View className='imglist-card'>
+                        <View className='imglist-card-tags' style={{ display: 'flex' }}>
+                            {/* imageimageimageimage34 */}
+                            {list[item].map((x) => {
+                                return <View className='tag' s>{x.tagName}</View>
+                            })}
+                        </View>
+                        <Image src={list[item][0].image} style={{ width: '100%' }} onClick={() => { setData(list[item]); setIsOpened(true) }}></Image>
+                    </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>
+                    })
+                }
+            </View>
+            {/* <Tab value={['取消','']}  onClick={() => { Taro.navigateTo({ url: `/pages/label/edit/index` }) }} ></Tab> */}
+            <Tab pageState='3' value={['取消', '选择']} onClick={[(e) => setPageState('1'), (e) => ontagsClick()]}></Tab>
+        </View>
+        }
+
+        <AtFloatLayout isOpened={isOpened} onClose={() => handleClose()} style={{ zIndex: '1000' }}>
+            <View className='floatmodel' >
+                <View onClick={() => updateLabel()}>更改标签</View>
+                <View onClick={() => updateImage()}>更换图片</View>
+                <View onClick={() => { setIsOpened(false); setRadioHouseState(true) }}>删除</View>
+                <View style={{ color: '#d2d2d2' }} onClick={() => setIsOpened(false)}>取消</View>
+            </View>
+
+        </AtFloatLayout>
+    </View>
+}
+
+export default index

src/pages/imglist/index.scss

@@ -0,0 +1,85 @@
+.imglist {
+  padding-top: 30rpx;
+
+  &-card {
+    background-color: #fff;
+    text-align: center;
+    color: #fff;
+    margin-top: 30px;
+    padding: 0;
+
+    &-tags {
+      font-size: 28px;
+
+      .tag {
+       
+          background-color: #ffffff;
+          color: #acacac;
+          margin: 10px;
+          font-size: 22px;
+          height: 50px;
+          line-height: 50px;
+          border-radius: 25px;
+
+      padding: 0 30px;
+            background-color: #274291;
+            color: #ffffff;
+         
+      }
+    }
+  }
+
+  
+  &-tagcard {
+    // background-color: #fff;
+    text-align: center;
+    // color: #fff;
+    margin-top: 30px;
+    padding: 0;
+
+    &-tags {
+      font-size: 28px;
+
+      .tag {
+       
+          background-color: #ffffff;
+          color: #acacac;
+          margin: 10px;
+          font-size: 22px;
+          height: 50px;
+          line-height: 50px;
+          border-radius: 25px;
+
+      padding: 0 30px;
+            background-color: #274291;
+            color: #ffffff;
+         
+      }
+    }
+  }
+}
+
+
+.floatmodel {
+  height: 500px;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+  align-items: center;
+  font-size: 32px;
+}
+
+.at-float-layout__container {
+  min-height: 100px;
+  color: #274291;
+  font-weight: 600;
+  border-radius: 50px 50px 0 0;
+}
+
+.at-float-layout {
+  .layout-page {
+    padding: 0;
+  }
+
+}
+

src/pages/index/index.config.js

@@ -0,0 +1,3 @@
+export default {
+  navigationBarTitleText: '首页'
+}

src/pages/index/index.jsx

@@ -0,0 +1,54 @@
+import React, { useEffect, useMemo, useState } from 'react'
+import { View } from '@tarojs/components'
+
+import AdminUser from '../adminUser/index'
+
+import './index.scss'
+
+const index = (props) => {
+
+
+
+  const [userRole, setUserRole] = useState('1')
+  const [pageState, SetPageState] = useState('1')
+  const [list, setList] = useState([])
+  useEffect(() => {
+
+    
+    setList([
+      {
+        name: 'zhou',
+        phone: '177'
+      },
+      {
+        name: 'zhou',
+        phone: '177'
+      },
+      {
+        name: 'zhou',
+        phone: '177'
+      }
+    ])
+  }, [])
+
+
+  const onTabClick = (e) => {
+    console.log(e, '111')
+    setUserRole(e)
+  }
+
+  const onRegisterChange = (e) => {
+    console.log(e, '111')
+  }
+
+
+
+ 
+  return <View className='index'>
+{/* 432 */}
+      <AdminUser></AdminUser>  
+     
+  </View>
+}
+
+export default index

src/pages/label/edit/index.config.js

@@ -0,0 +1,4 @@
+export default {
+
+  
+}

src/pages/label/edit/index.jsx

@@ -0,0 +1,165 @@
+import React, { useEffect, useMemo, 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)
+        })
+    }
+
+
+    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('用户点击确定')
+        
+                                    Taro.navigateBack({
+                                        delta: 1
+                                    })
+                                } else if (res.cancel) {
+                                    console.log('用户点击取消')
+                                }
+                            }
+                        })
+        
+                    })
+          
+                  } else if (res.cancel) {
+                    console.log('用户点击取消')
+                  }
+                }
+              })
+
+            
+        } else {
+            request({ url: '/taMateTagGroup', data: { name }, method: 'post' }).then((res) => {
+                Taro.navigateBack({
+                    delta: 1
+                })
+            })
+        }
+
+
+
+        // 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)
+
+
+
+    }
+
+    return <View className='addnewhouse'>
+
+
+        {/* <Form onSubmit={this.formSubmit} onReset={this.formReset} >
+        <View className='example-body'>
+          <Switch name='switch' className='form-switch'></Switch>
+        </View>
+      </Form> */}
+
+        <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> */}
+
+        </Layout>
+        <Tab className='addhousetab' pageState='3' value={['取消', id ? '确认修改' : '确认添加']} onClick={[(e) => Taro.navigateBack({
+            delta: 1
+        }), () => onSave()]}></Tab>
+
+
+
+
+
+    </View>
+}
+
+export default index

src/pages/label/edit/index.scss

@@ -0,0 +1,50 @@
+.map {
+  // padding:13.33px;
+  &-view {
+    margin: 50px 0 0;
+
+    &-card {
+      // height: 106px;
+      // line-height: 106px;
+      padding: 0 40px;
+      // color:#181818;
+      font-size: 24px;
+      // font-weight: 600;
+      margin-top: 26.67px;
+      border-radius: 30px;
+      border-radius: 20px;
+      .input{
+        font-size: 28px;
+        padding:30px 0;
+        line-height: 106px;
+        // color: red;
+      }
+      .placeholderinput{
+        // line-height: 106px;
+        color: #d2d2d2;
+        font-size: 28px;
+      }
+    }
+    &-icon {
+      margin-left: 40px;
+      // padding: 20px 30px;
+      // color:#181818;
+      width: 150px;
+      height: 106.67px;
+      // font-size: 36px;
+      // // font-weight: 600;
+      margin-top: 26.67px;
+      border-radius: 20px;
+      background-color: #274291;
+      padding: 0;
+      text-align: center;
+      line-height:120.67px;
+      .icon {
+        
+        // width: 100%;
+      }
+    }
+    // style={{width:'48.4rpx',height:'48.4rpx'}}
+  }
+
+}

src/pages/label/index.config.js

@@ -0,0 +1,4 @@
+export default {
+
+  
+}

src/pages/label/index.jsx

@@ -0,0 +1,95 @@
+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();
+
+
+  useDidShow(() => {
+    getMateTagGroupList()
+  })
+
+
+  const getMateTagGroupList = () => {
+    request({ url: '/taMateTagGroup' }).then((res) => {
+      const { records, ...page} = res.data.data
+      setList(records)
+    })
+  }
+
+
+  const onDelete = (row) => {
+    Taro.showModal({
+      title: '确定删除该标签组吗？',
+      content: row.name,
+      cancelColor: '#d2d2d2',
+      confirmColor: "#274191",
+      success: function (res) {
+        if (res.confirm) {
+          console.log('用户点击确定')
+
+          request({ url: `/taMateTagGroup/${row.groupId}`, method: 'delete', }).then((res)=>{
+            getMateTagGroupList({ pageNum: 1, pageSize:10 })
+          })
+          // 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) {
+          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

src/pages/label/index.scss

@@ -0,0 +1,54 @@
+.account {
+
+  // padding: 13.33px 0;
+  &-view {
+    margin: 40px 0 0;
+
+    // padding: 0;
+    &-title {
+      color: #7b7b7b;
+      font-size: 30px;
+      font-weight: 500;
+      margin-left: 40px;
+
+    }
+
+    &-card {
+      padding: 0;
+      color: #181818;
+      font-size: 24px;
+      font-weight: 600;
+      margin-top: 26.67px;
+      position: relative;
+
+      &-radio {
+          width: 50px;
+          height: 50px;
+        background-color: #274291;
+        text-align: center;
+        line-height: 50px;
+        position: absolute;
+        border-radius: 25px;
+        top: -12.5px;
+        right: -12.5px;
+      }
+
+      .top {
+        padding: 40px 40px;
+        border-bottom: 1px solid #f4f4f4;
+        line-height: 32px;
+        font-weight: 500;
+        // font-size: ;
+        // min-height: 120px;
+      }
+
+      .bottom {
+        display: flex;
+        justify-content: space-around;
+        padding: 20px
+      }
+
+
+    }
+  }
+}

src/pages/mateTag/edit/index.config.js

@@ -0,0 +1,4 @@
+export default {
+
+  
+}

src/pages/mateTag/edit/index.jsx

@@ -0,0 +1,140 @@
+import React, { useEffect, useMemo, 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)
+        })
+    }
+
+
+    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('用户点击确定')
+        
+                                    Taro.navigateBack({
+                                        delta: 1
+                                    })
+                                } else if (res.cancel) {
+                                    console.log('用户点击取消')
+                                }
+                            }
+                        })
+        
+                    })
+          
+                  } else if (res.cancel) {
+                    console.log('用户点击取消')
+                  }
+                }
+              })
+
+            
+        } else {
+            request({ url: '/taMateTag', data: { name:name,groupId: id}, method: 'post' }).then((res) => {
+                Taro.navigateBack({
+                    delta: 1
+                })
+            })
+        }
+
+
+
+        // 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)
+
+
+
+    }
+
+    return <View className='addnewhouse'>
+
+
+        {/* <Form onSubmit={this.formSubmit} onReset={this.formReset} >
+        <View className='example-body'>
+          <Switch name='switch' className='form-switch'></Switch>
+        </View>
+      </Form> */}
+
+        <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>
+   
+        </Layout>
+        <Tab className='addhousetab' pageState='3' value={['取消', tagId ? '确认修改' : '确认添加']} onClick={[(e) => Taro.navigateBack({
+            delta: 1
+        }), () => onSave()]}></Tab>
+
+
+    </View>
+}
+
+export default index

src/pages/mateTag/edit/index.scss

@@ -0,0 +1,50 @@
+.map {
+  // padding:13.33px;
+  &-view {
+    margin: 50px 0 0;
+
+    &-card {
+      // height: 106px;
+      // line-height: 106px;
+      padding: 0 40px;
+      // color:#181818;
+      font-size: 24px;
+      // font-weight: 600;
+      margin-top: 26.67px;
+      border-radius: 30px;
+      border-radius: 20px;
+      .input{
+        font-size: 28px;
+        padding:30px 0;
+        line-height: 106px;
+        // color: red;
+      }
+      .placeholderinput{
+        // line-height: 106px;
+        color: #d2d2d2;
+        font-size: 28px;
+      }
+    }
+    &-icon {
+      margin-left: 40px;
+      // padding: 20px 30px;
+      // color:#181818;
+      width: 150px;
+      height: 106.67px;
+      // font-size: 36px;
+      // // font-weight: 600;
+      margin-top: 26.67px;
+      border-radius: 20px;
+      background-color: #274291;
+      padding: 0;
+      text-align: center;
+      line-height:120.67px;
+      .icon {
+        
+        // width: 100%;
+      }
+    }
+    // style={{width:'48.4rpx',height:'48.4rpx'}}
+  }
+
+}

src/pages/mateTag/index.config.js

@@ -0,0 +1,4 @@
+export default {
+
+  
+}

src/pages/mateTag/index.jsx

@@ -0,0 +1,99 @@
+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'
+
+const house = (props) => {
+
+  const {id} = getQueryValue()
+
+  const [list, setList] = useState([])
+
+
+  useDidShow(() => {
+    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: '/api/mp/taMateTag',params:{groupId:id},method: 'get', }).then((res) => {
+      const { records, ...page} = res.data.data
+      setList(records)
+    })
+  }
+
+
+  const onDelete = (row) => {
+    Taro.showModal({
+      title: '确定删除该标签组吗？',
+      content: row.name,
+      cancelColor: '#d2d2d2',
+      confirmColor: "#274191",
+      success: function (res) {
+        if (res.confirm) {
+          console.log('用户点击确定')
+
+          request({ url: `/taMateTag/${row.tagId}`, method: 'delete', }).then((res)=>{
+            getMateTagList({ pageNum: 1, pageSize:10 })
+          })
+          // 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) {
+          console.log('用户点击取消')
+        }
+      }
+    })
+  }
+
+
+
+
+  return <View className='account'>
+    <Layout>
+      {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>
+
+      })}
+    </Layout>
+    {/* onClick={(e)=>(e) */}
+    <Tab value={['+新增标签']} color='#ffffff' onClick={() => { Taro.navigateTo({ url: `/pages/mateTag/edit/index?id=${id}` }) }} ></Tab>
+  </View>
+}
+
+export default house

src/pages/mateTag/index.scss

@@ -0,0 +1,54 @@
+.account {
+
+  // padding: 13.33px 0;
+  &-view {
+    margin: 40px 0 0;
+
+    // padding: 0;
+    &-title {
+      color: #7b7b7b;
+      font-size: 30px;
+      font-weight: 500;
+      margin-left: 40px;
+
+    }
+
+    &-card {
+      padding: 0;
+      color: #181818;
+      font-size: 24px;
+      font-weight: 600;
+      margin-top: 26.67px;
+      position: relative;
+
+      &-radio {
+          width: 50px;
+          height: 50px;
+        background-color: #274291;
+        text-align: center;
+        line-height: 50px;
+        position: absolute;
+        border-radius: 25px;
+        top: -12.5px;
+        right: -12.5px;
+      }
+
+      .top {
+        padding: 40px 40px;
+        border-bottom: 1px solid #f4f4f4;
+        line-height: 32px;
+        font-weight: 500;
+        // font-size: ;
+        // min-height: 120px;
+      }
+
+      .bottom {
+        display: flex;
+        justify-content: space-around;
+        padding: 20px
+      }
+
+
+    }
+  }
+}

src/pages/material/index.config.js

@@ -0,0 +1,4 @@
+export default {
+
+  
+}

src/pages/material/index.jsx

@@ -0,0 +1,127 @@
+import React, { useEffect, useMemo, 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 './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) => {
+        console.log(e, index, 'onLabelChange')
+
+        arrList[index] = e
+        // const [arrList, setArrList] = useState([[],[],[]])
+        setLabelList(arrList.flat())
+
+        console.log(arrList.flat(), 'labelList')
+    }
+
+
+    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'>
+
+
+
+
+        <Layout>
+            {
+                list.map((item,index) => {
+                    return <View className='material-card'>
+                        <Text>{item.name}</Text>
+                        <Tags list={item.taMateTagList} onChange={(e) => onLabelChange(e, index)} > </Tags>
+                    </View>
+                })
+            }
+
+            {/* <View className='inputstyle-view'>
+                <Text className='title'>入住人数</Text>
+                <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
+                    <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
+                </Container>
+            </View>
+            <View className='inputstyle-view'>
+                <Text className='title'>入住日期</Text>
+                <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
+                    <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
+                </Container>
+            </View>
+
+            <View className='inputstyle-view'>
+                <Text className='title'>离店日期</Text>
+                <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
+                    <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
+                </Container>
+            </View> */}
+        </Layout>
+        {/* className='addhousetab' */}
+        <Tab pageState='3' value={['取消', '开始查询']} onClick={[(e) => setPageState('2'), (e) => onClick(e)]}></Tab>
+    </View>
+}
+
+export default index

src/pages/material/index.scss

@@ -0,0 +1,58 @@
+.material {
+  padding-top: 30rpx;
+  &-card {
+    text-align: center;
+color: #7b7b7b;
+margin-top: 30px;
+
+  }
+
+  // // padding:13.33px;
+  // &-view {
+  //   margin: 50px 0 0;
+
+  //   &-card {
+  //     // height: 106px;
+  //     // line-height: 106px;
+  //     padding: 0 40px;
+  //     // color:#181818;
+  //     font-size: 24px;
+  //     // font-weight: 600;
+  //     margin-top: 26.67px;
+  //     border-radius: 30px;
+  //     border-radius: 20px;
+  //     .input{
+  //       font-size: 28px;
+  //       padding:30px 0;
+  //       line-height: 106px;
+  //       // color: red;
+  //     }
+  //     .placeholderinput{
+  //       // line-height: 106px;
+  //       color: #d2d2d2;
+  //       font-size: 28px;
+  //     }
+  //   }
+  //   &-icon {
+  //     margin-left: 40px;
+  //     // padding: 20px 30px;
+  //     // color:#181818;
+  //     width: 150px;
+  //     height: 106.67px;
+  //     // font-size: 36px;
+  //     // // font-weight: 600;
+  //     margin-top: 26.67px;
+  //     border-radius: 20px;
+  //     background-color: #274291;
+  //     padding: 0;
+  //     text-align: center;
+  //     line-height:120.67px;
+  //     .icon {
+
+  //       // width: 100%;
+  //     }
+  //   }
+  //   // style={{width:'48.4rpx',height:'48.4rpx'}}
+  // }
+
+}

src/pages/shop/edit/index.config.js

@@ -0,0 +1,3 @@
+export default {
+ 
+}

src/pages/shop/edit/index.jsx

@@ -0,0 +1,153 @@
+import React, { useEffect, useMemo, 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)
+    }
+
+    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('用户点击取消')
+        //         }
+        //     }
+        // })
+    }
+    // /api/taShopKeeper
+    const editShopKeeper = () => {
+
+
+        if (!name) {
+
+            Taro.showToast({
+                title: '请输入名称',
+                icon: 'none',
+                duration: 2000
+              })
+            return
+        }
+        if (!imgUrl) {
+            Taro.showToast({
+                title: '请上传图片',
+                icon: 'none',
+                duration: 2000
+              })
+            return
+        }
+        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'>
+
+        <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>
+
+        </Layout>
+        {/* <Input formType="submit" > */}
+        <Tab className='addhousetab' pageState='3' value={['取消', '确认添加']} onClick={[(e) => {
+            Taro.navigateBack({
+                delta: 1
+            })
+        }, () => editShopKeeper()]}></Tab>
+
+        {/* </Input> */}
+
+
+
+
+    </View>
+}
+
+export default index

src/pages/shop/edit/index.scss

@@ -0,0 +1,50 @@
+.map {
+  // padding:13.33px;
+  &-view {
+    margin: 50px 0 0;
+
+    &-card {
+      // height: 106px;
+      // line-height: 106px;
+      padding: 0 40px;
+      // color:#181818;
+      font-size: 24px;
+      // font-weight: 600;
+      margin-top: 26.67px;
+      border-radius: 30px;
+      border-radius: 20px;
+      .input{
+        font-size: 28px;
+        padding:30px 0;
+        line-height: 106px;
+        // color: red;
+      }
+      .placeholderinput{
+        // line-height: 106px;
+        color: #d2d2d2;
+        font-size: 28px;
+      }
+    }
+    &-icon {
+      margin-left: 40px;
+      // padding: 20px 30px;
+      // color:#181818;
+      width: 150px;
+      height: 106.67px;
+      // font-size: 36px;
+      // // font-weight: 600;
+      margin-top: 26.67px;
+      border-radius: 20px;
+      background-color: #274291;
+      padding: 0;
+      text-align: center;
+      line-height:120.67px;
+      .icon {
+        
+        // width: 100%;
+      }
+    }
+    // style={{width:'48.4rpx',height:'48.4rpx'}}
+  }
+
+}

src/pages/shop/index.config.js

@@ -0,0 +1,4 @@
+export default {
+
+  
+}

src/pages/shop/index.jsx

@@ -0,0 +1,150 @@
+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 VirtualList from '@tarojs/components/virtual-list'
+import ContainerLayout from '../../compents/container/index'
+import Tab from '../../compents/tab/index'
+import Layout from '../../layout/index'
+import request from '../../util/request'
+
+
+// const Row = React.memo(({ id, index, style, data }) => {
+//   console.log({ id, index, style, data },'444')
+//   return (
+//     <View className='account-view' id={index}>
+//       {/* <Text className='account-view-title'>店铺编号：{index}</Text> */}
+//       <ContainerLayout className='account-view-card'>
+//         <View className='top' >
+//           <View>店铺名称：{data[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/edit/index?=${data.shopId}` }) }}>编辑</Text>
+//           <Text >删除</Text>
+//         </View>
+//       </ContainerLayout>
+
+//     </View>
+//   );
+// })
+
+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(() => {
+
+
+  }, [])
+
+  useDidShow(() => {
+    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)
+        setPage({
+          ...page,
+          pageNum: page.current
+        })
+
+        setList(list.concat(records || []))
+
+      }).catch(() => setLoading(false))
+  }
+
+  const onDelete = (shopId) => {
+    Taro.showModal({
+      title: '确定删除该店铺吗',
+      // content: '确定后，该老板房源信息将一并删除',
+      cancelColor: '#d2d2d2',
+      confirmColor: "#274191",
+      success: function (res) {
+        if (res.confirm) {
+         
+          request({ url: `/taShop/${shopId}`,  method: 'delete' })
+          .then((res) => {
+          })
+
+
+        } else if (res.cancel) {
+          console.log('用户点击取消')
+        }
+      }
+    })
+  }
+
+  // const listReachBottom = () => {
+  //   getShopList({ pageNum: page.pageNum + 1 })
+  // }
+  
+
+  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> */}
+
+      {
+        list.map((item)=>{
+        return  <View className='account-view' >
+          {/* <Text className='account-view-title'>店铺编号：{index}</Text> */}
+          <ContainerLayout className='account-view-card'>
+            <View className='top' >
+              <View>店铺名称：{item.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=${item.shopId}` }) }}>详情</Text>
+              <Text onClick={()=>onDelete(item.shopId)}>删除</Text>
+            </View>
+          </ContainerLayout>
+    
+        </View>
+        })
+      }
+
+    </Layout>
+    {/* onClick={(e)=>(e) */}
+    <Tab value={['+新增店铺']} color='#ffffff' onClick={() => { Taro.navigateTo({ url: `/pages/shop/edit/index` }) }} ></Tab>
+  </View>
+}
+
+export default account

src/pages/shop/index.scss

@@ -0,0 +1,54 @@
+.account {
+
+  // padding: 13.33px 0;
+  &-view {
+    margin: 40px 0 0;
+
+    // padding: 0;
+    &-title {
+      color: #7b7b7b;
+      font-size: 30px;
+      font-weight: 500;
+      margin-left: 40px;
+
+    }
+
+    &-card {
+      padding: 0;
+      color: #181818;
+      font-size: 24px;
+      font-weight: 600;
+      margin-top: 26.67px;
+      position: relative;
+
+      &-radio {
+          width: 50px;
+          height: 50px;
+        background-color: #274291;
+        text-align: center;
+        line-height: 50px;
+        position: absolute;
+        border-radius: 25px;
+        top: -12.5px;
+        right: -12.5px;
+      }
+
+      .top {
+        padding: 40px 40px;
+        border-bottom: 1px solid #f4f4f4;
+        line-height: 32px;
+        font-weight: 500;
+        // font-size: ;
+        // min-height: 120px;
+      }
+
+      .bottom {
+        display: flex;
+        justify-content: space-around;
+        padding: 20px
+      }
+
+
+    }
+  }
+}

src/reducers/guide.js

@@ -0,0 +1,31 @@
+// import { ADD, MINUS } from '../constants/user'
+
+// // landlord: 'landlord',
+// //     customer:'customer'
+
+// const INITIAL_STATE = {
+//   house:{},
+//   Park:{},
+//   wifi:{
+//       name:'234',
+//       passward:'432'
+//   },
+//   image:''
+// }
+
+// export default function counter (state = INITIAL_STATE, action) {
+//   switch (action.type) {
+//     case ADD:
+//       return {
+//         ...state,
+//         num: state.num + 1
+//       }
+//      case MINUS:
+//        return {
+//          ...state,
+//          num: state.num - 1
+//        }
+//      default:
+//        return state
+//   }
+// }

src/reducers/index.js

@@ -0,0 +1,10 @@
+import { combineReducers } from 'redux'
+// import user from './user'
+// import page from './page'
+// import guide from './guide'
+
+export default combineReducers({
+  // user,
+  // page,
+  // guide,
+})

src/reducers/page.js

@@ -0,0 +1,27 @@
+// import { ADD, MINUS } from '../constants/user'
+
+// // landlord: 'landlord',
+// //     customer:'customer'
+
+// const INITIAL_STATE = {
+//   link:'index',
+//   id:String,
+//   params:Object
+// }
+
+// export default function counter (state = INITIAL_STATE, action) {
+//   switch (action.type) {
+//     case ADD:
+//       return {
+//         ...state,
+//         num: state.num + 1
+//       }
+//      case MINUS:
+//        return {
+//          ...state,
+//          num: state.num - 1
+//        }
+//      default:
+//        return state
+//   }
+// }

src/reducers/user.js

@@ -0,0 +1,28 @@
+import {
+  ADD,
+  MINUS
+} from '../constants/user'
+
+// landlord: 'landlord',
+//     customer:'customer'
+// adminuser
+const INITIAL_STATE = {
+  user:'22'
+}
+
+export default function counter(state = INITIAL_STATE, action) {
+  switch (action.type) {
+    case ADD:
+      return {
+        ...state,
+        num: state.num + 1
+      }
+      case MINUS:
+        return {
+          ...state,
+          num: state.num - 1
+        }
+        default:
+          return state
+  }
+}

src/store/index.js

@@ -0,0 +1,28 @@
+import { createStore, applyMiddleware, compose } from 'redux'
+// import thunkMiddleware from 'redux-thunk'
+import rootReducer from '../reducers'
+
+// const composeEnhancers =
+//   typeof window === 'object' &&
+//   window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ ?   
+//     window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__({
+//       // Specify extension’s options like name, actionsBlacklist, actionsCreators, serialize...
+//     }) : compose
+
+// const middlewares = [
+//   thunkMiddleware
+// ]
+
+// if (process.env.NODE_ENV === 'development' && process.env.TARO_ENV !== 'quickapp') {
+//   // middlewares.push(require('redux-logger').createLogger())
+// }
+
+// const enhancer = composeEnhancers(
+//   applyMiddleware(...middlewares),
+//   // other store enhancers if any
+// ), enhancer
+
+export default function configStore () {
+  const store = createStore(rootReducer)
+  return store
+}

src/store/user.js

@@ -0,0 +1,25 @@
+import { useState } from "react";
+import Taro from '@tarojs/taro'
+
+import request from '../util/request'
+
+export default function useUser() {
+    const [user, setUser] = useState()
+
+    const getUser = code => {
+        request({url:`/login?code=${code}`,method:"POST"}).then((res)=>{
+          console.log(res.data.data,'res')
+          setUser(res.data.data)
+
+          Taro.setStorage({
+            key:"token",
+            data:res.data.data.token
+          })
+        })
+    }
+
+    return {
+        user,
+        getUser,
+    }
+}

src/util/getCode.js

@@ -0,0 +1,16 @@
+
+export function getCode() {
+    const m = /code=([^&]+)/.exec(window.location.search)
+    const codeFromQuery = m ? m[1] : false
+    const codeFromCash = window.localStorage.getItem('code')
+
+    if (codeFromQuery !== codeFromCash) {
+        return codeFromQuery
+    }
+
+    return false;
+}
+
+export function setCode(code) {
+    window.localStorage.setItem('code', code)
+}

src/util/getCodeUrl.js

@@ -0,0 +1,18 @@
+
+import Taro from '@tarojs/taro'
+const appid = APPID
+
+export default function(path) {
+
+    console.log(window.location,'window.location')
+  const  redirect_uri = `${window.location.origin}/#/${window.location.hash}`
+
+
+//   window.location.origin = `${window.location.protocol}//${Taro.Current.router.path
+//       window.location.hostname
+//     }${window.location.port ? ':' + window.location.port : ''}`;
+    console.log(APPID,redirect_uri,'')
+
+    const url=`https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${encodeURIComponent(redirect_uri)}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
+    return url
+}

src/util/getQueryValue.js

@@ -0,0 +1,16 @@
+export default function () {
+
+  let [page, query=''] = decodeURI(window.location.hash.substring(1)).split('?')
+  let params = {}
+  let vars = query.split("&");
+  console.log(vars, 'query')
+  for (let i = 0; i < vars.length; i++) {
+    let pair = vars[i].split("=");
+    params = {
+      ...params,
+      [pair[0]]: pair[1]
+    }
+   
+  }
+  return params;
+}

src/util/request.js

@@ -0,0 +1,106 @@
+import React from 'react'
+import Taro from '@tarojs/taro'
+
+// const baseURL = HOST
+
+export default async (options) => {
+  const opts = optionBuilder(options)
+  console.log(opts, "optsoptsoptsoptsoptsoptsoptsoptsoptsopts")
+
+  return Taro.request(opts)
+    .then((res) => {
+      console.log('3322');
+      return res
+    })
+    .catch((err) => {
+      console.log(err, '333221');
+      return err
+    })
+}
+// import useUser from './store/user'
+// const {user} = useUser()
+
+export function optionBuilder(options) {
+  const {
+    url,
+    data = {},
+    method = 'get',
+    params = {},
+    header
+  } = options
+  // console.log(user,'user')
+  let api = `/api/mp${url}`
+
+  if (method == 'get'&&JSON.stringify(params) != "{}") {
+    api = `${api}?${paramsToString(params)}`
+  } 
+  const token = Taro.getStorageSync('token')||''
+  return {
+    url: api,
+    method,
+    data,
+    header: {
+      'content-type': 'application/json',
+      'authorization': `X-Authorization-JWT ${token}`,
+      // 'appId': appId,
+      // 'x-action': 'miniapp',
+      // 'x-version': Version,
+      // 'x-consultant': consultant,
+      // 'x-recommender': recommender,
+
+      ...header || {},
+    },
+    mode: 'cors',
+  }
+
+}
+
+
+function paramsToString(params) {
+  return Object.keys(params).map((key) => {
+    const val = params[key]
+    return Array.isArray(val) ? val.map((x) => {
+      return composeKeyValue(key, x)
+    }).join('&') : composeKeyValue(key, val)
+
+  }).join('&')
+}
+
+function composeKeyValue(k, v, encode) {
+
+  return encode === false ? `${k}=${v}` : `${encodeURIComponent(k)}=${encodeURIComponent(v)}`
+}
+
+
+export const uploadFiles = async (files,url) => {
+  const uploads = []
+  const token = Taro.getStorageSync('token')||''
+  for (var i = 0; i < files.length; i++) {
+    uploads[i] = new Promise((resolve, reject) => {
+      Taro.uploadFile({
+        url:  url||`/api/mp/image`,
+        filePath: files[i],
+        header: {
+          'authorization': `X-Authorization-JWT ${token}`,
+
+          // 'x-action': 'miniapp'
+        },
+        name: 'file',
+        success: function (res) {
+          // debugger
+          const _data = JSON.parse(res.data)
+          // if (_data.code !== CODE_SUCCESS) {
+          //   reject(new Error(_data.message))
+          // }
+
+          resolve(_data.data)
+        },
+        fail(err) {
+          reject(err)
+        }
+      })
+    })
+  }
+
+  return Promise.all(uploads)
+}