2.3.9

app.js

@@ -1,8 +1,8 @@
 App({
   globalData: {
-    Version: "2.3.8",
-    //IsProduction: true,
-    IsProduction: false,
+    Version: "2.3.9",
+    IsProduction: true,
+    //IsProduction: false,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",
     ShareImage: '../images/program_screenshot_main.png',

pages/index/index.js

@@ -5,8 +5,7 @@ const app = getApp();
 
 var timeout1 = 0, timeout3=0;
 var timeoutRedirect=0;
-
-
+var UserAssociatedID=0;
 
 Page({
   data: {
@@ -19,22 +18,15 @@ Page({
   },
   onLoad: function (options) {
 
-    // var interval=null;
-    // var index=0;
-    // interval = setInterval(function () {
-    //   index++;
-    //   console.log(index);
-    //   if (index>10) {
-    //     clearInterval(interval);
-    //   }
-    // },200);
-
     console.log("Time1:" + new Date().getTime());
     if (options) {
       if (options.UserID) {
         console.log("UserID:" + options.UserID);
         app.globalData.introducer = options.UserID;
       }
+      if (options.UserAssociatedID)
+      UserAssociatedID=options.UserAssociatedID;
+
       if (options.SourceID) {
         console.log("SourceID:" + options.SourceID);
         app.globalData.SourceID = options.SourceID;
@@ -211,6 +203,7 @@ Page({
     main.getLocalHost(function () {
       main.postData('MiaoguoLogin', {
         Code: param.Code,
+        UserAssociatedID:UserAssociatedID,
         NickName: param.nickName,
         Language: param.language,
         Gender: param.gender,
@@ -256,8 +249,8 @@ Page({
               isShow = 1;
             }
           }
-
           app.globalData.userInfo.IsShow = isShow;
+
           if (app.globalData.userInfo.IsMember == 1)
             app.globalData.IsLocked = 0;
 

pages/main/default.js

@@ -18,6 +18,7 @@ Page({
     AwardDayNumber: 0,
     IsShowRemind: false,
     IsShowHelp: false,
+    IsShowUserAssociated: 0,
   },
   onPullDownRefresh: function () {
     wx.redirectTo({
@@ -41,6 +42,8 @@ Page({
       withShareTicket: true,
       menus: ['shareAppMessage', 'shareTimeline']
     });
+
+    that.getUserAssociatedInfo(app.globalData.userInfo.UserID, function (data) {});
   },
   onHide: function () {
     wx.hideLoading();
@@ -343,44 +346,49 @@ Page({
   },
   setSelectUser: function (e) {
     var that = this;
-    if (app.globalData.userInfo.UserID == 1 ||
-      app.globalData.userInfo.UserID == 2 ||
-      app.globalData.userInfo.UserID == 3 ||
-      app.globalData.userInfo.UserID == 4) {
-      var userid = that.data.ChangeUserID;
-      wx.setStorageSync("UserID", userid);
+    
+      if (app.globalData.userInfo.UserID == 1 ||
+        app.globalData.userInfo.UserID == 2 ||
+        app.globalData.userInfo.UserID == 3 ||
+        app.globalData.userInfo.UserID == 4) {
+        var userid = that.data.ChangeUserID;
+        wx.setStorageSync("UserID", userid);
+
+        app.globalData.userInfo.UserID = userid;
+        var fieldStr = "";
+        that.getUserInfo(userid, fieldStr, function (data) {
+          wx.setNavigationBarTitle({
+            title: data.NickName
+          });
+          main.getUserConfig();
+          app.globalData.userInfo.ProductServiceTime = data.ProductServiceTime;
 
-      app.globalData.userInfo.UserID = userid;
-      var fieldStr = "";
-      that.getUserInfo(userid, fieldStr, function (data) {
-        wx.setNavigationBarTitle({
-          title: data.NickName
-        });
-        main.getUserConfig();
-        app.globalData.userInfo.ProductServiceTime = data.ProductServiceTime;
+          if (app.globalData.userInfo.UserID != 2) {
+            app.globalData.userInfo.NickName = data.NickName;
+            app.globalData.userInfo.AvatarUrl = data.AvatarUrl;
+          }
+          if (data.IsPromoter > 0) {
+            app.globalData.userInfo.IsPromoter = data.IsPromoter;
+            app.globalData.userInfo.PromotionLimitDays = data.PromotionLimitDays;
+            app.globalData.userInfo.PromotionLimitTime = data.PromotionLimitTime;
+            app.globalData.userInfo.WXServiceCharge = data.WXServiceCharge;
+            app.globalData.userInfo.IndividualIncomeTax = data.IndividualIncomeTax;
+            app.globalData.userInfo.WXAccount = data.WXAccount;
+            app.globalData.userInfo.RealName = data.RealName;
+            app.globalData.userInfo.IntroducerNickName = data.IntroducerNickName;
+            app.globalData.userInfo.IntroducerAvatarUrl = data.IntroducerAvatarUrl;
+          }
 
-        if (app.globalData.userInfo.UserID != 2) {
-          app.globalData.userInfo.NickName = data.NickName;
-          app.globalData.userInfo.AvatarUrl = data.AvatarUrl;
-        }
-        if (data.IsPromoter > 0) {
-          app.globalData.userInfo.IsPromoter = data.IsPromoter;
-          app.globalData.userInfo.PromotionLimitDays = data.PromotionLimitDays;
-          app.globalData.userInfo.PromotionLimitTime = data.PromotionLimitTime;
-          app.globalData.userInfo.WXServiceCharge = data.WXServiceCharge;
-          app.globalData.userInfo.IndividualIncomeTax = data.IndividualIncomeTax;
-          app.globalData.userInfo.WXAccount = data.WXAccount;
-          app.globalData.userInfo.RealName = data.RealName;
-          app.globalData.userInfo.IntroducerNickName = data.IntroducerNickName;
-          app.globalData.userInfo.IntroducerAvatarUrl = data.IntroducerAvatarUrl;
-        }
-      });
+          that.getUserAssociatedInfo(app.globalData.userInfo.UserID, function (data) {});
 
-      that.setData({
-        IsShowUserID: false,
-      });
-      that.onShow();
-    }
+        });
+
+        that.setData({
+          IsShowUserID: false,
+        });
+        that.onShow();
+      }
+    
   },
   getUserInfoFunction: function (e) {
     var that = this;
@@ -414,6 +422,22 @@ Page({
       }
     });
   },
+  //得到用户关联列表
+  getUserAssociatedInfo: function (userID, callback) {
+    var that = this;
+    var url = "GetUserAssociated?UserID=" + userID+"&IsWeb=false";
+    main.getData(url, function (data) {
+      if (data) {
+        that.setData({
+          IsShowUserAssociated: 1,
+          UserAssociatedNickName: common.getStringMaxLength(app.globalData.userInfo.NickName,12),
+          UserAssociatedAvatar: app.globalData.userInfo.AvatarUrl,
+          UserAssociated: data,
+          ChildUserID:app.globalData.userInfo.ChildUserID,
+        });
+      }
+    });
+  },
   selectPayItem: function (e) {
     var that = this;
     var id = e.currentTarget.dataset.id;
@@ -481,6 +505,16 @@ Page({
     //判断每30天是否是高级模式
     wx.removeStorageSync('IsShowPatternMenu');
   },
+  showUserAssociated: function () {
+    this.setData({
+      IsShowUserAssociated: 2,
+    });
+  },
+  closeUserAssociated: function () {
+    this.setData({
+      IsShowUserAssociated: 1,
+    });
+  },
   setVersionStart: function (e) {
     var flag = e.currentTarget.dataset.flag;
     var versionid = e.currentTarget.dataset.versionid;

pages/main/default.wxml

@@ -10,6 +10,12 @@
     </view>
   </view>
 
+  <view wx:if="{{IsShowUserAssociated>=1 && !ChildUserID}}" class="UserAssociated{{IsIPad}} FlexRow" bindtap="showUserAssociated">
+    <image class="UserAssociatedAvatar" src="{{UserAssociatedAvatar}}" ></image>
+    <view class="UserAssociatedNickName">{{UserAssociatedNickName}}</view>
+    <image class="icon_nextpage_2" src="../images/icon_nextpage_2.png" ></image>
+  </view>
+
   <image class="message_practise_index_01{{IsIPad}}" src='../images/message_practise_index_01.png' wx:if="{{IsShowSettingRemind}}" />
   <image wx:if="{{TodayTaskNumber>0 && IsStart==1}}" class="study_index_start{{IsIPad}}" src='../images/practise_index_start.png' bindtap="goto" data-url="./detail?CardType={{CardType}}" />
   <image wx:if="{{TodayTaskNumber>0 && IsStart==0}}" class="study_index_start{{IsIPad}}" src='../images/practise_index_goon.png' bindtap="goto" data-url="./detail?CardType={{CardType}}" />
@@ -98,7 +104,7 @@
     </view>
 </view>
 
-<view  wx:if="{{IsShowRemind}}" class="IsRemindContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
+<view wx:if="{{IsShowRemind}}" class="IsRemindContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
   <view class="IsRemindPanel FlexColumn">
     <text class="IsRemindText1">延长有效期\n的好办法</text>
     <text class="IsRemindText2">一口气增加120天\n上不封顶等您来拿</text>
@@ -125,3 +131,22 @@
   </view>
 </view>
 
+<view wx:if="{{IsShowUserAssociated==2}}" class="IsRemindContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
+  <view class="IsRemindPanel2{{IsIPad}} FlexColumn">
+    <view class="text7">切换续费主帐户</view>
+    <view class="IsRemindPanel20 FlexRow">
+      <view class="IsRemindPanel201 FlexColumn">
+        <image class="UserAssociatedAvatar2" src="{{UserAssociatedAvatar}}"></image>
+        <text class="text8">{{UserAssociatedNickName}}</text>
+
+        <view class="text10">使用中</view>
+      </view>
+      <view class="IsRemindPanel201 FlexColumn" wx:for="{{UserAssociated}}" wx:key="*this" catchtap="gotoReLaunch" data-url="../index/index?UserAssociatedID={{item.UserID}}">
+        <image class="UserAssociatedAvatar2" src="{{item.AvatarUrl}}"></image>
+        <text class="text8">{{item.NickName}}</text>
+      </view>
+    </view>
+    <view class="text9">修改切换帐号请微信天乐 changyibzr</view>
+    <image class="practise_index_board_close" src="../images/practise_index_board_close.png" catchtap="closeUserAssociated"></image>
+  </view>
+</view>

pages/main/default.wxss

@@ -452,3 +452,126 @@ page{
   padding-left: 20rpx;
 }
 
+.UserAssociated{
+  position: fixed;
+  top:397rpx;
+  height: 80rpx;
+  border-radius: 40rpx;
+  background-color: #2a4a9f;
+  justify-content: space-between;
+}
+
+.UserAssociated_iPad{
+  position: fixed;
+  top:282rpx;
+  height: 80rpx;
+  border-radius: 40rpx;
+  background-color: #2a4a9f;
+  justify-content: space-between;
+}
+
+.UserAssociatedAvatar{
+  width:60rpx;
+  height:60rpx;
+  margin-left: 10rpx;
+  border-radius: 50%;
+}
+
+.UserAssociatedNickName{
+  color:#fff;
+  font-size: 28rpx;
+  margin: 0 20rpx;
+}
+
+.icon_nextpage_2{
+  width:16rpx;
+  height:26rpx;
+  margin-right: 30rpx;
+}
+
+
+.IsRemindPanel2{
+  width:660rpx;
+  height:520rpx;
+  margin-top: 270rpx;
+  border-radius: 40rpx;
+  background-color: #222D4C;
+  justify-content: flex-start;
+  position: relative;
+}
+
+.IsRemindPanel2_iPad{
+  width:660rpx;
+  height:520rpx;
+  margin-top: 170rpx;
+  border-radius: 40rpx;
+  background-color: #222D4C;
+  justify-content: flex-start;
+  position: relative;
+}
+
+.text7{
+  font-size: 36rpx;
+  color: #F0F0F0;
+  letter-spacing: 0;
+  margin-top: 60rpx;
+}
+
+.IsRemindPanel20{
+  width:480rpx;
+  justify-content: space-around;
+  margin-top: 50rpx;
+}
+
+.IsRemindPanel201{
+  height:300rpx;
+  justify-content: flex-start;
+  position: relative;
+}
+
+.UserAssociatedAvatar2{
+  width:120rpx;
+  height:120rpx;
+  border-radius: 50%;
+  background-color: #fff;
+}
+
+.text8{
+  width:120rpx;
+  font-size: 24rpx;
+  color: #FFFFFF;
+  text-align: center;
+  margin-top: 25rpx;
+}
+
+.text9{
+  font-size: 22rpx;
+  color: #5282FA;
+  letter-spacing: 0;
+  text-align: center;
+}
+
+.text10{
+  background: #FE6659;
+  border-radius: 10rpx;
+  font-size: 20rpx;
+  color: #F0F0F0;
+  letter-spacing: 0;
+  width:80rpx;
+  height:40rpx;
+  border-radius: 10rpx;
+  position: absolute;
+  top:80rpx;
+  text-align: center;
+  line-height: 40rpx;
+  z-index: 20;
+}
+
+.practise_index_board_close{
+  width:70rpx;
+  height:70rpx;
+  position: absolute;
+  top:30rpx;
+  right:30rpx;
+  z-index: 10;
+}

pages/main/detail.js

@@ -504,6 +504,8 @@ Page({
     if (listTaskFinished.length > 0) {
       var card = listTaskFinished.pop();
       wx.setStorageSync("ListTaskFinished", listTaskFinished);
+      wx.setStorageSync("ListTaskFinishedUserID", app.globalData.userInfo.UserID);
+      
 
       timeHistory = 0;
       that.timeCompute();
@@ -739,6 +741,8 @@ Page({
         }
 
         wx.setStorageSync("ListTaskFinished", listTaskFinished);
+        wx.setStorageSync("ListTaskFinishedUserID", app.globalData.userInfo.UserID);
+      
         TaskList.shift();
 
       }

pages/other/userbook.js

@@ -71,8 +71,6 @@ Page({
     }
     that.setData({
       Containnerheight: main.getWindowHeight(),
-      NickName: app.globalData.userInfo.NickName,
-      AvatarUrl: app.globalData.userInfo.AvatarUrl,
       ProductServiceTime: productServiceTime,
       EndDate: endDate,
       ArrInformation: arr,
@@ -82,6 +80,7 @@ Page({
       IsLoseEfficacy: app.globalData.userInfo.IsLoseEfficacy,
       ClassTotalDayNumber: app.globalData.userInfo.ClassTotalDayNumber,
       ChildUserID: app.globalData.userInfo.ChildUserID,
+      MainUserID: app.globalData.userInfo.MainUserID,
       UserID:app.globalData.userInfo.UserID,
     });
 
@@ -134,6 +133,13 @@ Page({
       });
     }
   },
+  onShow:function(){
+    var that=this;
+    that.setData({
+      NickName: app.globalData.userInfo.NickName,
+      AvatarUrl: app.globalData.userInfo.AvatarUrl,
+    });
+  },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
     wx.navigateTo({
@@ -146,9 +152,11 @@ Page({
     })
   },
   updateMember: function () {
-    wx.navigateTo({
-      url: '../index/accredit',
-    });
+    if (!this.data.ChildUserID && this.data.UserID==this.data.MainUserID){
+      wx.navigateTo({
+        url: '../index/accredit',
+      });
+    }
   },
   onShareAppMessage: function () {
     return {

pages/other/userbook.wxml

@@ -32,12 +32,12 @@
         <view>优惠券</view>
       </view>
 
-      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/pay?PayUserID={{UserID}}&PayType=6" wx:if="{{ClassDayNumber>=ClassTotalDayNumber && (IsPay==0 || IsLoseEfficacy==1) && !ChildUserID }}">
+      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/pay?PayUserID={{UserID}}&PayType=6" wx:if="{{ClassDayNumber>=ClassTotalDayNumber && (IsPay==0 || IsLoseEfficacy==1) && !ChildUserID && MainUserID==UserID }}">
         <image class="usermanual_index_handshake" src='../images/usermanual_index_wallet.png' />
         <view>去续费</view>
       </view>
       
-      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/pay?PayUserID={{UserID}}&PayType=6&EndDate={{EndDate}}" wx:if="{{ClassDayNumber>=ClassTotalDayNumber && (IsPay==1 && !IsLoseEfficacy) && !ChildUserID }}">
+      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/pay?PayUserID={{UserID}}&PayType=6&EndDate={{EndDate}}" wx:if="{{ClassDayNumber>=ClassTotalDayNumber && (IsPay==1 && !IsLoseEfficacy) && !ChildUserID && MainUserID==UserID }}">
         <image class="usermanual_index_handshake" src='../images/usermanual_index_wallet.png' />
         <view>去续费</view>
       </view>
@@ -52,7 +52,7 @@
         <view>推广计划</view>
       </view>
 
-      <view class="panel21 FlexColumn" bindtap="goto" data-url="./binding"  wx:if="{{!ChildUserID}}">
+      <view class="panel21 FlexColumn" bindtap="goto" data-url="./binding"  wx:if="{{!ChildUserID && MainUserID==UserID}}">
         <image class="usermanual_index_handshake" src='../images/usermanual_index_link.png' />
         <view>帐号绑定</view>
       </view>

utils/main.js

@@ -625,7 +625,8 @@ function UpdateMiaoguoCardTodayAll(isShowLoading, callback) {
       obj.LastTime = list[i].LastTime;
       arr.push(obj);
     }
-    that.postData('UpdateMiaoguoCardTodayAll?UserID=' + app.globalData.userInfo.UserID, {
+    var userid=wx.getStorageSync("ListTaskFinishedUserID");
+    that.postData('UpdateMiaoguoCardTodayAll?UserID=' + userid, {
       List: arr,
     }, function (data) {
       if (isShowLoading) {
@@ -634,6 +635,7 @@ function UpdateMiaoguoCardTodayAll(isShowLoading, callback) {
       }
       if (data) {
         wx.removeStorageSync("ListTaskFinished");
+        wx.removeStorageSync("ListTaskFinishedUserID");
       }
       if (callback) {
         callback();