Merge branch 'master' of http://git.ycjcjy.com/pet_identity/miniapp

config/index.js

@@ -15,6 +15,7 @@ const config = {
   alias: {
     '@/assets': path.resolve(__dirname, '..', 'src/assets'),
     '@/components': path.resolve(__dirname, '..', 'src/components'),
+    '@/store': path.resolve(__dirname, '..', 'src/store'),
     '@/services': path.resolve(__dirname, '..', 'src/services'),
     '@/utils': path.resolve(__dirname, '..', 'src/utils')
   },

package.json

@@ -41,6 +41,7 @@
     "@tarojs/runtime": "3.3.6",
     "@tarojs/taro": "3.3.6",
     "@zjxpcyc/react-tiny-store": "^1.0.0",
+    "async-validator": "^4.1.1",
     "react": "^17.0.0",
     "react-dom": "^17.0.0"
   },

src/components/Form/index.jsx

@@ -0,0 +1,35 @@
+import Taro from '@tarojs/taro';
+import { Form } from '@tarojs/components';
+import Schema from 'async-validator';
+
+// 支持验证规则的表单
+// 验证规则同 ant design 一致
+export default function (props) {
+  const { onSubmit, onError, rules, ...leftProps } = props
+
+  const handleSubmit = (e) => {
+    if (!rules) {
+      if (onSubmit) {
+        onSubmit(e.detail.value)
+      }
+      return;
+    }
+
+    const validator = new Schema(rules);
+    validator.validate(e.detail.value).then(() => {
+      if (onSubmit) {
+        onSubmit(e.detail.value)
+      }
+    }).catch((...args) => {
+      if (onError) {
+        onError(...args)
+      }
+    })
+  }
+
+  return (
+    <Form {...leftProps} onSubmit={handleSubmit} >
+      {props.children}
+    </Form>
+  )
+}

src/components/Picker/index.jsx

@@ -0,0 +1,61 @@
+import Taro from '@tarojs/taro';
+import { Picker, View } from '@tarojs/components';
+import { useMemo, useState } from 'react';
+import PropTypes from 'prop-types';
+
+// 暂时只支持单列普通选择器
+const XPicker = (props) => {
+  const { bindchange, onChange, range, value : propValue, rangeKey, rangeValue, placeholder = '请选择', ...leftProps } = props
+
+  const [innerValue, setInnerValue] = useState()
+
+  const handleChange = (e) => {
+    const data = range[e.detail.value]
+    const val = data[rangeValue]
+    e.detail.value = val
+    setInnerValue(data)
+
+    console.log('-----bindchange----->', bindchange)
+    console.log('-----onChange----->', onChange)
+
+    if (bindchange) {
+      bindchange(e, data)
+    }
+    if (onChange) {
+      onChange(e, data)
+    }
+  }
+
+  const value = useMemo(() => {
+    if (propValue === undefined || propValue === null) {
+      return undefined
+    }
+
+    for (let i in range) {
+      if (range[i][rangeValue] === propValue) {
+        setInnerValue(range[i])
+        return i;
+      }
+    }
+
+    return undefined;
+  }, [propValue, range, rangeValue])
+
+  const childViewStyle = useMemo(() => {
+    return innerValue ? {} : { color: '#858585' }
+  }, [innerValue])
+
+  return (
+    <Picker {...leftProps} mode='selector' range={range} value={value} rangeKey={rangeKey} onChange={handleChange}>
+      <View style={childViewStyle}>{innerValue === undefined ? placeholder : innerValue[rangeKey]}</View>
+    </Picker>
+  )
+}
+
+XPicker.behaviors = ['wx://form-field']
+XPicker.propTypes = {
+  behaviors: PropTypes.array
+}
+
+
+export default XPicker

src/pages/setUser/index.jsx

@@ -1,9 +1,11 @@
-import { View, Button, Form, Text, Image, Picker, Switch, Input, Radio, Label, ScrollView } from '@tarojs/components'
+import { View, Button, Text, Image, Switch, Input, Radio, Label, ScrollView } from '@tarojs/components'
 import Taro from '@tarojs/taro';
 import { useEffect, useState } from 'react';
-import { setPersons } from '../../services/dogAPI';
-import { useModel } from '../../store';
-import { uploadFile } from '../../utils/request';
+import { setPersons } from '@/services/dogAPI';
+import { useModel } from '@/store';
+import { uploadFile } from '@/utils/request';
+import Form from '@/components/Form';
+import Picker from '@/components/Picker';
 
 import './style.less'
 
@@ -35,24 +37,24 @@ export default (props) => {
 
   }
   const formSubmit = e => {
-    const formData = e.detail.value
+    const formData = e
     console.log(e)
 
-    // setPerson
-    setPersons({ ...userInfo, ...formData, sex: userSex[formData.sex].value, }).then((e) => {
-      console.log('e', e);
-      setPerson(e)
-      Taro.showToast({
-        title: '保存成功',
-        icon: 'none',
-        duration: 1000
-      })
-      setTimeout(() => {
-        Taro.navigateBack({
-          delta: 1
-        })
-      }, 600);
-    })
+    // // setPerson
+    // setPersons({ ...userInfo, ...formData, sex: userSex[formData.sex].value, }).then((e) => {
+    //   console.log('e', e);
+    //   setPerson(e)
+    //   Taro.showToast({
+    //     title: '保存成功',
+    //     icon: 'none',
+    //     duration: 1000
+    //   })
+    //   setTimeout(() => {
+    //     Taro.navigateBack({
+    //       delta: 1
+    //     })
+    //   }, 600);
+    // })
   }
 
 
@@ -93,19 +95,15 @@ export default (props) => {
     }}
     >
       <View class='page' >
-        <Form onSubmit={formSubmit}  >
-          <mp-form  >
+        <Form onSubmit={formSubmit}>
+          <mp-form>
             <mp-cells title=' '>
               <mp-cell title='姓名' extClass=''>
                 <Input name='nickName' placeholder='请输入姓名' value={person?.nickName} />
               </mp-cell>
               <mp-cell title='性别' extClass=''>
                 {/* <Input name='sex' placeholder='请输入卡号' /> */}
-                <Picker name='sex' mode='selector' rangeKey='text' range={userSex} onChange={(e) => { handleSetUser('sex', e.detail.value) }}>
-                  <View className='picker'>
-                    {userInfo.sex == 1 ? '男' : userInfo.sex == 2 ? '女' : userInfo.sex}
-                  </View>
-                </Picker>
+                <Picker name='sex' rangeKey='text' rangeValue='value' range={userSex} />
               </mp-cell>
               <mp-cell title='手机号' extClass=''>
                 <Input name='phone' type='number' placeholder='请输入手机号' maxlength={11} value={person?.phone} />
@@ -123,10 +121,9 @@ export default (props) => {
                     <Image className='userImg1' name='cardImg1' src={userInfo.cardImg1} onClick={(e) => handleSetUser('img', e.detail.value)} />
                 }
               </mp-cell>
-
             </mp-cells>
           </mp-form>
-          <View slot='button' style={{ margin: '4em 0 2em 0' }}>
+          <View style={{ margin: '4em 0 2em 0' }}>
             <Button style={{ backgroundColor: '#fbd804', borderRadius: '40px', color: '#000', border: '0px' }} class='weui-btn' type='primary' loading={false} formType='submit'>确定</Button>
           </View>
         </Form>

yarn.lock

@@ -364,11 +364,16 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.16.7", "@babel/parser@^7.18.0", "@babel/parser@^7.3.1", "@babel/parser@^7.7.0":
+"@babel/parser@^7.16.7", "@babel/parser@^7.18.0", "@babel/parser@^7.7.0":
   version "7.18.0"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.0.tgz#10a8d4e656bc01128d299a787aa006ce1a91e112"
   integrity sha512-AqDccGC+m5O/iUStSJy3DGRIUFu7WbY/CppZYwrEUB4N0tZlnI8CSTsgL7v5fHVFmUbRv2sd+yy27o8Ydt4MGg==
 
+"@babel/parser@^7.3.1":
+  version "7.18.3"
+  resolved "https://registry.npmmirror.com/@babel/parser/-/parser-7.18.3.tgz#39e99c7b0c4c56cef4d1eed8de9f506411c2ebc2"
+  integrity sha512-rL50YcEuHbbauAFAysNsJA4/f89fGTOBRNs9P81sniKnKAr4xULe5AecolcsKbi88xu0ByWYDj/S1AJ3FSFuSQ==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.17.12":
   version "7.17.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz#1dca338caaefca368639c9ffb095afbd4d420b1e"
@@ -1173,9 +1178,9 @@
     regenerator-runtime "^0.13.4"
 
 "@babel/runtime@^7.7.2":
-  version "7.18.2"
-  resolved "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.18.2.tgz#674575748fa99cf03694e77fc00de8e5117b42a0"
-  integrity sha512-mTV1PibQHr88R1p4nH/uhR/TJ0mXGEgKTx6Mnd1cn/DSA9r8fqbd+d31xujI2C1pRWtxjy+HAcmtB+MEcF4VNg==
+  version "7.18.3"
+  resolved "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.18.3.tgz#c7b654b57f6f63cf7f8b418ac9ca04408c4579f4"
+  integrity sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==
   dependencies:
     regenerator-runtime "^0.13.4"
 
@@ -2771,6 +2776,11 @@ async-limiter@~1.0.0:
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
   integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
 
+async-validator@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.npmmirror.com/async-validator/-/async-validator-4.1.1.tgz#3cd1437faa2de64743f7d56649dd904c946a18fe"
+  integrity sha512-p4DO/JXwjs8klJyJL8Q2oM4ks5fUTze/h5k10oPPKMiLe1fj3G1QMzPHNmN1Py4ycOk7WlO2DcGXv1qiESJCZA==
+
 async@^2.6.2:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
@@ -3865,11 +3875,16 @@ camelize@^1.0.0:
   resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b"
   integrity sha512-W2lPwkBkMZwFlPCXhIlYgxu+7gC/NUlCtdK652DAJ1JdgV0sTrvuPFshNPrFa1TY2JOkLhgdeEBplB4ezEa+xg==
 
-caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000864, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001332:
+caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000864, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001332:
   version "1.0.30001342"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001342.tgz#87152b1e3b950d1fbf0093e23f00b6c8e8f1da96"
   integrity sha512-bn6sOCu7L7jcbBbyNhLg0qzXdJ/PMbybZTH/BA6Roet9wxYRm6Tr9D0s0uhLkOZ6MSG+QU6txUgdpr3MXIVqjA==
 
+caniuse-lite@^1.0.30001109:
+  version "1.0.30001343"
+  resolved "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001343.tgz#8e1107e30d9a4d2f63782b48ae0a3ce34e2f9c2a"
+  integrity sha512-8KeCrAtPMabo/XW14B+R9sZYoClx1n0b+WYgwDKZPtWR3TcdvWzdSy7mPyFEmR5WU1St9v1PW6sdO5dkFOEzfA==
+
 capture-stack-trace@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmmirror.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"