Merge branch 'main' of http://git.ycjcjy.com/marketing/miniapp into main

src/pages/index/brandDetail/index.jsx

@@ -12,7 +12,7 @@ import ColumnTitle from '../components/ColumnTitle/index'
 import './index.scss'
 
 export default withLayout((props) => {
-  const { router } = props
+  const { router, city } = props
   const { id } = router.params
   
   const [PageList, setPageList] = useState([])
@@ -31,7 +31,7 @@ export default withLayout((props) => {
 
   const GetPageList = () => {
     setHasNextPage(false)
-    fetch({ url: API_ITEMS_LIST, method: 'get', payload: { pageNumber, pageSize: 10, brandId: id } }).then((res) => {
+    fetch({ url: API_ITEMS_LIST, method: 'get', payload: { pageNumber, pageSize: 10, brandId: id, cityId: city.id } }).then((res) => {
       setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
       setHasNextPage(res.current < res.pages)
       setPull(false)

src/pages/index/buildingList/index.scss

@@ -1,5 +1,8 @@
 .Page.buildingList {
   background: #fff;
+  width: 100%;
+  position: relative;
+  overflow: hidden;
   > .Search {
     padding: 0 50px;
     position: relative;

src/pages/mine/customerDetail/index.jsx

@@ -112,7 +112,7 @@ export default withLayout((props) => {
             <view className='centerLabel'>
               <view className='flex-h'>
                 <view className='Icon'>
-                  <Image mode='aspectFill' src={getImgURL(custBaseInfo.avatarurl)}></Image>
+                  <Image mode='aspectFill' src={getImgURL(custBaseInfo.avatarurl || custBaseInfo.picture)}></Image>
                 </view>
                 <view className='flex-item'>
                   <view>

src/subpackages/pages/consultant/components/StatCustomerListItem/index.jsx

@@ -10,7 +10,7 @@ export default function StatCustomerListItem (props) {
   return (
     <view className='components StatCustomerListItem flex-h'>
       <view className='Icon' onClick={() => { Taro.navigateTo({ url: `/pages/mine/customerDetail/index?id=${data.customerId}&name=${data.name}&sex=${data.sex}&phone=${data.phone}&avatarurl=${data.avatarurl}&status=${data.status}` }) }}>
-        <Image mode='scaleToFill' src={data.avatarurl}></Image>
+        <Image mode='scaleToFill' src={data.avatarurl || data.picture}></Image>
       </view>
       <view className='flex-item' onClick={() => { Taro.navigateTo({ url: `/pages/mine/customerDetail/index?id=${data.customerId}&name=${data.name}&sex=${data.sex}&phone=${data.phone}&avatarurl=${data.avatarurl}&status=${data.status}` }) }}>
         <view>