默认提交

@@ -996,8 +996,6 @@ Page({
       name,
       name,
       data
       data
     } = evt.detail;
     } = evt.detail;
-    console.log("evt:", evt);
-    console.log("data:", data);
     if (data && data.evttype && data.evttype == "join") {
     if (data && data.evttype && data.evttype == "join") {
       console.log("55555");
       console.log("55555");
     }
     }

@@ -348,10 +348,9 @@ $blessContentLabelWidth: 650px;
           .more-template {
           .more-template {
             font-size: 36px;
             font-size: 36px;
             color: #dfa244;
             color: #dfa244;
-            text-align: right;
-            margin-right: 40px;
-            margin-top: 24px;
-
+            // text-align: right;
+            // margin-right: 40px;
+            // margin-top: 48px;
 
 
             .t1 {
             .t1 {
               text-decoration: underline;
               text-decoration: underline;
@@ -360,11 +359,12 @@ $blessContentLabelWidth: 650px;
 
 
           &-item {
           &-item {
             display: flex;
             display: flex;
-            justify-content: flex-end;
+            justify-content: center;
 
 
             .btn {
             .btn {
               @extend .bb;
               @extend .bb;
-              margin: 24px 45px 8px 0;
+              margin: 32px auto;
+              width: 480px;
               height: 76px;
               height: 76px;
               line-height: 76px;
               line-height: 76px;
               padding: 0 20px;
               padding: 0 20px;

@@ -123,6 +123,8 @@
       <!-- 分情况显示btn-wrap -->
       <!-- 分情况显示btn-wrap -->
       <!-- 单人 -->
       <!-- 单人 -->
       <block wx:if="{{detailData.type == 0}}">
       <block wx:if="{{detailData.type == 0}}">
+        <!-- 自己 -->
+        <block wx:if="{{ownerMember.mySelf == 1}}">
           <!-- 未定制 -->
           <!-- 未定制 -->
           <view wx:if="{{detailData.customMade == 0}}" class="btn-wrap">
           <view wx:if="{{detailData.customMade == 0}}" class="btn-wrap">
             <button bindtap="onPosterHandler" class="btn btn1">分享图片祝福</button>
             <button bindtap="onPosterHandler" class="btn btn1">分享图片祝福</button>
@@ -137,6 +139,11 @@
             <button open-type="share" class="btn btn2">送祝福给亲友</button>
             <button open-type="share" class="btn btn2">送祝福给亲友</button>
           </view>
           </view>
         </block>
         </block>
+        <block wx:else>
+          <view bindtap="onBlessMakeHandler" class="btn btn2">定制我的祝福</view>
+          <button open-type="share" class="btn btn2">送祝福给亲友</button>
+        </block>
+      </block>
       <!-- 组队 -->
       <!-- 组队 -->
       <block wx:if="{{detailData.type == 1}}">
       <block wx:if="{{detailData.type == 1}}">
         <!-- 未定制 -->
         <!-- 未定制 -->

@@ -18,8 +18,7 @@ Page({
     queueCode: "", // 队列标识，每次请求，会返回一个队列标识，用户加载更多时候请携带queueCode参数
     queueCode: "", // 队列标识，每次请求，会返回一个队列标识，用户加载更多时候请携带queueCode参数
     active: 0,
     active: 0,
     curBanner: {},
     curBanner: {},
-    blessContent: [
-      {
+    blessContent: [{
         type: "text",
         type: "text",
         content: "文本内容",
         content: "文本内容",
         color: "0xffffff",
         color: "0xffffff",
@@ -29,7 +28,8 @@ Page({
         type: "image",
         type: "image",
         content: "url",
         content: "url",
       },
       },
-    ]
+    ],
+    options: {}
   },
   },
   onShareAppMessage(res) {
   onShareAppMessage(res) {
     if (res.from === 'button') {
     if (res.from === 'button') {
@@ -49,13 +49,34 @@ Page({
     })
     })
   },
   },
   onLoad(options) {
   onLoad(options) {
+    this.setData({
+      options
+    })
     this.initData();
     this.initData();
   },
   },
   initData() {
   initData() {
     this.queryTabList().then((result) => {
     this.queryTabList().then((result) => {
+      let {
+        options,
+        tabList
+      } = this.data;
+      if (options.t == "bless") {
+        let tabIndex = 0;
+        tabList.forEach((element, idx) => {
+          if (element.type == 2) {
+            tabIndex = idx;
+          }
+        });
         this.setData({
         this.setData({
-        curTab: this.data.tabList[0]
+          curTab: tabList[tabIndex],
+          active: tabIndex
         })
         })
+      } else {
+        this.setData({
+          curTab: tabList[0]
+        })
+      }
+
       this.resetPage();
       this.resetPage();
       this.queryBannerList();
       this.queryBannerList();
       this.queryVideoList();
       this.queryVideoList();