静态页面

src/constants/api.js

@@ -241,3 +241,4 @@ export const API_TEMPLATE_TYPE = resolvePath('template/of/')
 export const API_STORE_LIST = resolvePath('shop')
 export const API_STORE_TYPE_LIST = resolvePath('shop-type')
 export const API_STORE_DETAIL = resolvePath('shop')
+export const API_STORE_BANNER = resolvePath('shop-banner')

src/pages/dichan/index.js

@@ -6,7 +6,7 @@ import ready from '@/utils/ready'
 import { connect } from '@tarojs/redux'
 
 @connect(
-  state => ({ ...state.userInfo })
+  state => ({ ...state.user, ...state.city })
 )
 export default class Index extends Component {
   config = {
@@ -15,11 +15,14 @@ export default class Index extends Component {
   state = {
     PageList: [{}, {}, {}, {}, {}],
     filterOpt: {},
-    pageIndex: 1
+    pageIndex: 1,
+    Org: null
   }
   componentWillMount () {
     ready.queue(async () => {
-      console.log(userInfo, `-----------------------11111111111111111111111`)
+      this.setState({
+        Org: this.props.userInfo.person.org || null
+      })
       const { records: list } = await this.loadList(1, 10)
       this.setState({
         PageList: list
@@ -43,12 +46,21 @@ export default class Index extends Component {
 
         {/* 顶部背景图 */}
         <View className='TopContainer'>
-          <Image mode='widthFix' className='Bg' src={require('@/assets/img/topbg1.jpg')} />
+          {
+            Org !== null ?
+              <Image mode='widthFix' className='Bg' src={Org.thumb} />
+              :
+              <Image mode='widthFix' className='Bg' src={require('@/assets/img/topbg1.jpg')} />
+          }
           <View className='Text'>
             <View>
-              <View><Text>“同理心”</Text>是雅居乐待人处事的第一原则，我们尊重每个人的需求和期望。</View>
+              {/* <View><Text>“同理心”</Text>是雅居乐待人处事的第一原则，我们尊重每个人的需求和期望。</View>
               <View>不论是地产发展、物业服务，亦或其它产业，我们都本着将心比心的态度，务求从细微处了解每个人的需求，一点一滴改善生活的每 个细节。</View>
-              <View>我们相信，这份坚持将为员工、客户和投资者带来永续的回报价值，成就更多自由自在、高枕无忧的快乐人生。</View>
+              <View>我们相信，这份坚持将为员工、客户和投资者带来永续的回报价值，成就更多自由自在、高枕无忧的快乐人生。</View> */}
+              {
+                Org !== null &&
+                <RichText nodes={Org.orgDesc}></RichText>
+              }
             </View>
           </View>
         </View>
@@ -65,7 +77,7 @@ export default class Index extends Component {
               PageList.map((item, index) => (
                 <Navigator key={`List-${index}`} className='flex-h ListItem' url={`/pages/project/detail/index?id=${item.buildingId}`}>
                   <View className='Img'>
-                    <Image mode='widthFix' className='centerLabel' src={item.buildingListImg !==null && item.buildingListImg.length ? item.buildingListImg[0].url : 'https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/images/default.jpg'} />
+                    <Image mode='widthFix' className='centerLabel' src={item.buildingListImg !== null && item.buildingListImg.length ? item.buildingListImg[0].url : 'https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/images/default.jpg'} />
                   </View>
                   <View className='flex-item'>
                     <Image mode='widthFix' className='Logo' src={require('@/assets/img/logo.png')} />

src/pages/dichan/index.scss

@@ -9,10 +9,8 @@
   min-height: 100vh;
   > .TopContainer {
     width: 100%;
-    padding-bottom: 140%;
     position: relative;
     overflow: visible;
-    height: 0;
     > .Bg {
       width: 100%;
       display: block;

src/pages/league/index.js

@@ -1,7 +1,7 @@
 import { View } from '@tarojs/components'
 import { Component } from '@tarojs/taro'
 import './index.scss'
-import { GetShopList, GetShopTypeList } from '@/services/shop'
+import { GetShopList, GetShopTypeList, GetShopBanner } from '@/services/shop'
 import ready from '@/utils/ready'
 import ShopItem from './item'
 import { connect } from '@tarojs/redux'
@@ -17,13 +17,7 @@ export default class Index extends Component {
   }
   state = {
     TestImg: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1604566584132&di=33926cb8407ae341fa1d8cc0d322d392&imgtype=0&src=http%3A%2F%2Fattach.bbs.miui.com%2Fforum%2F201305%2F30%2F220025pxfkhykvkgkvuktq.jpg',
-    BannerData: [
-      { id: 1, img: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1604485078843&di=e50cb70de152bb6b83f7b1d712b509c8&imgtype=0&src=http%3A%2F%2Fattachments.gfan.com%2Fforum%2F201503%2F19%2F211608ztcq7higicydxhsy.jpg' },
-      { id: 2, img: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1604486077351&di=a5320b0e8f2dd45ccdee71f7e1a541d5&imgtype=0&src=http%3A%2F%2Fbenyouhuifile.it168.com%2Fforum%2F201304%2F06%2F11435052yrezzae1bua8ee.jpg' },
-      { id: 3, img: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1604486077351&di=ba0b2021b0dce8807b75bcd81cd44d32&imgtype=0&src=http%3A%2F%2Fbenyouhuifile.it168.com%2Fforum%2Fday_100429%2F1004291840008539c8ac02cd5c.jpg' },
-      { id: 4, img: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1604486077351&di=014ef8ce837f8762c1e982f093286f42&imgtype=0&src=http%3A%2F%2Fattach.bbs.miui.com%2Fforum%2F201306%2F23%2F110328s72xxse7lfis9fnd.jpg' },
-      { id: 5, img: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1604486077349&di=861dfd8adb91ede1c5f6de5abb59638b&imgtype=0&src=http%3A%2F%2Fattach.bbs.miui.com%2Fforum%2F201205%2F15%2F152011zser9o5oa9ee9xx6.jpg' }
-    ],
+    BannerData: [],
     isEmpty: false,
     SearchName: '',
     StoreList: [],
@@ -40,6 +34,11 @@ export default class Index extends Component {
       this.setState({
         CityData: city
       }, () => {
+        GetShopBanner({ pageNum: 1, pageSize: 10 }).then((res) => {
+          this.setState({
+            BannerData: res.records || []
+          })
+        })
         GetShopTypeList({ pageNum: 1, pageSize: 10 }).then((res) => {
           let Arr = res.records || []
           let aArr = []
@@ -160,15 +159,18 @@ export default class Index extends Component {
             <View className='Banner'>
               <View>
                 <View>
-                  <Swiper className='Swiper' indicatorColor='rgba(0,0,0,0.4)' indicatorActiveColor='#fff' circular indicatorDots autoplay>
-                    {
-                      BannerData.map((item, index) => (
-                        <SwiperItem key={`Swiper-${index}`}>
-                          <Image mode='widthFix' className='centerLabel' src={item.img} />
-                        </SwiperItem>
-                      ))
-                    }
-                  </Swiper>
+                  {
+                    BannerData.length &&
+                    <Swiper className='Swiper' indicatorColor='rgba(0,0,0,0.4)' indicatorActiveColor='#fff' circular indicatorDots autoplay>
+                      {
+                        BannerData.map((item, index) => (
+                          <SwiperItem key={`Swiper-${index}`}>
+                            <Image mode='widthFix' className='centerLabel' src={item.thumb} />
+                          </SwiperItem>
+                        ))
+                      }
+                    </Swiper>
+                  }
                 </View>
               </View>
             </View>

src/services/shop.js

@@ -2,7 +2,8 @@ import { fetch } from "@/utils/request";
 import {
   API_STORE_LIST,
   API_STORE_TYPE_LIST,
-  API_STORE_DETAIL
+  API_STORE_DETAIL,
+  API_STORE_BANNER
 } from "@/constants/api";
 
 /**
@@ -19,3 +20,6 @@ export const GetShopTypeList = payload =>
 export const GetShopDetail = payload =>
   fetch({ url: `${API_STORE_DETAIL}/${payload.id}`, method: 'get' });
 
+export const GetShopBanner = payload =>
+  fetch({ url: API_STORE_BANNER, payload, method: "GET" });
+

src/utils/login.js

@@ -38,8 +38,6 @@ export default function (payload, callback) {
         dispatch({ type: USER_INFO, payload: { extraInfo, person, miniApp } })
         const { city: { curCity } } = getState()
 
-        console.log(curCity, "curCity")
-
         if (!curCity || Object.keys(curCity).length == 0) {
           if (city) {
             dispatchCitySelected(city)(dispatch)