chengjie 6 年之前
父節點
當前提交
7213839d9a

+ 1 - 0
app.js

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

+ 1 - 1
marketing/main/extenduser.js

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

+ 1 - 1
marketing/main/index.js

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

+ 1 - 1
marketing/main/shareuser.js

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

+ 4 - 0
pages/index/index.js

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

+ 16 - 2
pages/main/default.js

@@ -75,9 +75,23 @@ Page({
75 75
             });
76 76
           }
77 77
 
78
-          if (app.globalData.userInfo.IsMember && app.globalData.LessonID && app.globalData.LessonID>0) {
78
+          if (app.globalData.userInfo.IsMember && app.globalData.LessonID) {
79
+            var url = '';
80
+            if (app.globalData.LessonID==="all"){
81
+              url = '../other/lessonlist';
82
+            }
83
+            else if (app.globalData.LessonID > 0){
84
+              url='../other/lesson?LessonID=' + app.globalData.LessonID + '&LessonPage=' + app.globalData.LessonPage
85
+            }
86
+            wx.navigateTo({
87
+              url: url,
88
+            });
89
+          }
90
+
91
+          if (app.globalData.userInfo.IsMember && app.globalData.Marketing==1) {
92
+            var url = '../../marketing/main/index';
79 93
             wx.navigateTo({
80
-              url: '../other/lesson?LessonID=' + app.globalData.LessonID +'&LessonPage='+app.globalData.LessonPage,
94
+              url: url,
81 95
             });
82 96
           }
83 97
 

+ 2 - 2
pages/main/default.wxml

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

+ 1 - 1
pages/other/lessonlist.js

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

+ 5 - 5
project.config.json

@@ -49,7 +49,7 @@
49 49
 			"list": []
50 50
 		},
51 51
 		"miniprogram": {
52
-			"current": 3,
52
+			"current": 4,
53 53
 			"list": [
54 54
 				{
55 55
 					"id": 0,
@@ -81,10 +81,10 @@
81 81
 				},
82 82
 				{
83 83
 					"id": 4,
84
-					"name": "marketing/main/index",
85
-					"pathName": "marketing/main/index",
86
-					"query": "",
87
-					"scene": 1047
84
+					"name": "lessonlist",
85
+					"pathName": "pages/index/index",
86
+					"query": "UserID=1&Marketing=1",
87
+					"scene": 1001
88 88
 				}
89 89
 			]
90 90
 		}