denae

src/app.config.js

@@ -10,4 +10,4 @@ export default {
     navigationBarTitleText: 'WeChat',
     navigationBarTextStyle: 'black'
   }
-}
+}

src/pages/DepartmentSelection/index.jsx

@@ -1,8 +1,9 @@
-import { View, Text } from "@tarojs/components"
+import { View } from "@tarojs/components"
 import { useEffect, useState } from "react"
 import Taro, { useDidShow } from "@tarojs/taro"
-import { TreeSelect } from "@antmjs/vantui";
+import { TreeSelect, Button } from "@antmjs/vantui";
 import { getDepartmenList } from "../../services/user";
+import { useModel } from "../../store";
 
 // import BottomMoadl from '@/components/BottomMoadl/index'
 
@@ -14,47 +15,97 @@ import { getDepartmenList } from "../../services/user";
 import './style.less'
 
 export default (props) => {
+  const [departItem, setDepartItem] = useState([]);
+  const [mainActiveIndex, setMainActiveIndex] = useState();
+  const [activeId, setActiveId] = useState();
+  const { deptName, setDeptName, sessionKey } = useModel('userData')
+
+
+
   useEffect(() => {
-    getDepartmenList().then((e) => {
-      console.log('科室选择', e);
+    // setDeptName('连云港第一人民医院')
+    getDepartmenList().then((res) => {
+
+      // res.reduce((acc, item) => {
+      //   const parent = res.filter(x => x.id === item.parentId)[0]
+      //   if (parent) {
+      //     parent.children = (parent.children || []).concat(item)
+      //     return acc;
+      //   } else {
+      //     return acc.concat(item);
+      //   }
+      // }, [])
+
+      // const idMapping = res.reduce((acc, el, i) => {
+      //   acc[el.id] = i;
+      //   return acc;
+      // }, []);
+      // console.log('idMapping', idMapping);
+
+
+      function array2tree () {
+        const newList = []
+        for (let i = 0; i < res.length; i++) {
+
+          res[i].text = res[i].name
+          const list = res.filter((item) =>
+            item.id == res[i].parentId
+          )
+          if (list.length > 0) {
+            const parent = list[0];
+            parent.children = (parent.children || []).concat(res[i])
+
+          } else {
+            newList.push(res[i])
+          }
+        }
+        setDepartItem(newList)
+        return newList
+      }
+      console.log("🚀 ~ file: index.jsx ~ line 43 ~ getDepartmenList ~  array2tree()", array2tree())
     })
+
+
+
   }, [])
 
-  // {
-  //   text: number ¦ string
-  //   badge?: number ¦ string
-  //   dot?: boolean
-  //   disabled?: boolean
-  //   children?: {
-  //     text: number ¦ string
-  //     id: number ¦ string
-  //     disabled?: boolean
-  //   }[]
-  // }[]
-  const items = [
-    { text: '眼科医院', children: [{ text: '连云港市爱尔眼科' }, { text: '眼科一楼' }], },
-    {
-      text: '连云港开发区高中',
-      children:
-        [
-          { text: '开发区高一4班' },
-          { text: '开发区高一8班' },
-          { text: '开发区高一8班' },
-          { text: '开发区高二1班' },
-          { text: '开发区高二2班' },
-          { text: '开发区高二3班' },
-          { text: '开发区高二15班' },
-          { text: '开发区高三10班' },
-          { text: '开发区高三2班' },
-
-        ]
+  const goBack = () => {
+    if (deptName) {
+      Taro.navigateBack({
+        delta: 1
+      })
+    } else {
+      Taro.showToast({
+        title: '请选择科室!',
+        icon: 'none',
+        duration: 2000
+      })
+    }
+
+  }
+
+
+
+
+  const onClickNav = ({ detail }) => {
+    setMainActiveIndex(detail.index || 0,)
+    console.log("🚀 ~ file: index.jsx ~ line 92 ~ onClickNav ~ detail.index", detail.index)
+
+    if (departItem[detail.index]?.children) {
+      console.log('父级: detail.index || 0', departItem[detail.index]);
+
+    } else {
+      setDeptName(departItem[detail.index]?.name)
+      console.log('没有子节点: children || 0', departItem[detail.index]?.name);
+
     }
-  ]
-  const onClickNav = () => {
-    console.log('父级: detail.index || 0',);
+
   }
-  const onClickItem = () => {
-    console.log('自己: detail.index || 0',);
+  const onClickItem = ({ detail }) => {
+    const activeIdaa = activeId === detail.id ? null : detail.id
+    setActiveId(activeIdaa)
+    setDeptName(detail?.name)
+    console.log('自己: detail.index || 0', activeId, detail);
 
   }
 
@@ -65,13 +116,24 @@ export default (props) => {
   return (
     <View className='page-index'>
       <TreeSelect
-        items={items}
-        mainActiveIndex={items.mainActiveIndex}
-        activeId={items.activeId}
+        height='80vh'
+        items={departItem}
+        mainActiveIndex={mainActiveIndex}
+        activeId={activeId}
         onClickNav={onClickNav}
         onClickItem={onClickItem}
       />
-
+      <View className='buttom-box'>
+        <Button
+          type='info'
+          size='normal'
+          formType='submit'
+          className='buttom-box-buttonSubmit'
+          onClick={goBack}
+        >
+          确定
+        </Button>
+      </View>
     </View>
   )
 }

src/pages/DepartmentSelection/style.less

@@ -57,3 +57,12 @@
   bottom: 5vh;
   display: flex;
 }
+
+.buttom-box {
+  width: 100%;
+  text-align: center;
+  margin: 5vh 0 0 0;
+  &-buttonSubmit {
+    width: 90%;
+  }
+}

src/pages/index/index.jsx

@@ -4,19 +4,41 @@ import dayjs from 'dayjs'
 import { Button, Icon } from "@antmjs/vantui";
 import Taro from '@tarojs/taro';
 import BarCode from '@/components/barcode'
-import CountDown from '@/components/CountDown'
+import { useModel } from '../../store';
 
 import './style.less'
 
 export default (props) => {
+  const { deptName, person, sessionKey } = useModel('userData')
+
   const userId = '320888800110023011';
-  
+
   const goUserInfo = () => {
     // 跳转到目的页面，在当前页面打开
     Taro.redirectTo({
       url: '/pages/setUserInfo/index'
     })
   }
+  useEffect(() => {
+    if (deptName) {
+      Taro.showModal({
+        title: '提示',
+        content: '未添加个人信息!',
+        success: function (res) {
+          if (res.confirm) {
+            Taro.redirectTo({
+              url: '/pages/setUserInfo/index'
+            })
+
+          } else if (res.cancel) {
+            console.log('用户点击取消')
+          }
+        }
+      })
+
+    }
+
+  }, [deptName])
 
   const today = useMemo(() => dayjs().format('YYYY-MM-DD'))
 
@@ -26,10 +48,10 @@ export default (props) => {
       {/* <View className='index-UserQRcode-headerInfo' style={{ backgroundImage: `url(${userBck})` }}> */}
       <View className='index-UserQRcode-headerInfo' >
         <View className='index-UserQRcode-headerInfo-User'>
-          <View className='index-UserQRcode-headerInfo-User-NameInfo'>姓名：鲍张抄</View>
+          <View className='index-UserQRcode-headerInfo-User-NameInfo'>姓名：{person?.personName ?? '请添加个人信息'}</View>
           <View onClick={goUserInfo} className='index-UserQRcode-headerInfo-User-setNameInfo'><Icon name='edit' />修改信息</View>
         </View>
-        <View className='index-UserQRcode-headerInfo-UserID'>身份证：{userId.replace(/^(\d{6})\d+(\d{4})$/, "$1******$2")}</View>
+        <View className='index-UserQRcode-headerInfo-UserID'>身份证：{person?.idNo.replace(/^(\d{6})\d+(\d{4})$/, "$1******$2")}</View>
       </View>
       <View className='index-UserQRcode-cententQR'>
         <View className='index-UserQRcode-cententQR-Barcode'>
@@ -40,7 +62,7 @@ export default (props) => {
         </View>
       </View>
       <View className='index-UserQRcode-footer'>
-      {today}
+        {today}
       </View>
     </View>
   )

src/pages/setUserInfo/index.jsx

@@ -1,17 +1,42 @@
 import { View, Text, Input } from "@tarojs/components"
-import { useEffect, useRef, useState } from "react"
 import Taro, { useDidShow } from "@tarojs/taro"
 import { Button, Form, FormItem, Icon } from "@antmjs/vantui";
 
-
+import { useEffect, useState } from "react";
+import { useModel } from "../../store";
+import { getPhoneuser, setUserInfo } from "../../services/user";
 // import BottomMoadl from '@/components/BottomMoadl/index'
 import './style.less'
 
+
 export default (props) => {
+  const [phone, setPhone] = useState('')
+
+  const { deptName, person, sessionKey } = useModel('userData')
+  let form = null
+  const onSubmit = (e) => {
+    form.validateFields((errorMessage, fieldValues) => {
+      if (errorMessage && errorMessage.length) {
+        return console.info('errorMessage', errorMessage)
+      } else {
+        console.info(fieldValues)
+        setUserInfo({ ...fieldValues, person: person?.personId }).then(() => {
+          Taro.showToast({
+            title: '保存成功',
+            icon: 'none',
+            duration: 2000
+          }).then(() => {
+            Taro.redirectTo({
+              url: '/pages/index/index'
+            })
+          })
+
+        })
+
+      }
+    })
 
-  const handleClick = (fieldValues) => {
 
-    console.info(fieldValues)
   }
   const goDepartmen = () => {
     Taro.navigateTo({
@@ -19,27 +44,31 @@ export default (props) => {
     })
 
   }
-  const getPhone = () => {
-    console.log('手机号',);
+  const getPhone = (e) => {
+    console.log('deptName', deptName);
+    console.log('手机号', e);
+    const { errMsg, ...data } = e.detail || {}
+
+    getPhoneuser({ ...data, sessionKey: sessionKey }).then((res) => {
+      setPhone(res?.phoneNumber)
+    })
 
   }
   return (
     <View className='page-index'>
       <Form
         initialValues={{
-          name: '我是初始值',
-          singleSelect: '1',
-          rate: 2,
-          slider: '50',
+          phone: phone,
+          deptName: deptName,
+
         }}
-        // ref={(el) => (form = el)}
-        onFinish={(e) => handleClick(e)}
+        ref={(el) => (form = el)}
+        onFinish={(e) => onSubmit(e)}
       >
         <FormItem
           label='用户名'
-          name='userName'
+          name='personName'
           required
-
           trigger='onInput'
           validateTrigger='onBlur'
           // taro的input的onInput事件返回对应表单的最终值为e.detail.value
@@ -50,48 +79,48 @@ export default (props) => {
         <FormItem
           label='手机号'
           name='phone'
-          required
           trigger='onInput'
+          required
           validateTrigger='onBlur'
-          // taro的input的onInput事件返回对应表单的最终值为e.detail.value
           valueFormat={(e) => e.detail.value}
         >
-          <Input placeholder='请输入手机号' type='number' />
+          <Input placeholder='请输入手机号' type='number' value={phone} maxlength={11} disabled />
           <Button
             plain
             hairline
             size='small'
             type='info'
+            required
+
+            openType='getPhoneNumber'
             onGetPhoneNumber={getPhone}
           >
-            一键填写
+            授权手机
           </Button>
         </FormItem>
 
         <FormItem
           label='身份证'
-          name='id'
+          name='idNo'
           required
-
           trigger='onInput'
           validateTrigger='onBlur'
           // taro的input的onInput事件返回对应表单的最终值为e.detail.value
           valueFormat={(e) => e.detail.value}
         >
-          <Input placeholder='请输入身份证号' type='number' />
+          <Input placeholder='请输入身份证号' type='number' maxlength={18} />
         </FormItem>
 
         <FormItem
           label='科室'
-          name='departmen'
-          required
-
+          name='deptName'
           trigger='onInput'
+          required
           validateTrigger='onBlur'
           // taro的input的onInput事件返回对应表单的最终值为e.detail.value
           valueFormat={(e) => e.detail.value}
         >
-          <Input placeholder='请选择科室' value='' disabled onClick={goDepartmen} />
+          <Input placeholder='请选择科室' value={deptName} disabled onClick={goDepartmen} />
         </FormItem>
         <View className='buttom-box'>
           <Button

src/services/user.js

@@ -16,4 +16,20 @@ export const login = (data) => request('/login', { data, method: 'POST' })
  * @returns 
  */
 export const getDepartmenList = (data) => request('/bds-org', { data, method: 'GET' })
-// /api/wx/{clientId}/bds-org
+
+
+/**
+ * 手机号
+ * @param {*} data 
+ * @returns 
+ */
+export const getPhoneuser = (data) => request('/auth-phone', { data, method: 'PUT' })
+
+
+/**
+ * 维护个人信息
+ * @param {*} data 
+ * @returns 
+ */
+export const setUserInfo = (data) => request('/person', { data, method: 'PUT' })
+

src/store/userData.js

@@ -7,7 +7,7 @@ export default () => {
   const [person, setPerson] = useState()
   const [sessionKey, setSessionKey] = useState()
   const [userPhoneInfo, setUserPhoneInfo] = useState()
-
+  const [deptName, setDeptName] = useState()
 
 
 
@@ -37,6 +37,9 @@ export default () => {
     userPhoneInfo,
     setUserPhoneInfo,
 
+    deptName,
+    setDeptName,
+
 
     logins,
   }

src/utils/request.js

@@ -50,18 +50,13 @@ export default (url, options) => {
 
       fail: (err) => {
         console.error(err)
-
-
-
         const message = err.message || err.errMsg || err
-
         if (!skipError) {
           Taro.showToast({
             title: message,
             icon: 'none',
           })
         }
-
         reject(message)
       }
     })