1.3.6

app.js

@@ -26,7 +26,7 @@ App({
     }
   },
   globalData: {
-    Version: "1.3.0",
+    Version: "1.3.6",
     IsProduction: true,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",

app.json

@@ -2,7 +2,6 @@
   "pages": [
     "pages/index/index",
     "pages/index/accredit",
-    "pages/index/notice",
     "pages/index/openSetting",
 
     "pages/main/default",

marketing/main/extenduser.js

@@ -2,18 +2,14 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
-const ArrFilter1 = ["全部", "仅看未报名"];
-const ArrFilter2 = ["全部", "仅看未续费"];
-var AllList = [];
+var AllList = [],List1=[];
 
 Page({
   data: {
   },
   onLoad: function (options) {
-    if (options){
-      app.globalData.userInfo={};
-      app.globalData.userInfo.UserID=options.UserID;
-    }
+    
+    //app.globalData.userInfo.UserID=9;
     
     var pageType = 0;
     if (options.PageType == 1) {
@@ -25,12 +21,9 @@ Page({
     this.setData({
       Containnerheight: main.getWindowHeight(),
       ArrMenu: [
-        { Name: "打开过", Selected: 1 },
-        { Name: "报过名", Selected: 0 },
-        { Name: "已续费", Selected: 0 }
+        { Name: "报名了", Selected: 1 },
+        { Name: "续费了", Selected: 0 }
       ],
-      Filter1: ArrFilter1[0],
-      Filter2: ArrFilter2[0],
       ArrAward: [
         { Name: "等待出账", Remark: "等待用户渡过7天退款期的名单",List:[] },
         { Name: "出账", Remark: "已符合奖励条件的名单", List: [] },
@@ -38,33 +31,46 @@ Page({
       ],
       PageType: pageType,
     });
-    this.init();
+
+    if (app.globalData.userInfo.Subscribe == 1) {
+      this.init();
+    }
+    else{
+      wx.redirectTo({
+        url: '../../pages/other/userbook',
+      });
+    }
+    
   },
   init: function () {
     var that = this;
     main.getData('GetIntroducerUserList?UserID=' + app.globalData.userInfo.UserID, function (data) {
       wx.hideLoading();
       if (data) {
-        AllList = data;
+        List1=data.List1;
+        AllList = data.List2;
         if (that.data.PageType == 0) {
           that.setData({
-            List: data,
+            List: data.List1,
           });
         }
         else {
           var sevenday = common.formatTime(common.addDate("d",-7,new Date()));
+          //console.log(sevenday);
           for (var i = 0; i < AllList.length; i++) {
             if (AllList[i].IsPay == 1 && AllList[i].IsMember == 1){
               var payTime = AllList[i].PayTime;
-              if (sevenday < payTime) {
-                that.data.ArrAward[0].List.push(AllList[i]);
-              }
-              else {
-                if (AllList[i].IsRebate == 0) {
-                  that.data.ArrAward[1].List.push(AllList[i]);
+              if (payTime != "1900-01-01 00:00:00"){
+                if (sevenday < payTime) {
+                  that.data.ArrAward[0].List.push(AllList[i]);
                 }
                 else {
-                  that.data.ArrAward[2].List.push(AllList[i]);
+                  if (AllList[i].IsRebate == 0) {
+                    that.data.ArrAward[1].List.push(AllList[i]);
+                  }
+                  else {
+                    that.data.ArrAward[2].List.push(AllList[i]);
+                  }
                 }
               }
             }
@@ -79,83 +85,27 @@ Page({
   changeMenu: function (e) {
     var that = this;
     var id = e.currentTarget.dataset.id;
-    for (var i = 0; i < 3; i++) {
-      if (id == i)
-        that.data.ArrMenu[i].Selected = 1;
-      else
-        that.data.ArrMenu[i].Selected = 0;
-    }
-
     var list = [];
-
-    for (var i = 0; i < AllList.length; i++) {
-      if (id == 1) {
-        if (AllList[i].IsMember == 1)
-          list.push(AllList[i]);
-      }
-      else if (id == 2) {
-        if (AllList[i].IsPay == 1)
-          list.push(AllList[i]);
-      }
-      else
-        list.push(AllList[i]);
+    if (id == 0) {
+      that.data.ArrMenu[0].Selected = 1;
+      that.data.ArrMenu[1].Selected = 0;
+      list = List1;
+    }  
+    else {
+      that.data.ArrMenu[0].Selected = 0;
+      that.data.ArrMenu[1].Selected = 1;
+      list = AllList;
     }
 
     that.setData({
       ArrMenu: that.data.ArrMenu,
       List: list,
-      Filter1: ArrFilter1[0],
-      Filter2: ArrFilter2[0],
     });
 
     wx.pageScrollTo({
       scrollTop: 0,
     });
   },
-  filterData1: function (e) {
-    var that = this;
-    wx.showActionSheet({
-      itemList: ArrFilter1,
-      success(res) {
-        var list = [];
-        for (var i = 0; i < AllList.length; i++) {
-          if (res.tapIndex == 1) {
-            if (AllList[i].IsMember == 0)
-              list.push(AllList[i]);
-          }
-          else
-            list.push(AllList[i]);
-        }
-
-        that.setData({
-          Filter1: ArrFilter1[res.tapIndex],
-          List: list,
-        });
-      },
-    })
-  },
-  filterData2: function (e) {
-    var that = this;
-    wx.showActionSheet({
-      itemList: ArrFilter2,
-      success(res) {
-        var list = [];
-        for (var i = 0; i < AllList.length; i++) {
-          if (res.tapIndex == 1) {
-            if (AllList[i].IsPay == 0 && AllList[i].IsMember == 1)
-              list.push(AllList[i]);
-          }
-          else if (AllList[i].IsMember == 1)
-            list.push(AllList[i]);
-        }
-
-        that.setData({
-          Filter2: ArrFilter2[res.tapIndex],
-          List: list,
-        });
-      },
-    })
-  },
   gogoShareUser: function () {
     wx.navigateTo({
       url: './shareuser',

marketing/main/extenduser.wxml

@@ -6,24 +6,8 @@
       <view class="line1{{item.Selected}}"></view>
     </view>
   </view>
+  <view class="line2"></view>
   <view class="panel FlexColumn">
-    <view class="panel1 FlexRow" bindtap="filterData1" wx:if="{{ArrMenu[0].Selected==1}}">
-      <view class="left">筛选</view>
-      <view class="right FlexRow">
-        <view class="panel11">{{Filter1}}</view>
-        <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
-      </view>
-    </view>
-    <view class="panel1 FlexRow" bindtap="filterData2" wx:if="{{ArrMenu[1].Selected==1}}">
-      <view class="left">筛选</view>
-      <view class="right FlexRow">
-        <view class="panel11">{{Filter2}}</view>
-        <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
-      </view>
-    </view>
-    <view class="lineWidthAll FlexRow" wx:if="{{ArrMenu[2].Selected==0}}">
-      <view class="lineWidth720"></view>
-    </view>
     <view class="panel2 FlexRow">
       <view class="left">共{{List.length}}人</view>
     </view>

marketing/main/extenduser.wxss

@@ -1,3 +1,8 @@
+.container{
+  width:100%;
+  background-color:#fff;
+}
+
 .panelTop{
   width:100%;
   position: fixed;
@@ -6,7 +11,7 @@
 }
 
 .panelTop1{
-  width:250rpx;
+  width:375rpx;
   height: 90rpx;
   justify-content: flex-end;
   background-color: #fff;
@@ -25,6 +30,13 @@
   margin-bottom: 20rpx;
 }
 
+.line2{
+  width:100%;
+  height:20rpx;
+  background-color: #f0f0f0;
+  margin-top: 90rpx;
+}
+
 .line10{
   width:84rpx;
   height:10rpx;
@@ -38,7 +50,6 @@
 
 .panel{
   width:100%;
-  margin-top: 110rpx;
   background-color: #fff;
   justify-content: flex-start;
 }

marketing/main/index.js

@@ -7,6 +7,11 @@ Page({
   data: {
   },
   onLoad: function (options) {
+    if (options && options.UserID){
+      app.globalData.userInfo={};
+      app.globalData.userInfo.UserID=options.UserID;
+    }
+
     this.setData({
       Containnerheight: main.getWindowHeight(),
     });
@@ -21,6 +26,11 @@ Page({
       url: './shareuser',
     });
   },
+  gotoWeb:function(){
+    wx.navigateTo({
+      url: '../../pages/other/webview?PageID=7',
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

marketing/main/index.wxml

@@ -4,16 +4,16 @@
     <view class="panelTitle1">推广</view>
     <view class="panelTitle2"></view>
   </view>
-  <!-- <view class="panelItem FlexRow">
-    <view class="panelItem1">规则说明</view>
+  <view class="panelItem FlexRow" bindtap="gotoWeb">
+    <view class="panelItem1">活动规则</view>
     <view class="panelItem2 FlexRow">
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
   <view class="lineWidthAll FlexRow">
     <view class="lineWidth720"></view>
-  </view> -->
-  <view class="panelItem FlexRow"  bindtap="gogoShareUser">
+  </view>
+  <view class="panelItem FlexRow" bindtap="gogoShareUser">
     <view class="panelItem1">我的宣传品</view>
     <view class="panelItem2 FlexRow">
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
@@ -23,14 +23,14 @@
     <view class="lineWidth720"></view>
   </view>
   <view class="panelItem FlexRow" bindtap="gogoExtendUser" data-id="0">
-    <view class="panelItem1">推广名单</view>
+    <view class="panelItem1">推广效果</view>
     <view class="panelItem2 FlexRow">
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
   <view class='lineFooter'></view>
 
-  <view class="panelTitle FlexRow">
+  <!-- <view class="panelTitle FlexRow">
     <view class="panelTitle1">奖励</view>
     <view class="panelTitle2"></view>
   </view>
@@ -39,7 +39,8 @@
     <view class="panelItem2 FlexRow">
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
-  </view>
+  </view> -->
+
   <!-- <view class="lineWidthAll FlexRow">
     <view class="lineWidth720"></view>
   </view>
@@ -60,15 +61,4 @@
   </view> -->
   <view class='lineFooter'></view>
 
-  <!-- <view class="panelTitle FlexRow">
-    <view class="panelTitle1">辅助</view>
-    <view class="panelTitle2"></view>
-  </view>
-  <view class="panelItem FlexRow">
-    <view class="panelItem1">过程提醒</view>
-    <view class="panelItem2 FlexRow">
-      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
-    </view>
-  </view>
-  <view class='lineFooter'></view> -->
 </view>

marketing/main/shareuser.js

@@ -24,6 +24,13 @@ Page({
         });
       }
     });
+    main.getData("GetClassList?Flag=0", function (data) {
+      if (data && data.length > 0) {
+        that.setData({
+          StartDate: common.formatDateCHS(data[0].StartDate),
+        })
+      }
+    });
   }, 
   buildImage:function(){
 
@@ -38,7 +45,7 @@ Page({
     var imageUrl = '../images/promotion_leaflet_a01.png';
     var imageQRCode = app.globalData.serverUrl;
     imageQRCode += common.Encrypt("BuildWXServiceQRCode?QRCodeType=0&UserID=" + app.globalData.userInfo.UserID + "&SourceID=" + app.globalData.ProgramID);
-
+    console.log(imageQRCode);
     var that = this;
     var downloadTask = wx.downloadFile({
       url: imageQRCode,
@@ -50,7 +57,7 @@ Page({
           canvas.drawImage(res.tempFilePath, 550, 1068, 160, 160);
           canvas.fillStyle = "#1e1e1e";
           canvas.setFontSize(28);
-          canvas.fillText("开班时间：2019-09-01", 50, 1212);
+          canvas.fillText("开班时间："+that.data.StartDate, 50, 1212);
           canvas.draw(1, function (n) {
 
             wx.canvasToTempFilePath({
@@ -81,6 +88,7 @@ Page({
         }
       },
       fail: function (err) {
+        console.log("err:"+err);
         wx.hideLoading();
         downloadNumber++;
         if (downloadNumber<3)

pages/index/accredit.js

@@ -12,13 +12,21 @@ Page({
     urlRedirectTo = options.url;
     this.setData({
       Containnerheight: main.getWindowHeight(),
+      IsShow: app.globalData.userInfo.IsShow,
     });
 
+    this.init();
+
     if (!app.globalData.userInfo)
       app.globalData.userInfo={};
   },
-  onUnload: function () {
-
+  init: function () {
+    var that=this;
+    main.getData("GetAccreditInfo?IsShow=" + app.globalData.userInfo.IsShow, function (data) {
+      that.setData({
+        Info: data,
+      });
+    });
   },
   goto: function () {
     var that = this;
@@ -30,9 +38,6 @@ Page({
             success() {
               that.getUserInfo();
             },
-            fail() {
-              
-            }
           })
         }
         else {
@@ -60,15 +65,10 @@ Page({
             that.login(app.globalData.userInfo, res.userInfo);
           },
           fail: function (res) {
-            wx.navigateBack({
-              delta: 1
-            });
+            that.gotoReturn();
           }
         });
       },
-      fail: function () {
-
-      }
     });
   },
   login: function (param, param2) {
@@ -102,31 +102,18 @@ Page({
       app.globalData.userInfo.IsMember=data.IsMember;
 
       if (app.globalData.userInfo.UserID)
-        that.buildInitData();
+        main.buildInitData(function(){
+          that.gotoReturn();
+        });
       else{
         app.globalData.userInfo.UserID = data.UserID;
-        wx.navigateBack({
-          delta: 1
-        });
+        that.gotoReturn();
       }
     });
   },
-  buildInitData: function () {
-    //app.globalData.userInfo.UserID=4;
-    wx.showLoading({
-      title: '数据初始化',
-    });
-    setTimeout(function () {
-      wx.hideLoading();
-    }, 5000);
-    
-    main.getData('BuildInitData?UserID=' + app.globalData.userInfo.UserID, function (data) {
-      wx.hideLoading();
-      if (data) {
-        wx.navigateBack({
-          delta: 1
-        });
-      }
+  gotoReturn:function(){
+    wx.navigateBack({
+      delta: 1
     });
   },
   onShareAppMessage: function () {

pages/index/accredit.wxml

@@ -1,11 +1,21 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <image src="../images/universalpic_logo_200x200.png" class='img' />
-  <text class="text0">请登录</text>
 
-  <button open-type="getUserInfo" bindgetuserinfo="goto" class="btn FlexRow">
+
+  <text class="text0">{{Info.Text1}}</text>
+  <text class="text1">{{Info.Text2}}</text>
+
+  <view class="FlexRow" wx:if="{{!Info.Btn3}}">
+    <button bindtap="gotoReturn" class="btn2 btn FlexRow">
+      <view>{{Info.Btn2}}</view>
+    </button>
+    <button open-type="getUserInfo" bindgetuserinfo="goto" class="btn2 btn FlexRow">
+      <view>{{Info.Btn1}}</view>
+    </button>
+  </view>
+  <button wx:if="{{Info.Btn3}}" open-type="getUserInfo" bindgetuserinfo="goto" class="btn FlexRow">
     <image src="../images/universalpic_share_white_52x40.png" class="universalpic_share_white_52x40" />
-    <view>微信登录</view>
+    <view>{{Info.Btn3}}</view>
   </button>
 
-  <text class="text1">本产品仅对受邀用户开放</text>
 </view>

pages/index/accredit.wxss

@@ -18,6 +18,12 @@
   text-align: center;
 }
 
+.text1{
+  font-size:32rpx;
+  margin-top: 20rpx;
+  text-align: center;
+}
+
 .btn{
   width:600rpx;
   height:90rpx;
@@ -27,11 +33,9 @@
   margin-top: 40rpx;
   color:#fff;
 }
-
-.text1{
-  font-size:28rpx;
-  margin-top: 40rpx;
-  text-align: center;
+.btn2{
+  width:280rpx;
+  margin: 40rpx 20rpx;
 }
 
 .universalpic_share_white_52x40{

pages/index/index.js

@@ -23,9 +23,7 @@ const arrSentence = [
 var timeout1 = 0;
 
 Page({
-  data: {
-
-  },
+  data: {},
   onPullDownRefresh: function () {
     wx.reLaunch({
       url: './index',
@@ -143,7 +141,6 @@ Page({
       success: function (res0) {
         app.globalData.userInfo = {};
         app.globalData.userInfo.Code = res0.code;
-        //console.log("Code:" + res0.code);
         console.log("Time2:" + new Date().getTime());
         wx.getSetting({
           scope: "scope.userInfo",
@@ -239,7 +236,7 @@ Page({
             }
           }
 
-          app.globalData.IsShow = isShow;
+          app.globalData.userInfo.IsShow = isShow;
           if (app.globalData.userInfo.IsMember == 1)
             app.globalData.IsLocked = 0;
 
@@ -324,8 +321,12 @@ Page({
         content: '新版本已经准备好，是否重启应用？',
         success: function (res) {
           if (res.confirm) {
+            wx.removeStorageSync("UserID");
+            wx.removeStorageSync("UserName");
+            wx.removeStorageSync("SearchWord3");
+
             // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
-            updateManager.applyUpdate()
+            updateManager.applyUpdate();
           }
         }
       });

pages/index/notice.js

@@ -1,20 +0,0 @@
-import common from '../../utils/util';
-import main from '../../utils/main';
-
-const app = getApp();
-
-Page({
-  data: {
-  },
-  onLoad: function (options) {
-    this.setData({
-      Containnerheight: main.getWindowHeight(),
-    });
-
-  },
-  onPullDownRefresh:function(){
-    wx.reLaunch({
-      url: './index',
-    })
-  }
-});

pages/index/notice.json

@@ -1,4 +0,0 @@
-{
-  "navigationBarTitleText": "通知",
-  "enablePullDownRefresh": true
-}

pages/index/notice.wxml

@@ -1,6 +0,0 @@
-<view class="container FlexColumn" style='height:{{Containnerheight}}rpx;'>
-  <view class="text1">Sorry</view>
-  <text class="text2">目前，本产品仅对受邀用户开放。\n
-  如您是秒过学习群的朋友，\n
-  请与群主联系开通。</text>
-</view>

pages/index/notice.wxss

@@ -1,20 +0,0 @@
-.container {
-  background-color: #fff;
-  position: fixed;
-  top:0;
-}
-
-.text1{
-  position: fixed;
-  top:380rpx;
-  font-size:68rpx;
-  font-weight: 400;
-}
-.text2{
-  position: fixed;
-  top:515rpx;
-  font-size:28rpx;
-  font-weight: 400;
-  line-height: 20rpx;
-  text-align: center;
-}

pages/main/add.js

@@ -67,6 +67,7 @@ Page({
       MiaoguoCardID: options.id,
       FieldNumber: fieldNumber,
       PracticeTimeStr: PracticeTimeArr[0].Name,
+      IsShow: app.globalData.userInfo.IsShow,
     });
 
     var list = app.globalData.CardList;
@@ -758,27 +759,43 @@ Page({
     var isSave = e.currentTarget.dataset.idsave;
     if (isSave == "true") {
       isUnload = false;
-      this.updateField();
+      var content = encodeURI(that.data.FieldContent)
+      main.getData("MsgSecCheck?content=" + content, function (data) {
+        if (data && data.errcode == 0) {
+          next(that);
+        }
+        else {
+          wx.showToast({
+            title: data.errmsg,
+            duration: 2000,
+            image: "../images/universalpic_wrong_white_120x120.png",
+          });
+        }
+      });
     }
     else if (isSave == "false") {
       var content = wx.getStorageSync("TempCardInfoAddItem");
       this.setData({
         FieldContent: content,
-      })
-      this.updateField();
+      });
+      next(that);
     }
 
-    this.setData({
-      HiddenFieldEdit: true,
-    });
+    function next(obj){
+      obj.updateField();
+
+      obj.setData({
+        HiddenFieldEdit: true,
+      });
 
-    var title = "编辑题卡";
-    if (that.data.UpdateType == "add2") {
-      title = "添加题卡";
+      var title = "编辑题卡";
+      if (obj.data.UpdateType == "add2") {
+        title = "添加题卡";
+      }
+      wx.setNavigationBarTitle({
+        title: title,
+      });
     }
-    wx.setNavigationBarTitle({
-      title: title,
-    });
   },
 
   updateField: function () {
@@ -971,7 +988,7 @@ Page({
     var that = this;
     if (that.checkRecorderCount()) {
       that.recorderInit();
-      tempRecorderFile="";
+      tempRecorderFile = "";
       wx.setNavigationBarTitle({
         title: '录音',
       });

pages/main/add.wxml

@@ -143,11 +143,11 @@
         <image class="universalpic_read_end_white_38x22" src='../images/universalpic_read_end_white_38x22.png' />
       </view>
 
-      <view class="panelSaveTag2 panelSaveTag1 FlexRow" catchtap="uploadImageField">
+      <view class="panelSaveTag2 panelSaveTag1 FlexRow" catchtap="uploadImageField" wx:if="{{IsShow==1}}">
         <image class="universalpic_picture_gray_26x26" src='../images/universalpic_picture_gray_26x26.png' />
       </view>
 
-      <view class="panelSaveTag2 panelSaveTag1 FlexRow" catchtap="recorderAccredit">
+      <view class="panelSaveTag2 panelSaveTag1 FlexRow" catchtap="recorderAccredit" wx:if="{{IsShow==1}}">
         <image class="universalpic_voicerecorder_normal_gray_21x26" src='../images/universalpic_voicerecorder_normal_gray_21x26.png' />
       </view>
     </view>

pages/main/default.js

@@ -40,7 +40,7 @@ Page({
     var that = this;
     wx.getSetting({
       success(res) {
-        if (res.authSetting['scope.userInfo']) {
+        if (res.authSetting['scope.userInfo'] || app.globalData.userInfo.IsShow == 0) {
 
           if (!app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1){
             if (app.globalData.userInfo.Subscribe == 1) {
@@ -76,7 +76,9 @@ Page({
               app.globalData.GotoUrl="";
             }
           }
-          
+          else if (app.globalData.userInfo.IsShow == 0){
+            main.buildInitData(function () {});
+          }
           
           that.setData({
             IsAccredit: true,
@@ -183,6 +185,11 @@ Page({
     wx.removeStorageSync("TempCardNoSaved");
     that.isNoSavedCard();
   },
+  gotoSearchCard:function(){
+    wx.reLaunch({
+      url: './searchCard',
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/default.wxml

@@ -28,7 +28,7 @@
         <view>添加</view>
       </view>
       <view class='line1'></view>
-      <view class='panelBottom11 FlexColumn' bindtap='goto'  data-url="./searchCard">
+      <view class='panelBottom11 FlexColumn' bindtap='gotoSearchCard'>
         <image class="program_tabbar_study_default" src='../images/program_tabbar_note_default.png' />
         <view>题卡</view>
       </view>

pages/main/detail.js

@@ -702,6 +702,8 @@ Page({
 
     if (url.indexOf("http") > 0)
       url = url.substr(url.indexOf("http"));
+    if (url.indexOf("'") > 0)
+      url = common.ReplaceAllString(url, "'", "");
     url = url.replace("http://", "https://");
 
     url = encodeURI(url);

pages/main/preview.js

@@ -419,6 +419,8 @@ Page({
 
     if (url.indexOf("http") > 0)
       url = url.substr(url.indexOf("http"));
+    if (url.indexOf("'") > 0)
+      url = common.ReplaceAllString(url,"'","");
     url = url.replace("http://", "https://");
 
     url = encodeURI(url);
@@ -435,7 +437,7 @@ Page({
       setTimeout(function () {
         wx.hideLoading();
       }, 30000);
-
+      console.log(url);
       wx.downloadFile({
         url: url,
         success(res) {

pages/main/searchCard.js

@@ -10,6 +10,9 @@ Page({
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
+      AvatarUrl: app.globalData.userInfo.AvatarUrl,
+      NickName: app.globalData.userInfo.NickName,
+      IsShow: app.globalData.userInfo.IsShow,
     });
     
   },
@@ -28,9 +31,9 @@ Page({
     
   },
   gotoDefault:function(){
-    wx.redirectTo({
+    wx.reLaunch({
       url: './default',
-    })
+    });
   },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
@@ -97,6 +100,17 @@ Page({
       });
     }
   },
+  gotoAccredit:function(){
+    wx.getSetting({
+      success(res) {
+        if (!res.authSetting['scope.userInfo']){
+          wx.navigateTo({
+            url: '../index/accredit',
+          })
+        }
+      }
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/searchCard.wxml

@@ -6,6 +6,20 @@
         <view>搜索我的题卡</view>
       </view>
     </view>
+    <block wx:if="{{IsShow==0}}">
+    <view class='panelBtn FlexColumn'>
+      <view class="panelItem3 panelItem FlexRow" bindtap="gotoAccredit">
+        <view class="panelItem1 FlexRow">
+          <image class="avatar" src='{{AvatarUrl}}' />
+          <view class="text6" wx:if="{{NickName=='陌生用户'}}">点击这里登录</view>
+          <view class="text6" wx:if="{{NickName!='陌生用户'}}">{{NickName}}</view>
+        </view>
+        <view class="panelItem2 FlexRow">
+        </view>
+      </view>
+    </view>
+    <view class='lineFooter'></view>
+    </block>
     <view class='panelBtn FlexColumn'>
       <view class="panelItem FlexRow" bindtap="getList" data-id="0">
         <view class="panelItem1">

pages/main/searchCard.wxss

@@ -96,4 +96,18 @@
   width:26rpx;
   height:24rpx;
   margin-right: 20rpx;
+}
+
+.panelItem3{
+  height:140rpx;
+}
+.avatar{
+  width:80rpx;
+  height:80rpx;
+  background-color: #D8D8D8;
+  border-radius: 10rpx;
+}
+.text6{
+  font-size:28rpx;
+  margin-left: 20rpx;
 }

pages/main/searchCardList.js

@@ -39,9 +39,9 @@ Page({
       IsCollect = 1;
     }
 
-    var count=0;
+    var count = 0;
     if (options.count)
-      count=options.count;
+      count = options.count;
 
     that.setData({
       IsCollect: IsCollect,
@@ -132,11 +132,11 @@ Page({
         }
       });
     }
-    else if (that.data.Search){
+    else if (that.data.Search) {
       that.setData({
         List: list,
         Count: list.length,
-        HasPage: false,
+        HasPage: true,
       });
     }
     else {
@@ -258,6 +258,12 @@ Page({
         }
         app.globalData.CardList = list;
         that.getList();
+
+        if (data.List.length < 20) {
+          that.setData({
+            HasPage: false,
+          });
+        }
       }
     });
   },
@@ -330,7 +336,7 @@ Page({
             app.globalData.CardList = list;
             that.setData({
               List: list,
-              Count:--that.data.Count,
+              Count: --that.data.Count,
             });
           });
         }

pages/main/searchWeb.js

@@ -39,6 +39,9 @@ Page({
             break;
         }
         
+        arr[i].ScrollLeft = 0;
+        arr[i].DeleteStr = "删除";
+
         list.push(arr[i]);
       }
     }
@@ -61,6 +64,40 @@ Page({
       url: './searchWeb2',
     });
   },
+  DeleteItem: function (e) {
+    var that = this;
+    var index = e.currentTarget.dataset.index;
+    var list = that.data.SelectList;
+    var b = true;
+    for (var i = 0; i < list.length; i++) {
+      var item = list[i];
+      if (index == i) {
+        if (item.DeleteStr == "删除") {
+          item.ScrollLeft = 160;
+          item.DeleteStr = "确认删除";
+        }
+        else if (item.DeleteStr == "确认删除") {
+          b = false;
+          item.DeleteStr = "删除";
+          item.ScrollLeft = 0;
+          that.data.SelectList.splice(index, 1);
+          that.setData({
+            SelectList: that.data.SelectList,
+          });
+          wx.setStorageSync("SearchWord3", that.data.SelectList);
+        }
+      }
+      else {
+        item.DeleteStr = "删除";
+        item.ScrollLeft = 0;
+      }
+    }
+    if (b) {
+      that.setData({
+        SelectList: list,
+      });
+    }
+  },
   deleteItem: function (e) {
     var that = this;
     var index = e.currentTarget.dataset.index;

pages/main/searchWeb.wxml

@@ -15,26 +15,36 @@
     <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
       <view class="lineWidth720"></view>
     </view>
-    <view class="panelItemSearch FlexColumn" bindtap='onSearchHistory' data-index="{{index}}" data-type="many">
-        <view class="panelItemSearch1 FlexRow">
-          <view class="panelItemSearch11">
-            {{item.Key}}
+
+    <scroll-view class="ScrollView" scroll-left="{{item.ScrollLeft}}" scroll-x="true" data-index="{{index}}">
+      <view class='CellItem'>
+        <view class="panelItemSearch FlexColumn" bindtap='onSearchHistory' data-index="{{index}}" data-type="many">
+          <view class="panelItemSearch1 FlexRow">
+            <view class="panelItemSearch11">
+              {{item.Key}}
+            </view>
+            <view class="panelItemSearch12 FlexRow" wx:if="{{item.Type=='shici' || item.Type=='eng'}}">
+              {{item.TypeName}}
+            </view>
           </view>
-          <view class="panelItemSearch12 FlexRow" wx:if="{{item.Type=='shici' || item.Type=='eng'}}">
-            {{item.TypeName}}
+          <view class="panelItemSearch2 FlexRow" wx:if="{{item.Type=='zici' || item.Type=='eng'}}">
+            {{item.Remark}}
+          </view>
+          <view class="panelItemSearch2 FlexRow" wx:if="{{item.Type=='shici'}}">
+            {{item.Author}} {{item.Dynasty}}
+          </view>
+          <view class="panelItemSearch3 FlexRow">
+            {{item.Content}}
           </view>
         </view>
-        <view class="panelItemSearch2 FlexRow" wx:if="{{item.Type=='zici' || item.Type=='eng'}}">
-          {{item.Remark}}
-        </view>
-        <view class="panelItemSearch2 FlexRow" wx:if="{{item.Type=='shici'}}">
-          {{item.Author}} {{item.Dynasty}}
-        </view>
-        <view class="panelItemSearch3 FlexRow">
-          {{item.Content}}
+      </view>
+      <view class='CellDelete'>
+        <view class='DeleteItem' catchtap='DeleteItem' data-index="{{index}}">
+          <block wx:if="{{item.DeleteStr=='确认删除'}}">{{item.DeleteStr}}</block>
+          <image class="universalpic_del_white_20x28" src='../images/universalpic_del_white_20x28.png' wx:if="{{item.DeleteStr=='删除'}}" />
         </view>
       </view>
-    
+    </scroll-view>
   </block>
   <view class='lineFooter'></view>
   <view style='height:100rpx;'></view>

pages/main/searchWeb.wxss

@@ -57,6 +57,26 @@
 
 }
 
+
+.ScrollView {
+  width: 100%;
+  display: flex;
+  white-space: nowrap;
+  background-color: #fff;
+}
+
+.CellItem {
+  width: 750rpx;
+  display: inline-block;
+  position: relative;
+}
+
+.CellDelete {
+  width: 160rpx;
+  display: inline-block;
+  position: relative;
+}
+
 .panelItemSearch {
   width: 100%;
   min-height: 100rpx;
@@ -109,4 +129,22 @@
   margin-left: 30rpx;
   font-size:24rpx;
   margin-bottom: 30rpx;
+}
+
+.DeleteItem {
+  background-color: #B3443B;
+  width: 160rpx;
+  height: 167rpx;
+  line-height: 167rpx;
+  color: #fff;
+  text-align: center;
+  font-size: 30rpx;
+  position: absolute;
+  top: -58rpx;
+  left: 0;
+}
+
+.universalpic_del_white_20x28 {
+  width: 20rpx;
+  height: 28rpx;
 }

pages/main/searchWeb2.js

@@ -7,6 +7,7 @@ var hasStart = {};
 Page({
   data: {
     IsShowHelp: 1,
+    ShowKaiti:0,
     CSS: {},
   },
   onLoad: function (options) {
@@ -63,10 +64,10 @@ Page({
       if (tag == "发音")
         this.data.CSS[css].SoundMark = soundmark;
 
-      if (tag == "读写") {
-        var pinyin = e.currentTarget.dataset.pinyin;
-        if (pinyin)
-          this.data.CSS[css].SoundMark = pinyin;
+      if (tag == "默写" || tag=="拼音") {
+        var soundmark = e.currentTarget.dataset.soundmark;
+        if (soundmark)
+          this.data.CSS[css].SoundMark = e.currentTarget.dataset.soundmark;
       }
 
       this.data.CSS[css].Number = "1";
@@ -133,7 +134,7 @@ Page({
               if (item.Tag == "发音") {
                 str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
               }
-              else if (item.Tag == "拼音" || item.Tag == "读写") {
+              else if (item.Tag == "拼音" || item.Tag == "默写") {
                 if (item.SoundMark)
                   str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
                 else
@@ -185,6 +186,12 @@ Page({
       })
     }
   },
+  changeBishun:function(e){
+    var id=e.currentTarget.dataset.id;
+    this.setData({
+      ShowKaiti: id,
+    });
+  },
   openHelp: function () {
     this.setData({
       IsShowHelp: 0,

pages/main/searchWeb2.wxml

@@ -23,7 +23,7 @@
       <view class="panelTitle1">拼音</view>
     </view>
     <view class="panelItem FlexRow">
-      <view class="{{CSS['CHN_PinYin_'+index+'_pinyin'].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PinYin}}" wx:key="pinyin" bindtap='getInputData' data-type="sound" data-content="{{item.pinyin}}" data-css="CHN_PinYin_{{index}}_pinyin" data-tag="拼音">
+      <view class="{{CSS['CHN_PinYin_'+index+'_pinyin'].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PinYin}}" wx:key="pinyin" bindtap='getInputData' data-type="sound" data-content="{{item.pinyin}}" data-css="CHN_PinYin_{{index}}_pinyin" data-soundmark="{{Result.CHN.PinyinTone}}" data-tag="拼音">
         <view class="{{CSS['CHN_PinYin_'+index+'_pinyin'].Css2}} panelSelect0">{{CSS['CHN_PinYin_'+index+'_pinyin'].Number}}</view>
         <view class="text2 text1">{{item.pinyin}}</view>
       </view>
@@ -37,7 +37,7 @@
       <view class="panelTitle1">单字默写</view>
     </view>
     <view class="panelItem FlexRow">
-      <view class="{{CSS['CHN_TianKong_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.TianKong}}" wx:key="*this" bindtap='getInputData' data-type="sound" data-content="{{item}}" data-css="CHN_TianKong_{{index}}" data-pinyin="{{Result.CHN.PinYin[0].pinyin}}"
+      <view class="{{CSS['CHN_TianKong_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.TianKong}}" wx:key="*this" bindtap='getInputData' data-type="sound" data-content="{{item}}" data-css="CHN_TianKong_{{index}}" data-pinyin="{{Result.CHN.PinYin[0].pinyin}}" data-soundmark="{{Result.CHN.PinyinTone}}"
         data-tag="默写">
         <view class="{{CSS['CHN_TianKong_'+index].Css2}} panelSelect0">{{CSS['CHN_TianKong_'+index].Number}}</view>
         <view class="text1">{{item}}</view>
@@ -46,32 +46,30 @@
     <view class='lineFooter'></view>
   </block>
 
-  <!-- 笔顺和楷书 -->
-  <block wx:if="{{Result.CHN.HanZiImageUrl || Result.CHN.BiShunUrl }}">
+  <!-- 楷书数组 -->
+  <block wx:if="{{Result.CHN.KaitiArr && Result.CHN.KaitiArr.length>0 && ShowKaiti==0}}">
     <view class="panelTitle FlexRow">
       <view class="panelTitle1">书写</view>
+      <view class="panelTitle2" bindtap="changeBishun" data-id="1">换成笔顺</view>
     </view>
     <view class="panelItem FlexRow">
-      <view wx:if="{{Result.CHN.HanZiImageUrl}}" class="{{CSS.CHN_HanZiImageUrl.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="image" data-content="{{Result.CHN.HanZiImageUrl}}" data-css="CHN_HanZiImageUrl" data-tag="书写">
-        <view class="{{CSS.CHN_HanZiImageUrl.Css2}} panelSelect0">{{CSS.CHN_HanZiImageUrl.Number}}</view>
-        <image class="image1" src="{{Result.CHN.HanZiImageUrl}}" />
-      </view>
-      <view wx:if="{{Result.CHN.BiShunUrl}}" class="{{CSS.CHN_BiShunUrl.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="image" data-content="{{Result.CHN.BiShunUrl}}" data-css="CHN_BiShunUrl" data-tag="书写">
-        <view class="{{CSS.CHN_BiShunUrl.Css2}} panelSelect0">{{CSS.CHN_BiShunUrl.Number}}</view>
-        <image class="image1" src="{{Result.CHN.BiShunUrl}}" />
+      <view class="{{CSS['CHN_KaitiArr_'+index].Css1}} panelItemFrame1 panelItemFrame FlexRow" wx:for="{{Result.CHN.KaitiArr}}" wx:key="*this" bindtap='getInputData' data-type="image" data-content="{{item}}" data-css="CHN_KaitiArr_{{index}}" data-tag="书写">
+        <view class="{{CSS['CHN_KaitiArr_'+index].Css2}} panelSelect0">{{CSS['CHN_KaitiArr_'+index].Number}}</view>
+        <image class="image1" src="{{item}}" />
       </view>
     </view>
     <view class='lineFooter'></view>
   </block>
 
-  <!-- 楷书数组 -->
-  <block wx:if="{{Result.CHN.BiShunArr && Result.CHN.BiShunArr.length>0}}">
+  <!-- 笔顺数组 -->
+  <block wx:if="{{Result.CHN.BiShunArr2 && Result.CHN.BiShunArr2.length>0 && ShowKaiti==1 }}">
     <view class="panelTitle FlexRow">
       <view class="panelTitle1">书写</view>
+      <view class="panelTitle2" bindtap="changeBishun" data-id="0">换成静图</view>
     </view>
     <view class="panelItem FlexRow">
-      <view class="{{CSS['CHN_BiShunArr_'+index].Css1}} panelItemFrame1 panelItemFrame FlexRow" wx:for="{{Result.CHN.BiShunArr}}" wx:key="*this" bindtap='getInputData' data-type="image" data-content="{{item}}" data-css="CHN_BiShunArr_{{index}}" data-tag="书写">
-        <view class="{{CSS['CHN_BiShunArr_'+index].Css2}} panelSelect0">{{CSS['CHN_BiShunArr_'+index].Number}}</view>
+      <view class="{{CSS['CHN_BiShunArr2_'+index].Css1}} panelItemFrame1 panelItemFrame FlexRow" wx:for="{{Result.CHN.BiShunArr2}}" wx:key="*this" bindtap='getInputData' data-type="image" data-content="{{item}}" data-css="CHN_BiShunArr2_{{index}}" data-tag="书写">
+        <view class="{{CSS['CHN_BiShunArr2_'+index].Css2}} panelSelect0">{{CSS['CHN_BiShunArr2_'+index].Number}}</view>
         <image class="image1" src="{{item}}" />
       </view>
     </view>

pages/main/searchWeb2.wxss

@@ -11,14 +11,16 @@
 }
 
 .panelTitle .panelTitle2 {
-  font-size: 28rpx;
+  line-height:50rpx;
+  font-size: 24rpx;
   margin-right: 30rpx;
-  background-color: #1e1e1e;
-  color: #fff;
-  border-radius: 22rpx;
+  background-color: #fff;
+  color: #0071EF;
+  border-radius: 6rpx;
   text-align: center;
   padding: 0 20rpx;
-  margin-bottom: 32rpx;
+  margin-bottom: 30rpx;
+  border:1rpx solid #9B9B9B;
 }
 
 .panelItem {

pages/main/systemsetting.js

@@ -27,7 +27,7 @@ Page({
       Version: app.globalData.Version,
       ProductServiceTime: productServiceTime,
       IsPay: isPay,
-      IsShow: app.globalData.IsShow,
+      IsShow: app.globalData.userInfo.IsShow,
       ChildUserID: childUserID,
     });
   },
@@ -55,20 +55,6 @@ Page({
       url: '../index/index',
     })
   },
-  gotoPayTemp: function (e) {
-    if (app.globalData.userInfo.UserID <= 7) {
-      wx.navigateTo({
-        url: '../other/pay?paypanel=0&payindex=0',
-      });
-    }
-  },
-  gotoLesson: function () {
-    if (app.globalData.userInfo.UserID <= 7) {
-      wx.navigateTo({
-        url: '../other/lessonlist',
-      });
-    }
-  },
   gotoMarketingUserList: function (e) {
     wx.navigateTo({
       url: '../../marketing/main/index',

pages/main/systemsetting.wxml

@@ -1,33 +1,25 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-
-  <view class="panelTitle FlexRow">
-    <view class="panelTitle1">用户</view>
-    <view class="panelTitle2"></view>
-  </view>
-  <view class="panelItem FlexRow" bindtap='gotoUserbook'>
-    <view class="panelItem1">用户手册</view>
-    <view class="panelItem2 FlexRow">
-      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+  <block wx:if="{{IsShow==1}}">
+    <view class="panelTitle FlexRow">
+      <view class="panelTitle1">用户</view>
+      <view class="panelTitle2"></view>
     </view>
-  </view>
-  <view class="lineWidthAll FlexRow">
-    <view class="lineWidth720"></view>
-  </view>
-  <view class="panelItem FlexRow" bindtap='gotoMarketingUserList'>
-    <view class="panelItem1">推广计划</view>
-    <view class="panelItem2 FlexRow">
-      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+    <view class="panelItem FlexRow" bindtap='gotoUserbook'>
+      <view class="panelItem1">用户手册</view>
+      <view class="panelItem2 FlexRow">
+        <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+      </view>
     </view>
-  </view>
-  <!-- <view class="lineWidthAll FlexRow">
-    <view class="lineWidth720"></view>
-  </view>
-  <view class="panelItem FlexRow" bindtap='gotoPay'>
-    <view class="panelItem1">续费</view>
-    <view class="panelItem2 FlexRow">
-      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+    <view class="lineWidthAll FlexRow">
+      <view class="lineWidth720"></view>
+    </view>
+    <view class="panelItem FlexRow" bindtap='gotoMarketingUserList' wx:if="{{IsShow==1}}">
+      <view class="panelItem1">推广计划</view>
+      <view class="panelItem2 FlexRow">
+        <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+      </view>
     </view>
-  </view> -->
+  </block>
   <view class='lineFooter'></view>
 
   <view class="panelTitle FlexRow">
@@ -46,8 +38,8 @@
     重启小程序
   </view>
   <view class='lineFooter'></view>
-  <view style='width:100%;height:50rpx;' bindtap='gotoPayTemp'></view>
-  <text class='text1'>©2016-2019 {{ProgramName}}\n唱意教育微信小程序 版本 {{Version}}</text>
-  <view style='width:100%;height:100rpx;' bindtap='gotoLesson'></view>
+  <view style='width:100%;height:50rpx;'></view>
+  <text class='text1'>©2019 秒过™学习\n唱意教育微信小程序 版本 {{Version}}</text>
+  <view style='width:100%;height:100rpx;'></view>
 
 </view>

pages/other/activity.wxml

@@ -12,7 +12,8 @@
       <view class="panel12" bindtap="gotoPay" data-paytype="2" data-enddate="{{EndTime}}">去续费</view>
     </view>
 
-    <text class="text1">条款：领取后请在活动时间内完成续费，逾期无效。\n续费次日起7天内可退款。</text>
+    <text class="text1">条款：领取后请在活动时间内完成续费，逾期无效。</text>
+    <text class="text3">续费次日起7天内可退款。</text>
   </block>
   <block wx:if="{{ActivityID=='3'}}">
     <text class="EndTime">截止日期\n{{EndTime}}</text>
@@ -22,7 +23,8 @@
       <view class="panel11">已领取，{{DayNumber}}天内有效，</view>
       <view class="panel12" bindtap="gotoPay" data-paytype="3" data-enddate="{{EndTime}}">去续费</view>
     </view>
-    <text class="text1">条款：领取后请在活动时间内完成续费，逾期无效。\n续费次日起7天内可退款。</text>
+    <text class="text1">条款：领取后请在活动时间内完成续费，逾期无效。</text>
+    <text class="text3">续费次日起7天内可退款。</text>
   </block>
   <view style="height:100rpx"></view>
 </view>

pages/other/activity.wxss

@@ -17,6 +17,12 @@
   text-align: center;
 }
 
+.text3{
+  font-size:32rpx;
+  text-align: center;
+  font-weight: 400;
+}
+
 .panel1{
   width:560rpx;
   height:90rpx;

pages/other/binding.js

@@ -67,18 +67,20 @@ Page({
   },
   onShow: function () {
     var that = this;
-    wx.getSetting({
-      success(res) {
-        if (res.authSetting['scope.userInfo']) {
+    if (app.globalData.userInfo.IsShow==1){
+      wx.getSetting({
+        success(res) {
+          if (res.authSetting['scope.userInfo']) {
 
+          }
+          else {
+            wx.navigateTo({
+              url: '../index/accredit',
+            });
+          }
         }
-        else {
-          wx.navigateTo({
-            url: '../index/accredit',
-          });
-        }
-      }
-    });
+      });
+    }
   },
   shareFinished: function () {
     wx.showModal({

pages/other/coupon.js

@@ -12,6 +12,7 @@ Page({
 
     that.setData({
       Containnerheight: main.getWindowHeight(),
+      IsSuccess:0,
     });
 
     that.init();
@@ -20,6 +21,11 @@ Page({
     var that = this;
     main.getData("GetMiaoguoCoupon?UserID=" + app.globalData.userInfo.UserID, function (data) {
       if (data){
+        for(var i=0;i<data.length;i++){
+          if (data[i].Content[1].indexOf("[CouponNumber]")>0){
+            data[i].Content[1] = data[i].Content[1].replace("[CouponNumber]",data[i].CouponNumber);
+          }
+        }
         that.setData({
           List: data,
         });
@@ -29,26 +35,31 @@ Page({
   getCoupon: function (e) {
     var that = this;
     var coupontype = e.currentTarget.dataset.coupontype;
+    var couponnumber = e.currentTarget.dataset.couponnumber;
     var isloseefficacy = e.currentTarget.dataset.isloseefficacy;
-    if (!isloseefficacy && coupontype==134){
-      wx.showModal({
-        title: '兑换成功',
-        content: '必须重新启动小程序，然后到“用户手册”检查有效期。',
-        showCancel: false,
-        confirmText: "重启程序",
-        success(res) {
-          if (res.confirm) {
-              wx.reLaunch({
-                url: '../index/index?type=userbook',
-              });
-          }
-        },
+    if (!isloseefficacy && couponnumber>0){
+      wx.setNavigationBarColor({
+        frontColor: '#ffffff',
+        backgroundColor: '#0B8457',
+      });
+      
+      var ProductServiceTimeNew = common.formatTime(common.addDate("d", couponnumber, new Date(app.globalData.userInfo.ProductServiceTime))); 
+      
+      that.setData({
+        IsSuccess:1,
+        ProductServiceTimeOld: common.formatDateCHS(app.globalData.userInfo.ProductServiceTime),
+        ProductServiceTimeNew: common.formatDateCHS(ProductServiceTimeNew),
       });
       setTimeout(function(){
-        main.getData("UseMiaoguoCoupon?UserID=" + app.globalData.userInfo.UserID + "&CouponType=" + coupontype, function (data) {});
+        main.getData("UseMiaoguoCoupon?UserID=" + app.globalData.userInfo.UserID + "&CouponType=" + coupontype+"&CouponNumber="+couponnumber, function (data) {});
       },500);
     }
   },
+  gotoIndex:function(){
+    wx.reLaunch({
+      url: '../index/index?type=userbook',
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/other/coupon.wxml

@@ -1,7 +1,7 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <block wx:if="{{List.length>0}}">
     <view style="height:50rpx;"></view>
-    <view class="panel FlexColumn" wx:for="{{List}}" wx:key="index" bindtap="getCoupon" data-coupontype="{{item.CouponType}}" data-isloseefficacy="{{item.IsLoseEfficacy}}">
+    <view class="panel FlexColumn" wx:for="{{List}}" wx:key="index" bindtap="getCoupon" data-coupontype="{{item.CouponType}}" data-couponnumber="{{item.CouponNumber}}" data-isloseefficacy="{{item.IsLoseEfficacy}}">
       <view class="panel1 FlexColumn">
         <view class="panel11 FlexRow">
           <view class="text1">{{item.Content[0]}}</view>
@@ -20,8 +20,8 @@
       <view class="line"></view>
       <view class="panel3 FlexRow">
         <view class="panel31 FlexColumn">
-          <block wx:if="{{item.CouponType==134}}">兑换</block>
-          <block wx:if="{{item.CouponType!=134}}">使用</block>
+          <block wx:if="{{item.CouponType>=134}}">兑换</block>
+          <block wx:if="{{item.CouponType<134}}">使用</block>
         </view>
         <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
       </view>
@@ -30,4 +30,20 @@
   <block wx:if="{{List.length==0}}">
     <view class="panelNone">没有优惠券</view>
   </block>
+</view>
+
+<view class="Success container FlexColumn" style='min-height:{{Containnerheight}}rpx;' wx:if="{{IsSuccess}}">
+  
+  <image src="../images/universalpic_logo_200x200.png" class='img' />
+
+  <text class="text10">兑换成功\n重启后生效</text>
+  <text class="text11">您的秒过有效期将从</text>
+  <text class="text12">{{ProductServiceTimeOld}} 延长到 {{ProductServiceTimeNew}}</text>
+
+  <button bindtap="gotoIndex" class="btn FlexRow">
+    <view>重启</view>
+  </button>
+
+  <text class="text13">重启后可在“用户手册”检查有效期</text>
+
 </view>

pages/other/coupon.wxss

@@ -78,4 +78,51 @@
 .panelNone{
   margin-top: 462rpx;
   font-size:48rpx;
-}
+}
+
+.Success{
+  position: fixed;
+  top:0;
+  background-color: #0B8457;
+  color:#fff;
+}
+
+.img{
+  width:200rpx;
+  height:200rpx;
+  margin-top: 150rpx;
+}
+
+.text10{
+  font-size:54rpx;
+  text-align: center;
+  margin-top: 170rpx;
+}
+
+.text11{
+  font-size:32rpx;
+  margin-top: 40rpx;
+}
+
+.text12{
+  font-size:32rpx;
+  margin-top: 10rpx;
+}
+
+.btn {
+  font-size: 36rpx;
+  width: 600rpx;
+  height: 90rpx;
+  border-radius: 14rpx;
+  text-align: center;
+  line-height: 90rpx;
+  margin-top: 40rpx;
+  background-color: #0B8457;
+  border:1rpx solid #fff;
+  color:#fff;
+}
+
+.text13{
+  font-size:28rpx;
+  margin-top: 40rpx;
+}

pages/other/lessonlist.js

@@ -29,31 +29,6 @@ Page({
       url: '../other/lesson?LessonID=' + id,
     });
   },
-  gotoUserList: function (e) {
-    wx.navigateTo({
-      url: '../other/userlist',
-    });
-  },
-  gotoMarketingUserList: function (e) {
-    wx.navigateTo({
-      url: '../../marketing/main/index',
-    });
-  },
-  gotoCheckList: function () {
-    var url = '../other/homework';
-    if (this.data.CheckListUserID)
-      url += "?UserID=" + this.data.CheckListUserID;
-    wx.navigateTo({
-      url: url,
-    });
-  },
-  onKeyInput: function (e) {
-    var userid = e.detail.value;
-    var that = this;
-    that.setData({
-      CheckListUserID: userid,
-    });
-  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/other/lessonlist.wxml

@@ -20,16 +20,4 @@
     </block>
     <view class='lineFooter'></view>
   </view>
-
-  <block wx:if="{{UserID<=7}}">
-    <view style='height:300rpx;'></view>
-    <button bindtap='gotoLesson' data-id="5">暖暖爸结业致辞</button>
-    <view style='height:50rpx;'></view>
-    <button bindtap='gotoUserList'>审核用户</button>
-    <view style='height:50rpx;'></view>
-    <button bindtap='gotoMarketingUserList'>推广用户</button>
-    <view style='height:50rpx;'></view>
-    <input class='input' maxlength='4' auto-focus bindinput="onKeyInput" value="{{CheckListUserID}}" />
-    <button bindtap='gotoCheckList'>CheckList</button>
-  </block>
 </view>

pages/other/pay.js

@@ -23,7 +23,7 @@ Page({
   init: function (PayType, EndDate) {
     var that = this;
 
-    EndDate = common.formatDateENG(EndDate, "-");
+    EndDate = common.formatDateENG(EndDate, "/");
     
     main.getData('GetMiaoguoPayInfo3?EndDate=' + EndDate + '&PayType=' + PayType + '&UserID=' + app.globalData.userInfo.UserID, function (data) {
       if (data) {
@@ -41,12 +41,13 @@ Page({
     detail.Introducer = app.globalData.userInfo.Introducer;
     for (var i = 0; i < that.data.Info.List1.length; i++) {
       if (that.data.Info.List1[i].Name == "有效期") {
-        detail.EndTime = common.formatDateENG(that.data.Info.List1[i].Content);
+        detail.EndTime = common.formatDateENG(that.data.Info.List1[i].Content,"/");
       }
     }
 
     detail = JSON.stringify(detail);
 
+    console.log(detail);
     console.log(money);
     main.payMoney(7, null, money, detail, function () {
       that.setData({

pages/other/userbook.js

@@ -48,6 +48,12 @@ Page({
     ImagePath: app.globalData.uploadImageUrl,
     PanelShow: 0,
   },
+  onPullDownRefresh: function () {
+    wx.reLaunch({
+      url: '../../pages/index/index',
+    })
+    wx.stopPullDownRefresh();
+  },
   onLoad: function () {
     var that = this;
 
@@ -62,6 +68,7 @@ Page({
       AvatarUrl: app.globalData.userInfo.AvatarUrl,
       ProductServiceTime: productServiceTime,
       ArrInformation: arr,
+      IsShow: app.globalData.userInfo.IsShow,
       IsMember: app.globalData.userInfo.IsMember,
       IsPay: app.globalData.userInfo.IsPay,
       IsLoseEfficacy: app.globalData.userInfo.IsLoseEfficacy,
@@ -140,7 +147,7 @@ Page({
   onShareAppMessage: function () {
     return {
       title: "《秒过学习法》用户手册",
-      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      path: app.globalData.SharePath + '?type=userbook&UserID=' + app.globalData.userInfo.UserID,
       imageUrl: "../images/program_screenshot_usermanual.png",
     }
   },

pages/other/userbook.json

@@ -2,5 +2,6 @@
   "navigationBarTitleText": "用户手册",
   "navigationBarBackgroundColor": "#FF9F33",
   "navigationBarTextStyle": "white",
-  "backgroundColorTop": "#FF9F33"
+  "backgroundColorTop": "#FF9F33",
+  "enablePullDownRefresh": true
 }

pages/other/userbook.wxml

@@ -25,14 +25,14 @@
         <view class="panel11">{{ProductServiceTime}}</view>
       </view>
     </view>
-    <view class="panel1 FlexRow" wx:if="{{IsMember==1 && (!(ClassDayNumber>=16 || IsPay==1) || ClassDayNumber<0)}}">
+    <view class="panel1 FlexRow" wx:if="{{IsMember==1 && (!(ClassDayNumber>=16 || IsPay==1) || (ClassDayNumber<0  && IsPay==0))}}">
       <view class="left">有效期</view>
       <view class="right FlexColumn">
         <view class="panel11">{{ProductServiceTime}}</view>
         <view class="panel12">新手包16天体验</view>
       </view>
     </view>
-    <view class="panel2 FlexRow" wx:if="{{IsPay==1}}">
+    <view class="panel2 FlexRow" wx:if="{{IsShow==1 && IsPay==1}}">
       <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/pay?PayType=5&EndDate={{ClassTimeEnd}}">
         <image class="usermanual_index_wallet" src='../images/usermanual_index_wallet.png' />
         <view>去续费</view>
@@ -44,13 +44,12 @@
       </view>
     </view>
     <view class='lineFooter'></view>
-
-    <view class="panelTitle FlexRow" wx:if="{{PanelShow===2 && ClassDayNumber>=0 && (ClassDayNumber<16 || IsPay==0)}}">
+    <view class="panelTitle FlexRow" wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>=0 && (ClassDayNumber<16 || IsPay==0)}}">
       <view class="panelTitle1">会员活动</view>
       <view class="panelTitle2"></view>
     </view>
 
-    <block wx:if="{{PanelShow===2 && ClassDayNumber>=16 && IsPay==0}}">
+    <block wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>=16 && IsPay==0}}">
       <view class="panelItem FlexColumn">
         <image class="salesactivity_a04_usermanual_banner_header" src='{{ImagePath}}web/salesactivity_a04_usermanual_banner_header.png' />
         <view class="btn3 btn2 btn" bindtap="goto" data-url="../other/pay?PayType=4&EndDate={{ClassTimeEnd}}">续费</view>
@@ -59,7 +58,7 @@
       <view class="line"></view>
     </block>
 
-    <block wx:if="{{PanelShow===2 && ClassDayNumber>=13 && ClassDayNumber<16}}">
+    <block wx:if="{{IsShow==1 && PanelShow===2 && IsPay==0 && ClassDayNumber>=13 && ClassDayNumber<16}}">
       <view class="panelItem FlexColumn">
         <image class="salesactivity_a02_usermanual_banner_header" src='{{ImagePath}}web/salesactivity_a03_usermanual_banner_header.png' />
         <view class="text9">截止日期：{{ClassTimeEnd}}</view>
@@ -69,7 +68,7 @@
       <view class="line"></view>
     </block>
 
-    <block wx:if="{{PanelShow===2 && ClassDayNumber>=4 && ClassDayNumber<10}}">
+    <block wx:if="{{IsShow==1 && PanelShow===2 && IsPay==0 && ClassDayNumber>=4 && ClassDayNumber<10}}">
       <view class="panelItem FlexColumn">
         <image class="salesactivity_a02_usermanual_banner_header" src='{{ImagePath}}web/salesactivity_a02_usermanual_banner_header.png' />
         <view class="text9">活动日期：{{EarlyBirdTimeStart}}-{{EarlyBirdTimeEnd}}</view>
@@ -79,7 +78,7 @@
       <view class="line"></view>
     </block>
 
-    <block wx:if="{{PanelShow===2 && ClassDayNumber>=0 && ClassDayNumber<16}}">
+    <block wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>=0 && ClassDayNumber<16}}">
       <view class="panelItem FlexColumn">
         <image class="salesactivity_a01_usermanual_banner_header" src='{{ImagePath}}web/salesactivity_a01_usermanual_banner_header.png' />
         <view class="text5">截止日期：{{ClassTimeEnd}}</view>
@@ -96,8 +95,8 @@
       <view class="panelTitle2"></view>
     </view>
 
-    <view class="panelItem2 panelItem FlexColumn" wx:if="{{PanelShow===2 && ClassDayNumber>=16 && (IsPay==0 || IsLoseEfficacy==1) }}">
-      <text class="text3">您的有效期已过期。请尽快续费。续费后可立即恢复使用。</text>
+    <view class="panelItem2 panelItem FlexColumn" wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>=16 && (IsPay==0 || IsLoseEfficacy==1) }}">
+      <text class="text11">您的有效期已过期。请尽快续费。续费后可立即恢复使用。</text>
     </view>
 
     <view class="panelItem FlexColumn" wx:if="{{PanelShow===1}}">

pages/other/userbook.wxss

@@ -123,6 +123,11 @@
 }
 
 .text3 {
+  margin-top: 30rpx;
+  width:690rpx;
+  font-size:24rpx;
+}
+.text11 {
   color:#fff;
   font-size:24rpx;
 }

pages/plan/setting.js

@@ -5,7 +5,7 @@ const app = getApp();
 const arrSortType = ["自由安排", "到期时间较早的题卡", "到期时间较近的题卡"];
 const arrClickType = ["专属按钮", "点击空白", "两种方式"];
 var arrUserName = ["程晟涵", "临时"];
-var arrUserID = [2, 787];
+var arrUserID = [2, 568];
 
 Page({
   data: {

project.config.json

@@ -49,13 +49,13 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 1,
+			"current": 6,
 			"list": [
 				{
 					"id": 0,
 					"name": "分享",
 					"pathName": "pages/index/index",
-					"query": "UserID=1&Share=1&MiaoguoCardID=32401",
+					"query": "UserID=1&type=share&MiaoguoCardID=71228",
 					"scene": null
 				},
 				{
@@ -65,13 +65,6 @@
 					"query": "type=activity&ActivityID=3&EndTime=2019年09月10日",
 					"scene": 1007
 				},
-				{
-					"id": 2,
-					"name": "marketing/main/index",
-					"pathName": "marketing/main/index",
-					"query": "UserID=1",
-					"scene": null
-				},
 				{
 					"id": 3,
 					"name": "webview",
@@ -99,6 +92,13 @@
 					"pathName": "pages/index/index",
 					"query": "type=userbook",
 					"scene": null
+				},
+				{
+					"id": 6,
+					"name": "pages/index/index",
+					"pathName": "pages/index/index",
+					"query": "type=marketing&UserID=1",
+					"scene": null
 				}
 			]
 		}

utils/main.js

@@ -781,6 +781,25 @@ function setCollect(id, collect, callback) {
   });
 }
 
+function buildInitData (callback) {
+  var that = this;
+  //app.globalData.userInfo.UserID=4;
+  wx.showLoading({
+    title: '数据初始化',
+  });
+  setTimeout(function () {
+    wx.hideLoading();
+  }, 5000);
+
+  getData('BuildInitData?UserID=' + app.globalData.userInfo.UserID, function (data) {
+    wx.hideLoading();
+    if (data) {
+      if (callback)
+        callback();
+    }
+  });
+}
+
 function getMemoryLevelAll() {
   return [
     {
@@ -2424,4 +2443,5 @@ module.exports = {
   UploadUserConfig: UploadUserConfig,
   getServerImage: getServerImage,
   getBaiduToken: getBaiduToken,
+  buildInitData: buildInitData,
 }