2.1.61

app.js

@@ -1,6 +1,6 @@
 App({
   globalData: {
-    Version: "2.1.58",
+    Version: "2.1.61",
     IsProduction: true,
     //IsProduction: false,
     ShareTitle: "高效学习从秒过开始",

app.json

@@ -79,9 +79,14 @@
     {
       "root": "pages_agent",
       "pages": [
-        "promotion/earnings_list",
-        "promotion/earnings",
-        "promotion/user_index",
+        "main/search_user",
+        "main/user_relation",
+        "main/withdraw_deposit",
+        "main/result_list",
+        "main/other_list",
+        "main/earnings_apply",
+        "main/earnings_list",
+        "main/user_index",
         "main/message_info",
         "main/message",
         "main/userinfo",

pages/index/index.js

@@ -273,6 +273,7 @@ Page({
               timeoutRedirect=setTimeout(function () {
                 console.log("Time5:" + new Date().getTime());
                 clearTimeout(timeout1);
+                clearTimeout(timeout3);
                 app.globalData.FolderList=[];
                 wx.redirectTo({
                   url: url,

pages/index/index.wxml

@@ -5,7 +5,7 @@
     <image class="img" mode="aspectFit" src="../images/program_start_tips0{{Sentence}}.png"></image>
   </view>
   <block wx:if="{{IsRefresh}}">
-    <view class="text2">网络繁忙，请稍后再试</view>
-    <view class="btn" bindtap='onPullDownRefresh'>重启</view>
+    <text class="text2">如多次刷新无效，\n请<text class="text3">重启微信</text>排除本地网络故障</text>
+    <view class="btn" bindtap='onPullDownRefresh'>刷新</view>
   </block>
 </view>

pages/index/index.wxss

@@ -31,13 +31,17 @@
 .text2{
   font-size:28rpx;
   position: fixed;
-  top:500rpx;
+  top:460rpx;
   text-align: center;
   color:#1e1e1e;
   z-index: 10;
   font-weight: 400;
 }
 
+.text3{
+  color:#FE6659;
+}
+
 .img{
   width:400rpx;
   height:150rpx;

pages/main/add.js

@@ -11,7 +11,6 @@ var arrSoundMark = [];
 var isUnload = true;
 var isEdit = true;
 var isSave = true;
-var interval;
 var timeoutUploadImage = 0;
 var intervalRecorder = 0; //录音计时器
 var recorderManager;
@@ -307,7 +306,6 @@ Page({
       app.globalData.CardList = list;
       wx.removeStorageSync("TempCardInfo");
     }
-    clearInterval(interval);
     clearTimeout(timeoutUploadImage);
     clearInterval(intervalRecorder);
 
@@ -641,13 +639,13 @@ Page({
       }, 30000);
     }
 
-    interval = setInterval(function () {
-      //console.log(arrResult.length);
+    //检查是否上传成功
+    setTimeout(function () {
+      console.log(arrResult.length);
+      console.log(arrSource.length);
       if (arrResult.length >= arrSource.length) {
-        wx.hideLoading();
         //console.log("arrResult:" + JSON.stringify(arrResult));
 
-        clearInterval(interval);
         var success = true;
 
         var ari = 0;
@@ -664,10 +662,11 @@ Page({
               }
               console.log("serverUrl:" + serverUrl);
               //console.log("tempUrl:" + tempUrl);
-              if (serverUrl == "")
-                serverUrl = main.getServerImage(tempUrl);
+              // if (serverUrl == "")
+              //   serverUrl = main.getServerImage(tempUrl);
+
+              // main.saveTempImage(serverUrl, tempUrl);
 
-              main.saveTempImage(serverUrl, tempUrl);
               arr[i][j].Content = serverUrl;
               arr[i][j].ContentServer = serverUrl;
 
@@ -681,7 +680,7 @@ Page({
         //console.log(JSON.stringify(arr));
         callback(success, arr);
       }
-    }, 500);
+    }, 2000);
   },
   uploadFileToServer: function (file, callback) {
     var url = common.Encrypt("MiaoguoUploadFile2");
@@ -697,8 +696,8 @@ Page({
             wx.downloadFile({
               url: err.result.Target,
               success(res) {
+                wx.hideLoading();
                 if (res.statusCode != 200) {
-                  wx.hideLoading();
                   wx.showModal({
                     title: '上传图片可能失败',
                     showCancel: false,

pages/main/add.wxss

@@ -1032,7 +1032,7 @@ page{
   width:690rpx;
   height:211rpx;
   font-size:48rpx;
-  columns: #4d4d4d;
+  color: #4d4d4d;
   border-radius: 10rpx;
   background-color: #e3e3e3;
   margin-top:30rpx;

pages/main/default.wxss

@@ -1,3 +1,7 @@
+page{
+  background-color: #3157ba;
+}
+
 .container {
   background-color: #3157ba;
 }

pages/main/detail.js

@@ -28,7 +28,7 @@ var currentFolderStart = false;
 var timeoutPlayAudio;
 var tempPlayUrl = "";
 var tempPlayUrlLocal = "";
-var timeoutEveryCard = 0;
+var timeoutEveryCard = [];
 var timeoutHide = 0;
 
 var arrAutoAudio = [];
@@ -173,8 +173,9 @@ Page({
     main.getData(url, function (data) {});
   },
   onUnload: function () {
+    var that=this;
     clearInterval(intervalSound);
-    clearTimeout(timeoutEveryCard);
+    that.clearTimeoutEveryCard();
     clearTimeout(timeoutHide);
     listTaskFinished = [];
 
@@ -309,7 +310,9 @@ Page({
       arrImage = TaskList[0].ContentNew.Images;
       arrImage2 = TaskList[0].ContentNew.Images2;
 
-      that.autoAudioPlayInit();
+      setTimeout(function(){
+        that.autoAudioPlayInit();
+      },1000);
       taskInfo = TaskList[0];
 
 
@@ -494,7 +497,7 @@ Page({
       url: './add?type=edit1&id=' + TaskList[0].MiaoguoCardID,
     });
     isExit = false;
-    clearTimeout(timeoutEveryCard);
+    that.clearTimeoutEveryCard();
   },
   //回到上一张题卡
   gotoPrev: function () {
@@ -844,8 +847,8 @@ Page({
   timeCompute: function () {
     var that = this;
     timeStart = new Date();
-    clearTimeout(timeoutEveryCard);
-    timeoutEveryCard = setTimeout(function () {
+    that.clearTimeoutEveryCard();
+    var timeoutEveryCardNumber = setTimeout(function () {
       //计算暂停时已经用掉的时长
       timeHistory += common.diffDate("s", timeStart, new Date());
       console.log("timeHistory:" + timeHistory);
@@ -859,7 +862,7 @@ Page({
           showCancel: false,
           confirmText: "知道了",
           success(res) {
-            clearTimeout(timeoutEveryCard);
+            that.clearTimeoutEveryCard();
             clearTimeout(timeoutHide);
             if (res.confirm) {
               that.timeCompute();
@@ -869,6 +872,7 @@ Page({
       }
 
     }, app.globalData.CardWaitTimeMax * 60 * 1000);
+    timeoutEveryCard.push(timeoutEveryCardNumber);
   },
   setFinallyResult: function () {
     var that = this;
@@ -881,7 +885,7 @@ Page({
       Recommend: 0,
       IsMore: false,
     });
-    clearTimeout(timeoutEveryCard);
+    that.clearTimeoutEveryCard();
     that.setSoundFile(1);
     main.UpdateMiaoguoCardTodayAll(true, function () {
       listTaskFinished = [];
@@ -947,6 +951,7 @@ Page({
     });
   },
   showNumberContainner: function () {
+    var that=this;
     if (!this.data.Title) {
       this.setData({
         IsShowNumberInfo: true,
@@ -956,7 +961,7 @@ Page({
       this.setData({
         Title: "进度",
       });
-      clearTimeout(timeoutEveryCard);
+      that.clearTimeoutEveryCard();
     }
   },
   closeNumberContainner: function () {
@@ -1039,6 +1044,7 @@ Page({
     });
   },
   onMore: function () {
+    var that=this;
     for (var i = 0; i < this.data.FontSizeArray.length; i++) {
       if (this.data.FontSizeArray[i].Value == this.data.TaskInfo.FontSize)
         this.data.FontSizeArray[i].CSS = "color:#1E1E1E;background-color:" + this.data.Color.LineColor + ";border:3rpx solid " + this.data.Color.LineColor + ";";
@@ -1050,7 +1056,7 @@ Page({
       FontSizeArray: this.data.FontSizeArray,
       Title: "调节",
     });
-    clearTimeout(timeoutEveryCard);
+    that.clearTimeoutEveryCard();
   },
   showOtherButton: function () {
     var animation = wx.createAnimation();
@@ -1127,7 +1133,9 @@ Page({
     this.closeNumberContainner();
   },
   onClose: function () {
+    var that=this;
     console.log("close");
+    that.clearTimeoutEveryCard();
     wx.navigateBack({
       delta: 1,
     });
@@ -1268,76 +1276,6 @@ Page({
               };
 
             });
-
-          // var canvas = wx.createCanvasContext("shareCanvas", that);
-          // canvas.setFillStyle(main.getShareImageBackColor());
-          // canvas.fillRect(360, 0, 600, 360);
-          // canvas.drawImage(res.tempFilePath, 0, 0, 360, 360);
-          // canvas.drawImage("../images/universalpic_screenshot_jl_bgimage_360x360.png", 0, 0, 360, 360);
-          // canvas.fillStyle = "#ffffff";
-          // canvas.setTextBaseline('top');
-          // canvas.setFontSize(24);
-          // canvas.fillText(app.globalData.userInfo.NickName, 30, 282);
-
-          // var today = common.formatTime(new Date(), ".", true);
-          // canvas.setFontSize(18);
-          // canvas.fillText(today, 30, 315);
-
-          // canvas.setFontSize(20);
-          // canvas.fillText("秒过学习", 390, 30);
-          // canvas.setFontSize(44);
-          // canvas.fillText("勤勉接力", 390, 58);
-          // canvas.setFontSize(20);
-          // canvas.fillText("见证成长", 390, 120);
-
-          // canvas.setFontSize(68);
-          // if (!that.data.TodayTime)
-          //   that.data.TodayTime = 0;
-
-          // canvas.fillText(that.data.TodayTime, 390, 148);
-
-          // canvas.font = "normal 500 68px caption";
-          // var metrics = canvas.measureText(that.data.TodayTime.toString());
-          // //console.log(JSON.stringify(metrics));
-
-          // var h = 179;
-          // if (app.globalData.IsIOS)
-          //   h = 176;
-          // canvas.font = "normal 500 32px caption";
-          // canvas.fillText("分钟", 393 + Math.round(metrics.width), h);
-
-
-          // canvas.setFontSize(20);
-          // canvas.fillText("迄今已接力", 390, 267);
-          // canvas.setFontSize(32);
-          // canvas.fillText(app.globalData.TaskToday.DayNumber + "次", 390, 295);
-          // //console.log("生成前");
-          // canvas.draw(1, function (n) {
-          //   //console.log("生成后1");
-          //   wx.canvasToTempFilePath({
-          //     x: 0,
-          //     y: 0,
-          //     width: 600,
-          //     height: 360,
-          //     destWidth: 600,
-          //     destHeight: 360,
-          //     canvasId: 'shareCanvas',
-          //     success: function (res2) {
-          //       wx.hideLoading();
-          //       //console.log("生成后2");
-          //       wx.previewImage({
-          //         current: res2.tempFilePath, // 当前显示图片的http链接
-          //         urls: [res2.tempFilePath] // 需要预览的图片http链接列表
-          //       });
-
-          //       main.getData("ShareMiaoguoTask?UserID=" + app.globalData.userInfo.UserID, function (data) {});
-          //     },
-          //     fail: function (e) {
-          //       wx.hideLoading();
-          //       //console.log("生成错误："+e);
-          //     }
-          //   })
-          // });
         } else {
           wx.hideLoading();
         }
@@ -1463,7 +1401,6 @@ Page({
         }
       });
       arrAutoAudio.splice(0, 1);
-
     }
   },
   autoAudioPlayEnd: function () {
@@ -1552,8 +1489,10 @@ Page({
         success(res) {
           wx.hideLoading();
           tempPlayUrlLocal = res.tempFilePath;
-          that.audioCtx.setSrc(res.tempFilePath);
-          that.audioCtx.play();
+          // that.audioCtx.setSrc(res.tempFilePath);
+          // that.audioCtx.play();
+          innerAudioContext1.src = res.tempFilePath;
+          innerAudioContext1.play();
           tempPlayUrl = url;
         },
         fail(err) {
@@ -1597,8 +1536,11 @@ Page({
       url: url,
     });
   },
-  getNull: function () {
-
+  clearTimeoutEveryCard: function () {
+    for(var i=0;i<timeoutEveryCard.length;i++){
+      clearTimeout(timeoutEveryCard[i]);
+    }
+    timeoutEveryCard=[];
   },
   //获取导航栏高度
   getBarInfo(e) {

pages/test/index.js

@@ -25,12 +25,10 @@ Page({
       Subject: "CHN",
     });
 
-    main.getHanzi(function (arr) {
-      if (!arr) {
-        wx.removeStorageSync("HanziUpdateTime");
-        wx.removeStorageSync("HanziAll");
-        main.getHanzi(function (arr) {});
-      }
+    main.getHanzi(function () {
+      main.getEnglish(function () {
+      
+      });
     });
   },
   onShow: function () {

pages/test/list.js

@@ -19,20 +19,11 @@ Page({
       Name1: options.name1,
     });
     isClick = true;
-    main.getHanzi(function (arr) {
-      if (!arr) {
-        wx.removeStorageSync("HanziUpdateTime");
-        wx.removeStorageSync("HanziAll");
-        wx.removeStorageSync("NewConceptEngList");
-        wx.removeStorageSync("CambridgeEngList");
-        wx.removeStorageSync("PhoneticEngList");
-        main.getHanzi(function (arr) {
-          that.init();
-        });
-      } else {
+    main.getHanzi(function () {
+      main.getEnglish(function () {
         that.init();
-      }
-      isStart=false;
+        isStart=false;
+      });
     });
   },
   onUnload:function(){

pages_agent/main/earnings_apply.js

@@ -0,0 +1,67 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    
+  },
+  onLoad: function (options) {
+    var that = this;
+    
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      RecordID:options.RecordID,
+      AgentCategory:options.AgentCategory,
+    });
+    that.init();
+  },
+  init:function(){
+    var that = this;
+    var list=app.globalData.EarningsList.List1;
+    if (that.data.AgentCategory=="ambassador")
+      list=app.globalData.EarningsList.List2;
+    for(var i=0;i<list.length;i++){
+      if (list[i].ID==that.data.RecordID){
+        that.setData({
+          Info:list[i],
+        });
+        break;
+      }
+    }
+    var url="GetMiaoguoAgentPayList?UserID=" + app.globalData.userInfo.UserID+"&RecordID="+that.data.RecordID+"&AgentCategory="+that.data.AgentCategory;
+    main.getData(url, function (data) {
+      if (data) {
+        var list1=[],list2=[];
+        for(var i=0;i<data.length;i++){
+          if (data[i].Status==-1)
+            list1.push(data[i]);
+          else if (data[i].Status==1)
+            list2.push(data[i]);
+        }
+
+        that.setData({
+          List1:list1,
+          List2:list2,
+        });
+      }
+    });
+  },
+  getID:function(e){
+    var id=e.currentTarget.dataset.id;
+    wx.setClipboardData({
+      data: id.toString(),
+      success (res) {
+        
+      }
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages_agent/main/earnings_apply.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "提现申请单",
+  "backgroundColor": "#F2F2F2"
+}

pages_agent/main/earnings_apply.wxml

@@ -0,0 +1,127 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panel1 FlexColumn">
+    <view class="text1">审核通过</view>
+    <view class="text2">{{Info.RealMoney}}</view>
+    <view class="text3">到帐金额</view>
+    <view class="line"></view>
+    <view class="panel11 FlexColumn">
+      <view class="panel111 FlexRow">
+        <view class="text4">申请单号</view>
+        <view class="text5">{{Info.ID}}</view>
+      </view>
+      <view class="panel112 FlexRow">
+        <view class="text4">申请时间</view>
+        <view class="text5">{{Info.ApplyTime}}</view>
+      </view>
+      <view class="panel113 FlexRow">
+        <view class="text4">批复时间</view>
+        <view class="text5">{{Info.CheckTime}}</view>
+      </view>
+    </view>
+    <view class="line2"></view>
+    <view class="panel12 FlexRow" bindtap="getID" data-id="{{Info.ID}}">
+      <view class="text6">复制单号</view>
+    </view>
+  </view>
+
+  <view class="panel1 FlexColumn">
+    <view class="panel21 FlexRow">
+      <view class="text7">提现金额</view>
+      <view class="text8">{{Info.RealMoney}}</view>
+    </view>
+    <view class="line"></view>
+    <view class="panel11 FlexColumn">
+      <view class="panel22 panel111 FlexRow">
+        <view class="text4">微信支付平台交易手续费</view>
+        <view class="text5">{{Info.WXServiceCharge}}</view>
+      </view>
+      <view class="panel22 panel113 FlexRow">
+        <view class="text4">代缴个人所得税</view>
+        <view class="text5">{{Info.IndividualIncomeTax}}</view>
+      </view>
+    </view>
+    <view class="line"></view>
+    <view class="panel11 FlexColumn">
+      <view class="panel22 panel111 FlexRow">
+        <view class="text4">收款方式</view>
+        <view class="text5">{{Info.PaymentTerm}}</view>
+      </view>
+      <view class="panel22 panel112 FlexRow">
+        <view class="text4">收款人微信帐号</view>
+        <view class="text5">{{Info.PayeeWechatAccount}}</view>
+      </view>
+      <view class="panel22 panel113 FlexRow">
+        <view class="text4">收款帐号真实姓名</view>
+        <view class="text5">{{Info.RealName}}</view>
+      </view>
+    </view>
+  </view>
+  <view class="panel3 FlexRow" wx:if="{{List1.length>0}}">
+    <text class="text9"><text class="Number1">{{List1.length}}</text> 条退款记录</text>
+    <text></text>
+  </view>
+  <view class="panel4 FlexRow" wx:for="{{List1}}" wx:key="index">
+    <view class="panel41 FlexRow">
+      <image src='{{item.AvatarUrl}}' class="product_icon_mg_70x70" />
+      <view class="panel411 FlexColumn">
+        <text class="text10">{{item.NickName}}</text>
+        <text class="text11">{{item.RefundTime}}</text>
+      </view>
+    </view>
+    <text class="Number3 Number2">{{item.Money}}</text>
+  </view>
+
+  <view class="panel3 FlexRow">
+    <text class="text9"><text class="Number1">{{List2.length}}</text> 条收益记录</text>
+    <text></text>
+  </view>
+
+  <!-- 推广用户 -->
+  <block wx:if="{{AgentCategory!='ambassador'}}" wx:for="{{List2}}" wx:key="index">
+    <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
+      <view class="lineWidth720"></view>
+    </view>
+    <view class="panel4 FlexRow">
+      <view class="panel41 FlexRow">
+        <image src='{{item.AvatarUrl}}' class="product_icon_mg_70x70" />
+        <view class="panel411 FlexColumn">
+          <text class="text10">{{item.NickName}}</text>
+          <text class="text11">{{item.PayEndTime}}</text>
+        </view>
+      </view>
+      <text class="Number2">{{item.Money}}</text>
+    </view>
+  </block>
+
+  <!-- 大使用户 -->
+  <view wx:if="{{AgentCategory=='ambassador'}}" style="width: 100%;" wx:for="{{List2}}" wx:key="index" class="panelItem0 FlexColumn">
+    <view class="nullLine" wx:if="{{index>0}}"></view>
+    <view class="panelItem2 panelItem FlexRow">
+      <image src='{{item.IntroducerAvatarUrl}}' class="avatar2" />
+      <view class="text9">{{item.IntroducerNickName}} 的推荐</view>
+    </view>
+
+    <view class="lineWidthAll FlexRow">
+      <view class="lineWidth750"></view>
+    </view>
+
+    <block wx:for="{{item.List}}" wx:key="indexChild" wx:for-item="itemChild" wx:for-index="indexChild">
+      <view class="lineWidthAll FlexRow" wx:if="{{indexChild>0}}">
+        <view class="lineWidth720"></view>
+      </view>
+      <view class="panel4 FlexRow">
+        <view class="panel41 FlexRow">
+          <image src='{{itemChild.AvatarUrl}}' class="product_icon_mg_70x70" />
+          <view class="panel411 FlexColumn">
+            <text class="text10">{{itemChild.NickName}}</text>
+            <text class="text11">{{itemChild.PayEndTime}}</text>
+          </view>
+        </view>
+        <text class="Number2">{{itemChild.Money}}</text>
+      </view>
+    </block>
+  </view>
+  <view style="height:100rpx;"></view>
+
+
+</view>

pages_agent/main/earnings_apply.wxss

@@ -0,0 +1,195 @@
+.panel1{
+  width:711rpx;
+  margin-top: 60rpx;
+  background-color: #fff;
+  border-radius: 20rpx;
+}
+
+.text1{
+  font-size: 36rpx;
+  margin-top: 40rpx;
+  color:#4D4D4D;
+}
+
+.text2{
+  font-size: 64rpx;
+  margin-top: 10rpx;
+  color:#4D4D4D;
+  font-family: 'Roboto-Black';
+}
+
+.text3{
+  font-size: 28rpx;
+  color:#4D4D4D;
+  margin-bottom: 30rpx;
+}
+.line{
+  width:650rpx;
+  height:1rpx;
+  background-color: #e3e3e3;
+}
+.panel11{
+  width:100%;
+  justify-content: flex-start;
+}
+
+.panel111{
+  margin: 30rpx 0 0 0;
+  width:650rpx;
+  justify-content: flex-start;
+}
+.panel112{
+  margin: 20rpx 0 0 0;
+  width:650rpx;
+  justify-content: flex-start;
+}
+.panel113{
+  margin: 20rpx 0 30rpx 0;
+  width:650rpx;
+  justify-content: flex-start;
+}
+
+.text4{
+  font-size: 24rpx;
+  color:#787878;
+  font-weight: 400;
+}
+.text5{
+  font-size: 24rpx;
+  color:#4D4D4D;
+  margin-left: 30rpx;
+}
+
+.panel12{
+  width:100%;
+  height: 100rpx;
+}
+
+.text6{
+  font-size: 28rpx;
+  color: #1e1e1e;
+  margin-left: 30rpx;
+  font-weight: 400;
+}
+.line2{
+  width:100%;
+  height:1rpx;
+  background-color: #e3e3e3;
+}
+
+.Arrow{
+  width:16rpx;
+  height:26rpx;
+  margin-right: 30rpx;
+}
+
+.panel21{
+  width:100%;
+  height:93rpx;
+  justify-content: space-between;
+  font-size:24rpx;
+}
+
+.text7{
+  font-size: 24rpx;
+  color: #787878;
+  margin-left: 30rpx;
+  font-weight: 400;
+}
+.text8{
+  font-size: 24rpx;
+  color: #4d4d4d;
+  margin-right: 30rpx;
+}
+
+.panel22{
+  justify-content: space-between;
+}
+
+
+.panel3{
+  width: 100%;
+  justify-content: space-between;
+  margin: 60rpx 0 30rpx 0;
+}
+
+.text9{
+  margin-left: 30rpx;
+  font-size: 32rpx;
+  color:#4D4D4D;
+}
+.Number1{
+  font-family: 'Roboto-Black';
+  font-size:36rpx;
+  color:#4D4D4D;
+}
+
+.product_icon_mg_70x70{
+  width:80rpx;
+  height:80rpx;
+  border-radius: 20rpx;
+}
+
+
+.panel4{
+  width: 100%;
+  justify-content: space-between;
+  height:140rpx;
+  background-color: #fff;
+}
+
+.panel41{
+  margin-left:30rpx;
+}
+.panel411{
+  margin-left:20rpx;
+  align-items: flex-start;
+}
+
+.text10{
+  color:#4D4D4D;
+  font-size:28rpx;
+  font-weight: 400;
+}
+
+.text11{
+  color:#9B9B9B;
+  font-size:20rpx;
+}
+
+.Number2{
+  font-family: 'Roboto-Black';
+  font-size:28rpx;
+  color:#4D4D4D;
+  margin-right: 30rpx;
+}
+.Number3{
+  color:#FE6659; 
+}
+
+
+.nullLine{
+  width:100%;
+  height:20rpx;
+  background-color: #f2f2f2;
+}
+
+.panelItem2{
+  justify-content: flex-start;
+  height:111rpx;
+  width:100%;
+  background-color: #fff;
+}
+
+.avatar2{
+  width:50rpx;
+  height:50rpx;
+  border-radius: 50%;
+  margin-left: 30rpx;
+}
+
+.text9{
+  font-size: 24rpx;
+  margin-left: 20rpx;
+  color:#4D4D4D;
+}

pages_agent/main/earnings_list.js

@@ -0,0 +1,42 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    
+  },
+  onLoad: function (options) {
+    var that = this;
+    
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      AgentCategory:options.AgentCategory,
+    });
+
+    that.init();
+  },
+  init:function(){
+    var that = this;
+    var list=app.globalData.EarningsList.List1;
+    if (that.data.AgentCategory=="ambassador")
+      list=app.globalData.EarningsList.List2;
+    that.setData({
+      List: list,
+    });
+  },
+  goto: function (e) {
+    var url = e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages_agent/main/earnings_list.wxml

@@ -0,0 +1,25 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <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="text3">到帐金额</view>
+    <view class="line"></view>
+    <view class="panel11 FlexColumn">
+      <view class="panel111 FlexRow">
+        <view class="text4">申请单号</view>
+        <view class="text5">{{item.ID}}</view>
+      </view>
+      <view class="panel112 FlexRow">
+        <view class="text4">申请时间</view>
+        <view class="text5">{{item.ApplyTime}}</view>
+      </view>
+    </view>
+    <view class="line2"></view>
+    <view class="panel12 FlexRow" bindtap='goto' data-url="earnings_apply?RecordID={{item.ID}}&AgentCategory={{AgentCategory}}">
+      <view class="text6">查看申请单详情</view>
+      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
+  <view style="height:100rpx;"></view>
+</view>

pages_agent/promotion/earnings_list.wxss

@@ -68,7 +68,7 @@
 
 .text6{
   font-size: 28rpx;
-  columns: #1e1e1e;
+  color: #1e1e1e;
   margin-left: 30rpx;
   font-weight: 400;
 }

pages_agent/main/index.js

@@ -5,19 +5,88 @@ const app = getApp();
 
 Page({
   data: {
-    
+
   },
   onLoad: function (options) {
     var that = this;
-    
+
     that.setData({
       Containnerheight: main.getWindowHeight(),
     });
+
+    that.getUserInfo(); 
+  },
+  //得到用户信息
+  getUserInfo: function () {
+    var that = this
+    //调用登录接口
+    wx.login({
+      success: function (res0) {
+        app.globalData.userInfo = {};
+        app.globalData.userInfo.Code = res0.code;
+        console.log("Time2:" + new Date().getTime());
+        app.globalData.userInfo.nickName = "陌生用户";
+        app.globalData.userInfo.language = "";
+        app.globalData.userInfo.gender = "0";
+        app.globalData.userInfo.city = "";
+        app.globalData.userInfo.province = "";
+        app.globalData.userInfo.country = "";
+        app.globalData.userInfo.avatarUrl = "../../pages/images/universalpic_face_default_blue_120x120.png";
+        that.login(app.globalData.userInfo);
+      },
+      fail: function () {}
+    });
   },
-  goto:function(){
-      wx.navigateTo({
-        url: '../other/paycustom',
+
+  login: function (param) {
+    var that = this;
+    main.getLocalHost(function () {
+      main.postData('MiaoguoLogin?IsPromotion=true', {
+        Code: param.Code,
+        NickName: param.nickName,
+        Language: param.language,
+        Gender: param.gender,
+        City: param.city,
+        Province: param.province,
+        Country: param.country,
+        AvatarUrl: param.avatarUrl,
+        Introducer: app.globalData.introducer,
+        UserSource: app.globalData.userSource,
+        SourceID: app.globalData.SourceID,
+        LastUserSource: app.globalData.userSource,
+        Brand: app.globalData.systemInfo.brand,
+        Model: app.globalData.systemInfo.model,
+        PixelRatio: app.globalData.systemInfo.pixelRatio,
+        ScreenWidth: app.globalData.systemInfo.screenWidth,
+        ScreenHeight: app.globalData.systemInfo.screenHeight,
+        WindowWidth: app.globalData.systemInfo.windowWidth,
+        WindowHeight: app.globalData.systemInfo.windowHeight,
+        WXLanguage: app.globalData.systemInfo.language,
+        WXVersion: app.globalData.systemInfo.version,
+        System: app.globalData.systemInfo.system,
+        Platform: app.globalData.systemInfo.platform,
+        SDKVersion: app.globalData.systemInfo.SDKVersion,
+        ProgramVersion: app.globalData.Version,
+      }, function (data) {
+        console.log("Time4:" + new Date().getTime());
+        if (!data) {
+          timeout3 = setTimeout(function () {
+            that.getUserInfo();
+            console.log("reboot:" + new Date().getTime());
+          }, 2000);
+        } else {
+          app.globalData.userInfo = data;
+          //console.log(data);          
+        }
       });
+    });
+  },
+
+  goto: function (e) {
+    var url = e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
   },
   onShareAppMessage: function () {
     return {
@@ -26,4 +95,4 @@ Page({
       imageUrl: app.globalData.ShareImage,
     }
   },
-})
+})

pages_agent/main/index.wxml

@@ -1,6 +1,6 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelHeight"></view>
-  <view class="panel1 FlexRow" bindtap='goto'>
+  <view class="panel1 FlexRow" bindtap='goto' data-url="user_index?AgentCategory=promotion">
     <view class="panel11 FlexRow">
       <image src='../../pages/images/product_icon_mg_70x70.png' class="product_icon_mg_70x70" />
       <view class="panel111">秒过推广计划</view>
@@ -9,7 +9,7 @@
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
-  <view class="panel1 FlexRow" bindtap='goto'>
+  <view class="panel1 FlexRow" bindtap='goto' data-url="user_index?AgentCategory=ambassador">
     <view class="panel11 FlexRow">
       <image src='../../pages/images/product_icon_mg_70x70.png' class="product_icon_mg_70x70" />
       <view class="panel111">秒过大使计划</view>

pages_agent/main/message.js

@@ -14,6 +14,12 @@ Page({
       Containnerheight: main.getWindowHeight(),
     });
   },
+  goto: function (e) {
+    var url = e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages_agent/main/message.wxml

@@ -1,6 +1,6 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelHeight"></view>
-  <view class="panel1 FlexRow" bindtap='goto'>
+  <view class="panel1 FlexRow" bindtap='goto' data-url="message_info">
     <view class="panel11 FlexColumn">
       <view class="panel110"></view>
       <view class="panel111">新消息未读</view>
@@ -12,7 +12,7 @@
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
-  <view class="panel1 FlexRow" bindtap='goto'>
+  <view class="panel1 FlexRow" bindtap='goto' data-url="message_info">
     <view class="panel11 FlexColumn">
       <view class="panel110"></view>
       <view class="panel111">新消息未读</view>
@@ -24,7 +24,7 @@
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
-  <view class="panel1 FlexRow" bindtap='goto'>
+  <view class="panel1 FlexRow" bindtap='goto' data-url="message_info">
     <view class="panel11 FlexColumn">
       <view class="panel110"></view>
       <view class="panel112_2 panel112">财务通知</view>

pages_agent/main/other_list.js

@@ -0,0 +1,88 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    
+  },
+  onLoad: function (options) {
+    var that = this;
+    
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      ListType:options.ListType,
+      AgentCategory:options.AgentCategory,
+      IsWithdraw:false,
+      IsPromotion:false,
+      User:app.globalData.userInfo,
+    });
+
+    wx.setNavigationBarTitle({
+      title: that.data.ListType
+    });
+
+    this.getList();
+  },
+  getList:function(e){
+    var that = this;
+
+    var url="";
+    if (that.data.ListType=="近期报名"){
+      that.setData({
+        Info: app.globalData.NewUserApplyArray,
+        Len:app.globalData.NewUserApplyArray.List.length,
+      });
+    }
+    else if (that.data.ListType=="预估新增收益"){
+      that.setData({
+        Info: app.globalData.EstimatedNewRevenue,
+        Len:app.globalData.EstimatedNewRevenue.Length,
+        Total:"0",
+      });
+    }
+    else if (that.data.ListType=="可提现收益"){
+      that.setData({
+        Info: app.globalData.WithdrawableEarnings,
+        Len:app.globalData.WithdrawableEarnings.Length,
+        Total:app.globalData.WithdrawableEarnings.Total,
+      });
+    }
+    else{
+      if (that.data.ListType=="退款记录")
+        url="GetRefundList?AgentCategory="+that.data.AgentCategory;
+      else if (that.data.ListType=="未续费记录")
+        url="GetIntroducerUserList2?ListType="+that.data.ListType;
+      else if (that.data.ListType=="报名步骤没做完")
+        url="GetIntroducerUserList2?ListType="+that.data.ListType;
+      
+      url+="&UserID=" + app.globalData.userInfo.UserID;
+
+      main.getData(url, function (data) {
+        wx.hideLoading();
+        if (data) {
+          that.setData({
+            Info: data,
+            Len:data.List.length,
+          });
+        }
+      });
+    }
+  },
+  showWithdraw:function(e){
+    this.setData({
+      IsWithdraw:!this.data.IsWithdraw,
+    });
+  },
+  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/other_list.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "其他记录",
+  "backgroundColor": "#F2F2F2"
+}

pages_agent/main/other_list.wxml

@@ -0,0 +1,133 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+
+  <view class="panel1 FlexColumn" wx:if="{{Info.Description}}">
+    <view class="panel11 FlexColumn">
+      <text class="text1">{{Info.Description}}</text>
+    </view>
+    <view class="panel12 FlexRow" bindtap="goto" data-url="{{Info.ReadmeUrl}}" wx:if="{{Info.Readme}}">
+      <view class="text2">{{Info.Readme}}</view>
+      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
+  <view class="panel2 FlexRow">
+    <text class="text3"><text class="Number1">{{Len}}</text> 条记录</text>
+    <text class="text8" wx:if="{{Total>0}}">收益 <text class="Number1">{{Total}}</text></text>
+    <text wx:if="{{Total==0}}"></text>
+  </view>
+  <view class="panel3 FlexRow">
+    <!-- 推广用户 -->
+    <block wx:if="{{AgentCategory=='promotion'}}" wx:for="{{Info.List}}" 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='{{item.AvatarUrl}}' class="avatar" />
+          <view class="panelItem1 FlexColumn">
+            <view class="text4">{{item.NickName}}</view>
+            <view class="text5">{{item.Remark}}</view>
+          </view>
+        </view>
+        <view class="Right FlexColumn">
+          <view class="Number2" wx:if="{{item.Money}}">{{item.Money}}</view>
+          <view class="text6" wx:if="{{item.Remark2}}">{{item.Remark2}}</view>
+          <view class="text7" wx:if="{{item.Remark3}}">{{item.Remark3}}</view>
+        </view>
+      </view>
+    </block>
+    <!-- 大使用户 -->
+    <view wx:if="{{AgentCategory=='ambassador' && Len>0}}" wx:for="{{Info.List}}" wx:key="*this" class="panelItem0 FlexColumn">
+      <view class="nullLine" wx:if="{{index>0}}"></view>
+      <view class="panelItem2 panelItem FlexRow">
+        <image src='{{item.IntroducerAvatarUrl}}' class="avatar2" />
+        <view class="text9">{{item.IntroducerNickName}} 的推荐</view>
+      </view>
+      <view class="lineWidthAll FlexRow">
+        <view class="lineWidth750"></view>
+      </view>
+      <block wx:for="{{item.List}}" wx:key="indexChild" wx:for-item="itemChild" wx:for-index="indexChild">
+        <view class="lineWidthAll FlexRow" wx:if="{{indexChild>0}}">
+          <view class="lineWidth720"></view>
+        </view>
+        <view class="panelItem FlexRow">
+          <view class="Left FlexRow">
+            <image src='{{itemChild.AvatarUrl}}' class="avatar" />
+            <view class="panelItem1 FlexColumn">
+              <view class="text4">{{itemChild.NickName}}</view>
+              <view class="text5">{{itemChild.Remark}}</view>
+            </view>
+          </view>
+          <view class="Right FlexColumn">
+            <view class="Number2" wx:if="{{itemChild.Money}}">{{itemChild.Money}}</view>
+            <view class="text6" wx:if="{{itemChild.Remark2}}">{{itemChild.Remark2}}</view>
+            <view class="text7" wx:if="{{itemChild.Remark3}}">{{itemChild.Remark3}}</view>
+          </view>
+        </view>
+      </block>
+
+    </view>
+  </view>
+  <view style="height:150rpx;"></view>
+  <view class="panelBottom FlexColumn" wx:if="{{ListType=='可提现收益' && Len>0}}" bindtap="showWithdraw">
+    <view class="btn">申请提现</view>
+  </view>
+</view>
+
+<view wx:if="{{IsWithdraw}}" 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">{{Total}}</view>
+        <view class="text53">提现金额</view>
+      </view>
+      <view class="panel511 FlexColumn">
+        <view class="text52">{{Total}}</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">0</view>
+    </view>
+    <view class="panel53 FlexRow">
+      <view class="text54">微信支付平台交易手续费</view>
+      <view class="text54">{{User.WXServiceCharge}}</view>
+    </view>
+    <view class="lineWidthAll FlexRow">
+      <view class="lineWidth680"></view>
+    </view>
+    <view class="panel53 FlexRow">
+      <view class="text54">代缴个人所得税</view>
+      <view class="text54">{{User.IndividualIncomeTax}}</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">{{User.WXAccount}}</view>
+    </view>
+    <view class="lineWidthAll FlexRow">
+      <view class="lineWidth680"></view>
+    </view>
+    <view class="panel53 FlexRow">
+      <view class="text54">收款人帐号真实姓名</view>
+      <view class="text54">{{User.RealName}}</view>
+    </view>
+    <view class="btn2">确认</view>
+
+  </view>
+  <view class="btnCancel" bindtap="showWithdraw">取消</view>
+
+</view>

pages_agent/main/other_list.wxss

@@ -0,0 +1,311 @@
+.panelTop{
+  position: fixed;
+  top:0;
+  width:100%;
+  background-color: #fff;
+}
+
+.panelTop1{
+  width:400rpx;
+  height:100rpx;
+  justify-content: flex-end;
+}
+
+.panelTop2{
+  width:200rpx;
+}
+
+.panelTop3{
+  width:150rpx;
+  justify-content: center;
+}
+
+.text0{
+  font-size: 36rpx;
+}
+.line1{
+  width:144rpx;
+  height:10rpx;
+  background-color: #fff;
+  margin-top:10rpx;
+}
+.selectItem{
+  color: #5282FA;
+}
+.selectItemBG{
+  background-color: #5282FA;
+}
+
+.universalpic_magnifier_black_30x30{
+  width:30rpx;
+  height:30rpx;
+  margin-top: 15rpx;
+}
+
+.panel1{
+  width:710rpx;
+  margin: 60rpx 0 0 0;
+  background-color: #fff;
+  border-radius: 20rpx;
+}
+
+.panel11{
+  width:100%;
+  font-size: 22rpx;
+  font-weight: 400;
+  min-height: 178rpx;
+  justify-content: flex-start;
+}
+
+.text1{
+  margin: 30rpx 0;
+  width:650rpx;
+  line-height: 42rpx;
+}
+
+.panel12{
+  width:100%;
+  height: 100rpx;
+  justify-content: space-between;
+
+  border-top:1rpx solid #e3e3e3;
+}
+
+.text2{
+  font-size: 28rpx;
+  font-weight: 400;
+  margin-left: 30rpx;
+}
+
+.Arrow{
+  width:16rpx;
+  height:26rpx;
+  margin-right: 30rpx;
+}
+
+
+.panel2{
+  width: 100%;
+  justify-content: space-between;
+  margin: 60rpx 0 30rpx 0;
+}
+
+.text3{
+  margin-left: 30rpx;
+  font-size: 36rpx;
+  color:#4D4D4D;
+}
+.Number1{
+  font-family: 'Roboto-Black';
+  font-size:36rpx;
+  color:#4D4D4D;
+}
+
+.panel3{
+  width:100%;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  align-items: flex-start;
+  background-color: #fff;
+}
+
+.nullLine{
+  width:100%;
+  height:20rpx;
+  background-color: #f2f2f2;
+}
+
+.panelItem{
+  width: 100%;
+  height:141rpx;
+  justify-content: space-between;
+}
+.panelItem0{
+  width:100%;
+}
+
+.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;
+}
+
+.text5{
+  font-size: 20rpx;
+  color:#9B9B9B;
+}
+.text7{
+  font-size: 20rpx;
+  color:#9B9B9B;
+  margin-top: 6rpx;
+}
+.Right{
+  margin-right: 30rpx;
+  align-items: flex-end;
+  height:141rpx;
+}
+.text6{
+  font-size: 24rpx;
+  color:#4D4D4D;
+}
+.footer{
+  width:100%;
+  height:232rpx;
+  background-color: #fff;
+}
+
+.text8{
+  margin-right: 30rpx;
+  font-size: 32rpx;
+  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;
+  z-index: 10;
+}
+
+.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;
+}
+
+.universalpic_exclamation_orange_40x40{
+  width:40rpx;
+  height:40rpx;
+  margin-left: 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;
+}

pages_agent/main/result_list.js

@@ -0,0 +1,69 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    IsPromotion:false,
+    SelectMenuCss1:"selectItem",
+    SelectMenuCss2:"",
+  },
+  onLoad: function (options) {
+    var that = this;
+    var isPromotion=false;
+    if (options.AgentCategory=="promotion"){
+      isPromotion=true;
+    }
+
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      IsPromotion:isPromotion,
+      ListType:options.ListType,
+    });
+
+    wx.setNavigationBarTitle({
+      title: that.data.ListType
+    });
+
+    this.getList();
+  },
+  getList:function(e){
+    var that = this;
+
+    var url="";
+    url="GetIntroducerUserList2?ListType="+that.data.ListType;
+    url+="&UserID=" + app.globalData.userInfo.UserID;
+
+    main.getData(url, function (data) {
+      wx.hideLoading();
+      if (data) {
+        that.setData({
+          Info:data,
+        });
+      }
+    });
+  },
+  onPullDownRefresh: function () {
+    wx.stopPullDownRefresh();
+  },
+  onMenu:function(e){
+    var id=e.currentTarget.dataset.id;
+    var SelectMenuCss1="",SelectMenuCss2="";
+    if (id==1)
+      SelectMenuCss1="selectItem";
+    else if (id==2)
+      SelectMenuCss2="selectItem";
+    this.setData({
+      SelectMenuCss1:SelectMenuCss1,
+      SelectMenuCss2:SelectMenuCss2,
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages_agent/main/result_list.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "成果记录",
+  "backgroundColor": "#F2F2F2"
+}

pages_agent/main/result_list.wxml

@@ -0,0 +1,40 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <block wx:if="{{!IsPromotion}}">
+    <view class="panelTop FlexRow">
+      <view class="panelTop1 FlexColumn" catchtap="onMenu" data-id="1">
+        <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">
+        <image src='../../pages/images/universalpic_magnifier_black_30x30.png' class="universalpic_magnifier_black_30x30" />
+      </view>
+    </view>
+    <view style="height:100rpx;"></view>
+  </block>
+
+
+  <view class="panel1 FlexColumn">
+    <view class="panel11 FlexColumn">
+      <text class="text1">{{Info.Description}}</text>
+    </view>
+    <view class="panel12 FlexRow"  wx:if="{{!IsPromotion}}">
+      <view class="text2">大使工作规则</view>
+      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
+  <view class="panel2 FlexRow">
+    <text class="text3"><text class="Number1">{{Info.List.length}}</text> 条记录</text>
+    <text></text>
+  </view>
+  <view class="panel3 FlexRow">
+    <view class="panel31 FlexColumn" wx:for="{{Info.List}}" wx:key="*this">
+      <image src='{{item.AvatarUrl}}' class="product_icon_mg_70x70" />
+      <view class="text4">{{item.NickName}}</view>
+    </view>
+  </view>
+  <view class="footer"></view>
+</view>

pages_agent/main/result_list.wxss

@@ -0,0 +1,136 @@
+.panelTop{
+  position: fixed;
+  top:0;
+  width:100%;
+  background-color: #fff;
+}
+
+.panelTop1{
+  width:400rpx;
+  height:100rpx;
+  justify-content: flex-end;
+}
+
+.panelTop2{
+  width:200rpx;
+}
+
+.panelTop3{
+  width:150rpx;
+  justify-content: center;
+}
+
+.text0{
+  font-size: 36rpx;
+}
+.line1{
+  width:144rpx;
+  height:10rpx;
+  background-color: #fff;
+  margin-top:10rpx;
+}
+.selectItem{
+  color: #5282FA;
+}
+.selectItemBG{
+  background-color: #5282FA;
+}
+
+.universalpic_magnifier_black_30x30{
+  width:30rpx;
+  height:30rpx;
+  margin-top: 15rpx;
+}
+
+.panel1{
+  width:710rpx;
+  margin: 60rpx 0 0 0;
+  background-color: #fff;
+  border-radius: 20rpx;
+}
+
+.panel11{
+  width:100%;
+  font-size: 22rpx;
+  font-weight: 400;
+  min-height: 178rpx;
+  justify-content: flex-start;
+}
+
+.text1{
+  margin-top: 30rpx;
+  width:650rpx;
+}
+
+.panel12{
+  width:100%;
+  height: 100rpx;
+  justify-content: space-between;
+
+  border-top:1rpx solid #e3e3e3;
+}
+
+.text2{
+  font-size: 28rpx;
+  font-weight: 400;
+  margin-left: 30rpx;
+}
+
+.Arrow{
+  width:16rpx;
+  height:26rpx;
+  margin-right: 30rpx;
+}
+
+
+.panel2{
+  width: 100%;
+  justify-content: space-between;
+  margin: 60rpx 0 30rpx 0;
+}
+
+.text3{
+  margin-left: 30rpx;
+  font-size: 36rpx;
+  color:#4D4D4D;
+}
+.Number1{
+  font-family: 'Roboto-Black';
+  font-size:36rpx;
+  color:#4D4D4D;
+}
+
+.panel3{
+  width:100%;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  align-items: flex-start;
+  background-color: #fff;
+}
+
+.panel31{
+  width:150rpx;
+  min-height:168rpx;
+  justify-content: flex-start;
+}
+
+.product_icon_mg_70x70{
+  width:80rpx;
+  height:80rpx;
+  border-radius: 20rpx;
+  margin-top: 30rpx;
+}
+
+.text4{
+  width:110rpx;
+  font-size:20rpx;
+  font-weight: 400;
+  text-align: center;
+  margin-top:20rpx;
+}
+
+.footer{
+  width:100%;
+  height:232rpx;
+  background-color: #fff;
+}

pages_agent/promotion/earnings.js

@@ -5,7 +5,7 @@ const app = getApp();
 
 Page({
   data: {
-    
+    IsList:true,
   },
   onLoad: function (options) {
     var that = this;
@@ -13,6 +13,9 @@ Page({
     that.setData({
       Containnerheight: main.getWindowHeight(),
     });
+
+    common.getStorageValue(that, "SearchTextList", [], function () {});
+  
   },
   onPullDownRefresh: function () {
     wx.stopPullDownRefresh();

pages_agent/main/search_user.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "搜队员",
+  "backgroundColor": "#F2F2F2"
+}

pages_agent/main/search_user.wxml

@@ -0,0 +1,68 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelTop FlexRow">
+    <view class="panelLeft FlexRow">
+      <view class="panelTopSearch FlexRow">
+        <image class="universalpic_magnifier_gray_30x30" src='../../pages/images/universalpic_magnifier_gray_30x30.png' />
+        <input class='input' always-embed="true" maxlength='50' focus='{{Focus}}' bindinput="onKeyInput" bindblur="onBindblur" value="{{SearchInfo}}" placeholder="输入微信名字(不支付表情和微信号)" confirm-type="search" bindconfirm="onSearch" bindfocus="onFocus" />
+
+        <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' />
+          </view>
+        </view>
+
+      </view>
+    </view>
+    <view class="panelRight FlexRow">
+      <view class='panelTop1 FlexRow' bindtap="close">
+        <view class="panelTop3">取消</view>
+      </view>
+    </view>
+  </view>
+  <view class="panelTopNull"></view>
+  <block wx:if="{{!IsList}}">
+    <view class="panel1 FlexColumn">
+      <view class="panel11 FlexRow">
+        <view class="panel11Left">
+          搜过的内容
+        </view>
+        <view class="panel11Right FlexRow" bindtap='deleteItem'>
+          <image class="universalpic_dustbin_black_24x30" src='../../pages/images/universalpic_dustbin_black_24x30.png' />
+        </view>
+      </view>
+    </view>
+    <view class="lineWidthAll FlexRow">
+      <view class="lineWidth720"></view>
+    </view>
+    <view class='panelItemSearch0 FlexRow'>
+      <scroll-view wx:if="{{SearchTextList.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>
+      </scroll-view>
+
+      <view class="panelItemSearchNull" wx:if="{{SearchTextList.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="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>
+        </view>
+        <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
+      </view>
+    </view>
+  </block>
+
+</view>

pages_agent/main/search_user.wxss

@@ -0,0 +1,350 @@
+.container{
+  background-color: #fff;
+}
+.panelTop {
+  width: 100%;
+  height:100rpx;
+  background-color: #fff;
+  justify-content: space-between;
+  position: fixed;
+  top:0;
+}
+.panelTopNull {
+  width: 100%;
+  height:100rpx;
+}
+
+
+.panelLeft {
+  margin-left: 20rpx;
+  justify-content: flex-start;
+}
+.panelRight {
+  margin-right: 20rpx;
+  justify-content: flex-end;
+}
+
+.panelTopSearch{
+  width:600rpx;
+  height:70rpx;
+  background-color: #F2F2F2;
+  border-radius: 14rpx;
+  justify-content: flex-start;
+  position: relative;
+}
+
+.panelItemSearchNull{
+  margin: 25rpx 0 40rpx 30rpx;
+  font-size: 24rpx;
+  color:#787878;
+}
+
+.universalpic_magnifier_gray_30x30{
+  width:30rpx;
+  height:30rpx;
+  margin-left: 30rpx;
+}
+.panelTopSearchText{
+  font-size: 28rpx;
+  font-weight: 400;
+  margin-left: 20rpx;
+}
+.input{
+  margin-left: 20rpx;
+  font-size:28rpx;
+  font-weight: 400;
+  width:450rpx;
+  height:30rpx;
+}
+
+.clearData{
+  width:80rpx;
+  height:70rpx;
+  position: absolute;
+  top:0rpx;
+  right:0rpx;
+}
+
+.clearData0{
+  width:40rpx;
+  height:40rpx;
+  border-radius: 50%;
+  background-color: #D2D2D2;
+}
+
+.universalpic_close_black_16x16{
+  width:16rpx;
+  height:16rpx;
+}
+
+.panelTop1 {
+  width:80rpx;
+  height:80rpx;
+
+  font-size: 28rpx;
+  font-weight: 400;
+}
+.panelTop3 {
+  font-size: 28rpx;
+  font-weight: 500;
+}
+
+.panel1{
+  width:100%;
+  margin-top: 60rpx;
+  background-color: #fff;
+}
+
+.panel11{
+  width:100%;
+  justify-content: space-between;
+  margin-bottom: 15rpx;
+}
+
+.panel10{
+  margin-top: 40rpx;
+  margin-bottom: 30rpx;
+}
+
+.panel11Left{
+  margin-left: 30rpx;
+  font-size:32rpx;
+  align-items: flex-start;
+  color:#4D4D4D;
+}
+
+.panel111{
+  font-size:20rpx;
+  color:#787878;
+}
+
+.panel11Right{
+  width:80rpx;
+  height:80rpx;
+}
+
+.universalpic_dustbin_black_24x30{
+  width:24rpx;
+  height:30rpx;
+}
+
+.panelItemSearch0 {
+  width: 100%;
+  justify-content: flex-start;
+  font-size: 24rpx;
+  background-color: #fff;
+  flex-wrap: wrap;
+}
+
+.panelBtnSmall {
+  z-index: 10;
+  width:100%;
+  background-color: #fff;
+  display: flex;
+  white-space: nowrap;
+}
+
+.panelBtnSmall .btn0 {
+  width: 10rpx;
+  display: inline-block;
+  margin-right: 20rpx;
+}
+
+.panelBtnSmall .btn {
+  background-color: #fff;
+  border: 2rpx solid #E3E3E3;
+  color: #1e1e1e;
+  border-radius: 10rpx;
+  text-align: center;
+  line-height: 69rpx;
+  height: 69rpx;
+  margin-top: 30rpx;
+  margin-right: 20rpx;
+  padding: 0 20rpx;
+  font-size: 24rpx;
+  display: inline-block;
+}
+
+.panelNull{
+  width: 100%;
+  margin-top:180rpx;
+}
+
+.universalpic_card_none_gray_90x84{
+  width:90rpx;
+  height:84rpx;
+  margin-bottom: 30rpx;
+}
+
+.panelNullText{
+  color:#4D4D4D;
+  font-size: 32rpx;
+}
+
+.panelAdd{
+  width:360rpx;
+  height:100rpx;
+  border:2rpx solid #E3E3E3;
+  border-radius: 10rpx;
+  margin: 60rpx 0 180rpx 0;
+}
+
+.universalpic_add_black_30x30{
+  width:30rpx;
+  height: 30rpx;
+  margin-left: 10rpx;
+}
+
+.panelAddText{
+  font-size: 28rpx;
+  font-weight: 400;
+  margin-left: 20rpx;
+}
+
+.universalpic_indicator_right_gray{
+  width:16rpx;
+  height:26rpx;
+  margin-right: 30rpx;
+}
+
+.panelSearching{
+  width:100%;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+.panelSearching1{
+  font-size:28rpx;
+  color:#787878;
+  margin: 16rpx 0 0 30rpx;
+}
+
+.panelSearchNull{
+  width:100%;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+.panelSearchNull1{
+  font-size:28rpx;
+  color:#4D4D4D;
+  margin: 16rpx 0 0 30rpx;
+}
+.panelSearchNull2{
+  font-size:20rpx;
+  color:#787878;
+  margin: 4rpx 0 0 30rpx;
+}
+
+.panelSearchData{
+  width:690rpx;
+  justify-content: flex-start;
+  margin: 30rpx 0 0 30rpx;
+  align-items: flex-start;
+}
+
+.panelSearchDataImage{
+  width:100rpx;
+  height:116rpx;
+  border-radius: 6rpx;
+}
+
+.panelSearchDataImageZ{
+  background-color: #FFE6DB;
+}
+
+.panelSearchDataImageC{
+  background-color: #F7EFBE;
+}
+.panelSearchDataImageS{
+  background-color: #EDDDFF;
+}
+
+.panelSearchDataImageD{
+  background-color: #C9EFF9;
+}
+
+
+.universalpic_dictionary_ciyu_black_55x23{
+  width:55rpx;
+  height:23rpx;
+}
+.universalpic_dictionary_hanzi_black_54x26{
+  width:54rpx;
+  height:26rpx;
+}
+.universalpic_dictionary_shici_black_53x27{
+  width:53rpx;
+  height:27rpx;
+}
+.universalpic_dictionary_danci_black_53x28{
+  width:53rpx;
+  height:28rpx;
+}
+
+.panelSearchData1{
+  width:560rpx;
+  align-items: flex-start;
+  margin-left: 30rpx;
+  border-bottom: 1rpx solid #E3E3E3;
+}
+
+.panelSearchDataText1{
+  width: 520rpx;
+  font-size: 30rpx;
+}
+
+.panelSearchDataText2{
+  width: 520rpx;
+  font-size: 22rpx;
+  font-weight: 400;
+  margin: 8rpx 0;
+}
+
+.panelSearchDataText3{
+  width: 520rpx;
+  font-size: 20rpx;
+  color:#787878;
+  margin-bottom: 30rpx;
+}
+
+.panelHeight60{
+  width:100%;
+  height:60rpx;
+}
+
+.panel2{
+  width:100%;
+  background-color: #f2f2f2;
+  justify-content: flex-start;
+  padding-top:60rpx;
+}
+
+.panelItem{
+  width:710rpx;
+  height:110rpx;
+  border-radius: 20rpx;
+  background-color: #fff;
+  justify-content: space-between;
+  margin-bottom: 30rpx;
+}
+
+.avatar{
+  width:50rpx;
+  height:50rpx;
+  border-radius: 20rpx;
+  margin-left:30rpx;
+}
+
+.panelItem1{
+  font-size: 28rpx;
+  font-weight: 400;
+  color:#4D4D4D;
+  margin-left: 20rpx;
+}
+
+.Arrow{
+  width:16rpx;
+  height:26rpx;
+  margin-right: 30rpx;
+}

pages_agent/main/user_index.js

@@ -0,0 +1,130 @@
+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 = false;
+    var title = "秒过大使计划";
+    var backColor = "#FFB808";
+    var frontColor = "#000000";
+    var frontColor2 = "#2e2e2e";
+    if (options.AgentCategory == "promotion") {
+      isPromotion = true;
+      title = "秒过推广计划";
+      backColor = "#FC7406";
+      frontColor = "#ffffff";
+      frontColor2 = "#ffffff";
+    }
+
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      IsPromotion: isPromotion,
+      BackColor: backColor,
+      User: app.globalData.userInfo,
+      AgentCategory: options.AgentCategory,
+      FrontColor: frontColor2,
+    });
+
+    wx.setNavigationBarTitle({
+      title: title
+    });
+    wx.setBackgroundColor({
+      backgroundColor: backColor,
+    });
+    wx.setNavigationBarColor({
+      backgroundColor: backColor,
+      backgroundColorTop: backColor,
+      backgroundColorBottom: backColor,
+      frontColor: frontColor,
+    });
+
+    this.init();
+
+  },
+  init: function () {
+    var that = this;
+    if (that.data.AgentCategory == "promotion") {
+      var url = "GetIntroducerUserList2?ListType=近期报名";
+      url += "&UserID=" + app.globalData.userInfo.UserID;
+
+      main.getData(url, function (data) {
+        if (data) {
+          that.setData({
+            NewUserCount: data.List.length,
+          });
+          app.globalData.NewUserApplyArray = data;
+        }
+      });
+    }
+
+    var url = "GetMiaoguoAgentRecordList?UserID=" + app.globalData.userInfo.UserID + "&AgentCategory=" + that.data.AgentCategory;
+    main.getData(url, function (data) {
+      if (data) {
+        that.setData({
+          Total: data.Total,
+          Total1: data.Total1,
+          Total2: data.Total2,
+          WithdrawableEarnings: data.WithdrawableEarnings,
+        });
+        app.globalData.EarningsList = data;
+      }
+    });
+
+    //预估新增收益
+    var url = url="GetMiaoguoEstimatedNewRevenueList?AgentCategory="+that.data.AgentCategory+"&UserID=" + app.globalData.userInfo.UserID+"&IsDue=0";
+    main.getData(url, function (data) {
+      if (data) {
+        that.setData({
+          EstimatedNewRevenueTotal: Math.round(data.Total),
+        });
+        app.globalData.EstimatedNewRevenue = data;
+      }
+    });
+    //可提现收益
+    var url = url="GetMiaoguoEstimatedNewRevenueList?AgentCategory="+that.data.AgentCategory+"&UserID=" + app.globalData.userInfo.UserID+"&IsDue=1";
+    main.getData(url, function (data) {
+      if (data) {
+        that.setData({
+          WithdrawableEarningsTotal: Math.round(data.Total),
+        });
+        app.globalData.WithdrawableEarnings = data;
+      }
+    });
+  },
+  onPullDownRefresh: function () {
+    wx.stopPullDownRefresh();
+    this.init();
+  },
+  goto: function (e) {
+    var url = e.currentTarget.dataset.url;
+    var gotoType = e.currentTarget.dataset.type;
+    if (!gotoType) {
+      wx.navigateTo({
+        url: url,
+      });
+    } else {
+      wx.redirectTo({
+        url: url,
+      })
+    }
+  },
+  gotoIndex: function () {
+    wx.reLaunch({
+      url: '../../pages/index/index',
+    })
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages_agent/main/user_index.wxml

@@ -0,0 +1,142 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;background-color: {{BackColor}};'>
+  <view class="panel0 FlexRow" wx:if="{{User.IsPromoter==1}}">
+    <view wx:if="{{IsPromotion}}" class="panel02Left panel01 FlexRow">
+      <view>直属推荐</view>
+    </view>
+    <view wx:if="{{IsPromotion}}" class="panel01 FlexRow" bindtap='goto' data-url="user_index?AgentCategory=ambassador" data-type="d">
+      <view>大使计划</view>
+    </view>
+    <view wx:if="{{!IsPromotion}}" class="panel01 FlexRow" bindtap='goto' data-url="user_index?AgentCategory=promotion" data-type="d">
+      <view>直属推荐</view>
+    </view>
+    <view wx:if="{{!IsPromotion}}" class="panel02Right panel01 FlexRow">
+      <view>大使计划</view>
+    </view>
+  </view>
+  <image src='{{User.AvatarUrl}}' class="avatar" />
+  <image wx:if="{{IsPromotion}}" src='../images/promotion_user_home_title01.png' class="promotion_user_home_title01" />
+  <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>
+  <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" />
+  </scroll-view>
+
+  <view class="panelTitle FlexRow" wx:if="{{IsPromotion}}">
+    <image src='../images/promotion_user_home_title02.png' class="promotion_user_home_title01" />
+  </view>
+  <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>
+      <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="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>
+      <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=退款记录">
+        退款记录
+      </view>
+    </view>
+  </view>
+
+  <view class="panel12 panel1 FlexRow">
+    <view class="panel112 FlexColumn" wx:if="{{!IsPromotion}}">
+      <image src='../images/promotion_index_rules.png' class="promotion_index_rules" />
+      <view class="text8">
+        大使计划规则
+      </view>
+    </view>
+    <view class="panel112 FlexColumn" wx:if="{{!IsPromotion}}">
+      <image src='../images/promotion_index_workbook.png' class="promotion_index_rules" />
+      <view class="text8">
+        大使工作手册
+      </view>
+    </view>
+    <view class="panel112 FlexColumn" wx:if="{{IsPromotion}}">
+      <image src='../images/promotion_index_rules.png' class="promotion_index_rules" />
+      <view class="text8">
+        推广计划规则
+      </view>
+    </view>
+    <view class="panel112 FlexColumn" wx:if="{{IsPromotion}}">
+      <image src='../images/promotion_index_code.png' class="promotion_index_rules" />
+      <view class="text8">
+        我的推广物料
+      </view>
+    </view>
+    <view class="panel112 FlexColumn" bindtap='goto' data-url="userinfo?AgentCategory={{AgentCategory}}">
+      <image src='../images/promotion_index_userinfo.png' class="promotion_index_rules" />
+      <view class="text8">
+        用户信息
+      </view>
+    </view>
+    <view class="panel112 FlexColumn" bindtap='goto' data-url="message">
+      <image src='../images/promotion_index_message.png' class="promotion_index_rules" />
+      <view class="text8">
+        消息中心
+      </view>
+      <view class="textMessage">新消息</view>
+    </view>
+  </view>
+
+  <block wx:if="{{IsPromotion}}">
+    <view class="panelTitle FlexRow">
+      <image src='../images/promotion_user_home_title03.png' class="promotion_user_home_title01" />
+    </view>
+    <view class="panel1 FlexColumn">
+      <view class="panel111 FlexColumn" bindtap='goto' data-url="other_list?AgentCategory=promotion&ListType=近期报名">
+        <view class="text3">{{NewUserCount}}</view>
+        <view class="text4">新报名的朋友</view>
+      </view>
+    </view>
+
+    <view class="panel3 FlexRow">
+      <view class="panel13 panel1 FlexColumn" bindtap='goto' data-url="other_list?AgentCategory=promotion&ListType=报名步骤没做完">
+        <text class="text6">别让这些朋友掉队\n在报名的路上</text>
+      </view>
+      <view class="panel14 panel1 FlexRow" bindtap='goto' data-url="other_list?AgentCategory=promotion&ListType=未续费记录">
+        <text class="text7">问问这些\n朋友为什么\n没续费</text>
+      </view>
+    </view>
+  </block>
+
+
+  <view class="textBottom FlexRow" style="color:{{FrontColor}};">
+    <view class="panel21 FlexRow" bindtap='goto' data-url="index">
+      返回活动
+    </view>
+    <view class="line2 line"></view>
+    <view class="panel21 FlexRow">
+      联系客服
+    </view>
+    <view class="line2 line"></view>
+    <view class="panel21 FlexRow" bindtap='gotoIndex'>
+      返回秒过
+    </view>
+  </view>
+</view>

pages_agent/promotion/user_index.wxss

@@ -5,64 +5,127 @@
   background-color: #FC7406;
 }
 
+.panel0{
+  width:500rpx;
+  height:110rpx;
+  margin-top: 30rpx;
+  background-color: #AB4E05;
+  border-radius: 20rpx;
+}
+
+.panel01{
+  font-size:36rpx;
+  color:#FC7406;
+  width:250rpx;
+}
+
+.panel02Left{
+  color:#fff;
+  background-color: #793703;
+  height:110rpx;
+  border-top-left-radius: 20rpx;
+  border-bottom-left-radius: 20rpx;
+}
+
+.panel02Right{
+  color:#fff;
+  background-color: #793703;
+  height:110rpx;
+  border-top-right-radius: 20rpx;
+  border-bottom-right-radius: 20rpx;
+}
+
 .avatar{
-  width:200rpx;
-  height:200rpx;
+  width:160rpx;
+  height:160rpx;
   margin-top: 60rpx;
-  border-radius: 20rpx;
+  border-radius: 50%;
 }
 
-.text1{
-  font-size:48rpx;
+.promotion_user_home_title01{
+  width:200rpx;
+  height:67rpx;
   margin-top: 30rpx;
 }
 
+.text1{
+  font-size:96rpx;
+  font-family: 'Roboto-Black';
+  color:#2E2E2E;
+}
 .text2{
-  font-size:128rpx;
+  font-size:96rpx;
   font-family: 'Roboto-Black';
 }
 
+.panelAD{
+  width:710rpx;
+  height:230rpx;
+  margin-top: 60rpx;
+  white-space: nowrap;
+}
+
+.adImage{
+  width:710rpx;
+  height:230rpx;
+  display: inline-block;
+}
+
+.panelTitle{
+  width:650rpx;
+  justify-content: flex-start;
+  margin-top: 50rpx;
+}
 
 .panel1{
   width:710rpx;
   background-color: #F2F2F2;
   border-radius: 20rpx;
   color:#4D4D4D;
-  margin: 60rpx 0 0 0;
+  margin: 30rpx 0 0 0;
   justify-content: flex-start;
   box-shadow: 0 20rpx 0 0 rgba(0,0,0,0.1);
 }
 
-.panel11{
-  align-items: flex-start;
+.panel12{
+  margin-top: 40rpx;
+  flex-wrap: wrap;
 }
 
+
 .panel111{
-  width:238rpx;
-  height:188rpx;
-  justify-content: flex-start;
+  width:355rpx;
+  height:208rpx;
+}
+
+.panel112{
+  width:236rpx;
+  height:203rpx;
   position: relative;
 }
 
+
 .text3{
   font-size:64rpx;
   font-family: 'Roboto-Black';
-  color:#1E1E1E;
-  margin-top: 40rpx;
+  color:#4d4d4d;
 }
 .text4{
   font-size:24rpx;
   margin-top: 10rpx;
 }
+.text8{
+  font-size:24rpx;
+  margin-top: 22rpx;
+}
 
 .line{
   width:4rpx;
   height:40rpx;
   background-color: #4D4D4D;
-  margin-top: 60rpx;
 }
 .line2{
-  margin-top: 54rpx;
+  background-color: #FD9949;
 }
 
 .universalpic_indicator_right_deepgray{
@@ -80,17 +143,23 @@
 .panel2_0{
   background-color: #2e2e2e; 
   color:#fff;
+  border-bottom-left-radius: 20rpx;
+  border-bottom-right-radius: 20rpx;
 }
 .panel2_1{
   border-top:1rpx solid #e3e3e3;
   border-bottom-left-radius: 20rpx;
   border-bottom-right-radius: 20rpx;
   background-color: #fff;
+  justify-content: center;
+  font-size: 28rpx;
+  font-weight: 400;
 }
 .panel21{
-  margin-left: 30rpx;
   font-size: 28rpx;
   font-weight: 400;
+  width:238rpx;
+  min-height: 100rpx;
 }
 .Arrow{
   width:16rpx;
@@ -98,10 +167,6 @@
   margin-right: 30rpx;
 }
 
-.panel1_0{
-  margin-top: 50rpx;
-}
-
 .text5{
   font-size:36rpx;
   margin-top: 40rpx;
@@ -110,13 +175,12 @@
 .promotion_index_rules{
   width:46rpx;
   height:46rpx;
-  margin: 52rpx 0 12rpx 0;
 }
 
 .textMessage{
   position: absolute;
   top:20rpx;
-  right:20rpx;
+  left:40rpx;
   width:80rpx;
   height:36rpx;
   line-height: 36rpx;
@@ -131,5 +195,35 @@
 .textBottom{
   font-size:28rpx;
   color:#fff;
-  margin: 100rpx 0 60rpx 0;
+  margin: 70rpx 0 60rpx 0;
+}
+
+.panel3{
+  width:710rpx;
+  margin-top: 10rpx;
+  justify-content: space-between;
+}
+.panel13{
+  width:430rpx;
+  height:210rpx;
+  justify-content: flex-end;
+  align-items: flex-start;
+}
+.text6{
+  margin: 0 0 30rpx 30rpx;
+  font-size:34rpx;
+}
+.panel14{
+  width:260rpx;
+  height:210rpx;
+  background-color: #F7E1D1;
+  justify-content: flex-start;
+}
+.text7{
+  margin: 0 0 0 30rpx;
+  font-size:34rpx;
+}
+
+.Null1{
+  height:30rpx;
 }

pages_agent/promotion/user_index.js

@@ -5,13 +5,24 @@ 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";
+
     that.setData({
       Containnerheight: main.getWindowHeight(),
+      List:that.data.List,
     });
   },
   onPullDownRefresh: function () {
@@ -24,4 +35,4 @@ Page({
       imageUrl: app.globalData.ShareImage,
     }
   },
-})
+})

pages_agent/main/user_relation.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "队员详情",
+  "backgroundColor": "#F2F2F2"
+}

pages_agent/main/user_relation.wxml

@@ -0,0 +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>
+  </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>
+      </view>
+      <view class="Right FlexColumn">
+          <view class="text4">
+            <block wx:if="{{index==0}}">我的直属</block>
+            <block wx:if="{{index>0}}">第{{index+1}}度</block>
+          </view>
+      </view>
+    </view>
+  </block>
+  <view class="panel3 FlexColumn">
+    <text class="text5">Ta的直属推荐</text>
+    <text class="text6"><text class="Number1" >24</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="text8 FlexRow">
+        <view class="Number2">5</view>
+        <view class="line2"></view>
+        <view class="Number2">12</view>
+      </view>
+    </view>
+  </view>
+</view>

pages_agent/main/user_relation.wxss

@@ -0,0 +1,138 @@
+.panel1{
+  width:100%;
+  height: 110rpx;
+  justify-content: flex-start;
+  background-color: #fff;
+}
+
+.avatar{
+  width:50rpx;
+  height:50rpx;
+  border-radius: 20rpx;
+  margin-left: 30rpx;
+}
+
+.text1{
+  font-size: 28rpx;
+  font-weight: 400;
+  margin-left: 22rpx;
+  color: #4d4d4d;
+}
+
+.panel2{
+  width: 100%;
+  justify-content: flex-start;
+  margin: 60rpx 0 30rpx 0;
+}
+
+.text2{
+  font-size: 36rpx;
+  margin: 0 30rpx;
+  color: #4d4d4d;
+}
+
+.panelItem{
+  width:100%;
+  height:110rpx;
+  background-color: #fff;
+  justify-content: space-between;
+}
+
+.avatar2{
+  width:50rpx;
+  height:50rpx;
+  border-radius: 50%;
+  margin-left: 30rpx;
+}
+
+.text3{
+  font-size: 28rpx;
+  margin-left: 20rpx;
+  color: #4d4d4d;
+}
+
+.text4{
+  font-size: 28rpx;
+  margin-right: 30rpx;
+  color: #787878;
+}
+
+.IsMe{
+  background-color: #FFE4B6;
+}
+
+.panel3{
+  width: 100%;
+  justify-content: flex-start;
+  height:190rpx;
+  align-items: flex-start;
+}
+
+
+.text5{
+  font-size: 36rpx;
+  margin: 60rpx 30rpx 0 30rpx;
+  color: #4d4d4d;
+}
+.text6{
+  font-size: 36rpx;
+  margin: 0 30rpx 0 30rpx;
+  color: #4d4d4d;
+}
+
+.Number1{
+  font-family: 'Roboto-Black';
+  font-size:36rpx;
+  color:#4D4D4D;
+  margin-right: 6rpx;
+}
+
+.panel4{
+  width: 100%;
+  min-height:372rpx;
+  background-color: #fff;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+
+.panel41{
+  width:150rpx;
+  min-height:168rpx;
+  justify-content: flex-start;
+}
+
+.product_icon_mg_70x70{
+  width:80rpx;
+  height:80rpx;
+  border-radius: 20rpx;
+  margin-top: 30rpx;
+}
+
+.text7{
+  width:110rpx;
+  font-size:20rpx;
+  font-weight: 400;
+  text-align: center;
+  margin-top:20rpx;
+}
+
+.text8{
+  width:110rpx;
+  font-size:20rpx;
+  font-weight: 400;
+  text-align: center;
+}
+
+.line2{
+  width:2rpx;
+  height:14rpx;
+  background-color: #d2d2d2;
+  margin: 0 6rpx;
+}
+.Number2{
+  font-family: 'Roboto-Black';
+  color:#4D4D4D;
+  margin: 6rpx;
+}

pages_agent/main/userinfo.js

@@ -1,66 +1,55 @@
-// pages_agent/main/userinfo.js
-Page({
+import common from '../../utils/util';
+import main from '../../utils/main';
 
-  /**
-   * 页面的初始数据
-   */
-  data: {
+const app = getApp();
 
+Page({
+  data: {
+    IsPromotion:false,
   },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
   onLoad: function (options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
+    var that = this;
+    
+    var isPromotion=false;
+    var title="大使";
+    var backColor="#FFB808";
+    var frontColor="#2E2E2E";
+    var frontColor2="#000000";
+    if (options.AgentCategory=="promotion"){
+      isPromotion=true;
+      title="推广";
+      backColor="#FC7406";
+      frontColor="#ffffff";
+      frontColor2="#000000";
+    }
+
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      IsPromotion:isPromotion,
+      BackColor:backColor,
+      FrontColor:frontColor,
+      Title:title,
+      User:app.globalData.userInfo,
+    });
+
+    wx.setBackgroundColor({
+      backgroundColor: backColor,
+    });
+    wx.setNavigationBarColor({
+      backgroundColor: backColor,
+      backgroundColorTop:backColor,
+      backgroundColorBottom:backColor,
+      frontColor: frontColor2,
+    })
   },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
   onPullDownRefresh: function () {
-
+    wx.stopPullDownRefresh();
   },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
   onShareAppMessage: function () {
-
-  }
-})
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages_agent/main/userinfo.wxml

@@ -1,64 +1,70 @@
-<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="panel1_1 panel1 FlexColumn">
-    <image src='../../pages/images/product_icon_mg_70x70.png' class="avatar" />
-    <view class="text1">昵称</view>
-    <view class="panel11 FlexColumn">
-      <view class="text2">正式用户</view>
-      <view class="panel111 FlexRow">
-        <view class="panel1111 FlexColumn">
-          <view class="text3">2021.11.04</view>
-          <view class="text4">首次续费时间</view>
-        </view>
-        <view class="line"></view>
-        <view class="panel1111 FlexColumn">
-          <view class="text3">2021.11.04</view>
-          <view class="text4">首次续费时间</view>
-        </view>
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;background-color: {{BackColor}};'>
+  <view class="panel1_1 panel1 FlexColumn" style="background-color: {{BackColor}};color:{{FrontColor}}">
+    <image src='{{User.AvatarUrl}}' class="avatar" />
+    <view class="text1">{{User.NickName}}</view>
+    <text class="text2">您是已参加{{Title}}计划的\n正式用户</text>
+    <view class="panel11 FlexRow">
+      <view class="panel111 FlexColumn">
+        <view class="Number1">{{User.PromotionLimitTime}}</view>
+        <view class="text3">资格有效期</view>
+      </view>
+      <view wx:if="{{IsPromotion}}" class="line"></view>
+      <view wx:if="{{!IsPromotion}}" class="line2 line"></view>
+      <view class="panel112 FlexColumn">
+        <view class="Number1">{{User.PromotionLimitDays}}</view>
+        <view class="text3">剩余天数</view>
       </view>
     </view>
+    <text class="text4">这里有一段对资格有效期的说明 ARIA vocal collection15曲アリア OP, ED, 挿入歌 ／ 牧野由依, ROUND TABLE feat. Nino, 河井英里 etc.</text>
+    <block wx:if="{{IsPromotion && (User.Introducer>0 && User.Introducer!=6)}}">
+      <text class="text5">我的推荐人</text>
+      <view class="btn FlexRow">
+        <image src='{{User.IntroducerAvatarUrl}}' class="avatar2" />
+        <view class="text7">{{User.IntroducerNickName}}</view>
+      </view>
+    </block>
   </view>
   <view class="panel2 FlexColumn">
+    
     <view class="panel2Item FlexRow">
-      <view>推广计划资格有效期</view>
-      <view>2021年11月04日</view>
+      <view class="text6">收款人微信帐号</view>
+      <view>{{User.WXAccount}}</view>
     </view>
     <view class="lineWidthAll FlexRow">
       <view class="lineWidth720"></view>
     </view>
-    <view class="panel2Item2 panel2Item FlexRow">
-      <view>离失去推广收益资格还剩</view>
-      <view>1天</view>
-      <text class="text5">这里有一段对资格有效期的说明\nARIA vocal collection（15曲）アリア OP, ED, 挿入歌 ／ 牧野由依, ROUND TABLE feat. Nino, 河井英里 etc.</text>
+    <view class="panel2Item FlexRow">
+      <view class="text6">收款帐号真实姓名</view>
+      <view>{{User.RealName}}</view>
     </view>
     <view class="lineWidthAll FlexRow">
       <view class="lineWidth720"></view>
     </view>
     <view class="panel2Item FlexRow">
-      <view>微信支付平台交易手续费</view>
-      <view>0.6%</view>
+      <view class="text6">收款帐号身份证</view>
+      <view>{{User.IdentityCard}}</view>
     </view>
     <view class="lineWidthAll FlexRow">
       <view class="lineWidth720"></view>
     </view>
     <view class="panel2Item FlexRow">
-      <view>代缴个人所得税</view>
-      <view>6%</view>
+      <view class="text6">收款帐号联系电话</view>
+      <view>{{User.Phone}}</view>
     </view>
+
     <view class="lineWidthAll FlexRow">
       <view class="lineWidth720"></view>
     </view>
     <view class="panel2Item FlexRow">
-      <view>收款人微信帐号</view>
-      <view>一泓清水@体脂管理</view>
+      <view class="text6">微信支付平台交易手续费</view>
+      <view>{{User.WXServiceCharge}}</view>
     </view>
     <view class="lineWidthAll FlexRow">
       <view class="lineWidth720"></view>
     </view>
     <view class="panel2Item FlexRow">
-      <view>收款帐号真实姓名</view>
-      <view>天不怕</view>
+      <view class="text6">代缴个人所得税</view>
+      <view>{{User.IndividualIncomeTax}}</view>
     </view>
-  </view>    
-  
-  
+  </view>  
 </view>

pages_agent/main/userinfo.wxss

@@ -3,68 +3,92 @@
   justify-content: flex-start;
   color:#fff;
 }
-.panel1_1{
-  background-color: #FC7406;
-}
-.panel1_2{
-  background-color: #FFB808;
-}
 .avatar{
-  width:200rpx;
-  height:200rpx;
+  width:160rpx;
+  height:160rpx;
   margin-top: 60rpx;
-  border-radius: 20rpx;
+  border-radius: 50%;
 }
 
 .text1{
-  font-size:32rpx;
-  margin-top: 20rpx;
+  font-size:38rpx;
+  margin-top: 30rpx;
+}
+.text2{
+  font-size:28rpx;
+  margin-top: 30rpx;
+  text-align: center;
 }
 
 .panel11{
-  width:710rpx;
-  height:245rpx;
-  background-color: #F2F2F2;
-  border-radius: 20rpx;
-  color:#4D4D4D;
-  margin: 60rpx 0 80rpx 0;
-  justify-content: flex-start;
-
-  box-shadow: 0 20rpx 0 0 rgba(0,0,0,0.1);
-}
-.text2{
-  font-size:36rpx;
-  margin-top:40rpx;
+  width:610rpx;
+  margin-top: 43rpx;
+  justify-content: space-between;
+  align-items: flex-start;
 }
 
 .panel111{
-  margin-top: 20rpx;
+  width:446rpx;
   align-items: flex-start;
 }
-
-.panel1111{
-  width:300rpx;
-  height:85rpx;
+.line{
+  width: 4rpx;
+  height:40rpx;
+  background-color: #FD9949;
+  margin-top: 8rpx;
+}
+.line2{
+  background-color: #FFD56E;
+}
+.panel112{
+  width:160rpx;
+  align-items: flex-end;
+}
+.Number1{
+  font-family: 'Roboto-Black';
+  font-size:48rpx;
 }
 
 .text3{
-  font-size:36rpx;
-  font-family: 'Roboto-Black';
+  font-size:24rpx;
+  margin-top: 4rpx;
 }
 .text4{
-  font-size:24rpx;
-  margin-top: 10rpx;
+  font-size:22rpx;
+  margin-top: 30rpx;
+  width:610rpx;
 }
 
-.line{
-  width:4rpx;
-  height:40rpx;
-  background-color: #4D4D4D;
+.text5{
+  width:610rpx;
+  font-size: 28rpx;
+  margin-top: 60rpx;
+  text-align: center;
+}
+
+.btn{
+  width:610rpx;
+  height:100rpx;
+  border-radius: 20rpx;
+  background-color: #fff;
+  margin:30rpx 0 0 0;
+}
+
+.avatar2{
+  border-radius: 50%;
+  width:50rpx;
+  height:50rpx;
+  margin-right: 20rpx;
+}
+.text7{
+  color:#787878;
+  font-size: 28rpx;
 }
 
 .panel2{
   width:100%;
   background-color: #fff;
+  margin-top: 80rpx;
 }
 
 .panel2Item{
@@ -72,17 +96,15 @@
   min-height:100rpx;
   justify-content: space-between;
   font-size: 28rpx;
-  font-weight: 400;
   flex-wrap: wrap;
 }
 
 .panel2Item2{
   height:189rpx;
+  color:#787878;
 }
 
-.text5{
-  width:690rpx;
-  font-size: 20rpx;
-  font-weight: 500;
-}
-
+.text6{
+  font-weight: 400;
+  color:#4D4D4D;
+}

pages_agent/promotion/earnings_list.js

@@ -5,14 +5,21 @@ 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();

pages_agent/main/withdraw_deposit.json

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

pages_agent/promotion/earnings.wxml

@@ -10,15 +10,17 @@
     </view>
   </view>
 
-  <view class="panel4 FlexRow">
-    <view class="Left FlexRow">
+  <view class="panel4 FlexColumn">
+    <view class="panel41 FlexRow">
       <image src='../../pages/images/universalpic_exclamation_orange_40x40.png' class="universalpic_exclamation_orange_40x40" />
-      <view class="panel41 FlexColumn">
-        <view class="text8">您有1笔退款，返还奖励后，剩余收益可提现。</view>
-        <view class="text4">查看退款记录</view>
-      </view>
+      <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>
-    <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
+
   </view>
 
   <view class="panel2 FlexRow">
@@ -26,28 +28,63 @@
     <text class="text7">收益 <text class="Number1">960.00</text></text>
   </view>
   <view class="panel3 FlexColumn">
-    <block wx:for="{{[1,2,3,4,5]}}" wx:key="index">
+    <!-- 推广 -->
+    <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 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="Right FlexColumn">
-        <block wx:if="{{false}}">
-          <view class="text6">等待生效</view>
-          <view class="text5">2021年11月04日 08:20</view>
-        </block>
-        <view class="Number1" wx:if="{{true}}">30.00</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>
-    </block>
-    
+
+
+
   </view>
   <view style="height:150rpx;"></view>
   <view class="panelBottom FlexColumn">
@@ -55,7 +92,7 @@
   </view>
 </view>
 
-<view class="container2 container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+<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">
@@ -108,7 +145,7 @@
       <view class="text54">张三</view>
     </view>
     <view class="btn2">确认</view>
-    
+
   </view>
   <view class="btnCancel">取消</view>
 

pages_agent/promotion/earnings.wxss

@@ -39,11 +39,9 @@
 
 .panel4{
   width:710rpx;
-  height:143rpx;
   border-radius: 20rpx;
   background-color: #fff;
   margin: 0 0 60rpx 0;
-  justify-content: space-between;
 }
 
 .universalpic_exclamation_orange_40x40{
@@ -68,19 +66,37 @@
   color:#4D4D4D;
 }
 .Number1{
+  font-family: 'Roboto-Black';
+  font-size:36rpx;
+  color:#4D4D4D;
+}
+.Number2{
   font-family: 'Roboto-Black';
   font-size:28rpx;
   color:#4D4D4D;
 }
 
 .panel41{
-  align-items: flex-start;
-  margin-left: 20rpx;
+  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: 24rpx;
-  color:#1E1E1E;
-  margin-bottom: 10rpx;
+  font-size: 22rpx;
+  color: #4d4d4d;
+  margin-left: 30rpx;
 }
 
 .panel3{
@@ -90,6 +106,12 @@
   margin-top: 30rpx;
 }
 
+.nullLine{
+  width:100%;
+  height:20rpx;
+  background-color: #f2f2f2;
+}
+
 .panelItem{
   width: 100%;
   height:141rpx;
@@ -103,6 +125,24 @@
   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;
@@ -112,6 +152,7 @@
   font-size: 28rpx;
   color:#4D4D4D;
   font-weight: 400;
+  margin-left: 30rpx;
 }
 .text5{
   font-size: 20rpx;

pages_agent/promotion/earnings.json

@@ -1,4 +0,0 @@
-{
-  "navigationBarTitleText": "预估新增收益",
-  "backgroundColor": "#F2F2F2"
-}

pages_agent/promotion/earnings_list.wxml

@@ -1,45 +0,0 @@
-<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="panel1 FlexColumn" bindtap='goto'>
-    <view class="text10 text1">等待审核</view>
-    <view class="text2">166.24</view>
-    <view class="text3">到帐金额</view>
-    <view class="line"></view>
-    <view class="panel11 FlexColumn">
-      <view class="panel111 FlexRow">
-        <view class="text4">申请单号</view>
-        <view class="text5">123456789</view>
-      </view>
-      <view class="panel112 FlexRow">
-        <view class="text4">申请时间</view>
-        <view class="text5">2021年11月04日 08:20</view>
-      </view>
-    </view>
-    <view class="line2"></view>
-    <view class="panel12 FlexRow">
-      <view class="text6">查看申请单详情</view>
-      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
-    </view>
-  </view>
-
-  <view class="panel1 FlexColumn" bindtap='goto'>
-    <view class="text1">审核通过</view>
-    <view class="text2">66.84</view>
-    <view class="text3">到帐金额</view>
-    <view class="line"></view>
-    <view class="panel11 FlexColumn">
-      <view class="panel111 FlexRow">
-        <view class="text4">申请单号</view>
-        <view class="text5">123456789</view>
-      </view>
-      <view class="panel112 FlexRow">
-        <view class="text4">申请时间</view>
-        <view class="text5">2021年11月04日 08:20</view>
-      </view>
-    </view>
-    <view class="line2"></view>
-    <view class="panel12 FlexRow">
-      <view class="text6">查看申请单详情</view>
-      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
-    </view>
-  </view>
-</view>

pages_agent/promotion/user_index.wxml

@@ -1,105 +0,0 @@
-<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-    <image src='../../pages/images/product_icon_mg_70x70.png' class="avatar" />
-    <view class="text1">累计收益</view>
-    <view class="text2">166.24</view>
-    
-    <view class="panel1 FlexColumn">
-      <view class="panel11 FlexRow">
-        <view class="panel111 FlexColumn">
-          <view class="text3">60</view>
-          <view class="text4 FlexRow">
-            <view class="universalpic_indicator_right_deepgray"></view>
-            <view>预估新增收益</view>
-            <image src='../images/universalpic_indicator_right_deepgray.png' class="universalpic_indicator_right_deepgray" />
-          </view>
-        </view>
-        <view class="line"></view>
-        <view class="panel111 FlexColumn">
-          <view class="text3">260</view>
-          <view class="text4 FlexRow">
-            <view class="universalpic_indicator_right_deepgray"></view>
-            <view>可提现收益</view>
-            <image src='../images/universalpic_indicator_right_deepgray.png' class="universalpic_indicator_right_deepgray" />
-          </view>
-        </view>
-        <view class="line"></view>
-        <view class="panel111 FlexColumn">
-          <view class="text3">12</view>
-          <view class="text4 FlexRow">
-            <view class="universalpic_indicator_right_deepgray"></view>
-            <view>已结清人数</view>
-            <image src='../images/universalpic_indicator_right_deepgray.png' class="universalpic_indicator_right_deepgray" />
-          </view>
-        </view>
-      </view>
-      <view class="panel2_0 panel2 FlexRow">
-        <view class="panel21 FlexRow">
-          收益记录
-        </view>
-        <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
-      </view>
-      <view class="panel2_1 panel2 FlexRow">
-        <view class="panel21 FlexRow">
-          其它情况
-        </view>
-        <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
-      </view>
-    </view>
-
-    <view class="panel1_0 panel1 FlexColumn">
-      <view class="text5">潜在收益</view>
-      <view class="panel11 FlexRow">
-        <view class="panel111 FlexColumn">
-          <view class="text3">17</view>
-          <view class="text4 FlexRow">
-            <view class="universalpic_indicator_right_deepgray"></view>
-            <view>新报名</view>
-            <image src='../images/universalpic_indicator_right_deepgray.png' class="universalpic_indicator_right_deepgray" />
-          </view>
-        </view>
-        <view class="line"></view>
-        <view class="panel111 FlexColumn">
-          <view class="text3">0</view>
-          <view class="text4 FlexRow">
-            <view class="universalpic_indicator_right_deepgray"></view>
-            <view>新访客</view>
-            <image src='../images/universalpic_indicator_right_deepgray.png' class="universalpic_indicator_right_deepgray" />
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <view class="panel1_0 panel1 FlexColumn">
-      <view class="panel11 FlexRow">
-        <view class="panel111 FlexColumn">
-          <image src='../images/promotion_index_rules.png' class="promotion_index_rules" />
-          <view class="text4 FlexRow">
-            <view>推广计划规则</view>
-          </view>
-        </view>
-        <view class="line2 line"></view>
-        <view class="panel111 FlexColumn">
-          <image src='../images/promotion_index_code.png' class="promotion_index_rules" />
-          <view class="text4 FlexRow">
-            <view>我的推广物料</view>
-          </view>
-        </view>
-        <view class="line2 line"></view>
-        <view class="panel111 FlexColumn">
-          <image src='../images/promotion_index_message.png' class="promotion_index_rules" />
-          <view class="text4 FlexRow">
-            <view>消息中心</view>
-          </view>
-          <view class="textMessage">新消息</view>
-        </view>
-      </view>
-      <view class="panel2_1 panel2 FlexRow">
-        <view class="panel21 FlexRow">
-          联系客服
-        </view>
-        <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
-      </view>
-    </view>
-
-    <view class="textBottom">返回秒过活动首页</view>
-</view>

project.config.json

@@ -17,7 +17,7 @@
     "checkInvalidKey": true,
     "checkSiteMap": true,
     "uploadWithSourceMap": true,
-    "compileHotReLoad": true,
+    "compileHotReLoad": false,
     "useMultiFrameRuntime": true,
     "useApiHook": true,
     "useApiHostProcess": true,
@@ -32,9 +32,9 @@
     "packNpmRelationList": [],
     "minifyWXSS": true,
     "disableUseStrict": false,
+    "minifyWXML": true,
     "showES6CompileOption": false,
-    "useCompilerPlugins": false,
-    "minifyWXML": true
+    "useCompilerPlugins": false
   },
   "compileType": "miniprogram",
   "libVersion": "2.20.2",

project.private.config.json

@@ -34,8 +34,8 @@
           "scene": null
         },
         {
-          "name": "pages_agent/promotion/earnings_list",
-          "pathName": "pages_agent/promotion/earnings_list",
+          "name": "推广",
+          "pathName": "pages_agent/main/index",
           "query": "",
           "scene": null
         }

utils/main.js

@@ -608,9 +608,6 @@ function UpdateMiaoguoCardTodayAll(isShowLoading, callback) {
     clearTimeout(dataSendTimeout);
     dataSendTimeout = setTimeout(function () {
       wx.hideLoading();
-      wx.reLaunch({
-        url: '../index/index',
-      })
     }, 60000);
   }
   var list = wx.getStorageSync("ListTaskFinished");
@@ -632,7 +629,7 @@ function UpdateMiaoguoCardTodayAll(isShowLoading, callback) {
       List: arr,
     }, function (data) {
       if (isShowLoading) {
-        wx.hideLoading();
+        wx.hideLoading();        
         clearTimeout(dataSendTimeout);
       }
       if (data) {
@@ -846,8 +843,8 @@ function GetHanziUnitWords(unitsID, testType, callback) {
             taskInfo.Content[0].Content = ["怎么写"];
   
             var question = words[k].CombineWords;
-            var question2 = common.ReplaceAllString(question, words[k].Name, words[k].Pinyin);
-  
+            //var question2 = common.ReplaceAllString(question, words[k].Name, words[k].Pinyin);
+            var question2= words[k].CombineWords2;
             question = "[读 src='" + taskInfo.ReadString + "']" + question2 + "[/读]"
             taskInfo.Content[1].Content = question;
             var answer = words[k].Name;
@@ -1232,29 +1229,47 @@ function getHanzi(callback) {
   });
   
   var time = wx.getStorageSync("HanziUpdateTime");
-  getData('GetHanziAll2?HasEnglish=true&HasHanziWrite=true&UpdateTime=' + time, function (data) {
+  getData('GetHanziAll3?UpdateTime=' + time, function (data) {
     wx.hideLoading();
     if (data) {
       var arr = [];
       if (data.List) {
         arr = common.Decrypt(data.List);
         wx.setStorageSync("HanziAll", arr);
-
-        var arrEng = common.Decrypt(data.EngList);
-        var arrNewConceptEngList = common.Decrypt(data.NewConceptEngList);
-        var arrCambridgeEngList = common.Decrypt(data.CambridgeEngList);
-        var arrPhoneticEngList = common.Decrypt(data.PhoneticEngList);
-        wx.setStorageSync("EnglishAll", arrEng);
-        wx.setStorageSync("NewConceptEngList", arrNewConceptEngList);
-        wx.setStorageSync("CambridgeEngList", arrCambridgeEngList);
-        wx.setStorageSync("PhoneticEngList", arrPhoneticEngList);
         wx.setStorageSync("HanziUpdateTime", data.UpdateTime);
+        callback(true);
       } else {
-        arr = wx.getStorageSync("HanziAll");
-        if (arr)
-          arr = JSON.parse(arr);
+        callback(false);
       }
-      callback(arr);
+    }
+  });
+}
+
+function getEnglish(callback) {
+  var that = this;
+  wx.showLoading({
+    title: '请稍候',
+    mask: true,
+  });
+  
+  var time = wx.getStorageSync("HanziUpdateTime");
+  getData('GetEnglishAll3?UpdateTime=' + time, function (data) {
+    wx.hideLoading();
+    if (data.EngList) {
+      var arrEng = common.Decrypt(data.EngList);
+      var arrNewConceptEngList = common.Decrypt(data.NewConceptEngList);
+      var arrCambridgeEngList = common.Decrypt(data.CambridgeEngList);
+      var arrPhoneticEngList = common.Decrypt(data.PhoneticEngList);
+      wx.setStorageSync("EnglishAll", arrEng);
+      wx.setStorageSync("NewConceptEngList", arrNewConceptEngList);
+      wx.setStorageSync("CambridgeEngList", arrCambridgeEngList);
+      wx.setStorageSync("PhoneticEngList", arrPhoneticEngList);
+      wx.setStorageSync("EnglishUpdateTime", data.UpdateTime);
+     
+      callback(true);
+    }
+    else{
+      callback(false);
     }
   });
 }
@@ -1354,9 +1369,16 @@ function replaceCardInfoString(str) {
   var str2 = "";
   if (str.indexOf("[读 src=") >= 0) {
     str2 = str.substr(str.indexOf("[读 src="));
-    str2 = str2.substring(0, str2.indexOf("/读]") + 3);
+    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("[读 src=") >= 0) {
     str2 = str.substr(str.indexOf("[读 src"));
@@ -1364,6 +1386,12 @@ function replaceCardInfoString(str) {
   }
   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, "");
 
@@ -1684,6 +1712,7 @@ module.exports = {
   buildInitData: buildInitData,
   getPinyinNormal: getPinyinNormal,
   getHanzi: getHanzi,
+  getEnglish:getEnglish,
   GetHanziUnitWords: GetHanziUnitWords,
   GetTestReportInfo: GetTestReportInfo,
   getUserConfig: getUserConfig,