2.1.64

app.js

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

app.json

@@ -81,7 +81,6 @@
       "pages": [
         "main/search_user",
         "main/user_relation",
-        "main/withdraw_deposit",
         "main/result_list",
         "main/other_list",
         "main/earnings_apply",

pages/index/index.js

@@ -6,6 +6,8 @@ const app = getApp();
 var timeout1 = 0, timeout3=0;
 var timeoutRedirect=0;
 
+
+
 Page({
   data: {
     Sentence:1,
@@ -16,6 +18,17 @@ Page({
     })
   },
   onLoad: function (options) {
+
+    // var interval=null;
+    // var index=0;
+    // interval = setInterval(function () {
+    //   index++;
+    //   console.log(index);
+    //   if (index>10) {
+    //     clearInterval(interval);
+    //   }
+    // },200);
+
     console.log("Time1:" + new Date().getTime());
     if (options) {
       if (options.UserID) {

pages/main/cardmain.wxml

@@ -68,14 +68,9 @@
       <image class="zhishijianyan_70x75" src='../images/wangzhan_70x75.png' />
     </view>
   </view>
-  <!-- <block wx:if="{{IsYearReport}}">
-    <view class="panelItem5 FlexRow" bindtap="goto" data-url="../other/annualreport">
-      <view class="panelItem51 FlexColumn">
-        2020年度秒过用户年报
-      </view>
-      <image class="report_20201231_04" src='{{ImagePath}}web/report_20201231_04.png' />
-    </view>
-  </block> -->
+  <block wx:if="{{IsYearReport}}">
+    <image class="report_2021-banner" src='{{ImagePath}}web/report_2021-banner.png' bindtap="goto" data-url="../other/annualreport" />
+  </block>
 
   <view class="panelItem6 FlexRow" wx:if="{{FolderArr}}">
     <view class="panelItem61 FlexColumn">

pages/main/cardmain.wxss

@@ -143,10 +143,10 @@
   margin-right: 30rpx;
 }
 
-.report_20201231_04{
-  width:139rpx;
-  height:59rpx;
-  margin-right:40rpx;
+.report_2021-banner{
+  width:710rpx;
+  height:180rpx;
+  margin: 30rpx 0 0 0;
 }
 
 

pages/main/default.js

@@ -339,6 +339,16 @@ Page({
         ChangeGroupUserID: id,
       });
     }
+    else if (usertype=="refunduserid"){
+      that.setData({
+        RefundUserID: id,
+      });
+    }
+    else if (usertype=="refundremark"){
+      that.setData({
+        RefundRemark: id,
+      });
+    }
   },
   setSelectUser: function (e) {
     var that = this;
@@ -395,6 +405,20 @@ Page({
             GroupUserNickName: data.NickName,
           });
         }
+        else if (type1==3){
+          that.setData({
+            RefundUserAvatar: data.AvatarUrl,
+            RefundUserNickName: data.NickName,
+          });
+          var url = "GetUserPayList?UserID=" + userid;
+            main.getData(url, function (data) {
+              if (data) {
+                that.setData({
+                  PayList: data,
+                });
+              }
+            });
+          }
       });
     }
   },
@@ -449,6 +473,66 @@ Page({
       }
     }
   },
+  selectPayItem:function(e){
+    var that=this;
+    var id=e.currentTarget.dataset.id;
+    var list=that.data.PayList;
+    for(var i=0;i<list.length;i++){
+      if (list[i].TradeNo==id)
+        list[i].IsSelected="1";
+      else
+        list[i].IsSelected="";
+    }
+    that.setData({
+      PayList:list,
+    });
+  },
+  setRefund:function(){
+    var that=this;
+    var str="",TradeNo="",Remark="";
+
+    var list=that.data.PayList;
+    for(var i=0;i<list.length;i++){
+      if (list[i].IsSelected=="1"){
+        str='确认给【'+that.data.RefundUserNickName+"】退款 ";
+        str+=list[i].Money+"元，";
+        str+="交易编号："+list[i].TradeNo;
+        TradeNo=list[i].TradeNo;
+        Remark=that.data.RefundRemark;
+        break;
+      }
+    }
+    if (!str){
+      wx.showToast({
+        title: '请列表中选择',
+      });
+    }
+    else if (!that.data.RefundRemark){
+      wx.showToast({
+        title: '请输入退款备注',
+      });
+    }
+    else{
+      wx.showModal({
+        title: '退款确认',
+        showCancel: true,
+        cancelText: "取消",
+        content: str,
+        confirmText: '确认',
+        success(res) {
+          if (res.confirm) {
+            var url = "RefundUser?UserID=" + that.data.RefundUserID + "&TradeNo="+TradeNo+"&Remark="+Remark;
+            main.getData(url, function (data) {
+              wx.showToast({
+                title: '退款完成',
+              });
+            });
+            
+          }
+        }
+      });
+    }
+  },
   closeRemind:function(){
     this.setData({
       IsShowRemind: false,

pages/main/default.wxml

@@ -52,7 +52,7 @@
   <view class='btn1' catchtap="goto" data-url="../index/index">重启小程序</view>
 </view>
 
-<view wx:if="{{IsShowUserID}}" class="IsExitContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
+<view wx:if="{{IsShowUserID}}" class="IsExitContainer container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
     <view class="panel2 FlexRow">
     <input class='input2 input' type="number"  always-embed="true"  value="{{ChangeUserID}}" bindinput="onKeyInput" data-type="userid" />
     <button class="btn2" bindtap="setSelectUser">查看用户</button>
@@ -66,9 +66,14 @@
     <view class="panel2 FlexRow">
       <button class="btnShowUserID" bindtap="goto" data-url="../other/newuser">新手页面</button>
       <button class="btnShowUserID" bindtap="goto" data-url="../other/homework">作业清单</button>
+      <button class="btnShowUserID" bindtap="goto" data-url="../../pages_agent/main/index">推广活动</button>
     </view>
+
+    <!-- 自定义开据 -->
     <view class="hiddenline"></view>
     <button class="btnShowUserID" bindtap="goto" data-url="../other/paycustom">自定义开据</button>
+    
+    <!-- 更改介绍人 -->
     <view class="hiddenline"></view>
     <view class="panel2 FlexRow">
       <input class='input2 input' type="number"  always-embed="true"  placeholder="新用户ID" value="{{ChangeNewUserID}}" bindinput="onKeyInput" data-type="newuserid"/>
@@ -84,6 +89,7 @@
     </view>
     <button class="btnShowUserID" bindtap="setUserIntroducer">更改用户介绍人</button>
     
+    <!-- 更改班群 -->
     <view class="hiddenline"></view>
     <view class="panel2 FlexRow">
       <input class='input2 input' type="number"  always-embed="true"  placeholder="用户ID" value="{{ChangeGroupUserID}}" bindinput="onKeyInput" data-type="groupuserid"/>
@@ -96,6 +102,24 @@
       <button class="btnShowUserID" bindtap="setUserGroup" data-id="2">群改润雨</button>
       <button class="btnShowUserID" bindtap="setUserGroup" data-id="3">群改扬帆</button>
     </view>
+
+    <!-- 退款 -->
+    <view class="hiddenline"></view>
+    <view class="panel2 FlexRow">
+      <input class='input2 input' type="number"  always-embed="true"  placeholder="用户ID" value="{{RefundUserID}}" bindinput="onKeyInput" data-type="refunduserid"/>
+      <button class="btn2" bindtap="getUserInfoFunction" data-id="{{RefundUserID}}" data-type="3">查看</button>
+      <image class="Avatar2" src='{{RefundUserAvatar}}'  wx:if="{{RefundUserAvatar}}"/>
+      <view  class="NickName2"  wx:if="{{RefundUserAvatar}}">{{RefundUserNickName}}</view>
+    </view>
+    <view class="panel2 FlexColumn" wx:if="{{RefundUserAvatar}}">
+      <text catchtap="selectPayItem" data-id="{{item.TradeNo}}" class="panelItemPay{{item.IsSelected}}" wx:for="{{PayList}}" wx:key="index">交易编号：{{item.TradeNo}} \n支付费用：{{item.Money}}元 \n支付时间：{{item.PayEndTime}} \n到期日期：{{item.ProductServiceTime}} </text>
+    </view>
+    <view class="panel2 FlexColumn" wx:if="{{RefundUserAvatar}}">
+      <input class="input3 input" placeholder="备注如微信帐号、昵称（便于查找）及原因等。" confirm-type="done" value="{{RefundRemark}}" bindinput="onKeyInput" data-type="refundremark" />
+    </view>
+    <view class="panel21 panel2 FlexRow">
+      <button class="btnShowUserID" bindtap="setRefund">退款</button>
+    </view>
     
     <view class="hiddenline"></view>
     <view class="panel2 FlexRow">

pages/main/default.wxss

@@ -266,7 +266,7 @@ page{
 
 .IsExitContainer{
   background-color: #3157ba;
-  position: fixed;
+  position: absolute;
   z-index: 100;
   top:0;
 }
@@ -302,7 +302,6 @@ page{
   margin-top: 30rpx;
 }
 .panel2{
-  
   margin: 10rpx 0 10rpx 0;  
 }
 
@@ -429,4 +428,26 @@ page{
   width:70%;
   height:1rpx;
   background-color: #ddd;
+}
+
+.panelItemPay{
+  background-color: #fff;
+  width:100%;
+  border-bottom: 2rpx solid #F0F0F0;
+  padding: 10rpx 30rpx;
+}
+
+.panelItemPay1{
+  background-color: #E3E3E3;
+  width:100%;
+  border-bottom: 2rpx solid #F0F0F0;
+  padding: 10rpx 30rpx;
+}
+
+.input3{
+  width: 602rpx;
+  margin: 0rpx 30rpx 10rpx 30rpx;
+  font-size:28rpx;
+  text-align: left;
+  padding-left: 20rpx;
 }

pages/main/detail.js

@@ -873,6 +873,7 @@ Page({
 
     }, app.globalData.CardWaitTimeMax * 60 * 1000);
     timeoutEveryCard.push(timeoutEveryCardNumber);
+    console.log("timeoutEveryCard:"+timeoutEveryCard);
   },
   setFinallyResult: function () {
     var that = this;

pages/main/searchCard.js

@@ -17,7 +17,6 @@ Page({
       IsShowNull: false,
       Searching:true,
     });
-
     common.getStorageValue(that, "SearchTextList", [], function () {});
   },
   onShow:function(){

pages/other/annualreport.js

@@ -32,7 +32,6 @@ Page({
     var imageQRCode = app.globalData.serverUrl;
     imageQRCode += common.Encrypt("BuildWXServiceQRCode?QRCodeType=0&UserID=" + app.globalData.userInfo.UserID + "&SourceID=" + app.globalData.ProgramID);
     console.log(imageQRCode);
-    var that = this;
     var downloadTask = wx.downloadFile({
       url: imageQRCode,
       success(res) {

pages/other/annualreport.wxml

@@ -1,10 +1,6 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-	<image src="{{ImagePath}}web/report_20201231_01.png" class="panelTop" />
+	<image src="{{ImagePath}}web/report_2021-header.png" class="panelTop" />
 	<view class="panelMain FlexColumn">
-		<view class="Remark FlexColumn">
-			<text>　　2020是不同凡响的一年，我们一起经历了疫情期间的远程上课，和重返校园后的奋起直追。突如其来的生活变化，家长们孩子们大家都辛苦了。祝我们在2021年过地更加顺利平安和谐进步。给彼此加油，为祖国加油！\n
-			　　2020年度练习奖励、期末备考有奖练习活动结果，将于1月10日在秒过学习小组公布。</text>
-		</view>
 		<view class="text1">自{{Data.StartDate}}以来</view>
 		<view class="text2">年度报告的数据统计截止于{{Data.EndDate}}</view>
 		<view class="line1"></view>
@@ -94,36 +90,36 @@
 			<image src="{{ImagePath}}web/universalpic_help_orange_26x26.png" class="help" />
 			<view>急需了解的知识</view>
 		</view>
-		<view class="panelItem FlexRow" bindtap='goto' data-url="./help?id=1&idchild=0">
-			<view class="text3">题卡建议数量</view>
+		<view class="panelItem FlexRow" bindtap='goto' data-url="./help?id=1&idchild=13">
+			<view class="text3">什么是到期时间，什么是到期题卡</view>
 			<view class="text4">
 				<image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray" />
 			</view>
 		</view>
 		<view class="line1"></view>
-		<view class="panelItem FlexRow" bindtap='goto' data-url="./help?id=2&idchild=3">
-			<view class="text3">1分钟做完和0任务量的处理</view>
+		<view class="panelItem FlexRow" bindtap='goto' data-url="../plan/pattern">
+			<view class="text3">使用记忆评价高级模式让复习更精确</view>
 			<view class="text4">
 				<image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray" />
 			</view>
 		</view>
 		<view class="line1"></view>
-		<view class="panelItem FlexRow" bindtap='goto' data-url="../plan/pattern">
-			<view class="text3">建议把记忆评价命名方式改为“高级模式”</view>
+		<view class="panelItem FlexRow" bindtap='goto' data-url="./help?id=2&idchild=0">
+			<view class="text3">批量管理题卡用秒过官网</view>
 			<view class="text4">
 				<image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray" />
 			</view>
 		</view>
 		<view class="line1"></view>
-		<view class="panelItem FlexRow" bindtap='goto' data-url="./help?id=2&idchild=4">
-			<view class="text3">过度点蓝的成因和危害</view>
+		<view class="panelItem FlexRow" bindtap='goto' data-url="./help?id=1&idchild=12">
+			<view class="text3">归档、不会、挪到最后、搁置，多种处置</view>
 			<view class="text4">
 				<image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray" />
 			</view>
 		</view>
 		<view class="line1"></view>
-		<view class="panelItem FlexRow" bindtap='goto' data-url="./help?id=0&idchild=3">
-			<view class="text3">什么是群接力</view>
+		<view class="panelItem FlexRow" bindtap='goto' data-url="./tips">
+			<view class="text3">更多使用技巧</view>
 			<view class="text4">
 				<image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray" />
 			</view>

pages/test/index.wxml

@@ -60,7 +60,7 @@
           <view class="ItemTitle2">{{item.Name[0]}}</view>
         </view>
         <view class="Item2 FlexColumn">
-          <view class="ItemDate">{{item.CreateTime}}</view>
+          <view class="ItemDate">{{item.UpdateTime}}</view>
           <view class="ItemNumber FlexRow">
             <image wx:if="{{item.TestType=='read' && item.IsFinished==1}}" class="examine_willread_gray_22x22"
               src="../images/examine_willread_green_22x22.png"></image>

pages/test/report.js

@@ -2,7 +2,7 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
-var intervalBuild = 0;
+var intervalBuild = null;
 var TestReportID = 0;
 
 Page({
@@ -203,21 +203,34 @@ Page({
         IsBuild: 1,
       });
       var buildCardNumber = 0;
+      if (intervalBuild!=null){
+        clearInterval(intervalBuild);
+        intervalBuild=null;
+      }
       intervalBuild = setInterval(function () {
-        that.addCard(arr[buildCardNumber]);
-        buildCardNumber++;
-        that.setData({
-          BuildCardNumber: Math.round(100 * buildCardNumber / arr.length) + "%",
-        });
-        if (buildCardNumber >= arr.length) {
-          clearInterval(intervalBuild);
-          var TestTask = {};
-          TestTask.TestExistStr = TestExistStr;
-          
-          that.saveInfo(TestTask);
+        if (arr.length>0){
+          that.addCard(arr[buildCardNumber]);
+          buildCardNumber++;
           that.setData({
-            IsBuild: 2,
+            BuildCardNumber: Math.round(100 * buildCardNumber / arr.length) + "%",
           });
+          if (buildCardNumber >= arr.length) {
+            clearInterval(intervalBuild);
+            //intervalBuild=null;
+            buildCardNumber=0;
+            arr=[];
+            var TestTask = {};
+            TestTask.TestExistStr = TestExistStr;
+            
+            that.saveInfo(TestTask);
+            that.setData({
+              IsBuild: 2,
+            });
+          }
+        }
+        else{
+          clearInterval(intervalBuild);
+          //intervalBuild=null;
         }
       }, 500);
     } else {
@@ -242,7 +255,6 @@ Page({
   },
   saveInfo: function (TestTask) {
     var that = this;
-    clearInterval(intervalBuild);
     var userid = app.globalData.userInfo.UserID;
     var param1 = wx.getStorageSync("TestTask");
     if (param1.List)

pages_agent/main/earnings_apply.wxml

@@ -15,7 +15,7 @@
       </view>
       <view class="panel113 FlexRow">
         <view class="text4">批复时间</view>
-        <view class="text5">{{Info.CheckTime}}</view>
+        <view class="text5"><block wx:if="{{Info.CheckTime}}">{{Info.CheckTime}}</block></view>
       </view>
     </view>
     <view class="line2"></view>
@@ -27,7 +27,7 @@
   <view class="panel1 FlexColumn">
     <view class="panel21 FlexRow">
       <view class="text7">提现金额</view>
-      <view class="text8">{{Info.RealMoney}}</view>
+      <view class="text8">{{Info.ApplyMoney}}</view>
     </view>
     <view class="line"></view>
     <view class="panel11 FlexColumn">
@@ -52,7 +52,7 @@
       </view>
       <view class="panel22 panel113 FlexRow">
         <view class="text4">收款帐号真实姓名</view>
-        <view class="text5">{{Info.RealName}}</view>
+        <view class="text5"><block wx:if="{{Info.RealName}}">{{Info.RealName}}</block></view>
       </view>
     </view>
   </view>

pages_agent/main/earnings_list.wxml

@@ -2,7 +2,8 @@
   <view class="panel1 FlexColumn" wx:for="{{List}}" wx:key="*this">
     <view class="text10 text1" wx:if="{{item.IsCheck==0}}">等待审核</view>
     <view class="text1" wx:if="{{item.IsCheck==1}}">审核通过</view>
-    <view class="text2">{{item.RealMoney}}</view>
+    <view class="text2" wx:if="{{item.IsCheck==0}}">{{item.ApplyMoney}}</view>
+    <view class="text2" wx:if="{{item.IsCheck==1}}">{{item.RealMoney}}</view>
     <view class="text3">到帐金额</view>
     <view class="line"></view>
     <view class="panel11 FlexColumn">

pages_agent/main/index.js

@@ -5,7 +5,7 @@ const app = getApp();
 
 Page({
   data: {
-
+    Version:app.globalData.Version,
   },
   onLoad: function (options) {
     var that = this;
@@ -75,8 +75,15 @@ Page({
             console.log("reboot:" + new Date().getTime());
           }, 2000);
         } else {
+          if (!data.IdentityCard)
+            data.IdentityCard="";
+          if (!data.Phone)
+            data.Phone="";
+            
           app.globalData.userInfo = data;
-          //console.log(data);          
+          that.setData({
+            IsPromoter:app.globalData.userInfo.IsPromoter,
+          });    
         }
       });
     });
@@ -88,6 +95,32 @@ Page({
       url: url,
     });
   },
+  setSelectUser: function (e) {
+    var that = this;
+
+    var userid = e.currentTarget.dataset.userid;
+    wx.setStorageSync("UserID", userid);
+    
+    app.globalData.userInfo.UserID = userid;
+    that.getUserInfo2(userid,"",function(data){
+      wx.setNavigationBarTitle({
+        title: data.NickName
+      });
+      app.globalData.userInfo=data;
+      that.setData({
+        IsPromoter:app.globalData.userInfo.IsPromoter,
+      });    
+
+    });
+  },
+  getUserInfo2:function(userID,fieldStr,callback){
+    var url = "GetMiaoguoWXUserInfo?UserID=" + userID + fieldStr;
+    main.getData(url, function (data) {
+      if (data) {
+        callback(data);
+      }
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages_agent/main/index.wxml

@@ -1,6 +1,9 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelHeight"></view>
-  <view class="panel1 FlexRow" bindtap='goto' data-url="user_index?AgentCategory=promotion">
+  <view wx:if="{{IsPromoter==0}}">
+    无活动
+  </view>
+  <view class="panel1 FlexRow" bindtap='goto' data-url="user_index?AgentCategory=promotion" wx:if="{{IsPromoter>0}}">
     <view class="panel11 FlexRow">
       <image src='../../pages/images/product_icon_mg_70x70.png' class="product_icon_mg_70x70" />
       <view class="panel111">秒过推广计划</view>
@@ -9,7 +12,7 @@
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
-  <view class="panel1 FlexRow" bindtap='goto' data-url="user_index?AgentCategory=ambassador">
+  <view class="panel1 FlexRow" bindtap='goto' data-url="user_index?AgentCategory=ambassador" wx:if="{{IsPromoter==1}}">
     <view class="panel11 FlexRow">
       <image src='../../pages/images/product_icon_mg_70x70.png' class="product_icon_mg_70x70" />
       <view class="panel111">秒过大使计划</view>
@@ -18,5 +21,14 @@
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
+
+  <view class="test FlexColumn">
+    <view class="btn">下列按钮测试用({{Version}})</view>
+    <button class="btn" bindtap="setSelectUser" data-userid="4398">slyicecream</button>
+    <button class="btn" bindtap="setSelectUser" data-userid="14983">小云</button>
+    <button class="btn" bindtap="setSelectUser" data-userid="14822">管璐瑶</button>
+    <button class="btn" bindtap="setSelectUser" data-userid="14850">艾小西</button>
+    <button class="btn" bindtap="setSelectUser" data-userid="14818">甲子</button>
+  </view>
   
 </view>

pages_agent/main/index.wxss

@@ -27,4 +27,16 @@
   width:16rpx;
   height:26rpx;
   margin-right: 30rpx;
+}
+
+.test{
+  width: 500rpx;
+  border-radius: 20rpx;
+  padding: 0 0 30rpx 0;
+  margin-top: 100rpx;
+  background-color: #dddddd;
+}
+
+.btn{
+  margin: 30rpx 0 0 0;
 }

pages_agent/main/other_list.js

@@ -75,6 +75,36 @@ Page({
       IsWithdraw:!this.data.IsWithdraw,
     });
   },
+  applyPay:function(e){
+    var that=this;
+    if (that.data.Total<1){
+      wx.showToast({
+        title: '不足1元不能提现',
+        mask: true,
+        image: "../../pages/images/universalpic_exclamation_white_120x120.png",
+      });
+    }
+    else{
+      wx.showLoading({
+        title: '申请保存中',
+        mask: true,
+      });
+      var url="ApplyWithdraw?UserID="+app.globalData.userInfo.UserID+"&AgentCategory="+that.data.AgentCategory;
+      main.getData(url, function () {
+        var url = "GetMiaoguoAgentRecordList?UserID=" + app.globalData.userInfo.UserID + "&AgentCategory=" + that.data.AgentCategory;
+        main.getData(url, function (data) {
+          if (data) {
+            wx.hideLoading();
+            app.globalData.EarningsList = data;
+            wx.redirectTo({
+              url: "earnings_list?AgentCategory="+that.data.AgentCategory,
+            });
+          }
+        });
+      });
+    }
+
+  },
   onPullDownRefresh: function () {
     wx.stopPullDownRefresh();
   },

pages_agent/main/other_list.wxml

@@ -86,7 +86,7 @@
         <view class="text53">到账金额</view>
       </view>
     </view>
-    <view class="panel52 FlexRow">
+    <view class="panel52 FlexRow" wx:if="{{false}}">
       <view class="Left FlexRow">
         <image src='../../pages/images/universalpic_exclamation_orange_40x40.png' class="universalpic_exclamation_orange_40x40" />
         <view class="text53">已扣除因退款返还奖励金额</view>
@@ -125,9 +125,9 @@
       <view class="text54">收款人帐号真实姓名</view>
       <view class="text54">{{User.RealName}}</view>
     </view>
-    <view class="btn2">确认</view>
+    <view class="btn2" catchtap="applyPay">确认</view>
 
   </view>
-  <view class="btnCancel" bindtap="showWithdraw">取消</view>
+  <view class="btnCancel" catchtap="showWithdraw">取消</view>
 
 </view>

pages_agent/main/result_list.js

@@ -6,8 +6,7 @@ const app = getApp();
 Page({
   data: {
     IsPromotion:false,
-    SelectMenuCss1:"selectItem",
-    SelectMenuCss2:"",
+
   },
   onLoad: function (options) {
     var that = this;
@@ -20,6 +19,9 @@ Page({
       Containnerheight: main.getWindowHeight(),
       IsPromotion:isPromotion,
       ListType:options.ListType,
+      AgentCategory:options.AgentCategory,    
+      SelectMenuCss1:"selectItem",
+      SelectMenuCss2:"",
     });
 
     wx.setNavigationBarTitle({
@@ -32,31 +34,77 @@ Page({
     var that = this;
 
     var url="";
-    url="GetIntroducerUserList2?ListType="+that.data.ListType;
-    url+="&UserID=" + app.globalData.userInfo.UserID;
 
+    if (that.data.ListType=="团队动态"){
+      url="GetMiaoguoTeamDynamic?UserID=" + app.globalData.userInfo.UserID;
+    }
+    else{
+      url="GetIntroducerUserList2?ListType="+that.data.ListType;
+      url+="&AgentCategory="+that.data.AgentCategory;
+      url+="&UserID=" + app.globalData.userInfo.UserID;
+    }
     main.getData(url, function (data) {
-      wx.hideLoading();
       if (data) {
+        if (that.data.ListType=="团队动态"){
+          if (that.data.SelectMenuCss1=="selectItem")
+            data.List=data.List1;
+          else if (id==2)
+            data.List=data.List2;
+        }
         that.setData({
           Info:data,
         });
       }
     });
   },
+  gotoRecord: function (e) {
+    var that = this;
+
+    var userid = e.currentTarget.dataset.userid;
+
+    if (that.data.ListType=="团队动态"){
+      wx.navigateTo({
+        url: "user_relation?UserID="+userid,
+      });
+    }
+    else{
+      var url="GetMiaoguoAgentRecordID?AgentCategory="+that.data.AgentCategory;
+      url+="&UserID=" + userid;
+  
+      main.getData(url, function (data) {
+        if (data) {
+          wx.navigateTo({
+            url: "earnings_apply?RecordID="+data+"&AgentCategory="+that.data.AgentCategory,
+          });
+        }
+      });
+    }
+  },
+  goto: function (e) {
+    var url = e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
   onPullDownRefresh: function () {
     wx.stopPullDownRefresh();
   },
   onMenu:function(e){
+    var that = this;
     var id=e.currentTarget.dataset.id;
     var SelectMenuCss1="",SelectMenuCss2="";
-    if (id==1)
+    if (id==1){
       SelectMenuCss1="selectItem";
-    else if (id==2)
+      that.data.Info.List=that.data.Info.List1;
+    }
+    else if (id==2){
       SelectMenuCss2="selectItem";
+      that.data.Info.List=that.data.Info.List2;
+    }
     this.setData({
       SelectMenuCss1:SelectMenuCss1,
       SelectMenuCss2:SelectMenuCss2,
+      Info:  that.data.Info
     });
   },
   onShareAppMessage: function () {

pages_agent/main/result_list.wxml

@@ -1,15 +1,15 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <block wx:if="{{!IsPromotion}}">
+  <block wx:if="{{!IsPromotion && ListType=='团队动态'}}">
     <view class="panelTop FlexRow">
       <view class="panelTop1 FlexColumn" catchtap="onMenu" data-id="1">
-        <view class="{{SelectMenuCss1}} text0">团队贡献</view>
+        <view class="{{SelectMenuCss1}} text0">队员能量</view>
         <view class="{{SelectMenuCss1}}BG line1"></view>
       </view>
       <view class="panelTop2 panelTop1 FlexColumn" catchtap="onMenu" data-id="2">
         <view class="{{SelectMenuCss2}} text0">其他</view>
         <view class="{{SelectMenuCss2}}BG line1"></view>
       </view>
-      <view class="panelTop3 panelTop1 FlexColumn">
+      <view class="panelTop3 panelTop1 FlexColumn" catchtap="goto" data-url="search_user">
         <image src='../../pages/images/universalpic_magnifier_black_30x30.png' class="universalpic_magnifier_black_30x30" />
       </view>
     </view>
@@ -21,7 +21,7 @@
     <view class="panel11 FlexColumn">
       <text class="text1">{{Info.Description}}</text>
     </view>
-    <view class="panel12 FlexRow"  wx:if="{{!IsPromotion}}">
+    <view class="panel12 FlexRow"  wx:if="{{!IsPromotion && Info.Readme}}">
       <view class="text2">大使工作规则</view>
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
@@ -31,9 +31,15 @@
     <text></text>
   </view>
   <view class="panel3 FlexRow">
-    <view class="panel31 FlexColumn" wx:for="{{Info.List}}" wx:key="*this">
+    <view class="panel31 FlexColumn" wx:for="{{Info.List}}" wx:key="*this" bindtap="gotoRecord" data-userid="{{item.UserID}}" >
       <image src='{{item.AvatarUrl}}' class="product_icon_mg_70x70" />
-      <view class="text4">{{item.NickName}}</view>
+      <view class="text4" wx:if="{{item.IsRebate==1 || !IsPromotion}}">{{item.NickName}}</view>
+      <view class="text5" wx:if="{{item.IsRebate!=1 && IsPromotion}}">{{item.NickName}}</view>
+      <view class="text6 FlexRow" wx:if="{{ListType=='团队动态'}}">
+        <view class="text61">{{item.Type}}</view>
+        <view class="text62"></view>
+        <view class="text61">{{item.Count}}</view>
+      </view>
     </view>
   </view>
   <view class="footer"></view>

pages_agent/main/result_list.wxss

@@ -53,7 +53,7 @@
   width:100%;
   font-size: 22rpx;
   font-weight: 400;
-  min-height: 178rpx;
+  min-height:90rpx;
   justify-content: flex-start;
 }
 
@@ -129,6 +129,30 @@
   margin-top:20rpx;
 }
 
+
+.text5{
+  width:110rpx;
+  font-size:20rpx;
+  font-weight: 400;
+  text-align: center;
+  margin-top:20rpx;
+  color:#fff;
+  background-color: #4D4D4D;
+}
+
+.text61{
+  font-size:18rpx;
+  color: #4D4D4D;
+  font-family: 'Roboto-Black';
+}
+
+.text62{
+  width: 2rpx;
+  height:14rpx;
+  background-color: #d2d2d2;
+  margin: 0 10rpx;
+}
+
 .footer{
   width:100%;
   height:232rpx;

pages_agent/main/search_user.js

@@ -5,7 +5,10 @@ const app = getApp();
 
 Page({
   data: {
-    IsList:true,
+    IsNull:false,
+    IsList:false,
+    Searching:true,
+    SearchList:[],
   },
   onLoad: function (options) {
     var that = this;
@@ -14,12 +17,122 @@ Page({
       Containnerheight: main.getWindowHeight(),
     });
 
-    common.getStorageValue(that, "SearchTextList", [], function () {});
+    common.getStorageValue(that, "SearchTextList2", [], function () {});
   
   },
+  onShow:function(){
+    this.setData({
+      Focus: true,
+    });
+  },
   onPullDownRefresh: function () {
     wx.stopPullDownRefresh();
   },
+
+  onKeyInput: function (e) {
+    console.log("onKeyInput");
+    var search = e.detail.value;
+    var that = this;
+    that.setData({
+      SearchInfo: search,
+    });
+  },
+  onFocus: function (e) {
+    console.log("onFocus");
+    var that = this;
+    that.setData({
+      Searching:true,
+      IsNull:false,
+    });
+  },
+  onBindblur: function (e) {
+    console.log("onBindblur");
+  },
+  onSearch: function (e) {
+    if (e.currentTarget.dataset.search){
+      this.data.SearchInfo = e.currentTarget.dataset.search;
+      this.setData({
+        SearchInfo:this.data.SearchInfo,
+      });
+    }
+    if (this.data.SearchInfo && this.data.SearchInfo.length > 0) {
+      var search = this.data.SearchInfo;
+      
+      var that = this;
+      var url = 'GetMiaoguoIntroducerSearchUser?UserID=' + app.globalData.userInfo.UserID;
+      if (search)
+        url += "&Key=" + search;
+
+      updateData(that,search);
+      
+      wx.showLoading({
+        title: '请稍后...',
+      });
+      main.getData(url, function (data) {
+        wx.hideLoading();
+        if (data) {
+          if (data.length==0){
+            that.setData({
+              IsNull:true,
+            });
+          }
+          else{
+            that.setData({
+              IsList:true,
+              List:data,
+            });
+          }
+        }
+      });
+    }
+    else {
+      wx.showToast({
+        title: '请输搜索内容',
+      })
+    }
+
+    function updateData(obj,search) {
+      setTimeout(function () {
+        var arr = obj.data.SearchTextList2;
+        for (var i = 0; i < arr.length; i++) {
+          if (arr[i] == search) {
+            arr.splice(i, 1);
+            break;
+          }
+        }
+        arr.unshift(search);
+
+        while (arr.length > 10) {
+          arr.pop();
+        }
+
+        wx.setStorageSync("SearchTextList2", arr);
+        obj.setData({
+          SearchTextList2: arr,
+        });
+      }, 2000);
+    }
+  },
+  clearInput:function(){
+    this.setData({
+      SearchInfo:"",
+      IsNull:false,
+      SearchList:[],
+      Focus:true,
+      IsList:false,
+    });
+  },
+  goto: function (e) {
+    var url = e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
+  onClose: function () {
+    wx.navigateBack({
+      delta: 1,
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages_agent/main/search_user.wxml

@@ -7,14 +7,14 @@
 
         <view class="clearData FlexRow" catchtap="clearInput" wx:if="{{SearchInfo}}">
           <view class="clearData0 FlexRow">
-            <image class="universalpic_close_black_16x16" src='../images/universalpic_close_black_16x16.png' />
+            <image class="universalpic_close_black_16x16" src='../../pages/images/universalpic_close_black_16x16.png' />
           </view>
         </view>
 
       </view>
     </view>
     <view class="panelRight FlexRow">
-      <view class='panelTop1 FlexRow' bindtap="close">
+      <view class='panelTop1 FlexRow' bindtap="onClose">
         <view class="panelTop3">取消</view>
       </view>
     </view>
@@ -35,30 +35,22 @@
       <view class="lineWidth720"></view>
     </view>
     <view class='panelItemSearch0 FlexRow'>
-      <scroll-view wx:if="{{SearchTextList.length>0}}" scroll-x="true" class="panelBtnSmall">
+      <scroll-view wx:if="{{SearchTextList2.length>0}}" scroll-x="true" class="panelBtnSmall">
         <view class="btn0"></view>
-        <view class="btn" catchtap="onSearch" wx:for="{{SearchTextList}}" wx:key="index" data-search="{{item}}">{{item}}
+        <view class="btn" catchtap="onSearch" wx:for="{{SearchTextList2}}" wx:key="index" data-search="{{item}}">{{item}}
         </view>
       </scroll-view>
 
-      <view class="panelItemSearchNull" wx:if="{{SearchTextList.length==0}}">暂无内容，搜一次就有了</view>
+      <view class="panelItemSearchNull" wx:if="{{SearchTextList2.length==0}}">暂无内容，搜一次就有了</view>
 
     </view>
   </block>
   <block wx:if="{{IsList}}">
     <view class="panel2 FlexColumn" style='min-height:{{Containnerheight-100}}rpx;'>
-      <view class="panelItem FlexRow">
+      <view class="panelItem FlexRow" wx:for="{{List}}" wx:key="index" bindtap="goto" data-url="user_relation?UserID={{item.UserID}}">
         <view class="Left FlexRow">
-          <image src='../../pages/images/product_icon_mg_70x70.png' class="avatar" />
-          <view class="panelItem1">昵称</view>
-        </view>
-        <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
-      </view>
-
-      <view class="panelItem FlexRow">
-        <view class="Left FlexRow">
-          <image src='../../pages/images/product_icon_mg_70x70.png' class="avatar" />
-          <view class="panelItem1">昵称</view>
+          <image src='{{item.AvatarUrl}}' class="avatar" />
+          <view class="panelItem1">{{item.NickName}}</view>
         </view>
         <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
       </view>

pages_agent/main/user_index.js

@@ -44,9 +44,9 @@ Page({
       backgroundColorBottom: backColor,
       frontColor: frontColor,
     });
-
+  },
+  onShow:function(){
     this.init();
-
   },
   init: function () {
     var that = this;
@@ -64,6 +64,7 @@ Page({
       });
     }
 
+    //收益记录
     var url = "GetMiaoguoAgentRecordList?UserID=" + app.globalData.userInfo.UserID + "&AgentCategory=" + that.data.AgentCategory;
     main.getData(url, function (data) {
       if (data) {

pages_agent/main/user_index.wxml

@@ -18,6 +18,13 @@
   <image wx:if="{{!IsPromotion}}" src='../images/promotion_partner_home_title01.png' class="promotion_user_home_title01" />
   <view wx:if="{{IsPromotion}}" class="text2">{{Total}}</view>
   <view wx:if="{{!IsPromotion}}" class="text1">{{Total}}</view>
+
+  <blocl wx:if="{{!IsPromotion}}">
+    <view class="text9">大使收益</view>
+    <view class="text10">{{Total2}}</view>
+  </blocl>
+
+
   <scroll-view wx:if="{{IsPromotion}}" class="panelAD" scroll-x="true" bindscroll="scroll">
     <image src='../images/ad.png' class="adImage" />
     <image src='../images/ad.png' class="adImage" />
@@ -29,34 +36,27 @@
   <view class="Null1" wx:if="{{!IsPromotion}}"></view>
   <view class="panel1 FlexColumn">
     <view class="panel11 FlexRow">
-      <view class="panel112 FlexColumn" bindtap='goto' data-url="earnings_list?AgentCategory={{AgentCategory}}" wx:if="{{!IsPromotion}}">
-        <view class="text3">{{Total2}}</view>
-        <view class="text4">大使收益</view>
+      <view class="panel112 FlexColumn" bindtap='goto' data-url="other_list?AgentCategory={{AgentCategory}}&ListType=预估新增收益">
+        <view class="text3">{{EstimatedNewRevenueTotal}}</view>
+        <view class="text4">预估新增收益</view>
       </view>
       <view class="panel112 FlexColumn" bindtap='goto' data-url="other_list?AgentCategory={{AgentCategory}}&ListType=可提现收益">
         <view class="text3">{{WithdrawableEarningsTotal}}</view>
         <view class="text4">可提现收益</view>
       </view>
-      <view class="panel112 FlexColumn" bindtap='goto' data-url="earnings_list?AgentCategory={{AgentCategory}}" wx:if="{{IsPromotion}}">
+      <view class="panel112 FlexColumn" bindtap='goto' data-url="earnings_list?AgentCategory={{AgentCategory}}">
         <view class="text3">{{WithdrawableEarnings}}</view>
         <view class="text4">即将到帐</view>
       </view>
-      <view class="panel112 FlexColumn" bindtap='goto' data-url="other_list?AgentCategory={{AgentCategory}}&ListType=预估新增收益">
-        <view class="text3">{{EstimatedNewRevenueTotal}}</view>
-        <view class="text4">预估新增收益</view>
-      </view>
     </view>
     <view class="panel2_0 panel2 FlexRow">
       <view class="panel21 FlexRow" bindtap='goto' data-url="earnings_list?AgentCategory={{AgentCategory}}">
         收益记录
       </view>
       <view class="line"></view>
-      <view class="panel21 FlexRow" wx:if="{{IsPromotion}}" bindtap='goto' data-url="result_list?AgentCategory={{AgentCategory}}&ListType=成果记录">
+      <view class="panel21 FlexRow" bindtap='goto' data-url="result_list?AgentCategory={{AgentCategory}}&ListType=成果记录">
         成果记录
       </view>
-      <view class="panel21 FlexRow" wx:if="{{!IsPromotion}}" bindtap='goto' data-url="result_list?AgentCategory={{AgentCategory}}&ListType=团队能量">
-        团队能量
-      </view>
       <view class="line"></view>
       <view class="panel21 FlexRow" bindtap='goto' data-url="other_list?AgentCategory={{AgentCategory}}&ListType=退款记录">
         退款记录
@@ -71,10 +71,10 @@
         大使计划规则
       </view>
     </view>
-    <view class="panel112 FlexColumn" wx:if="{{!IsPromotion}}">
+    <view class="panel112 FlexColumn" wx:if="{{!IsPromotion}}" bindtap="goto" data-url="result_list?AgentCategory={{AgentCategory}}&ListType=团队动态">
       <image src='../images/promotion_index_workbook.png' class="promotion_index_rules" />
       <view class="text8">
-        大使工作手册
+        团队动态
       </view>
     </view>
     <view class="panel112 FlexColumn" wx:if="{{IsPromotion}}">

pages_agent/main/user_index.wxss

@@ -58,6 +58,19 @@
   font-family: 'Roboto-Black';
 }
 
+.text9{
+  font-size:36rpx;
+  margin-top: 20rpx;
+  color:#2E2E2E;
+}
+
+.text10{
+  font-size:64rpx;
+  font-family: 'Roboto-Black';
+  color:#2E2E2E;
+  text-align: center;
+}
+
 .panelAD{
   width:710rpx;
   height:230rpx;

pages_agent/main/user_relation.js

@@ -5,26 +5,32 @@ const app = getApp();
 
 Page({
   data: {
-    List: [{
-      NickName: "昵称1"
-    }, {
-      NickName: "昵称2"
-    }, {
-      NickName: "昵称3"
-    }, {
-      NickName: "本人"
-    }],
+    
   },
   onLoad: function (options) {
     var that = this;
-
-    that.data.List[that.data.List.length-1].IsMe="IsMe";
-
+    //预估新增收益
+    var url = url="GetMiaoguoUserAndIntroducer?UserID=" + options.UserID;
+    main.getData(url, function (data) {
+      if (data) {
+        that.setData({
+          Info:data,
+          CurrentUserID:options.UserID,
+        });
+      }
+    });
     that.setData({
       Containnerheight: main.getWindowHeight(),
-      List:that.data.List,
     });
   },
+  goto: function (e) {
+    if (e.currentTarget.dataset.userid!=this.data.CurrentUserID){
+      var url = e.currentTarget.dataset.url;
+      wx.navigateTo({
+        url: url,
+      });
+    }
+  },
   onPullDownRefresh: function () {
     wx.stopPullDownRefresh();
   },

pages_agent/main/user_relation.wxml

@@ -1,41 +1,41 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panel1 FlexRow">
-    <image src='../../pages/images/product_icon_mg_70x70.png' class="avatar" />
-    <view class="text1">宏壮-主持策划18835883876</view>
+    <image src='{{Info.MyInfo.AvatarUrl}}' class="avatar" />
+    <view class="text1">{{Info.MyInfo.NickName}}</view>
   </view>
   <view class="panel2 FlexRow">
     <text class="text2">Ta与我的关系</text>
   </view>
-  <block wx:for="{{List}}" wx:key="index">
-    <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
-      <view class="lineWidth720"></view>
-    </view>
-    <view class="{{item.IsMe}} panelItem FlexRow">
-      <view class="Left FlexRow">
-        <image src='../../pages/images/product_icon_mg_70x70.png' class="avatar2" />
-        <view class="text3">{{item.NickName}}</view>
+  <block wx:for="{{Info.Tree}}" wx:key="index">
+    <view class="panelItem FlexRow" bindtap="goto" data-url="user_relation?UserID={{item.UserID}}" data-userid="{{item.UserID}}">
+      <view class="panelItem2 FlexRow">
+        <view class="line"></view>
+        <view class="circle"></view>
+        <view class="panelItem21">{{item.Level}}</view>
       </view>
-      <view class="Right FlexColumn">
-          <view class="text4">
-            <block wx:if="{{index==0}}">我的直属</block>
-            <block wx:if="{{index>0}}">第{{index+1}}度</block>
-          </view>
+      <view class="panelItem1 FlexColumn">
+        <view style="margin-top:20rpx;" wx:if="{{index==0}}"></view>
+        <image src='{{item.AvatarUrl}}' class="avatar2" />
+        <view class="text3">{{item.NickName}}</view>
       </view>
+      <view class="panelItem2"></view>
     </view>
+
   </block>
   <view class="panel3 FlexColumn">
     <text class="text5">Ta的直属推荐</text>
-    <text class="text6"><text class="Number1" >24</text>位用户</text>
+    <text class="text6"><text class="Number1" >{{Info.List.length}}</text>位用户</text>
   </view>
-  <view class="panel4 FlexRow">
-    <view class="panel41 FlexColumn" wx:for="{{[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]}}">
-      <image src='../../pages/images/product_icon_mg_70x70.png' class="product_icon_mg_70x70" />
-      <view class="text7">昵称昵称昵称昵称昵称昵称昵称昵称</view>
+  <view class="panel4 FlexRow" wx:if="{{Info.List.length>0}}">
+    <view class="panel41 FlexColumn" wx:for="{{Info.List}}" wx:key="index" bindtap="goto" data-url="user_relation?UserID={{item.UserID}}">
+      <image src='{{item.AvatarUrl}}' class="product_icon_mg_70x70" />
+      <view class="text7">{{item.NickName}}</view>
       <view class="text8 FlexRow">
-        <view class="Number2">5</view>
+        <view class="Number2">{{Info.Tree.length+1}}</view>
         <view class="line2"></view>
-        <view class="Number2">12</view>
+        <view class="Number2">{{item.Count}}</view>
       </view>
     </view>
   </view>
+  <view style="height: 100rpx;"></view>
 </view>

pages_agent/main/user_relation.wxss

@@ -33,22 +33,60 @@
 
 .panelItem{
   width:100%;
-  height:110rpx;
   background-color: #fff;
   justify-content: space-between;
+  position: relative;
+  overflow: hidden;
 }
 
-.avatar2{
-  width:50rpx;
-  height:50rpx;
+.panelItem1{
+  margin: 20rpx 0 20rpx 0;
+  width: 150rpx;
+}
+.panelItem2{
+  width:300rpx;
+  justify-content: flex-start;
+  position: relative;
+}
+.panelItem22{
+  width:20rpx;
+  position: relative;
+}
+.line{
+  width:3rpx;
+  height:300rpx;
+  position: absolute;
+  left:36rpx;
+  top:-100rpx;
+  z-index: 50;
+  background-color: #d2d2d2;
+}
+
+.circle{
+  width:10rpx;
+  height:10rpx;
   border-radius: 50%;
+  border:3rpx solid #d2d2d2;
+  background-color: #fff;
   margin-left: 30rpx;
+  z-index: 60;
+}
+.panelItem21{
+  font-size:28rpx;
+  color:#4d4d4d;
+  margin-left: 24rpx;
+}
+
+.avatar2{
+  width:80rpx;
+  height:80rpx;
+  border-radius: 20rpx;
 }
 
 .text3{
-  font-size: 28rpx;
-  margin-left: 20rpx;
-  color: #4d4d4d;
+  font-size: 20rpx;
+  margin-top: 20rpx;
+  color: #1e1e1e;
 }
 
 .text4{

pages_agent/main/withdraw_deposit.js

@@ -1,34 +0,0 @@
-import common from '../../utils/util';
-import main from '../../utils/main';
-
-const app = getApp();
-
-Page({
-  data: {
-    IsPromotion:false,
-  },
-  onLoad: function (options) {
-    var that = this;
-    
-    var isPromotion=true;
-    if (options.AgentCategory=="promotion"){
-      isPromotion=true;
-    }
-
-    that.setData({
-      Containnerheight: main.getWindowHeight(),
-      IsPromotion:isPromotion,
-    });
-
-  },
-  onPullDownRefresh: function () {
-    wx.stopPullDownRefresh();
-  },
-  onShareAppMessage: function () {
-    return {
-      title: app.globalData.ShareTitle,
-      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: app.globalData.ShareImage,
-    }
-  },
-})

pages_agent/main/withdraw_deposit.json

@@ -1,4 +0,0 @@
-{
-  "navigationBarTitleText": "可提现收益",
-  "backgroundColor": "#F2F2F2"
-}

pages_agent/main/withdraw_deposit.wxml

@@ -1,152 +0,0 @@
-<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="panel1 FlexColumn" bindtap='goto'>
-    <view class="panel11 FlexColumn">
-      <text class="text1">① 7天退款期，有退款的情况\n② 检查一下是否与您的认知有出入，一旦他人就无法更改了
-      </text>
-    </view>
-    <view class="panel12 FlexRow">
-      <view class="text2">详细规则</view>
-      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
-    </view>
-  </view>
-
-  <view class="panel4 FlexColumn">
-    <view class="panel41 FlexRow">
-      <image src='../../pages/images/universalpic_exclamation_orange_40x40.png' class="universalpic_exclamation_orange_40x40" />
-      <view class="text8">您有1笔退款，返还奖励后，剩余收益可提现。</view>
-    </view>
-
-    <view class="panel42 FlexRow">
-      <view class="text4">查看退款记录</view>
-      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
-    </view>
-
-  </view>
-
-  <view class="panel2 FlexRow">
-    <text class="text3"><text class="Number1">24</text> 条记录</text>
-    <text class="text7">收益 <text class="Number1">960.00</text></text>
-  </view>
-  <view class="panel3 FlexColumn">
-    <!-- 推广 -->
-    <block wx:if="{{!IsPromotion}}" wx:for="{{[1,2,3,4,5]}}" wx:key="index">
-      <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
-        <view class="lineWidth720"></view>
-      </view>
-      <view class="panelItem FlexRow">
-        <view class="Left FlexRow">
-          <image src='../../pages/images/product_icon_mg_70x70.png' class="avatar" />
-          <view class="panelItem1 FlexColumn">
-            <view class="text4">昵称</view>
-            <view class="text5">续费 2021年11月04日 08:20</view>
-          </view>
-        </view>
-        <view class="Right FlexColumn">
-          <block wx:if="{{false}}">
-            <view class="text6">等待生效</view>
-            <view class="text5">2021年11月04日 08:20</view>
-          </block>
-          <view class="Number2" wx:if="{{true}}">30.00</view>
-        </view>
-      </view>
-    </block>
-    <!-- 大使 -->
-    <view style="width: 100%;" wx:if="{{IsPromotion}}" wx:for="{{[1,2,3]}}" wx:key="indexParent" wx:for-item="itemParent" wx:for-index="indexParent" class="panelItem0 FlexColumn">
-      <view class="nullLine" wx:if="{{indexParent>0}}"></view>
-      <view class="panelItem2 panelItem FlexRow">
-        <image src='../../pages/images/product_icon_mg_70x70.png' class="avatar2" />
-        <view class="text9">宏壮-主持策划18835883876 的推荐</view>
-      </view>
-      <view class="lineWidthAll FlexRow">
-        <view class="lineWidth750"></view>
-      </view>
-      <block wx:for="{{[1,2,3,4,5]}}" wx:key="index">
-        <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
-          <view class="lineWidth720"></view>
-        </view>
-        <view class="panelItem FlexRow">
-          <view class="Left FlexRow">
-            <image src='../../pages/images/product_icon_mg_70x70.png' class="avatar" />
-            <view class="panelItem1 FlexColumn">
-              <view class="text4">昵称</view>
-              <view class="text5">续费 2021年11月04日 08:20</view>
-            </view>
-          </view>
-          <view class="Right FlexColumn">
-            <block wx:if="{{false}}">
-              <view class="text6">等待生效</view>
-              <view class="text5">2021年11月04日 08:20</view>
-            </block>
-            <view class="Number2" wx:if="{{true}}">30.00</view>
-          </view>
-        </view>
-      </block>
-    </view>
-
-
-
-  </view>
-  <view style="height:150rpx;"></view>
-  <view class="panelBottom FlexColumn">
-    <view class="btn">申请提现</view>
-  </view>
-</view>
-
-<view wx:if="{{false}}" class="container2 container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="panel5 FlexColumn">
-    <view class="text51">申请提现</view>
-    <view class="panel51 FlexRow">
-      <view class="panel511 FlexColumn">
-        <view class="text52">176.42</view>
-        <view class="text53">提现金额</view>
-      </view>
-      <view class="panel511 FlexColumn">
-        <view class="text52">166.24</view>
-        <view class="text53">到账金额</view>
-      </view>
-    </view>
-    <view class="panel52 FlexRow">
-      <view class="Left FlexRow">
-        <image src='../../pages/images/universalpic_exclamation_orange_40x40.png' class="universalpic_exclamation_orange_40x40" />
-        <view class="text53">已扣除因退款返还奖励金额</view>
-      </view>
-      <view class="text54">24.58</view>
-    </view>
-    <view class="panel53 FlexRow">
-      <view class="text54">微信支付平台交易手续费</view>
-      <view class="text54">0.6%</view>
-    </view>
-    <view class="lineWidthAll FlexRow">
-      <view class="lineWidth680"></view>
-    </view>
-    <view class="panel53 FlexRow">
-      <view class="text54">代缴个人所得税</view>
-      <view class="text54">0%</view>
-    </view>
-    <view class="lineWidthAll FlexRow">
-      <view class="lineWidth680"></view>
-    </view>
-    <view class="panel53 FlexRow">
-      <view class="text54">收款方式</view>
-      <view class="text54">微信钱包</view>
-    </view>
-    <view class="lineWidthAll FlexRow">
-      <view class="lineWidth680"></view>
-    </view>
-    <view class="panel53 FlexRow">
-      <view class="text54">收款人微信帐号</view>
-      <view class="text54">ABC</view>
-    </view>
-    <view class="lineWidthAll FlexRow">
-      <view class="lineWidth680"></view>
-    </view>
-    <view class="panel53 FlexRow">
-      <view class="text54">收款人帐号真实姓名</view>
-      <view class="text54">张三</view>
-    </view>
-    <view class="btn2">确认</view>
-
-  </view>
-  <view class="btnCancel">取消</view>
-
-</view>

pages_agent/main/withdraw_deposit.wxss

@@ -1,278 +0,0 @@
-.panel1{
-  width:710rpx;
-  border-radius: 20rpx;
-  background-color: #fff;
-  margin: 60rpx 0;
-}
-
-.panel11{
-  width:100%;
-  font-size: 22rpx;
-  font-weight: 400;
-  min-height: 178rpx;
-  justify-content: flex-start;
-  border-bottom:1rpx solid #e3e3e3;
-}
-
-.text1{
-  margin-top: 30rpx;
-  width:650rpx;
-}
-
-.panel12{
-  width:100%;
-  height: 100rpx;
-  justify-content: space-between;
-}
-
-.text2{
-  font-size: 28rpx;
-  font-weight: 400;
-  margin-left: 30rpx;
-}
-
-.Arrow{
-  width:16rpx;
-  height:26rpx;
-  margin-right: 30rpx;
-}
-
-.panel4{
-  width:710rpx;
-  border-radius: 20rpx;
-  background-color: #fff;
-  margin: 0 0 60rpx 0;
-}
-
-.universalpic_exclamation_orange_40x40{
-  width:40rpx;
-  height:40rpx;
-  margin-left: 30rpx;
-}
-
-.panel2{
-  width: 100%;
-  justify-content: space-between;
-}
-
-.text3{
-  margin-left: 30rpx;
-  font-size: 32rpx;
-  color:#4D4D4D;
-}
-.text7{
-  margin-right: 30rpx;
-  font-size: 32rpx;
-  color:#4D4D4D;
-}
-.Number1{
-  font-family: 'Roboto-Black';
-  font-size:36rpx;
-  color:#4D4D4D;
-}
-.Number2{
-  font-family: 'Roboto-Black';
-  font-size:28rpx;
-  color:#4D4D4D;
-}
-
-.panel41{
-  justify-content: flex-start;
-  width:710rpx;
-  height:100rpx;
-  background-color: #FFE4B6;
-  border-top-left-radius: 20rpx;
-  border-top-right-radius: 20rpx;
-}
-
-.panel42{
-  justify-content: space-between;
-  width:710rpx;
-  height:100rpx;
-  background-color: #fff;
-  border-bottom-left-radius: 20rpx;
-  border-bottom-right-radius: 20rpx;
-}
-.text8{
-  font-size: 22rpx;
-  color: #4d4d4d;
-  margin-left: 30rpx;
-}
-
-.panel3{
-  width: 100%;
-  justify-content: flex-start;
-  background-color: #fff;
-  margin-top: 30rpx;
-}
-
-.nullLine{
-  width:100%;
-  height:20rpx;
-  background-color: #f2f2f2;
-}
-
-.panelItem{
-  width: 100%;
-  height:141rpx;
-  justify-content: space-between;
-}
-
-.avatar{
-  width:80rpx;
-  height:80rpx;
-  border-radius: 20rpx;
-  margin-left: 30rpx;
-}
-
-.panelItem2{
-  justify-content: flex-start;
-  height:111rpx;
-}
-
-.avatar2{
-  width:50rpx;
-  height:50rpx;
-  border-radius: 50%;
-  margin-left: 30rpx;
-}
-
-.text9{
-  font-size: 24rpx;
-  margin-left: 20rpx;
-  color:#4D4D4D;
-}
-
-.panelItem1{
-  align-items: flex-start;
-  margin-left: 20rpx;
-}
-
-.text4{
-  font-size: 28rpx;
-  color:#4D4D4D;
-  font-weight: 400;
-  margin-left: 30rpx;
-}
-.text5{
-  font-size: 20rpx;
-  color:#9B9B9B;
-}
-.Right{
-  margin-right: 30rpx;
-  align-items: flex-end;
-}
-.text6{
-  font-size: 24rpx;
-  color:#4D4D4D;
-}
-
-.panelBottom{
-  width:100%;
-  height:131rpx;
-  bottom: 0;
-  position: fixed;
-  background-color: #f2f2f2;
-  border-top: 1rpx solid #d2d2d2;
-}
-
-.panelBottom .btn{
-  width:730rpx;
-  height:110rpx;
-  border-radius: 20rpx;
-  background-color: #F57C00;
-  line-height: 110rpx;
-  color:#fff;
-  font-size:48rpx;
-  text-align: center;
-}
-
-/* 申请提现 */
-.container2{
-  background-color: rgba(0,0,0,0.8);
-  position: fixed;
-  top:0;
-  z-index: 10;
-  width: 100%;
-}
-
-.panel5{
-  width: 710rpx;
-  border-radius: 20rpx;
-  position: fixed;
-  bottom:160rpx;
-  background-color: #fff;
-  min-height: 500rpx;
-}
-
-.btnCancel{
-  width:710rpx;
-  height:100rpx;
-  border-radius: 20rpx;
-  text-align: center;
-  line-height: 100rpx;
-  font-size:28rpx;
-  background-color: #fff;
-  color: #1e1e1e;
-  position: fixed;
-  bottom:30rpx;
-}
-
-.text51{
-  margin-top: 40rpx;
-  font-size: 32rpx;
-  color:#4D4D4D;
-}
-
-.panel51{
-  margin-top: 10rpx;
-  width:100%;
-}
-
-.panel511{
-  flex: 1;
-}
-
-.text52{
-  font-size: 64rpx;
-  color:#4D4D4D;
-  font-family: 'Roboto-Black';
-}
-.text53{
-  font-size: 24rpx;
-  color:#4D4D4D;
-  margin: 0 30rpx 0 20rpx;
-  font-weight: 400;
-}
-
-.panel52{
-  width: 100%;
-  background-color: #FFE4B6;
-  height:94rpx;
-  justify-content: space-between;
-  margin-top: 30rpx;
-}
-
-.text54{
-  font-size: 24rpx;
-  color:#4D4D4D;
-  margin: 0 30rpx 0 30rpx;
-  font-weight: 400;
-}
-
-.panel53{
-  width: 100%;
-  height:94rpx;
-  justify-content: space-between;
-}
-
-.btn2{
-  width:100%;
-  line-height: 127rpx;
-  border-bottom-left-radius: 20rpx;
-  border-bottom-right-radius: 20rpx;
-  background-color: #F57C00;
-  text-align: center;
-  color:#fff;
-  font-size: 48rpx;
-}

project.config.json

@@ -17,7 +17,7 @@
     "checkInvalidKey": true,
     "checkSiteMap": true,
     "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
+    "compileHotReLoad": true,
     "useMultiFrameRuntime": true,
     "useApiHook": true,
     "useApiHostProcess": true,
@@ -34,10 +34,11 @@
     "disableUseStrict": false,
     "minifyWXML": true,
     "showES6CompileOption": false,
-    "useCompilerPlugins": false
+    "useCompilerPlugins": false,
+    "ignoreUploadUnusedFiles": true
   },
   "compileType": "miniprogram",
-  "libVersion": "2.20.2",
+  "libVersion": "2.18.0",
   "appid": "wx84b3feac6069eec3",
   "projectname": "秒过",
   "debugOptions": {

project.private.config.json

@@ -37,7 +37,8 @@
           "name": "推广",
           "pathName": "pages_agent/main/index",
           "query": "",
-          "scene": null
+          "scene": null,
+          "launchMode": "default"
         }
       ]
     }

utils/constant.js

@@ -564,640 +564,6 @@ module.exports = {
       BackColor3: "#253C0B",
     },
   ],
-  testGradeArr: [{
-    Name: "一年级",
-    Name2: "语文一年级",
-    Type:"CHN",
-    Select: "Select",
-    List: [{
-      ID: 43,
-      Type: "Shizi",
-      Name: "语文拼音",
-      Name2: "基础发音",
-      Finish: 0,
-      Total: 8,
-      Image: "../images/examine_subject_a001.png"
-    },{
-      ID: 44,
-      Type: "Shizi",
-      Name: "语文拼音",
-      Name2: "发音组合",
-      Finish: 0,
-      Total: 65,
-      Image: "../images/examine_subject_a001.png"
-    },{
-      ID: 61,
-      Type: "Shizi",
-      Name: "语文识字",
-      Name2: "上学期",
-      Finish: 0,
-      Total: 82,
-      Image: "../images/examine_subject_a001.png"
-    }, {
-      ID: 13,
-      Type: "Shizi",
-      Name: "语文写字",
-      Name2: "上学期",
-      Finish: 0,
-      Total: 52,
-      Image: "../images/examine_subject_a001.png"
-    }, {
-      ID: 25,
-      Type: "Shici",
-      Name: "语文古诗文",
-      Name2: "上学期",
-      Finish: 0,
-      Total: 1,
-      Image: "../images/examine_subject_a001.png"
-    }, {
-      ID: 2,
-      Type: "Shizi",
-      Name: "语文识字",
-      Name2: "下学期",
-      Finish: 0,
-      Total: 14,
-      Image: "../images/examine_subject_a002.png"
-    }, {
-      ID: 14,
-      Type: "Shizi",
-      Name: "语文写字",
-      Name2: "下学期",
-      Finish: 0,
-      Total: 56,
-      Image: "../images/examine_subject_a002.png"
-    }, {
-      ID: 26,
-      Type: "Shici",
-      Name: "语文古诗文",
-      Name2: "下学期",
-      Finish: 0,
-      Total: 1,
-      Image: "../images/examine_subject_a002.png"
-    }]
-  },
-  {
-    Name: "二年级",
-    Name2: "语文二年级",
-    Type:"CHN",
-    Select: "",
-    List: [{
-      ID: 63,
-      Type: "Shizi",
-      Name: "语文识字",
-      Name2: "上学期",
-      Finish: 0,
-      Total: 72,
-      Image: "../images/examine_subject_a003.png"
-    }, {
-      ID: 15,
-      Type: "Shizi",
-      Name: "语文写字",
-      Name2: "上学期",
-      Finish: 0,
-      Total: 56,
-      Image: "../images/examine_subject_a003.png"
-    },{
-      ID: 45,
-      Type: "Shizi",
-      Name: "语文词语",
-      Name2: "上学期",
-      Finish: 0,
-      Total: 52,
-      Image: "../images/examine_subject_a003.png"
-    },{
-      ID: 27,
-      Type: "Shici",
-      Name: "语文古诗文",
-      Name2: "上学期",
-      Finish: 0,
-      Total: 1,
-      Image: "../images/examine_subject_a003.png"
-    }, {
-      ID: 4,
-      Type: "Shizi",
-      Name: "语文识字",
-      Name2: "下学期",
-      Finish: 0,
-      Total: 16,
-      Image: "../images/examine_subject_a004.png"
-    }, {
-      ID: 16,
-      Type: "Shizi",
-      Name: "语文写字",
-      Name2: "下学期",
-      Finish: 0,
-      Total: 58,
-      Image: "../images/examine_subject_a004.png"
-    }, {
-      ID: 46,
-      Type: "Shizi",
-      Name: "语文词语",
-      Name2: "下学期",
-      Finish: 0,
-      Total: 46,
-      Image: "../images/examine_subject_a004.png"
-    }, {
-      ID: 28,
-      Type: "Shici",
-      Name: "语文古诗文",
-      Name2: "下学期",
-      Finish: 0,
-      Total: 1,
-      Image: "../images/examine_subject_a004.png"
-    }]
-  },
-  {
-    Name: "三年级",
-    Name2: "语文三年级",
-    Type:"CHN",
-    Select: "",
-    List: [{
-      ID: 65,
-      Type: "Shizi",
-      Name: "语文识字",
-      Name2: "上学期",
-      Finish: 0,
-      Total: 62,
-      Image: "../images/examine_subject_a005.png"
-    }, {
-      ID: 17,
-      Type: "Shizi",
-      Name: "语文写字",
-      Name2: "上学期",
-      Finish: 0,
-      Total: 40,
-      Image: "../images/examine_subject_a005.png"
-    }, {
-      ID: 47,
-      Type: "Shizi",
-      Name: "语文词语",
-      Name2: "上学期",
-      Finish: 0,
-      Total: 34,
-      Image: "../images/examine_subject_a005.png"
-    }, {
-      ID: 29,
-      Type: "Shici",
-      Name: "语文古诗文",
-      Name2: "上学期",
-      Finish: 0,
-      Total: 1,
-      Image: "../images/examine_subject_a005.png"
-    }, {
-      ID: 6,
-      Type: "Shizi",
-      Name: "语文识字",
-      Name2: "下学期",
-      Finish: 0,
-      Total: 16,
-      Image: "../images/examine_subject_a006.png"
-    }, {
-      ID: 18,
-      Type: "Shizi",
-      Name: "语文写字",
-      Name2: "下学期",
-      Finish: 0,
-      Total: 42,
-      Image: "../images/examine_subject_a006.png"
-    }, {
-      ID: 48,
-      Type: "Shizi",
-      Name: "语文词语",
-      Name2: "下学期",
-      Finish: 0,
-      Total: 36,
-      Image: "../images/examine_subject_a006.png"
-    }, {
-      ID: 30,
-      Type: "Shici",
-      Name: "语文古诗文",
-      Name2: "下学期",
-      Finish: 0,
-      Total: 1,
-      Image: "../images/examine_subject_a006.png"
-    }]
-  },
-  {
-    Name: "四年级",
-    Name2: "语文四年级",
-    Type:"CHN",
-    Select: "",
-    List: [{
-      ID: 67,
-      Type: "Shizi",
-      Name: "语文识字",
-      Name2: "上学期",
-      Finish: 0,
-      Total: 62,
-      Image: "../images/examine_subject_a007.png"
-    },  {
-      ID: 19,
-      Type: "Shizi",
-      Name: "语文写字",
-      Name2: "上学期",
-      Finish: 0,
-      Total: 40,
-      Image: "../images/examine_subject_a007.png"
-    },  {
-      ID: 49,
-      Type: "Shizi",
-      Name: "语文词语",
-      Name2: "上学期",
-      Finish: 0,
-      Total: 32,
-      Image: "../images/examine_subject_a007.png"
-    },  {
-      ID: 31,
-      Type: "Shici",
-      Name: "语文古诗文",
-      Name2: "上学期",
-      Finish: 0,
-      Total: 1,
-      Image: "../images/examine_subject_a007.png"
-    }, {
-      ID: 8,
-      Type: "Shizi",
-      Name: "语文识字",
-      Name2: "下学期",
-      Finish: 0,
-      Total: 16,
-      Image: "../images/examine_subject_a008.png"
-    }, {
-      ID: 20,
-      Type: "Shizi",
-      Name: "语文写字",
-      Name2: "下学期",
-      Finish: 0,
-      Total: 40,
-      Image: "../images/examine_subject_a008.png"
-    }, {
-      ID: 50,
-      Type: "Shizi",
-      Name: "语文词语",
-      Name2: "下学期",
-      Finish: 0,
-      Total: 32,
-      Image: "../images/examine_subject_a008.png"
-    }, {
-      ID: 32,
-      Type: "Shici",
-      Name: "语文古诗文",
-      Name2: "下学期",
-      Finish: 0,
-      Total: 1,
-      Image: "../images/examine_subject_a008.png"
-    }]
-  },
-  {
-    Name: "五年级",
-    Name2: "语文五年级",
-    Type:"CHN",
-    Select: "",
-    List: [{
-      ID: 69,
-      Type: "Shizi",
-      Name: "语文识字",
-      Name2: "上学期",
-      Finish: 0,
-      Total: 54,
-      Image: "../images/examine_subject_a009.png"
-    }, {
-      ID: 21,
-      Type: "Shizi",
-      Name: "语文写字",
-      Name2: "上学期",
-      Finish: 0,
-      Total: 42,
-      Image: "../images/examine_subject_a009.png"
-    }, {
-      ID: 51,
-      Type: "Shizi",
-      Name: "语文词语",
-      Name2: "上学期",
-      Finish: 0,
-      Total: 32,
-      Image: "../images/examine_subject_a009.png"
-    }, {
-      ID: 33,
-      Type: "Shici",
-      Name: "语文古诗文",
-      Name2: "上学期",
-      Finish: 0,
-      Total: 1,
-      Image: "../images/examine_subject_a009.png"
-    }, {
-      ID: 10,
-      Type: "Shizi",
-      Name: "语文识字",
-      Name2: "下学期",
-      Finish: 0,
-      Total: 16,
-      Image: "../images/examine_subject_a010.png"
-    }, {
-      ID: 22,
-      Type: "Shizi",
-      Name: "语文写字",
-      Name2: "下学期",
-      Finish: 0,
-      Total: 32,
-      Image: "../images/examine_subject_a010.png"
-    }, {
-      ID: 52,
-      Type: "Shizi",
-      Name: "语文词语",
-      Name2: "下学期",
-      Finish: 0,
-      Total: 24,
-      Image: "../images/examine_subject_a010.png"
-    }, {
-      ID: 34,
-      Type: "Shici",
-      Name: "语文古诗文",
-      Name2: "下学期",
-      Finish: 0,
-      Total: 1,
-      Image: "../images/examine_subject_a010.png"
-    }
-  ]
-  },
-  {
-    Name: "六年级",
-    Name2: "语文六年级",
-    Type:"CHN",
-    Select: "",
-    List: [
-      {
-        ID: 23,
-        Type: "Shizi",
-        Name: "语文写字",
-        Name2: "上学期",
-        Finish: 0,
-        Total: 36,
-        Image: "../images/examine_subject_a011.png"
-      }, {
-        ID: 53,
-        Type: "Shizi",
-        Name: "语文词语",
-        Name2: "上学期",
-        Finish: 0,
-        Total: 28,
-        Image: "../images/examine_subject_a011.png"
-      }, {
-        ID: 35,
-        Type: "Shici",
-        Name: "语文古诗文",
-        Name2: "上学期",
-        Finish: 0,
-        Total: 1,
-        Image: "../images/examine_subject_a011.png"
-      }, {
-        ID: 24,
-        Type: "Shizi",
-        Name: "语文写字",
-        Name2: "下学期",
-        Finish: 0,
-        Total: 24,
-        Image: "../images/examine_subject_a012.png"
-      }, {
-        ID: 54,
-        Type: "Shizi",
-        Name: "语文词语",
-        Name2: "下学期",
-        Finish: 0,
-        Total: 14,
-        Image: "../images/examine_subject_a012.png"
-      }, {
-        ID: 36,
-        Type: "Shici",
-        Name: "语文古诗文",
-        Name2: "下学期",
-        Finish: 0,
-        Total: 1,
-        Image: "../images/examine_subject_a012.png"
-      }, 
-    ]
-  },
-  {
-    Name: "七年级",
-    Name2: "语文七年级",
-    Type:"CHN",
-    Select: "",
-    List: [
-      {
-        ID: 37,
-        Type: "Shici",
-        Name: "语文古诗文",
-        Name2: "上学期",
-        Finish: 0,
-        Total: 1,
-        Image: "../images/examine_subject_a013.png"
-      }, {
-        ID: 38,
-        Type: "Shici",
-        Name: "语文古诗文",
-        Name2: "下学期",
-        Finish: 0,
-        Total: 1,
-        Image: "../images/examine_subject_a014.png"
-      }, 
-    ]
-  },
-  {
-    Name: "八年级",
-    Name2: "语文八年级",
-    Type:"CHN",
-    Select: "",
-    List: [
-      {
-        ID: 39,
-        Type: "Shici",
-        Name: "语文古诗文",
-        Name2: "上学期",
-        Finish: 0,
-        Total: 1,
-        Image: "../images/examine_subject_a015.png"
-      }, {
-        ID: 40,
-        Type: "Shici",
-        Name: "语文古诗文",
-        Name2: "下学期",
-        Finish: 0,
-        Total: 1,
-        Image: "../images/examine_subject_a016.png"
-      }, 
-    ]
-  },
-  {
-    Name: "九年级",
-    Name2: "语文九年级",
-    Type:"CHN",
-    Select: "",
-    List: [
-      {
-        ID: 41,
-        Type: "Shici",
-        Name: "语文古诗文",
-        Name2: "上学期",
-        Finish: 0,
-        Total: 1,
-        Image: "../images/examine_subject_a017.png"
-      }, {
-        ID: 42,
-        Type: "Shici",
-        Name: "语文古诗文",
-        Name2: "下学期",
-        Finish: 0,
-        Total: 1,
-        Image: "../images/examine_subject_a018.png"
-      }, 
-    ]
-  },
-  {
-    Name: "英语基础",
-    Name2: "英语基础",
-    Type:"ENG",
-    Select: "",
-    List: [
-      {
-        ID: 100,
-        Type: "Word",
-        Name: "英文字母",
-        Name2: "A~Z,a~z",
-        Finish: 0,
-        Total: 1,
-        Image: "../images/examine_subject_b005.png"
-      },
-      {
-        ID: 101,
-        Type: "Word",
-        Name: "国际音标",
-        Name2: "元音20、辅音28",
-        Finish: 0,
-        Total: 4,
-        Image: "../images/examine_subject_b005.png"
-      },
-    ]
-  },
-  {
-    Name: "英语常用单词",
-    Name2: "英语常用单词",
-    Type:"ENG",
-    Select: "",
-    List: [
-      {
-        ID: 111,
-        Type: "Word",
-        Name: "常用单词1",
-        Name2: "词汇1~220",
-        Finish: 0,
-        Total: 44,
-        Image: "../images/examine_subject_b001.png"
-      },
-      {
-        ID: 112,
-        Type: "Word",
-        Name: "常用单词2",
-        Name2: "词汇221~500",
-        Finish: 0,
-        Total: 56,
-        Image: "../images/examine_subject_b002.png"
-      },
-      {
-        ID: 113,
-        Type: "Word",
-        Name: "常用单词3",
-        Name2: "词汇500~1000",
-        Finish: 0,
-        Total: 100,
-        Image: "../images/examine_subject_b003.png"
-      },
-      {
-        ID: 114,
-        Type: "Word",
-        Name: "常用单词4",
-        Name2: "词汇1001~1500",
-        Finish: 0,
-        Total: 100,
-        Image: "../images/examine_subject_b004.png"
-      },
-      {
-        ID: 115,
-        Type: "Word",
-        Name: "常用单词5",
-        Name2: "词汇1501~2000",
-        Finish: 0,
-        Total: 100,
-        Image: "../images/examine_subject_b005.png"
-      },
-    ]
-  },{
-    Name: "新概念英语单词",
-    Name2: "新概念英语单词",
-    Type:"ENG",
-    Select: "",
-    List: [
-      {
-        ID: 121,
-        Type: "Word",
-        Name: "第一册",
-        Name2: "词汇906",
-        Finish: 0,
-        Total: 230,
-        Image: "../images/examine_subject_c001.png"
-      },
-      {
-        ID: 122,
-        Type: "Word",
-        Name: "第二册",
-        Name2: "词汇861",
-        Finish: 0,
-        Total: 192,
-        Image: "../images/examine_subject_c002.png"
-      },
-      {
-        ID: 123,
-        Type: "Word",
-        Name: "第三册",
-        Name2: "词汇1054",
-        Finish: 0,
-        Total: 120,
-        Image: "../images/examine_subject_c003.png"
-      },
-      {
-        ID: 124,
-        Type: "Word",
-        Name: "第四册",
-        Name2: "词汇777",
-        Finish: 0,
-        Total: 92,
-        Image: "../images/examine_subject_c004.png"
-      }
-    ]
-  },{
-    Name: "剑桥英语单词",
-    Name2: "剑桥英语单词",
-    Type:"ENG",
-    Select: "",
-    List: [
-      {
-        ID: 133,
-        Type: "Word",
-        Name: "KET分类单词",
-        Name2: "词汇1144",
-        Finish: 0,
-        Total: 48,
-        Image: "../images/examine_subject_c001.png"
-      },{
-        ID: 134,
-        Type: "Word",
-        Name: "PET分类单词",
-        Name2: "词汇1907",
-        Finish: 0,
-        Total: 46,
-        Image: "../images/examine_subject_c002.png"
-      }
-    ]
-  }],
   arrPinyin: [
     ['a1', 'ā', ['阿']],
     ['a2', 'á', ['啊']],

utils/cryptojs.js

@@ -1,3 +1,6 @@
+import BlockModes from '../utils/lib/BlockModes';
+import AES from '../utils/lib/AES';
+
 var Crypto = exports.Crypto = require('./lib/Crypto').Crypto;
 
 ['BlockModes', 'AES'].forEach(function (path) {

utils/main.js

@@ -255,18 +255,18 @@ function EncryptUrl(str) {
     else
       str = "";
   }
-  
+
   if (str) {
     str = str.replace(/baidu.com/g, "#####1#####");
     str = str.replace(/iciba.com/g, "#####2#####");
     str = str.replace(/https:\/\/pinyin.kylx365.com\/sounds/g, "#####3#####");
     str = str.replace(/https:\/\/miaguo-1253256735.file.myqcloud.com/g, "#####4#####");
-    
+
     if (str.substr(0, 1) == "\n")
       str = str.substr(1);
   }
 
-  
+
   return str;
 }
 
@@ -342,10 +342,10 @@ function changeStringToView(field) {
 
               obj.ContentServer = obj.ContentServer.substring(obj.ContentServer.indexOf("]") + 1);
               obj.Content = getTempImage(obj.ContentServer);
-              if (obj.Content.lastIndexOf("fm=58")>=0)
-                obj.IsShowBishun=true;
-              else if (obj.Content.indexOf("hanyu-word-gif")>0)
-                obj.IsShowKaiti=true;
+              if (obj.Content.lastIndexOf("fm=58") >= 0)
+                obj.IsShowBishun = true;
+              else if (obj.Content.indexOf("hanyu-word-gif") > 0)
+                obj.IsShowKaiti = true;
               result.Images.push(obj.Content);
             }
             arrResult.push(obj);
@@ -629,7 +629,7 @@ function UpdateMiaoguoCardTodayAll(isShowLoading, callback) {
       List: arr,
     }, function (data) {
       if (isShowLoading) {
-        wx.hideLoading();        
+        wx.hideLoading();
         clearTimeout(dataSendTimeout);
       }
       if (data) {
@@ -648,7 +648,7 @@ function UpdateMiaoguoCardTodayAll(isShowLoading, callback) {
   }
 }
 
-function updateSearchList(obj,callback) {
+function updateSearchList(obj, callback) {
   var arr = wx.getStorageSync("SearchWord3");
   if (!arr)
     arr = [];
@@ -668,13 +668,13 @@ function updateSearchList(obj,callback) {
           break;
         }
       } else {
-        var b=true;
+        var b = true;
         if (obj.Type && arr[i].Type && arr[i].Type != obj.Type)
-          b=false;
+          b = false;
         if (obj.Author && arr[i].Author && arr[i].Author != obj.Author)
-          b=false;
-        
-        if (b){
+          b = false;
+
+        if (b) {
           obj.Value = arr[i].Value;
           arr.splice(i, 1);
           break;
@@ -694,7 +694,7 @@ function updateSearchList(obj,callback) {
   app.globalData.SearchItem = obj.Value;
   if (obj.TypeName)
     app.globalData.SearchItem.TypeName = obj.TypeName;
-  
+
   if (callback)
     callback();
 }
@@ -788,16 +788,16 @@ function getMemoryLevel(index, number, time) {
 }
 //得到要检验的汉字列表
 function GetHanziUnitWords(unitsID, testType, callback) {
-  var url='GetHanziUnitWords?UnitID=' + unitsID;
+  var url = 'GetHanziUnitWords?UnitID=' + unitsID;
   if (testType)
-    url+="&TestType="+testType;
+    url += "&TestType=" + testType;
   getData(url, function (data) {
     if (data) {
       var TaskList = [];
       var words = data;
 
       //若是单字
-      if (words[0].Pinyin){
+      if (words[0].Pinyin) {
         for (var k = 0; k < words.length; k++) {
           var taskInfo = {
             FontSize: 144,
@@ -817,22 +817,22 @@ function GetHanziUnitWords(unitsID, testType, callback) {
             ]
           };
           taskInfo.Word = words[k].Name;
-  
+
           var pinyinNormal = "(" + getPinyinNormal(words[k].Pinyin) + ")";
           var combineWords = common.ReplaceAllString(words[k].CombineWords, words[k].Name, words[k].Name + pinyinNormal);
-  
+
           taskInfo.ReadString = words[k].Name + pinyinNormal + "," + combineWords + "的" + words[k].Name + pinyinNormal;
-  
+
           if (testType == "read") {
             taskInfo.Content[0].Content = ["怎么念"];
             var question = words[k].CombineWords;
             question = common.ReplaceAllString(question, words[k].Name, "(" + words[k].Name + ")");
             taskInfo.Content[1].Content = question;
-  
-  
+
+
             var answer = "[读 src='" + taskInfo.ReadString + "']" + words[k].Pinyin + "[/读]";
             taskInfo.Content[2].Content = answer;
-  
+
             if (words[k].CombineWords.length > 6) {
               taskInfo.FontSize = 108;
               if (words[k].CombineWords.length > 10) {
@@ -841,16 +841,16 @@ function GetHanziUnitWords(unitsID, testType, callback) {
             }
           } else if (testType == "write") {
             taskInfo.Content[0].Content = ["怎么写"];
-  
+
             var question = words[k].CombineWords;
             //var question2 = common.ReplaceAllString(question, words[k].Name, words[k].Pinyin);
-            var question2= words[k].CombineWords2;
+            var question2 = words[k].CombineWords2;
             question = "[读 src='" + taskInfo.ReadString + "']" + question2 + "[/读]"
             taskInfo.Content[1].Content = question;
             var answer = words[k].Name;
             answer += "[图 w='650' h='650']" + words[k].BiShunUrl + "[/图]";
             taskInfo.Content[2].Content = answer;
-  
+
             if (question2.length > 6) {
               taskInfo.FontSize = 108;
               if (question2.length > 10) {
@@ -864,16 +864,15 @@ function GetHanziUnitWords(unitsID, testType, callback) {
           taskInfo.ContentNew = changeStringToView(taskInfo.Content);
           TaskList.push(taskInfo);
         }
-  
-      }
-      else{ //若是词语
+
+      } else { //若是词语
         for (var k = 0; k < words.length; k++) {
-          var taskInfo = words[k];          
+          var taskInfo = words[k];
           taskInfo.ContentNew = changeStringToView(taskInfo.Content);
           TaskList.push(taskInfo);
         }
       }
-      
+
       callback(TaskList);
     } else {
       callback([]);
@@ -895,18 +894,17 @@ function GetTestReportInfo(reportid, callback) {
         var userTestReportInfo = UserTestReport[n];
         var bookid = userTestReportInfo.BookID;
 
-        
+
         var arrEnglist = [];
-        if (bookid<110){
-          if (name1[1]=="英文字母"){
-            bookid=100;
-            wordStr="A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z";
+        if (bookid < 110) {
+          if (name1[1] == "英文字母") {
+            bookid = 100;
+            wordStr = "A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z";
           }
-        }
-        else if (bookid>110 && bookid<120){
+        } else if (bookid > 110 && bookid < 120) {
           arrEnglist = wx.getStorageSync("EnglishAll");
           arrEnglist = JSON.parse(arrEnglist);
-          
+
           for (var i = 0; i < arrEnglist.length; i++) {
             if (arrEnglist[i].Name == name1[1]) {
               for (var j = 0; j < arrEnglist[i].Units.length; j++) {
@@ -917,7 +915,7 @@ function GetTestReportInfo(reportid, callback) {
               }
             }
           }
-          
+
         }
 
         var tempRight = "," + userTestReportInfo.TestRightStr + ",";
@@ -925,18 +923,16 @@ function GetTestReportInfo(reportid, callback) {
         var tempSkip = "," + userTestReportInfo.TestSkipStr + ",";
         var tempExist = "," + userTestReportInfo.TestExistStr + ",";
 
-        var unitsid="";
-        if (bookid>100 && bookid<110 && UserTestReport[n].Name[2]){
-          unitsid=Number(UserTestReport[n].Name[2]);
-        }
-        else if (bookid>120 && bookid<=124){
-          unitsid=Number(name2.replace("Lesson ",""));
-        }
-        else if (bookid>130 && bookid<=140 && UserTestReport[n].Name[2]){
-          unitsid=Number(UserTestReport[n].Name[2]);
+        var unitsid = "";
+        if (bookid > 100 && bookid < 110 && UserTestReport[n].Name[2]) {
+          unitsid = Number(UserTestReport[n].Name[2]);
+        } else if (bookid > 120 && bookid <= 124) {
+          unitsid = Number(name2.replace("Lesson ", ""));
+        } else if (bookid > 130 && bookid <= 140 && UserTestReport[n].Name[2]) {
+          unitsid = Number(UserTestReport[n].Name[2]);
         }
 
-        getData('GetTestEnglishWords?UserID=' + app.globalData.userInfo.UserID+'&BookID='+bookid+'&LessonID='+unitsid+ '&Words=' + wordStr+"&TestType="+userTestReportInfo.TestType, function (data) {
+        getData('GetTestEnglishWords?UserID=' + app.globalData.userInfo.UserID + '&BookID=' + bookid + '&LessonID=' + unitsid + '&Words=' + wordStr + "&TestType=" + userTestReportInfo.TestType, function (data) {
           if (data) {
             var result = {};
             result.ID = userTestReportInfo.ID;
@@ -950,13 +946,12 @@ function GetTestReportInfo(reportid, callback) {
             for (var k = 0; k < words.length; k++) {
               var taskInfo = words[k];
 
-              if (userTestReportInfo.TestType=="read"){
-                taskInfo.TagWidth=212;
-                taskInfo.FontSize=108;
-              }
-              else{
-                taskInfo.TagWidth=186;
-                taskInfo.FontSize=36;
+              if (userTestReportInfo.TestType == "read") {
+                taskInfo.TagWidth = 212;
+                taskInfo.FontSize = 108;
+              } else {
+                taskInfo.TagWidth = 186;
+                taskInfo.FontSize = 36;
               }
               taskInfo.ContentNew = changeStringToView(taskInfo.Content);
               if (tempRight.indexOf("," + taskInfo.Word + ",") >= 0)
@@ -990,8 +985,7 @@ function GetTestReportInfo(reportid, callback) {
             callback({});
           }
         });
-      } 
-      else if (name1[1].indexOf("拼音") >= 0) {
+      } else if (name1[1].indexOf("拼音") >= 0) {
         //console.log("拼音");
         var userTestReportInfo = UserTestReport[n];
         var bookid = userTestReportInfo.BookID;
@@ -1001,37 +995,37 @@ function GetTestReportInfo(reportid, callback) {
         var tempSkip = "," + userTestReportInfo.TestSkipStr + ",";
         var tempExist = "," + userTestReportInfo.TestExistStr + ",";
 
-        var unitsid="";
-        var name2=userTestReportInfo.Name[1];
-        if (bookid==43){
-          switch(name2){
+        var unitsid = "";
+        var name2 = userTestReportInfo.Name[1];
+        if (bookid == 43) {
+          switch (name2) {
             case "声母1":
-              unitsid=431;
+              unitsid = 431;
               break;
             case "声母2":
-              unitsid=432;
+              unitsid = 432;
               break;
             case "声母3":
-              unitsid=433;
+              unitsid = 433;
               break;
             case "韵母1":
-              unitsid=434;
+              unitsid = 434;
               break;
             case "韵母2":
-              unitsid=435;
+              unitsid = 435;
               break;
             case "韵母3":
-              unitsid=436;
+              unitsid = 436;
               break;
             case "整体认读1":
-              unitsid=437;
+              unitsid = 437;
               break;
             case "整体认读2":
-              unitsid=438;
+              unitsid = 438;
               break;
           }
-        }        
-        getData('GetPinyinUnitWords?UserID='+app.globalData.userInfo.UserID+'&BookID='+bookid+'&UnitID='+unitsid+'&Word='+name2, function (data) {
+        }
+        getData('GetPinyinUnitWords?UserID=' + app.globalData.userInfo.UserID + '&BookID=' + bookid + '&UnitID=' + unitsid + '&Word=' + name2, function (data) {
           if (data) {
             var result = {};
             result.ID = userTestReportInfo.ID;
@@ -1045,9 +1039,9 @@ function GetTestReportInfo(reportid, callback) {
             for (var k = 0; k < words.length; k++) {
               var taskInfo = words[k];
 
-              taskInfo.TagWidth=230;
-              taskInfo.FontSize=108;
-              
+              taskInfo.TagWidth = 230;
+              taskInfo.FontSize = 108;
+
               taskInfo.ContentNew = changeStringToView(taskInfo.Content);
               if (tempRight.indexOf("," + taskInfo.Word + ",") >= 0)
                 taskInfo.Result = 1;
@@ -1080,8 +1074,7 @@ function GetTestReportInfo(reportid, callback) {
             callback({});
           }
         });
-      } 
-      else if (name2=="古诗文") {
+      } else if (name2 == "古诗文") {
         //todo
         //console.log("古诗文");
         var userTestReportInfo = UserTestReport[n];
@@ -1089,9 +1082,9 @@ function GetTestReportInfo(reportid, callback) {
         var tempWrong = "," + userTestReportInfo.TestWrongStr + ",";
         var tempSkip = "," + userTestReportInfo.TestSkipStr + ",";
         var tempExist = "," + userTestReportInfo.TestExistStr + ",";
-        
+
         getData('GetTestAncientPoetryList?UserID=' + app.globalData.userInfo.UserID + '&BookID=' + userTestReportInfo.BookID, function (data) {
-          
+
           if (data) {
             var result = {};
             result.ID = userTestReportInfo.ID;
@@ -1102,12 +1095,12 @@ function GetTestReportInfo(reportid, callback) {
 
             var TaskList = [];
             for (var k = 0; k < data.length; k++) {
-              var taskInfo = data[k];              
-              taskInfo.TagWidth=336;
-              if (taskInfo.Word.length>9)
-                taskInfo.FontSize=48;
+              var taskInfo = data[k];
+              taskInfo.TagWidth = 336;
+              if (taskInfo.Word.length > 9)
+                taskInfo.FontSize = 48;
               else
-                taskInfo.FontSize=64;
+                taskInfo.FontSize = 64;
 
               taskInfo.ContentNew = changeStringToView(taskInfo.Content);
               if (tempRight.indexOf("," + taskInfo.Word + ",") >= 0)
@@ -1141,12 +1134,11 @@ function GetTestReportInfo(reportid, callback) {
             callback({});
           }
         });
-        
-      } 
-      else {
+
+      } else {
         var obj = UserTestReport[n];
-                
-        if (obj.BookID>=43 && obj.BookID<=60)
+
+        if (obj.BookID >= 43 && obj.BookID <= 60)
           name1 = name1[0] + "生词" + name1[2].substr(0, 1);
         else
           name1 = name1[0] + name1[1].substr(2, 2) + "能力" + name1[2].substr(0, 1);
@@ -1172,7 +1164,7 @@ function GetTestReportInfo(reportid, callback) {
                     }
                     var result = {};
                     result.ID = reportid;
-                    result.BookID=obj.BookID;
+                    result.BookID = obj.BookID;
                     result.TestType = obj.TestType;
                     result.Name = obj.Name.join("#");
                     result.IsFinished = obj.IsFinished;
@@ -1227,7 +1219,7 @@ function getHanzi(callback) {
     title: '请稍候',
     mask: true,
   });
-  
+
   var time = wx.getStorageSync("HanziUpdateTime");
   getData('GetHanziAll3?UpdateTime=' + time, function (data) {
     wx.hideLoading();
@@ -1251,7 +1243,7 @@ function getEnglish(callback) {
     title: '请稍候',
     mask: true,
   });
-  
+
   var time = wx.getStorageSync("HanziUpdateTime");
   getData('GetEnglishAll3?UpdateTime=' + time, function (data) {
     wx.hideLoading();
@@ -1265,10 +1257,9 @@ function getEnglish(callback) {
       wx.setStorageSync("CambridgeEngList", arrCambridgeEngList);
       wx.setStorageSync("PhoneticEngList", arrPhoneticEngList);
       wx.setStorageSync("EnglishUpdateTime", data.UpdateTime);
-     
+
       callback(true);
-    }
-    else{
+    } else {
       callback(false);
     }
   });
@@ -1290,7 +1281,7 @@ function UploadUserConfig(callback) {
   param1.ColorIndexArr = wx.getStorageSync("ColorIndexArr").join(",");
   param1.IsFolderPractice = wx.getStorageSync("IsFolderPractice");
   param1.IsAutoSound = wx.getStorageSync("IsAutoSound");
-  
+
   var symboMain = wx.getStorageSync("SymbolMain");
   var symbol1 = [];
   for (var i = 0; i < symboMain.length; i++) {
@@ -1299,10 +1290,10 @@ function UploadUserConfig(callback) {
   symbol1 = JSON.stringify(symbol1);
   param1.SymbolList = symbol1;
 
-  var folderOrder=wx.getStorageSync("FolderOrderStr");
+  var folderOrder = wx.getStorageSync("FolderOrderStr");
   if (folderOrder)
     param1.FolderOrder = folderOrder;
-  
+
   //console.log(param1);
   that.postData('UploadUserConfig?Type=update&UserID=' + app.globalData.userInfo.UserID, param1, function (data) {
     if (callback) {
@@ -1341,7 +1332,7 @@ function getUserConfig() {
     wx.setStorageSync("FolderOrderStr", data.FolderOrder);
     wx.setStorageSync("IsFolderPractice", data.IsFolderPractice);
     wx.setStorageSync("IsAutoSound", data.IsAutoSound);
-    
+
     var symbol1 = [];
     if (data.SymbolList) {
       for (var i = 0; i < data.SymbolList.length; i++) {
@@ -1353,11 +1344,11 @@ function getUserConfig() {
     } else {
       symbol1 = app.globalData.SymbolMain;
     }
-    if (symbol1.length>0){
+    if (symbol1.length > 0) {
       wx.setStorageSync("SymboMain", symbol1);
       app.globalData.SymbolMain = symbol1;
     }
-    
+
   });
 }
 
@@ -1365,60 +1356,62 @@ function replaceCardInfoString(str) {
   var that = this;
   //str = str.replace(/\[图]/g, "");
   //str = str.replace(/\[\/图\]/g, "");
-  
-  var str2 = "";
-  if (str.indexOf("[读 src=") >= 0) {
-    str2 = str.substr(str.indexOf("[读 src="));
-    str2 = str2.substring(0, str2.indexOf("]") + 1);
-  }
-  str = str.replace(str2, "");
+  console.log(str);
+  if (str && str!=null) {
+    var str2 = "";
+    if (str.indexOf("[读 src=") >= 0) {
+      str2 = str.substr(str.indexOf("[读 src="));
+      str2 = str2.substring(0, str2.indexOf("]") + 1);
+    }
+    str = str.replace(str2, "");
 
-  if (str.indexOf("[/读") >= 0) {
-    str2 = str.substr(str.indexOf("[/读"));
-    str2 = str2.substring(0, 4);
-  }
-  str = str.replace(str2, "");
-  
+    if (str.indexOf("[/读") >= 0) {
+      str2 = str.substr(str.indexOf("[/读"));
+      str2 = str2.substring(0, 4);
+    }
+    str = str.replace(str2, "");
 
-  if (str.indexOf("[读 src=") >= 0) {
-    str2 = str.substr(str.indexOf("[读 src"));
-    str2 = str2.substring(0, str2.indexOf("/读]") + 3);
-  }
-  str = str.replace(str2, "");
 
-  if (str.indexOf("[/读") >= 0) {
-    str2 = str.substr(str.indexOf("[/读"));
-    str2 = str2.substring(0, 4);
-  }
-  str = str.replace(str2, "");
-  
-  str = str.replace(/\[读]/g, "");
-  str = str.replace(/\[\/读\]/g, "");
-
-  var str3 = "";
-  if (str.indexOf("[图") >= 0) {
-    str3 = str.substr(str.indexOf("[图"));
-    str3 = str3.substring(0, str3.indexOf("/图]") + 3);
-  }
-  str = str.replace(str3, "");
-  if (str.indexOf("[图") >= 0) {
-    str3 = str.substr(str.indexOf("[图"));
-    str3 = str3.substring(0, str3.indexOf("/图]") + 3);
-  }
-  str = str.replace(str3, "");
+    if (str.indexOf("[读 src=") >= 0) {
+      str2 = str.substr(str.indexOf("[读 src"));
+      str2 = str2.substring(0, str2.indexOf("/读]") + 3);
+    }
+    str = str.replace(str2, "");
+
+    if (str.indexOf("[/读") >= 0) {
+      str2 = str.substr(str.indexOf("[/读"));
+      str2 = str2.substring(0, 4);
+    }
+    str = str.replace(str2, "");
 
-  str = str.replace(/\[线]/g, "");
-  str = str.replace(/\[\/线\]/g, "");
-  str = that.encryptUrl(str);
+    str = str.replace(/\[读]/g, "");
+    str = str.replace(/\[\/读\]/g, "");
+
+    var str3 = "";
+    if (str.indexOf("[图") >= 0) {
+      str3 = str.substr(str.indexOf("[图"));
+      str3 = str3.substring(0, str3.indexOf("/图]") + 3);
+    }
+    str = str.replace(str3, "");
+    if (str.indexOf("[图") >= 0) {
+      str3 = str.substr(str.indexOf("[图"));
+      str3 = str3.substring(0, str3.indexOf("/图]") + 3);
+    }
+    str = str.replace(str3, "");
+
+    str = str.replace(/\[线]/g, "");
+    str = str.replace(/\[\/线\]/g, "");
+    str = that.encryptUrl(str);
+  }
   return str;
 }
 
-function searchInfomation(search,searchtype,author,shiciurl,callback){
-  var WORD_LENGTH=18;
+function searchInfomation(search, searchtype, author, shiciurl, callback) {
+  var WORD_LENGTH = 18;
   wx.showLoading({
     title: '查询中',
   });
-  var timeout=setTimeout(function () {
+  var timeout = setTimeout(function () {
     wx.hideLoading();
   }, 5000);
 
@@ -1431,11 +1424,11 @@ function searchInfomation(search,searchtype,author,shiciurl,callback){
   if (shiciurl)
     url += "&ShiciUrl=" + shiciurl;
 
-  
+
   getData(url, function (data) {
     wx.hideLoading();
     clearTimeout(timeout);
-    
+
     if (data) {
       //console.log(data);
 
@@ -1475,7 +1468,7 @@ function searchInfomation(search,searchtype,author,shiciurl,callback){
           obj.TypeName = "诗词";
           obj.Content = data.CHN.PeomContent.join("").substr(0, WORD_LENGTH);
           obj.ShiciUrl = shiciurl;
-          obj.TypeName="S";
+          obj.TypeName = "S";
         } else if (data.CHN) {
           obj.Type = "zici";
           if (data.CHN.PinYin && data.CHN.PinYin[0] && data.CHN.PinYin[0].pinyin)
@@ -1489,9 +1482,9 @@ function searchInfomation(search,searchtype,author,shiciurl,callback){
           }
 
           if (obj.Key.length == 1)
-              obj.TypeName = "Z";
-            else
-              obj.TypeName = "C";
+            obj.TypeName = "Z";
+          else
+            obj.TypeName = "C";
         }
         if (data.ENG && !data.CHN) {
           obj.Type = "eng";
@@ -1507,11 +1500,10 @@ function searchInfomation(search,searchtype,author,shiciurl,callback){
         }
         app.globalData.TempSearchBackNumber = 2;
         //app.globalData.CardList=[];
-        app.globalData.CardList2=[];
-        
-        callback([],obj);
-      }
-      else{
+        app.globalData.CardList2 = [];
+
+        callback([], obj);
+      } else {
         callback([]);
 
       }
@@ -1521,13 +1513,13 @@ function searchInfomation(search,searchtype,author,shiciurl,callback){
   });
 }
 
-function downloadBishunKaitiImage(url,serverUrl,dataType,Fields,callback){
-  var param={};
-  param.Url=url;
-  param.DataType=dataType;
+function downloadBishunKaitiImage(url, serverUrl, dataType, Fields, callback) {
+  var param = {};
+  param.Url = url;
+  param.DataType = dataType;
 
-  if (param.Url==serverUrl){
-    postData("GetBiShunByKaitiUrl",param, function (data) {
+  if (param.Url == serverUrl) {
+    postData("GetBiShunByKaitiUrl", param, function (data) {
       if (data) {
         wx.downloadFile({
           url: data, // 仅为示例，并非真实的资源
@@ -1536,36 +1528,34 @@ function downloadBishunKaitiImage(url,serverUrl,dataType,Fields,callback){
             if (res.statusCode === 200) {
               //console.log("serverUrl2:" + serverUrl);
               console.log(res.tempFilePath);
-              callback(change(Fields,res.tempFilePath,param));
+              callback(change(Fields, res.tempFilePath, param));
             }
           },
-          complete(){
-            
+          complete() {
+
           }
         });
       }
     });
-  }
-  else{
-    callback(change(Fields,serverUrl,param));
+  } else {
+    callback(change(Fields, serverUrl, param));
   }
 
-  function change(Fields,filepath,param){
-    var iStart=0;
-    if (Fields.length==4)
-    iStart=1
+  function change(Fields, filepath, param) {
+    var iStart = 0;
+    if (Fields.length == 4)
+      iStart = 1
     for (var i = iStart; i < Fields.length; i++) {
       for (var j = 0; j < Fields[i].length; j++) {
         if (Fields[i][j].Type == "image") {
-          if (Fields[i][j].Content==param.Url){
+          if (Fields[i][j].Content == param.Url) {
             Fields[i][j].Content = filepath;
-            if (param.DataType=="bishun"){
-              Fields[i][j].IsShowKaiti=true;
-              Fields[i][j].IsShowBishun=false;
-            }
-            else if (param.DataType=="kaiti"){
-              Fields[i][j].IsShowKaiti=false;
-              Fields[i][j].IsShowBishun=true;
+            if (param.DataType == "bishun") {
+              Fields[i][j].IsShowKaiti = true;
+              Fields[i][j].IsShowBishun = false;
+            } else if (param.DataType == "kaiti") {
+              Fields[i][j].IsShowKaiti = false;
+              Fields[i][j].IsShowBishun = true;
             }
           }
         }
@@ -1576,108 +1566,109 @@ function downloadBishunKaitiImage(url,serverUrl,dataType,Fields,callback){
 }
 
 function GetSoundError(str) {
-  var arr=constant.arrSoundError;
-  var result=str;
-  for(var i=0;i<arr.length;i++){
-      if (str.indexOf(arr[i].Word)>0){
-          result=common.ReplaceAllString(str,arr[i].Word,arr[i].Sound);
-          break;
-      }
-      else if (str==arr[i].Word){
-        result=arr[i].Sound;
-      }
+  var arr = constant.arrSoundError;
+  var result = str;
+  for (var i = 0; i < arr.length; i++) {
+    if (str.indexOf(arr[i].Word) > 0) {
+      result = common.ReplaceAllString(str, arr[i].Word, arr[i].Sound);
+      break;
+    } else if (str == arr[i].Word) {
+      result = arr[i].Sound;
+    }
   }
   return result;
 }
 
-function GetTestReportList(userID,callback){
-  var GradeArr = constant.testGradeArr;
-  for (var i = 0; i < GradeArr.length; i++) {
-    for (var j = 0; j < GradeArr[i].List.length; j++) {
-      GradeArr[i].List[j].Finish = 0;
+function GetTestReportList(userID, callback) {
+
+  getData('GetTestGradeArr', function (GradeArr) {
+    for (var i = 0; i < GradeArr.length; i++) {
+      for (var j = 0; j < GradeArr[i].List.length; j++) {
+        GradeArr[i].List[j].Finish = 0;
+      }
     }
-  }
-  getData('GetTestReportList?UserID=' + userID, function (data) {
-    if (data) {
-      var dataTemp = [];
-      for (var i = 0; i < data.length; i++) {
-        for (var j = 0; j < dataTemp.length; j++) {
-          if (dataTemp[j].Name[0] == data[i].Name[0] &&
-            dataTemp[j].Name[1] == data[i].Name[1] &&
-            dataTemp[j].TestType == data[i].TestType &&
-            data[i].IsFinished == 1
-          ) {
-            dataTemp.splice(j, 1);
-            break;
+    getData('GetTestReportList?UserID=' + userID, function (data) {
+      if (data) {
+        var dataTemp = [];
+        for (var i = 0; i < data.length; i++) {
+          for (var j = 0; j < dataTemp.length; j++) {
+            if (dataTemp[j].Name[0] == data[i].Name[0] &&
+              dataTemp[j].Name[1] == data[i].Name[1] &&
+              dataTemp[j].TestType == data[i].TestType &&
+              data[i].IsFinished == 1
+            ) {
+              dataTemp.splice(j, 1);
+              break;
+            }
           }
-        }
-        dataTemp.push(data[i]);
+          dataTemp.push(data[i]);
 
-        if (data[i].Name[0].indexOf("英语")>=0 || data[i].Name[0].indexOf("语文词语")>=0 || data[i].Name[0].indexOf("识字 上学期")>=0 || data[i].Name[0].indexOf("拼音")>=0 || data[i].Name[1].indexOf("古诗文")>=0){
-          if (data[i].TestRightStr){
-            data[i].TestRightStr=data[i].TestRightStr.split(",");
-          }
-          if (data[i].TestWrongStr){
-            data[i].TestWrongStr=data[i].TestWrongStr.split(",");
-          }          
-          if (data[i].TestSkipStr){
-            data[i].TestSkipStr=data[i].TestSkipStr.split(",");
-          }
-          if (data[i].TestExistStr){
-            data[i].TestExistStr=data[i].TestExistStr.split(",");
+          if (data[i].Name[0].indexOf("英语") >= 0 || data[i].Name[0].indexOf("语文词语") >= 0 || data[i].Name[0].indexOf("识字 上学期") >= 0 || data[i].Name[0].indexOf("拼音") >= 0 || data[i].Name[1].indexOf("古诗文") >= 0) {
+            if (data[i].TestRightStr) {
+              data[i].TestRightStr = data[i].TestRightStr.split(",");
+            }
+            if (data[i].TestWrongStr) {
+              data[i].TestWrongStr = data[i].TestWrongStr.split(",");
+            }
+            if (data[i].TestSkipStr) {
+              data[i].TestSkipStr = data[i].TestSkipStr.split(",");
+            }
+            if (data[i].TestExistStr) {
+              data[i].TestExistStr = data[i].TestExistStr.split(",");
+            }
           }
+
+          if (!data[i].TestRightStr)
+            data[i].TestRightStr = "";
+          if (!data[i].TestWrongStr)
+            data[i].TestWrongStr = "";
+          if (!data[i].TestSkipStr)
+            data[i].TestSkipStr = "";
+          if (!data[i].TestExistStr)
+            data[i].TestExistStr = "";
+
         }
-        
-        if (!data[i].TestRightStr)
-          data[i].TestRightStr="";
-        if (!data[i].TestWrongStr)
-          data[i].TestWrongStr="";
-        if (!data[i].TestSkipStr)
-          data[i].TestSkipStr="";
-        if (!data[i].TestExistStr)
-          data[i].TestExistStr="";
-              
-      }
 
-      for (var i = 0; i < dataTemp.length; i++) {
-        var name = dataTemp[i].Name[0].split(" ");
-        for (var j = 0; j < GradeArr.length; j++) {
-          var item = GradeArr[j];
-          if (name[0] == item.Name) {
-            for (var k = 0; k < item.List.length; k++) {
-              
-              //音标计算进度  
-              if (item.List[k].ID==101 && dataTemp[i].BookID==101){
-                for(var n=1;n<=4;n++){
-                  if (Number(dataTemp[i].Name[2])==n && dataTemp[i].IsFinished==1)
-                    item.List[k].Finish++;
+        for (var i = 0; i < dataTemp.length; i++) {
+          var name = dataTemp[i].Name[0].split(" ");
+          for (var j = 0; j < GradeArr.length; j++) {
+            var item = GradeArr[j];
+            if (name[0] == item.Name) {
+              for (var k = 0; k < item.List.length; k++) {
+
+                //音标计算进度  
+                if (item.List[k].ID == 101 && dataTemp[i].BookID == 101) {
+                  for (var n = 1; n <= 4; n++) {
+                    if (Number(dataTemp[i].Name[2]) == n && dataTemp[i].IsFinished == 1)
+                      item.List[k].Finish++;
+                  }
                 }
-              }
-              //古诗词计算进度
-              else if (item.List[k].ID==dataTemp[i].BookID && dataTemp[i].TestType=="recite" && dataTemp[i].IsFinished == 1)
-                item.List[k].Finish=1;
-              else{
-                if (name[1] == item.List[k].Name && name[2] == item.List[k].Name2) {
-                  if (dataTemp[i].IsFinished == 1)
-                    item.List[k].Finish++;
+                //古诗词计算进度
+                else if (item.List[k].ID == dataTemp[i].BookID && dataTemp[i].TestType == "recite" && dataTemp[i].IsFinished == 1)
+                  item.List[k].Finish = 1;
+                else {
+                  if (name[1] == item.List[k].Name && name[2] == item.List[k].Name2) {
+                    if (dataTemp[i].IsFinished == 1)
+                      item.List[k].Finish++;
+                  }
                 }
               }
             }
           }
         }
-      }
 
-      for (var j = 0; j < GradeArr.length; j++) {
-        var item = GradeArr[j];
-        for (var k = 0; k < item.List.length; k++) {
-          item.List[k].Finished = Math.round(100 * item.List[k].Finish / item.List[k].Total);
-          item.List[k].NameStr=item.List[k].Name.replace("语文","");
+        for (var j = 0; j < GradeArr.length; j++) {
+          var item = GradeArr[j];
+          for (var k = 0; k < item.List.length; k++) {
+            item.List[k].Finished = Math.round(100 * item.List[k].Finish / item.List[k].Total);
+            item.List[k].NameStr = item.List[k].Name.replace("语文", "");
+          }
         }
+        wx.setStorageSync("UserTestReport", data);
+
+        callback(data, GradeArr);
       }
-      wx.setStorageSync("UserTestReport", data);
-      
-      callback(data,GradeArr);
-    }
+    });
   });
 }
 
@@ -1712,14 +1703,14 @@ module.exports = {
   buildInitData: buildInitData,
   getPinyinNormal: getPinyinNormal,
   getHanzi: getHanzi,
-  getEnglish:getEnglish,
+  getEnglish: getEnglish,
   GetHanziUnitWords: GetHanziUnitWords,
   GetTestReportInfo: GetTestReportInfo,
   getUserConfig: getUserConfig,
   getAwardData: getAwardData,
   replaceCardInfoString: replaceCardInfoString,
-  searchInfomation:searchInfomation,
-  downloadBishunKaitiImage:downloadBishunKaitiImage,
-  GetSoundError:GetSoundError,
-  GetTestReportList:GetTestReportList,
+  searchInfomation: searchInfomation,
+  downloadBishunKaitiImage: downloadBishunKaitiImage,
+  GetSoundError: GetSoundError,
+  GetTestReportList: GetTestReportList,
 }