afeast

config/dev.js

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

config/index.js

@@ -1,3 +1,5 @@
+const path = require('path')
+
 const config = {
   projectName: 'nanyang',
   date: '2022-3-8',
@@ -18,6 +20,14 @@ const config = {
     options: {
     }
   },
+  alias: {
+    '@/assets': path.resolve(__dirname, '..', 'src/assets'),
+    '@/components': path.resolve(__dirname, '..', 'src/components'),
+    '@/layouts': path.resolve(__dirname, '..', 'src/layouts'),
+    '@/utils': path.resolve(__dirname, '..', 'src/utils'),
+    '@/store': path.resolve(__dirname, '..', 'src/store'),
+    '@/services': path.resolve(__dirname, '..', 'src/services'),
+  },
   framework: 'react',
   mini: {
     postcss: {

config/prod.js

@@ -3,6 +3,9 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
+    HOST: '"http://sgl-v2-test.njyunzhi.com"',
+    OSS: '""',
+    // VERSION: '"2.0.33"',
   },
   mini: {},
   h5: {

jsconfig.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "@/*": [
+        "./src/*"
+      ]
+    }
+  }
+}

package.json

@@ -37,11 +37,12 @@
   "dependencies": {
     "@babel/runtime": "^7.7.7",
     "@tarojs/components": "3.3.6",
+    "@tarojs/react": "3.3.6",
     "@tarojs/runtime": "3.3.6",
     "@tarojs/taro": "3.3.6",
-    "@tarojs/react": "3.3.6",
+    "react": "^17.0.0",
     "react-dom": "^17.0.0",
-    "react": "^17.0.0"
+    "weui-miniprogram": "^1.2.3"
   },
   "devDependencies": {
     "@types/webpack-env": "^1.13.6",

project.config.json

@@ -1,13 +1,46 @@
 {
-  "miniprogramRoot": "./dist",
-  "projectname": "nanyang",
-  "description": "南阳农机",
-  "appid": "touristappid",
-  "setting": {
-    "urlCheck": true,
-    "es6": false,
-    "postcss": false,
-    "minified": false
-  },
-  "compileType": "miniprogram"
-}
+    "miniprogramRoot": "dist/",
+    "projectname": "nanyang",
+    "description": "南阳农机",
+    "appid": "wx835627a9b9b3932a",
+    "setting": {
+        "urlCheck": true,
+        "es6": false,
+        "enhance": true,
+        "postcss": false,
+        "preloadBackgroundData": false,
+        "minified": false,
+        "newFeature": false,
+        "coverView": true,
+        "nodeModules": false,
+        "autoAudits": false,
+        "showShadowRootInWxmlPanel": true,
+        "scopeDataCheck": false,
+        "uglifyFileName": false,
+        "checkInvalidKey": true,
+        "checkSiteMap": true,
+        "uploadWithSourceMap": true,
+        "compileHotReLoad": false,
+        "lazyloadPlaceholderEnable": false,
+        "useMultiFrameRuntime": true,
+        "useApiHook": true,
+        "useApiHostProcess": true,
+        "babelSetting": {
+            "ignore": [],
+            "disablePlugins": [],
+            "outputPath": ""
+        },
+        "enableEngineNative": false,
+        "useIsolateContext": false,
+        "userConfirmedBundleSwitch": false,
+        "packNpmManually": false,
+        "packNpmRelationList": [],
+        "minifyWXSS": true,
+        "disableUseStrict": false,
+        "showES6CompileOption": false,
+        "useCompilerPlugins": false,
+        "minifyWXML": true
+    },
+    "compileType": "miniprogram",
+    "condition": {}
+}

src/app.config.js

@@ -1,7 +1,10 @@
+import { pages, subPackages } from './routes'
+
 export default {
-  pages: [
-    'pages/index/index'
-  ],
+  pages,
+  useExtendedLib: {
+    weui: true,
+  },
   window: {
     backgroundTextStyle: 'light',
     navigationBarBackgroundColor: '#fff',
@@ -9,3 +12,4 @@ export default {
     navigationBarTextStyle: 'black'
   }
 }
+

src/app.js

@@ -1,20 +1,27 @@
 import { Component } from 'react'
+import Taro from '@tarojs/taro'
+import { login } from '@/services/login'
 import './app.less'
 
 class App extends Component {
 
-  componentDidMount () {}
+  componentDidMount () { }
 
-  componentDidShow () {}
+  componentDidShow () { }
+  onLaunch (options) {
+    // 登录获取人员信息
+    Taro.login({
+      success: (res) => {
+        const { code } = res;
+        // login({ code })
+      }
+    })
 
-  componentDidHide () {}
-
-  componentDidCatchError () {}
+  }
 
   // this.props.children 是将要会渲染的页面
   render () {
     return this.props.children
   }
 }
-
 export default App

src/app.less

@@ -0,0 +1,54 @@
+.page-index {
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 100vh;
+  overflow: hidden;
+  box-sizing: border-box;
+  // background-color: #f2f2f2;
+
+  .index-navbar {
+    flex: none;
+  }
+
+  .index-tabbar {
+    flex: none;
+  }
+
+  .index-container {
+    flex: 1;
+    overflow: hidden;
+    position: relative;
+  }
+}
+
+.custom-tabbar {
+  background: #ffffff;
+  box-shadow: 0px -4px 6px 0px rgba(0, 0, 0, 0.08);
+  .weui-tabbar__label {
+    color: #c0c8d3;
+    font-size: 40px;
+    font-weight: 800;
+  }
+
+  .weui-bar__item_on {
+    .weui-tabbar__label {
+      color: #202020;
+      font-size: 50px;
+      font-weight: 800;
+    }
+  }
+}
+
+.purebtn {
+  margin: 0;
+  padding: 0;
+  background: transparent;
+  border: none;
+  outline: none;
+  line-height: 88px;
+
+  &::after {
+    border: none;
+  }
+}

src/components/ButtontWX/index.jsx

@@ -0,0 +1,21 @@
+
+import { View, Text } from '@tarojs/components'
+import './style.less'
+
+export default (props) => {
+  const { butText, butWidth, butHeight, butFontSize, butBorderRadius } = props
+  let butStyle = {
+    width: `${butWidth || 100}px`,
+    height: `${butHeight || 40}px`,
+    borderRadius: `${butBorderRadius || 0}px`,
+    fontSize: `${butFontSize || 20}px`
+  }
+  let butStyle2 = {
+    lineHeight: `${butHeight || 40}px`,
+  }
+  return (
+    <View className='buttont-box' style={butStyle}>
+      <View style={butStyle2}>{butText || '确定'}</View>
+    </View>
+  )
+}

src/components/ButtontWX/style.less

@@ -0,0 +1,9 @@
+.buttont-box {
+  background: #ff703b;
+  display: flex;
+  > View {
+    margin: 0 auto;
+    font-weight: 600;
+    color: #ffffff;
+  }
+}

src/layouts/index.jsx

@@ -0,0 +1,15 @@
+
+
+import useRouter from '@/utils/hooks/useRouter'
+import { getPageBy, getIndexPageOf } from '../routes'
+
+export default (Child) => (props) => {
+
+  // const { person } = useModel('person')
+  const router = useRouter()
+
+
+
+  return <Child {...props} router={router} />
+
+}

src/pages/UserLogin/index.config.js

@@ -0,0 +1,11 @@
+
+export default {
+  navigationBarTitleText: '登陆',
+  // navigationStyle: 'custom',
+  disableScroll: true,
+
+  usingComponents: {
+  }
+
+
+}

src/pages/UserLogin/index.jsx

@@ -0,0 +1,9 @@
+
+import { View, Text } from '@tarojs/components'
+
+export default (props) => {
+
+  return (
+    <View>1111111111</View>
+  )
+}

src/pages/index/index.config.js

@@ -1,3 +1,12 @@
+
 export default {
-  navigationBarTitleText: '首页'
+  navigationBarTitleText: '首页',
+  // navigationStyle: 'custom',
+  styleIsolation: 'shared',
+  enableShareAppMessage: true,
+  disableScroll: true,
+  usingComponents: {
+    "mp-tabbar": "weui-miniprogram/tabbar/tabbar",
+  }
+
 }

src/pages/index/index.jsx

@@ -1,13 +1,61 @@
-import { View, Text } from '@tarojs/components'
+import React, { useState, useEffect } from 'react'
+import Taro, { useDidShow } from '@tarojs/taro'
+import withLayout from '@/layouts'
+
+import ButtontWX from '../../components/ButtontWX'
+import tabList from './tabbar'
+import Homes from './tabs/Homes'
+import Orders from './tabs/Orders'
+import Mine from './tabs/Mine'
+
 import './index.less'
 
 
+export default withLayout((props) => {
+  const { router } = props
+
+  const { params, path } = router
+  const { tab } = params || {}
+
+  const [currentTab, setCurrentTab] = useState(0)
+
+  const [isDidShow, setIsDidShow] = useState(0)
+
+
+  useDidShow(() => {
+    setIsDidShow(isDidShow + 1)
+  })
+
+  useEffect(() => {
+    if (tab) {
+      setCurrentTab(tab - 0)
+    }
+  }, [tab])
+
+
+  const handleTabChange = (e) => {
+    const { index } = e.detail
+    setCurrentTab(index)
+  }
 
-export default (props) => {
 
   return (
-    <View className='index'>
-      <Text>测试</Text>
-    </View>
+    <view className='page-index'>
+      {/* <ButtontWX butText='确认登陆' butWidth={100} butHeight={30} butFontSize={10} butBorderRadius={20} /> */}
+      <view className='index-navbar'>
+      </view>
+      <view className='index-container'>
+        {currentTab === 0 && <Homes />}
+        {currentTab === 1 && <Orders router={router} />}
+        {/* {currentTab === 2 && <Strategy />} */}
+        {currentTab === 2 && <Mine isDidShow={isDidShow} router={router} />}
+      </view>
+      <view className='index-tabbar'>
+        <mp-tabbar extClass='custom-tabbar' current={currentTab} list={tabList} onChange={handleTabChange}></mp-tabbar>
+      </view>
+    </view>
   )
-}
+})
+
+
+

src/pages/index/tabbar.js

@@ -0,0 +1,20 @@
+
+const tabbar = [
+  {//recommend_active
+    text: '首页',
+    // iconPath: require('@/assets/icons/tabbar/recommend.gif'),
+    // selectedIconPath: require('@/assets/icons/tabbar/recommend_active.png'),
+  },
+  {
+    text: '订单',
+    // iconPath: require('@/assets/icons/tabbar/guide.png'),
+    // selectedIconPath: require('@/assets/icons/tabbar/guide_active.png'),
+  },
+  {
+    text: '我的',
+    // iconPath: require('@/assets/icons/tabbar/mine.png'),
+    // selectedIconPath: require('@/assets/icons/tabbar/mine_active.png'),
+  },
+]
+
+export default tabbar

src/pages/index/tabs/Homes.jsx

@@ -0,0 +1,10 @@
+
+import { View } from "@tarojs/components"
+
+
+export default (props) => {
+
+  return (
+    <View>Home</View>
+  )
+}

src/pages/index/tabs/Mine.jsx

@@ -0,0 +1,46 @@
+
+import { View, Image } from "@tarojs/components"
+import { useDidShow } from "@tarojs/taro"
+import { useState } from "react"
+import './MineCss/style.less'
+
+
+export default (props) => {
+  const [isLoginBox, setIsLoginBox] = useState(false)
+
+  return (
+    <scroll-view scrollY style='height: 100%;' >
+
+      <View>
+        {/* 头像 */}
+        {
+          !isLoginBox ?
+            <View className='User-Avatar-background-falseBox'>
+              <Image className='User-Avatar-background-falseBox-userImg userImg' src='https://profile.csdnimg.cn/3/1/5/0_qq_42551866' />
+              <View className='User-Avatar-background-falseBox-userLogin' onClick={() => setIsLoginBox(true)}>点击登陆</View>
+            </View>
+            :
+            <View className='User-Avatar-background-trueBox'>
+              <View className='setPassword'>修改密码</View>
+              <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 textStyle' >鲍zhangchao</View>
+              <View className='User-Avatar-background-trueBox-phone textStyle'>18082043755</View>
+            </View>
+        }
+
+        {/* 菜单 */}
+        <View className='User-Setup-background'>
+          <View className='User-Setup-background-SetupText'>设置</View>
+          <View className='User-Setup-background-wxInfo'>
+            <View className='User-Setup-background-wxInfo-InfoCell'>
+              <Image className='User-Setup-background-wxInfo-InfoCell-imgae' src='https://profile.csdnimg.cn/3/1/5/0_qq_42551866' />
+              <View className='User-Setup-background-wxInfo-InfoCell-text'>关于我闷</View>
+              <View> 》 </View>
+            </View>
+
+          </View>
+        </View>
+      </View>
+    </scroll-view>
+  )
+}

src/pages/index/tabs/Orders.jsx

@@ -0,0 +1,10 @@
+
+import { View } from "@tarojs/components"
+
+
+export default (props) => {
+
+  return (
+    <View>Orders</View>
+  )
+}

src/pages/test/index.config.js

@@ -1,5 +0,0 @@
-export default {
-  navigationBarTitleText: '我的'
-}
-
-

src/pages/test/index.less

@@ -1 +0,0 @@
-

src/routes.js

@@ -0,0 +1,59 @@
+
+
+const Pages = [
+  {
+    title: '首页',
+    page: 'pages/index/index',
+    isIndex: true,
+  },
+
+];
+
+
+// 所有的页面
+const routes = Pages.map(x => ({ ...x, }))
+
+// 主包
+const pages = Pages.map(x => x.page);
+
+// 分包
+const subPages = routes.reduce((acc, route) => {
+  if (!route.root) return acc;
+
+  const pgs = acc[route.root] || []
+
+  return {
+    ...acc,
+    [route.root]: pgs.concat(route.page)
+  }
+}, {})
+
+const subPackages = Object.keys(subPages).map((key) => {
+  return {
+    root: key,
+    pages: subPages[key]
+  }
+})
+
+// 获取路径对应页面
+function getPageBy (path) {
+  return routes.filter(x => path.indexOf(x.page) > -1)[0]
+}
+
+// 获取角色首页
+function getIndexPageOf (role) {
+  if (role === 'person') {
+    return routes.filter(x => !x.root && x.isIndex)[0]
+  }
+
+  return routes.filter(x => x.root === role && x.isIndex)[0]
+}
+
+// eslint-disable-next-line import/no-commonjs
+module.exports = {
+  routes,
+  pages,
+  subPackages,
+  getPageBy,
+  getIndexPageOf
+}

src/services/login.js

@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+/**
+ * 登录
+ * @param {*} id 
+ * @returns 
+ * loginParam?login哪个接口。。
+ */
+export const login = (data) => request(`/loginParam  `, { method: 'post', data })

src/utils/codeSegment.js

@@ -0,0 +1,18 @@
+/**
+ * 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/hooks/useRouter.js

@@ -0,0 +1,27 @@
+import Taro, { useRouter } from '@tarojs/taro'
+// import { parseQueryString, random } from '@/utils'
+// import { useModel } from '@/store'
+import { useEffect, useRef, useState } from 'react'
+
+export default () => {
+  const router = useRouter()
+  const routerRef = useRef()
+
+
+  routerRef.current = router
+  const scene = router?.params?.scene
+  // const loginScene = Taro.getStorageSync('scene')
+
+  useEffect(() => {
+    // 没有 token 说明没有登录
+    const token = Taro.getStorageSync('token')
+    if (!token) {
+      return;
+    }
+
+
+
+  }, [scene])
+
+  return routerRef.current
+}

src/utils/request.js

@@ -0,0 +1,64 @@
+import Taro from '@tarojs/taro'
+import { getQueryString } from './codeSegment'
+
+
+
+export default (url, options) => {
+  const { params, skipError, header, ...leftOptions } = options || {}
+  const queryStr = getQueryString(params)
+
+  const urlWithParams = queryStr ? `${url}?${queryStr}` : url;
+  const nwUrl = `${HOST}/api/wx${urlWithParams}`
+
+  const authToken = Taro.getStorageSync('token')
+  const tokenHeader = authToken ? { 'X-Authorization-JWT': 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

@@ -10414,6 +10414,11 @@ websocket-extensions@>=0.1.1:
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
   integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
+weui-miniprogram@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/weui-miniprogram/-/weui-miniprogram-1.2.3.tgz#c966cdd56ec3e73c11ed8caff884fad10076feea"
+  integrity sha512-PFlPKnIVTkt3CMrasTVKFEoDO4kfy1i3p4g8iU255ydZnxieGpHGa1d5gvVH9qpmxMPoIpjN57YoP/drLbJQrg==
+
 weui@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/weui/-/weui-1.1.3.tgz#0f0899bb61bb2ec603b2648367a8139298f81514"