默认提交

@@ -52,7 +52,7 @@ Page({
       ownerMember,
       isAuth
     } = this.data;
-    let title = `${ownerMember.memberName}邀请您组队发祝福！体验今年最火爆的拜年方式`;
+    let title = "亲爱的家人们新年快乐";
     let shareType = ""
     // let imageUrl = detailData && detailData.thumbnail || "";
     if (res.from === 'button') {
@@ -60,7 +60,9 @@ Page({
       // shareType == join 分享给家人,能加入 组队模式
       shareType = res.target.dataset.data || "";
       console.log("shareType:", shareType);
-      title
+      if (shareType) {
+        title = `${ownerMember.memberName}邀请您组队发祝福！体验今年最火爆的拜年方式`
+      } else {}
     } else {}
 
     // 已经定制会提供房主的memberCode
@@ -69,7 +71,7 @@ Page({
     console.log("share path:", path);
 
     return {
-      // title,
+      title,
       path,
       // imageUrl
     }
@@ -202,6 +204,13 @@ Page({
     })
   },
 
+  onHideMoreHandler() {
+    this.setData({
+      isMore: false
+    })
+  },
+
+
   showTips(evt) {
     let tips = getBindtapData(evt);
     wx.showModal({
@@ -710,7 +719,7 @@ Page({
         } catch (error) {}
         let memberList = result.memberList;
         // hardcode数据
-        // for (let index = 0; index < 4; index++) {
+        // for (let index = 0; index < 6; index++) {
         //   memberList.push({
         //     blessCode: "4144feba2b904ba89585d90e8618a863",
         //     blessMemberCode: "747e8e314d0e46679be17fb495975439",

@@ -96,7 +96,7 @@ $blessContentLabelWidth: 650px;
 }
 
 .page {
-  padding-bottom: 200px;
+  // padding-bottom: 200px;
 
   .bgc {}
 
@@ -183,15 +183,16 @@ $blessContentLabelWidth: 650px;
         .group {
           width: 660px;
           display: flex;
-          justify-content: flex-start;
+          // justify-content: flex-start;
+          justify-content: center;
           flex-wrap: wrap;
           margin: 36px auto 0;
-          height: 450px;
+          // height: 450px;
           overflow: hidden;
 
           //
           &-item {
-            align-self: flex-start;
+            // align-self: flex-start;
             width: 33.33%;
             text-align: center;
             margin-bottom: 32px;
@@ -204,7 +205,7 @@ $blessContentLabelWidth: 650px;
               border-image-slice: 1;
               border-width: 4px;
               border-image-source: linear-gradient(to top, #f4b44d, #e8b976, #ffebb5);
-              background-image: linear-gradient(to top, #f4b44d, #e8b976, #ffebb5);
+              // background-image: linear-gradient(to top, #f4b44d, #e8b976, #ffebb5);
             }
 
             &-name {
@@ -237,15 +238,12 @@ $blessContentLabelWidth: 650px;
           }
         }
 
-        .fc {
-          display: flex;
-          justify-content: center;
+        .six {
+          height: 458px;
         }
 
-
         .all {
           height: auto;
-          // overflow: auto;
           overflow: visible;
         }
 
@@ -256,7 +254,7 @@ $blessContentLabelWidth: 650px;
           font-weight: 500;
           text-align: center;
           color: #e16e6e;
-          padding-top: 32px;
+          margin-top: 24px;
 
           .icon-down {
             width: 32px;
@@ -265,6 +263,10 @@ $blessContentLabelWidth: 650px;
           }
         }
 
+        .more2{
+          margin-top: 0;
+        }
+
         // 句子
         .sentence {
           margin: 64px auto 0;
@@ -350,9 +352,13 @@ $blessContentLabelWidth: 650px;
         }
 
         &-image-bot {
+          margin: 48px auto 0;
+          width: 750px;
+          display: block;
+        }
 
-          margin: 48px auto;
-          width: $blessContentWidth;
+        &-bot-space {
+          min-height: 156px;
         }
 
       }

@@ -3,7 +3,7 @@
   <view class="app__bgc bgc" style="background-color: {{detailData.background}};"></view>
   <!-- <view class="app__bg bg " style="background: url('{{detailData.backgroundImage}}')"></view> -->
   <image mode="scaleToFill" class="ebg" src="{{detailData.backgroundImage}}" />
-  <image mode="aspectF" class="ebg" src="{{detailData.backgroundGif}}" />
+  <image mode="aspectFill" class="ebg" src="{{detailData.backgroundGif}}" />
   <view class="app__content main">
     <!-- 顶部背景 -->
     <image class="top-bg" mode="widthFix" src="{{detailData.headImage}}" />
@@ -30,7 +30,7 @@
           <view class="tt t2">{{detailData.count}}人</view>
         </view>
         <!-- 用户组 -->
-        <view wx:if="{{detailData.type == 1}}" class="group {{isMore ? 'all' : ''}}  {{memberList.length < 1 ? 'fc':''}}">
+        <view wx:if="{{detailData.type == 1}}" class="group {{isMore ? 'all' : ''}}  {{memberList.length >= 6 && !isMore ? 'six':''}}">
           <view wx:for="{{memberList}}" wx:key="{{index}}" class="group-item">
             <image class="group-item-portrait" mode="scaleToFill" src="{{item.memberHead}}" />
             <view class="group-item-name">
@@ -53,6 +53,10 @@
           查看更多
           <image class="icon-down" mode="widthFix" src="../../image/blessing/icon-down-arrow.png" />
         </view>
+        <view bindtap="onHideMoreHandler" wx:if="{{memberList.length >= 6 && isMore}}" class="more more2">
+          收起
+          <image class="icon-down" mode="widthFix" src="../../image/blessing/icon-up-arrow.png" />
+        </view>
         <!-- 自定义句子 -->
         <view class="sentence">{{detailData.blessTitle}}</view>
       </view>
@@ -93,13 +97,12 @@
           </view>
         </view>
         <!-- 尾图 -->
-        <image class="tail-image-bot" mode="scaleToFill" src="{{detailData.tailImage}}" />
+        <image wx:if="{{detailData.tailImage}}" class="tail-image-bot" mode="widthFix" src="{{detailData.tailImage}}" />
+        <view wx:else class="tail-bot-space"></view>
       </view>
     </view>
     <!-- fix底部 -->
     <view class="bottom">
-      <!-- <image class="bottom-bg" mode="scaleToFill" src="{{detailData.tailImage}}" /> -->
-      <!-- <image class="bottom-bg" mode="widthFix" src="{{detailData.tailImage}}" /> -->
       <!-- 分情况显示btn-wrap -->
       <!-- 单人 -->
       <block wx:if="{{detailData.type == 0}}">

@@ -30,7 +30,7 @@
             <image class="poster" src="{{item.thumbnail}}" />
             <view class="desc-wrap">
               <view class="tit">{{item.blessTitle}}</view>
-              <view class="scene">{{item.type == 0 ? '单人祝福 >> 送' : '单团队祝福 >> 送'}}{{item.scene}}</view>
+              <view class="scene">{{item.type == 0 ? '单人祝福 >> 送' : '团队祝福 >> 送'}}{{item.scene}}</view>
             </view>
           </view>
         </block>