1.1.22

app.js

@@ -4,6 +4,7 @@ App({
     this.getSystemInfo();
     if (options && options.scene) {
       this.globalData.userSource = options.scene;
+      console.log("options.scene:" + options.scene);
     }
     if (options && options.shareTicket) {
       this.globalData.shareTicket = options.shareTicket;
@@ -25,7 +26,7 @@ App({
     }
   },
   globalData: {
-    Version: "1.1.18",
+    Version: "1.1.22",
     IsProduction: true,
     ShareTitle: "刻意学习，高效成长",
     SharePath: "pages/index/index",

app.json

@@ -22,15 +22,20 @@
     "pages/other/payinfo",
     "pages/other/lessonlist",
     "pages/other/userlist",
+    "pages/other/binding",
+    "pages/other/homework",
     "pages/main/setting"
   ],
   "window": {
-    "navigationBarBackgroundColor": "#fff",
+    "navigationBarBackgroundColor": "#ffffff",
     "navigationBarTitleText": "秒过",
     "navigationBarTextStyle": "black",
     "backgroundColor": "#ffffff",
     "enablePullDownRefresh": false
   },
+  "requiredBackgroundModes": [
+    "audio"
+  ],
   "navigateToMiniProgramAppIdList": [
     "wx84b3feac6069eec3",
     "wxa5441bbf344692ba",

app.wxss

@@ -1,9 +1,3 @@
-/**app.wxss**/
-.container {
-  width:100%;
-  justify-content: flex-start;
-} 
-
 ::-webkit-scrollbar {
   width: 0;
   height: 0;
@@ -24,6 +18,13 @@
   align-items: center;
   justify-content: center;
 }
+.container {
+  width:100%;
+  color: #1e1e1e;
+  justify-content: flex-start;
+  font-weight: 500;
+  background-color: #f0f0f0;
+} 
 
 .lineFooter{
   width: 100%;

pages/index/accredit.js

@@ -14,6 +14,8 @@ Page({
       Containnerheight: main.getWindowHeight(),
     });
 
+    if (!app.globalData.userInfo)
+      app.globalData.userInfo={};
   },
   onUnload: function () {
 
@@ -98,7 +100,15 @@ Page({
       app.globalData.userInfo.Country = data.Country;
       
       app.globalData.userInfo.IsMember=data.IsMember;
-      that.buildInitData();
+
+      if (app.globalData.userInfo.UserID)
+        that.buildInitData();
+      else{
+        app.globalData.userInfo.UserID = data.UserID;
+        wx.navigateBack({
+          delta: 1
+        });
+      }
     });
   },
   buildInitData: function () {

pages/index/accredit.wxss

@@ -1,9 +1,7 @@
 .container {
   background-color: #fff;
-  font-weight: 500;
   position: fixed;
   top:0;
-  justify-content: flex-start;
 }
 
 .universalpic_face_default_green_240x240{

pages/index/index.js

@@ -20,8 +20,11 @@ const arrSentence = [
   "孟子曰:\n故天将降大任于是人也\n必先苦其心志，劳其筋骨\n饿其体肤……",
 ];
 
+var timeout1=0;
+
 Page({
   data: {
+    
   },
   onPullDownRefresh: function () {
     wx.reLaunch({
@@ -56,6 +59,8 @@ Page({
         this.setData({
           MiaoguoCardID: options.MiaoguoCardID,
         });
+        if (options.ColorIndex)
+          app.globalData.ColorIndex=options.ColorIndex;
       }
 
       if (options.LessonID) {
@@ -66,8 +71,19 @@ Page({
         else
           app.globalData.LessonPage = 1;
       }
+
+      if (options.Homework == 1) {
+        app.globalData.Homework = 1;
+      }
+
+      if (options.type == "bebound") {
+        this.setData({
+          gotoBindingUrl: "../other/binding?type=bebound&ParentUserID=" + options.ParentUserID + "&NickName=" + options.NickName + "&AvatarUrl=" + options.AvatarUrl,
+        });
+      }
     }
     this.setData({
+      IsRefresh: false,
       Containnerheight: main.getWindowHeight(),
       Sentence: arrSentence[common.random(0, arrSentence.length - 1)],
     });
@@ -75,6 +91,13 @@ Page({
     this.updateProgram();
 
     this.getUserInfo();
+
+    var that=this;
+    timeout1=setTimeout(function(){
+      that.setData({
+        IsRefresh: true,
+      })
+    },15000);
   },
   //得到用户信息
   getUserInfo: function (cb) {
@@ -199,10 +222,17 @@ Page({
               url: '../main/preview?type=share&id=' + that.data.MiaoguoCardID,
             });
           }
+          else if (that.data.gotoBindingUrl){
+            wx.reLaunch({
+              url: that.data.gotoBindingUrl,
+            });
+          }
           else {
             var url = '../main/default?IsStart=1';
 
             setTimeout(function () {
+              clearTimeout(timeout1);
+
               wx.redirectTo({
                 url: url,
               });

pages/index/index.wxml

@@ -1,4 +1,5 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <image src='../images/program_start_footer.png' class="program_start_footer" />
-  <text class="text1">{{Sentence}}</text>  
+  <text class="text1">{{Sentence}}</text> 
+  <view class="btn" wx:if="{{IsRefresh}}" bindtap='onPullDownRefresh'>重启小程序</view> 
 </view>

pages/index/index.wxss

@@ -1,7 +1,4 @@
 .container {
-  justify-content: flex-start;
-  font-weight: 500;
-  color: #1e1e1e;
   background-color: #fff;
 }
 
@@ -17,4 +14,19 @@
   position: fixed;
   top:130rpx;
   text-align: center;
+}
+
+.btn{
+  width:600rpx;
+  height:90rpx;
+  text-align: center;
+  line-height: 90rpx;
+  border-radius: 14rpx;
+  border:1rpx solid #9B9B9B;
+  background-color: #fff;
+  color:#787878;
+  font-size:36rpx;
+  position: fixed;
+  top:426rpx;
+  z-index: 10;
 }

pages/index/notice.wxss

@@ -1,9 +1,7 @@
 .container {
   background-color: #fff;
-  font-weight: 500;
   position: fixed;
   top:0;
-  justify-content: flex-start;
 }
 
 .text1{

pages/main/add.wxss

@@ -1,9 +1,3 @@
-.container {
-  justify-content: flex-start;
-  font-weight: 500;
-  color: #1e1e1e;
-  background-color: #F0F0F0;
-}
 
 .panelTop{
   height: 120rpx;
@@ -209,7 +203,7 @@
   font-size: 28rpx;
   color:#1e1e1e;
   text-align: left;
-  height:100rpx;
+  min-height:100rpx;
   line-height: 100rpx;
   flex-wrap: wrap;
   justify-content: flex-start;

pages/main/cardInfo.wxss

@@ -1,10 +1,3 @@
-.container {
-  background-color: #f0f0f0;
-  color:#1e1e1e;
-  font-weight: 500;
-  justify-content: flex-start;
-}
-
 .panelTitle{
   width:100%;
   margin-top: 50rpx;

pages/main/clicktype.wxss

@@ -1,10 +1,3 @@
-.container {
-  background-color: #f0f0f0;
-  color: #1e1e1e;
-  font-weight: 500;
-  justify-content: flex-start;
-}
-
 .panelTitle {
   width: 100%;
   margin-top: 50rpx;

pages/main/colorplan.wxss

@@ -1,10 +1,3 @@
-.container {
-  background-color: #f0f0f0;
-  color:#1e1e1e;
-  font-weight: 500;
-  justify-content: flex-start;
-}
-
 .panelTitle{
   width:100%;
   margin-top: 50rpx;

pages/main/default.js

@@ -8,6 +8,12 @@ Page({
     IsTempCardNoSaved:false,
     IsExit:false,
   },
+  onPullDownRefresh: function () {
+    wx.redirectTo({
+      url: '../main/default',
+    })
+    wx.stopPullDownRefresh();
+  },
   onLoad: function (options) {
     var that = this;
     that.setData({
@@ -46,6 +52,12 @@ Page({
             });
           }
 
+          if (app.globalData.userInfo.IsMember && app.globalData.Homework == 1) {
+            wx.navigateTo({
+              url: '../other/homework',
+            });
+          }
+
           if (app.globalData.userInfo.IsMember && app.globalData.LessonID && app.globalData.LessonID>0) {
             wx.navigateTo({
               url: '../other/lesson?LessonID=' + app.globalData.LessonID +'&LessonPage='+app.globalData.LessonPage,

pages/main/default.json

@@ -2,5 +2,6 @@
   "navigationBarBackgroundColor": "#3157BA",
   "navigationBarTextStyle": "white",
   "navigationBarTitleText": "秒过",
-  "backgroundColor": "#3157BA"
+  "backgroundColor": "#3157BA",
+  "enablePullDownRefresh": true
 }

pages/main/default.wxss

@@ -1,7 +1,4 @@
 .container {
-  justify-content: flex-start;
-  font-weight: 500;
-  color: #1e1e1e;
   background-color: #3157ba;
 }
 

pages/main/detail.js

@@ -848,6 +848,8 @@ Page({
                   current: res2.tempFilePath, // 当前显示图片的http链接
                   urls: [res2.tempFilePath] // 需要预览的图片http链接列表
                 });
+
+                main.getData("ShareMiaoguoTask?UserID="+app.globalData.userInfo.UserID, function (data) {});
               },
               fail: function () {
                 wx.hideLoading();

pages/main/detail.wxss

@@ -1,8 +1,3 @@
-.container {
-  justify-content: flex-start;
-  font-weight: 500;
-}
-
 /* 工具栏 */
 .panelTop {
   width: 100%;

pages/main/memoryLevel.wxss

@@ -1,10 +1,3 @@
-.container {
-  background-color: #f0f0f0;
-  color:#1e1e1e;
-  font-weight: 500;
-  justify-content: flex-start;
-}
-
 .panelTitle {
   width: 100%;
   margin-top: 50rpx;

pages/main/preview.js

@@ -582,6 +582,11 @@ Page({
     this.setData({
       ShowType: 'sharepreview'
     });
+
+    var url = 'ShareMiaoguoCard?UserID=' + app.globalData.userInfo.UserID;
+    url += "&MiaoguoCardID=" + that.data.MiaoguoCardID;
+    main.getData(url, function (data) { });
+
     setTimeout(function () {
       that.setData({
         ShowType: 'show'
@@ -589,7 +594,7 @@ Page({
     }, 1000);
     return {
       title: '我的分享',
-      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID + '&Share=1&MiaoguoCardID=' + this.data.MiaoguoCardID,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID + '&Share=1&ColorIndex='+app.globalData.ColorIndex+'&MiaoguoCardID=' + this.data.MiaoguoCardID,
     }
   },
 })

pages/main/preview.wxss

@@ -1,7 +1,4 @@
 .container {
-  justify-content: flex-start;
-  font-weight: 500;
-  color: #1e1e1e;
   background-color: #e3e3e3;
 }
 

pages/main/recommend.wxss

@@ -1,10 +1,3 @@
-.container {
-  background-color: #f0f0f0;
-  color:#1e1e1e;
-  font-weight: 500;
-  justify-content: flex-start;
-}
-
 .panelTitle{
   width:100%;
   margin-top: 50rpx;

pages/main/searchCard.js

@@ -11,12 +11,21 @@ Page({
     that.setData({
       Containnerheight: main.getWindowHeight(),
     });
+    
   },
   onShow:function(){
-    var taskToday = app.globalData.TaskToday;
-    this.setData({
-      CardNumber: taskToday.CardNumber,
-    })
+    this.init();
+  },
+  init:function(){
+    var that=this;
+    main.getData("GetUserCardCount?UserID="+app.globalData.userInfo.UserID, function (data) {
+      if (data) {
+        that.setData({
+          CardNumber: data.CardNumber,
+        });
+      }
+    });
+    
   },
   gotoDefault:function(){
     wx.redirectTo({
@@ -34,6 +43,7 @@ Page({
       url: './searchCard1',
     })
   },
+  
   getList: function (e) {
     wx.showLoading({
       title: '请稍候',

pages/main/searchCard.wxss

@@ -1,11 +1,3 @@
-.container {
-  justify-content: flex-start;
-  font-weight: 500;
-  color: #1e1e1e;
-  background-color: #f0f0f0;
-}
-
-
 .panel{
   width: 100%;
   position: fixed;

pages/main/searchCard1.wxss

@@ -1,10 +1,3 @@
-.container {
-  justify-content: flex-start;
-  font-weight: 500;
-  color: #1e1e1e;
-  background-color: #F0F0F0;
-}
-
 .panel{
   width: 100%;
   position: fixed;

pages/main/searchCardList.js

@@ -43,11 +43,29 @@ Page({
   onShow: function () {
     var that = this;
     that.getList();
+    main.getData("GetUserCardCount?UserID=" + app.globalData.userInfo.UserID, function (data) {
+      if (data) {
+        that.setData({
+          Count: data.CardNumber,
+        });
+      }
+    });
+
+    //题卡主题色
+    var arrColorIndex = wx.getStorageSync("ColorIndexArr");
+    if (!arrColorIndex) {
+      app.globalData.ColorIndex = common.random(1, 4);
+    }
+    else {
+      app.globalData.ColorIndex = arrColorIndex[common.random(0, arrColorIndex.length - 1)];
+    }
   },
   onPullDownRefresh: function () {
     var that = this;
-    app.globalData.CardList=[];
-    that.gotoNextPage({currentTarget:{dataset:{id:0}}});
+    if (!that.data.IsCollect && !that.data.IsToday) {
+      app.globalData.CardList=[];
+      that.gotoNextPage({currentTarget:{dataset:{id:0}}});
+    }
     wx.stopPullDownRefresh();
   },
   getList: function () {
@@ -91,7 +109,7 @@ Page({
     // }
 
     var hasPage=false;
-    if (list.length<that.data.Count && that.data.IsToday==0)
+    if (list.length<that.data.Count && that.data.IsToday==0 && !that.data.IsCollect)
       hasPage=true;
     
     this.setData({

pages/main/searchCardList.wxss

@@ -1,10 +1,3 @@
-.container {
-  justify-content: flex-start;
-  font-weight: 500;
-  color: #1e1e1e;
-  background-color: #F0F0F0;
-}
-
 .panelTop{
   width: 100%;
   background-color: #fff;

pages/main/searchWeb.js

@@ -38,7 +38,7 @@ Page({
             arr[i].TypeName = '翻译';
             break;
         }
-
+        
         list.push(arr[i]);
       }
     }

pages/main/searchWeb.wxss

@@ -1,7 +1,4 @@
 .container {
-  justify-content: flex-start;
-  font-weight: 500;
-  color: #1e1e1e;
   background-color: #eee;
 }
 

pages/main/searchWeb1.wxss

@@ -1,10 +1,3 @@
-.container {
-  justify-content: flex-start;
-  font-weight: 500;
-  color: #1e1e1e;
-  background-color: #F0F0F0;
-}
-
 .panelSearch{
   width:100%;
   height:140rpx;

pages/main/searchWeb2.js

@@ -99,6 +99,7 @@ Page({
     })
   },
   getInputData: function (e) {
+    //console.log("time1:"+new Date().getTime());
     common.getStorageValue(this, "IsShowHelp", 0, function () {
 
     });
@@ -109,7 +110,7 @@ Page({
     var content = e.currentTarget.dataset.content;
     var soundmark = e.currentTarget.dataset.soundmark;
     //console.log(content);
-
+    //console.log("time2:" + new Date().getTime());
     if (!this.data.CSS[css] || this.data.CSS[css].Number == "") {
       if (!this.data.CSS[css])
         this.data.CSS[css] = {};
@@ -144,10 +145,11 @@ Page({
     else {
       this.data.CSS[css].Number = Number(this.data.CSS[css].Number) + 1;
     }
-
+    //console.log("time3:" + new Date().getTime());
     this.setData({
       CSS: this.data.CSS,
     });
+    //console.log("time4:" + new Date().getTime());
   },
   addData: function () {
     if (JSON.stringify(this.data.CSS) != "{}") {

pages/main/searchWeb2.wxml

@@ -17,62 +17,62 @@
     <view class='lineFooter'></view>
   </block>
 
-  <!-- 笔顺和楷书 -->
-  <block wx:if="{{Result.CHN.HanZiImageUrl || Result.CHN.BiShunUrl }}">
+  <!-- 拼音 -->
+  <block wx:if="{{Result.CHN.PinYin && Result.CHN.PinYin.length>0}}">
     <view class="panelTitle FlexRow">
-      <view class="panelTitle1">书写</view>
+      <view class="panelTitle1">拼音</view>
     </view>
     <view class="panelItem FlexRow">
-      <view wx:if="{{Result.CHN.HanZiImageUrl}}" class="{{CSS.CHN_HanZiImageUrl.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="image" data-content="{{Result.CHN.HanZiImageUrl}}" data-css="CHN_HanZiImageUrl" data-tag="书写">
-        <view class="{{CSS.CHN_HanZiImageUrl.Css2}} panelSelect0">{{CSS.CHN_HanZiImageUrl.Number}}</view>
-        <image class="image1" src="{{Result.CHN.HanZiImageUrl}}" />
-      </view>
-      <view wx:if="{{Result.CHN.BiShunUrl}}" class="{{CSS.CHN_BiShunUrl.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="image" data-content="{{Result.CHN.BiShunUrl}}" data-css="CHN_BiShunUrl" data-tag="书写">
-        <view class="{{CSS.CHN_BiShunUrl.Css2}} panelSelect0">{{CSS.CHN_BiShunUrl.Number}}</view>
-        <image class="image1" src="{{Result.CHN.BiShunUrl}}" />
+      <view class="{{CSS['CHN_PinYin_'+index+'_pinyin'].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PinYin}}" wx:key="pinyin" bindtap='getInputData' data-type="sound" data-content="{{item.pinyin}}" data-css="CHN_PinYin_{{index}}_pinyin" data-tag="拼音">
+        <view class="{{CSS['CHN_PinYin_'+index+'_pinyin'].Css2}} panelSelect0">{{CSS['CHN_PinYin_'+index+'_pinyin'].Number}}</view>
+        <view class="text2 text1">{{item.pinyin}}</view>
       </view>
     </view>
     <view class='lineFooter'></view>
   </block>
 
-  <!-- 笔顺数组 -->
-  <block wx:if="{{Result.CHN.BiShunArr && Result.CHN.BiShunArr.length>0}}">
+  <!-- 默写 -->
+  <block wx:if="{{Result.CHN.TianKong && Result.CHN.TianKong.length>0}}">
     <view class="panelTitle FlexRow">
-      <view class="panelTitle1">书写</view>
+      <view class="panelTitle1">单字默写</view>
     </view>
     <view class="panelItem FlexRow">
-      <view class="{{CSS['CHN_BiShunArr_'+index].Css1}} panelItemFrame1 panelItemFrame FlexRow" wx:for="{{Result.CHN.BiShunArr}}" wx:key="index" bindtap='getInputData' data-type="image" data-content="{{item}}" data-css="CHN_BiShunArr_{{index}}" data-tag="书写">
-        <view class="{{CSS['CHN_BiShunArr_'+index].Css2}} panelSelect0">{{CSS['CHN_BiShunArr_'+index].Number}}</view>
-        <image class="image1" src="{{item}}" />
+      <view class="{{CSS['CHN_TianKong_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.TianKong}}" wx:key="*this" bindtap='getInputData' data-type="sound" data-content="{{item}}" data-css="CHN_TianKong_{{index}}" data-pinyin="{{Result.CHN.PinYin[0].pinyin}}"
+        data-tag="默写">
+        <view class="{{CSS['CHN_TianKong_'+index].Css2}} panelSelect0">{{CSS['CHN_TianKong_'+index].Number}}</view>
+        <view class="text1">{{item}}</view>
       </view>
     </view>
     <view class='lineFooter'></view>
   </block>
 
-  <!-- 读写 -->
-  <block wx:if="{{Result.CHN.TianKong && Result.CHN.TianKong.length>0}}">
+  <!-- 笔顺和楷书 -->
+  <block wx:if="{{Result.CHN.HanZiImageUrl || Result.CHN.BiShunUrl }}">
     <view class="panelTitle FlexRow">
-      <view class="panelTitle1">读写</view>
+      <view class="panelTitle1">书写</view>
     </view>
     <view class="panelItem FlexRow">
-      <view class="{{CSS['CHN_TianKong_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.TianKong}}" wx:key="index" bindtap='getInputData' data-type="sound" data-content="{{item}}" data-css="CHN_TianKong_{{index}}" data-pinyin="{{Result.CHN.PinYin[0].pinyin}}"
-        data-tag="读写">
-        <view class="{{CSS['CHN_TianKong_'+index].Css2}} panelSelect0">{{CSS['CHN_TianKong_'+index].Number}}</view>
-        <view class="text1">{{item}}</view>
+      <view wx:if="{{Result.CHN.HanZiImageUrl}}" class="{{CSS.CHN_HanZiImageUrl.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="image" data-content="{{Result.CHN.HanZiImageUrl}}" data-css="CHN_HanZiImageUrl" data-tag="书写">
+        <view class="{{CSS.CHN_HanZiImageUrl.Css2}} panelSelect0">{{CSS.CHN_HanZiImageUrl.Number}}</view>
+        <image class="image1" src="{{Result.CHN.HanZiImageUrl}}" />
+      </view>
+      <view wx:if="{{Result.CHN.BiShunUrl}}" class="{{CSS.CHN_BiShunUrl.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="image" data-content="{{Result.CHN.BiShunUrl}}" data-css="CHN_BiShunUrl" data-tag="书写">
+        <view class="{{CSS.CHN_BiShunUrl.Css2}} panelSelect0">{{CSS.CHN_BiShunUrl.Number}}</view>
+        <image class="image1" src="{{Result.CHN.BiShunUrl}}" />
       </view>
     </view>
     <view class='lineFooter'></view>
   </block>
 
-  <!-- 拼音 -->
-  <block wx:if="{{Result.CHN.PinYin && Result.CHN.PinYin.length>0}}">
+  <!-- 笔顺数组 -->
+  <block wx:if="{{Result.CHN.BiShunArr && Result.CHN.BiShunArr.length>0}}">
     <view class="panelTitle FlexRow">
-      <view class="panelTitle1">拼音</view>
+      <view class="panelTitle1">书写</view>
     </view>
     <view class="panelItem FlexRow">
-      <view class="{{CSS['CHN_PinYin_'+index+'_pinyin'].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PinYin}}" wx:key="index" bindtap='getInputData' data-type="sound" data-content="{{item.pinyin}}" data-css="CHN_PinYin_{{index}}_pinyin" data-tag="拼音">
-        <view class="{{CSS['CHN_PinYin_'+index+'_pinyin'].Css2}} panelSelect0">{{CSS['CHN_PinYin_'+index+'_pinyin'].Number}}</view>
-        <view class="text2 text1">{{item.pinyin}}</view>
+      <view class="{{CSS['CHN_BiShunArr_'+index].Css1}} panelItemFrame1 panelItemFrame FlexRow" wx:for="{{Result.CHN.BiShunArr}}" wx:key="*this" bindtap='getInputData' data-type="image" data-content="{{item}}" data-css="CHN_BiShunArr_{{index}}" data-tag="书写">
+        <view class="{{CSS['CHN_BiShunArr_'+index].Css2}} panelSelect0">{{CSS['CHN_BiShunArr_'+index].Number}}</view>
+        <image class="image1" src="{{item}}" />
       </view>
     </view>
     <view class='lineFooter'></view>
@@ -84,7 +84,7 @@
       <view class="panelTitle1">组词</view>
     </view>
     <view class="panelItem FlexRow">
-      <view class="{{CSS['CHN_CombineWords_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.CombineWords}}" wx:key="index" bindtap='getInputData' data-type="normal" data-content="{{item}}" data-css="CHN_CombineWords_{{index}}" data-tag="组词">
+      <view class="{{CSS['CHN_CombineWords_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.CombineWords}}" wx:key="*this" bindtap='getInputData' data-type="normal" data-content="{{item}}" data-css="CHN_CombineWords_{{index}}" data-tag="组词">
         <view class="{{CSS['CHN_CombineWords_'+index].Css2}} panelSelect0">{{CSS['CHN_CombineWords_'+index].Number}}</view>
         <view class="text1">{{item}}</view>
       </view>
@@ -98,7 +98,7 @@
       <view class="panelTitle1">近义词</view>
     </view>
     <view class="panelItem FlexRow">
-      <view class="{{CSS['CHN_Synonym_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.Synonym}}" wx:key="index" bindtap='getInputData' data-type="normal" data-content="{{item}}" data-css="CHN_Synonym_{{index}}" data-tag="近义词">
+      <view class="{{CSS['CHN_Synonym_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.Synonym}}" wx:key="*this" bindtap='getInputData' data-type="normal" data-content="{{item}}" data-css="CHN_Synonym_{{index}}" data-tag="近义词">
         <view class="{{CSS['CHN_Synonym_'+index].Css2}} panelSelect0">{{CSS['CHN_Synonym_'+index].Number}}</view>
         <view class="text1">{{item}}</view>
       </view>
@@ -112,7 +112,7 @@
       <view class="panelTitle1">反义词</view>
     </view>
     <view class="panelItem FlexRow">
-      <view class="{{CSS['CHN_Antonym_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.Antonym}}" wx:key="index" bindtap='getInputData' data-type="normal" data-content="{{item}}" data-css="CHN_Antonym_{{index}}" data-tag="反义词">
+      <view class="{{CSS['CHN_Antonym_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.Antonym}}" wx:key="*this" bindtap='getInputData' data-type="normal" data-content="{{item}}" data-css="CHN_Antonym_{{index}}" data-tag="反义词">
         <view class="{{CSS['CHN_Antonym_'+index].Css2}} panelSelect0">{{CSS['CHN_Antonym_'+index].Number}}</view>
         <view class="text1">{{item}}</view>
       </view>
@@ -126,7 +126,7 @@
       <view class="panelTitle1">中文释义</view>
     </view>
     <view class="panelItem FlexRow">
-      <view class="{{CSS['CHN_PinYin_explain_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PinYin}}" wx:key="index" bindtap='getInputData' data-type="normal" data-content="{{item.explain}}" data-css="CHN_PinYin_explain_{{index}}" data-tag="释义">
+      <view class="{{CSS['CHN_PinYin_explain_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PinYin}}" wx:key="pinyin" bindtap='getInputData' data-type="normal" data-content="{{item.explain}}" data-css="CHN_PinYin_explain_{{index}}" data-tag="释义">
         <view class="{{CSS['CHN_PinYin_explain_'+index].Css2}} panelSelect0">{{CSS['CHN_PinYin_explain_'+index].Number}}</view>
         <text class="text1"><block wx:if="{{Result.CHN.PinYin.length>1}}">
         [{{item.pinyin}}]\n 
@@ -162,9 +162,9 @@
       <view class="{{CSS.CHN_PeomContent.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="normal" data-content="{{Result.CHN.PeomContent}}" data-css="CHN_PeomContent" data-tag="诗词">
         <view class="{{CSS.CHN_PeomContent.Css2}} panelSelect0">{{CSS.CHN_PeomContent.Number}}</view>
         <text class="text1">
-          <block wx:for="{{Result.CHN.PeomContent}}" wx:key="index" wx:for-item="item1">
+          <block wx:for="{{Result.CHN.PeomContent}}" wx:key="*this" wx:for-item="item1">
             <block wx:if="{{index>0}}">\n</block>
-            <block wx:for="{{item1}}" wx:key="indexChild" wx:for-item="item2">{{item2}}</block>
+            <block wx:for="{{item1}}" wx:key="*this" wx:for-item="item2">{{item2}}</block>
           </block>
         </text>
       </view>
@@ -172,17 +172,17 @@
 
       <!-- 每段原文较长，且有多段 -->
       <block wx:if="{{Result.CHN.PeomContentIsLong && Result.CHN.PeomContent.length>1}}">
-        <view class="{{CSS['CHN_PeomContent_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PeomContent}}" wx:key="index" bindtap='getInputData' data-type="normal" data-content="{{item}}" data-css="CHN_PeomContent_{{index}}" data-tag="诗词">
+        <view class="{{CSS['CHN_PeomContent_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PeomContent}}" wx:key="*this" bindtap='getInputData' data-type="normal" data-content="{{item}}" data-css="CHN_PeomContent_{{index}}" data-tag="诗词">
           <view class="{{CSS['CHN_PeomContent_'+index].Css2}} panelSelect0">{{CSS['CHN_PeomContent_'+index].Number}}</view>
           <view class="text1">
-            <block wx:for="{{item}}" wx:key="indexChild" wx:for-item="item2">{{item2}}</block>
+            <block wx:for="{{item}}" wx:key="*this" wx:for-item="item2" wx:for-index="indexChild">{{item2}}</block>
           </view>
         </view>
       </block>
 
       <!-- 每句诗词原文较长，且有单段 -->
       <block wx:if="{{Result.CHN.PeomContentIsLong && Result.CHN.PeomContent.length==1}}">
-        <view class="{{CSS['CHN_PeomContent_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PeomContent[0]}}" wx:if="{{item}}" wx:key="index" bindtap='getInputData' data-type="normal" data-content="{{item}}" data-css="CHN_PeomContent_{{index}}" data-tag="诗词">
+        <view class="{{CSS['CHN_PeomContent_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PeomContent[0]}}" wx:if="{{item}}" wx:key="*this" bindtap='getInputData' data-type="normal" data-content="{{item}}" data-css="CHN_PeomContent_{{index}}" data-tag="诗词">
           <view class="{{CSS['CHN_PeomContent_'+index].Css2}} panelSelect0">{{CSS['CHN_PeomContent_'+index].Number}}</view>
           <view class="text1">
             {{item}}
@@ -206,9 +206,9 @@
       <view class="{{CSS.CHN_Translation.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="normal" data-content="{{Result.CHN.Translation}}" data-css="CHN_Translation" data-tag="译文">
         <view class="{{CSS.CHN_Translation.Css2}} panelSelect0">{{CSS.CHN_Translation.Number}}</view>
         <text class="text1">
-          <block wx:for="{{Result.CHN.Translation}}" wx:key="index" wx:for-item="item1">
+          <block wx:for="{{Result.CHN.Translation}}" wx:key="*this" wx:for-item="item1">
             <block wx:if="{{index>0}}">\n</block>
-            <block wx:for="{{item1}}" wx:key="indexChild" wx:for-item="item2">{{item2}}</block>
+            <block wx:for="{{item1}}" wx:key="*this" wx:for-item="item2" wx:for-index="indexChild">{{item2}}</block>
           </block>
         </text>
       </view>
@@ -216,10 +216,10 @@
 
       <!-- 每段诗词原文较长，且有多段 -->
       <block wx:if="{{Result.CHN.PeomContentIsLong && Result.CHN.Translation.length>1}}">
-        <view class="{{CSS['CHN_Translation_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.Translation}}" wx:key="index" bindtap='getInputData' data-type="normal" data-content="{{item}}" data-css="CHN_Translation_{{index}}" data-tag="译文">
+        <view class="{{CSS['CHN_Translation_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.Translation}}" wx:key="*this" bindtap='getInputData' data-type="normal" data-content="{{item}}" data-css="CHN_Translation_{{index}}" data-tag="译文">
           <view class="{{CSS['CHN_Translation_'+index].Css2}} panelSelect0">{{CSS['CHN_Translation_'+index].Number}}</view>
           <view class="text1">
-            <block wx:for="{{item}}" wx:key="indexChild" wx:for-item="item2">{{item2}}</block>
+            <block wx:for="{{item}}" wx:key="*this" wx:for-item="item2" wx:for-index="indexChild">{{item2}}</block>
           </view>
         </view>
       </block>
@@ -229,7 +229,7 @@
         <view class="{{CSS.CHN_Translation.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="normal" data-content="{{Result.CHN.Translation[0]}}" data-css="CHN_Translation" data-tag="译文">
         <view class="{{CSS.CHN_Translation.Css2}} panelSelect0">{{CSS.CHN_Translation.Number}}</view>
         <text class="text1">
-          <block wx:for="{{Result.CHN.Translation}}" wx:key="index" wx:for-item="item1">
+          <block wx:for="{{Result.CHN.Translation}}" wx:key="*this" wx:for-item="item1">
             {{item1}}
           </block>
         </text>
@@ -281,8 +281,8 @@
       <view class="panelTitle1">翻译</view>
     </view>
     <view class="panelItem FlexRow">
-      <block wx:for="{{Result.ENG.Paraphrase}}" wx:key="index" wx:if="{{item.ParaphraseList}}">
-        <view class="{{CSS['ENG_ParaphraseList_'+index+'_'+indexChild].Css1}} panelItemFrame FlexRow" wx:for="{{item.ParaphraseList}}" wx:key="index1" wx:for-item="itemChild" wx:for-index="indexChild" bindtap='getInputData' data-type="normal" data-content="{{item.PartOfSpeech}} {{itemChild}}"
+      <block wx:for="{{Result.ENG.Paraphrase}}" wx:key="ParaphraseList" wx:if="{{item.ParaphraseList}}">
+        <view class="{{CSS['ENG_ParaphraseList_'+index+'_'+indexChild].Css1}} panelItemFrame FlexRow" wx:for="{{item.ParaphraseList}}" wx:key="*this" wx:for-item="itemChild" wx:for-index="indexChild" bindtap='getInputData' data-type="normal" data-content="{{item.PartOfSpeech}} {{itemChild}}"
           data-css="ENG_ParaphraseList_{{index}}_{{indexChild}}" data-tag="翻译">
           <view class="{{CSS['ENG_ParaphraseList_'+index+'_'+indexChild].Css2}} panelSelect0">{{CSS['ENG_ParaphraseList_'+index+'_'+indexChild].Number}}</view>
           <text class="text1">{{item.PartOfSpeech}} {{itemChild}}</text>

pages/main/searchWeb2.wxss

@@ -1,10 +1,3 @@
-.container {
-  justify-content: flex-start;
-  font-weight: 500;
-  color: #1e1e1e;
-  background-color: #F0F0F0;
-}
-
 .panelTitle {
   width: 100%;
   margin-top: 50rpx;
@@ -104,7 +97,6 @@
   border-top: 1rpx solid #d2d2d2;
 }
 
-
 .numberContainer {
   background-color: rgba(0, 0, 0, 0.7);
   position: fixed;

pages/main/setting.js

@@ -6,7 +6,7 @@ const arrSortType = ["随机抽取的题卡", "时间较早的题卡", "时间
 const arrSortType2 = ["随机的", "较早的", "较近的"];
 const arrClickType = ["专属按钮", "点击空白", "两种方式"];
 var arrUserName = ["程晟涵", "大耳兔", "teresa", "古利古拉", "Lucy-chan", "临时"];
-var arrUserID = [2, 11, 8, 9, 10, 128];
+var arrUserID = [2, 11, 8, 9, 10, 222];
 
 Page({
   data: {
@@ -166,6 +166,11 @@ Page({
       url: './clicktype',
     })
   },
+  gotoBinding:function(){
+    wx.navigateTo({
+      url: '../other/binding',
+    })
+  },
   updateMember: function () {
     wx.reLaunch({
       url: '../index/index',

pages/main/setting.wxml

@@ -29,7 +29,7 @@
     </view>
   </view>
   <view class='lineFooter'></view>
-  
+
   <view class="panelEveryDay">每天{{CardMaxNumberNew+CardMaxNumberHistory}}张题卡</view>
 
   <view class="panelTitle FlexRow">
@@ -98,7 +98,16 @@
     </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>
   <block wx:if="{{IsShowChange}}">
     <view class="panelTitle FlexRow">
       <view class="panelTitle1">切换帐号</view>
@@ -116,7 +125,11 @@
     <view class='lineFooter'></view>
   </block>
 
+  <view class="panelItem00 panelItem FlexRow" bindtap='updateMember'>
+    重启小程序
+  </view>
+
   <view style='width:100%;height:100rpx;' bindtap='gotoPay'></view>
-  <text class='text1' bindtap='updateMember'>©2019 {{ProgramName}}\n微信小程序 版本 {{Version}}</text>
+  <text class='text1'>©2019 {{ProgramName}}\n微信小程序 版本 {{Version}}</text>
   <view style='width:100%;height:100rpx;' bindtap='gotoLesson'></view>
 </view>

pages/main/setting.wxss

@@ -1,10 +1,3 @@
-.container {
-  background-color: #f0f0f0;
-  color:#1e1e1e;
-  font-weight: 500;
-  justify-content: flex-start;
-}
-
 .panelTitle{
   width:100%;
   margin-top: 50rpx;
@@ -37,6 +30,13 @@
 .panelItem0{
   height:133rpx;
 }
+.panelItem00{
+  margin-top: 10rpx;
+  line-height: 100rpx;
+  font-size:28rpx;
+  font-weight: 400;
+  justify-content: center;
+}
 
 .panelItem .panelItem1{
   margin-left: 30rpx;

pages/other/binding.js

@@ -0,0 +1,119 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+    var that = this;
+    if (options && options.type && options.type == "bebound") {
+      
+      if (app.globalData.userSource=="1007"){
+        that.setData({
+          ShowPanel: "bebound",
+          ParentUserID: options.ParentUserID,
+          NickName: options.NickName,
+        });
+        that.download(options.AvatarUrl);
+      }
+      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){
+          that.setData({
+            List:data,
+            ShowPanel: "unbinding",
+          });
+        }
+        else{
+          that.setData({
+            ShowPanel: "binding",
+          });
+        }
+      });
+    }
+
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+  },
+  download: function (avatarUrl){
+    var that=this;
+    wx.downloadFile({
+      url: avatarUrl, 
+      success(res) {
+        if (res.statusCode === 200) {
+          that.setData({
+            AvatarUrl: res.tempFilePath,
+          });
+        }
+      }
+    });
+  },
+  onShow: function () {
+    var that = this;
+    wx.getSetting({
+      success(res) {
+        if (res.authSetting['scope.userInfo']) {
+
+        }
+        else {
+          wx.navigateTo({
+            url: '../index/accredit',
+          });
+        }
+      }
+    });
+  },
+  shareFinished: function () {
+    wx.showModal({
+      title: '等待对方接受邀请',
+      content: '请尽快与对方联系确认邀请',
+      showCancel: false,
+      confirmText: "知道了",
+    });
+  },
+  gotoBinding: function () {
+    var that = this;
+    main.getData("UpdateUserMemberInfo?UserID=" + app.globalData.userInfo.UserID + "&ParentUserID=" + this.data.ParentUserID, function (data) {
+      wx.reLaunch({
+        url: '../index/index',
+      })
+    });
+  },
+  gotoUnBinding: function () {
+    var that = this;
+    main.getData("UpdateUserBinding?ParentUserID=" + app.globalData.userInfo.UserID, function (data) {
+      wx.reLaunch({
+        url: '../index/index',
+      })
+    });
+  },
+  onShareAppMessage: function () {
+    if (this.data.ShowPanel == "binding") {
+      var path = '/pages/index/index?type=bebound&ParentUserID=' + app.globalData.userInfo.UserID;
+      path += "&NickName=" + app.globalData.userInfo.NickName;
+      path += "&AvatarUrl=" + app.globalData.userInfo.AvatarUrl;
+      return {
+        title: app.globalData.userInfo.NickName,
+        path: path,
+        imageUrl: "../images/program_screenshot_bindaccount.png",
+      }
+    }
+  },
+})

pages/other/binding.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "帐号绑定",
+  "backgroundColor": "#F0F0F0"
+}

pages/other/binding.wxml

@@ -0,0 +1,58 @@
+<view wx:if="{{ShowPanel=='binding'}}" class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <text class="text2">使用协议：\n
+1）绑定帐号用于：与家人一同督导孩子学习，在您繁忙时，由另一位家长的微信帐号继续学习。这是官方唯一认可的用途。\n
+2）绑定后并非共享、分享您的数据，而是多个帐号均使用您的数据。\n
+3）与对方绑定后，对方将失去自己的独立数据和使用权，对方的小程序将看到和您完全相同的内容，直接对您的数据进行操作（包括但不限于题卡、任务、站内通知、设置等），对方的任何操作均被视同您本人的行为，其结果不可区分不可回溯。特别注意，对方同样拥有帐号绑定的操作权，可将自己解除绑定。\n
+4）请勿将此功能用于多人学习。这会极大干扰制定任务、编排计划、同步数据等，使得程序核心功能完全失去效用，反而丧失了使用本产品的价值，这是得不偿失的。\n
+5）发现绑定错误，请立即解绑。期间造成的隐私、数据等问题由个人承担。再次提醒您谨慎使用这项功能。
+  </text>
+
+  <text class="text3">请仔细阅读协议并谨慎操作，\n请再三确定对方身份（禁止转发聊天群）</text>
+
+  <button class='btn' bindtap='shareFinished' open-type='share'>同意并转发绑定申请</button>
+  <view style='height:100rpx;'></view>
+</view>
+
+<view wx:if="{{ShowPanel=='unbinding'}}" class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="text1">已绑定的微信帐号</view>
+  <view class='userinfo FlexRow' wx:for="{{List}}" wx:key="index">
+    <image class='avatar' src="{{item.AvatarUrl}}" />
+    <view class="nickname">{{item.NickName}}</view>
+  </view>
+  <view class='lineFooter'></view>
+  <text class="text2">使用协议：\n
+1）绑定帐号用于：与家人一同督导孩子学习，在您繁忙时，由另一位家长的微信帐号继续学习。这是官方唯一认可的用途。\n
+2）绑定后并非共享、分享您的数据，而是多个帐号均使用您的数据。\n
+3）与对方绑定后，对方将失去自己的独立数据和使用权，对方的小程序将看到和您完全相同的内容，直接对您的数据进行操作（包括但不限于题卡、任务、站内通知、设置等），对方的任何操作均被视同您本人的行为，其结果不可区分不可回溯。特别注意，对方同样拥有帐号绑定的操作权，可将自己解除绑定。\n
+4）请勿将此功能用于多人学习。这会极大干扰制定任务、编排计划、同步数据等，使得程序核心功能完全失去效用，反而丧失了使用本产品的价值，这是得不偿失的。\n
+5）发现绑定错误，请立即解绑。期间造成的隐私、数据等问题由个人承担。再次提醒您谨慎使用这项功能。
+  </text>
+
+  <button class='btn2 btn' bindtap='gotoUnBinding'>解除绑定</button>
+  <view style='height:100rpx;'></view>
+
+</view>
+
+
+<view wx:if="{{ShowPanel=='bebound'}}" class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="text1">这位用户邀请您“绑定帐号”</view>
+  <view class='userinfo FlexRow'>
+    <image class='avatar' src="{{AvatarUrl}}" />
+    <view class="nickname">{{NickName}}</view>
+  </view>
+  <view class='lineFooter'></view>
+
+  <text class="text2">使用协议：\n
+1）《秒过学习》的绑定帐号功能用于：与家人一同督导孩子学习，在您繁忙时，由另一位家长的微信帐号继续学习。这是官方唯一认可的用途。\n
+2）绑定后并非共享、分享您的数据，而是多个帐号均使用您的数据。\n
+3）与对方绑定后，您将失去自己的独立数据和使用权。您将和对方看到并使用相同的数据（包括但不限于题卡、任务、站内通知、设置等），您的任何操作均被视为对方本人的行为，其结果不可区分不可回溯。\n
+4）错误绑定，请立即通过微信联系对方。对方可能是您的直接联系人或某个群聊里的用户，请自行查找和解决。\n
+5）绑定期间对双方造成的隐私、数据等问题由您和对方承担。再次提醒您谨慎接受这则邀请。
+  </text>
+  <text class="text3">请仔细阅读协议并答复</text>
+  <view class="panelBtn FlexRow">
+    <navigator class='btn3 btn' open-type="exit" target="miniProgram">拒绝</navigator>
+    <button class='btn4 btn' bindtap='gotoBinding'>接受</button>
+  </view>
+  <view style='height:100rpx;'></view>
+</view>

pages/other/binding.wxss

@@ -0,0 +1,72 @@
+.text1{
+  align-self: flex-start;
+  font-size:32rpx;
+  margin: 50rpx 0 30rpx 30rpx;
+}
+
+.text2{
+  font-size:24rpx;
+  color:#787878;
+  margin-top: 30rpx;
+  width:690rpx;
+  font-weight: 400;
+}
+
+.text3{
+  font-size:28rpx;
+  margin: 60rpx 0 0 0;
+  font-weight: 400;
+  text-align: center;
+  line-height: 40rpx;
+}
+
+.btn{
+  width:690rpx;
+  height:90rpx;
+  text-align: center;
+  border:1rpx solid #9B9B9B;
+  font-size:36rpx;
+  line-height: 90rpx;
+  border-radius: 14rpx;
+  color:#787878;
+  background-color: #fff;
+  margin-top: 30rpx;
+}
+
+.userinfo{
+  width:100%;
+  height:120rpx;
+  background-color: #ffffff;
+  justify-content: flex-start;
+  border-bottom: 1rpx solid #E3E3E3;
+}
+
+.avatar{
+  margin-left: 30rpx;
+  width:60rpx;
+  height:60rpx;
+  border-radius: 50%;
+}
+
+.nickname{
+  margin-left: 30rpx;
+  font-weight:400;
+  font-size: 28rpx;
+}
+
+.btn2{
+  margin-top: 60rpx;
+  background-color: #B3443B;
+  color:#fff;
+}
+.btn3{
+  background-color: #B3443B;
+  color:#fff;
+  width:290rpx;
+  margin: 30rpx 10rpx;
+}
+
+.btn4{
+  width:290rpx;
+  margin: 30rpx 10rpx;
+}

pages/other/homework.js

@@ -0,0 +1,42 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    List: [],
+  },
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      NickName: app.globalData.userInfo.NickName,
+      AvatarUrl: app.globalData.userInfo.AvatarUrl,
+    });
+
+    var userid = app.globalData.userInfo.UserID;
+    if (options.UserID)
+      userid=options.UserID;
+
+    main.getData("GetMiaoguoCheckList?UserID=" + userid, function (data) {
+      if (data) {
+        that.setData({
+          FinishedCount:data.FinishedCount,
+          List: data.List,
+          NickName: data.NickName,
+          AvatarUrl: data.AvatarUrl,
+        });
+      }
+    });
+
+    app.globalData.Homework=0;
+  },
+  onShareAppMessage: function () {
+    return {
+      title: "作业清单",
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID +'&Homework=1',
+      imageUrl: "../images/program_screenshot_checklist.png",
+    }
+  },
+})

pages/other/homework.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "作业清单",
+  "backgroundColor": "#F0F0F0",
+  "enablePullDownRefresh": true
+}

pages/other/homework.wxml

@@ -0,0 +1,88 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class='userinfo FlexRow'>
+    <image class='avatar' src="{{AvatarUrl}}" />
+    <view class="nickname">{{NickName}}</view>
+  </view>
+  <view class='panelItem FlexRow'>
+    <view class='panelItem1'>作业进度</view>
+    <view class='panelItem2'>{{FinishedCount}}%</view>
+  </view>
+  <view class='lineFooter'></view>
+
+  <view class="panelTitle FlexRow">
+    <view class="panelTitle1">课前准备</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='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>
+      <view></view>
+    </view>
+  </block>
+  <view class='lineFooter'></view>
+
+  <view class="panelTitle FlexRow">
+    <view class="panelTitle1">看课程</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>
+      <view></view>
+    </view>
+  </block>
+  <view class='lineFooter'></view>
+
+  <view class="panelTitle FlexRow">
+    <view class="panelTitle1">课后练习</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='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='panelItem11'>{{item.Title}}</view>
+      </view>
+      <view></view>
+    </view>
+  </block>
+  <view class='lineFooter'></view>
+
+  <view class="panelTitle FlexRow">
+    <view class="panelTitle1">班群技能</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='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='panelItem11'>{{item.Title}}</view>
+      </view>
+      <view></view>
+    </view>
+  </block>
+  <view class='lineFooter'></view>
+  <view style='height:100rpx;'></view>
+</view>

pages/other/homework.wxss

@@ -0,0 +1,65 @@
+.userinfo{
+  width:100%;
+  margin: 50rpx 0 30rpx 0;
+  height:60rpx;
+  justify-content: flex-start;
+}
+
+.avatar{
+  margin-left:30rpx;
+  width:60rpx;
+  height:60rpx;
+  border-radius: 50%;
+}
+
+.nickname{
+  margin-left: 30rpx;
+  font-weight:400;
+  font-size: 28rpx;
+}
+.panelTitle{
+  width:100%;
+  margin-top: 50rpx;
+  justify-content: space-between;
+}
+.panelTitle .panelTitle1{
+  font-size:32rpx;
+  margin-left: 30rpx;
+  margin-bottom: 30rpx;
+}
+
+.panelItem{
+  width:100%;
+  justify-content: space-between;
+  font-size:28rpx;
+  height:100rpx;
+  background-color: #fff;
+}
+
+.panelItem .panelItem1{
+  margin-left: 30rpx;
+  font-weight: 400;
+  justify-content: flex-start;
+}
+
+.panelItem .panelItem2{
+  margin-right: 30rpx;
+  color:#787878;
+  font-weight: 500;
+}
+
+.panelItem .panelItem11{
+  margin-left: 20rpx;
+}
+
+.universalpic_checked_blue_40x40{
+  width:40rpx;
+  height:40rpx;
+}
+
+.Number{
+  font-size:36rpx;
+  color:#D2D2D2;
+  font-family: 'Roboto-Black';
+  margin: 0 19rpx 0 0;
+}

pages/other/lesson.js

@@ -4,15 +4,13 @@ import main from '../../utils/main';
 const app = getApp();
 var imageUrlPrefix;
 var currentContent;
+var backgroundAudioManager;
 
 Page({
   data: {
     LessonID: 1,
     ArrTirtle: [],
   },
-  onReady: function (e) {
-    this.audioCtx = wx.createAudioContext('myAudio')
-  },
   onLoad: function (options) {
     var that = this;
     var LessonID = 1;
@@ -23,11 +21,17 @@ Page({
     if (options && options.LessonPage) {
       LessonPage = options.LessonPage;
     }
+    else
+      LessonPage=1;
+
     that.setData({
       Containnerheight: main.getWindowHeight(),
       LessonID: LessonID,
       LessonPage: LessonPage,
     });
+    backgroundAudioManager = wx.getBackgroundAudioManager();
+    backgroundAudioManager.onEnded(that.bindEnded);
+
     imageUrlPrefix = app.globalData.uploadImageUrl + "lesson/lesson" + LessonID + "/";
     main.getData("GetMiaoguoLesson?Lesson=" + LessonID + "&time=" + new Date().getTime(), function (data) {
       var id = that.data.LessonPage;
@@ -39,6 +43,15 @@ Page({
         AudioSrc: imageUrlPrefix + "sounds/"+that.data.LessonPage+".m4a",
         ImageUrl: imageUrlPrefix + "%E5%B9%BB%E7%81%AF%E7%89%87" + id+".jpg",
       });
+
+      if (that.data.LessonPage>1){
+        that.setData({
+          IsPause: false,
+        });
+        backgroundAudioManager.title = that.data.ArrTirtle[that.data.LessonPage - 1].Title;
+        backgroundAudioManager.src = that.data.AudioSrc;
+      }
+
     });
     currentContent = [];
     app.globalData.LessonID = 0;
@@ -64,6 +77,7 @@ Page({
   playAudio: function (e) {
     var that = this;
     var id = Number(e.currentTarget.dataset.id) + 1;
+    currentContent.push(id);
     if (id < 10)
       id = "0" + id;
     this.setData({
@@ -72,25 +86,30 @@ Page({
       AudioSrc: imageUrlPrefix + "sounds/" + Number(id) + ".m4a",
       ImageUrl: imageUrlPrefix + "%E5%B9%BB%E7%81%AF%E7%89%87" + id + ".jpg",
     });
-    setTimeout(function () {
-      that.audioCtx.play();
-    }, 1000);
+    backgroundAudioManager.title = this.data.ArrTirtle[Number(e.currentTarget.dataset.id)].Title;
+    backgroundAudioManager.src = this.data.AudioSrc;
   },
   bindEnded: function () {
     var id = this.data.LessonPage;
-    currentContent.push(id);
     if (id < this.data.ArrTirtle.length)
       this.playAudio({ currentTarget: { dataset: { id: id } } });
+    else{
+      this.setData({
+        IsPause: true,
+      });
+    }
   },
   audioPlay: function () {
+    var that=this;
     if (this.data.IsPause){
-      this.audioCtx.play();
+      backgroundAudioManager.title = that.data.ArrTirtle[that.data.LessonPage - 1].Title;
+      backgroundAudioManager.src = that.data.AudioSrc;
       this.setData({
         IsPause: false,
       });
     }
     else{
-      this.audioCtx.pause();
+      backgroundAudioManager.pause();
       this.setData({
         IsPause: true,
       });
@@ -104,8 +123,12 @@ Page({
     });
   },
   onShareAppMessage: function () {
+    var title ="秒过学习法";
+    if (this.data.LessonPage>0){
+      title = this.data.ArrTirtle[this.data.LessonPage - 1].Title;
+    }
     return {
-      title: "秒过学习法",
+      title: title,
       path: app.globalData.SharePath + '?LessonID=' + this.data.LessonID + '&LessonPage=' + this.data.LessonPage+'&UserID=' + app.globalData.userInfo.UserID,
       imageUrl: '../images/program_screenshot_l' + this.data.LessonID+'.png',
     }

pages/other/lesson.wxml

@@ -5,7 +5,6 @@
     <image class='music-player-pause-lines' src='../images/music-player-pause-lines.png' hidden="{{IsPause}}" ></image>
     <view class='btnUp' catchtap='audioPlay'></view>  
   </view>
-  <audio class='audio' src="{{AudioSrc}}" id="myAudio" bindended="bindEnded"></audio>
   <view class="main FlexColumn">
     <block wx:for="{{ArrTirtle}}" wx:key="index">
       <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">

pages/other/lesson.wxss

@@ -1,13 +1,7 @@
-.container {
-  background-color: #f0f0f0;
-  color:#1e1e1e;
-  font-weight: 500;
-  justify-content: flex-start;
-}
 
 .top {
   width:100%;
-  height:575rpx;
+  height:555rpx;
   position: fixed;
   z-index: 10;
   background-color: #f0f0f0;
@@ -20,7 +14,7 @@
 }
 
 .main{
-  margin-top: 575rpx;
+  margin-top: 555rpx;
   width:100%;
   align-items: flex-start;
   background-color: #fff;
@@ -45,18 +39,18 @@
 .music-player-play{
   width:60rpx;
   height:60rpx;
-  margin: 20rpx;
+  margin: 30rpx 0 0 0;
 }
 
 .music-player-pause-lines{
   width:60rpx;
   height:60rpx;
-  margin: 20rpx;
+  margin: 30rpx 0 0 0;
 }
 
 .btnUp{
-  width:60rpx;
-  height:60rpx;
+  width:80rpx;
+  height:80rpx;
   background-color: rgba(240,240,240,0.6);
-  margin-top: -80rpx;
+  margin-top: -70rpx;
 }

pages/other/lessonlist.js

@@ -5,11 +5,12 @@ const app = getApp();
 
 Page({
   data: {
-    List: ['预备课','第1课','第2课','第3课'],
+    List: ['第一课', '第二课', '第三课', '第四课'],
   },
   onLoad: function () {
     var that = this;
     that.setData({
+      CheckListUserID:app.globalData.userInfo.UserID,
       Containnerheight: main.getWindowHeight(),
     });
   },
@@ -24,6 +25,21 @@ Page({
       url: '../other/userlist',
     });
   },
+  gotoCheckList: function(){
+    var url = '../other/homework';
+    if (this.data.CheckListUserID)
+      url+="?UserID="+this.data.CheckListUserID;
+    wx.navigateTo({
+      url: url,
+    });
+  },
+  onKeyInput: function (e) {
+    var userid = e.detail.value;
+    var that = this;
+    that.setData({
+      CheckListUserID: userid,
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/other/lessonlist.wxml

@@ -15,4 +15,7 @@
   
   <view style='height:100rpx;'></view>
   <button bindtap='gotoUserList'>审核用户</button>
+  <view style='height:100rpx;'></view>
+  <input class='input' maxlength='4' auto-focus bindinput="onKeyInput" value="{{CheckListUserID}}"  />
+  <button bindtap='gotoCheckList'>CheckList</button>
 </view>

pages/other/lessonlist.wxss

@@ -1,8 +1,3 @@
-.container {
-  justify-content: flex-start;
-  font-weight: 500;
-}
-
 .main{
   width: 100%;
 }
@@ -35,3 +30,9 @@
   margin-left: 30rpx;
 }
 
+.input{
+  width:200rpx;
+  height:80rpx;
+  background-color: #fff;
+}
+

pages/other/payinfo.wxss

@@ -1,8 +1,3 @@
-.container {
-  justify-content: flex-start;
-  font-weight: 500;
-}
-
 .imageDM{
   width:750rpx;
   height:1545rpx;

pages/other/userlist.wxss

@@ -1,9 +1,3 @@
-.container {
-  justify-content: flex-start;
-  font-weight: 500;
-}
-
-
 .panelSearch{
   width:100%;
   height:140rpx;

project.config.json

@@ -59,15 +59,15 @@
 				{
 					"id": 2,
 					"name": "临时",
-					"pathName": "pages/other/userlist",
-					"query": "",
+					"pathName": "pages/index/index",
+					"query": "Homework=1",
 					"scene": null
 				},
 				{
 					"id": 3,
 					"name": "临时",
-					"pathName": "pages/index/index",
-					"query": "LessonID=1&LessonPage=2",
+					"pathName": "pages/other/homework",
+					"query": "",
 					"scene": null
 				}
 			]

utils/main.js

@@ -667,7 +667,8 @@ function updateSearchList(obj) {
 
     }
   }
-  arr.unshift(obj);
+  if (obj.Key)
+    arr.unshift(obj);
 
   if (arr.length > 100) {
     arr.pop();