fliex

babel.config.js

@@ -6,6 +6,19 @@ module.exports = {
       framework: 'react',
       ts: false
     },
+
+    ]
+
+  ],
+  plugins: [
+    [
+      "import",
+      {
+        "libraryName": "@antmjs/vantui",
+        "libraryDirectory": "es",
+        "style": (name) => `${name}/style/less`,
+      },
+      "@antmjs/vantui"
     ]
   ]
 }

config/dev.js

@@ -3,6 +3,7 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
+    HOST: '"http://192.168.89.147:9000"'
   },
   mini: {},
   h5: {}

config/prod.js

@@ -2,6 +2,12 @@ module.exports = {
   env: {
     NODE_ENV: '"production"'
   },
+  defineConstants: {
+    // HOST: '"https://machine.njyunzhi.com"',
+
+    OSS: '""',
+    // VERSION: '"2.0.33"',
+  },
   defineConstants: {
   },
   mini: {},

package-lock.json

@@ -3701,6 +3701,14 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
       "dev": true
     },
+    "@zjxpcyc/react-tiny-store": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@zjxpcyc/react-tiny-store/-/react-tiny-store-1.0.0.tgz",
+      "integrity": "sha512-ykPq4Tlfv4dr8HHSsBHBzcms8R3dld80FaZruMwxhIUqTQ+ypIDvQYqpajnnvS9sOPDZNqWyd9+mRiyKcADf9g==",
+      "requires": {
+        "fast-deep-equal": "^3.1.3"
+      }
+    },
     "abab": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
@@ -4232,6 +4240,15 @@
       "integrity": "sha512-M8Sby4wRLuLr+9UB8V31knVRf/rl0xkk51A7um6hUCvVPyOvLtI0u0k1OPiMgE2d7CwmeSa33NzGpaALHPQCPg==",
       "dev": true
     },
+    "babel-plugin-import": {
+      "version": "1.13.5",
+      "resolved": "https://registry.npmjs.org/babel-plugin-import/-/babel-plugin-import-1.13.5.tgz",
+      "integrity": "sha512-IkqnoV+ov1hdJVofly9pXRJmeDm9EtROfrc5i6eII0Hix2xMs5FEm8FG3ExMvazbnZBbgHIt6qdO8And6lCloQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.0.0"
+      }
+    },
     "babel-plugin-jsx-attributes-array-to-object": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-jsx-attributes-array-to-object/-/babel-plugin-jsx-attributes-array-to-object-0.3.0.tgz",
@@ -7195,8 +7212,7 @@
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "fast-json-stable-stringify": {
       "version": "2.1.0",

package.json

@@ -41,6 +41,7 @@
     "@tarojs/react": "3.3.6",
     "@tarojs/runtime": "3.3.6",
     "@tarojs/taro": "3.3.6",
+    "@zjxpcyc/react-tiny-store": "^1.0.0",
     "dayjs": "^1.11.1",
     "react": "^17.0.0",
     "react-dom": "^17.0.0"
@@ -51,6 +52,7 @@
     "@tarojs/webpack-runner": "3.3.6",
     "@types/react": "^17.0.2",
     "@types/webpack-env": "^1.13.6",
+    "babel-plugin-import": "^1.13.5",
     "babel-preset-taro": "3.3.6",
     "eslint": "^6.8.0",
     "eslint-config-taro": "3.3.6",

project.config.json

@@ -2,7 +2,7 @@
   "miniprogramRoot": "./dist",
   "projectname": "hospitalGN",
   "description": "灌南县",
-  "appid": "wx06a7372d48d56843",
+  "appid": "wx835627a9b9b3932a",
   "setting": {
     "urlCheck": true,
     "es6": false,

project.tt.json

@@ -1,7 +1,7 @@
 {
   "miniprogramRoot": "./",
   "projectname": "hospitalGN",
-  "appid": "touristappid",
+  "appid": "wx835627a9b9b3932a",
   "setting": {
     "es6": false,
     "minified": false

src/app.config.js

@@ -2,6 +2,7 @@ export default {
   pages: [
     'pages/index/index',
     'pages/setUserInfo/index',
+    'pages/DepartmentSelection/index',
   ],
   window: {
     backgroundTextStyle: 'light',

src/app.js

@@ -1,7 +1,11 @@
 import { Component } from 'react'
 import { View } from '@tarojs/components';
+import Taro from '@tarojs/taro';
 import '@antmjs/vantui/lib/index.less';
 import './app.less'
+import { login } from './services/user';
+import store, { StoreRoot, useModel } from './store'
+
 
 class App extends Component {
 
@@ -12,12 +16,34 @@ class App extends Component {
   componentDidHide () { }
 
   componentDidCatchError () { }
+  onLaunch (options) {
+    const { logins, setUserLocation } = store.getModel('userData').getState()
+
+
+    // 登录获取人员信息
+
+
+    Taro.login({
+      success: (res) => {
+        const { code } = res;
+        logins({ code })
+
+
+      }
+    })
+  }
 
   // this.props.children 是将要会渲染的页面
+
   render () {
-    return <View className='index'>
+    return <StoreRoot>
       {this.props.children}
-    </View>
+    </StoreRoot>
+    // <View className='index'>
+    //   {this.props.children}
+    // </View>
+
+
 
   }
 }

src/pages/DepartmentSelection/index.jsx

@@ -2,6 +2,7 @@ import { View, Text } from "@tarojs/components"
 import { useEffect, useState } from "react"
 import Taro, { useDidShow } from "@tarojs/taro"
 import { TreeSelect } from "@antmjs/vantui";
+import { getDepartmenList } from "../../services/user";
 
 // import BottomMoadl from '@/components/BottomMoadl/index'
 
@@ -13,12 +14,63 @@ import { TreeSelect } from "@antmjs/vantui";
 import './style.less'
 
 export default (props) => {
+  useEffect(() => {
+    getDepartmenList().then((e) => {
+      console.log('科室选择', e);
+    })
+  }, [])
+
+  // {
+  //   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 onClickNav = () => {
+    console.log('父级: detail.index || 0',);
+  }
+  const onClickItem = () => {
+    console.log('自己: detail.index || 0',);
+
+  }
+
+
 
 
 
   return (
     <View className='page-index'>
-
+      <TreeSelect
+        items={items}
+        mainActiveIndex={items.mainActiveIndex}
+        activeId={items.activeId}
+        onClickNav={onClickNav}
+        onClickItem={onClickItem}
+      />
 
     </View>
   )

src/pages/index/index.jsx

@@ -1,7 +1,7 @@
 import { View, Text, Image } from '@tarojs/components'
 import { useEffect, useRef, useState } from 'react'
 import dayjs from 'dayjs'
-import { Icon } from "@antmjs/vantui";
+import { Button, Icon } from "@antmjs/vantui";
 import Taro from '@tarojs/taro';
 // import userBck from '../../assets/userBck.png'
 import barcodeimg from '../../assets/barcodeimg.png'

src/pages/setUserInfo/index.jsx

@@ -1,25 +1,110 @@
-import { View, Text } from "@tarojs/components"
-import { useEffect, useState } from "react"
+import { View, Text, Input } from "@tarojs/components"
+import { useEffect, useRef, useState } from "react"
 import Taro, { useDidShow } from "@tarojs/taro"
-import { Button } from "@antmjs/vantui"
+import { Button, Form, FormItem, Icon } from "@antmjs/vantui";
 
-// import BottomMoadl from '@/components/BottomMoadl/index'
 
+// import BottomMoadl from '@/components/BottomMoadl/index'
+import './style.less'
 
+export default (props) => {
 
+  const handleClick = (fieldValues) => {
 
+    console.info(fieldValues)
+  }
+  const goDepartmen = () => {
+    Taro.navigateTo({
+      url: '/pages/DepartmentSelection/index'
+    })
 
+  }
+  const getPhone = () => {
+    console.log('手机号',);
 
-import './style.less'
+  }
+  return (
+    <View className='page-index'>
+      <Form
+        initialValues={{
+          name: '我是初始值',
+          singleSelect: '1',
+          rate: 2,
+          slider: '50',
+        }}
+        // ref={(el) => (form = el)}
+        onFinish={(e) => handleClick(e)}
+      >
+        <FormItem
+          label='用户名'
+          name='userName'
+          required
 
-export default (props) => {
+          trigger='onInput'
+          validateTrigger='onBlur'
+          // taro的input的onInput事件返回对应表单的最终值为e.detail.value
+          valueFormat={(e) => e.detail.value}
+        >
+          <Input placeholder='请输入用户名' />
+        </FormItem>
+        <FormItem
+          label='手机号'
+          name='phone'
+          required
+          trigger='onInput'
+          validateTrigger='onBlur'
+          // taro的input的onInput事件返回对应表单的最终值为e.detail.value
+          valueFormat={(e) => e.detail.value}
+        >
+          <Input placeholder='请输入手机号' type='number' />
+          <Button
+            plain
+            hairline
+            size='small'
+            type='info'
+            onGetPhoneNumber={getPhone}
+          >
+            一键填写
+          </Button>
+        </FormItem>
 
+        <FormItem
+          label='身份证'
+          name='id'
+          required
 
+          trigger='onInput'
+          validateTrigger='onBlur'
+          // taro的input的onInput事件返回对应表单的最终值为e.detail.value
+          valueFormat={(e) => e.detail.value}
+        >
+          <Input placeholder='请输入身份证号' type='number' />
+        </FormItem>
 
-  return (
-    <View className='page-index'>
+        <FormItem
+          label='科室'
+          name='departmen'
+          required
 
+          trigger='onInput'
+          validateTrigger='onBlur'
+          // taro的input的onInput事件返回对应表单的最终值为e.detail.value
+          valueFormat={(e) => e.detail.value}
+        >
+          <Input placeholder='请选择科室' value='' disabled onClick={goDepartmen} />
+        </FormItem>
+        <View className='buttom-box'>
+          <Button
+            type='info'
+            size='normal'
+            formType='submit'
+            className='buttom-box-buttonSubmit'
+          >
+            提交
+          </Button>
+        </View>
 
+      </Form>
     </View>
   )
 }

src/pages/setUserInfo/style.less

@@ -1,59 +1,8 @@
-.orders-listBox-RihtboxBoxOrderViewText:before {
-  content: "";
-  display: block;
-  position: absolute;
+.buttom-box {
   width: 100%;
-  bottom: -10px;
-  left: 0;
-  border-bottom: 20px dotted rgb(255, 255, 255);
-}
-
-.orders-listBox-RihtboxBoxOrderViewText {
-  width: 85vw;
-  margin: 35px auto 44px auto;
-  padding: 62px 30px 93px 30px;
-  background: #ffffff;
-  box-shadow: 0px 4px 40px 0px rgba(0, 0, 0, 0.12);
-  border-radius: 40px 40px 0px 0px;
-  position: relative;
-
-  .View-LiftTextTop {
-    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-    padding-bottom: 20px;
-    padding-top: 0;
-  }
-  View:nth-child(6) {
-    padding-bottom: 40px;
-
-    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+  text-align: center;
+  margin: 5vh 0 0 0;
+  &-buttonSubmit {
+    width: 90%;
   }
-  > View {
-    padding: 15px 0;
-    font-size: 32px;
-    font-weight: bold;
-    color: #666666;
-    > Text {
-      color: #222222;
-    }
-
-    .feiyongStyle {
-      justify-content: space-between;
-      display: flex;
-      color: #222222;
-      &-charges {
-        background: linear-gradient(180deg, #fa7878 0%, #b61515 100%);
-        -webkit-background-clip: text;
-        -webkit-text-fill-color: transparent;
-      }
-      &-stateStyle {
-      }
-    }
-  }
-}
-
-.BottomtBut {
-  width: 99vw;
-  position: absolute;
-  bottom: 5vh;
-  display: flex;
 }

src/services/user.js

@@ -0,0 +1,19 @@
+
+import request from '../utils/request'
+// utils/request
+
+
+/**
+ * 登陆
+ * @param {*} data 
+ * @returns 
+ */
+export const login = (data) => request('/login', { data, method: 'POST' })
+
+/**
+ * 科室选择
+ * @param {*} data 
+ * @returns 
+ */
+export const getDepartmenList = (data) => request('/bds-org', { data, method: 'GET' })
+// /api/wx/{clientId}/bds-org

src/store/index.js

@@ -0,0 +1,16 @@
+import { createStore, createStoreRoot, createModelHook } from '@zjxpcyc/react-tiny-store'
+import userData from './userData'
+
+const store = createStore()
+const models = { userData, }
+
+
+
+const useModel = createModelHook(store)
+const StoreRoot = createStoreRoot(store, models)
+
+export default store
+export {
+  useModel,
+  StoreRoot,
+}

src/store/userData.js

@@ -0,0 +1,43 @@
+import { useState } from "react"
+
+import { login } from "../services/user"
+
+
+export default () => {
+  const [person, setPerson] = useState()
+  const [sessionKey, setSessionKey] = useState()
+  const [userPhoneInfo, setUserPhoneInfo] = useState()
+
+
+
+
+
+
+
+
+  const logins = (params) => {
+    console.log('login');
+
+    login(params).then((res) => {
+      const { person: taPerson, sessionKey: skey } = res;
+      // taPerson.phone = null
+      setPerson(taPerson);
+      setSessionKey(skey);
+    })
+  }
+  console.log("🚀 来自store的打印 person数据", person)
+
+  return {
+    person,
+    sessionKey,
+
+    setPerson,
+    setSessionKey,
+
+    userPhoneInfo,
+    setUserPhoneInfo,
+
+
+    logins,
+  }
+}

src/utils/codeSegment.js

@@ -0,0 +1,24 @@
+
+
+/**
+ * object 转 queryStr
+ * @param {*} params 
+ * @returns 
+ */
+export function getQueryString (params) {
+  if (!params) return;
+
+  const keys = Object.keys(params)
+  const arr = keys.map((key) => {
+    const val = params[key]
+    if (val === null || val === undefined) return false;
+
+    return `${key}=${encodeURIComponent(val)}`
+  })
+
+  return arr.filter(Boolean).join('&')
+}
+
+
+
+

src/utils/request.js

@@ -0,0 +1,69 @@
+import Taro from '@tarojs/taro'
+import { getQueryString } from './codeSegment'
+
+let appid
+
+export default (url, options) => {
+  const { params, skipError, header, ...leftOptions } = options || {}
+  const queryStr = getQueryString(params)
+
+  if (!appid) {
+    const { miniProgram } = Taro.getAccountInfoSync()
+    appid = miniProgram.appId
+  }
+
+  const urlWithParams = queryStr ? `${url}?${queryStr}` : url;
+  const nwUrl = `${HOST}/api/wx/${appid}${urlWithParams}`
+
+  const authToken = Taro.getStorageSync('token')
+  const tokenHeader = authToken ? { Authorization: authToken } : {}
+  const nwHeader = {
+    ...(header || {}),
+    ...tokenHeader,
+  }
+
+  return new Promise((resolve, reject) => {
+    Taro.request({
+      ...leftOptions,
+      url: nwUrl,
+      header: nwHeader,
+      success: (res) => {
+        const { code, message, data, token } = res.data
+
+        if (token || data?.token) {
+          Taro.setStorage({ key: 'token', data: token || data?.token })
+        }
+
+        if (code === 1000) {
+          resolve(data)
+
+        } else {
+          if (!skipError) {
+            Taro.showToast({
+              title: message || '网络异常',
+              icon: 'none',
+            })
+          }
+          reject(message?.indexOf('java') > -1 ? '系统内部错误' : message)
+        }
+      },
+
+      fail: (err) => {
+        console.error(err)
+
+
+
+        const message = err.message || err.errMsg || err
+
+        if (!skipError) {
+          Taro.showToast({
+            title: message,
+            icon: 'none',
+          })
+        }
+
+        reject(message)
+      }
+    })
+  })
+}

yarn.lock

@@ -1955,6 +1955,13 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
+"@zjxpcyc/react-tiny-store@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@zjxpcyc/react-tiny-store/-/react-tiny-store-1.0.0.tgz#316a2a0336273c1c014bf2f55a513583770c7181"
+  integrity sha512-ykPq4Tlfv4dr8HHSsBHBzcms8R3dld80FaZruMwxhIUqTQ+ypIDvQYqpajnnvS9sOPDZNqWyd9+mRiyKcADf9g==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+
 abab@^2.0.0:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
@@ -2391,6 +2398,13 @@ babel-plugin-global-define@^1.0.3:
   resolved "https://registry.yarnpkg.com/babel-plugin-global-define/-/babel-plugin-global-define-1.0.3.tgz#262c528f0c26bf318f4ccc77cf21df43a0fa6308"
   integrity sha512-M8Sby4wRLuLr+9UB8V31knVRf/rl0xkk51A7um6hUCvVPyOvLtI0u0k1OPiMgE2d7CwmeSa33NzGpaALHPQCPg==
 
+babel-plugin-import@^1.13.5:
+  version "1.13.5"
+  resolved "https://registry.yarnpkg.com/babel-plugin-import/-/babel-plugin-import-1.13.5.tgz#42eed1c5afd9a35ee1b1f8fe922b07c44077d753"
+  integrity sha512-IkqnoV+ov1hdJVofly9pXRJmeDm9EtROfrc5i6eII0Hix2xMs5FEm8FG3ExMvazbnZBbgHIt6qdO8And6lCloQ==
+  dependencies:
+    "@babel/helper-module-imports" "^7.0.0"
+
 babel-plugin-jsx-attributes-array-to-object@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-jsx-attributes-array-to-object/-/babel-plugin-jsx-attributes-array-to-object-0.3.0.tgz#ac7b551a2407750ac899460fe5e38b1dceaebed1"
@@ -3699,7 +3713,7 @@ data-urls@^1.1.0:
     whatwg-mimetype "^2.2.0"
     whatwg-url "^7.0.0"
 
-dayjs@^1.10.6:
+dayjs@^1.10.6, dayjs@^1.11.1:
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.1.tgz#90b33a3dda3417258d48ad2771b415def6545eb0"
   integrity sha512-ER7EjqVAMkRRsxNCC5YqJ9d9VQYuWdGt7aiH2qA5R5wt8ZmWaP2dLUSIK6y/kVzLMlmh1Tvu5xUf4M/wdGJ5KA==
@@ -4623,7 +4637,7 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
   integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==
 
-fast-deep-equal@^3.1.1:
+fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==