''

project.config.json

@@ -41,7 +41,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 99,
+			"current": 102,
 			"list": [
 				{
 					"id": 0,
@@ -758,10 +758,10 @@
 					"scene": null
 				},
 				{
-					"id": -1,
+					"id": 102,
 					"name": "主题页面",
-					"pathName": "src/pages/themeindex/index",
-					"query": "id=364&tid=4240",
+					"pathName": "src/pages/beforeinvitation/index",
+					"query": "tid=60&consumerId=111&d=190513",
 					"scene": null
 				}
 			]

src/pages/beforeinvitation/index.js

@@ -24,7 +24,8 @@ Page({
     bgsrc: '',
     loaded: false,
     themeDetail: {},
-    userInfo: {}
+    userInfo: {},
+    d: ''
   },
 
   /**
@@ -33,19 +34,22 @@ Page({
   onLoad: function (options) {
     if (options.scene) {
       let sceneQuery = scenQueryGet(options.scene);
-      const {i, ctd} = sceneQuery;
+      const {i, ctd, d} = sceneQuery;
       this.setData({
         tid: i,
-        consumerId: ctd
+        consumerId: ctd,
+        d: d || ''
       })
     } else {
       const {
         tid,
-        consumerId
+        consumerId,
+        d
       } = options;
       this.setData({
         tid,
-        consumerId
+        consumerId,
+        d: d || ''
       })
     }
     this.getThemeDetail();
@@ -149,7 +153,7 @@ Page({
   navigate () {
     if (this.data.auditStatus != 3) { // 游客的跳转
       wx.reLaunch({
-        url: `/src/pages/invitation/index?tid=${this.data.tid}&consumerId=${this.data.consumerId}`
+        url: `/src/pages/invitation/index?tid=${this.data.tid}&consumerId=${this.data.consumerId}&d=${this.data.d}`
       })
     } else { // 正常用户的跳转 跳转到邀请卡片页面
       this.goThemeIndex();
@@ -162,7 +166,7 @@ Page({
       })
     } else if (this.data.themeDetail.subject_type == 2) {
       wx.reLaunch({
-        url: `/src/pages/calendarthemeindex/index?id=${this.data.themeDetail.class_id}&tid=${this.data.tid}`
+        url: `/src/pages/calendarthemeindex/index?id=${this.data.themeDetail.class_id}&tid=${this.data.tid}&d=${this.data.d}`
       })
     }
   }

src/pages/calendarthemeindex/index.js

@@ -279,9 +279,14 @@ Page({
     let shareObj = {
 
     }
+    const _activeDay = this.data.activeDay;
+    const month = Number(_activeDay.month) < 10 ? '0' + _activeDay.month : _activeDay.month
+    const day = Number(_activeDay.day) < 10 ? '0' + _activeDay.day : _activeDay.day
+    const clockdate = _activeDay.year + month + day;
+    console.log(`/src/pages/beforeinvitation/index?tid=${this.data.tid}&consumerId=${visitor && visitor.id || 0}&d=${clockdate.substr(2)}`)
     let initShareObj = {
       title: `我正在参加【${this.data.circleInfo.title}】的打卡`,
-      path: `/src/pages/beforeinvitation/index?tid=${this.data.tid}&consumerId=${visitor && visitor.id || 0}`
+      path: `/src/pages/beforeinvitation/index?tid=${this.data.tid}&consumerId=${visitor && visitor.id || 0}&d=${clockdate.substr(2)}`
     }
     if (from == 'menu') {
       shareObj = initShareObj;
@@ -1757,6 +1762,7 @@ Page({
     if (today.getTime() > new Date(_activeDay.date).getTime()) {
       _activeDay.isAfter = true;
     }
+    console.log(_activeDay)
     this.setData({
       weeksArr: _weeksArr,
       activeDay: _activeDay,
@@ -2210,8 +2216,10 @@ Page({
     })
     let qrcode = '';
     generateCustomerQrcode({
-      scene: `i=${this.data.id}&t=${this.data.tid}&p=7`,
-      page: `src/pages/themeindex/index`
+      // scene: `i=${this.data.id}&t=${this.data.tid}&p=7`,
+      // page: `src/pages/themeindex/index`
+      scene: `ctd=${visitor && visitor.id}&t=${this.data.tid}`,
+      page: `src/pages/beforeinvitation/index`
     }).then((res) => {
       const {
         code,

src/pages/invitation/index.js

@@ -25,7 +25,8 @@ Page({
     bgsrc: '',
     loaded: false,
     themeDetail: {},
-    userInfo: {}
+    userInfo: {},
+    d: ''
   },
 
   /**
@@ -34,11 +35,13 @@ Page({
   onLoad: function (options) {
     const {
       tid,
-      consumerId
+      consumerId,
+      d
     } = options;
     this.setData({
       tid,
-      consumerId
+      consumerId,
+      d: d || ''
     })
     this.getThemeDetail();
     this.subjectClassStudent();
@@ -149,7 +152,7 @@ Page({
       })
     } else if (this.data.themeDetail.subject_type == 2) {
       wx.reLaunch({
-        url: `/src/pages/calendarthemeindex/index?id=${this.data.themeDetail.class_id}&tid=${this.data.tid}`
+        url: `/src/pages/calendarthemeindex/index?id=${this.data.themeDetail.class_id}&tid=${this.data.tid}&d=${this.data.d}`
       })
     }
   }