Merge branch 'master' of http://git.ycjcjy.com/whole-estate/wxmini

pages/components/SubIndex/index.wxml

@@ -78,8 +78,18 @@
   <view class="mapList">
     <view class="flex-h">
       <view class="flex-item">
-        <text>银城颐居悦见山</text>
-        <text>均价：<text>￥18000</text>元/m²</text>
+        <!-- <text>银城颐居悦见山</text>
+        <text>均价：<text>￥18000</text>元/m²</text> -->
+        <swiper autoplay="{{true}}" style="height: 100rpx;" vertical="{{true}}">
+          <block wx:for="{{['','','']}}" wx:for-item="item" wx:for-index="index" wx:key="key">
+            <swiper-item>
+              <view class="swiper-item">
+                <text>银城颐居悦见山</text>
+                <text>均价：<text>￥18000</text>元/m²</text>
+              </view>
+            </swiper-item>
+          </block>
+        </swiper>
       </view>
       <view>
         <image mode="widthFix" src="/assets/images/icon7.png"></image>

pages/components/SubIndex/index.wxss

@@ -112,27 +112,28 @@
   background: #eee;
 }
 
-.mapList > view > view.flex-item > text {
+.mapList > view > view.flex-item text {
   width: 100%;
   display: block;
   white-space: nowrap;
 }
 
-.mapList > view > view.flex-item > text:nth-child(1) {
+.mapList > view > view.flex-item text:nth-child(1) {
   font-size: 32rpx;
   line-height: 52rpx;
   font-weight: bold;
 }
 
-.mapList > view > view.flex-item > text:nth-child(2) {
+.mapList > view > view.flex-item text:nth-child(2) {
   font-size: 22rpx;
   line-height: 46rpx;
 }
 
-.mapList > view > view.flex-item > text text {
+.mapList > view > view.flex-item text text {
   font-size: 26rpx;
   font-weight: bold;
   color: #e23838;
+  display: inline-block;
 }
 
 .mapList > view > view:nth-child(2) {

pages/index/index.js

@@ -10,7 +10,7 @@ create(store, {
     })
   },
   data: {
-    ShowLayer: true,
+    ShowLayer: false,
     NavList: [{ // navlist数据
       value: '首页',
       icon: '/assets/images/icon1.png'

pages/index/index.wxss

@@ -83,16 +83,19 @@
 
 .layer > view {
   width: 65%;
-  padding: 10rpx 0;
   background: #fff;
   border-radius: 20rpx;
   box-shadow: 0 0 20rpx 10rpx rgba(0, 0, 0, 0.05);
 }
 
 .layer .top {
+  width: 100%;
   text-align: right;
-  position: relative;
+  position: absolute;
+  left: 0;
+  top: 10rpx;
   overflow: hidden;
+  z-index: 1002;
 }
 
 .layer .top image {
@@ -103,8 +106,8 @@
 }
 
 .layer .content {
-  padding: 0 20rpx;
   position: relative;
   overflow: hidden;
-  margin: 10rpx auto 0;
+  margin: 0 auto;
+  z-index: 1001;
 }