1.5.4

app.js

@@ -2,12 +2,11 @@
 App({
   onLaunch: function (options) {
     this.getSystemInfo();
+  },
+  onShow: function(options) {
     if (options && options.scene) {
       this.globalData.userSource = options.scene;
-      console.log("options.scene:" + options.scene);
-    }
-    if (options && options.shareTicket) {
-      this.globalData.shareTicket = options.shareTicket;
+      console.log("options.scene2:" + options.scene);
     }
   },
   getSystemInfo: function () {
@@ -32,8 +31,8 @@ App({
     }
   },
   globalData: {
-    Version: "1.5.3",
-    IsProduction: false,
+    Version: "1.5.4",
+    IsProduction: true,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",
     ShareImage: '../images/program_screenshot_main.png',

pages/index/index.js

@@ -64,7 +64,7 @@ Page({
       else if (options.type == "bebound") {
         this.setData({
           gotoType: "bebound",
-          gotoUrl: "../other/binding?type=bebound&ParentUserID=" + options.ParentUserID + "&NickName=" + options.NickName + "&AvatarUrl=" + options.AvatarUrl,
+          gotoUrl: "../other/binding?type=bebound&ParentUserID=" + options.ParentUserID + "&NickName=" + options.NickName + "&AvatarUrl=" + options.AvatarUrl + "&BindTime=" + options.BindTime,
         });
       }
       else if (options.type == "lesson") {
@@ -200,6 +200,9 @@ Page({
 
   login: function (param) {
     var that = this;
+    //var userSource = wx.getLaunchOptionsSync();
+    //console.log("userSource1:" + userSource.scene);
+    //console.log("userSource2:" + app.globalData.userSource);
 
     main.getLocalHost(function () {
       main.postData('MiaoguoLogin', {
@@ -345,7 +348,7 @@ Page({
 
     });
   },
-
+  
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/default.js

@@ -37,7 +37,9 @@ Page({
         });
       }
     }
-    
+
+    this.checkMemory();
+
   },
   onHide:function(){
     wx.hideLoading();
@@ -263,6 +265,19 @@ Page({
     wx.setStorageSync("IsShowMarketingTime", common.formatTime(common.addDate("d",7,new Date())));
 
   },
+  checkMemory: function () {
+    wx.onMemoryWarning(function () {
+      wx.showModal({
+        title: '手机内存不足',
+        content: '请先清理内存再用秒过。内存不足会导致小程序异常或被迫退出。',
+        showCancel: false,
+        confirmText: '知道了',
+        success: function (res) {
+
+        }
+      });
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/other/binding.js

@@ -8,22 +8,37 @@ Page({
   },
   onLoad: function (options) {
     var that = this;
+
     if (options && options.type && options.type == "bebound") {
+      var bBind = 0;
+      //console.log("userSource3:" + app.globalData.userSource);
       
-      if (app.globalData.userSource == "1044" || app.globalData.userSource == "1008"){
-        wx.showModal({
-          title: '抱歉',
-          content: '绑定功能只能用于朋友单聊',
-          showCancel: false,
-          confirmText: "知道了",
-          success: function () {
-            wx.reLaunch({
-              url: '../index/index',
-            })
+
+      var arrUserSource = [1007, 1037, 1089, 1006, 1001, 1005, 1048, 1012, 1024, 1042, 1011, 1106, 1035, 1047, 1020, 1013, 1053];
+      for (var i = 0; i < arrUserSource.length; i++) {
+        if (app.globalData.userSource == arrUserSource[i]) {
+          bBind = 1;
+          break;
+        }
+      }
+      if (options && options.BindTime) {
+        var time = new Date(options.BindTime);
+        var timeNow = new Date();
+        var sub = common.diffDate("s", time, timeNow);
+
+        if (app.globalData.userSource==1006) {
+          if (sub > 86400) {
+            bBind = -1;
           }
-        });
+        }
+        else{
+          if (sub > 180) {
+            bBind = -1;
+          }
+        }
       }
-      else{
+
+      if (bBind == 1) {
         that.setData({
           ShowPanel: "bebound",
           ParentUserID: options.ParentUserID,
@@ -31,16 +46,44 @@ Page({
         });
         that.download(options.AvatarUrl);
       }
+      else {
+        if (bBind == -1) {
+          wx.showModal({
+            title: '请求时间过期',
+            content: '请联系邀请人，再次私聊发给您。',
+            showCancel: false,
+            confirmText: "知道了",
+            success: function () {
+              wx.reLaunch({
+                url: '../index/index',
+              });
+            }
+          });
+        }
+        else {
+          wx.showModal({
+            title: '无效邀请',
+            content: '发群无效。请联系邀请人，单独私聊发给您。',
+            showCancel: false,
+            confirmText: "知道了",
+            success: function () {
+              wx.reLaunch({
+                url: '../index/index',
+              });
+            }
+          });
+        }
+      }
     }
     else {
       main.getData("GetUserBindingList?UserID=" + app.globalData.userInfo.UserID, function (data) {
-        if (data && data.length>0){
+        if (data && data.length > 0) {
           that.setData({
-            List:data,
+            List: data,
             ShowPanel: "unbinding",
           });
         }
-        else{
+        else {
           that.setData({
             ShowPanel: "binding",
           });
@@ -52,10 +95,10 @@ Page({
       Containnerheight: main.getWindowHeight(),
     });
   },
-  download: function (avatarUrl){
-    var that=this;
+  download: function (avatarUrl) {
+    var that = this;
     wx.downloadFile({
-      url: avatarUrl, 
+      url: avatarUrl,
       success(res) {
         if (res.statusCode === 200) {
           that.setData({
@@ -65,9 +108,9 @@ Page({
       }
     });
   },
-  onShow: function () {
+  onShow: function (options) {
     var that = this;
-    if (app.globalData.userInfo.IsShow==1){
+    if (app.globalData.userInfo.IsShow == 1) {
       wx.getSetting({
         success(res) {
           if (res.authSetting['scope.userInfo']) {
@@ -83,14 +126,14 @@ Page({
     }
   },
   shareFinished: function () {
-    setTimeout(function(){
+    setTimeout(function () {
       wx.showModal({
         title: '等待对方接受邀请',
         content: '请尽快与对方联系确认邀请',
         showCancel: false,
         confirmText: "知道了",
       });
-    },3000);
+    }, 3000);
   },
   gotoBinding: function () {
     var that = this;
@@ -110,14 +153,15 @@ Page({
   },
   onShareAppMessage: function () {
     if (this.data.ShowPanel == "binding") {
-      var path = '/pages/index/index?type=bebound&ParentUserID=' + app.globalData.userInfo.UserID;
+      var time = common.formatTime(new Date());
+      var path = '/pages/index/index?type=bebound&ParentUserID=' + app.globalData.userInfo.UserID + '&BindTime=' + time;
       path += "&NickName=" + app.globalData.userInfo.NickName;
       path += "&AvatarUrl=" + app.globalData.userInfo.AvatarUrl;
-      var time = common.formatTime(new Date());
+      //console.log(path);
       return {
-        title: "帐号绑定 "+time,
+        title: "帐号绑定 " + time,
         path: path,
-        imageUrl: app.globalData.uploadImageUrl +"web/program_screenshot_bindaccount.png",
+        imageUrl: app.globalData.uploadImageUrl + "web/program_screenshot_bindaccount.png",
       }
     }
   },

pages/other/userbook.js

@@ -73,6 +73,7 @@ Page({
       IsPay: app.globalData.userInfo.IsPay,
       IsLoseEfficacy: app.globalData.userInfo.IsLoseEfficacy,
       ClassTotalDayNumber: app.globalData.userInfo.ClassTotalDayNumber,
+      ChildUserID: app.globalData.userInfo.ChildUserID,
     });
 
     that.init();

pages/other/userbook.wxml

@@ -50,7 +50,7 @@
         <view>推广计划</view>
       </view>
 
-      <view class="panel21 FlexColumn" bindtap="goto" data-url="./binding">
+      <view class="panel21 FlexColumn" bindtap="goto" data-url="./binding"  wx:if="{{!ChildUserID}}">
         <image class="usermanual_index_handshake" src='../images/usermanual_index_link.png' />
         <view>帐号绑定</view>
       </view>

project.config.json

@@ -115,9 +115,9 @@
 				},
 				{
 					"id": 8,
-					"name": "绑定",
+					"name": "pages/index/index",
 					"pathName": "pages/index/index",
-					"query": "type=bebound&ParentUserID=2&NickName=一二",
+					"query": "type=bebound&ParentUserID=1&BindTime=2019/12/10 17:20:54&NickName=程杰&AvatarUrl=https://wx.qlogo.cn/mmopen/vi_32/DYAIOgq83epkAJy0WEvyOEzLtHQ6BPV39ubS692yN5Qq30hic8hKTl0FmbuYGeaib1Uiaypic7GYfL15iczyWaUSK1Q/132",
 					"scene": 1007
 				}
 			]