Merge branch 'develop' of git.server:wangxuelai/wechatapp.shangjiadao.com into lvtz_home

src/pages/calendarthemeindex/index.wxml

@@ -242,7 +242,7 @@
             wx:if="{{activeDay.isRise}}"></view>
         <view class="greyblock"  wx:if="{{!activeDay.isRise}}"></view>
         <view class="sign-content"  wx:if="{{!activeDay.isRise}}">
-            <view class="website-card" bindtap="goWebsiteIndex">
+            <view class="website-card" bindtap="goWebsiteIndex" wx:if="{{websiteData}}">
                 <view class="website-info">
                     <view class="title">{{websiteData.title}}</view>
                     <view class="count">

src/pages/calendarthemeindex/index.wxss

@@ -333,7 +333,6 @@ page {
     display: -webkit-flex;
     justify-content: flex-start;
     align-items: center;
-    padding-top: 50rpx;
     line-height: 1;
     background-color: #fff;
     padding-left: 24rpx;

src/pages/morethemeindex/index.wxml

@@ -167,7 +167,7 @@
             </view>
         </view>
         <view class="sign-content" >
-            <view class="website-card" bindtap="goWebsiteIndex">
+            <view class="website-card" bindtap="goWebsiteIndex" wx:if="{{websiteData}}">
                 <view class="website-info">
                     <view class="title">{{websiteData.title}}</view>
                     <view class="count">

src/pages/morethemeindex/index.wxss

@@ -380,7 +380,6 @@ page{
     display: -webkit-flex;
     justify-content: flex-start;
     align-items: center;
-    padding-top: 42rpx;
     line-height: 1;
     background-color: #fff;
     padding-left: 24rpx;
@@ -1441,7 +1440,7 @@ page{
     width:670rpx;
     background:rgba(255,238,210,1);
     border-radius:20rpx;
-    margin: 0 auto;
+    margin: 0 auto 50rpx;
     padding: 32rpx;
     display: flex;
     align-items: center;

src/pages/themeindex/index.wxss

@@ -341,7 +341,6 @@ page {
     display: -webkit-flex;
     justify-content: flex-start;
     align-items: center;
-    padding-top: 50rpx;
     line-height: 1;
     background-color: #fff;
     padding-left: 24rpx;
@@ -1086,7 +1085,7 @@ page {
     width: 670rpx;
     background: rgba(255, 238, 210, 1);
     border-radius: 20rpx;
-    margin: 0 auto;
+    margin: 0 auto 50rpx;
     padding: 32rpx;
     display: flex;
     align-items: center;