Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into dev

src/onlineSelling/components/GrantProfile/index.js

@@ -2,11 +2,14 @@ import { useState } from '@tarojs/taro'
 import { Block } from "@tarojs/components"
 import AchievePhone from '@/components/achievePhone'
 import AchieveAvatar from '@/components/achieveAvatar'
+import { isEmpty } from '@/utils/tools'
 
 function noop(){}
 
 export default function GrantProfile(props) {
-  const { tel, phone, avatarurl } = props.person || {}
+  if (isEmpty(props.person)) return <Block />;
+
+  const { tel, phone, avatarurl } = props.person
 
   const noPhone = !(tel || phone)
   const noAvatar = !avatarurl || avatarurl.indexOf('wx.qlogo.cn') === -1

src/pages/project/map/index.js

@@ -87,7 +87,7 @@ export default class Index extends Component {
     const that = this;
     const { curCity } = this.props
     const { filterOpt } = this.state
-    const payload = Object.assign({ pageSize: 10, pageNumber }, filterOpt)
+    const payload = Object.assign({ pageSize: 999, pageNumber }, filterOpt)
     if (curCity.id) {
       payload.cityId = curCity.id
       that.setState({

src/utils/tools.js

@@ -1,8 +1,6 @@
 import Taro from '@tarojs/taro';
 import store from '../store'
 
-console.log('----------store', store.getState())
-
 /**
  * 是否为空
  * @param {*} o