默认提交

@@ -58,7 +58,9 @@ function login() {
             code,
             code,
             content
             content
           } = res2.data;
           } = res2.data;
+          console.log("res2:",res2);
           if (code == 200 && content.sessionId) {
           if (code == 200 && content.sessionId) {
+            console.log("content:", content);
             Store.setItem('sessionId', content.sessionId);
             Store.setItem('sessionId', content.sessionId);
             Store.setItem('memberCode', content.memberCode);
             Store.setItem('memberCode', content.memberCode);
             resolve();
             resolve();

@@ -6,6 +6,9 @@ import {
 import Dialog from '../../ui/vant-weapp/dialog/dialog';
 import Dialog from '../../ui/vant-weapp/dialog/dialog';
 import Poster from '../../miniprogram_dist/poster/poster';
 import Poster from '../../miniprogram_dist/poster/poster';
 
 
+// import calendar from '../../utils/calendar.js';
+let calendar = require('../../utils/calendar.js');
+
 const innerAudio = wx.createInnerAudioContext();
 const innerAudio = wx.createInnerAudioContext();
 
 
 let app = getApp();
 let app = getApp();
@@ -45,12 +48,14 @@ Page({
     imageUrl: "", // 海报图
     imageUrl: "", // 海报图
     posterVisible: false,
     posterVisible: false,
     wxCodeUrl: "", // 微信小程序码
     wxCodeUrl: "", // 微信小程序码
+
+    lunarDate: "", //农历月日
   },
   },
   onShareAppMessage(res) {
   onShareAppMessage(res) {
     let {
     let {
       detailData,
       detailData,
       ownerMember,
       ownerMember,
-      isAuth
+      options
     } = this.data;
     } = this.data;
     let title = "亲爱的家人们新年快乐";
     let title = "亲爱的家人们新年快乐";
     let shareType = ""
     let shareType = ""
@@ -65,8 +70,13 @@ Page({
       } else {}
       } else {}
     } else {}
     } else {}
 
 
-    // 已经定制会提供房主的memberCode
-    let memberCode = detailData.customMade == 1 ? app.store.getItem("memberCode") : "";
+    // 权重 参数memberCode(房主memberCode) => 本人memberCode
+    let memberCode = "";
+    if (options.m) {
+      memberCode = options.m;
+    } else if (detailData.customMade == 1) {
+      memberCode = app.store.getItem("memberCode");
+    }
     let path = `pages/blessing/blessing?c=${detailData.blessCode}&m=${memberCode}&t=${shareType}`;
     let path = `pages/blessing/blessing?c=${detailData.blessCode}&m=${memberCode}&t=${shareType}`;
     console.log("share path:", path);
     console.log("share path:", path);
 
 
@@ -104,8 +114,13 @@ Page({
     this.pauseBgm();
     this.pauseBgm();
   },
   },
   onLoad(options) {
   onLoad(options) {
+
+    let date = new Date();
+    let lunar = calendar.calendar.solar2lunar(date.getFullYear(), date.getMonth() + 1, date.getDate());
+    let lunarDate = lunar.IMonthCn + lunar.IDayCn;
     this.setData({
     this.setData({
-      options
+      options,
+      lunarDate
     });
     });
     checkAuth().then((result) => {
     checkAuth().then((result) => {
       this.setData({
       this.setData({
@@ -171,15 +186,18 @@ Page({
       detailData
       detailData
     } = this.data;
     } = this.data;
 
 
-    innerAudio.src = detailData.musicUrl;
-    innerAudio.seek(0);
-    innerAudio.play();
-    innerAudio.onEnded(() => {
-      _this.playBgm();
-    })
-    this.setData({
-      isPlayingBgm: true,
-    })
+    if (detailData.musicUrl) {
+      innerAudio.src = detailData.musicUrl;
+      innerAudio.seek(0);
+      innerAudio.play();
+      innerAudio.onEnded(() => {
+        _this.playBgm();
+      })
+      this.setData({
+        isPlayingBgm: true,
+      })
+    }
+
   },
   },
 
 
   pauseBgm() {
   pauseBgm() {
@@ -481,7 +499,7 @@ Page({
           height: 92,
           height: 92,
           borderRadius: 92,
           borderRadius: 92,
           zIndex: 101,
           zIndex: 101,
-          url: avatar,
+          url: element.memberHead,
         })
         })
         texts.push({
         texts.push({
           x: endX - (idx * wid),
           x: endX - (idx * wid),
@@ -806,6 +824,7 @@ Page({
       })
       })
       this.queryBlessDetail().then((result) => {
       this.queryBlessDetail().then((result) => {
         wx.showModal({
         wx.showModal({
+          showCancel: false,
           content: '加入成功',
           content: '加入成功',
           success(res) {}
           success(res) {}
         })
         })

@@ -202,10 +202,10 @@ $blessContentLabelWidth: 650px;
               width: 145px;
               width: 145px;
               height: 145px;
               height: 145px;
               border-radius: 145px;
               border-radius: 145px;
-              border-image-slice: 1;
-              border-width: 4px;
-              border-image-source: linear-gradient(to top, #f4b44d, #e8b976, #ffebb5);
+              // 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);
+              border: solid 4px #e8b976;
             }
             }
 
 
             &-name {
             &-name {

@@ -10,7 +10,7 @@
     <!-- <view class="top-bg"></view> -->
     <!-- <view class="top-bg"></view> -->
     <view class="top-space"></view>
     <view class="top-space"></view>
     <view class="content">
     <view class="content">
-      <view class="title">{{detailData.lunarCalendar}}</view>
+      <view class="title">{{lunarDate}}</view>
       <!-- 用户 -->
       <!-- 用户 -->
       <view class="user">
       <view class="user">
         <!-- 用户头像 -->
         <!-- 用户头像 -->