1.2.1

app.js

@@ -53,6 +53,7 @@ App({
     IV: "kylx365hongliren",
     IsEnter: true,//是否是刚进来
     LessonID:0,//听课ID
+    Marketing:0,//市场推广计划
     CardWaitTimeMax:3,//每张卡最长等待时间（分钟）
     IsRecorderAccredit:0,
     CardList:[],//卡列表变量

marketing/main/extenduser.js

@@ -155,7 +155,7 @@ Page({
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,
-      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      path: app.globalData.SharePath + '?Marketing=1&UserID=' + app.globalData.userInfo.UserID,
       imageUrl: "../images/program_screenshot_promotion.png",
     }
   },

marketing/main/index.js

@@ -24,7 +24,7 @@ Page({
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,
-      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      path: app.globalData.SharePath + '?Marketing=1&UserID=' + app.globalData.userInfo.UserID,
       imageUrl: "../images/program_screenshot_promotion.png",
     }
   },

marketing/main/shareuser.js

@@ -26,7 +26,7 @@ Page({
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,
-      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      path: app.globalData.SharePath + '?Marketing=1&UserID=' + app.globalData.userInfo.UserID,
       imageUrl: "../../pages/images/program_screenshot_main.png",
     }
   },

pages/index/index.js

@@ -77,6 +77,10 @@ Page({
         app.globalData.Homework = 1;
       }
 
+      if (options.Marketing == 1) {
+        app.globalData.Marketing = 1;
+      }
+
       if (options.type == "bebound") {
         this.setData({
           gotoBindingUrl: "../other/binding?type=bebound&ParentUserID=" + options.ParentUserID + "&NickName=" + options.NickName + "&AvatarUrl=" + options.AvatarUrl,

pages/main/default.js

@@ -75,9 +75,23 @@ Page({
             });
           }
 
-          if (app.globalData.userInfo.IsMember && app.globalData.LessonID && app.globalData.LessonID>0) {
+          if (app.globalData.userInfo.IsMember && app.globalData.LessonID) {
+            var url = '';
+            if (app.globalData.LessonID==="all"){
+              url = '../other/lessonlist';
+            }
+            else if (app.globalData.LessonID > 0){
+              url='../other/lesson?LessonID=' + app.globalData.LessonID + '&LessonPage=' + app.globalData.LessonPage
+            }
+            wx.navigateTo({
+              url: url,
+            });
+          }
+
+          if (app.globalData.userInfo.IsMember && app.globalData.Marketing==1) {
+            var url = '../../marketing/main/index';
             wx.navigateTo({
-              url: '../other/lesson?LessonID=' + app.globalData.LessonID +'&LessonPage='+app.globalData.LessonPage,
+              url: url,
             });
           }
 

pages/main/default.wxml

@@ -1,9 +1,9 @@
 <view class="container FlexColumn" style='height:{{Containnerheight}}rpx;'>
-  <view class='panel1 FlexColumn'>
+  <view class='panel1 FlexColumn' bindtap="goto" data-url="../plan/setting">
     <view class='text1 FlexRow'>第<text class="text11">{{DayNumber}}</text>天</view>
     <view class='text3' wx:if="{{TodayTaskNumber>0 && IsStart==0}}">剩余任务</view>
     <view class='text3' wx:if="{{TodayTaskNumber>0 && IsStart==1}}">今天任务</view>
-    <view class='panel11 FlexRow' bindtap="goto" data-url="../plan/setting">
+    <view class='panel11 FlexRow' >
       <view class='universalpic_setup_gray_40x40'></view>
       <view class='text2'>{{TodayTaskNumber}}</view>
       <image class="universalpic_setup_white_50x50" src='../images/universalpic_setup_white_50x50.png' />

pages/other/lessonlist.js

@@ -57,7 +57,7 @@ Page({
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,
-      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      path: app.globalData.SharePath + '?LessonID=all&UserID=' + app.globalData.userInfo.UserID,
       imageUrl: "../images/program_screenshot_lesson1.png",
     }
   },

project.config.json

@@ -49,7 +49,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 3,
+			"current": 4,
 			"list": [
 				{
 					"id": 0,
@@ -81,10 +81,10 @@
 				},
 				{
 					"id": 4,
-					"name": "marketing/main/index",
-					"pathName": "marketing/main/index",
-					"query": "",
-					"scene": 1047
+					"name": "lessonlist",
+					"pathName": "pages/index/index",
+					"query": "UserID=1&Marketing=1",
+					"scene": 1001
 				}
 			]
 		}