2.3.10

app.json

@@ -1,6 +1,5 @@
 {
   "pages": [
-
     "pages/index/index",
 
     "pages/share/cardlist",
@@ -40,8 +39,8 @@
 
     "pages/plan/studyplan",
     "pages/plan/studyplandetail",
-    
-    
+        
+    "pages/other/family",
     "pages/other/recover",
     "pages/other/video",
     "pages/other/menu",

pages/index/index.js

@@ -5,7 +5,7 @@ const app = getApp();
 
 var timeout1 = 0, timeout3=0;
 var timeoutRedirect=0;
-var UserAssociatedID=0;
+var UserFamilyID=0;
 
 Page({
   data: {
@@ -24,8 +24,8 @@ Page({
         console.log("UserID:" + options.UserID);
         app.globalData.introducer = options.UserID;
       }
-      if (options.UserAssociatedID)
-      UserAssociatedID=options.UserAssociatedID;
+      if (options.UserFamilyID)
+      UserFamilyID=options.UserFamilyID;
 
       if (options.SourceID) {
         console.log("SourceID:" + options.SourceID);
@@ -64,6 +64,15 @@ Page({
           gotoUrl: "../other/binding?type=bebound&ParentUserID=" + options.ParentUserID + "&NickName=" + options.NickName + "&AvatarUrl=" + options.AvatarUrl + "&BindTime=" + options.BindTime,
         });
       }
+      else if (options.type == "family") {
+        var url="../other/family";
+        if (options.PanelType==1)
+          url="../other/family?PanelType=1&Time="+options.Time+"&MainUserID="+options.MainUserID+ "&NickName=" + options.NickName + "&AvatarUrl=" + options.AvatarUrl;
+        this.setData({
+          gotoType: "other",
+          gotoUrl: url,
+        });
+      }
       else if (options.type == "lesson" || options.type == "video") {
         app.globalData.LessonID = options.LessonID;
         if (options.LessonPage)
@@ -203,7 +212,7 @@ Page({
     main.getLocalHost(function () {
       main.postData('MiaoguoLogin', {
         Code: param.Code,
-        UserAssociatedID:UserAssociatedID,
+        UserFamilyID:UserFamilyID,
         NickName: param.nickName,
         Language: param.language,
         Gender: param.gender,

pages/main/default.js

@@ -18,7 +18,7 @@ Page({
     AwardDayNumber: 0,
     IsShowRemind: false,
     IsShowHelp: false,
-    IsShowUserAssociated: 0,
+    IsShowUserFamily: 0,
   },
   onPullDownRefresh: function () {
     wx.redirectTo({
@@ -43,7 +43,7 @@ Page({
       menus: ['shareAppMessage', 'shareTimeline']
     });
 
-    that.getUserAssociatedInfo(app.globalData.userInfo.UserID, function (data) {});
+    that.getUserFamilyInfo(app.globalData.userInfo.UserID, function (data) {});
   },
   onHide: function () {
     wx.hideLoading();
@@ -120,9 +120,7 @@ Page({
             } else if (res.authSetting['scope.record'] === false) {
               app.globalData.IsRecorderAccredit = -1;
             }
-
           }
-
         }
       });
     }
@@ -346,49 +344,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);
-
-        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;
-          }
-
-          that.getUserAssociatedInfo(app.globalData.userInfo.UserID, function (data) {});
+    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;
+
+        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.getUserFamilyInfo(app.globalData.userInfo.UserID, function (data) {});
+
+      });
+
+      that.setData({
+        IsShowUserID: false,
+      });
+      that.onShow();
+    }
 
-        that.setData({
-          IsShowUserID: false,
-        });
-        that.onShow();
-      }
-    
   },
   getUserInfoFunction: function (e) {
     var that = this;
@@ -423,18 +421,21 @@ Page({
     });
   },
   //得到用户关联列表
-  getUserAssociatedInfo: function (userID, callback) {
+  getUserFamilyInfo: function (userID, callback) {
     var that = this;
-    var url = "GetUserAssociated?UserID=" + userID+"&IsWeb=false";
+    var url = "GetUserFamily?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,
-        });
+        if (data.length > 0) {
+          that.setData({
+            IsShowUserFamily: 1,
+            UserFamilyNickName: common.getStringMaxLength(app.globalData.userInfo.NickName, 12),
+            UserFamilyAvatar: app.globalData.userInfo.AvatarUrl,
+            UserFamily: data,
+            ChildUserID: app.globalData.userInfo.ChildUserID,
+          });
+          app.globalData.FamilyUsers = data;
+        }
       }
     });
   },
@@ -505,14 +506,14 @@ Page({
     //判断每30天是否是高级模式
     wx.removeStorageSync('IsShowPatternMenu');
   },
-  showUserAssociated: function () {
+  showUserFamily: function () {
     this.setData({
-      IsShowUserAssociated: 2,
+      IsShowUserFamily: 2,
     });
   },
-  closeUserAssociated: function () {
+  closeUserFamily: function () {
     this.setData({
-      IsShowUserAssociated: 1,
+      IsShowUserFamily: 1,
     });
   },
   setVersionStart: function (e) {

pages/main/default.wxml

@@ -10,9 +10,9 @@
     </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>
+  <view wx:if="{{IsShowUserFamily>=1 && !ChildUserID}}" class="UserFamily{{IsIPad}} FlexRow" bindtap="showUserFamily">
+    <image class="UserFamilyAvatar" src="{{UserFamilyAvatar}}" ></image>
+    <view class="UserFamilyNickName">{{UserFamilyNickName}}</view>
     <image class="icon_nextpage_2" src="../images/icon_nextpage_2.png" ></image>
   </view>
 
@@ -131,22 +131,21 @@
   </view>
 </view>
 
-<view wx:if="{{IsShowUserAssociated==2}}" class="IsRemindContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
+<view wx:if="{{IsShowUserFamily==2}}" class="IsRemindContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
   <view class="IsRemindPanel2{{IsIPad}} FlexColumn">
-    <view class="text7">切换续费主帐户</view>
+    <view class="text7">切换「家庭用户」</view>
     <view class="IsRemindPanel20 FlexRow">
       <view class="IsRemindPanel201 FlexColumn">
-        <image class="UserAssociatedAvatar2" src="{{UserAssociatedAvatar}}"></image>
-        <text class="text8">{{UserAssociatedNickName}}</text>
-
+        <image class="UserFamilyAvatar2" src="{{UserFamilyAvatar}}"></image>
+        <text class="text8">{{UserFamilyNickName}}</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>
+      <view class="IsRemindPanel201 FlexColumn" wx:for="{{UserFamily}}" wx:key="*this" catchtap="gotoReLaunch" data-url="../index/index?UserFamilyID={{item.UserID}}">
+        <image class="UserFamilyAvatar2" 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 class="text9" catchtap="goto" data-url="../other/family">设置</view>
+    <image class="practise_index_board_close" src="../images/practise_index_board_close.png" catchtap="closeUserFamily"></image>
   </view>
 </view>

pages/main/default.wxss

@@ -452,7 +452,7 @@ page{
   padding-left: 20rpx;
 }
 
-.UserAssociated{
+.UserFamily{
   position: fixed;
   top:397rpx;
   height: 80rpx;
@@ -461,7 +461,7 @@ page{
   justify-content: space-between;
 }
 
-.UserAssociated_iPad{
+.UserFamily_iPad{
   position: fixed;
   top:282rpx;
   height: 80rpx;
@@ -470,14 +470,14 @@ page{
   justify-content: space-between;
 }
 
-.UserAssociatedAvatar{
+.UserFamilyAvatar{
   width:60rpx;
   height:60rpx;
   margin-left: 10rpx;
   border-radius: 50%;
 }
 
-.UserAssociatedNickName{
+.UserFamilyNickName{
   color:#fff;
   font-size: 28rpx;
   margin: 0 20rpx;
@@ -492,7 +492,7 @@ page{
 
 .IsRemindPanel2{
   width:660rpx;
-  height:520rpx;
+  height:555rpx;
   margin-top: 270rpx;
   border-radius: 40rpx;
   background-color: #222D4C;
@@ -524,12 +524,12 @@ page{
 }
 
 .IsRemindPanel201{
-  height:300rpx;
+  height:285rpx;
   justify-content: flex-start;
   position: relative;
 }
 
-.UserAssociatedAvatar2{
+.UserFamilyAvatar2{
   width:120rpx;
   height:120rpx;
   border-radius: 50%;
@@ -545,10 +545,13 @@ page{
 }
 
 .text9{
-  font-size: 22rpx;
-  color: #5282FA;
+  font-size: 28rpx;
+  color: #FFFFFF;
   letter-spacing: 0;
+  border-top:1rpx solid #4d4d4d;
+  width:600rpx;
   text-align: center;
+  line-height:100rpx;
 }
 
 .text10{

pages/main/systemsetting.wxml

@@ -4,6 +4,12 @@
     <view class="panelTitle1">通用</view>
     <view class="panelTitle2"></view>
   </view>
+  <view class="panelItem FlexRow" bindtap='goto' data-url="../other/family">
+    <view class="panelItem1">家庭用户</view>
+    <view class="panelItem2 FlexRow">
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
   <view class="panelItem FlexRow">
     <view class="panelItem1">按键音</view>
     <view class="panelItem2 FlexRow">

pages/other/family.js

@@ -0,0 +1,267 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+import constant from '../../utils/constant';
+
+const app = getApp();
+
+Page({
+  data: {
+    HelpList:constant.arrFamilyHelpList,
+    PanelType:0,
+  },
+  onPullDownRefresh: function () {
+    var that = this;
+    if (that.data.PanelType==0){
+      app.globalData.FamilyUsers=[];
+      var url = "GetUserFamily?UserID=" + app.globalData.userInfo.UserID + "&IsWeb=false";
+      main.getData(url, function (data) {
+        if (data) {
+          if (data.length > 0) {
+            app.globalData.FamilyUsers = data;
+            wx.redirectTo({
+              url: 'family',
+            })
+          }
+        }
+      });
+    }
+    
+    wx.stopPullDownRefresh();
+  },
+  onShow: function (options) {
+    var that = this;
+    if (app.globalData.userInfo.IsShow == 1) {
+      var today=wx.getStorageSync("AccreditLimitTime");
+      if (common.formatTime(new Date(),"-")>today){
+        wx.navigateTo({
+          url: '../index/accredit',
+        });
+      }
+    }
+  },
+  onLoad: function (options) {
+    var that = this;
+
+    var panelType=0;
+    if (options.PanelType)
+      panelType=options.PanelType;
+
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      FamilyUsers:app.globalData.FamilyUsers,
+      IsMember:app.globalData.userInfo.IsMember,
+      PanelType:panelType,
+    });
+
+    wx.setNavigationBarColor({
+      frontColor: "#000000",
+      backgroundColor: "#ffffff"
+    });
+
+    if (panelType==1){
+      that.setData({
+        MainUserID:options.MainUserID,
+        NickName:options.NickName,
+        HelpList:constant.arrFamilyHelpListAccept,
+        Time:options.Time,
+      });
+      that.download(options.AvatarUrl);
+      wx.setNavigationBarTitle({
+        title: '邀请函',
+      });
+    }
+  },
+  download: function (avatarUrl) {
+    var that = this;
+    wx.downloadFile({
+      url: avatarUrl,
+      success(res) {
+        if (res.statusCode === 200) {
+          that.setData({
+            AvatarUrl: res.tempFilePath,
+          });
+        }
+      }
+    });
+  },
+  showHelp:function(e){
+    var index=e.currentTarget.dataset.index;
+    var expand=e.currentTarget.dataset.expand;
+    this.data.HelpList[index].IsExpand=!this.data.HelpList[index].IsExpand;
+    this.setData({
+      HelpList:this.data.HelpList,
+    });
+  },
+  gotoReLaunch: function (e) {
+    var url = e.currentTarget.dataset.url;
+    wx.reLaunch({
+      url: url,
+    });
+  },
+  addUser:function(e){
+    var that=this;
+    if (!app.globalData.userInfo.IsMember){
+      wx.showModal({
+        title: '添加失败',
+        content: '只有秒过续费用户可使用。未续费和已过期的不能使用。',
+        showCancel: false,
+        confirmText: "知道了",
+        success(res) {},
+      });
+    }
+    else if (that.data.FamilyUsers.length>=2){
+      wx.showModal({
+        title: '添加失败',
+        content: '最多添加2名用户。如要替换请解除后重新添加。',
+        showCancel: false,
+        confirmText: "知道了",
+        success(res) {},
+      });
+    }
+  },
+  addUser2:function(e){    
+    setTimeout(function () {
+      wx.showModal({
+        title: '等待对方接受邀请',
+        content: '请尽快与对方联系确认邀请',
+        showCancel: false,
+        confirmText: "知道了",
+      });
+    }, 3000);
+  },
+  removeUser:function(e){
+    var that=this;
+    if (that.data.FamilyUsers.length==0){
+      wx.showModal({
+        title: '解除失败',
+        content: '尚未添加用户，不能解除。',
+        showCancel: false,
+        confirmText: "知道了",
+        success(res) {},
+      });
+    }
+    else{
+      wx.showModal({
+        title: '解除家庭用户吗',
+        content: '解除后重启小程序。对方不能再使用您的秒过。可重新添加用户。',
+        showCancel: true,
+        confirmText: "解除",
+        success(res) {
+          if (res.confirm) {
+            main.getData("updateMiaoguoFamily?UpdateType=delete&UserID=" + app.globalData.userInfo.UserID, function (data) {
+              app.globalData.FamilyUsers=[];
+              wx.reLaunch({
+                url: '../index/index?type=family',
+              });
+            });
+          }
+        },
+      });
+    }
+  },
+  accept:function(){
+    var that=this;
+    if (!app.globalData.userInfo.IsMember){
+      wx.showModal({
+        title: '接受失败',
+        content: '未续费的和有效期已过期的用户不能加入「家庭用户」。请先续费再接受邀请。',
+        showCancel: false,
+        confirmText: "知道了",
+        success(res) {},
+      });
+    }
+    else if (app.globalData.userInfo.ChildUserID>0){
+      wx.showModal({
+        title: '接受失败',
+        content: '「帐号绑定」的子账号不能加入「家庭用户」。只有有效期内的续费用户才能加入。',
+        showCancel: false,
+        confirmText: "知道了",
+        success(res) {},
+      });
+    }
+    else if (that.data.FamilyUsers.length>=2){
+      wx.showModal({
+        title: '接受失败',
+        content: '最多添加2名用户。如要替换请解除后重新添加。',
+        showCancel: false,
+        confirmText: "知道了",
+        success(res) {},
+      });
+    }
+    else if (that.data.MainUserID==app.globalData.userInfo.UserID){
+      wx.showModal({
+        title: '接受失败',
+        content: '不能自己和自己建立家庭帐号，请发给另外一个微信号。',
+        showCancel: false,
+        confirmText: "知道了",
+        success(res) {},
+      });
+    }
+    else{
+      wx.showModal({
+        title: '接受邀请吗',
+        content: '接受后重启小程序。对方可使用您的秒过。',
+        showCancel: true,
+        confirmText: "接受",
+        success(res) {
+          if (res.confirm) {
+            main.getData("updateMiaoguoFamily?UpdateType=add&Time="+that.data.Time+"&UserID=" + that.data.MainUserID+"&NewUserID=" + app.globalData.userInfo.UserID, function (data) {
+              if (data==0){
+                app.globalData.FamilyUsers=[];
+                wx.reLaunch({
+                  url: '../index/index?type=family',
+                });
+              }
+              else if (data<0){
+                var content="";
+                if (data==-1)
+                  content="本邀请已过期，请联系对方重新设置。";
+                else if (data==-2)
+                  content="您已经加入该「家庭用户」了。重启小程序后，在首页即可切换帐号。";
+                else if (data==-3)
+                  content="对方的「家庭用户」名额已满，请联系对方重新设置。";
+                
+                wx.showModal({
+                  title: '接受失败',
+                  content: content,
+                  showCancel: false,
+                  confirmText: "知道了",
+                  success(res) {
+                    if (data==-2){
+                      app.globalData.FamilyUsers=[];
+                      wx.reLaunch({
+                        url: '../index/index?type=family',
+                      });
+                    }
+                  },
+                });
+              }
+              
+            });
+          }
+        },
+      });
+    }
+  },
+  onShareAppMessage: function () {
+    if (this.data.PanelType==0 && this.data.FamilyUsers.length<2 && this.data.IsMember==1) {
+      var path=app.globalData.SharePath + '?type=family&PanelType=1&MainUserID=' + app.globalData.userInfo.UserID;
+      path += "&Time=" + common.formatTime(new Date(),"-");
+      path += "&NickName=" + app.globalData.userInfo.NickName;
+      path += "&AvatarUrl=" + app.globalData.userInfo.AvatarUrl;
+      
+      return {
+        title: app.globalData.ShareTitle,
+        path: path,
+        imageUrl: app.globalData.uploadImageUrl +"web/program_screenshot_jtyh.png",
+      }
+    }
+    else{
+      return {
+        title: app.globalData.ShareTitle,
+        path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+        imageUrl: app.globalData.ShareImage,
+      }
+    }
+  },
+})

pages/other/family.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "家庭用户",
+  "navigationBarBackgroundColor": "#ffffff",
+  "navigationBarTextStyle": "black",
+  "enablePullDownRefresh": true
+}

pages/other/family.wxml

@@ -0,0 +1,76 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <!-- 家庭用户主页 -->
+  <block wx:if="{{PanelType==0}}">
+    <view class="panel1 FlexRow">
+      <view class="panel11" >家庭用户</view>
+    </view>
+
+    <block wx:if="{{FamilyUsers.length>0}}">
+      <view class="panel20 panel2 FlexRow" wx:for="{{FamilyUsers}}" wx:key="*this">
+        <image class="avatar" src='{{item.AvatarUrl}}' />
+        <view class="panel21">{{item.NickName}}</view>
+      </view>
+      <view class="text1">务必再三确认对方身份。如加错人，请立即解除。</view>
+    </block>
+
+    <view class="panel2 FlexRow" bindtap="addUser" wx:if="{{FamilyUsers.length>=2 || IsMember==0}}">
+      <image class="universalpic_add_black_22x22" src='../images/universalpic_add_black_22x22.png' />
+      <view class="panel21">添加用户</view>
+    </view>
+
+    <button class="panel2_1 FlexRow" bindtap="addUser2" open-type='share' wx:if="{{FamilyUsers.length<2 && IsMember==1}}">
+      <image class="universalpic_add_black_22x22" src='../images/universalpic_add_black_22x22.png' />
+      <view class="panel21">添加用户</view>
+    </button>
+
+    <text class="panel3">可添加2名续费用户。\n建议仅在家人之间使用，不要添加陌生人或群聊。</text>
+
+    <view class="panel2 FlexRow" bindtap="removeUser">
+      <view class="panel22 panel21">解除并退出</view>
+    </view>
+  </block>
+
+  <!-- 邀请函 -->
+  <block wx:if="{{PanelType==1}}">
+    <view class="panel20 panel2 FlexRow" >
+      <image class="avatar" src='{{AvatarUrl}}' />
+      <view class="panel21">{{NickName}}</view>
+    </view>
+
+    <view class="panel1 FlexRow">
+      <text class="panel12" >以上用户邀请您加入Ta的秒过「家庭用户」。加入后你们可以在一个微信上切换彼此的秒过帐号。Ta可使用您的秒过，您也能使用Ta的。\n请务必核实对方身份，慎重接受邀请。</text>
+    </view>
+
+    <view class="panel41 FlexRow">
+      <view class="panel412 panel411">加入条件和风险提醒</view>
+      <view></view>
+    </view>
+
+    <text class="panel43">① 您的必须是秒过已续费并在有效期内的用户。\n\n② 您从未加入过其他「家庭用户」或加入的「家庭用户」额度未满2人。\n\n③ 加入后，对方可使用您的秒过，所有操作均视为您本人的行为，期间造成的隐私泄露、数据损失等问题，均由您自行承担。请务必在认真确认对方身份后再决定是否接受本邀请。</text>
+    
+    <view class="panelBottom FlexRow">
+      <view class="btn" catchtap="gotoReLaunch" data-url="../index/index">拒绝</view>
+      <view class="btn" catchtap="accept" >接受</view>
+    </view>
+  </block>
+
+  <view class="panel1 FlexRow">
+    <view class="panel11" >帮助</view>
+  </view>
+  <view class="panel4 FlexColumn">
+    <block wx:for="{{HelpList}}" wx:key="*this">
+      <view class="line" wx:if="{{index>0}}"></view>
+      <view class="panel41 FlexRow" bindtap="showHelp" data-index="{{index}}" data-expand="{{item.IsExpand}}">
+        <view class="panel411">{{item.Title}}</view>
+        <image class="icon_fold_3" src='../images/icon_fold_3.png' wx:if="{{!item.IsExpand}}" />
+        <image class="icon_fold_3" src='../images/icon_fold_4.png' wx:if="{{item.IsExpand}}" />
+      </view>
+      <text class="panel42" wx:if="{{item.IsExpand}}">{{item.Content}}</text>
+    </block>
+  </view>
+  <view style="height:60rpx;"></view>
+  <view style="height:100rpx;" wx:if="{{PanelType==1}}"></view>
+</view>
+
+
+

pages/other/family.wxss

@@ -0,0 +1,151 @@
+.panel1{
+  width:100%;
+  justify-content: flex-start;
+}
+
+.panel11{
+  margin: 60rpx 0 0 30rpx;
+  font-size: 36rpx;
+  color: #4D4D4D;
+}
+
+.panel12{
+  margin: 30rpx 0 0 30rpx;
+  font-size: 36rpx;
+  color: #4D4D4D;
+  width: 690rpx;
+}
+
+.panel2{
+  background: #FFFFFF;
+  border-radius: 20rpx;
+  width:710rpx;
+  height:100rpx;
+  margin-top: 60rpx;
+  justify-content: flex-start;
+}
+
+.panel2_1{
+  background-color: #FFFFFF;
+  border-radius: 20rpx;
+  width:710rpx;
+  height:100rpx;
+  margin: 60rpx 0 0 0;
+  justify-content: flex-start;
+  padding: 0;
+  box-sizing:inherit;
+  outline: none;
+}
+
+button::after {
+  border: none;
+}
+
+
+.universalpic_add_black_22x22{
+  width:22rpx;
+  height: 22rpx;
+  margin-left: 39rpx;
+}
+
+.panel21{
+  margin-left: 20rpx;
+  font-size: 28rpx;
+  color: #4D4D4D;
+}
+.panel22{
+  margin-left: 30rpx;
+}
+
+.panel3{
+  width:690rpx;
+  text-align: start;
+  font-size:24rpx;
+  font-weight: 400;
+  color:#4D4D4D;
+  margin-top: 30rpx;
+}
+
+.panel4{
+  width: 690rpx;
+}
+.panel41{
+  width:690rpx;
+  justify-content: space-between;
+}
+.panel411{
+  font-size: 28rpx;
+  color: #4D4D4D;
+  margin: 30rpx 0;
+}
+
+.panel412{
+  margin: 60rpx 0 30rpx 0;
+}
+
+.icon_fold_3{
+  width:26rpx;
+  height:16rpx;
+}
+
+.line{
+  width:720rpx;
+  height:1rpx;
+  background-color: #D2D2D2;
+}
+
+.panel42{
+  font-size: 24rpx;
+  color: #4D4D4D;
+  font-weight: 400;
+  margin-bottom: 30rpx;
+}
+
+.panel20{
+  height:120rpx;
+  margin:30rpx 0 0 0;
+}
+
+.avatar{
+  border-radius: 30rpx;
+  width:60rpx;
+  height:60rpx;
+  margin-left:30rpx;
+}
+
+.text1{
+  width:690rpx;
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #4D4D4D;
+  margin-top: 30rpx;
+}
+
+
+.panel43{
+  width:690rpx;
+  font-size: 24rpx;
+  color: #4D4D4D;
+  font-weight: 400;
+  margin-bottom: 30rpx;
+}
+
+.panelBottom{
+  position: fixed;
+  bottom:0;
+  width:100%;
+  height:120rpx;
+  border-top:1rpx solid #d2d2d2;
+  background-color: #fff;
+}
+
+.btn{
+  width:345rpx;
+  line-height:80rpx;
+  text-align: center;
+  background: #FFFFFF;
+  border: 1px solid #9B9B9B;
+  border-radius: 10rpx;
+  font-size: 32rpx;
+  margin: 0 10rpx;
+}

pages/other/userbook.js

@@ -132,6 +132,16 @@ Page({
         PanelShow: panelShow,
       });
     }
+
+    if (that.data.IsLoseEfficacy==1 && that.data.MainUserID!=that.data.UserID){
+      wx.showModal({
+        title: '帐号过期',
+        content: '该帐号已过期，重启微信可回到您原本的秒过，「家庭用户」已自动解除。如想为该帐号续费，请使用该帐号原本对应的微信打开秒过就能续费了（其它微信不能代付）。',
+        showCancel: false,
+        confirmText: "知道了",
+        success(res) {},
+      });
+    }
   },
   onShow:function(){
     var that=this;

pages/other/userbook.wxml

@@ -27,9 +27,9 @@
     </view>
     <view class="panel2 FlexRow" wx:if="{{IsShow==1 && ClassDayNumber>=0 && ((ClassDayNumber<ClassTotalDayNumber && IsPay==0) || IsPay==1)}}">
       
-      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/coupon" wx:if="{{IsPay==1}}">
+      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/coupon" wx:if="{{IsPay==1 && MainUserID==UserID}}">
         <image class="usermanual_index_handshake" src='../images/usermanual_index_coupon.png' />
-        <view>优惠券</view>
+        <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 && MainUserID==UserID }}">

project.private.config.json

@@ -12,7 +12,7 @@
         {
           "name": "pages/index/index",
           "pathName": "pages/index/index",
-          "query": "type=marketing",
+          "query": "type=family&PanelType=1&Time=2022-07-29 14:06:44&MainUserID=2&NickName=万戍仁&AvatarUrl=https://thirdwx.qlogo.cn/mmopen/vi_32/o7M9drMKflfW78mJrM9NX7hqPfyBaC4kic0IZ7Nw473oTlgERksibvlViauEiaiayIicT3cs7a5r9UcbKVSLnYhbCoNg/132",
           "launchMode": "default",
           "scene": 1007
         },