2.1.65

app.js

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

app.wxss

@@ -117,3 +117,59 @@
     font-weight: 900;
     font-style: normal;
 }
+
+
+.IsHelpContainer{
+  position: fixed;
+  z-index: 100;
+  top:0;
+}
+
+.IsHelpContainer .IsHelpContainer0{
+  background-color:rgba(0,0,0,0.5);
+  position: absolute;
+  z-index: 100;
+}
+
+.IsHelpContainer .IsHelpContainerTop{
+  width:100%;
+  top:0;
+}
+
+.IsHelpContainer .IsHelpContainerLeft{
+  left:0;
+}
+
+.IsHelpContainer .IsHelpContainerRight{
+  right:0;
+  width:750rpx;
+}
+.IsHelpContainer .IsHelpContainerBottom{
+  width:100%;
+}
+
+.IsHelpContainer .HelpText1{
+  font-size: 32rpx;
+  color:#1e1e1e;
+  position: absolute;
+  background-color: #fff;
+  text-align: center;
+  border-radius: 20rpx;
+  padding: 20rpx;
+  z-index: 110;
+}
+
+.IsHelpContainer .HelpClose{
+  width:50rpx;
+  height:50rpx;
+  position: absolute;
+  top:30rpx;
+  background-color: #fff;
+  border-radius: 50%;
+  z-index: 110;
+}
+
+.IsHelpContainer .universalpic_del_gray_14x14{
+  width:28rpx;
+  height:28rpx;
+}

pages/index/index.js

@@ -157,6 +157,9 @@ Page({
           gotoUrl: "../other/pay?PayType=7&EndDate="+options.EndDate, 
         }); 
       } 
+      else if (options.type == "helpAddInfomation") { 
+        wx.setStorageSync('IsHelpAddInfomation', 1);
+      } 
     }
     this.setData({
       IsRefresh: false,

pages/main/add.js

@@ -42,6 +42,7 @@ Page({
     IsFontsize: false,
     IsCollect: 0,
     BtnSaveSelectCss: "",
+    IsShowHelp:false,
   },
   onReady: function () {
     recorderManager = wx.getRecorderManager();
@@ -257,6 +258,24 @@ Page({
     that.setBtnSaveCss();
 
     common.getStorageValue(that, "SymbolMain", app.globalData.SymbolMain, function () {});
+    
+    if (wx.getStorageSync("IsHelpAddInfomation")==1){
+      that.setData({
+        IsShowHelp:true,
+      });
+      if (that.data.Field[1]!="" && that.data.Field[1][0].Content && that.data.Field[1][0].Content=="lì害" && that.data.BtnSaveSelectCss=="MenuBtnSelect"){
+        main.ShowHelp(that,"#btnSave","up","点击下方“保存”按钮","Left");
+      }
+      else{
+        main.ShowHelp(that,"#btnSearch","down","点击上方“加资料”按钮","Left");
+      }
+    }
+    else{
+      that.setData({
+        IsShowHelp:false,
+      });
+    }
+      
   },
   onHide: function () {
     //用于恢复未保存的新题卡
@@ -484,6 +503,10 @@ Page({
                         image: "../images/universalpic_save_white_120x120.png",
                       });
                       changePattern(that);
+                      
+                      if (wx.getStorageSync("IsHelpAddInfomation")==1){
+                        that.closeHelp();
+                      }
                     }
                     isFirstAdd = false;
                     that.initAddCard();
@@ -1503,12 +1526,21 @@ Page({
   },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
-    wx.navigateTo({
-      url: url,
-    });
 
-    if (url == "./folderEdit?type=add") {
-      isAddFolder = true;
+    if (url == "../index/index?type=helpAddInfomation") {
+      wx.setStorageSync('IsHelpAddInfomation', 1);
+      wx.redirectTo({
+        url: './default',
+      });
+    }
+    else{
+      wx.navigateTo({
+        url: url,
+      });
+  
+      if (url == "./folderEdit?type=add") {
+        isAddFolder = true;
+      }
     }
   },
   showTagShow: function () {
@@ -1887,6 +1919,12 @@ Page({
     app.globalData.TempStr = "deleteCard";
     this.onClose();
   },
+  closeHelp:function(){
+    this.setData({
+      IsShowHelp:false,
+    });
+    wx.setStorageSync('IsHelpAddInfomation', 0);
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/add.wxml

@@ -9,7 +9,7 @@
 			</view>
 		</view>
 		<view class="panelRight FlexRow">
-			<view class="panelTopBtn" catchtap="onSearch">加资料</view>
+			<view id="btnSearch" class="panelTopBtn" catchtap="onSearch">加资料</view>
 			<view class="panelTop11 panelTop1 FlexColumn" catchtap="showPanel" data-type="help">
 				<image class="universalpic_light_black_22x30" src='../images/universalpic_light_black_22x30.png' />
 			</view>
@@ -150,7 +150,7 @@
 			<view class="panelSave1" wx:if="{{UpdateType!='add' && UpdateType!='add2'}}">
 
 			</view>
-			<view class='{{BtnSaveSelectCss}} panelSave2' bindtap="saveCard">
+			<view id="btnSave" class='{{BtnSaveSelectCss}} panelSave2' bindtap="saveCard">
 				保存
 			</view>
 			<view class="panelSave1" bindtap="onPreview">
@@ -340,7 +340,9 @@
 			<view class="HelpPanel111 FlexRow" catchtap="hiddenPanel">
 				<image src='../images/universalpic_close_black_24x24.png' class="universalpic_close_black_24x24" />
 			</view>
-			<view></view>
+			<view class="panelTop11 panelTop1 FlexColumn" catchtap="goto" data-url="../index/index?type=helpAddInfomation">
+				<image class="universalpic_light_black_22x30" src='../images/universalpic_light_black_22x30.png' />
+			</view>
 		</view>
 		<swiper class="HelpPanel2" indicator-dots="true" autoplay="true" interval="10000" duration="500">
 			<block wx:for="{{HelpArr}}" wx:key="*this">
@@ -494,4 +496,16 @@
 			<view class="panelHeight100_green"></view>
 		</view>
 	</view>
-</view>
+</view>
+
+<view  wx:if="{{IsShowHelp}}" class="IsHelpContainer container FlexColumn" >
+  <view class="IsHelpContainerTop IsHelpContainer0" style='height:{{HelpTop}}px;'></view>
+  <view class="IsHelpContainerLeft IsHelpContainer0" style='top:{{HelpTop}}px;width:{{HelpWidth1}}px;height:{{HelpHeight1}}px;'></view>
+  <view class="IsHelpContainerRight IsHelpContainer0" style='top:{{HelpTop}}px;left:{{HelpLeft2}}px;width:{{HelpWidth2}}px;height:{{HelpHeight2}}px;'></view>
+  <view class="IsHelpContainerBottom IsHelpContainer0" style='top:{{HelpBottom}}px;height:{{Containnerheight}}px;'></view>
+  <view class="HelpText1" style='top:{{HelpTextTop}}px;'>{{HelpText}}</view>
+	<view class="HelpClose FlexColumn" style="{{HelpClosePos}}:30rpx;" catchtap="closeHelp">
+    <image class="universalpic_del_gray_14x14" src="../images/universalpic_del_gray_14x14.png"></image>
+  </view>
+</view>
+

pages/main/add.wxss

@@ -1282,4 +1282,4 @@ page{
   border:2rpx solid #5282FA;
   color:#fff;
   font-size:36rpx;
-}
+}

pages/main/addInfomation.js

@@ -11,6 +11,7 @@ Page({
     SearchList: [],
     SearchInfo: "",
     IsMore:true,
+    IsShowHelp:false,
   },
   onLoad: function () {
     var that = this;
@@ -50,6 +51,17 @@ Page({
       });
     });
 
+    if (wx.getStorageSync("IsHelpAddInfomation")==1){
+      that.setData({
+        IsShowHelp:true,
+      });
+      main.ShowHelp(that,"#input","down","在上方输入需要查找的\n词语。比如输入“厉害”,\n再点键盘右下的“搜索”");
+    }
+    else{
+      that.setData({
+        IsShowHelp:false,
+      });
+    }
   },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
@@ -82,8 +94,17 @@ Page({
 
   searchResult: function (e) {
     var that = this;
-
     var search = that.data.SearchInfo;
+    
+    if (wx.getStorageSync("IsHelpAddInfomation")==1){
+      if (search!="厉害"){
+        wx.showToast({
+          title: '请输入“厉害”搜索',
+        });
+        return;
+      }
+    }
+
     if (e.currentTarget.dataset.search) {
       search = e.currentTarget.dataset.search;
       that.setData({
@@ -237,6 +258,12 @@ Page({
       IsMore:false,
     });
   },
+  closeHelp:function(){
+    this.setData({
+      IsShowHelp:false,
+    });
+    wx.setStorageSync('IsHelpAddInfomation', 0);
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/addInfomation.wxml

@@ -1,16 +1,14 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelTop FlexRow">
     <view class="panelLeft FlexRow">
-      <view class="panelTopSearch FlexRow">
+      <view id="input" class="panelTopSearch FlexRow">
         <image class="universalpic_magnifier_gray_30x30" src='../images/universalpic_magnifier_gray_30x30.png' />
-        <input class='input'  always-embed="true"  maxlength='50' focus='{{Focus}}' bindinput="onKeyInput" value="{{SearchInfo}}"
-          placeholder="字词、成语、诗词、单词" confirm-type="search" bindconfirm="searchResult" />
+        <input class='input' always-embed="true" maxlength='50' focus='{{Focus}}' bindinput="onKeyInput" value="{{SearchInfo}}" placeholder="字词、成语、诗词、单词" confirm-type="search" bindconfirm="searchResult" />
         <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">
@@ -60,19 +58,13 @@
         <view class="lineWidth720"></view>
       </view>
       <view class="panelSearchData FlexRow" wx:for="{{SearchWord3}}" wx:key="index">
-        <view class="panelSearchDataImage{{item.TypeName}} panelSearchDataImage FlexColumn" bindtap='onSearchHistory'
-          data-index="{{index}}" data-type="SearchWord3">
-          <image wx:if="{{item.TypeName=='Z'}}" class="universalpic_dictionary_hanzi_black_54x26"
-            src='../images/universalpic_dictionary_hanzi_black_54x26.png' />
-          <image wx:if="{{item.TypeName=='C'}}" class="universalpic_dictionary_ciyu_black_55x23"
-            src='../images/universalpic_dictionary_ciyu_black_55x23.png' />
-          <image wx:if="{{item.TypeName=='S'}}" class="universalpic_dictionary_shici_black_53x27"
-            src='../images/universalpic_dictionary_shici_black_53x27.png' />
-          <image wx:if="{{item.TypeName=='D'}}" class="universalpic_dictionary_danci_black_53x28"
-            src='../images/universalpic_dictionary_danci_black_53x28.png' />
+        <view class="panelSearchDataImage{{item.TypeName}} panelSearchDataImage FlexColumn" bindtap='onSearchHistory' data-index="{{index}}" data-type="SearchWord3">
+          <image wx:if="{{item.TypeName=='Z'}}" class="universalpic_dictionary_hanzi_black_54x26" src='../images/universalpic_dictionary_hanzi_black_54x26.png' />
+          <image wx:if="{{item.TypeName=='C'}}" class="universalpic_dictionary_ciyu_black_55x23" src='../images/universalpic_dictionary_ciyu_black_55x23.png' />
+          <image wx:if="{{item.TypeName=='S'}}" class="universalpic_dictionary_shici_black_53x27" src='../images/universalpic_dictionary_shici_black_53x27.png' />
+          <image wx:if="{{item.TypeName=='D'}}" class="universalpic_dictionary_danci_black_53x28" src='../images/universalpic_dictionary_danci_black_53x28.png' />
         </view>
-        <view class="panelSearchData1 FlexColumn" bindtap='onSearchHistory' data-index="{{index}}"
-          data-type="SearchWord3">
+        <view class="panelSearchData1 FlexColumn" bindtap='onSearchHistory' data-index="{{index}}" data-type="SearchWord3">
           <view class="panelSearchDataText1">{{item.Key}}</view>
           <view class="panelSearchDataText2">{{item.Remark}}</view>
           <view class="panelSearchDataText3">{{item.Content}}</view>
@@ -92,18 +84,12 @@
     <view class="panelNullLine" wx:if="{{SearchList.length==0}}"></view>
     <view class="panelSearchData0 FlexColumn" wx:if="{{SearchList.length>0}}">
       <view class="panelSearchDataOther FlexColumn">
-        <view class="panelSearchDataOther2 FlexRow"  wx:for="{{SearchList}}" wx:key="index"
-          bindtap='searchResult' data-search="{{item.Key}}" data-type="SearchList" data-author="{{item.Author}}"
-          data-searchtype="{{item.Type}}" data-shiciurl="{{item.Url}}" wx:if="{{(IsMore && index<4) || (!IsMore)}}">
+        <view class="panelSearchDataOther2 FlexRow" wx:for="{{SearchList}}" wx:key="index" bindtap='searchResult' data-search="{{item.Key}}" data-type="SearchList" data-author="{{item.Author}}" data-searchtype="{{item.Type}}" data-shiciurl="{{item.Url}}" wx:if="{{(IsMore && index<4) || (!IsMore)}}">
           <view class="panelSearchDataImage{{item.TypeName}} panelSearchDataImage FlexColumn">
-            <image wx:if="{{item.TypeName=='Z'}}" class="universalpic_dictionary_hanzi_black_54x26"
-              src='../images/universalpic_dictionary_hanzi_black_54x26.png' />
-            <image wx:if="{{item.TypeName=='C'}}" class="universalpic_dictionary_ciyu_black_55x23"
-              src='../images/universalpic_dictionary_ciyu_black_55x23.png' />
-            <image wx:if="{{item.TypeName=='S'}}" class="universalpic_dictionary_shici_black_53x27"
-              src='../images/universalpic_dictionary_shici_black_53x27.png' />
-            <image wx:if="{{item.TypeName=='D'}}" class="universalpic_dictionary_danci_black_53x28"
-              src='../images/universalpic_dictionary_danci_black_53x28.png' />
+            <image wx:if="{{item.TypeName=='Z'}}" class="universalpic_dictionary_hanzi_black_54x26" src='../images/universalpic_dictionary_hanzi_black_54x26.png' />
+            <image wx:if="{{item.TypeName=='C'}}" class="universalpic_dictionary_ciyu_black_55x23" src='../images/universalpic_dictionary_ciyu_black_55x23.png' />
+            <image wx:if="{{item.TypeName=='S'}}" class="universalpic_dictionary_shici_black_53x27" src='../images/universalpic_dictionary_shici_black_53x27.png' />
+            <image wx:if="{{item.TypeName=='D'}}" class="universalpic_dictionary_danci_black_53x28" src='../images/universalpic_dictionary_danci_black_53x28.png' />
           </view>
           <view class="panelSearchDataOther21 FlexColumn">
             <view class="panelSearchDataText1">{{item.Key}}</view>
@@ -135,14 +121,11 @@
 
       <view class="panelSearchNull FlexColumn" wx:if="{{SearchCardList.length>0}}">
         <view class="panelSearchNull10 panelSearchNull1">您有 {{SearchCardList.length}} 张有关“{{SearchInfo}}”的题卡</view>
-        <view class="panelSearchData3 FlexRow" wx:for="{{SearchCardList}}" wx:key="index" bindtap="goto"
-          data-url="./preview?type=preview&id={{item.MiaoguoCardID}}">
+        <view class="panelSearchData3 FlexRow" wx:for="{{SearchCardList}}" wx:key="index" bindtap="goto" data-url="./preview?type=preview&id={{item.MiaoguoCardID}}">
           <image class="universalpic_card_gray_22x22" src='../images/universalpic_card_gray_22x22.png' />
 
           <view class="panelListItem FlexRow">
-            <image class="panelListItem1Image" mode="aspectFill" src='{{item.ImageUrlTemp}}'
-              wx:if="{{item.ImageUrlServer}}" binderror="onBindError" data-id="{{item.MiaoguoCardID}}"
-              data-serverurl="{{item.ImageUrlServer}}" />
+            <image class="panelListItem1Image" mode="aspectFill" src='{{item.ImageUrlTemp}}' wx:if="{{item.ImageUrlServer}}" binderror="onBindError" data-id="{{item.MiaoguoCardID}}" data-serverurl="{{item.ImageUrlServer}}" />
             <view class="panelListItem11 FlexColumn">
               <view class="panelListItem11Name1">
                 {{item.Content[1].ContentStr}}
@@ -159,4 +142,15 @@
   </block>
 
   <view class="panelHeight60"></view>
+</view>
+
+<view wx:if="{{IsShowHelp}}" class="IsHelpContainer container FlexColumn">
+  <view class="IsHelpContainerTop IsHelpContainer0" style='height:{{HelpTop}}px;'></view>
+  <view class="IsHelpContainerLeft IsHelpContainer0" style='top:{{HelpTop}}px;width:{{HelpWidth1}}px;height:{{HelpHeight1}}px;'></view>
+  <view class="IsHelpContainerRight IsHelpContainer0" style='top:{{HelpTop}}px;left:{{HelpLeft2}}px;width:{{HelpWidth2}}px;height:{{HelpHeight2}}px;'></view>
+  <view class="IsHelpContainerBottom IsHelpContainer0" style='top:{{HelpBottom}}px;height:{{Containnerheight}}px;'></view>
+  <text class="HelpText1" style='top:{{HelpTextTop}}px;'>{{HelpText}}</text>
+  <view class="HelpClose FlexColumn" style="{{HelpClosePos}}:30rpx;" catchtap="closeHelp">
+    <image class="universalpic_del_gray_14x14" src="../images/universalpic_del_gray_14x14.png"></image>
+  </view>
 </view>

pages/main/addInfomationDetail.js

@@ -7,13 +7,13 @@ var hasStart = {};
 Page({
   data: {
     ImagePath: app.globalData.uploadImageUrl,
-    IsShowHelp: 1,
     IsPoemRead: 0,
     ShowKaiti: 0,
-    ShowSoundMark:1,
+    ShowSoundMark: 1,
     CSS: {},
-    IsHelp:false,
-    HelpArr:["help_board_tips_zhidingduanluo","help_board_tips_tiaozhuanchaxun"],
+    IsHelp: false,
+    IsShowHelp: false,
+    HelpArr: ["help_board_tips_zhidingduanluo", "help_board_tips_tiaozhuanchaxun"],
   },
   onLoad: function (options) {
     var that = this;
@@ -25,6 +25,20 @@ Page({
     hasStart = {};
 
   },
+  onShow: function () {
+    var that = this;
+    if (wx.getStorageSync("IsHelpAddInfomation") == 1) {
+      that.setData({
+        IsShowHelp: true,
+      });
+      main.ShowHelp(that, "#helpTianKong0", "down", "选择拼音作为问题，点一下","Left");
+    }
+    else{
+      that.setData({
+        IsShowHelp:false,
+      });
+    }
+  },
   getList: function () {
     if (app.globalData.SearchItem) {
       this.getListFinished(app.globalData.SearchItem);
@@ -42,21 +56,19 @@ Page({
         data.TypeName = "C";
     } else if (data.ENG) {
       data.TypeName = "D";
-    }    
-    
+    }
+
     if (data.CHN && data.CHN.KaitiArr) {
-      if (data.CHN.KaitiArr.length==1){
-        data.CHN.KaitiWidth="";
+      if (data.CHN.KaitiArr.length == 1) {
+        data.CHN.KaitiWidth = "";
+      } else {
+        data.CHN.KaitiWidth = "panelItemSmall";
       }
-      else{
-        data.CHN.KaitiWidth="panelItemSmall";
-      }
-      
-      if (data.CHN.BiShunArr2.length==1){
-        data.CHN.BiShunWidth="";
-      }
-      else{
-        data.CHN.BiShunWidth="panelItemSmall";
+
+      if (data.CHN.BiShunArr2.length == 1) {
+        data.CHN.BiShunWidth = "";
+      } else {
+        data.CHN.BiShunWidth = "panelItemSmall";
       }
     }
 
@@ -68,17 +80,29 @@ Page({
       }
     }
 
-    if (data.ENG && data.ENG.ExamplesSentences){
+    if (data.ENG && data.ENG.ExamplesSentences) {
       for (var i = 0; i < data.ENG.ExamplesSentences.length; i++) {
         var item = data.ENG.ExamplesSentences[i];
-        var obj=[{ContentType:0,Content:""},{ContentType:1,Content:item[0]},{ContentType:2,Content:""},{ContentType:3,Content:""}];
-        var obj2=main.changeStringToView(obj);
-        var str=obj2.Field[1][0].Content;
+        var obj = [{
+          ContentType: 0,
+          Content: ""
+        }, {
+          ContentType: 1,
+          Content: item[0]
+        }, {
+          ContentType: 2,
+          Content: ""
+        }, {
+          ContentType: 3,
+          Content: ""
+        }];
+        var obj2 = main.changeStringToView(obj);
+        var str = obj2.Field[1][0].Content;
         item.push(str);
-        
-        
-        item[1]=common.ReplaceAllString(item[1],"<b>","");
-        item[1]=common.ReplaceAllString(item[1],"</b>","");
+
+
+        item[1] = common.ReplaceAllString(item[1], "<b>", "");
+        item[1] = common.ReplaceAllString(item[1], "</b>", "");
       }
     }
 
@@ -87,10 +111,8 @@ Page({
     })
   },
   getInputData: function (e) {
+    var that = this;
     //console.log("time1:"+new Date().getTime());
-    common.getStorageValue(this, "IsShowHelp", 0, function () {
-
-    });
 
     var type = e.currentTarget.dataset.type;
     var css = e.currentTarget.dataset.css;
@@ -110,7 +132,7 @@ Page({
       if (tag == "发音")
         this.data.CSS[css].SoundMark = soundmark;
 
-      if (tag == "默写" || tag=="拼音") {
+      if (tag == "默写" || tag == "拼音") {
         var soundmark = e.currentTarget.dataset.soundmark;
         if (soundmark)
           this.data.CSS[css].SoundMark = e.currentTarget.dataset.soundmark;
@@ -121,16 +143,14 @@ Page({
         this.data.CSS[css].Number = app.globalData.TempFieldNumber;
         hasStart[css] = true;
       }
-    }
-    else if (this.data.CSS[css].Number == "3") {
+    } else if (this.data.CSS[css].Number == "3") {
       this.data.CSS[css].Css1 = "";
       this.data.CSS[css].Css2 = "";
       this.data.CSS[css].Number = "";
       this.data.CSS[css].Content = "";
       this.data.CSS[css].Type = "";
       this.data.CSS[css].Tag = "";
-    }
-    else {
+    } else {
       this.data.CSS[css].Number = Number(this.data.CSS[css].Number) + 1;
     }
     //console.log("time3:" + new Date().getTime());
@@ -138,6 +158,18 @@ Page({
       CSS: this.data.CSS,
     });
     //console.log("time4:" + new Date().getTime());
+
+    if (wx.getStorageSync("IsHelpAddInfomation") == 1) {
+      that.setData({
+        IsShowHelp: true,
+      });
+      if (this.data.CSS[css].Number == 0)
+        main.ShowHelp(that, "#HelpHanZi", "down", "选择文字作为答案，\n点两下，注意是点两下","Left");
+      else if (this.data.CSS[css].Number == 1)
+        main.ShowHelp(that, "#HelpHanZi", "down", "选择文字作为答案，\n点两下，注意是点两下\n让左侧数字成为2","Left");
+      else if (this.data.CSS[css].Number == 2)
+        main.ShowHelp(that, "#btnAdd", "down", "请点“添加”按钮","Left");
+    }
   },
   addData: function () {
     if (JSON.stringify(this.data.CSS) != "{}") {
@@ -174,39 +206,34 @@ Page({
               item.Content = main.encryptUrl(item.Content);
 
               str = "[图]" + item.Content + "[/图]";
-            }
-            else if (item.Type == "sound") {
+            } else if (item.Type == "sound") {
               str = "[读]" + item.Content + "[/读]";
               if (item.Tag == "发音") {
-                var strTemp=item.Content.substr(0,1);
-                if (this.data.ShowSoundMark=="1")
+                var strTemp = item.Content.substr(0, 1);
+                if (this.data.ShowSoundMark == "1")
                   str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
                 else
-                  str = "[读 src='" + item.SoundMark + "']"+strTemp+"式[/读]";
-              }
-              else if (item.Tag == "拼音" || item.Tag == "默写") {
-                if (item.SoundMark){
-                  if (this.data.Result.CHN.HanZi){
-                    var sound=this.data.Result.CHN.HanZi;
-                    sound=main.GetSoundError(sound);
+                  str = "[读 src='" + item.SoundMark + "']" + strTemp + "式[/读]";
+              } else if (item.Tag == "拼音" || item.Tag == "默写") {
+                if (item.SoundMark) {
+                  if (this.data.Result.CHN.HanZi) {
+                    var sound = this.data.Result.CHN.HanZi;
+                    sound = main.GetSoundError(sound);
                     str = "[读 src='" + sound + "']" + item.Content + "[/读]";
-                  }
-                  else
+                  } else
                     str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
-                }
-                else{
-                  var sound=this.data.Result.CHN.HanZi+"("+ main.getPinyinNormal(item.Content) +")";
-                  sound=main.GetSoundError(sound);
-                  str = "[读 src='"+sound+"']" + item.Content + "[/读]";
+                } else {
+                  var sound = this.data.Result.CHN.HanZi + "(" + main.getPinyinNormal(item.Content) + ")";
+                  sound = main.GetSoundError(sound);
+                  str = "[读 src='" + sound + "']" + item.Content + "[/读]";
                 }
               }
-            }
-            else {
-              if (item.Tag == "诗词" || item.Tag == "译文"){
-                if (common.checkIsArray(item.Content) 
-                  && common.checkIsArray(item.Content[0])){
+            } else {
+              if (item.Tag == "诗词" || item.Tag == "译文") {
+                if (common.checkIsArray(item.Content) &&
+                  common.checkIsArray(item.Content[0])) {
                   for (var j = 0; j < item.Content.length; j++) {
-                    if (common.checkIsArray(item.Content[j])){
+                    if (common.checkIsArray(item.Content[j])) {
                       item.Content[j] = item.Content[j].join("");
                     }
                   }
@@ -214,53 +241,50 @@ Page({
                     str = item.Content.join("\n");
                   else
                     str = item.Content;
-                }
-                else{
+                } else {
                   if (common.checkIsArray(item.Content))
                     str = item.Content.join("");
                   else
                     str = item.Content;
                 }
 
-                if (item.Tag == "诗词" && this.data.IsPoemRead==1){
-                  var arr=str.split("\n");
-                  var arr2=[];
-                  for(var j=0;j<arr.length;j++){
-                    arr2.push("[读]" +arr[j]+ "[/读]");
+                if (item.Tag == "诗词" && this.data.IsPoemRead == 1) {
+                  var arr = str.split("\n");
+                  var arr2 = [];
+                  for (var j = 0; j < arr.length; j++) {
+                    arr2.push("[读]" + arr[j] + "[/读]");
                   }
-                  str=arr2.join("\n");
+                  str = arr2.join("\n");
                 }
-              }
-              else
+              } else
                 str = item.Content;
             }
 
-            if (this.data.Result && this.data.Result.CHN && this.data.Result.CHN.PinYin && this.data.Result.CHN.PinYin.length == 1){
-              if (item.Tag=="释义"){
-                str=str.substr(str.indexOf("[/读]")+4);
+            if (this.data.Result && this.data.Result.CHN && this.data.Result.CHN.PinYin && this.data.Result.CHN.PinYin.length == 1) {
+              if (item.Tag == "释义") {
+                str = str.substr(str.indexOf("[/读]") + 4);
               }
             }
 
-            if (list[i].Content[item.Number].Content){
-              if (item.Tag == "组词" || item.Tag == "近义词" || item.Tag == "反义词"){
+            if (list[i].Content[item.Number].Content) {
+              if (item.Tag == "组词" || item.Tag == "近义词" || item.Tag == "反义词") {
                 str = "\n" + str;
-              }
-              else{
+              } else {
                 str = "\n\n" + str;
               }
             }
 
             list[i].Content[item.Number].Content += str;
 
-            if (list[i].Content[item.Number].Content.indexOf("\n\n")==0)
-              list[i].Content[item.Number].Content=list[i].Content[item.Number].Content.substr(2);
-            
-            if (item.Tag == "诗词"){
-              if (list[i].Content[item.Number].Content.indexOf("\n")>0 && list[i].Content[item.Number].Content.indexOf("[")!=0){
-                list[i].Content[item.Number].Content="\n\n"+list[i].Content[item.Number].Content;
+            if (list[i].Content[item.Number].Content.indexOf("\n\n") == 0)
+              list[i].Content[item.Number].Content = list[i].Content[item.Number].Content.substr(2);
+
+            if (item.Tag == "诗词") {
+              if (list[i].Content[item.Number].Content.indexOf("\n") > 0 && list[i].Content[item.Number].Content.indexOf("[") != 0) {
+                list[i].Content[item.Number].Content = "\n\n" + list[i].Content[item.Number].Content;
               }
             }
-            
+
           }
           break;
         }
@@ -270,22 +294,20 @@ Page({
       wx.navigateBack({
         delta: app.globalData.TempSearchBackNumber,
       });
-    }
-    else {
+    } else {
       wx.showToast({
         title: '请选择内容',
       })
     }
   },
-  changeBishun:function(e){
-    var id=e.currentTarget.dataset.id;
+  changeBishun: function (e) {
+    var id = e.currentTarget.dataset.id;
 
-    if (id === "0"){
+    if (id === "0") {
       for (var i = 0; i < 6; i++) {
         delete this.data.CSS["CHN_BiShunArr2_" + i];
       }
-    }
-    else if (id === "1") {
+    } else if (id === "1") {
       for (var i = 0; i < 6; i++) {
         delete this.data.CSS["CHN_KaitiArr_" + i];
       }
@@ -293,92 +315,90 @@ Page({
 
     this.setData({
       ShowKaiti: id,
-      CSS:this.data.CSS,
+      CSS: this.data.CSS,
     });
 
   },
-  changeSoundMark:function(e){
-    var id=e.currentTarget.dataset.id;
+  changeSoundMark: function (e) {
+    var id = e.currentTarget.dataset.id;
     this.setData({
       ShowSoundMark: id,
     });
   },
   changeRead: function (e) {
     var id = e.currentTarget.dataset.id;
-    var count=Object.getOwnPropertyNames(this.data.CSS).length;
-    for (var i=0;i<count;i++) {
+    var count = Object.getOwnPropertyNames(this.data.CSS).length;
+    for (var i = 0; i < count; i++) {
       delete this.data.CSS["CHN_PeomContent_" + i];
     }
     delete this.data.CSS["CHN_PeomContent"];
     this.setData({
       IsPoemRead: id,
-      CSS:this.data.CSS,
+      CSS: this.data.CSS,
     });
   },
-  changeInfomation:function(e){
-    var word=e.currentTarget.dataset.word;
-    if (word.indexOf(";")>0){
-      word=word.substr(0,word.indexOf(";"));
+  changeInfomation: function (e) {
+    var word = e.currentTarget.dataset.word;
+    if (word.indexOf(";") > 0) {
+      word = word.substr(0, word.indexOf(";"));
     }
     var url = 'GetMiaoguoAISearch2?UserID=' + app.globalData.userInfo.UserID;
     url += "&Word=" + word;
     if (!e.currentTarget.dataset.ischn)
       url += "&SearchType=zici";
-    
+
     wx.showLoading();
-    
+
     main.getData(url, function (data) {
       wx.hideLoading();
-      if (data && (data.CHN || data.ENG)){
-        var obj={};
+      if (data && (data.CHN || data.ENG)) {
+        var obj = {};
         var len = 26;
-        obj.Value=data;
-          
-        if (data.CHN){
-          obj.Key=data.CHN.HanZi;
-          obj.Content=data.CHN.PinYin[0].explain;
-
-          if (obj.Key.length==1)
-            obj.TypeName="Z";
+        obj.Value = data;
+
+        if (data.CHN) {
+          obj.Key = data.CHN.HanZi;
+          obj.Content = data.CHN.PinYin[0].explain;
+
+          if (obj.Key.length == 1)
+            obj.TypeName = "Z";
           else
-            obj.TypeName="C";
-          
-          obj.Url="&UserID="+app.globalData.userInfo.UserID+"&Word="+obj.Key;
-        
-        }
-        else if (data.ENG){
-          obj.Key=data.ENG.Word;
-          obj.TypeName="D";
+            obj.TypeName = "C";
+
+          obj.Url = "&UserID=" + app.globalData.userInfo.UserID + "&Word=" + obj.Key;
+
+        } else if (data.ENG) {
+          obj.Key = data.ENG.Word;
+          obj.TypeName = "D";
           if (data.ENG.Soundmark)
-            obj.Remark=data.ENG.Soundmark.Eng;
+            obj.Remark = data.ENG.Soundmark.Eng;
 
           if (data.ENG.Paraphrase && data.ENG.Paraphrase[0] && data.ENG.Paraphrase[0].ParaphraseList)
-            obj.Content=data.ENG.Paraphrase[0].ParaphraseList;
+            obj.Content = data.ENG.Paraphrase[0].ParaphraseList;
 
-          obj.Url="&UserID="+app.globalData.userInfo.UserID+"&Word="+obj.Key;
+          obj.Url = "&UserID=" + app.globalData.userInfo.UserID + "&Word=" + obj.Key;
         }
-          
-        
-        if (data.CHN && data.CHN.PinYin && data.CHN.PinYin.length>0){
-          obj.Remark=data.CHN.PinYin[0].pinyin;
+
+
+        if (data.CHN && data.CHN.PinYin && data.CHN.PinYin.length > 0) {
+          obj.Remark = data.CHN.PinYin[0].pinyin;
         }
 
         if (obj.Content && obj.Content.length > len)
-            obj.Content = obj.Content.substr(0, len) + "...";
+          obj.Content = obj.Content.substr(0, len) + "...";
 
         main.updateSearchList(obj);
-        
-        if (app.globalData.TempSearchBackNumber==0)
-          app.globalData.TempSearchBackNumber=1;
-        else if (app.globalData.TempSearchBackNumber>=1)
-          app.globalData.TempSearchBackNumber=2;
-        
+
+        if (app.globalData.TempSearchBackNumber == 0)
+          app.globalData.TempSearchBackNumber = 1;
+        else if (app.globalData.TempSearchBackNumber >= 1)
+          app.globalData.TempSearchBackNumber = 2;
+
 
         wx.redirectTo({
           url: './addInfomationDetail',
         });
-      }
-      else{
+      } else {
         wx.showToast({
           title: '无资料',
           image: "../images/universalpic_exclamation_white_120x120.png",
@@ -386,22 +406,23 @@ Page({
       }
     });
   },
-  openHelp: function () {
-    this.setData({
-      IsShowHelp: 0,
-    });
-  },
-  showHelp: function () {
+  showHelp0: function () {
     var that = this;
     that.setData({
       IsHelp: true,
     });
   },
-  closeHelp: function () {
+  closeHelp0: function () {
     this.setData({
       IsHelp: false,
     });
   },
+  closeHelp: function () {
+    this.setData({
+      IsShowHelp: false,
+    });
+    wx.setStorageSync('IsHelpAddInfomation', 0);
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,
@@ -409,4 +430,4 @@ Page({
       imageUrl: app.globalData.ShareImage,
     }
   },
-})
+})

pages/main/addInfomationDetail.wxml

@@ -12,10 +12,10 @@
       
     </view>
     <view class="panelRight FlexRow">
-      <view class='panelTop1 FlexRow' catchtap='showHelp'>
+      <view class='panelTop1 FlexRow' catchtap='showHelp0'>
         <image class="universalpic_light_black_22x30" src='../images/universalpic_light_black_22x30.png' />
       </view>
-      <view class='panelTop1 FlexRow' catchtap="addData">
+      <view id="btnAdd" class='panelTop1 FlexRow' catchtap="addData">
         <view class="panelTop3">添加</view>
       </view>
     </view>
@@ -29,7 +29,7 @@
         <view class="panelTitle11">搜索内容</view>
       </view>
     </view>
-    <view class="{{CSS.CHN_HanZi.Css1}} panelItem FlexRow" bindtap='getInputData' data-type="normal"
+    <view id="HelpHanZi" class="{{CSS.CHN_HanZi.Css1}} panelItem FlexRow" bindtap='getInputData' data-type="normal"
       data-content="{{Result.CHN.HanZi}}" data-css="CHN_HanZi">
       <view class="FlexRow">
         <view class="{{CSS.CHN_HanZi.Css2}} panelSelect0">{{CSS.CHN_HanZi.Number}}</view>
@@ -92,7 +92,7 @@
       <view class="panelTitle2">此格式便于做个别汉字默写练习</view>
     </view>
 
-    <view class="{{CSS['CHN_TianKong_'+index].Css1}} panelItem FlexRow" wx:for="{{Result.CHN.TianKong}}" wx:key="*this"
+    <view id="helpTianKong{{index}}" class="{{CSS['CHN_TianKong_'+index].Css1}} panelItem FlexRow" wx:for="{{Result.CHN.TianKong}}" wx:key="*this"
       bindtap='getInputData' data-type="sound" data-content="{{item}}" data-css="CHN_TianKong_{{index}}"
       data-pinyin="{{Result.CHN.PinYin[0].pinyin}}" data-soundmark="{{Result.CHN.PinyinTone}}" data-tag="默写">
       <view class="FlexRow">
@@ -605,7 +605,7 @@
 <view wx:if="{{IsHelp}}" class="HelpContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
   <view class="HelpPanel1 FlexColumn">
     <view class="HelpPanel11 FlexRow">
-      <view class="HelpPanel111 FlexRow" catchtap="closeHelp">
+      <view class="HelpPanel111 FlexRow" catchtap="closeHelp0">
         <image src='../images/universalpic_close_black_24x24.png' class="universalpic_close_black_24x24" />
       </view>
       <view></view>
@@ -621,4 +621,15 @@
       </block>
     </swiper>
   </view>
+</view>
+
+<view wx:if="{{IsShowHelp}}" class="IsHelpContainer container FlexColumn">
+  <view class="IsHelpContainerTop IsHelpContainer0" style='height:{{HelpTop}}px;'></view>
+  <view class="IsHelpContainerLeft IsHelpContainer0" style='top:{{HelpTop}}px;width:{{HelpWidth1}}px;height:{{HelpHeight1}}px;'></view>
+  <view class="IsHelpContainerRight IsHelpContainer0" style='top:{{HelpTop}}px;left:{{HelpLeft2}}px;width:{{HelpWidth2}}px;height:{{HelpHeight2}}px;'></view>
+  <view class="IsHelpContainerBottom IsHelpContainer0" style='top:{{HelpBottom}}px;height:{{Containnerheight}}px;'></view>
+  <text class="HelpText1" style='top:{{HelpTextTop}}px;'>{{HelpText}}</text>
+  <view class="HelpClose FlexColumn" style="{{HelpClosePos}}:30rpx;" catchtap="closeHelp">
+    <image class="universalpic_del_gray_14x14" src="../images/universalpic_del_gray_14x14.png"></image>
+  </view>
 </view>

pages/main/default.js

@@ -14,9 +14,10 @@ Page({
     IsIPhoneX: app.globalData.IsIPhoneX,
     ImagePath: app.globalData.uploadImageUrl,
     IsShowUserID: false,
-    VersionID:app.globalData.Version,
-    AwardDayNumber:0,
-    IsShowRemind:false,
+    VersionID: app.globalData.Version,
+    AwardDayNumber: 0,
+    IsShowRemind: false,
+    IsShowHelp: false,
   },
   onPullDownRefresh: function () {
     wx.redirectTo({
@@ -39,8 +40,7 @@ Page({
     wx.showShareMenu({
       withShareTicket: true,
       menus: ['shareAppMessage', 'shareTimeline']
-    })
-
+    });
   },
   onHide: function () {
     wx.hideLoading();
@@ -53,50 +53,43 @@ Page({
           url: '../other/newuser',
         });
       }
-    }
-    else {
+    } else {
       wx.getSetting({
         success(res) {
-          if (app.globalData.userInfo.NickName=="陌生用户" && app.globalData.userInfo.IsMember==1 && app.globalData.userInfo.IsShow == 1){
+          if (app.globalData.userInfo.NickName == "陌生用户" && app.globalData.userInfo.IsMember == 1 && app.globalData.userInfo.IsShow == 1) {
             wx.navigateTo({
               url: '../index/accredit',
             });
-          }
-          else{
+          } else {
             if (!app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1) {
               if (app.globalData.userInfo.Subscribe == 1) {
                 wx.navigateTo({
                   url: '../other/userbook',
                 });
                 app.globalData.GotoUrl = "";
-              }
-              else {
+              } else {
                 wx.redirectTo({
                   url: '../other/newuser',
                 });
               }
-            }
-            else if (app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1) {
+            } else if (app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1) {
               if (app.globalData.GotoUrl.indexOf("../other/pay?PayType=6") >= 0) {
                 wx.navigateTo({
                   url: app.globalData.GotoUrl,
                 });
                 app.globalData.GotoUrl = "";
-              }
-              else {
+              } else {
                 var productServiceTime = common.formatDateCHS(common.formatTime(new Date(app.globalData.userInfo.ProductServiceTime)));
                 var today = common.formatDateCHS(common.formatTime(new Date()));
                 if (productServiceTime < today) {
                   wx.redirectTo({
                     url: '../other/userbook',
                   });
-                }
-                else if (app.globalData.userInfo.ClassDayNumber < 0) {
+                } else if (app.globalData.userInfo.ClassDayNumber < 0) {
                   wx.redirectTo({
                     url: '../other/userbook',
                   });
-                }
-                else if (app.globalData.GotoUrl) {
+                } else if (app.globalData.GotoUrl) {
                   //console.log(app.globalData.GotoUrl);
                   wx.navigateTo({
                     url: app.globalData.GotoUrl,
@@ -105,9 +98,8 @@ Page({
                 }
               }
 
-            }
-            else if (app.globalData.userInfo.IsShow == 0) {
-              main.buildInitData(function () { });
+            } else if (app.globalData.userInfo.IsShow == 0) {
+              main.buildInitData(function () {});
             }
 
             that.setData({
@@ -122,23 +114,33 @@ Page({
 
             if (res.authSetting['scope.record'] === true) {
               app.globalData.IsRecorderAccredit = 1;
-            }
-            else if (res.authSetting['scope.record'] === false) {
+            } else if (res.authSetting['scope.record'] === false) {
               app.globalData.IsRecorderAccredit = -1;
             }
 
           }
-          
+
         }
       });
     }
-    
-    app.globalData.TempStr2=null;
+
+    app.globalData.TempStr2 = null;
 
     wx.setNavigationBarColor({
       frontColor: "#ffffff",
       backgroundColor: "#3157BA",
     });
+
+    if (wx.getStorageSync("IsHelpAddInfomation") == 1) {
+      that.setData({
+        IsShowHelp: true,
+      });
+      main.ShowHelp(that, "#btnAdd", "up", "点击下方“添加题卡”按钮");
+    } else {
+      that.setData({
+        IsShowHelp: false,
+      });
+    }
   },
   init: function () {
     //显示练习模式
@@ -153,8 +155,7 @@ Page({
     var arrColorIndex = wx.getStorageSync("ColorIndexArr");
     if (!arrColorIndex) {
       app.globalData.ColorIndex = common.random(1, 4);
-    }
-    else {
+    } else {
       app.globalData.ColorIndex = arrColorIndex[common.random(0, arrColorIndex.length - 1)];
     }
     //显示答案操作方式
@@ -188,7 +189,7 @@ Page({
       wx.setStorageSync("IsShowMarketingTime", common.formatTime(common.addDate("d", 30, new Date())));
     }
 
-    if (url == "../plan/studyplan" && this.data.DayNumber<=app.globalData.IsShowSettingRemind){
+    if (url == "../plan/studyplan" && this.data.DayNumber <= app.globalData.IsShowSettingRemind) {
       wx.setStorageSync('IsShowSettingRemind', this.data.DayNumber);
     }
   },
@@ -201,8 +202,7 @@ Page({
           that.setData({
             IsMaintain: 1,
           });
-        }
-        else {
+        } else {
           var TodayTaskNumber = data.ListNew.length + data.ListReview.length + data.ListHistory.length;
           that.setData({
             DayNumber: data.DayNumber,
@@ -210,17 +210,16 @@ Page({
             IsStart: data.IsStart,
           });
 
-          
+
 
           //是否显示提示任务量设置
-          if (that.data.DayNumber<=app.globalData.IsShowSettingRemind){
+          if (that.data.DayNumber <= app.globalData.IsShowSettingRemind) {
             var IsShowSettingRemind = wx.getStorageSync("IsShowSettingRemind");
-            if (!IsShowSettingRemind || IsShowSettingRemind<that.data.DayNumber){
+            if (!IsShowSettingRemind || IsShowSettingRemind < that.data.DayNumber) {
               that.setData({
                 IsShowSettingRemind: 1,
               });
-            }
-            else{
+            } else {
               that.setData({
                 IsShowSettingRemind: 0,
               });
@@ -229,21 +228,20 @@ Page({
 
           //判断是否出现推广广告
           common.getStorageValue(that, "IsShowMarketingTime", "2020-01-01 00:00:00", function () {
-            if (that.data.IsShowMarketingTime<common.formatTime(new Date())) {
-              main.getAwardData(function(data){
-                var award=data.Total-data.AwardDayNumber
+            if (that.data.IsShowMarketingTime < common.formatTime(new Date())) {
+              main.getAwardData(function (data) {
+                var award = data.Total - data.AwardDayNumber
                 that.setData({
                   IsShowRemind: true,
-                  AwardDayNumber:award,
+                  AwardDayNumber: award,
                 });
               });
 
-            }
-            else{
-              
-              if(app.globalData.MemoryLevel==0 && data.DayNumber>=8){
+            } else {
+
+              if (app.globalData.MemoryLevel == 0 && data.DayNumber >= 8) {
                 var IsShowPatternMenu = wx.getStorageSync("IsShowPatternMenu");
-                if (!IsShowPatternMenu){
+                if (!IsShowPatternMenu) {
                   wx.navigateTo({
                     url: '../other/menu?Type=1',
                   });
@@ -253,7 +251,7 @@ Page({
             }
           });
 
-          
+
         }
       });
     });
@@ -275,8 +273,7 @@ Page({
       wx.navigateTo({
         url: '../other/recover',
       });
-    }
-    else {
+    } else {
       that.setData({
         IsTempCardNoSaved: false,
       });
@@ -286,65 +283,59 @@ Page({
       });
     }
   },
-  
+
   gotoReLaunch: function (e) {
-    var url=e.currentTarget.dataset.url;
+    var url = e.currentTarget.dataset.url;
     wx.reLaunch({
       url: url,
     });
   },
-  showUserID:function(){
+  showUserID: function () {
     var that = this;
-    if (app.globalData.userInfo.UserID == 1
-      || app.globalData.userInfo.UserID == 3 
-      || app.globalData.userInfo.UserID == 4) {
-      
-      var userid=2;
-      if (app.globalData.userInfo.UserID>=3)
+    if (app.globalData.userInfo.UserID == 1 ||
+      app.globalData.userInfo.UserID == 3 ||
+      app.globalData.userInfo.UserID == 4) {
+
+      var userid = 2;
+      if (app.globalData.userInfo.UserID >= 3)
         userid = app.globalData.userInfo.UserID;
 
       that.setData({
         IsShowUserID: true,
-        ChangeUserID:userid,
+        ChangeUserID: userid,
       });
     }
   },
   onKeyInput: function (e) {
     var id = e.detail.value;
     var usertype = e.currentTarget.dataset.type;
-    
+
     var that = this;
-    if (usertype=="userid"){
+    if (usertype == "userid") {
       that.setData({
         ChangeUserID: id,
       });
-    }
-    else if (usertype=="newuserid"){
+    } else if (usertype == "newuserid") {
       that.setData({
         ChangeNewUserID: id,
       });
-    }
-    else if (usertype=="introduceruserid"){
+    } else if (usertype == "introduceruserid") {
       that.setData({
         ChangeIntroducerUserID: id,
       });
-    }
-    else if (usertype=="versionid"){
+    } else if (usertype == "versionid") {
       that.setData({
         VersoinID: id,
       });
-    }
-    else if (usertype=="groupuserid"){
+    } else if (usertype == "groupuserid") {
       that.setData({
         ChangeGroupUserID: id,
       });
-    }
-    else if (usertype=="refunduserid"){
+    } else if (usertype == "refunduserid") {
       that.setData({
         RefundUserID: id,
       });
-    }
-    else if (usertype=="refundremark"){
+    } else if (usertype == "refundremark") {
       that.setData({
         RefundRemark: id,
       });
@@ -352,77 +343,85 @@ Page({
   },
   setSelectUser: function (e) {
     var that = this;
-    if (app.globalData.userInfo.UserID == 1
-      || app.globalData.userInfo.UserID == 2 
-      || app.globalData.userInfo.UserID == 3 
-      || app.globalData.userInfo.UserID == 4) {
+    if (app.globalData.userInfo.UserID == 1 ||
+      app.globalData.userInfo.UserID == 2 ||
+      app.globalData.userInfo.UserID == 3 ||
+      app.globalData.userInfo.UserID == 4) {
       var userid = that.data.ChangeUserID;
       wx.setStorageSync("UserID", userid);
-      
+
       app.globalData.userInfo.UserID = userid;
-      var fieldStr="&FieldStr=NickName,ProductServiceTime,AvatarUrl";
-      that.getUserInfo(userid,fieldStr,function(data){
+      var fieldStr = "";
+      that.getUserInfo(userid, fieldStr, function (data) {
         wx.setNavigationBarTitle({
           title: data.NickName
         });
         main.getUserConfig();
-        app.globalData.userInfo.ProductServiceTime=data.ProductServiceTime;
-        
-        if (app.globalData.userInfo.UserID!=2){
-          app.globalData.userInfo.NickName=data.NickName;
-          app.globalData.userInfo.AvatarUrl=data.AvatarUrl;
+        app.globalData.userInfo.ProductServiceTime = data.ProductServiceTime;
+
+        if (app.globalData.userInfo.UserID != 2) {
+          app.globalData.userInfo.NickName = data.NickName;
+          app.globalData.userInfo.AvatarUrl = data.AvatarUrl;
+        }
+        if (data.IsPromoter > 0) {
+          app.globalData.userInfo.IsPromoter = data.IsPromoter;
+          app.globalData.userInfo.PromotionLimitDays = data.PromotionLimitDays;
+          app.globalData.userInfo.PromotionLimitTime = data.PromotionLimitTime;
+          app.globalData.userInfo.WXServiceCharge = data.WXServiceCharge;
+          app.globalData.userInfo.IndividualIncomeTax = data.IndividualIncomeTax;
+          app.globalData.userInfo.WXAccount = data.WXAccount;
+          app.globalData.userInfo.RealName = data.RealName;
+          app.globalData.userInfo.IntroducerNickName = data.IntroducerNickName;
+          app.globalData.userInfo.IntroducerAvatarUrl = data.IntroducerAvatarUrl;
         }
       });
-      
+
       that.setData({
         IsShowUserID: false,
       });
       that.onShow();
     }
   },
-  getUserInfoFunction:function(e){
+  getUserInfoFunction: function (e) {
     var that = this;
-    var userid=e.currentTarget.dataset.id;
-    var type1=e.currentTarget.dataset.type;
-    var fieldStr="&FieldStr=NickName,AvatarUrl";
-    if (userid){
-      that.getUserInfo(userid,fieldStr,function(data){
-        if (type1==0){
+    var userid = e.currentTarget.dataset.id;
+    var type1 = e.currentTarget.dataset.type;
+    var fieldStr = "&FieldStr=NickName,AvatarUrl";
+    if (userid) {
+      that.getUserInfo(userid, fieldStr, function (data) {
+        if (type1 == 0) {
           that.setData({
             NewUserAvatar: data.AvatarUrl,
             NewUserNickName: data.NickName,
           });
-        }
-        else if (type1==1){
+        } else if (type1 == 1) {
           that.setData({
             IntroducerAvatar: data.AvatarUrl,
             IntroducerNickName: data.NickName,
           });
-        }
-        else if (type1==2){
+        } else if (type1 == 2) {
           that.setData({
             GroupUserAvatar: data.AvatarUrl,
             GroupUserNickName: data.NickName,
           });
-        }
-        else if (type1==3){
+        } else if (type1 == 3) {
           that.setData({
             RefundUserAvatar: data.AvatarUrl,
             RefundUserNickName: data.NickName,
           });
           var url = "GetUserPayList?UserID=" + userid;
-            main.getData(url, function (data) {
-              if (data) {
-                that.setData({
-                  PayList: data,
-                });
-              }
-            });
-          }
+          main.getData(url, function (data) {
+            if (data) {
+              that.setData({
+                PayList: data,
+              });
+            }
+          });
+        }
       });
     }
   },
-  getUserInfo:function(userID,fieldStr,callback){
+  getUserInfo: function (userID, fieldStr, callback) {
     var url = "GetMiaoguoWXUserInfo?UserID=" + userID + fieldStr;
     main.getData(url, function (data) {
       if (data) {
@@ -432,87 +431,87 @@ Page({
   },
   setUserGroup: function (e) {
     var that = this;
-    if (that.data.ChangeGroupUserID){
-      if (app.globalData.userInfo.UserID == 1
-        || app.globalData.userInfo.UserID == 2 
-        || app.globalData.userInfo.UserID == 3 
-        || app.globalData.userInfo.UserID == 4) {
-          var id=e.currentTarget.dataset.id;
-          var url = "UpdateUserMemberInfo?UserID=" + that.data.ChangeGroupUserID + "&GroupID="+id;
-          main.getData(url, function (data) {
-            that.setData({
-              ChangeGroupUserID: null,
-              GroupUserAvatar:null,
-            });
-            wx.showToast({
-              title: '群更改成功',
-            })
+    if (that.data.ChangeGroupUserID) {
+      if (app.globalData.userInfo.UserID == 1 ||
+        app.globalData.userInfo.UserID == 2 ||
+        app.globalData.userInfo.UserID == 3 ||
+        app.globalData.userInfo.UserID == 4) {
+        var id = e.currentTarget.dataset.id;
+        var url = "UpdateUserMemberInfo?UserID=" + that.data.ChangeGroupUserID + "&GroupID=" + id;
+        main.getData(url, function (data) {
+          that.setData({
+            ChangeGroupUserID: null,
+            GroupUserAvatar: null,
           });
+          wx.showToast({
+            title: '群更改成功',
+          })
+        });
       }
     }
   },
   setUserIntroducer: function (e) {
     var that = this;
-    if (that.data.ChangeNewUserID && that.data.ChangeIntroducerUserID){
-      if (app.globalData.userInfo.UserID == 1
-        || app.globalData.userInfo.UserID == 2 
-        || app.globalData.userInfo.UserID == 3 
-        || app.globalData.userInfo.UserID == 4) {
-          var url = "UpdateIntroducer?UserID=" + that.data.ChangeNewUserID + "&Introducer="+that.data.ChangeIntroducerUserID;
-          main.getData(url, function (data) {
-            that.setData({
-              ChangeNewUserID: null,
-              ChangeIntroducerUserID: null,
-              NewUserAvatar:null,
-              IntroducerAvatar:null,
-            });
-            wx.showToast({
-              title: '介绍人更改成功',
-            })
+    if (that.data.ChangeNewUserID && that.data.ChangeIntroducerUserID) {
+      if (app.globalData.userInfo.UserID == 1 ||
+        app.globalData.userInfo.UserID == 2 ||
+        app.globalData.userInfo.UserID == 3 ||
+        app.globalData.userInfo.UserID == 4) {
+        var url = "UpdateIntroducer?UserID=" + that.data.ChangeNewUserID + "&Introducer=" + that.data.ChangeIntroducerUserID;
+        main.getData(url, function (data) {
+          that.setData({
+            ChangeNewUserID: null,
+            ChangeIntroducerUserID: null,
+            NewUserAvatar: null,
+            IntroducerAvatar: null,
           });
+          wx.showToast({
+            title: '介绍人更改成功',
+          })
+        });
       }
     }
   },
-  selectPayItem:function(e){
-    var that=this;
-    var id=e.currentTarget.dataset.id;
-    var list=that.data.PayList;
-    for(var i=0;i<list.length;i++){
-      if (list[i].TradeNo==id)
-        list[i].IsSelected="1";
+  selectPayItem: function (e) {
+    var that = this;
+    var id = e.currentTarget.dataset.id;
+    var list = that.data.PayList;
+    for (var i = 0; i < list.length; i++) {
+      if (list[i].TradeNo == id)
+        list[i].IsSelected = "1";
       else
-        list[i].IsSelected="";
+        list[i].IsSelected = "";
     }
     that.setData({
-      PayList:list,
+      PayList: list,
     });
   },
-  setRefund:function(){
-    var that=this;
-    var str="",TradeNo="",Remark="";
-
-    var list=that.data.PayList;
-    for(var i=0;i<list.length;i++){
-      if (list[i].IsSelected=="1"){
-        str='确认给【'+that.data.RefundUserNickName+"】退款 ";
-        str+=list[i].Money+"元，";
-        str+="交易编号："+list[i].TradeNo;
-        TradeNo=list[i].TradeNo;
-        Remark=that.data.RefundRemark;
+  setRefund: function () {
+    var that = this;
+    var str = "",
+      TradeNo = "",
+      Remark = "";
+
+    var list = that.data.PayList;
+    for (var i = 0; i < list.length; i++) {
+      if (list[i].IsSelected == "1") {
+        str = '确认给【' + that.data.RefundUserNickName + "】退款 ";
+        str += list[i].Money + "元，";
+        str += "交易编号：" + list[i].TradeNo;
+        TradeNo = list[i].TradeNo;
+        Remark = that.data.RefundRemark;
         break;
       }
     }
-    if (!str){
+    if (!str) {
       wx.showToast({
         title: '请列表中选择',
       });
-    }
-    else if (!that.data.RefundRemark){
+    } else if (!that.data.RefundRemark) {
       wx.showToast({
         title: '请输入退款备注',
       });
-    }
-    else{
+    } else {
       wx.showModal({
         title: '退款确认',
         showCancel: true,
@@ -521,19 +520,18 @@ Page({
         confirmText: '确认',
         success(res) {
           if (res.confirm) {
-            var url = "RefundUser?UserID=" + that.data.RefundUserID + "&TradeNo="+TradeNo+"&Remark="+Remark;
+            var url = "RefundUser?UserID=" + that.data.RefundUserID + "&TradeNo=" + TradeNo + "&Remark=" + Remark;
             main.getData(url, function (data) {
               wx.showToast({
                 title: '退款完成',
               });
             });
-            
           }
         }
       });
     }
   },
-  closeRemind:function(){
+  closeRemind: function () {
     this.setData({
       IsShowRemind: false,
     });
@@ -541,24 +539,39 @@ Page({
     //判断每30天是否是高级模式
     wx.removeStorageSync('IsShowPatternMenu');
   },
-  setVersionStart:function(e){
-    var flag=e.currentTarget.dataset.flag;
-    var versionid=e.currentTarget.dataset.versionid;
-    var url = "UpdateVersionStatus?ProgramID=166&Version="+versionid+"&Flag=" + flag;
+  setVersionStart: function (e) {
+    var flag = e.currentTarget.dataset.flag;
+    var versionid = e.currentTarget.dataset.versionid;
+    var url = "UpdateVersionStatus?ProgramID=166&Version=" + versionid + "&Flag=" + flag;
     main.getData(url, function (data) {
       wx.showToast({
         title: '修改成功！',
       })
     });
   },
-  onShareAppMessage: function () {
-    return {
-      title: app.globalData.ShareTitle,
-      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: app.globalData.ShareImage,
-    }
-  },
   onShareTimeline: function () {
     return this.onShareAppMessage();
   },
-})
+  closeHelp: function () {
+    this.setData({
+      IsShowHelp: false,
+    });
+    wx.setStorageSync('IsHelpAddInfomation', 0);
+  },
+  onShareAppMessage: function () {
+    if (wx.getStorageSync("IsHelpAddInfomation") == 1) {
+      return {
+        title: "题卡制作【加资料】教程",
+        path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID + "&type=helpAddInfomation",
+        imageUrl: app.globalData.uploadImageUrl + "web/program_screenshot_lesson_a0204.png",
+      }
+    } else {
+      return {
+        title: app.globalData.ShareTitle,
+        path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+        imageUrl: app.globalData.ShareImage,
+      }
+    }
+  },
+
+})

pages/main/default.wxml

@@ -28,7 +28,7 @@
       <view class='panelBottom11 FlexColumn'>
         <view class='text5'>练习</view>
       </view>
-      <view class='panelBottom11 FlexColumn' catchtap="goto" data-url="../main/add?type=add&id=0">
+      <view id="btnAdd" class='panelBottom11 FlexColumn' catchtap="goto" data-url="../main/add?type=add&id=0">
         <image class="tabbar_add_red_70x70" src='../images/tabbar_add_red_70x70.png' />
       </view>
       <view class='panelBottom11 FlexColumn' catchtap='gotoReLaunch' data-url="../main/cardmain">
@@ -142,3 +142,16 @@
     <image class="practise_index_board_close" catchtap="closeRemind" src='../images/practise_index_board_close.png' />
   </view>
 </view>
+
+<view  wx:if="{{IsShowHelp}}" class="IsHelpContainer container FlexColumn" >
+  <view class="IsHelpContainerTop IsHelpContainer0" style='height:{{HelpTop}}px;'></view>
+  <view class="IsHelpContainerLeft IsHelpContainer0" style='top:{{HelpTop}}px;width:{{HelpWidth1}}px;height:{{HelpHeight1}}px;'></view>
+  <view class="IsHelpContainerRight IsHelpContainer0" style='top:{{HelpTop}}px;left:{{HelpLeft2}}px;height:{{HelpHeight2}}px;'></view>
+  <view class="IsHelpContainerBottom IsHelpContainer0" style='top:{{HelpBottom}}px;height:{{Containnerheight}}px;'></view>
+  <view class="HelpText1" style='top:{{HelpTextTop}}px;'>{{HelpText}}</view>
+
+  <view class="HelpClose FlexColumn" style="{{HelpClosePos}}:30rpx;" catchtap="closeHelp">
+    <image class="universalpic_del_gray_14x14" src="../images/universalpic_del_gray_14x14.png"></image>
+  </view>
+</view>
+

pages/main/default.wxss

@@ -450,4 +450,5 @@ page{
   font-size:28rpx;
   text-align: left;
   padding-left: 20rpx;
-}
+}
+

pages/main/systemsetting.js

@@ -18,6 +18,7 @@ Page({
       Version: app.globalData.Version,
       IsShow: app.globalData.userInfo.IsShow,
       ShowUserID:app.globalData.userInfo.ShowUserID,
+      IsPromoter:app.globalData.userInfo.IsPromoter,
     });
 
     common.getStorageValue(this, "HasSound", true, function () {
@@ -46,6 +47,19 @@ Page({
       });
     }
   },
+  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,
+      })
+    }
+  },
   switch1Change(e) {
     var that = this;
     that.data.HasSound = e.detail.value;

pages/main/systemsetting.wxml

@@ -22,6 +22,10 @@
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
+  <view wx:if="{{IsPromoter>0}}" class='lineFooter'></view>
+  <view wx:if="{{IsPromoter>0}}" class="panelItem00 panelItem FlexRow" bindtap='goto' data-url="../../pages_agent/main/user_index?AgentCategory=promotion">
+    返现推广计划（测试版）
+  </view>  
   <view class='lineFooter'></view>
   <view class="panelItem00 panelItem FlexRow" bindtap='updateMember'>
     重新获取用户信息

pages/other/newuser.js

@@ -104,12 +104,12 @@ Page({
     var that=this;
     var isPlay=!that.data.IsPlay;
     if (isPlay){
-      that.data.List[8].Image="bm_sy_banner-zc_pause.png";
+      that.data.List[10].Image="bm_sy_banner-zc_pause.png";
       backgroundAudioManager.title = "暖暖爸致辞";
       backgroundAudioManager.src = app.globalData.uploadImageUrl+"web/_lesson/nuannuanbazhici.m4a";
     }
     else{
-      that.data.List[8].Image="bm_sy_banner-zc_play.png";
+      that.data.List[10].Image="bm_sy_banner-zc_play.png";
       backgroundAudioManager.pause();
     }
     that.setData({

pages_agent/main/earnings_apply.js

@@ -33,17 +33,24 @@ Page({
     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=[];
+        var list1=[],list2=[],Len=0;
         for(var i=0;i<data.length;i++){
-          if (data[i].Status==-1)
+          if (data[i].Money<0)
             list1.push(data[i]);
-          else if (data[i].Status==1)
+          else {
             list2.push(data[i]);
+            if (that.data.AgentCategory=="ambassador")
+              Len+=data[i].List.length;
+          }
         }
 
+        if (that.data.AgentCategory!="ambassador")
+          Len=list2.length;
+
         that.setData({
           List1:list1,
           List2:list2,
+          Len:Len,
         });
       }
     });

pages_agent/main/earnings_apply.wxml

@@ -1,8 +1,10 @@
 <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="text1" wx:if="{{Info.IsCheck==1}}">审核通过</view>
+    <view class="text1_0 text1" wx:if="{{Info.IsCheck==0}}">等待审核</view>
+    <view class="text2" wx:if="{{Info.IsCheck==1}}">{{Info.RealMoney}}</view>
+    <view class="text2" wx:if="{{Info.IsCheck==0}}">{{Info.RealMoneyPlan}}</view>
+    <view class="text3">到账金额</view>
     <view class="line"></view>
     <view class="panel11 FlexColumn">
       <view class="panel111 FlexRow">
@@ -15,7 +17,7 @@
       </view>
       <view class="panel113 FlexRow">
         <view class="text4">批复时间</view>
-        <view class="text5"><block wx:if="{{Info.CheckTime}}">{{Info.CheckTime}}</block></view>
+        <view class="text5"><block wx:if="{{Info.CheckTime}}">{{Info.CheckTime}}</block><block wx:if="{{!Info.CheckTime}}">72小时内做出批复</block></view>
       </view>
     </view>
     <view class="line2"></view>
@@ -72,7 +74,7 @@
   </view>
 
   <view class="panel3 FlexRow">
-    <text class="text9"><text class="Number1">{{List2.length}}</text> 条收益记录</text>
+    <text class="text9"><text class="Number1">{{Len}}</text> 条收益记录</text>
     <text></text>
   </view>
 

pages_agent/main/earnings_apply.wxss

@@ -11,6 +11,10 @@
   color:#4D4D4D;
 }
 
+.text1_0{
+  color:#FE6659;
+}
+
 .text2{
   font-size: 64rpx;
   margin-top: 10rpx;

pages_agent/main/earnings_list.js

@@ -13,6 +13,7 @@ Page({
     that.setData({
       Containnerheight: main.getWindowHeight(),
       AgentCategory:options.AgentCategory,
+      IsCheck:options.IsCheck,
     });
 
     that.init();
@@ -22,8 +23,29 @@ Page({
     var list=app.globalData.EarningsList.List1;
     if (that.data.AgentCategory=="ambassador")
       list=app.globalData.EarningsList.List2;
+
+    var arr=[];
+    for(var i=0;i<list.length;i++){
+      if (that.data.IsCheck==list[i].IsCheck || that.data.IsCheck=="all"){
+        arr.push(list[i]);
+      }
+    }
+
+    var SelectMenuCss1="",SelectMenuCss2="",SelectMenuCss3="";
+    if (that.data.IsCheck=="all"){
+      SelectMenuCss1="selectItem";
+    }
+    else if (that.data.IsCheck=="0"){
+      SelectMenuCss2="selectItem";
+    }
+    else if (that.data.IsCheck=="1"){
+      SelectMenuCss3="selectItem";
+    }
     that.setData({
-      List: list,
+      SelectMenuCss1:SelectMenuCss1,
+      SelectMenuCss2:SelectMenuCss2,
+      SelectMenuCss3:SelectMenuCss3,
+      List: arr,
     });
   },
   goto: function (e) {
@@ -32,6 +54,12 @@ Page({
       url: url,
     });
   },
+  onMenu:function(e){
+    this.setData({
+      IsCheck:e.currentTarget.dataset.id,
+    });
+    this.init();
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages_agent/main/earnings_list.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText": "收益记录",
+  "navigationBarTitleText": "历史账单",
   "backgroundColor": "#F2F2F2"
 }

pages_agent/main/earnings_list.wxml

@@ -1,15 +1,31 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+    <view class="panelTop FlexRow">
+      <view class="panelTop1 FlexColumn" catchtap="onMenu" data-id="all">
+        <view class="{{SelectMenuCss1}} text0">全部</view>
+        <view class="{{SelectMenuCss1}}BG line1"></view>
+      </view>
+      <view class="panelTop1 FlexColumn" catchtap="onMenu" data-id="0">
+        <view class="{{SelectMenuCss2}} text0">审核中</view>
+        <view class="{{SelectMenuCss2}}BG line1"></view>
+      </view>
+      <view class="panelTop1 FlexColumn" catchtap="onMenu" data-id="1">
+        <view class="{{SelectMenuCss3}} text0">通过</view>
+        <view class="{{SelectMenuCss3}}BG line1"></view>
+      </view>
+    </view>
+    <view style="height:100rpx;"></view>
+  
   <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" wx:if="{{item.IsCheck==0}}">{{item.ApplyMoney}}</view>
     <view class="text2" wx:if="{{item.IsCheck==1}}">{{item.RealMoney}}</view>
-    <view class="text3">到帐金额</view>
+    <view class="text3">到账金额</view>
     <view class="line"></view>
     <view class="panel11 FlexColumn">
       <view class="panel111 FlexRow">
         <view class="text4">申请单号</view>
-        <view class="text5">{{item.ID}}</view>
+        <text class="text5" user-select="true">{{item.ID}}</text>
       </view>
       <view class="panel112 FlexRow">
         <view class="text4">申请时间</view>

pages_agent/main/earnings_list.wxss

@@ -1,3 +1,33 @@
+.panelTop{
+  position: fixed;
+  top:0;
+  width:100%;
+  background-color: #fff;
+  z-index: 10;
+}
+
+.panelTop1{
+  width:250rpx;
+  height:100rpx;
+  justify-content: flex-end;
+}
+
+.text0{
+  font-size: 36rpx;
+}
+.line1{
+  width:144rpx;
+  height:10rpx;
+  background-color: #fff;
+  margin-top:10rpx;
+}
+.selectItem{
+  color: #5282FA;
+}
+.selectItemBG{
+  background-color: #5282FA;
+}
+
 .panel1{
   width:711rpx;
   margin-top: 60rpx;

pages_agent/main/index.js

@@ -79,6 +79,11 @@ Page({
             data.IdentityCard="";
           if (!data.Phone)
             data.Phone="";
+
+          if (!data.WXAccount)
+            data.WXAccount="";
+          if (!data.RealName)
+            data.RealName="";
             
           app.globalData.userInfo = data;
           that.setData({
@@ -106,6 +111,10 @@ Page({
       wx.setNavigationBarTitle({
         title: data.NickName
       });
+      if (!data.WXAccount)
+        data.WXAccount="";
+      if (!data.RealName)
+        data.RealName="";
       app.globalData.userInfo=data;
       that.setData({
         IsPromoter:app.globalData.userInfo.IsPromoter,

pages_agent/main/index.wxml

@@ -27,8 +27,11 @@
     <button class="btn" bindtap="setSelectUser" data-userid="4398">slyicecream</button>
     <button class="btn" bindtap="setSelectUser" data-userid="14983">小云</button>
     <button class="btn" bindtap="setSelectUser" data-userid="14822">管璐瑶</button>
+    <button class="btn" bindtap="setSelectUser" data-userid="10541">忠丽</button>
     <button class="btn" bindtap="setSelectUser" data-userid="14850">艾小西</button>
     <button class="btn" bindtap="setSelectUser" data-userid="14818">甲子</button>
+    <button class="btn" bindtap="setSelectUser" data-userid="15655">大肉丁</button>
+    <button class="btn" bindtap="setSelectUser" data-userid="16109">堃堃</button>
   </view>
   
 </view>

pages_agent/main/other_list.js

@@ -17,6 +17,7 @@ Page({
       IsWithdraw:false,
       IsPromotion:false,
       User:app.globalData.userInfo,
+      RefundTotal:0,
     });
 
     wx.setNavigationBarTitle({
@@ -32,8 +33,8 @@ Page({
     if (that.data.ListType=="近期报名"){
       that.setData({
         Info: app.globalData.NewUserApplyArray,
-        Len:app.globalData.NewUserApplyArray.List.length,
       });
+      getLen(that,app.globalData.NewUserApplyArray.List);
     }
     else if (that.data.ListType=="预估新增收益"){
       that.setData({
@@ -41,45 +42,84 @@ Page({
         Len:app.globalData.EstimatedNewRevenue.Length,
         Total:"0",
       });
+      getLen(that,app.globalData.EstimatedNewRevenue.List);
     }
     else if (that.data.ListType=="可提现收益"){
       that.setData({
         Info: app.globalData.WithdrawableEarnings,
-        Len:app.globalData.WithdrawableEarnings.Length,
         Total:app.globalData.WithdrawableEarnings.Total,
       });
+      getLen(that,app.globalData.WithdrawableEarnings.List);
+
+      //查看是否有退款返还奖励
+      url="GetRefundList?AgentCategory="+that.data.AgentCategory;
+      url+="&UserID=" + app.globalData.userInfo.UserID;
+      main.getData(url, function (data) {
+        if (data) {
+          var list=data.List;
+          var num=0,refundTotal=0;
+          for(var i=0;i<list.length;i++){
+            if (list[i].IsPay===0 && list[i].Money>0){
+              num++;
+              refundTotal+=list[i].Money;
+            }
+          }
+          that.setData({
+            RefundNum:num,
+            RefundTotal:refundTotal,
+          });
+        }
+      });
     }
     else{
       if (that.data.ListType=="退款记录")
         url="GetRefundList?AgentCategory="+that.data.AgentCategory;
       else if (that.data.ListType=="未续费记录")
-        url="GetIntroducerUserList2?ListType="+that.data.ListType;
+        url="GetIntroducerUserList2?ListType="+that.data.ListType+"&AgentCategory="+that.data.AgentCategory;
       else if (that.data.ListType=="报名步骤没做完")
-        url="GetIntroducerUserList2?ListType="+that.data.ListType;
+        url="GetIntroducerUserList2?ListType="+that.data.ListType+"&AgentCategory="+that.data.AgentCategory;
       
       url+="&UserID=" + app.globalData.userInfo.UserID;
 
       main.getData(url, function (data) {
-        wx.hideLoading();
         if (data) {
+
           that.setData({
             Info: data,
-            Len:data.List.length,
           });
+          getLen(that,data.List);
+          
         }
       });
     }
+
+    function getLen(obj,list){
+      var len=0;
+        
+      if (that.data.AgentCategory=="ambassador"){
+        for(var i=0;i<list.length;i++){
+          len+=list[i].List.length;
+        }
+      }
+      else
+        len= list.length;
+
+      that.setData({
+        Len:len,
+      });
+    }
   },
   showWithdraw:function(e){
     this.setData({
       IsWithdraw:!this.data.IsWithdraw,
+      TotalAll:common.formatMoney(Number(this.data.Total)-this.data.RefundTotal),
     });
   },
   applyPay:function(e){
     var that=this;
     if (that.data.Total<1){
       wx.showToast({
-        title: '不足1元不能提现',
+        title: '满1元才能提现',
         mask: true,
         image: "../../pages/images/universalpic_exclamation_white_120x120.png",
       });
@@ -97,7 +137,7 @@ Page({
             wx.hideLoading();
             app.globalData.EarningsList = data;
             wx.redirectTo({
-              url: "earnings_list?AgentCategory="+that.data.AgentCategory,
+              url: "earnings_list?IsCheck=0&AgentCategory="+that.data.AgentCategory,
             });
           }
         });
@@ -108,6 +148,37 @@ Page({
   onPullDownRefresh: function () {
     wx.stopPullDownRefresh();
   },
+  goto: function (e) {
+    var url = e.currentTarget.dataset.url;
+    var gotoType = e.currentTarget.dataset.type;
+
+    var ispay=e.currentTarget.dataset.ispay;
+    if (url.indexOf("earnings_apply")>=0 && ispay==undefined){
+      return;
+    }
+    if (!gotoType) {
+      wx.navigateTo({
+        url: url,
+      });
+    } else {
+      wx.redirectTo({
+        url: url,
+      })
+    }
+  },
+
+  ShowImage:function(e){
+    var url=e.currentTarget.dataset.url;
+    wx.downloadFile({
+      url: url,
+      success(res) {
+        wx.previewImage({
+          current: res.tempFilePath, // 当前显示图片的http链接
+          urls: [res.tempFilePath] // 需要预览的图片http链接列表
+        });
+      }
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages_agent/main/other_list.wxml

@@ -4,13 +4,31 @@
     <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="panel12 FlexRow" bindtap="ShowImage" 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="panelRefund FlexColumn" wx:if="{{ListType=='可提现收益' && RefundNum}}">
+    <view class="panelRefund1 FlexRow">
+      <image src='../../pages/images/universalpic_exclamation_orange_40x40.png' class="universalpic_exclamation_orange_40x40" />
+      <view class="text10">您有 {{RefundNum}} 笔退款，返还奖励后，剩余收益可提现。</view>
+    </view>
+    <view class="panelRefund2 FlexRow" bindtap='goto' data-url="other_list?AgentCategory={{AgentCategory}}&ListType=退款记录">
+      <view class="text10">查看退款记录</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="text3" wx:if="{{Len>0}}"><text class="Number1">{{Len}}</text> 条记录</text>
+    <text class="text3" wx:if="{{Len==0 && ListType=='预估新增收益'}}">近期暂无用户续费</text>
+    <text class="text3" wx:if="{{Len==0 && ListType=='可提现收益'}}">暂无奖励</text>
+    <text class="text3" wx:if="{{Len==0 && ListType=='退款记录'}}">暂无用户退款</text>
+    <text class="text3" wx:if="{{Len==0 && ListType=='未续费记录'}}">暂无未续费用户</text>
+    <text class="text3" wx:if="{{Len==0 && ListType=='近期报名'}}">近期没有用户完成报名</text>
+    <text class="text3" wx:if="{{Len==0 && ListType=='报名步骤没做完'}}">暂无报名步骤没做完的用户</text>
     <text class="text8" wx:if="{{Total>0}}">收益 <text class="Number1">{{Total}}</text></text>
     <text wx:if="{{Total==0}}"></text>
   </view>
@@ -20,7 +38,7 @@
       <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
         <view class="lineWidth720"></view>
       </view>
-      <view class="panelItem FlexRow">
+      <view class="panelItem FlexRow" bindtap="goto" data-ispay="{{item.IsPay}}" data-url="earnings_apply?RecordID={{item.RecordID}}&AgentCategory={{AgentCategory}}">
         <view class="Left FlexRow">
           <image src='{{item.AvatarUrl}}' class="avatar" />
           <view class="panelItem1 FlexColumn">
@@ -28,10 +46,15 @@
             <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 class="Right FlexRow">
+          <view class="Right1 FlexColumn">
+            <view class="text6" wx:if="{{item.Remark2}}">{{item.Remark2}}</view>
+            <view class="text7" wx:if="{{item.Remark3}}">{{item.Remark3}}</view>
+            <view class="Number2" wx:if="{{item.Money && !item.Remark4}}">{{item.Money}}</view>
+            <view class="text6" wx:if="{{item.Remark4 && item.IsPay!==0}}">{{item.Remark4}}</view>
+            <view class="text61" wx:if="{{item.Remark4 && item.IsPay===0}}">{{item.Remark4}}</view>
+          </view>
+          <image wx:if="{{item.IsPay==1}}" src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
         </view>
       </view>
     </block>
@@ -49,7 +72,7 @@
         <view class="lineWidthAll FlexRow" wx:if="{{indexChild>0}}">
           <view class="lineWidth720"></view>
         </view>
-        <view class="panelItem FlexRow">
+        <view class="panelItem FlexRow" bindtap="goto" data-ispay="{{item.IsPay}}" data-url="earnings_apply?RecordID={{item.RecordID}}&AgentCategory={{AgentCategory}}">
           <view class="Left FlexRow">
             <image src='{{itemChild.AvatarUrl}}' class="avatar" />
             <view class="panelItem1 FlexColumn">
@@ -57,10 +80,15 @@
               <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 class="Right FlexRow">
+            <view class="Right1 FlexColumn">
+              <view class="text6" wx:if="{{itemChild.Remark2}}">{{itemChild.Remark2}}</view>
+              <view class="text7" wx:if="{{itemChild.Remark3}}">{{itemChild.Remark3}}</view>
+              <view class="Number2" wx:if="{{itemChild.Money && !itemChild.Remark4}}">{{itemChild.Money}}</view>
+              <view class="text6" wx:if="{{itemChild.Remark4 && itemChild.IsPay!==0}}">{{itemChild.Remark4}}</view>
+              <view class="text61" wx:if="{{itemChild.Remark4 && itemChild.IsPay===0}}">{{itemChild.Remark4}}</view>
+            </view>
+            <image wx:if="{{item.IsPay==1}}" src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
           </view>
         </view>
       </block>
@@ -68,7 +96,7 @@
     </view>
   </view>
   <view style="height:150rpx;"></view>
-  <view class="panelBottom FlexColumn" wx:if="{{ListType=='可提现收益' && Len>0}}" bindtap="showWithdraw">
+  <view class="panelBottom FlexColumn" wx:if="{{ListType=='可提现收益'}}" bindtap="showWithdraw">
     <view class="btn">申请提现</view>
   </view>
 </view>
@@ -82,27 +110,27 @@
         <view class="text53">提现金额</view>
       </view>
       <view class="panel511 FlexColumn">
-        <view class="text52">{{Total}}</view>
+        <view class="text52">{{TotalAll}}</view>
         <view class="text53">到账金额</view>
       </view>
     </view>
-    <view class="panel52 FlexRow" wx:if="{{false}}">
+    <view class="panel52 FlexRow" wx:if="{{RefundNum}}">
       <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 class="text54">{{RefundTotal}}</view>
     </view>
     <view class="panel53 FlexRow">
       <view class="text54">微信支付平台交易手续费</view>
-      <view class="text54">{{User.WXServiceCharge}}</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 class="text54">{{User.IndividualIncomeTax}}%</view>
     </view>
     <view class="lineWidthAll FlexRow">
       <view class="lineWidth680"></view>

pages_agent/main/other_list.wxss

@@ -101,6 +101,17 @@
   color:#4D4D4D;
 }
 
+.Number2{
+  font-family: 'Roboto-Black';
+  font-size:28rpx;
+  color:#4D4D4D;
+}
+.Number3{
+  font-family: 'Roboto-Black';
+  font-size:28rpx;
+  color:#FE6659;
+}
+
 .panel3{
   width:100%;
   flex-wrap: wrap;
@@ -170,6 +181,9 @@
   margin-top: 6rpx;
 }
 .Right{
+  justify-content: flex-end;
+}
+.Right1{
   margin-right: 30rpx;
   align-items: flex-end;
   height:141rpx;
@@ -178,6 +192,10 @@
   font-size: 24rpx;
   color:#4D4D4D;
 }
+.text61{
+  font-size: 24rpx;
+  color:#FE6659;
+}
 .footer{
   width:100%;
   height:232rpx;
@@ -308,4 +326,40 @@
   text-align: center;
   color:#fff;
   font-size: 48rpx;
+}
+
+.universalpic_exclamation_orange_40x40{
+  width:40rpx;
+  height: 40rpx;
+}
+
+.panelRefund{
+  width:710rpx;
+  margin-top: 60rpx;
+}
+.panelRefund1{
+  width:100%;
+  border-top-left-radius: 20rpx;
+  border-top-right-radius: 20rpx;
+  background-color: #FFE4B6;
+  height:100rpx;
+  font-size:22rpx;
+  color:#4D4D4D;
+  justify-content: flex-start;
+}
+
+.text10{
+  margin-left: 30rpx;
+}
+
+.panelRefund2{
+  width:100%;
+  border-bottom-left-radius: 20rpx;
+  border-bottom-right-radius: 20rpx;
+  background-color: #FFF;
+  height:100rpx;
+  font-size:28rpx;
+  font-weight: 400;
+  color:#4D4D4D;
+  justify-content: space-between;
 }

pages_agent/main/result_list.js

@@ -2,6 +2,7 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
+var downloadData={};
 
 Page({
   data: {
@@ -45,14 +46,16 @@ Page({
     }
     main.getData(url, function (data) {
       if (data) {
+        downloadData=data;
+        var info=data;
         if (that.data.ListType=="团队动态"){
           if (that.data.SelectMenuCss1=="selectItem")
-            data.List=data.List1;
+            info=data.团队能量;
           else if (id==2)
-            data.List=data.List2;
+            info=data.其他;
         }
         that.setData({
-          Info:data,
+          Info:info,
         });
       }
     });
@@ -95,11 +98,11 @@ Page({
     var SelectMenuCss1="",SelectMenuCss2="";
     if (id==1){
       SelectMenuCss1="selectItem";
-      that.data.Info.List=that.data.Info.List1;
+      that.data.Info=downloadData.团队能量;
     }
     else if (id==2){
       SelectMenuCss2="selectItem";
-      that.data.Info.List=that.data.Info.List2;
+      that.data.Info=downloadData.其他;
     }
     this.setData({
       SelectMenuCss1:SelectMenuCss1,
@@ -107,6 +110,18 @@ Page({
       Info:  that.data.Info
     });
   },
+  ShowImage:function(e){
+    var url=e.currentTarget.dataset.url;
+    wx.downloadFile({
+      url: url,
+      success(res) {
+        wx.previewImage({
+          current: res.tempFilePath, // 当前显示图片的http链接
+          urls: [res.tempFilePath] // 需要预览的图片http链接列表
+        });
+      }
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages_agent/main/result_list.wxml

@@ -2,7 +2,7 @@
   <block wx:if="{{!IsPromotion && ListType=='团队动态'}}">
     <view class="panelTop FlexRow">
       <view class="panelTop1 FlexColumn" catchtap="onMenu" data-id="1">
-        <view class="{{SelectMenuCss1}} text0">队员能量</view>
+        <view class="{{SelectMenuCss1}} text0">团队能量</view>
         <view class="{{SelectMenuCss1}}BG line1"></view>
       </view>
       <view class="panelTop2 panelTop1 FlexColumn" catchtap="onMenu" data-id="2">
@@ -16,21 +16,22 @@
     <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 && Info.Readme}}">
-      <view class="text2">大使工作规则</view>
+    <view class="panel12 FlexRow"  wx:if="{{!IsPromotion && Info.Readme}}" bindtap="ShowImage" data-url="{{Info.ReadmeUrl}}">
+      <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">{{Info.List.length}}</text> 条记录</text>
+    <text class="text3" wx:if="{{Info.List.length>0}}"><text class="Number1">{{Info.List.length}}</text> 位用户</text>
+    <text class="text3" wx:if="{{Info.List.length==0 && ListType=='成果记录'}}">暂无成果</text>
+    <text class="text3" wx:if="{{Info.List.length==0 && ListType=='团队动态'}}">团队中没有符合条件的成员</text>
     <text></text>
   </view>
-  <view class="panel3 FlexRow">
+  <view class="panel3 FlexRow" >
     <view class="panel31 FlexColumn" wx:for="{{Info.List}}" wx:key="*this" bindtap="gotoRecord" data-userid="{{item.UserID}}" >
       <image src='{{item.AvatarUrl}}' class="product_icon_mg_70x70" />
       <view class="text4" wx:if="{{item.IsRebate==1 || !IsPromotion}}">{{item.NickName}}</view>
@@ -42,5 +43,5 @@
       </view>
     </view>
   </view>
-  <view class="footer"></view>
+  <view class="footer" wx:if="{{Info.List.length>0}}"></view>
 </view>

pages_agent/main/result_list.wxss

@@ -60,6 +60,7 @@
 .text1{
   margin-top: 30rpx;
   width:650rpx;
+  margin-bottom: 30rpx;
 }
 
 .panel12{

pages_agent/main/search_user.js

@@ -74,6 +74,7 @@ Page({
           if (data.length==0){
             that.setData({
               IsNull:true,
+              IsList:true,
             });
           }
           else{

pages_agent/main/search_user.wxml

@@ -44,8 +44,14 @@
       <view class="panelItemSearchNull" wx:if="{{SearchTextList2.length==0}}">暂无内容，搜一次就有了</view>
 
     </view>
+    <view class="panelFooter" style='min-height:{{Containnerheight}}rpx;'></view>
   </block>
-  <block wx:if="{{IsList}}">
+  <block wx:if="{{IsNull}}">
+    <view class="text1">没有</view>
+    <text class="text2">请搜微信名字（昵称），\n请去掉名字里的表情符号再搜。\n无法搜索微信号。</text>
+  </block>
+  
+  <block wx:if="{{IsList && List.length>0}}">
     <view class="panel2 FlexColumn" style='min-height:{{Containnerheight-100}}rpx;'>
       <view class="panelItem FlexRow" wx:for="{{List}}" wx:key="index" bindtap="goto" data-url="user_relation?UserID={{item.UserID}}">
         <view class="Left FlexRow">
@@ -56,5 +62,6 @@
       </view>
     </view>
   </block>
+  
 
 </view>

pages_agent/main/search_user.wxss

@@ -1,5 +1,5 @@
 .container{
-  background-color: #fff;
+  background-color: #f0f0f0;
 }
 .panelTop {
   width: 100%;
@@ -347,4 +347,20 @@
   width:16rpx;
   height:26rpx;
   margin-right: 30rpx;
+}
+
+.panelFooter{
+  width: 100%;
+  background-color: #fff;
+}
+
+.text1{
+  margin-top: 400rpx;
+  font-size:48rpx;
+  color:#4D4D4D;
+}
+.text2{
+  font-size:28rpx;
+  color:#4D4D4D;
+  text-align: center;
 }

pages_agent/main/user_index.js

@@ -51,7 +51,7 @@ Page({
   init: function () {
     var that = this;
     if (that.data.AgentCategory == "promotion") {
-      var url = "GetIntroducerUserList2?ListType=近期报名";
+      var url = "GetIntroducerUserList2?ListType=近期报名&AgentCategory=" + that.data.AgentCategory;
       url += "&UserID=" + app.globalData.userInfo.UserID;
 
       main.getData(url, function (data) {
@@ -64,7 +64,7 @@ Page({
       });
     }
 
-    //收益记录
+    //历史账单
     var url = "GetMiaoguoAgentRecordList?UserID=" + app.globalData.userInfo.UserID + "&AgentCategory=" + that.data.AgentCategory;
     main.getData(url, function (data) {
       if (data) {

pages_agent/main/user_index.wxml

@@ -1,34 +1,38 @@
 <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 class="panel0 FlexRow" wx:if="{{User.IsPromoter==1 && IsPromotion}}">
+    <view class="panel01Left panel01 FlexRow">
       <view>直属推荐</view>
     </view>
-    <view wx:if="{{IsPromotion}}" class="panel01 FlexRow" bindtap='goto' data-url="user_index?AgentCategory=ambassador" data-type="d">
+    <view class="panel01Right 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 class="panel0 FlexRow" wx:if="{{User.IsPromoter==1 && !IsPromotion}}">
+    <view class="panel02Left 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 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>
+  <view wx:if="{{IsPromotion}}" class="text2" bindtap='goto' data-url="earnings_list?IsCheck=1&AgentCategory={{AgentCategory}}">{{Total}}</view>
+  <view wx:if="{{!IsPromotion}}" class="text1" >{{Total}}</view>
 
-  <blocl wx:if="{{!IsPromotion}}">
+  <blocl wx:if="{{!IsPromotion}}" bindtap='goto' data-url="earnings_list?IsCheck=1&AgentCategory={{AgentCategory}}">
     <view class="text9">大使收益</view>
     <view class="text10">{{Total2}}</view>
   </blocl>
 
 
-  <scroll-view wx:if="{{IsPromotion}}" class="panelAD" scroll-x="true" bindscroll="scroll">
+  <!-- <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>
+  </scroll-view> -->
 
   <view class="panelTitle FlexRow" wx:if="{{IsPromotion}}">
     <image src='../images/promotion_user_home_title02.png' class="promotion_user_home_title01" />
@@ -44,14 +48,14 @@
         <view class="text3">{{WithdrawableEarningsTotal}}</view>
         <view class="text4">可提现收益</view>
       </view>
-      <view class="panel112 FlexColumn" bindtap='goto' data-url="earnings_list?AgentCategory={{AgentCategory}}">
+      <view class="panel112 FlexColumn" bindtap='goto' data-url="earnings_list?IsCheck=0&AgentCategory={{AgentCategory}}">
         <view class="text3">{{WithdrawableEarnings}}</view>
-        <view class="text4">即将到帐</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 class="panel21 FlexRow" bindtap='goto' data-url="earnings_list?IsCheck=all&AgentCategory={{AgentCategory}}">
+        历史账单
       </view>
       <view class="line"></view>
       <view class="panel21 FlexRow" bindtap='goto' data-url="result_list?AgentCategory={{AgentCategory}}&ListType=成果记录">
@@ -65,18 +69,20 @@
   </view>
 
   <view class="panel12 panel1 FlexRow">
-    <view class="panel112 FlexColumn" wx:if="{{!IsPromotion}}">
+    <!-- <view class="panel112 FlexColumn" wx:if="{{!IsPromotion}}">
       <image src='../images/promotion_index_rules.png' class="promotion_index_rules" />
       <view class="text8">
         大使计划规则
       </view>
-    </view>
+    </view> -->
     <view class="panel112 FlexColumn" wx:if="{{!IsPromotion}}" bindtap="goto" data-url="result_list?AgentCategory={{AgentCategory}}&ListType=团队动态">
       <image src='../images/promotion_index_workbook.png' class="promotion_index_rules" />
       <view class="text8">
         团队动态
       </view>
     </view>
+
+    <!-- 
     <view class="panel112 FlexColumn" wx:if="{{IsPromotion}}">
       <image src='../images/promotion_index_rules.png' class="promotion_index_rules" />
       <view class="text8">
@@ -101,7 +107,8 @@
         消息中心
       </view>
       <view class="textMessage">新消息</view>
-    </view>
+    </view> 
+    -->
   </view>
 
   <block wx:if="{{IsPromotion}}">
@@ -119,14 +126,14 @@
       <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 class="panel14 panel1 FlexColumn" bindtap='goto' data-url="other_list?AgentCategory=promotion&ListType=未续费记录">
+        <text class="text6">暂未续费\n的朋友</text>
       </view>
     </view>
   </block>
 
-
-  <view class="textBottom FlexRow" style="color:{{FrontColor}};">
+  <view style="height:100rpx;"></view>
+  <!-- <view class="textBottom FlexRow" style="color:{{FrontColor}};">
     <view class="panel21 FlexRow" bindtap='goto' data-url="index">
       返回活动
     </view>
@@ -138,5 +145,5 @@
     <view class="panel21 FlexRow" bindtap='gotoIndex'>
       返回秒过
     </view>
-  </view>
+  </view> -->
 </view>

pages_agent/main/user_index.wxss

@@ -9,17 +9,16 @@
   width:500rpx;
   height:110rpx;
   margin-top: 30rpx;
-  background-color: #AB4E05;
   border-radius: 20rpx;
 }
 
 .panel01{
   font-size:36rpx;
-  color:#FC7406;
+  background-color:#FC7406;
   width:250rpx;
 }
 
-.panel02Left{
+.panel01Left{
   color:#fff;
   background-color: #793703;
   height:110rpx;
@@ -27,9 +26,26 @@
   border-bottom-left-radius: 20rpx;
 }
 
+.panel02Left{
+  color:#fff;
+  background-color: #B27F00;
+  height:110rpx;
+  border-top-left-radius: 20rpx;
+  border-bottom-left-radius: 20rpx;
+  color:#FFB808;
+}
+
+.panel01Right{
+  color:#fff;
+  background-color: #AB4E05;
+  height:110rpx;
+  border-top-right-radius: 20rpx;
+  border-bottom-right-radius: 20rpx;
+  color:#FC7406;
+}
 .panel02Right{
   color:#fff;
-  background-color: #793703;
+  background-color: #6E4E00;
   height:110rpx;
   border-top-right-radius: 20rpx;
   border-bottom-right-radius: 20rpx;
@@ -221,6 +237,7 @@
   height:210rpx;
   justify-content: flex-end;
   align-items: flex-start;
+  background-color: #CAF1FB;
 }
 .text6{
   margin: 0 0 30rpx 30rpx;
@@ -230,11 +247,8 @@
   width:260rpx;
   height:210rpx;
   background-color: #F7E1D1;
-  justify-content: flex-start;
-}
-.text7{
-  margin: 0 0 0 30rpx;
-  font-size:34rpx;
+  justify-content: flex-end;
+  align-items: flex-start;
 }
 
 .Null1{

pages_agent/main/user_relation.wxml

@@ -24,7 +24,8 @@
   </block>
   <view class="panel3 FlexColumn">
     <text class="text5">Ta的直属推荐</text>
-    <text class="text6"><text class="Number1" >{{Info.List.length}}</text>位用户</text>
+    <text class="text6" wx:if="{{Info.List.length>0}}"><text class="Number1" >{{Info.List.length}}</text>位用户</text>
+    <text class="text6" wx:if="{{Info.List.length==0}}">暂无成果</text>
   </view>
   <view class="panel4 FlexRow" wx:if="{{Info.List.length>0}}">
     <view class="panel41 FlexColumn" wx:for="{{Info.List}}" wx:key="index" bindtap="goto" data-url="user_relation?UserID={{item.UserID}}">

project.config.json

@@ -18,15 +18,15 @@
     "checkSiteMap": true,
     "uploadWithSourceMap": true,
     "compileHotReLoad": true,
-    "useMultiFrameRuntime": false,
-    "useApiHook": false,
-    "useApiHostProcess": false,
+    "useMultiFrameRuntime": true,
+    "useApiHook": true,
+    "useApiHostProcess": true,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
     },
-    "useIsolateContext": false,
+    "useIsolateContext": true,
     "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
     "packNpmRelationList": [],

project.private.config.json

@@ -20,10 +20,10 @@
           "scene": null
         },
         {
-          "id": 1,
           "name": "pages/index/index",
           "pathName": "pages/index/index",
-          "query": "type=activity&ActivityID=2&EndTime=2019年10月07日&EarlyBirdTimeStart=2019年09月23日&EarlyBirdTimeEnd=2019年10月05日",
+          "query": "type=helpAddInfomation",
+          "launchMode": "default",
           "scene": 1007
         },
         {
@@ -37,6 +37,13 @@
           "name": "推广",
           "pathName": "pages_agent/main/index",
           "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages_agent/main/other_list",
+          "query": "AgentCategory=promotion&ListType=%E5%8F%AF%E6%8F%90%E7%8E%B0%E6%94%B6%E7%9B%8A",
           "scene": null,
           "launchMode": "default"
         }

utils/main.js

@@ -1672,6 +1672,36 @@ function GetTestReportList(userID, callback) {
   });
 }
 
+
+function showHelp(obj,myClass,textTopDirection,helpText,closePos){
+  setTimeout(function(){
+    wx.createSelectorQuery().select(myClass).boundingClientRect(function (rect) {
+      console.log("rect.left:"+rect.left);
+      console.log("rect.top:"+rect.top);
+      console.log("rect.width:"+rect.width);
+      console.log("rect.height:"+rect.height);
+      var textTop=rect.bottom+5;
+      if (textTopDirection=="up")
+        textTop=rect.top-47;
+
+      if (!closePos)
+        closePos="Right";
+      obj.setData({
+        HelpTop:rect.top,
+        HelpWidth1:rect.left,
+        HelpHeight1:rect.height,
+        HelpLeft2:rect.right,
+        HelpHeight2:rect.height,
+        HelpBottom:rect.bottom-1,
+        HelpTextTop:textTop,
+        HelpText:helpText,
+        HelpClosePos:closePos,
+      });
+    }).exec();
+  },500);
+  
+}
+
 module.exports = {
   getData: getData,
   postData: postData,
@@ -1713,4 +1743,5 @@ module.exports = {
   downloadBishunKaitiImage: downloadBishunKaitiImage,
   GetSoundError: GetSoundError,
   GetTestReportList: GetTestReportList,
+  ShowHelp:showHelp,
 }

utils/util.js

@@ -371,6 +371,27 @@ function IsNumber(value) {//判断是否是数字，true：是，false：不是
   return !isNaN(value);
 }
 
+function formatMoney(money) {
+  var result;
+  if (money == 0)
+      result = "0.00";
+  else {
+      result = Math.round(money).toString();
+      //console.log("1:"+result);
+      if (result.indexOf(".") >= 0) {
+          if (result.substr(result.indexOf(".")).length < 3)
+              result += "0";
+      }
+      else {
+          result += ".00";
+      }
+      //console.log("2:"+result);
+
+  }
+
+  return result;
+}
+
 module.exports = {
   formatTime: formatTime,
   formatDateCHS: formatDateCHS,
@@ -395,4 +416,5 @@ module.exports = {
   IsNumber:IsNumber,
   checkIsArray: checkIsArray,
   formatDateENG: formatDateENG,
+  formatMoney:formatMoney
 }