静态页面

src/components/ListView/index.js

@@ -1,7 +1,7 @@
 import Taro, { Component } from '@tarojs/taro';
 import { ScrollView, View, Image } from '@tarojs/components';
 import { throttle } from '@/utils/tools'
-import emptyImg from '@/assets/empty.png'
+import emptyImg from '@/assets/img/nodata.png'
 import './index.scss'
 
 /**

src/pages/dichan/index.js

@@ -80,7 +80,12 @@ export default class Index extends Component {
                     <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')} />
+                    {
+                      Org !== null ?
+                        <Image mode='widthFix' className='Logo' src={Org.waterMark} />
+                        :
+                        <Image mode='widthFix' className='Logo' src={require('@/assets/img/logo.png')} />
+                    }
                     <View className='centerLabel'>
                       <View>
                         <Text>{item.buildingArea}</Text>

src/pages/index/index.js

@@ -15,6 +15,7 @@ import { share as shareSavePoint } from '@/utils/shareSavePoint'
 import { transferImage } from '@/utils/tools'
 import ShopItem from '../league/item'
 import BannerTwo from '../project/swiper'
+import { View } from '@tarojs/components';
 
 @connect(
   state => ({ ...state.project, ...state.city, ...state.user, system: state.system }),
@@ -448,25 +449,6 @@ export default class Index extends Component {
             }
           </View>
 
-          {
-            this.state.visPropagandaBanner && propagandaBanner.length > 0 &&
-            <View
-              style={{
-                position: 'relative', padding: '20px 0 0 0'
-              }}>
-              <BannerTwo
-                style={{
-                  borderRadius: '6px',
-                  height: '172rpx'
-                }}
-                // forwardShow={true}
-                indicatorDots={false}
-                list={propagandaBanner}
-                onClick={this.handlePropagandaClick}>
-              </BannerTwo>
-            </View>
-          }
-
         </View>
 
         {/* 热门活动推荐 */}
@@ -475,7 +457,19 @@ export default class Index extends Component {
           <View className='ActivityRecommed'>
             <Text className='Title'>热门活动推荐</Text>
             <View>
-              <Image mode='widthFix' className='centerLabel' src={transferImage(helpGroupList[0].bannerListImg)} onClick={this.handleItemClick.bind(this, item)} />
+              <View>
+                <Swiper className='Swiper' indicatorColor='rgba(0,0,0,0.4)' indicatorActiveColor='#fff' circular indicatorDots autoplay>
+                  {
+                    propagandaBanner.length &&
+                    propagandaBanner.map((item, index) => (
+                      <SwiperItem key={`Swiper-${index}`} onClick={this.handleBannerClick.bind(this, item)}>
+                        <Image mode='widthFix' className='centerLabel' src={item.image} />
+                      </SwiperItem>
+                    ))
+                  }
+                </Swiper>
+              </View>
+              {/* <Image mode='widthFix' className='centerLabel' src={transferImage(helpGroupList[0].bannerListImg)} onClick={this.handleItemClick.bind(this, item)} /> */}
             </View>
           </View>
         }

src/pages/index/index.scss

@@ -114,9 +114,20 @@
       background: #eee;
       border-radius: 24px;
       margin-top: 20px;
-      > image {
-        min-width: 100%;
-        min-height: 100%;
+      > view {
+        width: 100%;
+        position: absolute;
+        left: 0;
+        top: 0;
+        bottom: 0;
+        > .Swiper {
+          width: 100%;
+          height: 100%;
+          image {
+            width: 100%;
+            height: 100%;
+          }
+        }
       }
     }
   }
@@ -222,7 +233,7 @@
               position: relative;
               overflow: hidden;
             }
-            > text.Label  {
+            > text.Label {
               font-size: 20px;
               font-weight: normal;
               width: 30px;

src/pages/project/detail/index.js

@@ -859,11 +859,11 @@ export default class Index extends Component {
           }
 
         </View>
-        <View className='bt-nav__item  bt-nav__right' style='border-color: #1BC5D4;' onClick={this.ChatOnlineClick}>
+        <View className='NewBottomBtn' style='border-color: #1BC5D4;margin-left: 20px;' onClick={this.ChatOnlineClick}>
           <Image src={require('@/assets/img/icon14.png')} mode='widthFix' className='BtnIcon1'></Image>
           <Text className="text" style='color: #1BC5D4;'>在线聊</Text>
         </View>
-        <View className='bt-nav__item  bt-nav__right bt-nav__right2' style='border-color: #1DD100;' onClick={this.callPhone}>
+        <View className='NewBottomBtn' style='border-color: #1DD100;' onClick={this.callPhone}>
           <Image src={require('@/assets/img/icon13.png')} mode='widthFix' className='BtnIcon2'></Image>
           <Text className="text" style='color: #1DD100;'>打电话</Text>
         </View>

src/pages/project/detail/index.scss

@@ -250,7 +250,7 @@
     margin: 0;
     padding: 0;
     line-height: 1;
-    width: 50%;
+    // width: 50%;
     box-sizing: border-box;
     background: transparent;
     border-radius: none;
@@ -260,6 +260,9 @@
     justify-content: center;
     align-items: center;
     // border-right: solid 1px rgba(0, 0, 0, 0.1);
+    &:first-child {
+      margin-left: 20px;
+    }
 
     .iconfont {
       font-size: 42px;
@@ -286,6 +289,7 @@
       text-align: center;
       font-size: 30px;
       color: #333;
+      white-space: nowrap;
     }
 
     .icon-xiazai {
@@ -1115,3 +1119,25 @@
   background: rgba(216, 216, 216, 1);
   border-radius: 12px;
 }
+
+.NewBottomBtn {
+  font-size: 0;
+  white-space: nowrap;
+  padding: 0 20px;
+  border-radius: 8px;
+  border: 2px solid #333;
+  margin-right: 20px;
+  > image {
+    width: 32px;
+    height: auto;
+    display: inline-block;
+    vertical-align: middle;
+    margin-right: 10px;
+  }
+  > text {
+    display: inline-block;
+    font-size: 30px;
+    line-height: 80px;
+    vertical-align: middle;
+  }
+}