1.2.0

app.json

@@ -16,6 +16,7 @@
     "pages/main/searchWeb1",
     "pages/main/searchWeb",
     "pages/main/detail",
+    "pages/main/systemsetting",
     
     "pages/plan/recommend",
     "pages/plan/clicktype",

marketing/main/extenduser.js

@@ -156,7 +156,7 @@ Page({
     return {
       title: app.globalData.ShareTitle,
       path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: app.globalData.ShareImage,
+      imageUrl: "../images/program_screenshot_promotion.png",
     }
   },
 });

marketing/main/index.js

@@ -25,7 +25,7 @@ Page({
     return {
       title: app.globalData.ShareTitle,
       path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: app.globalData.ShareImage,
+      imageUrl: "../images/program_screenshot_promotion.png",
     }
   },
 });

pages/index/index.js

@@ -213,7 +213,7 @@ Page({
 
           //测试
           //var url = '../../package4/main/giftcard?GiftID=89542&UserID=1';
-          //var url = '../main/share';
+          //var url = '../other/homework';
           // var url = '../../marketing/main/index';
           // wx.redirectTo({
           //   url: url,

pages/main/add.js

@@ -419,7 +419,7 @@ Page({
       });
       timeoutUploadImage = setTimeout(function () {
         wx.hideLoading();
-      }, 15000);
+      }, 30000);
     }
 
     interval = setInterval(function () {

pages/main/detail.js

@@ -611,14 +611,14 @@ Page({
         that.setSoundFile(3);
         if (time == "1d") {
           wx.showToast({
-            title: '今天不练',
+            title: '搁置一天',
             mask: true,
             image: "../images/universalpic_shelve_white_120x120.png",
           });
         }
         else {
           wx.showToast({
-            title: '已延后',
+            title: '已推迟',
             mask: true,
             image: "../images/universalpic_bell_white_120x120.png",
           });
@@ -787,12 +787,18 @@ Page({
     this.setData({
       IsShowNumberInfo: true,
     });
+    wx.setNavigationBarTitle({
+      title: "进度"
+    });
   },
   closeNumberContainner: function () {
     this.setData({
       IsShowNumberInfo: false,
       IsMore: false,
     });
+    wx.setNavigationBarTitle({
+      title: "学习中"
+    });
   },
   showImage: function (e) {
     var name = e.currentTarget.dataset.name;

pages/main/detail.wxml

@@ -53,9 +53,9 @@
     </view>
 
     <view class="panelField10" style='background-color:{{Color.BackColor}};'></view>
-    
+
     <template is="CardShow" data="{{Color:Color,Field:TaskInfo.ContentNew.Field,Tags:TaskInfo.ContentNew.Tags,IsShowAnswer:IsShowAnswer,TagWidth:TaskInfo.TagWidth,FontSize:TaskInfo.FontSize}}" />
-    
+
     <view class='footer0'></view>
 
     <!-- 下方按钮 -->
@@ -138,35 +138,36 @@
   </block>
   <!-- 今日任务量 -->
   <view wx:if="{{IsShowNumberInfo}}" class="numberContainer FlexColumn" style='height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}};'>
-    <view class="numberContainer11 FlexRow">
-      今日剩余任务量
-    </view>
-    <view class="numberContainer12 FlexRow">
-      <view class='left'>新题卡</view>
-      <view class='right3'>{{NumberNew}}张</view>
-    </view>
-    <view class="lineWidthAll FlexRow">
-      <view class="lineWidth720"></view>
-    </view>
-    <view class="numberContainer12 FlexRow">
-      <view class='left'>旧题卡</view>
-      <view class='right3'>{{NumberHistory}}张</view>
-    </view>
-    <view class="lineWidthAll FlexRow">
-      <view class="lineWidth720"></view>
-    </view>
-    <view class="numberContainer12 FlexRow">
-      <view class='left'>需要及时强化</view>
-      <view class='right3'>{{NumberReview}}张</view>
-    </view>
-    <view class="lineWidthAll FlexRow">
-      <view class="lineWidth720"></view>
-    </view>
-    <view class="numberContainer12 FlexRow">
-      <view class='left'>总计</view>
-      <view class='right3' style='color:{{Color.LineColor}};'>{{NumberNew+NumberReview+NumberHistory}}张</view>
+    <view class="numberContainerFooter1 FlexColumn">
+      <view class='lineFooter'></view>
+      <view class="numberContainer12 FlexRow">
+        <view class='left'>新题卡</view>
+        <view class='right3'>{{NumberNew}}张</view>
+      </view>
+      <view class="lineWidthAll FlexRow">
+        <view class="lineWidth720"></view>
+      </view>
+      <view class="numberContainer12 FlexRow">
+        <view class='left'>旧题卡</view>
+        <view class='right3'>{{NumberHistory}}张</view>
+      </view>
+      <view class="lineWidthAll FlexRow">
+        <view class="lineWidth720"></view>
+      </view>
+      <view class="numberContainer12 FlexRow">
+        <view class='left'>及时强化</view>
+        <view class='right3'>{{NumberReview}}张</view>
+      </view>
+      <view class="lineWidthAll FlexRow">
+        <view class="lineWidth720"></view>
+      </view>
+      <view class="numberContainer12 FlexRow">
+        <view class='left'>剩余任务</view>
+        <view class='right3' style='color:{{Color.LineColor}};'>{{NumberNew+NumberReview+NumberHistory}}张</view>
+      </view>
+      <view class='lineFooter'></view>
+    
     </view>
-    <view class='lineFooter'></view>
     <view class="numberContaineFooter FlexRow" catchtap='closeNumberContainner'>
       <view>关闭</view>
     </view>
@@ -203,8 +204,8 @@
           </view>
         </view>
       </view>
+      <view class='lineFooter'></view>
     </view>
-    <view class='lineFooter'></view>
     <view class="numberContaineFooter FlexRow" catchtap='closeNumberContainner'>
       <view>关闭</view>
     </view>

pages/main/preview.wxml

@@ -6,7 +6,7 @@
     <view class="panelTop FlexRow">
       <view class='left FlexColumn'>
         <view class="text3" bindtap='practiceToday' hidden="{{!IsTodayPractice}}">今天必练</view>
-        <view class="text4 text3" bindtap='shelveTask' hidden="{{IsTodayPractice}}">今天不练</view>
+        <view class="text4 text3" bindtap='shelveTask' hidden="{{IsTodayPractice}}">搁置</view>
       </view>
       <view class='right FlexRow'>
         <view class="panelTopBtn FlexRow" bindtap='getDetailInfo'>

pages/main/searchCard.js

@@ -43,6 +43,11 @@ Page({
       url: './searchCard1',
     })
   },
+  gotoSystemsetting: function(e) {
+    wx.navigateTo({
+      url: './systemsetting',
+    })
+  },
   
   getList: function (e) {
     wx.showLoading({

pages/main/searchCard.wxml

@@ -3,7 +3,7 @@
     <view class="panelSearch FlexRow">
       <view class="panelSearch1 FlexRow" bindtap="onSearch">
         <image class="universalpic_search_gray_30x30" src='../images/universalpic_search_gray_30x30.png' />
-        <view>搜索题卡</view>
+        <view>搜索我的题卡</view>
       </view>
     </view>
     <view class='panelBtn FlexColumn'>
@@ -14,33 +14,43 @@
         <view class="panelItem2 FlexRow">
           <view>{{CardNumber}}</view>
           <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
-        
         </view>
       </view>
       <view class="lineWidthAll FlexRow">
         <view class="lineWidth720"></view>
       </view>
+      <view class="panelItem FlexRow" bindtap="getList" data-id="0" data-iscollect="1">
+        <view class="panelItem1 FlexRow">
+          <image class="universalpic_fav_default_gray_26x24" src='../images/universalpic_fav_default_gray_26x24.png' />
+          <view>收藏夹</view>
+        </view>
+        <view class="panelItem2 FlexRow">
+          <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
+        </view>
+      </view>
+    </view>
+    <view class='lineFooter'></view>
+    <view class='panelBtn FlexColumn'>
       <view class="panelItem FlexRow" bindtap="getList" data-id="1">
         <view class="panelItem1">
-          今天剩余任务量
+          任务清单
         </view>
         <view class="panelItem2 FlexRow">
           <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
         </view>
       </view>
-      <view class="lineWidthAll FlexRow">
-        <view class="lineWidth720"></view>
-      </view>
-      <view class="panelItem FlexRow" bindtap="getList" data-id="0" data-iscollect="1">
-        <view class="panelItem1 FlexRow">
-          <image class="universalpic_fav_default_gray_26x24" src='../images/universalpic_fav_default_gray_26x24.png' />
-          <view>幻灯片</view>
+    </view>
+    <view class='lineFooter'></view>
+
+    <view class='panelBtn FlexColumn'>
+      <view class="panelItem FlexRow" bindtap="gotoSystemsetting">
+        <view class="panelItem1">
+          系统设置
         </view>
         <view class="panelItem2 FlexRow">
           <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
         </view>
       </view>
-      
     </view>
     <view class='lineFooter'></view>
   </view>

pages/main/searchCardList.js

@@ -29,12 +29,12 @@ Page({
     else if (options.type == 1) {
       IsToday = 1;
       wx.setNavigationBarTitle({
-        title: "剩余任务"
+        title: "任务清单"
       });
     }
     else if (options.IsCollect == 1) {
       wx.setNavigationBarTitle({
-        title: "幻灯片"
+        title: "收藏夹"
       });
       IsCollect = 1;
     }
@@ -115,7 +115,7 @@ Page({
     // }
 
 
-    if (!that.data.IsCollect && !that.data.IsToday) {
+    if (!that.data.IsCollect && !that.data.IsToday && !that.data.Search) {
       main.getData("GetUserCardCount?UserID=" + app.globalData.userInfo.UserID, function (data) {
         if (data) {
           that.setData({
@@ -129,11 +129,16 @@ Page({
             List: list,
             HasPage: hasPage,
           });
-
-
         }
       });
     }
+    else if (that.data.Search){
+      that.setData({
+        List: list,
+        Count: list.length,
+        HasPage: false,
+      });
+    }
     else {
       that.setData({
         Count: list.length,

pages/main/searchCardList.wxml

@@ -7,7 +7,9 @@
       </view>
     </view>
     <view class="panelTop0 FlexRow">
-      <view class='panelTop1 FlexRow' bindtap='addCard'>
+      <view class='panelTop1' wx:if='{{IsCollect || IsToday}}'>
+      </view>
+      <view class='panelTop1 FlexRow' bindtap='addCard' wx:if='{{!IsCollect && !IsToday}}'>
         <image class="universalpic_add_black_30x30" src='../images/universalpic_add_black_30x30.png' />
       </view>
       <view>{{Count}}张题卡</view>
@@ -69,10 +71,20 @@
   <block wx:if="{{List.length==0}}">
 
     <view style="height:110rpx;" wx:if="{{Search}}"></view>
-    <view class='panelNull FlexColumn'>
+    <view class='panelNull FlexColumn' wx:if="{{!IsCollect && !IsToday}}">
       <view class='Text3'>无匹配</view>
       <view class='Text4'>从左上角按钮添加新题卡</view>
     </view>
+
+    <view class='panelNull FlexColumn' wx:if="{{IsCollect}}">
+      <view class='Text3'>没有题卡</view>
+      <view class='Text4'>在“查看题卡、学习中”界面里，点爱心图标把题卡收藏到这里。</view>
+    </view>
+
+    <view class='panelNull FlexColumn' wx:if="{{IsToday}}">
+      <view class='Text3'>今天剩余任务量</view>
+      <view class='Text4'>没有需要练习的题卡了。</view>
+    </view>
   </block>
 </view>
 

pages/main/systemsetting.js

@@ -0,0 +1,75 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    List: [],
+    IsPay: true,
+    IsShow: 0,
+  },
+  onLoad: function (options) {
+    var that = this;
+    var childUserID = 0;
+    if (app.globalData.userInfo.ChildUserID && app.globalData.userInfo.ChildUserID != undefined)
+      childUserID = app.globalData.userInfo.ChildUserID;
+    var productServiceTime = common.formatDateCHS(common.formatTime(new Date(app.globalData.userInfo.ProductServiceTime)));
+    var today15 = common.formatDateCHS(common.formatTime(common.addDate("d", 15, new Date())));
+    var isPay = true;
+    if (productServiceTime > today15) {
+      isPay = false;
+    }
+
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      ProgramName: app.globalData.ProgramName,
+      Version: app.globalData.Version,
+      ProductServiceTime: productServiceTime,
+      IsPay: isPay,
+      IsShow: app.globalData.IsShow,
+      ChildUserID: childUserID,
+    });
+  },
+  gotoPay: function () {
+    var payindex = 3;
+    if (app.globalData.userInfo.IsFinishTask == 1)
+      payindex = 2;
+
+    wx.navigateTo({
+      url: '../other/pay?paypanel=1&payindex=' + payindex,
+    });
+  },
+  gotoBinding: function () {
+    wx.navigateTo({
+      url: '../other/binding',
+    })
+  },
+
+  updateMember: function () {
+    wx.reLaunch({
+      url: '../index/index',
+    })
+  },
+  gotoPayTemp: function (e) {
+    if (app.globalData.userInfo.UserID <= 7) {
+      wx.navigateTo({
+        url: '../other/pay?paypanel=0&payindex=0',
+      });
+    }
+  },
+  gotoLesson: function () {
+    if (app.globalData.userInfo.UserID <= 7) {
+      wx.navigateTo({
+        url: '../other/lessonlist',
+      });
+    }
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/main/systemsetting.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "系统设置",
+  "backgroundColor": "#F0F0F0",
+  "backgroundTextStyle": "dark",
+  "enablePullDownRefresh": true
+}

pages/main/systemsetting.wxml

@@ -0,0 +1,44 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+
+  <view class="panelTitle FlexRow">
+    <view class="panelTitle1">帐号</view>
+    <view class="panelTitle2"></view>
+  </view>
+  <view class="panelItem FlexRow">
+    <view class="panelItem1">有效期</view>
+    <view class="panelItem2 FlexRow">
+      {{ProductServiceTime}}
+    </view>
+  </view>
+  <!-- <view class="lineWidthAll FlexRow">
+    <view class="lineWidth720"></view>
+  </view>
+  <view class="panelItem FlexRow" bindtap='gotoPay'>
+    <view class="panelItem1">续费</view>
+    <view class="panelItem2 FlexRow">
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view> -->
+  <view class='lineFooter'></view>
+
+  <view class="panelTitle FlexRow">
+    <view class="panelTitle1">通用</view>
+    <view class="panelTitle2"></view>
+  </view>
+  <view class="panelItem FlexRow" bindtap='gotoBinding'>
+    <view class="panelItem1">帐号绑定</view>
+    <view class="panelItem2 FlexRow">
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
+
+
+  <view class="panelItem00 panelItem FlexRow" bindtap='updateMember'>
+    重启小程序
+  </view>
+  <view class='lineFooter'></view>
+  <view style='width:100%;height:50rpx;' bindtap='gotoPayTemp'></view>
+  <text class='text1'>©2016-2019 {{ProgramName}}\n唱意教育微信小程序 版本 {{Version}}</text>
+  <view style='width:100%;height:100rpx;' bindtap='gotoLesson'></view>
+
+</view>

pages/main/systemsetting.wxss

@@ -0,0 +1,62 @@
+.panelTitle{
+  width:100%;
+  margin-top: 50rpx;
+  justify-content: space-between;
+}
+.panelTitle .panelTitle1{
+  font-size:32rpx;
+  margin-left: 30rpx;
+  margin-bottom: 30rpx;
+}
+.panelTitle .panelTitle2{
+  font-size:28rpx;
+  margin-right: 30rpx;
+  background-color: #1e1e1e;
+  color:#fff;
+  border-radius: 22rpx;
+  text-align: center;
+  padding: 0 20rpx;
+  margin-bottom: 32rpx;
+}
+
+.panelItem{
+  width:100%;
+  justify-content: space-between;
+  font-size:28rpx;
+  height:100rpx;
+  background-color: #fff;
+}
+
+.panelItem0{
+  height:133rpx;
+}
+.panelItem00{
+  margin-top: 50rpx;
+  line-height: 100rpx;
+  font-size:28rpx;
+  font-weight: 400;
+  justify-content: center;
+}
+
+.panelItem .panelItem1{
+  margin-left: 30rpx;
+  font-weight: 400;
+}
+.panelItem .panelItem2{
+  margin-right: 30rpx;
+  color:#787878;
+  font-weight: 400;
+}
+
+.Arrow{
+  width:16rpx;
+  height:26rpx;
+  margin-left: 30rpx;
+}
+
+
+.text1{
+  font-size:24rpx;
+  text-align: center;
+  color:#787878;
+}

pages/other/binding.wxml

@@ -1,4 +1,6 @@
 <view wx:if="{{ShowPanel=='binding'}}" class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <text class="text3">请仔细阅读协议并谨慎操作，\n请再三确定对方身份（禁止转发聊天群）</text>
+
   <text class="text2">使用协议：\n
 1）绑定帐号用于：与家人一同督导孩子学习，在您繁忙时，由另一位家长的微信帐号继续学习，或与孩子专用的微信帐号分立。这是官方唯一认可的用途。\n
 2）绑定后并非共享、分享您的数据，而是与对方一起使用您名下的数据。\n
@@ -8,10 +10,9 @@
 6）发现绑定错误，请立即解绑。期间造成的隐私、数据等问题由个人承担。再次提醒您谨慎使用这项功能。
   </text>
 
-  <text class="text3">请仔细阅读协议并谨慎操作，\n请再三确定对方身份（禁止转发聊天群）</text>
-
-  <button class='btn' bindtap='shareFinished' open-type='share'>同意并转发绑定申请</button>
-  <view style='height:100rpx;'></view>
+  <view class="panelBottom FlexRow">
+    <button class='btn' bindtap='shareFinished' open-type='share'>同意并转发绑定申请</button>
+  </view>
 </view>
 
 <view wx:if="{{ShowPanel=='unbinding'}}" class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
@@ -30,9 +31,9 @@
 6）发现绑定错误，请立即解绑。期间造成的隐私、数据等问题由个人承担。再次提醒您谨慎使用这项功能。
   </text>
 
-  <button class='btn2 btn' bindtap='gotoUnBinding'>解除绑定</button>
-  <view style='height:100rpx;'></view>
-
+  <view class="panelBottom FlexRow">
+    <button class='btn2 btn' bindtap='gotoUnBinding'>解除绑定</button>
+  </view>
 </view>
 
 
@@ -44,6 +45,8 @@
   </view>
   <view class='lineFooter'></view>
 
+  <text class="text4">请仔细阅读协议并答复</text>
+
   <text class="text2">使用协议：\n
 1）《秒过学习》的绑定帐号功能用于：与家人一同督导孩子学习，在您繁忙时，由另一位家长的微信帐号继续学习，或与孩子专用的微信帐号分立。这是官方唯一认可的用途。\n
 2）绑定后并非共享、分享邀请人的数据，而是一起使用邀请人名下的数据。\n
@@ -52,10 +55,9 @@
 5）发现绑定错误，请立即通过微信联系邀请人。对方可能是您的直接联系人或某个群聊里的用户，请自行查找和解决。\n
 6）绑定期间造成的一系列涉及但不限于个人隐私、数据安全等问题、责任及后果，主子账号共同承担。再次提醒您谨慎答复这则邀请。
   </text>
-  <text class="text3">请仔细阅读协议并答复</text>
-  <view class="panelBtn FlexRow">
+
+  <view class="panelBottom FlexRow">
     <navigator class='btn3 btn' open-type="exit" target="miniProgram">拒绝</navigator>
-    <button class='btn4 btn' bindtap='gotoBinding'>接受</button>
+    <button class='btn3 btn' bindtap='gotoBinding'>接受</button>
   </view>
-  <view style='height:100rpx;'></view>
 </view>

pages/other/binding.wxss

@@ -10,27 +10,46 @@
   margin-top: 30rpx;
   width:690rpx;
   font-weight: 400;
+  line-height: 28rpx;
 }
 
 .text3{
+  width:690rpx;
   font-size:28rpx;
   margin: 60rpx 0 0 0;
   font-weight: 400;
-  text-align: center;
   line-height: 40rpx;
 }
 
+.text4{
+  width:690rpx;
+  font-size:28rpx;
+  margin: 30rpx 0 0 0;
+  font-weight: 400;
+  line-height: 40rpx;
+}
+
+.panelBottom{
+  width:100%;
+  height:120rpx;
+  border-top:1rpx solid #D2D2D2;
+  background-color: #fff;
+  position: fixed;
+  bottom:0;
+  justify-content: center;
+  align-items: center;
+}
+
 .btn{
   width:690rpx;
-  height:90rpx;
+  height:80rpx;
   text-align: center;
   border:1rpx solid #9B9B9B;
-  font-size:36rpx;
-  line-height: 90rpx;
-  border-radius: 14rpx;
-  color:#787878;
+  font-size:33rpx;
+  line-height: 80rpx;
+  border-radius: 10rpx;
+  color:#1E1E1E;
   background-color: #fff;
-  margin-top: 30rpx;
 }
 
 .userinfo{
@@ -55,18 +74,10 @@
 }
 
 .btn2{
-  margin-top: 60rpx;
-  background-color: #B3443B;
-  color:#fff;
-}
-.btn3{
-  background-color: #B3443B;
-  color:#fff;
-  width:290rpx;
-  margin: 30rpx 10rpx;
+  color:#B3443B;
 }
 
-.btn4{
-  width:290rpx;
-  margin: 30rpx 10rpx;
+.btn3{
+  width:345rpx;
+  margin: 0 10rpx;
 }

pages/other/homework.js

@@ -21,17 +21,51 @@ Page({
 
     main.getData("GetMiaoguoCheckList?UserID=" + userid, function (data) {
       if (data) {
-        that.setData({
-          FinishedCount:data.FinishedCount,
-          List: data.List,
-          NickName: data.NickName,
-          AvatarUrl: data.AvatarUrl,
+
+        common.getStorageValue(that, "HomeworkListClick", [0,0,0], function () {
+
+          if (that.data.HomeworkListClick[1] == 0) {
+            data.List[1].Finished = 0;
+            data.FinishedCount -= 10;
+          }
+          if (that.data.HomeworkListClick[2] == 0) {
+            data.List[2].Finished = 0;
+            data.FinishedCount -= 10;
+          }
+
+          that.setData({
+            FinishedCount: data.FinishedCount,
+            List: data.List,
+            NickName: data.NickName,
+            AvatarUrl: data.AvatarUrl,
+          });
         });
       }
     });
 
     app.globalData.Homework=0;
   },
+  clickOK:function(e){
+    var that = this;
+    var index=e.currentTarget.dataset.index;
+    common.getStorageValue(that, "HomeworkListClick", [0, 0, 0], function () {
+      that.data.List[index].Finished = 1;
+      that.data.FinishedCount += 10;
+
+      that.setData({
+        FinishedCount: that.data.FinishedCount,
+        List: that.data.List,
+      });
+
+      that.data.HomeworkListClick[index]=1;
+      wx.setStorageSync("HomeworkListClick", that.data.HomeworkListClick);
+    });
+  },
+  gotoLessonList:function(){
+    wx.navigateTo({
+      url: '../other/lessonlist',
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: "作业清单",

pages/other/homework.wxml

@@ -1,88 +1,151 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class='userinfo FlexRow'>
-    <image class='avatar' src="{{AvatarUrl}}" />
-    <view class="nickname">{{NickName}}</view>
+    <view class="left FlexRow">
+      <image class='avatar' src="{{AvatarUrl}}" />
+      <view class="nickname">{{NickName}}</view>
+    </view>
+    <image src="../images/checklist_nameline_illus.png" class="checklist_nameline_illus" />
   </view>
-  <view class='panelItem FlexRow'>
-    <view class='panelItem1'>作业进度</view>
+  <view class='panelItem0 panelItem FlexRow'>
+    <view class='panelItem1 FlexColumn'>
+      <view class="panelItem01">总进度</view>
+      <view class="panelItem02">由以下10个项目组成（下拉刷新结果）</view>
+    </view>
     <view class='panelItem2'>{{FinishedCount}}%</view>
   </view>
   <view class='lineFooter'></view>
 
   <view class="panelTitle FlexRow">
-    <view class="panelTitle1">课前准备</view>
+    <view class="panelTitle1 FlexColumn">
+      <view class="">热身准备</view>
+      <view class="panelTitle11">有2个项目，由您自行检查是否做到。</view>
+    </view>
     <view></view>
   </view>
   <block wx:for="{{[List[1],List[2]]}}" wx:key="*this">
     <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
       <view class="lineWidth720"></view>
     </view>
-    <view class='panelItem FlexRow'>
+    <view class='panelItem FlexRow' wx:if="{{item.Finished<item.Max}}" >
+      <view class='panelItem1 FlexRow'>
+        <view class='Number'>{{index+1}}</view>
+        <view class='panelItem11'>{{item.Title}}</view>
+      </view>
+      <view class="btn" bindtap="clickOK" data-index="{{index+1}}">做到了</view>
+    </view>
+
+    <view class='panelItem FlexRow' wx:if="{{item.Finished>=item.Max}}" >
       <view class='panelItem1 FlexRow'>
-        <view wx:if="{{!item.Finished}}" class='Number'>{{index+3}}</view>
-        <image wx:if="{{item.Finished}}" class='universalpic_checked_blue_40x40' src='../images/universalpic_checked_blue_40x40.png' />
+        <image class='universalpic_checked_blue_40x40' src='../images/universalpic_checked_blue_40x40.png' />
         <view class='panelItem11'>{{item.Title}}</view>
       </view>
       <view></view>
     </view>
   </block>
   <view class='lineFooter'></view>
+  <text class='panelRemark'>说明：收集错题从作业本、近期考卷做起，逐步拓展到从阅读、课外学习、日常对话中收集。</text>
 
   <view class="panelTitle FlexRow">
-    <view class="panelTitle1">看课程</view>
+    <view class="panelTitle1 FlexColumn">
+      <view class="">课程自学</view>
+      <view class="panelTitle11">有4节课，自动检查。建议先收看课程再开始操作。</view>
+      <view class="panelTitle12" bindtap="gotoLessonList">去收看</view>
+    </view>
     <view></view>
   </view>
   <block wx:for="{{[List[3],List[4],List[5],List[6]]}}" wx:key="*this">
     <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
       <view class="lineWidth720"></view>
     </view>
-    <view class='panelItem FlexRow'>
-      <view class='panelItem1 FlexRow'>
-        <view wx:if="{{!item.Finished}}" class='Number'>{{index+3}}</view>
-        <image wx:if="{{item.Finished}}" class='universalpic_checked_blue_40x40' src='../images/universalpic_checked_blue_40x40.png' />
-        <view class='panelItem11'>{{item.Title}}</view>
+
+    <view class='panelItem FlexRow' wx:if="{{item.Finished<item.Max}}">
+      <view class='panelItem1_1 FlexRow'>
+        <view class='Number'>{{index+3}}</view>
+        <view class='panelItem11 FlexColumn'>
+          <view class="panelTitle10">{{item.Title}}</view>
+          <view class="panelTitle111">{{item.Remark}}</view>
+        </view>
+      </view>
+      <view class="Number2">{{item.Finished}}%</view>
+    </view>
+
+    <view class='panelItem FlexRow' wx:if="{{item.Finished>=item.Max}}">
+      <view class='panelItem1_1 FlexRow'>
+        <image class='universalpic_checked_blue_40x40' src='../images/universalpic_checked_blue_40x40.png' />
+        <view class='panelItem11 FlexColumn'>
+          <view class="panelTitle10">{{item.Title}}</view>
+          <view class="panelTitle111">{{item.Remark}}</view>
+        </view>
       </view>
       <view></view>
     </view>
   </block>
   <view class='lineFooter'></view>
+  <text class='panelRemark'>说明：先上课后操作。急于上手可能导致事倍功半。秒过并非单纯工具而是完整的学习方法，其中包含一些与传统习俗大为不同的方式。\n\n正常收看就能过关。锁屏可以收听，但不统计百分比。想要快速过关？每节课60%章节标题慢慢点一遍即可。</text>
 
   <view class="panelTitle FlexRow">
-    <view class="panelTitle1">课后练习</view>
+    <view class="panelTitle1 FlexColumn">
+      <view class="">实践操作</view>
+      <view class="panelTitle11">有2个项目，自动检查。</view>
+    </view>
     <view></view>
   </view>
   <block wx:for="{{[List[7],List[8]]}}" wx:key="*this">
     <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
       <view class="lineWidth720"></view>
     </view>
-    <view class='panelItem FlexRow'>
+    <view class='panelItem FlexRow' wx:if="{{item.Finished<item.Max}}">
       <view class='panelItem1 FlexRow'>
-        <view wx:if="{{!item.Finished}}" class='Number'>{{index+7}}</view>
-        <image wx:if="{{item.Finished}}" class='universalpic_checked_blue_40x40' src='../images/universalpic_checked_blue_40x40.png' />
+        <view class='Number'>{{index+7}}</view>
+        <view class='panelItem11'>{{item.Title}}</view>
+      </view>
+      <view class="Number2" wx:if="{{index==0}}">已有{{item.Finished}}张</view>
+      <view class="Number2" wx:if="{{index==1}}">已累计{{item.FinishedStr}}</view>
+    </view>
+
+    <view class='panelItem FlexRow' wx:if="{{item.Finished>=item.Max}}">
+      <view class='panelItem1 FlexRow'>
+        <image class='universalpic_checked_blue_40x40' src='../images/universalpic_checked_blue_40x40.png' />
         <view class='panelItem11'>{{item.Title}}</view>
       </view>
       <view></view>
     </view>
   </block>
   <view class='lineFooter'></view>
+  <text class='panelRemark'>说明：学习任务，在秒过首页上点击红色的“开始”按钮（有时是“继续”）后开始计算。一天任务可以分多次完成，完成时会显示“报告”；一天只做一次任务，做完即可，不能重复做，第二天重新开始。</text>
 
   <view class="panelTitle FlexRow">
-    <view class="panelTitle1">班群技能</view>
+    <view class="panelTitle1 FlexColumn">
+      <view class="">参与班群活动</view>
+      <view class="panelTitle11">有2个项目，自动检查。</view>
+    </view>
     <view></view>
   </view>
   <block wx:for="{{[List[9],List[10]]}}" wx:key="*this">
     <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
       <view class="lineWidth720"></view>
     </view>
-    <view class='panelItem FlexRow'>
+
+    <view class='panelItem FlexRow' wx:if="{{item.Finished<item.Max}}">
       <view class='panelItem1 FlexRow'>
-        <view wx:if="{{!item.Finished}}" class='Number'>{{index+9}}</view>
-        <image wx:if="{{item.Finished}}" class='universalpic_checked_blue_40x40' src='../images/universalpic_checked_blue_40x40.png' />
+        <view class='Number'>{{index+9}}</view>
+        <view class='panelItem11'>{{item.Title}}</view>
+      </view>
+      <view class="Number2" wx:if="{{index==0}}">已分享{{item.Finished}}次</view>
+      <view class="Number2" wx:if="{{index==1}}">已接力{{item.Finished}}天</view>
+    </view>
+
+    <view class='panelItem FlexRow' wx:if="{{item.Finished>=item.Max}}">
+      <view class='panelItem1 FlexRow'>
+        <image class='universalpic_checked_blue_40x40' src='../images/universalpic_checked_blue_40x40.png' />
         <view class='panelItem11'>{{item.Title}}</view>
       </view>
       <view></view>
     </view>
   </block>
   <view class='lineFooter'></view>
+  <text class='panelRemark'>说明：为什么要分享？请教做的对不对或共享题目都可以。群接力仅在完成当天学习任务后，在报告界面中才会出现。一天一次即可，多次接力是无效的。</text>
+  <!-- <text class='panelRemark'>帮助：</text> -->
+
   <view style='height:100rpx;'></view>
 </view>

pages/other/homework.wxss

@@ -1,55 +1,122 @@
 .userinfo{
   width:100%;
-  margin: 50rpx 0 30rpx 0;
-  height:60rpx;
-  justify-content: flex-start;
+  height:130rpx;
+  background-color: #1D6FC7;
+  justify-content: space-between;
 }
 
 .avatar{
   margin-left:30rpx;
-  width:60rpx;
-  height:60rpx;
+  width:70rpx;
+  height:70rpx;
   border-radius: 50%;
 }
 
 .nickname{
-  margin-left: 30rpx;
-  font-weight:400;
+  margin-left: 20rpx;
   font-size: 28rpx;
+  color:#fff;
+}
+
+.checklist_nameline_illus{
+  width:287rpx;
+  height:130rpx;
+  margin-right: 10rpx;
 }
+
 .panelTitle{
   width:100%;
   margin-top: 50rpx;
   justify-content: space-between;
 }
+
 .panelTitle .panelTitle1{
   font-size:32rpx;
   margin-left: 30rpx;
   margin-bottom: 30rpx;
+  align-items: flex-start;
+}
+
+
+.panelTitle11{
+  font-size:24rpx;
+  font-weight: 400;
+  margin-top: 10rpx;
+}
+
+.panelTitle12{
+  font-size:24rpx;
+  margin-top: 10rpx;
+  background-color: #03AF69;
+  border-radius: 6rpx;
+  color:#fff;
+  text-align: center;
+  line-height: 50rpx;
+  width:108rpx;
+  font-weight: 400;
 }
 
 .panelItem{
   width:100%;
   justify-content: space-between;
   font-size:28rpx;
-  height:100rpx;
   background-color: #fff;
 }
 
+.panelItem0{
+  height:134rpx;
+}
+
 .panelItem .panelItem1{
+  font-weight: 400;
+  justify-content: flex-start;
+  align-items: flex-start;
+  margin: 30rpx 0 30rpx 30rpx;
+}
+.panelItem .panelItem1_1{
   margin-left: 30rpx;
   font-weight: 400;
   justify-content: flex-start;
+  margin: 30rpx 0 30rpx 30rpx;
+}
+
+.panelItem .panelItem01{
+  font-size:28rpx;
+}
+
+.panelItem .panelItem02{
+  font-size:24rpx;
 }
 
 .panelItem .panelItem2{
   margin-right: 30rpx;
-  color:#787878;
-  font-weight: 500;
+  color:#0071EF;
+  font-size:48rpx;
+  font-family: 'Roboto-Black';
 }
 
 .panelItem .panelItem11{
   margin-left: 20rpx;
+  justify-content: center;
+  align-items: flex-start;
+}
+
+.panelTitle10{
+  font-size:28rpx;
+  font-weight: 400;
+}
+
+.panelTitle111{
+  font-size:24rpx;
+  font-weight: 400;
+}
+
+.panelRemark{
+  width:690rpx;
+  font-size:24rpx;
+  font-weight: 400;
+  color:#787878;
+  margin: 30rpx 0 0 0;
 }
 
 .universalpic_checked_blue_40x40{
@@ -62,4 +129,23 @@
   color:#D2D2D2;
   font-family: 'Roboto-Black';
   margin: 0 19rpx 0 0;
+}
+
+.Number2{
+  font-size:28rpx;
+  color:#787878;
+  margin: 0 30rpx 0 0;
+  font-weight: 400;
+}
+
+.btn{
+  border-radius: 6rpx;
+  width:108rpx;
+  height:50rpx;
+  line-height: 50rpx;
+  background-color: #0071EF;
+  color:#fff;
+  text-align: center;
+  font-size:24rpx;
+  margin-right: 30rpx;
 }

pages/other/lesson.js

@@ -6,6 +6,7 @@ var imageUrlPrefix;
 var currentContent;
 var backgroundAudioManager;
 
+
 Page({
   data: {
     LessonID: 1,
@@ -17,6 +18,10 @@ Page({
     var LessonPage = 1;
     if (options && options.LessonID) {
       LessonID = options.LessonID;
+      var arrName=['','第一课', '第二课', '第三课', '第四课'];
+      wx.setNavigationBarTitle({
+        title: arrName[LessonID],
+      });
     } 
     if (options && options.LessonPage) {
       LessonPage = options.LessonPage;
@@ -37,10 +42,15 @@ Page({
       var id = that.data.LessonPage;
       if (id < 10)
         id = "0" + id;
+
+      var imageUrl = "../images/program_screenshot_lesson1.png";
+      if (that.data.LessonID=="5")
+        imageUrl ="../images/program_screenshot_speak01.png";
+        
       that.setData({
         ArrTirtle: data.List,
         IsPause: true,
-        ShareImageUrl:data.ImageUrl,
+        ShareImageUrl:imageUrl,
         AudioSrc: imageUrlPrefix + "sounds/"+that.data.LessonPage+".m4a",
         ImageUrl: imageUrlPrefix + "%E5%B9%BB%E7%81%AF%E7%89%87" + id+".jpg",
       });

pages/other/lessonlist.js

@@ -5,19 +5,28 @@ const app = getApp();
 
 Page({
   data: {
-    List: ['第一课', '第二课', '第三课', '第四课', '第五课', '第六课', '第七课', '第八课'],
   },
   onLoad: function () {
     var that = this;
     that.setData({
-      CheckListUserID:app.globalData.userInfo.UserID,
+      CheckListUserID: app.globalData.userInfo.UserID,
       Containnerheight: main.getWindowHeight(),
+      UserID: app.globalData.userInfo.UserID,
+    });
+
+    var userid = app.globalData.userInfo.UserID;
+    main.getData("GetMiaoguoCheckList?UserID=" + userid, function (data) {
+      if (data) {
+        that.setData({
+          List: data.List,
+        });
+      }
     });
   },
   gotoLesson: function (e) {
-    var id=e.currentTarget.dataset.id;
+    var id = e.currentTarget.dataset.id;
     wx.navigateTo({
-      url: '../other/lesson?LessonID='+id,
+      url: '../other/lesson?LessonID=' + id,
     });
   },
   gotoUserList: function (e) {
@@ -30,10 +39,10 @@ Page({
       url: '../../marketing/main/index',
     });
   },
-  gotoCheckList: function(){
+  gotoCheckList: function () {
     var url = '../other/homework';
     if (this.data.CheckListUserID)
-      url+="?UserID="+this.data.CheckListUserID;
+      url += "?UserID=" + this.data.CheckListUserID;
     wx.navigateTo({
       url: url,
     });
@@ -49,7 +58,7 @@ Page({
     return {
       title: app.globalData.ShareTitle,
       path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: app.globalData.ShareImage,
+      imageUrl: "../images/program_screenshot_lesson1.png",
     }
   },
 })

pages/other/lessonlist.json

@@ -1,3 +1,3 @@
 {
-  "usingComponents": {}
+  "navigationBarTitleText": "课程"
 }

pages/other/lessonlist.wxml

@@ -1,23 +1,33 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="main FlexColumn">
-    <block wx:for="{{List}}" wx:key="index">
+    <block wx:for="{{[List[3],List[4],List[5],List[6]]}}" wx:key="index">
+      <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
+        <view class="lineWidth720"></view>
+      </view>
+
       <view class="panelItem FlexRow" bindtap="gotoLesson" data-id="{{index+1}}">
-        <view class="panelItem1">
-          {{item}}
+        <view class='panelItem1 FlexColumn'>
+          <view class="panelTitle10">{{item.Title}}</view>
+          <view class="panelTitle111">{{item.Remark}}</view>
         </view>
         <view class="panelItem2 FlexRow">
           <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
         </view>
       </view>
-      <view class='lineFooter'></view>
+
     </block>
+    <view class='lineFooter'></view>
   </view>
-  
-  <view style='height:100rpx;'></view>
-  <button bindtap='gotoUserList'>审核用户</button>
-  <view style='height:100rpx;'></view>
-  <button bindtap='gotoMarketingUserList'>推广用户</button>
-  <view style='height:100rpx;'></view>
-  <input class='input' maxlength='4' auto-focus bindinput="onKeyInput" value="{{CheckListUserID}}"  />
-  <button bindtap='gotoCheckList'>CheckList</button>
+
+  <block wx:if="{{UserID<=7}}">
+    <view style='height:300rpx;'></view>
+    <button bindtap='gotoLesson' data-id="5">暖暖爸结业致辞</button>
+    <view style='height:50rpx;'></view>
+    <button bindtap='gotoUserList'>审核用户</button>
+    <view style='height:50rpx;'></view>
+    <button bindtap='gotoMarketingUserList'>推广用户</button>
+    <view style='height:50rpx;'></view>
+    <input class='input' maxlength='4' auto-focus bindinput="onKeyInput" value="{{CheckListUserID}}" />
+    <button bindtap='gotoCheckList'>CheckList</button>
+  </block>
 </view>

pages/other/lessonlist.wxss

@@ -1,22 +1,33 @@
 .main{
   width: 100%;
+  margin-top: 20rpx;
 }
 
 .panelItem {
   width: 100%;
   justify-content: space-between;
   font-size: 28rpx;
-  height: 100rpx;
+  height: 134rpx;
   background-color: #fff;
 }
 
 .panelItem1 {
   margin-left: 30rpx;
-  justify-content: flex-start;
+  align-items: flex-start;
   font-weight: 400;
   font-size:28rpx;
 }
 
+.panelTitle10{
+  font-size:28rpx;
+  font-weight: 400;
+}
+
+.panelTitle111{
+  font-size:24rpx;
+  font-weight: 400;
+}
+
 .panelItem2 {
   margin-right: 30rpx;
   color: #787878;

pages/plan/setting.js

@@ -2,21 +2,17 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
-const arrSortType = ["自由安排的", "到期时间较早的", "到期时间较近的"];
+const arrSortType = ["自由安排", "到期时间较早的题卡", "到期时间较近的题卡"];
 const arrClickType = ["专属按钮", "点击空白", "两种方式"];
 var arrUserName = ["程晟涵", "临时"];
-var arrUserID = [2, 662];
+var arrUserID = [2, 787];
 
 Page({
   data: {
     CardNumber: [],
     IsShowChange: false,
-    ProgramName: app.globalData.ProgramName,
-    Version: app.globalData.Version,
     RecommendName: "启用",
     ChildUserID: 0,
-    IsPay: true,
-    IsShow: 0,
   },
   onPullDownRefresh: function () {
     //得到当天任务
@@ -43,17 +39,6 @@ Page({
     for (var i = 5; i <= 200; i++) {
       that.data.CardNumber.push(i);
     }
-
-    var childUserID = 0;
-    if (app.globalData.userInfo.ChildUserID && app.globalData.userInfo.ChildUserID != undefined)
-      childUserID = app.globalData.userInfo.ChildUserID;
-    var productServiceTime = common.formatDateCHS(common.formatTime(new Date(app.globalData.userInfo.ProductServiceTime)));
-    var today15 = common.formatDateCHS(common.formatTime(common.addDate("d", 15, new Date())));
-    var isPay = true;
-    if (productServiceTime > today15) {
-      isPay = false;
-    }
-
     var taskNumber = app.globalData.TaskToday.ListNew.length + app.globalData.TaskToday.ListReview.length + app.globalData.TaskToday.ListHistory.length;
     var cardEveryTime = 1 + Math.round(app.globalData.TaskToday.CardEveryTime / 60 * taskNumber);
     
@@ -62,10 +47,6 @@ Page({
       CardNumber: that.data.CardNumber,
       MinSecond: 10,
       TimeSecond: 60,
-      ChildUserID: childUserID,
-      ProductServiceTime: productServiceTime,
-      IsPay: isPay,
-      IsShow: app.globalData.IsShow,
       TaskNumber: taskNumber,
       CardEveryTime:cardEveryTime,
       CardLimitTimeNumber: app.globalData.TaskToday.CardLimitTimeNumber,
@@ -82,7 +63,6 @@ Page({
       }
     });
 
-
     if (app.globalData.userInfo.UserID == 1 || app.globalData.userInfo.UserID == 2) {
       that.setData({
         IsShowChange: true,
@@ -174,16 +154,7 @@ Page({
       url: './clicktype',
     })
   },
-  gotoBinding: function () {
-    wx.navigateTo({
-      url: '../other/binding',
-    })
-  },
-  updateMember: function () {
-    wx.reLaunch({
-      url: '../index/index',
-    })
-  },
+  
   getMemoryLevel: function () {
     var that = this;
     var index = wx.getStorageSync("MemoryLevel");
@@ -211,29 +182,7 @@ Page({
       url: './taskLimit',
     })
   },
-  gotoPay: function () {
-    var payindex = 3;
-    if (app.globalData.userInfo.IsFinishTask == 1)
-      payindex = 2;
-
-    wx.navigateTo({
-      url: '../other/pay?paypanel=1&payindex=' + payindex,
-    });
-  },
-  gotoPayTemp: function (e) {
-    if (app.globalData.userInfo.UserID <= 7) {
-      wx.navigateTo({
-        url: '../other/pay?paypanel=0&payindex=0',
-      });
-    }
-  },
-  gotoLesson: function () {
-    if (app.globalData.userInfo.UserID <= 7) {
-      wx.navigateTo({
-        url: '../other/lessonlist',
-      });
-    }
-  },
+  
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/plan/setting.json

@@ -1,9 +1,6 @@
 {
-  "navigationBarBackgroundColor": "#4EC3FF",
-  "navigationBarTextStyle": "black",
   "navigationBarTitleText": "练习方案",
   "backgroundColor": "#F0F0F0",
   "backgroundTextStyle":"dark",
-  "backgroundColorTop":"#4EC3FF",
   "enablePullDownRefresh": true
 }

pages/plan/setting.wxml

@@ -1,5 +1,5 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <image src='../images/study_plan_header.png' class="study_plan_header" />
+  <!-- <image src='../images/study_plan_header.png' class="study_plan_header" />
   <view class="panelTop FlexRow">
     <view class="panelTop1">今天的学习任务</view>
   </view>
@@ -33,7 +33,7 @@
     </view>
     <view class="lineWidthAll2 FlexRow">
     </view>
-  </view>
+  </view> -->
   <view class="panelTitle FlexRow">
     <view class="panelTitle1">任务量</view>
     <view class="panelTitle2"></view>
@@ -112,37 +112,9 @@
     </view>
   </view>
   <view class='lineFooter'></view>
-  <!-- <view class="panelTitle FlexRow" wx:if="{{ChildUserID==0}}">
-    <view class="panelTitle1">系统</view>
-    <view class="panelTitle2"></view>
-  </view>
-  <view class="panelItem FlexRow" bindtap='gotoBinding' wx:if="{{ChildUserID==0}}">
-    <view class="panelItem1">帐号绑定</view>
-    <view class="panelItem2 FlexRow">
-      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
-    </view>
-  </view>
-
-
-  <view class="panelItem00 panelItem FlexRow" bindtap='updateMember'>
-    重启小程序
-  </view>
-  <view class='lineFooter'></view> -->
-
-  <!-- <view class='text2'>有效期 {{ProductServiceTime}}</view>
-  <block wx:if="{{ChildUserID==0 && IsPay && IsShow}}">
-    <view class="panelItem00 panelItem FlexRow" bindtap='gotoPay'>
-      续费
-    </view>
-    <view class='lineFooter'></view>
-  </block> -->
-
-  <view style='width:100%;height:100rpx;' bindtap='gotoPayTemp'></view>
-  <text class='text1'>©2019 {{ProgramName}}\n微信小程序 版本 {{Version}}</text>
-  <view style='width:100%;height:100rpx;' bindtap='gotoLesson'></view>
-
+  
   <block wx:if="{{IsShowChange}}">
-    <view class="panelItem FlexRow" bindtap='setSelectUser'>
+    <view class="panelItemBottom panelItem FlexRow" bindtap='setSelectUser'>
       <view class="panelItem1">当前帐号</view>
       <view class="panelItem2 FlexRow">
         <view class="picker">

pages/plan/setting.wxss

@@ -126,4 +126,8 @@
   margin-top: 50rpx;
   font-size:24rpx;
   color:#787878;
+}
+
+.panelItemBottom{
+  margin-top: 300rpx;
 }

project.config.json

@@ -60,10 +60,10 @@
 				},
 				{
 					"id": 1,
-					"name": "上传",
-					"pathName": "pages/main/uploadinmage",
-					"query": "",
-					"scene": null
+					"name": "pages/index/index",
+					"pathName": "pages/index/index",
+					"query": "type= unbinding",
+					"scene": 1007
 				},
 				{
 					"id": 2,
@@ -74,9 +74,9 @@
 				},
 				{
 					"id": 3,
-					"name": "pages/plan/sortRule",
-					"pathName": "pages/plan/sortRule",
-					"query": "",
+					"name": "homework",
+					"pathName": "pages/other/homework",
+					"query": "UserID=1",
 					"scene": 1001
 				},
 				{

utils/main.js

@@ -763,14 +763,14 @@ function setCollect(id, collect, callback) {
   var that = this;
   if (collect) {
     wx.showToast({
-      title: '添加到幻灯片',
+      title: '已收藏',
       duration: 2000,
       image: "../images/universalpic_fav_white_120x110.png",
     });
   }
   else {
     wx.showToast({
-      title: '从幻灯片移除',
+      title: '取消收藏',
       duration: 2000,
       image: "../images/universalpic_fav_white_120x110.png",
     });