小程序端服务增加

config/dev.js

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

config/index.js

@@ -24,6 +24,9 @@ const config = {
     '@/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: {

package.json

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

src/app.js

@@ -1,19 +1,27 @@
 import { Component } from 'react'
+import Taro from '@tarojs/taro'
+import store, { StoreRoot } from './store'
 import './app.less'
 
 class App extends Component {
 
-  componentDidMount () {}
-
-  componentDidShow () {}
-
-  componentDidHide () {}
-
-  componentDidCatchError () {}
+  onLaunch(options) {
+    Taro.login({
+      success: (res) => {
+        const { code } = res;
+        const [_, login] = store.getModel('person').getState()
+        login({ code })
+      }
+    })
+  }
 
   // this.props.children 是将要会渲染的页面
   render () {
-    return this.props.children
+    return (
+      <StoreRoot>
+        {this.props.children}
+      </StoreRoot>
+    )
   }
 }
 

src/pages/index/index.jsx

@@ -1,6 +1,7 @@
 import React, { Suspense, useState, useEffect, lazy } from 'react'
 import { useRouter } from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
+import { useModel } from '@/store'
 import logo from '@/assets/icons/comm/logo_small.png'
 import tabList from './tabbar'
 import './index.less'
@@ -19,8 +20,11 @@ export default (props) => {
   const { params } = useRouter()
   const { tab } = params || {}
 
+  const [person] = useModel('person')
   const [currentTab, setCurrentTab] = useState(0)
 
+  console.log('------person------->', person)
+
   const handleTabChange = (e) => {
     const { index } = e.detail
     setCurrentTab(index)

src/pages/index/tabs/Recommend.jsx

@@ -1,24 +1,40 @@
 import { React, useState, useEffect, } from 'react'
 // .就是当前路径
-import './less/Recommend.less'
-import iconsearch from '../../../assets/icons/housemantj/search.png'
-import icontip from '../../../assets/icons/housemantj/tip.png'
-import location from '../../../assets/icons/housemantj/location.png'
-import msImage from '../../../assets/icons/housemantj/ms.jpg'
-import mjImage from '../../../assets/icons/housemantj/mj.jpg'
-import glImage from '../../../assets/icons/housemantj/gl.jpg'
-import msTip from '../../../assets/icons/housemantj/foodtip.png'
-import mjTip from '../../../assets/icons/housemantj/mjtip.png'
-import glTip from '../../../assets/icons/housemantj/gltip.png'
-import onlove from '../../../assets/icons/housemantj/onlove.png'
+import iconsearch from '@/assets/icons/housemantj/search.png'
+import icontip from '@/assets/icons/housemantj/tip.png'
+import location from '@/assets/icons/housemantj/location.png'
+import msImage from '@/assets/icons/housemantj/ms.jpg'
+import mjImage from '@/assets/icons/housemantj/mj.jpg'
+import glImage from '@/assets/icons/housemantj/gl.jpg'
+import msTip from '@/assets/icons/housemantj/foodtip.png'
+import mjTip from '@/assets/icons/housemantj/mjtip.png'
+import glTip from '@/assets/icons/housemantj/gltip.png'
+import onlove from '@/assets/icons/housemantj/onlove.png'
 import Taro,{useRouter } from '@tarojs/taro'
+import { getIndexType, getIndexRecommender } from '@/services/home'
 
+import './less/Recommend.less'
 
 
 export default (props) => {
   const [activeTab, setActiveTab] = useState(0)
   const { params } = useRouter()
   const { tabJump } = params || {}
+  const [typeList, setTypeList] = useState([])
+  const [list, setList] = useState([])
+
+  const tabs = [{ title: '附近' }].concat(typeList.map(x => ({...x, title: x.typeName })))
+
+  useEffect(() => {
+    getIndexType({ pageSize: 20 }).then((res) => {
+      setTypeList(res.records || [])
+    })
+
+    getIndexRecommender().then((res) => {
+      setList(res.records || [])
+    })
+  }, [])
+
   useEffect(() => {
     if (tabJump) {
       setActiveTab(tabJump - 0)
@@ -27,26 +43,29 @@ export default (props) => {
 
   }, [tabJump])
 
-  const tabs = [
-    {
-      title: '附近',
-    },
-    {
-      title: '全城',
+  // const tabs = [
+  //   {
+  //     title: '附近',
+  //   },
+  //   {
+  //     title: '全城',
 
-    },
-    {
-      title: '夫子庙',
+  //   },
+  //   {
+  //     title: '夫子庙',
 
-    },
-    {
-      title: '新街口',
+  //   },
+  //   {
+  //     title: '新街口',
 
-    },    
-  ]
+  //   },    
+  // ]
   const handleTabChange = (e) => {
     const { index } = e.detail
     setActiveTab(index)
+
+    const tab = tabs[index].typeId
+    // getIndexRecommender().then()
   }
 
 
@@ -107,6 +126,12 @@ export default (props) => {
       </view>
       <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
         <view className="waterfall">
+          {/* {
+            list.map()
+
+          } */}
+
+
           {activeTab === 0 &&
             <>
               <view className='contentCard' onClick={toDetails2}>

src/pages/searchResult/searchResult.less

@@ -134,5 +134,4 @@
     text-align: center;
     border-bottom: 6px solid #4C4C4C;
   }
-}
-
+}

src/services/home.js

@@ -0,0 +1,15 @@
+import request from '@/utils/request'
+
+/**
+ * 获取推荐列表
+ * @param {*} params 
+ * @returns 
+ */
+export const getIndexRecommender = (params) => request('/index/recommender', { params })
+
+/**
+ * 获取分类
+ * @returns 
+ */
+export const getIndexType = (params) => request('/tdType', { params })
+

src/services/person.js

@@ -0,0 +1,3 @@
+import request from '@/utils/request'
+
+export const login = (params) => request('/login', { params })

src/store/index.js

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

src/store/models/person.js

@@ -0,0 +1,15 @@
+import { useState } from "react"
+import { login } from '@/services/person'
+
+export default () => {
+  const [person, setPerson] = useState({ personId: 123 })
+
+  const personLogin = (params) => {
+    console.log('-------personLogin---->', params)
+    login(params).then((res) => {
+      setPerson(res)
+    })
+  }
+
+  return [person, personLogin]
+}

src/utils/request.js

@@ -0,0 +1,87 @@
+
+import Taro from '@tarojs/taro'
+
+const logger = Taro.getRealtimeLogManager()
+
+const object2QueryString = (params) => {
+  if (!params) return ;
+
+  const keys = Object.keys(params)
+  const arr = keys.map((key) => {
+    const val = params[key]
+    return `${key}=${encodeURIComponent(val)}`
+  })
+
+  return arr.join('&')
+}
+
+export default (url, options) => {
+  const { params, skipError, header, ...leftOptions } = options || {}
+  const queryStr = object2QueryString(params)
+
+  const urlWithParams = queryStr ? `${url}?${queryStr}` : url;
+  const nwUrl = `${HOST}/api/wx${urlWithParams}`
+
+  const token = Taro.getStorageSync('token')
+  const tokenHeader = token ? { 'X-Authorization-JWT': token } : {}
+  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 {
+          console.error(res)
+
+          logger.error(nwUrl)
+          logger.error(options)
+          logger.error(res)
+
+          if (!skipError) {
+            Taro.showToast({
+              title: message,
+              icon: 'none',
+            })
+          }
+
+          reject(message.indexOf('java') > -1 ? '系统内部错误' : message)
+        }
+      },
+    
+      fail: (err) => {
+        console.error(err)
+
+        logger.error('网络错误')
+        logger.error(nwUrl)
+        logger.error(options)
+        logger.error(err)
+
+        const message = err.message || err.errMsg || err
+
+        if (!skipError) {
+          Taro.showToast({
+            title: message,
+            icon: 'none',
+          })
+        }
+
+        reject(message)
+      }
+    })
+  })
+
+
+}