feat / login system

config/dev.js

@@ -3,7 +3,7 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    HOST: '"http://sgl-v2-test.njyunzhi.com"',
+    HOST: '"https://machine.njyunzhi.com"',
     OSS: '""',
     // VERSION: '"2.0.33"',
   },

config/prod.js

@@ -3,7 +3,8 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    HOST: '"http://sgl-v2-test.njyunzhi.com"',
+    HOST: '"https://machine.njyunzhi.com"',
+
     OSS: '""',
     // VERSION: '"2.0.33"',
   },

package.json

@@ -40,10 +40,9 @@
     "@tarojs/react": "3.3.6",
     "@tarojs/runtime": "3.3.6",
     "@tarojs/taro": "3.3.6",
+    "@zjxpcyc/react-tiny-store": "^1.0.0",
     "react": "^17.0.0",
     "react-dom": "^17.0.0",
-    "react-redux": "^7.2.6",
-    "redux": "^4.1.2",
     "weui-miniprogram": "^1.2.3"
   },
   "devDependencies": {

src/app.js

@@ -1,8 +1,6 @@
 import { Component } from 'react'
 import Taro from '@tarojs/taro'
-import { login } from '@/services/login'
-
-import store from './store'
+import store, { StoreRoot } from './store'
 
 import './app.less'
 
@@ -14,17 +12,14 @@ class App extends Component {
   componentDidShow () { }
   onLaunch (options) {
     // 登录获取人员信息
+
+    const { logins } = store.getModel('userData').getState()
+
     Taro.login({
       success: (res) => {
         const { code } = res;
-        login({ code })
-
-
-        const action = { type: "SET_VISIBILITY_FILTER", state: { cookis: 'a1sd54a5wd654s' } }
-        store.dispatch(action)
-
+        logins({ code })
 
-        console.log(store.getState());
       }
     })
 
@@ -32,7 +27,11 @@ class App extends Component {
 
   // this.props.children 是将要会渲染的页面
   render () {
-    return this.props.children
+    return (
+      <StoreRoot>
+        {this.props.children}
+      </StoreRoot>
+    )
   }
 }
 export default App

src/pages/OrderInfo/index.jsx

@@ -2,7 +2,6 @@ import { View, Text } from "@tarojs/components"
 import { useState } from "react"
 import CustomNav from '@/components/CustomNav'
 import ButtontWX from '@/components/ButtontWX'
-import store from "@/store"
 // import BottomMoadl from '@/components/BottomMoadl/index'
 
 

src/pages/UserLogin/index.jsx

@@ -1,18 +1,24 @@
 
 import { useState } from 'react'
 import Taro from '@tarojs/taro'
+import { getUserQcode, setUserPhone } from '@/services/login'
 
-import { View, Image, Input, Text } from '@tarojs/components'
+import { View, Image, Input, Text, Form } from '@tarojs/components'
 import CustomNav from '@/components/CustomNav'
 import ButtontWX from '@/components/ButtontWX'
 import checkedImg from '@/assets/lolginImages/checkedImg.png'
 import unselectedImg from '@/assets/lolginImages/unselectedImg.png'
+import { useModel } from '@/store'
+
 
 import './style.less'
 
 
 export default (props) => {
 
+  const { person, setUserPhoneInfo } = useModel('userData')
+
+
   const [countCenter, setCountCenter] = useState({
     count: 60,
     toast: false,
@@ -21,14 +27,22 @@ export default (props) => {
   })
 
   const [checkImage, setCheckImage] = useState(false)
-  const [InputCodeValue, setInputCodeValue] = useState('')
 
-  const InputCode = (r) => {
-    setInputCodeValue(r.detail.value)
+  const [InputPhoneValue, setInputPhoneValue] = useState('18082043755')
+  const [InputCodeValue, setInputCodeValue] = useState('375501')
+
+  const onInputPhone = (r) => {
+    setInputPhoneValue(r.detail.value)
+    console.log("🚀 ~ file: index.jsx ~ line 26 ~ InputCodeValue", InputPhoneValue)
+
   }
+  const onInputCode = (r) => {
+    setInputCodeValue(r.detail.value)
 
+  }
+  //获取验证码
   const getCode = (r) => {
-    if (InputCodeValue === '' || !(/^1[3456789]\d{9}$/.test(InputCodeValue))) {
+    if (InputPhoneValue === '' || !(/^1[3456789]\d{9}$/.test(InputPhoneValue))) {
       console.log('提示')
       Taro.showToast({
         title: '手机号码有误',
@@ -37,6 +51,13 @@ export default (props) => {
       })
 
     } else {
+      getUserQcode({ phone: InputPhoneValue }).then(() => {
+        Taro.showToast({
+          title: '验证码发送成功',
+          icon: 'none',
+          duration: 2000
+        })
+      })
       let count = countCenter.count
       const timer = setInterval(() => {
         setCountCenter({
@@ -61,13 +82,30 @@ export default (props) => {
 
 
   const getUserLogin = () => {
-    if (!checkImage) {
+    if (InputPhoneValue === '' || !(/^1[3456789]\d{9}$/.test(InputPhoneValue))) {
+      console.log('提示')
       Taro.showToast({
-        title: '下方协议未勾选',
+        title: '手机号或验证码有误',
         icon: 'none',
         duration: 2000
       })
+    } else {
+      if (!checkImage) {
+        Taro.showToast({
+          title: '下方协议未勾选',
+          icon: 'none',
+          duration: 2000
+        })
+      } else {
+        setUserPhone(person.personId, { captcha: InputCodeValue, phone: InputPhoneValue }).then((e) => {
+          console.log('e', e);
+          Taro.reLaunch({ url: '/pages/index/index?tab=2&userOk' });
+        })
+        // console.log('person', person);
+      }
+
     }
+
   }
 
 
@@ -87,14 +125,15 @@ export default (props) => {
         <View>
           <View className='loginPhone-box' >
             <View className='loginPhone-box-loginPhoneView'>+86</View>
-            <Input maxlength={11} placeholder='请输入手机号码' type={Number} onInput={InputCode} />
+            <Input maxlength={11} placeholder='请输入手机号码' type={Number} value={InputPhoneValue} onInput={onInputPhone} />
+
             <ButtontWX opacity={countCenter.show_btn ? '0.7' : '11'} disabled={countCenter.show_btn} onClick={getCode} butText={countCenter.code_ts} butWidth={94} butHeight={34} butFontSize={15} butBorderRadius={10} />
           </View>
           <View className='loginPhone-box'>
             <View className='loginPhone-box-loginPhoneView'>
               <Image style={{ width: '16px', height: '20px', margin: 'auto 2.8vw auto 2.8vw' }} src={require("@/assets/lolginImages/phoneCode.png")} />
             </View>
-            <Input maxlength={10} placeholder='请输入验证码' />
+            <Input maxlength={10} placeholder='请输入验证码' value={InputCodeValue} onInput={onInputCode} />
           </View>
         </View>
       </View>

src/pages/index/tabs/Homes.jsx

@@ -7,7 +7,6 @@ import searchs from '@/assets/homesImgaes/searchs.png'//搜索图片
 import carsListImga from '@/assets/homesImgaes/carsListImga.png'//农机列表图片
 
 
-import store from '@/store'
 
 import './HomesCss/style.less'
 
@@ -39,18 +38,6 @@ export default (props) => {
   const goToCarsList = () => {//更多
     Taro.navigateTo({ url: '/pages/MoreCars/index' })
 
-    // let value = store.getState()
-    // console.log('value-Home里面取值', store.getState());
-    // if (value.appid == '') {
-    //   Taro.showToast({
-    //     title: '成功',
-    //     icon: 'success',
-    //     duration: 2000
-    //   })
-    // } else {
-
-    // }
-
   }
 
   const startReserve = () => {

src/pages/index/tabs/Mine.jsx

@@ -1,7 +1,7 @@
 
 import { View, Image } from "@tarojs/components"
 import Taro from "@tarojs/taro"
-import { useState } from "react"
+import { useState, useEffect } from "react"
 import UserCellBox from '@/components/UserCellBox'
 import addresss from '@/assets/mineImgaes/addresss.png'//地址
 import aboutUs from '@/assets/mineImgaes/aboutUs.png'//关于我们
@@ -9,11 +9,15 @@ import feedbacks from '@/assets/mineImgaes/feedbacks.png'//意见反馈
 import helpCenter from '@/assets/mineImgaes/helpCenter.png'//帮助中心
 import versionUpdate from '@/assets/mineImgaes/versionUpdate.png'//版本更新
 import userRight from '@/assets/mineImgaes/userRight.png'//版本更新
-import store from "@/store"
+import { useModel } from "@/store"
+
+
+
 import './MineCss/style.less'
 
 
 export default (props) => {
+  const { person } = useModel('userData')
   const [isLoginBox, setIsLoginBox] = useState(false)
   const userList = [
     { userTitle: '关于我们', userImg: aboutUs, pageType: 0 },
@@ -22,6 +26,18 @@ export default (props) => {
     { userTitle: '意见反馈', userImg: feedbacks, pageType: 3 },
   ]
 
+  const $instance = Taro.getCurrentInstance()
+
+
+  useEffect(() => {
+    console.log($instance.router.params)
+    if ($instance.router.params.userOk || person.phone) {
+      setIsLoginBox(true)
+    } else {
+      console.log('没有',);
+    }
+  }, [$instance.router.params, person])
+
 
   const setAddress = (dd) => {
     Taro.navigateTo({ url: `/pages/MyAddressInfo/index?id${dd}` })
@@ -29,12 +45,7 @@ export default (props) => {
   }
 
   const userLoginnow = () => {
-    const action = { type: "SET_VISIBILITY_FILTER", state: { appid: '55555555555' } }
-    store.dispatch(action)
-    console.log(store.getState());
-
-
-    // Taro.navigateTo({ url: `/pages/UserLogin/index?id` })
+    Taro.navigateTo({ url: `/pages/UserLogin/index?id` })
     // setIsLoginBox(true)
   }
   const goToPages = (res) => {
@@ -80,7 +91,7 @@ export default (props) => {
                 <Image className='User-Avatar-background-trueBox-userImg' src='https://profile.csdnimg.cn/3/1/5/0_qq_42551866' />
                 <View className='User-Avatar-background-trueBox-name'>
                   <View >鲍zhangchao</View>
-                  <View >18082043755</View>
+                  <View >{person.phone}</View>
                 </View>
 
               </View>

src/services/login.js

@@ -4,4 +4,19 @@ import request from '@/utils/request'
  * @param {*} data 
  * @returns 
  */
-export const login = (data) => request('/login', { data, method: 'post' })
+export const login = (data) => request('/login', { data, method: 'post' })
+
+/**
+ * 发送验证码
+ * @param {*} data 
+ * @returns 
+ */
+export const getUserQcode = (params) => request('/sms-captcha', { method: 'post', params })
+
+/**
+* 验证码登陆
+* @param {*} 
+* @returns 
+*/
+
+export const setUserPhone = (id, data) => request(`/person/${id}/phone`, { method: 'put', data })

src/store/index.js

@@ -1,8 +1,16 @@
-import { createStore } from 'redux'
-import reducer from './reducers'
+import { createStore, createStoreRoot, createModelHook } from '@zjxpcyc/react-tiny-store'
+import userData from './userData'
 
+const store = createStore()
+const models = { userData, }
 
-const store = createStore(reducer) // 创建数据存储仓库
 
 
-export default store   
+const useModel = createModelHook(store)
+const StoreRoot = createStoreRoot(store, models)
+
+export default store
+export {
+  useModel,
+  StoreRoot,
+}

src/store/reducers.js

@@ -1,43 +0,0 @@
-const defaultState = {
-  appid: '',
-  cookis: ''
-}
-console.log(defaultState, 'defaultState');
-
-
-function todoApp (state = defaultState, action) {
-  state = JSON.parse(JSON.stringify(state)) //深度
-  switch (action.type) {
-    case 'SET_VISIBILITY_FILTER':
-      state = {
-        ...defaultState,
-        ...action.state
-      }
-      return state;
-    default:
-      return state;
-
-
-
-  }
-}
-
-
-// function fn (state = defaultState, action) {
-//   state = JSON.parse(JSON.stringify(state)) //深度
-
-//   switch (action.type) {
-//     case "setVisibilityFilter":
-//       state = {
-//         ...defaultState,
-//         ...action.state
-//       }
-//       return state;
-//     default:
-//       return state;
-//   }
-
-// }
-
-const state = todoApp
-export default state

src/store/userData.js

@@ -0,0 +1,35 @@
+import { useState } from "react"
+import { login } from '@/services/login'
+
+
+
+export default () => {
+  const [person, setPerson] = useState()
+  const [sessionKey, setSessionKey] = useState()
+  const [userPhoneInfo, setUserPhoneInfo] = useState()
+
+  console.log("🚀 ~ file: userData.js ~ line 8 ~ person", person)
+
+
+
+  const logins = (params) => {
+    login(params).then((res) => {
+      const { person: taPerson, sessionKey: skey } = res;
+      setPerson(taPerson);
+      setSessionKey(skey);
+    })
+  }
+
+  return {
+    person,
+    sessionKey,
+
+    setPerson,
+    setSessionKey,
+
+    userPhoneInfo,
+    setUserPhoneInfo,
+
+    logins,
+  }
+}

src/utils/request.js

@@ -8,15 +8,15 @@ export default (url, options) => {
   const queryStr = getQueryString(params)
 
   if (!appid) {
-    const { miniProgram } = Taro.getAccountInfoSync
-    appid = miniProgram.appid
+    const { miniProgram } = Taro.getAccountInfoSync()
+    appid = miniProgram.appId
   }
 
   const urlWithParams = queryStr ? `${url}?${queryStr}` : url;
-  const nwUrl = `${HOST}/api/wx${appid}${urlWithParams}`
+  const nwUrl = `${HOST}/api/wx/${appid}${urlWithParams}`
 
   const authToken = Taro.getStorageSync('token')
-  const tokenHeader = authToken ? { 'X-Authorization-JWT': authToken } : {}
+  const tokenHeader = authToken ? { Authorization: authToken } : {}
   const nwHeader = {
     ...(header || {}),
     ...tokenHeader,

yarn.lock

@@ -1046,7 +1046,7 @@
     core-js-pure "^3.20.2"
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.11.2", "@babel/runtime@^7.15.4", "@babel/runtime@^7.7.6", "@babel/runtime@^7.7.7", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.11.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.7.7", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
   version "7.17.7"
   resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.7.tgz"
   integrity sha512-L6rvG9GDxaLgFjg41K+5Yv9OMrU98sWe+Ykmc6FDJW/+vYZMhdOMKkISgzptMaERHvS2Y2lw9MDRm2gHhlQQoA==
@@ -1542,14 +1542,6 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
-"@types/hoist-non-react-statics@^3.3.0":
-  version "3.3.1"
-  resolved "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz"
-  integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==
-  dependencies:
-    "@types/react" "*"
-    hoist-non-react-statics "^3.3.0"
-
 "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8":
   version "7.0.9"
   resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz"
@@ -1597,17 +1589,7 @@
   resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz"
   integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==
 
-"@types/react-redux@^7.1.20":
-  version "7.1.23"
-  resolved "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.23.tgz"
-  integrity sha512-D02o3FPfqQlfu2WeEYwh3x2otYd2Dk1o8wAfsA0B1C2AJEFxE663Ozu7JzuWbznGgW248NaOF6wsqCGNq9d3qw==
-  dependencies:
-    "@types/hoist-non-react-statics" "^3.3.0"
-    "@types/react" "*"
-    hoist-non-react-statics "^3.3.0"
-    redux "^4.0.0"
-
-"@types/react@*", "@types/react@^17.0.2":
+"@types/react@^17.0.2":
   version "17.0.39"
   resolved "https://registry.npmjs.org/@types/react/-/react-17.0.39.tgz"
   integrity sha512-UVavlfAxDd/AgAacMa60Azl7ygyQNRwC/DsHZmKgNvPmRR5p70AJ5Q9EAmL2NWOJmeV+vVUI4IAP7GZrN8h8Ug==
@@ -1932,6 +1914,13 @@
   resolved "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz"
   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.5"
   resolved "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz"
@@ -4564,9 +4553,9 @@ extsprintf@1.3.0, extsprintf@^1.2.0:
   resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"
   integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
 
-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.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-glob@^2.0.2:
@@ -5239,13 +5228,6 @@ hmac-drbg@^1.0.1:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
-hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz"
-  integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
-  dependencies:
-    react-is "^16.7.0"
-
 hosted-git-info@^2.1.4:
   version "2.8.9"
   resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz"
@@ -7980,7 +7962,7 @@ promise-inflight@^1.0.1:
   resolved "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz"
   integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
-prop-types@^15.7.2, prop-types@^15.8.1:
+prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz"
   integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
@@ -8167,16 +8149,11 @@ react-dom@^17.0.0:
     object-assign "^4.1.1"
     scheduler "^0.20.2"
 
-react-is@^16.13.1, react-is@^16.7.0:
+react-is@^16.13.1:
   version "16.13.1"
   resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-react-is@^17.0.2:
-  version "17.0.2"
-  resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz"
-  integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
-
 react-reconciler@0.26.1:
   version "0.26.1"
   resolved "https://registry.npmjs.org/react-reconciler/-/react-reconciler-0.26.1.tgz"
@@ -8186,18 +8163,6 @@ react-reconciler@0.26.1:
     object-assign "^4.1.1"
     scheduler "^0.20.1"
 
-react-redux@^7.2.6:
-  version "7.2.6"
-  resolved "https://registry.npmjs.org/react-redux/-/react-redux-7.2.6.tgz"
-  integrity sha512-10RPdsz0UUrRL1NZE0ejTkucnclYSgXp5q+tB5SWx2qeG2ZJQJyymgAhwKy73yiL/13btfB6fPr+rgbMAaZIAQ==
-  dependencies:
-    "@babel/runtime" "^7.15.4"
-    "@types/react-redux" "^7.1.20"
-    hoist-non-react-statics "^3.3.2"
-    loose-envify "^1.4.0"
-    prop-types "^15.7.2"
-    react-is "^17.0.2"
-
 react-refresh@0.9.0:
   version "0.9.0"
   resolved "https://registry.npmjs.org/react-refresh/-/react-refresh-0.9.0.tgz"
@@ -8293,13 +8258,6 @@ redent@^2.0.0:
     indent-string "^3.0.0"
     strip-indent "^2.0.0"
 
-redux@^4.0.0, redux@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.npmjs.org/redux/-/redux-4.1.2.tgz"
-  integrity sha512-SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw==
-  dependencies:
-    "@babel/runtime" "^7.9.2"
-
 reflect-metadata@^0.1.13:
   version "0.1.13"
   resolved "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz"