1.4.0

app.js

@@ -26,8 +26,8 @@ App({
     }
   },
   globalData: {
-    Version: "1.3.7",
-    IsProduction: true,
+    Version: "1.4.0",
+    IsProduction: false,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",
     ShareImage: '../images/program_screenshot_main.png',
@@ -68,5 +68,8 @@ App({
     ClickType:0,//点击方案
     SecondConfigArray:[0,0,0],//选择记忆水平建议
     GotoUrl:"",//首页跳转页面
+    SymbolArray: "+-×÷=<>≤≥*/·≈≠±“”()[]{}《》「」％‰°℃º¹²³⁴ⁿ₁₂₃₄﹫①②③④⑤⑥⑦⑧⑨⑩½⅓⅔¼¾⅕⅖⅗⅘⅙⅚⅛⅜⅝⅞∵∴π|‖∠⊥☐△▽☆♤♧♡♢⊙√ㄨ←↑→↓↔↖↗↘↙āáǎàōóǒòēéěèīíǐìūúǔùǖǘǚǜüê＄￥〒￠￡∈∪∩⊆⊂⊇⊃∞",
+    SymbolMain:"+-×÷=",
+    SelectUserData: [2, 250]   //选择查看的用户
   }
 })

app.json

@@ -1,6 +1,7 @@
 {
   "pages": [
     "pages/index/index",
+    "pages/index/test",
     "pages/index/accredit",
     "pages/index/openSetting",
 
@@ -16,6 +17,7 @@
     "pages/main/searchWeb",
     "pages/main/detail",
     "pages/main/systemsetting",
+    "pages/main/symbolsetting",
     
     "pages/plan/recommend",
     "pages/plan/clicktype",
@@ -39,6 +41,8 @@
     "pages/other/userbook",
     "pages/other/activity",
     "pages/other/coupon",
+    "pages/other/tips",
+    "pages/other/help",
     "pages/other/pay"
     
   ],

marketing/main/extenduser.js

@@ -115,7 +115,7 @@ Page({
     return {
       title: app.globalData.ShareTitle,
       path: app.globalData.SharePath + '?type=marketing&UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: "../images/program_screenshot_promotion.png",
+      imageUrl: app.globalData.uploadImageUrl+"web/program_screenshot_promotion.png",
     }
   },
 });

marketing/main/index.js

@@ -35,7 +35,7 @@ Page({
     return {
       title: app.globalData.ShareTitle,
       path: app.globalData.SharePath + '?type=marketing&UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: "../images/program_screenshot_promotion.png",
+      imageUrl: app.globalData.uploadImageUrl+"web/program_screenshot_promotion.png",
     }
   },
 });

pages/index/index.js

@@ -74,6 +74,7 @@ Page({
         else
           app.globalData.LessonPage = 1;
 
+        var url="";
         if (app.globalData.LessonID === "all") {
           url = '../other/lessonlist';
         }
@@ -115,6 +116,12 @@ Page({
           gotoUrl: "../other/webview?PageID=" + options.PageID,
         });
       }
+      else if (options.type == "help") {
+        this.setData({
+          gotoType: "other",
+          gotoUrl: "../other/help?IsShare=1&id=" + options.ID+"&idchild="+options.IDChild,
+        });
+      }
     }
     this.setData({
       IsRefresh: false,

pages/index/test.js

@@ -0,0 +1,104 @@
+Page({
+  data:{
+    optionList:[
+      {
+        name: "标题1",
+        subname: "副标题1"
+      }, {
+        name: "标题2",
+        subname: "副标题2"
+      }, {
+        name: "标题3",
+        subname: "副标题3"
+      }, {
+        name: "标题4",
+        subname: "副标题4"
+      },
+    ],
+    kelong: {
+      top: 0,
+      xt: '',
+      name: '',
+      subname: ''
+    },
+    replace: {
+      xt: '',
+      name: '',
+      subname: ''
+    },
+  },
+  dragStart: function (e) {
+    var that = this
+    var kelong = that.data.kelong
+    var i = e.currentTarget.dataset.index
+    kelong.name = this.data.optionList[i].name
+    kelong.subname = this.data.optionList[i].subname
+
+    var query = wx.createSelectorQuery();
+    //选择id
+    query.select('.listbox').boundingClientRect(function (rect) {
+      // console.log(rect.top)
+      kelong.top = e.changedTouches[0].clientY - rect.top - 30
+      that.setData({
+        kelong: kelong,
+        showkelong: true
+      })
+    }).exec();
+  },
+  dragMove: function (e) {
+    var that = this
+    var i = e.currentTarget.dataset.index
+    var query = wx.createSelectorQuery();
+    var kelong = that.data.kelong
+    var listnum = that.data.optionList.length
+    var optionList = that.data.optionList
+    query.select('.listbox').boundingClientRect(function (rect) {
+      kelong.top = e.changedTouches[0].clientY - rect.top - 30
+      if (kelong.top < -60) {
+        kelong.top = -60
+      } else if (kelong.top > rect.height) {
+        kelong.top = rect.height - 60
+      }
+      that.setData({
+        kelong: kelong,
+      })
+
+      console.log(kelong.top);
+    }).exec();
+
+    
+  },
+  dragEnd: function (e) {
+    var that = this
+    var i = e.currentTarget.dataset.index
+    var query = wx.createSelectorQuery();
+    var kelong = that.data.kelong
+    var listnum = that.data.optionList.length
+    var optionList = that.data.optionList
+    query.select('.listbox').boundingClientRect(function (rect) {
+      kelong.top = e.changedTouches[0].clientY - rect.top - 30
+      if (kelong.top < -20) {
+        wx.showModal({
+          title: '删除提示',
+          content: '确定要删除此条记录？',
+          confirmColor: '#e4463b'
+        })
+      }
+      var target = parseInt(kelong.top / 60)
+      var replace = that.data.replace
+      if (target >= 0) {
+        replace.xt = optionList[target].xt
+        replace.name = optionList[target].name
+        replace.subname = optionList[target].subname
+        optionList[target].name = optionList[i].name
+        optionList[target].subname = optionList[i].subname
+        optionList[i].name = replace.name
+        optionList[i].subname = replace.subname
+      }
+      that.setData({
+        optionList: optionList,
+        showkelong: false
+      })
+    }).exec();
+  },
+})

pages/index/test.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/index/test.wxml

@@ -0,0 +1,19 @@
+<view class='listbox'>
+    <view class='kelong list' hidden='{{!showkelong}}' style='top:{{kelong.top}}px'>
+      <view class='index'>?</view>
+      <view class='info'>
+        <view class="name">{{kelong.name}}</view>
+        <view class='sub-name'>{{kelong.subname}}</view>
+      </view>
+      <view class='moreiconpl'>三</view>
+    </view>
+
+    <view class='list FlexRow' wx:for="{{optionList}}" wx:key="">
+      <view class='index'>{{index+1}}</view>
+      <view class='info'>
+        <view class="name">{{item.name}}</view>
+        <view class='sub-name'>{{item.subname}}</view>
+      </view>
+      <view class='moreiconpl' data-index='{{index}}' catchtouchstart='dragStart' catchtouchmove='dragMove' catchtouchend='dragEnd'>三</view>
+    </view>
+  </view>

pages/index/test.wxss

@@ -0,0 +1,65 @@
+.map-list .list {
+  position: relative;
+  height: 120rpx;
+  width: 100%;
+  justify-content: space-between;
+}
+
+.map-list .kelong {
+  position: absolute;
+}
+
+.map-list .list::after {
+  content: '';
+  width: 660rpx;
+  height: 2rpx;
+  background-color: #eee;
+  position: absolute;
+  right: 0;
+  bottom: 0;
+}
+
+.map-list .list .xt {
+  display: block;
+  width: 95rpx;
+  height: 77rpx;
+  position: absolute;
+  left: 93rpx;
+  top: 20rpx;
+}
+
+.map-list .list .more {
+  display: block;
+  width: 48rpx;
+  height: 38rpx;
+  position: absolute;
+  right: 30rpx;
+  top: 40rpx;
+}
+
+.map-list .list .info {
+  display: block;
+  width: 380rpx;
+  height: 80rpx;
+  position: absolute;
+  left: 220rpx;
+  top: 20rpx;
+  font-size: 30rpx;
+}
+
+.map-list .list .info .sub-name {
+  font-size: 28rpx;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  color: #646567;
+}
+
+.map-list .list .index {
+  color: #e4463b;
+  font-size: 32rpx;
+  font-weight: bold;
+  position: absolute;
+  left: 35rpx;
+  top: 40rpx;
+}

pages/main/add.wxml

@@ -7,7 +7,7 @@
       <image src='../images/universalpic_card_gray_26x26.png' class="universalpic_card_gray_26x26" />
     </view>
   </view>
-  <view style='height:120rpx' wx:if="{{UpdateType=='add' || UpdateType=='add2'}}"></view>
+  <view style='height:120rpx'></view>
   <view class="panelTitle FlexRow">
     <view class="panelTitle1">段落</view>
   </view>
@@ -69,17 +69,25 @@
   </block>
   <view class='lineFooter'></view>
 
-  <view class="panelTimePlan FlexRow" bindtap="showPracticeTime">
+  <view class="panelTimePlan FlexRow" bindtap="showPracticeTime" wx:if="{{IsShowPracticeTimeStart}}">
     <view class="panelItem1 FlexRow">
       <image src='../images/universalpic_clock_gray_24x24.png' class="universalpic_clock_gray_24x24" />
       <view>练习时间</view>
     </view>
     <view class="panelItem2 FlexRow">
-      <view class="panelTimePlan1" hidden="{{PracticeTimeStr!='智能安排'}}">{{PracticeTimeStr}}</view>
-      <view class="panelTimePlan2" hidden="{{PracticeTimeStr=='智能安排'}}">{{PracticeTimeStr}}</view>
-      <!-- <switch class='panelTimePlan2' checked="{{IsTodayStudy}}" bindchange="switch1Change" /> -->
+      <view class="panelTimePlan1">{{PracticeTimeStr2}}</view>
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
+  
+  <view class="panelTimePlan0 panelTimePlan FlexRow" bindtap="showPracticeTime" wx:if="{{!IsShowPracticeTimeStart}}">
+    <view class="panelItem1 FlexRow">
+      <image src='../images/universalpic_clock_white_24x24.png' class="universalpic_clock_gray_24x24" />
+      <view>练习时间</view>
+    </view>
+    <view class="panelItem2 FlexRow">
+      <view class="panelTimePlan2 panelTimePlan1">{{PracticeTimeStr2}}</view>
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
-
     </view>
   </view>
   <view style='height:300rpx;'></view>
@@ -101,9 +109,9 @@
     <view class='numberContainerFooter101 FlexRow'>
       <image class="universalpic_bell_black_30x30" src='../images/universalpic_bell_black_30x30.png' />
       <view class='numberContainerFooter11 FlexColumn'>
-        <view class='numberContainerFooter111'>练习时间</view>
+        <view class='numberContainerFooter111'>调整练习时间</view>
         <view class='numberContainerFooter112 FlexRow'>
-          <view class='{{item.CSS}} numberContainerFooter1121' wx:for="{{PracticeTimeArr}}" wx:key="index" catchtap='onPracticeTime' data-value='{{item.Name}}'>{{item.Name}}</view>
+          <view class='numberContainerFooter1121' wx:for="{{PracticeTimeArr}}" wx:key="index" catchtap='onPracticeTime' data-value='{{item.Name}}'>{{item.Name}}</view>
         </view>
       </view>
     </view>
@@ -165,15 +173,11 @@
   <view class='panelBtnItem FlexColumn'>
     <scroll-view scroll-x="true" class="panelBtnSmall" bindscroll="bindscrollHandler">
       <view class="btn0"></view>
-      <view class="btn1 btn" bindtap="addSymbol" wx:for="{{MathSymbolCommon}}" wx:key="index" data-id="{{item}}" data-type="common">{{item}}</view>
-      <view class="btn" bindtap="addSymbol" data-id="(     )">
-        <image class="universalpic_editbar_brackets_gray" src='../images/universalpic_editbar_brackets_gray.png' />
-      </view>
-      <view class="btn" bindtap="addSymbol" data-id="_____">
-        <image class="universalpic_editbar_underline_gray" src='../images/universalpic_editbar_underline_gray.png' />
-      </view>
-      <view class="btn" bindtap="addSymbol" wx:for="{{BtnArray}}" wx:key="index" data-id="{{item}}">{{item}}</view>
-      
+      <view class="btn1 btn" bindtap="addSymbol" wx:for="{{SymbolCommon}}" wx:key="index" data-id="{{item.Name1}}" data-type="common">{{item.Name2}}</view>
+      <view class="btn" bindtap="addSymbol" data-id="(     )">( )</view>
+      <view class="btn" bindtap="addSymbol" data-id="_____">_</view>
+      <view class="btn" bindtap="addSymbol" wx:for="{{SymbolMain}}" wx:key="index" data-id="{{item}}">{{item}}</view>
+      <view class="btn2 btn" bindtap="gotoSymbol">更多</view>
     </scroll-view>
     <view class='lineFooter'></view>
     <view class='panelBtn FlexRow'>

pages/main/add.wxss

@@ -50,24 +50,21 @@
   border-bottom: 1rpx solid #d2d2d2;
 }
 
-
-.panelTimePlan .panelTimePlan2 {
-  margin-left: 30rpx;
+.panelTimePlan0 {
+  background-color: #0071EF;
+  color:#fff;
 }
 
-.panelTimePlan .panelTimePlan1{
+.panelTimePlan1{
   color:#787878;
-  font-weight: 500;
-}
-.panelTimePlan .panelTimePlan2{
-  border: 2rpx solid #0071EF;
-  border-radius: 22rpx;
   font-size: 28rpx;
-  font-weight: 500;
-  color: #0071EF;
-  text-align: center;
-  line-height: 45rpx;
-  padding: 0 20rpx;
+  font-weight: 400;
+  width:220rpx;
+  text-align: right;
+}
+
+.panelTimePlan2{
+  color:#fff;
 }
 
 .universalpic_clock_gray_24x24{
@@ -144,7 +141,6 @@
 
 .panelItem2 {
   margin-right: 30rpx;
-  color: #1e1e1e;
   font-weight: 400;
 }
 
@@ -474,7 +470,7 @@
   /* font-family: 'Roboto-Black'; */
   width: 80rpx;
   background-color: #fff;
-  border: 1rpx solid #9b9b9b;
+  border: 1rpx solid #fff;
   color: #787878;
   border-radius: 10rpx;
   text-align: center;
@@ -482,12 +478,19 @@
   height: 80rpx;
   margin-top: 20rpx;
   margin-right: 10rpx;
-  font-size: 36rpx;
+  font-size: 28rpx;
+  font-weight: 700;
   display: inline-block;
 }
 
 .panelBtnSmall .btn1 {
+  border: 1rpx solid #f0f0f0;
   background-color: #f0f0f0;
+  color: #1e1e1e;
+}
+
+.panelBtnSmall .btn2 {
+  font-size: 24rpx;
 }
 
 .universalpic_editbar_brackets_gray {
@@ -601,7 +604,7 @@
 }
 .numberContainerFooter101{
   width:100%;
-  height: 337rpx;
+  height: 357rpx;
   justify-content: flex-start;
   align-items: flex-start;
 }
@@ -672,7 +675,6 @@
   justify-content: flex-start;
 }
 
-
 .RecorderPanel11{
   width:100%;
   justify-content: space-between;

pages/main/default.js

@@ -10,6 +10,7 @@ Page({
     DayNumber: 0,
     TodayTaskNumber: 0,
     IsStart: 0,
+    IsShowMarketing: 1,
   },
   onPullDownRefresh: function () {
     wx.redirectTo({
@@ -110,6 +111,10 @@ Page({
         }
       }
     });
+    wx.setNavigationBarColor({
+      frontColor: "#ffffff",
+      backgroundColor: "#3157BA",
+    });
   },
   init:function(){
     //题卡主题色
@@ -190,6 +195,12 @@ Page({
       url: './searchCard',
     });
   },
+  closeMarketing:function(){
+    this.setData({
+      IsShowMarketing:2,
+    });
+    wx.setStorageSync("IsShowMarketing",2);
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/default.wxml

@@ -15,6 +15,9 @@
 
   <view class='panelBottom FlexColumn'>
 
+    <image class="study_index_banner_close" src='../images/study_index_banner_close.png' bindtap="closeMarketing" wx:if="{{IsShowMarketing==1}}"/>
+    <image class="study_index_banner" src='../images/study_index_banner.png' bindtap="goto" data-url="../../marketing/main/index" wx:if="{{IsShowMarketing==1}}" />
+    
     <image class="study_index_footer" src='../images/study_index_footer.png' />
 
     <view class='panelBottom1 FlexRow'>

pages/main/default.wxss

@@ -36,6 +36,7 @@
   margin-top: 60rpx;
 }
 
+
 .study_index_start {
   width: 377rpx;
   height: 240rpx;
@@ -55,6 +56,24 @@
   bottom: 0;
   width: 100%;
 }
+
+
+.study_index_banner_close{
+  width: 50rpx;
+  height: 50rpx;
+  z-index: 100;
+  align-self: flex-end;
+  margin-right: 20rpx;
+  margin-bottom: -50rpx;
+}
+
+.study_index_banner{
+  width: 360rpx;
+  height: 148rpx;
+  align-self: flex-end;
+  margin-right: 20rpx;
+}
+
 .study_index_footer{
   width: 100%;
   height:130rpx;

pages/main/detail.js

@@ -543,7 +543,7 @@ Page({
       duration = 0;
     finishCard.Duration = timeHistory + duration;
 
-    //console.log("CardTime:"+finishCard.Duration);
+    console.log("CardTime:"+finishCard.Duration);
 
     timeHistory = 0;
     that.timeCompute();
@@ -585,6 +585,8 @@ Page({
         Recommend: 0,
         IsMore: false,
       });
+      clearTimeout(timeoutEveryCard);
+      
       that.setSoundFile(1);
       main.UpdateMiaoguoCardTodayAll(true, function () {
         listTaskFinished = [];
@@ -634,7 +636,7 @@ Page({
     timeoutEveryCard=setTimeout(function(){
       //计算暂停时已经用掉的时长
       timeHistory += common.diffDate("s", timeStart, new Date());
-      //console.log("timeHistory:"+timeHistory);
+      console.log("timeHistory:"+timeHistory);
       wx.showModal({
         title: '提醒',
         content: '您已等待了' + app.globalData.CardWaitTimeMax+'分钟',

pages/main/searchCard.js

@@ -46,12 +46,12 @@ Page({
       url: './searchCard1',
     })
   },
-  gotoSystemsetting: function(e) {
+  gotoUserbook: function (e) {
     wx.navigateTo({
-      url: './systemsetting',
+      url: '../other/userbook',
     })
   },
-  
+
   getList: function (e) {
     wx.showLoading({
       title: '请稍候',

pages/main/searchCard.wxml

@@ -55,11 +55,10 @@
       </view>
     </view>
     <view class='lineFooter'></view>
-
     <view class='panelBtn FlexColumn'>
-      <view class="panelItem FlexRow" bindtap="gotoSystemsetting">
+      <view class="panelItem FlexRow" bindtap="gotoUserbook">
         <view class="panelItem1">
-          系统设置
+          用户手册
         </view>
         <view class="panelItem2 FlexRow">
           <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />

pages/main/searchWeb2.js

@@ -188,9 +188,23 @@ Page({
   },
   changeBishun:function(e){
     var id=e.currentTarget.dataset.id;
+
+    if (id === "0"){
+      for (var i = 0; i < 6; i++) {
+        delete this.data.CSS["CHN_BiShunArr2_" + i];
+      }
+    }
+    else if (id === "1") {
+      for (var i = 0; i < 6; i++) {
+        delete this.data.CSS["CHN_KaitiArr_" + i];
+      }
+    }
+
     this.setData({
       ShowKaiti: id,
+      CSS:this.data.CSS,
     });
+
   },
   openHelp: function () {
     this.setData({

pages/main/symbolsetting.js

@@ -0,0 +1,192 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+var xOffset = 0;
+var yOffset = 0;
+var xStart = 0;
+var yStart = 0;
+var xEnd = 0;
+var yEnd = 0;
+
+Page({
+  data: {
+    ImagePath: app.globalData.uploadImageUrl,
+    Copy: {
+      top: 0,
+      left: 0,
+      Name: '',
+    },
+  },
+  onLoad: function(options) {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      ShowCopy: false,
+    });
+
+    // if (app.globalData.IsIOS) {
+    //   xOffset = -140;
+    //   yOffset = -40;
+    // } else if (app.globalData.IsAndroid) {
+    //   xOffset = 100;
+    //   yOffset = 0;
+    // }
+
+    common.getStorageValue(that, "SymbolMain", app.globalData.SymbolMain, function() {
+      var arr = [];
+      for (var i = 0; i < app.globalData.SymbolArray.length; i++) {
+        var obj = {};
+        obj.Name = app.globalData.SymbolArray[i];
+        for (var j = 0; j < that.data.SymbolMain.length; j++) {
+          if (obj.Name === that.data.SymbolMain[j]) {
+            obj.CSS = "btn2";
+          }
+        }
+        arr.push(obj);
+      }
+      that.setData({
+        SymbolArray: arr,
+      });
+
+      var query = wx.createSelectorQuery();
+      query.select('#btn0').boundingClientRect();
+      query.selectViewport().scrollOffset();
+      query.exec(function (rect) {
+        xStart = rect[0].left;
+        yStart = rect[0].top;
+        console.log("xStart:" + xStart);
+        console.log("yStart:" + yStart);
+
+      });
+      var query = wx.createSelectorQuery();
+      query.select('#btn' + (arr.length-1)).boundingClientRect();
+      query.selectViewport().scrollOffset();
+      query.exec(function (rect) {
+        xEnd = rect[0].left;
+        yEnd = rect[0].top;
+        console.log("xEnd:" + xEnd);
+        console.log("yEnd:" + yEnd);
+
+      });
+    });
+  },
+  // selectSymbol:function(e){
+  //   var that=this;
+  //   var name=e.currentTarget.dataset.name;
+  //   var SymbolMain="";
+  //   for (var i = 0; i < that.data.SymbolArray.length; i++) {
+  //     if (that.data.SymbolArray[i].Name===name) {
+  //       if (!that.data.SymbolArray[i].CSS)
+  //         that.data.SymbolArray[i].CSS = "btn2";
+  //       else
+  //         that.data.SymbolArray[i].CSS = "";
+  //     }
+
+  //     if (that.data.SymbolArray[i].CSS)
+  //       SymbolMain += that.data.SymbolArray[i].Name;
+  //   }
+  //   that.setData({
+  //     SymbolArray: that.data.SymbolArray,
+  //   });
+
+  //   wx.setStorageSync("SymbolMain", SymbolMain);
+  // },
+  dragStart: function(e) {
+    var that = this
+    var index = e.currentTarget.dataset.index;
+    var Copy = that.data.Copy;
+    Copy.Name = this.data.SymbolArray[index].Name;
+
+    for (var i = 0; i < that.data.SymbolArray.length; i++) {
+      if (i == index) {
+        that.data.SymbolArray[i].CSS = "btnClear";
+      }
+    }
+
+    var query = wx.createSelectorQuery();
+    query.select('#btn' + index).boundingClientRect();
+    query.selectViewport().scrollOffset();
+    query.exec(function(rect) {
+
+      Copy.top = (rect[0].top + rect[1].scrollTop);
+      console.log("Copy.top:" + Copy.top);
+      console.log("e.changedTouches[0].pageY_Start:" + e.changedTouches[0].pageY );
+      yOffset = e.changedTouches[0].pageY  - Copy.top;
+      Copy.left = rect[0].left ;
+      xOffset = e.changedTouches[0].pageX  - Copy.left;
+      console.log("yOffset:" + yOffset);
+
+      that.setData({
+        Copy: Copy,
+        ShowCopy: true,
+        SymbolArray: that.data.SymbolArray,
+      })
+    });
+  },
+  dragMove: function(e) {
+    console.log("e.changedTouches[0].pageY_Move:" + e.changedTouches[0].pageY);
+    var that = this
+    var index = e.currentTarget.dataset.index;
+    var Copy = that.data.Copy;
+
+    Copy.top = e.changedTouches[0].pageY  - yOffset;
+    Copy.left = e.changedTouches[0].pageX  - xOffset;
+    if (Copy.top < yStart-5)
+      Copy.top = yStart-5;
+    if (Copy.top > yEnd+5)
+      Copy.top = yEnd + 5;
+    if (Copy.left < -14)
+      Copy.left = -14;
+    if (Copy.left > 321)
+      Copy.left = 321;
+
+    that.setData({
+      Copy: Copy,
+      ShowCopy: true
+    });
+
+  },
+  dragEnd: function(e) {
+    var that = this
+    var index = e.currentTarget.dataset.index;
+    var Copy = that.data.Copy;
+
+    console.log(Copy.left + "," + Copy.top);
+
+    var x = Math.round((Copy.left - xStart) / 52);
+    var y = Math.round((Copy.top - yStart) / 52);
+
+    var index2 = y * 7 + x;
+    console.log("index2:" + index2);
+
+    for (var i = 0; i < that.data.SymbolArray.length; i++) {
+      if (i == index) {
+        that.data.SymbolArray.splice(i,1);
+      }
+    }
+    for (var i = 0; i < that.data.SymbolArray.length; i++) {
+      if (i == index2) {
+        var obj={};
+        obj.CSS = "";
+        obj.Name = Copy.Name;
+        that.data.SymbolArray.splice(i, 0,obj);
+      }
+    }
+    
+
+    that.setData({
+      Copy: Copy,
+      ShowCopy: false,
+      SymbolArray: that.data.SymbolArray,
+    });
+    wx.setStorageSync("SymbolMain", that.data.SymbolArray);
+  },
+  onShareAppMessage: function() {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/main/symbolsetting.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "符号"
+}

pages/main/symbolsetting.wxss

@@ -0,0 +1,78 @@
+.container{
+  background-color: #fff;
+}
+
+
+.panelTitle{
+  width:100%;
+  justify-content: space-between;
+  background-color: #f0f0f0;
+}
+.panelTitle .panelTitle1{
+  font-size:32rpx;
+  margin-left: 30rpx;
+  margin-bottom: 30rpx;
+
+  margin-top: 50rpx;
+}
+
+.panelItem0{
+  width:100%;
+}
+
+.panelItem{
+  width:720rpx;
+  margin-top:30rpx; 
+  font-size:28rpx;
+  justify-content: flex-start;
+  background-color: #fff;
+  flex-wrap: wrap;
+}
+
+
+.btn {
+  width: 80rpx;
+  height:80rpx;
+  background-color: #fff;
+  border: 2rpx solid #9b9b9b;
+  color: #787878;
+  border-radius: 10rpx;
+  text-align: center;
+  line-height: 80rpx;
+  margin: 8rpx;
+  font-size: 36rpx;
+  font-weight: 700;
+}
+
+.btn2 {
+  border: 4rpx solid #0071EF;
+  width: 74rpx;
+  height:74rpx;
+}
+.btnClear {
+  border: 4rpx solid #fff;
+  width: 74rpx;
+  height:74rpx;
+  color:#fff;
+}
+.btnCopy {
+  position: absolute;
+  z-index: 10;
+}
+
+.help_picture_mathsymbol{
+  width:688rpx;
+  height:347rpx;
+  margin: 40rpx 0;
+}
+
+.panelTitle0{
+  background-color: #fff;
+  border-top:20rpx solid #f0f0f0;
+}
+
+.text1 {
+  font-size:24rpx;
+  width:690rpx;
+  font-weight: 400;
+}

pages/main/systemsetting.js

@@ -5,49 +5,16 @@ const app = getApp();
 
 Page({
   data: {
-    List: [],
-    IsPay: true,
     IsShow: 0,
   },
   onLoad: function (options) {
     var that = this;
-    var childUserID = 0;
-    if (app.globalData.userInfo.ChildUserID && app.globalData.userInfo.ChildUserID != undefined)
-      childUserID = app.globalData.userInfo.ChildUserID;
-    var productServiceTime = common.formatDateCHS(common.formatTime(new Date(app.globalData.userInfo.ProductServiceTime)));
-    var today15 = common.formatDateCHS(common.formatTime(common.addDate("d", 15, new Date())));
-    var isPay = true;
-    if (productServiceTime > today15) {
-      isPay = false;
-    }
-
+    
     that.setData({
       Containnerheight: main.getWindowHeight(),
       ProgramName: app.globalData.ProgramName,
       Version: app.globalData.Version,
-      ProductServiceTime: productServiceTime,
-      IsPay: isPay,
       IsShow: app.globalData.userInfo.IsShow,
-      ChildUserID: childUserID,
-    });
-  },
-  gotoPay: function () {
-    var payindex = 3;
-    if (app.globalData.userInfo.IsFinishTask == 1)
-      payindex = 2;
-
-    wx.navigateTo({
-      url: '../other/pay?paypanel=1&payindex=' + payindex,
-    });
-  },
-  gotoBinding: function () {
-    wx.navigateTo({
-      url: '../other/binding',
-    })
-  },
-  gotoUserbook:function(){
-    wx.navigateTo({
-      url: '../other/userbook',
     });
   },
   updateMember: function () {
@@ -55,9 +22,9 @@ Page({
       url: '../index/index',
     })
   },
-  gotoMarketingUserList: function (e) {
+  gotoSymbol: function (e) {
     wx.navigateTo({
-      url: '../../marketing/main/index',
+      url: '../main/symbolsetting',
     });
   },
   onShareAppMessage: function () {

pages/main/systemsetting.wxml

@@ -1,39 +1,16 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <block wx:if="{{IsShow==1}}">
-    <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" />
-      </view>
-    </view>
-    <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>
-  </block>
-  <view class='lineFooter'></view>
-
+  
   <view class="panelTitle FlexRow">
     <view class="panelTitle1">通用</view>
     <view class="panelTitle2"></view>
   </view>
-  <view class="panelItem FlexRow" bindtap='gotoBinding'>
-    <view class="panelItem1">帐号绑定</view>
+  <view class="panelItem FlexRow" bindtap='gotoSymbol'>
+    <view class="panelItem1">符号</view>
     <view class="panelItem2 FlexRow">
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
-
-
+  <view class='lineFooter'></view>
   <view class="panelItem00 panelItem FlexRow" bindtap='updateMember'>
     重启小程序
   </view>

pages/other/binding.js

@@ -114,7 +114,7 @@ Page({
       return {
         title: app.globalData.userInfo.NickName,
         path: path,
-        imageUrl: "../images/program_screenshot_bindaccount.png",
+        imageUrl: app.globalData.uploadImageUrl +"web/program_screenshot_bindaccount.png",
       }
     }
   },

pages/other/help.js

@@ -0,0 +1,52 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+var id=0;
+var idchild=0;
+
+Page({
+  data: {
+    List: [],
+    ImagePath: app.globalData.uploadImageUrl,
+  },
+  onLoad: function (options) {
+    var that = this;
+    id=options.id;
+    idchild=options.idchild;
+
+    var list = wx.getStorageSync("MiaoguoTipsList");
+
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      Item:list[options.id].List[options.idchild],
+      IsShare:options.IsShare,
+    });
+
+    wx.setNavigationBarColor({
+      frontColor: "#000000",
+      backgroundColor: "#ffffff",
+    });
+    
+  },
+  goto: function (e) {
+    if (this.data.IsShare==1){
+      var url = e.currentTarget.dataset.url;
+      wx.redirectTo({
+        url: url,
+      });
+    }
+    else{
+      wx.navigateBack({
+        delta: 1,
+      });
+    }
+  },
+  onShareAppMessage: function () {
+    return {
+      title: "《秒过学习法》小贴士",
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID + '&type=help&ID=' + id + '&IDChild=' + idchild,
+      imageUrl: app.globalData.uploadImageUrl+'web/'+this.data.Item.Cover,
+    }
+  },
+})

pages/other/help.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "帮助"
+}

pages/other/help.wxml

@@ -0,0 +1,9 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelTop FlexRow">
+    <view class="btn" bindtap="goto" data-url="./tips">返回目录</view>
+  </view>
+  <view style="height:120rpx;"></view>
+  <image class="img" mode="widthFix" wx:for="{{Item.Images}}" wx:key="index" src='{{ImagePath}}web/{{item}}' />
+  
+  <view style="height:100rpx;"></view>
+</view>

pages/other/help.wxss

@@ -0,0 +1,28 @@
+.container{
+  background-color: #F8F8F8;
+}
+
+.panelTop{
+  width:100%;
+  height:120rpx;
+  border-bottom: 1rpx solid #f0f0f0;
+  background-color: #fff;
+  justify-content: flex-start;
+  position: fixed;
+  top:0;
+}
+
+.btn{
+  width:172rpx;
+  line-height:80rpx;
+  margin-left: 20rpx;
+  border-radius: 10rpx;
+  border:1rpx solid #9B9B9B;
+  color:#787878;
+  font-size:28rpx;
+  text-align: center;
+}
+
+.img{
+  width:100%;
+}

pages/other/homework.js

@@ -93,7 +93,7 @@ Page({
     return {
       title: "作业清单",
       path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID +'&type=homework',
-      imageUrl: "../images/program_screenshot_checklist.png",
+      imageUrl: app.globalData.uploadImageUrl +"web/program_screenshot_checklist.png",
     }
   },
 })

pages/other/lesson.js

@@ -38,36 +38,48 @@ Page({
     backgroundAudioManager.onEnded(that.bindEnded);
 
     imageUrlPrefix = app.globalData.uploadImageUrl + "lesson/lesson" + LessonID + "/";
-    main.getData("GetMiaoguoLesson?Lesson=" + LessonID + "&time=" + new Date().getTime(), function (data) {
-      var id = that.data.LessonPage;
-      if (id < 10)
-        id = "0" + id;
+    
+    that.getData(LessonID,function(data){
+      if (data){
+        var id = that.data.LessonPage;
+        if (id < 10)
+          id = "0" + id;
 
-      var imageUrl = "../images/program_screenshot_lesson_a01.png";
-      if (that.data.LessonID=="5")
-        imageUrl ="../images/program_screenshot_lesson_b01.png";
-        
-      that.setData({
-        ArrTirtle: data.List,
-        IsPause: true,
-        ShareImageUrl:imageUrl,
-        AudioSrc: imageUrlPrefix + "sounds/"+that.data.LessonPage+".m4a",
-        ImageUrl: imageUrlPrefix + "%E5%B9%BB%E7%81%AF%E7%89%87" + id+".jpg",
-      });
-
-      if (that.data.LessonPage>1){
         that.setData({
-          IsPause: false,
+          ArrTirtle: data.List,
+          IsPause: true,
+          AudioSrc: imageUrlPrefix + "sounds/" + that.data.LessonPage + ".m4a",
+          ImageUrl: imageUrlPrefix + "%E5%B9%BB%E7%81%AF%E7%89%87" + id + ".jpg",
         });
-        backgroundAudioManager.title = that.data.ArrTirtle[that.data.LessonPage - 1].Title;
-        backgroundAudioManager.src = that.data.AudioSrc;
-      }
 
+        if (that.data.LessonPage > 1) {
+          that.setData({
+            IsPause: false,
+          });
+          backgroundAudioManager.title = that.data.ArrTirtle[that.data.LessonPage - 1].Title;
+          backgroundAudioManager.src = that.data.AudioSrc;
+        }
+      }
     });
+    
     currentContent = [];
     app.globalData.LessonID = 0;
     app.globalData.LessonPage = 0;
   },
+  getData:function(LessonID,callback){
+    var list = wx.getStorageSync("LessonList");
+    if (list){
+      callback(list[LessonID-1]);
+    }
+    else{
+      main.getData("GetMiaoguoLesson2?Lesson=" + LessonID + "&time=" + new Date().getTime(), function (data) {
+        if (data)
+          callback(data[LessonID-1]);
+        else
+          callback();
+      });
+    }
+  },
   onUnload: function () {
     this.InsertMiaoguoUserLesson();
   },
@@ -141,14 +153,20 @@ Page({
   },
   onShareAppMessage: function () {
     var title ="《秒过学习法》课程";
-    var imageUrl = this.data.ShareImageUrl;
-    if (this.data.LessonID==5){
-      title="《秒过学习法》结业致辞"
+    var imageUrl = "";
+    if (this.data.LessonID == 5) {
+      title = "《秒过学习法》结业致辞";
+      imageUrl = this.data.ArrTirtle[0].ImageUrl;
     }
     else if (this.data.LessonPage>0){
       title = this.data.ArrTirtle[this.data.LessonPage - 1].Title;
+      imageUrl = this.data.ArrTirtle[this.data.LessonPage - 1].ImageUrl;
+      if (this.data.LessonID==1)
+        imageUrl = this.data.ArrTirtle[0].ImageUrl;
     }
 
+    imageUrl=app.globalData.uploadImageUrl+"web/"+imageUrl;
+
     return {
       title: title,
       path: app.globalData.SharePath + '?type=lesson&LessonID=' + this.data.LessonID + '&LessonPage=' + this.data.LessonPage+'&UserID=' + app.globalData.userInfo.UserID,

pages/other/lessonlist.js

@@ -5,6 +5,7 @@ const app = getApp();
 
 Page({
   data: {
+    ImagePath: app.globalData.uploadImageUrl,
   },
   onLoad: function () {
     var that = this;
@@ -15,25 +16,35 @@ Page({
     });
 
     var userid = app.globalData.userInfo.UserID;
-    main.getData("GetMiaoguoCheckList?UserID=" + userid, function (data) {
+    main.getData("GetMiaoguoLesson2?UserID=" + userid, function (data) {
       if (data) {
+        
+        var arr=[];
+        for(var i=0;i<4;i++)
+          arr.push(data[i]);
+
         that.setData({
-          List: data.List,
+          List: arr,
         });
+
+        wx.setStorageSync("LessonList", data);
       }
     });
   },
   gotoLesson: function (e) {
     var id = e.currentTarget.dataset.id;
+    var idchild="";
+    if (e.currentTarget.dataset.idchild && id>1)
+      idchild = '&LessonPage=' +e.currentTarget.dataset.idchild;
     wx.navigateTo({
-      url: '../other/lesson?LessonID=' + id,
+      url: '../other/lesson?LessonID=' + id +idchild,
     });
   },
   onShareAppMessage: function () {
     return {
-      title: app.globalData.ShareTitle,
+      title: "《秒过学习法》教学课程",
       path: app.globalData.SharePath + '?type=lesson&LessonID=all&UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: "../images/program_screenshot_lesson_a01.png",
+      imageUrl: app.globalData.uploadImageUrl+"web/program_screenshot_lesson_a00.png",
     }
   },
 })

pages/other/lessonlist.wxml

@@ -1,23 +1,30 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <image class="trial_lesson_header" src='../images/trial_lesson_header.png' />
-        
+  <image class="trial_lesson_header" src='{{ImagePath}}web/trial_lesson_header.png' />
+
   <view class="main FlexColumn">
-    <block wx:for="{{[List[3],List[4],List[5],List[6]]}}" wx:key="index">
-      <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
-        <view class="lineWidth720"></view>
+    <block wx:for="{{List}}" wx:key="index">
+      <view class="panelTitle FlexRow" bindtap="gotoLesson" data-id="{{index+1}}">
+        <view class="panelTitle1">{{item.Text}}</view>
+        <view class="panelTitle2">{{item.Time}}</view>
       </view>
-
-      <view class="panelItem FlexRow" bindtap="gotoLesson" data-id="{{index+1}}">
-        <view class='panelItem1 FlexColumn'>
-          <view class="panelTitle10">{{item.Title}}</view>
-          <view class="panelTitle111">{{item.Remark}}</view>
+      <block wx:for="{{item.List}}" wx:key="index2" wx:for-item="itemChild" wx:for-index="indexChild" wx:if="{{itemChild.Cover==1}}">
+        <view class="lineWidthAll FlexRow" wx:if="{{indexChild>0}}">
+          <view class="lineWidth720"></view>
         </view>
-        <view class="panelItem2 FlexRow">
-          <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
+
+        <view class="panelItem FlexRow" bindtap="gotoLesson" data-id="{{index+1}}" data-idchild="{{indexChild+1}}">
+          <view class='panelItem1 FlexColumn'>
+            <view class="panelTitle10">{{itemChild.Title}}</view>
+          </view>
+          <view class="panelItem2 FlexRow">
+            <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
+          </view>
         </view>
-      </view>
+
+      </block>
+      <view class='lineFooter'></view>
 
     </block>
-    <view class='lineFooter'></view>
   </view>
+  <view style="height:100rpx;"></view>
 </view>

pages/other/lessonlist.wxss

@@ -7,11 +7,28 @@
   width: 100%;
 }
 
+.panelTitle{
+  width:100%;
+  margin-top: 50rpx;
+  justify-content: space-between;
+}
+.panelTitle .panelTitle1{
+  font-size:32rpx;
+  margin-left: 30rpx;
+  margin-bottom: 30rpx;
+}
+.panelTitle .panelTitle2{
+  font-size:24rpx;
+  margin-right: 30rpx;
+  margin-bottom: 30rpx;
+  font-weight: 400;
+}
+
 .panelItem {
   width: 100%;
   justify-content: space-between;
   font-size: 28rpx;
-  height: 134rpx;
+  height: 101rpx;
   background-color: #fff;
 }
 

pages/other/newuser.js

@@ -6,6 +6,7 @@ var app = getApp();
 Page({
   data: {
     PanelShow: 0,
+    ImagePath: app.globalData.uploadImageUrl,
   },
   onLoad: function (options) {
     var that = this;

pages/other/newuser.wxml

@@ -1,9 +1,9 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
 
   <block wx:if="{{PanelShow==0}}">
-    <image class="promotion_leaflet_c01" src='../images/promotion_leaflet_c01.png' />
-    <image class="promotion_leaflet_c02" src='../images/promotion_leaflet_c02.png' />
-    <image class="promotion_leaflet_c03" src='../images/promotion_leaflet_c03.png' />
+    <image class="promotion_leaflet_c01" src='{{ImagePath}}web/promotion_leaflet_c01.png' />
+    <image class="promotion_leaflet_c02" src='{{ImagePath}}web/promotion_leaflet_c02.png' />
+    <image class="promotion_leaflet_c03" src='{{ImagePath}}web/promotion_leaflet_c03.png' />
     <view class="panelBottom FlexRow">
       <view class="panelBottom1 FlexColumn" wx:if="{{!StartDate}}">
         <view class='text7'>16天手把手</view>

pages/other/tips.js

@@ -0,0 +1,42 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    List: [],
+  },
+  onLoad: function (options) {
+    var that = this;
+    
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+    that.init();
+  },
+  init: function (e) {
+    var that=this;
+    main.getData("GetMiaoguoTipsList", function (data) {
+      that.setData({
+        List: data,
+      });
+      wx.setStorageSync("MiaoguoTipsList", data);
+    });
+  },
+  goto: function (e) {
+    var id = e.currentTarget.dataset.id;
+    var idchild = e.currentTarget.dataset.idchild;
+
+    wx.navigateTo({
+      url: './help?id='+id+'&idchild='+idchild,
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.uploadImageUrl +"web/program_screenshot_tips.png",
+    }
+  },
+})

pages/other/tips.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "小贴士"
+}

pages/other/tips.wxml

@@ -0,0 +1,23 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <block wx:for="{{List}}" wx:key="index">
+    <view class="panelTitle FlexRow">
+      <view class="panelTitle1">{{item.Headline}}</view>
+      <view class="panelTitle2"></view>
+    </view>
+
+    <block wx:for="{{item.List}}" wx:for-item="itemChild" wx:for-index="indexChild" wx:key="index2">
+    <view class="lineWidthAll FlexRow" wx:if="{{indexChild>0}}">
+      <view class="lineWidth720"></view>
+    </view>
+    <view class="panelItem FlexRow" bindtap='goto' data-id="{{index}}" data-idchild="{{indexChild}}">
+      <view class="panelItem1">{{itemChild.Title}}</view>
+      <view class="panelItem2 FlexRow">
+        <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+      </view>
+    </view>
+    </block>
+    <view class='lineFooter'></view>
+  </block>
+  <view style='width:100%;height:100rpx;'></view>
+
+</view>

pages/other/tips.wxss

@@ -0,0 +1,34 @@
+.panelTitle{
+  width:100%;
+  margin-top: 50rpx;
+  justify-content: space-between;
+}
+.panelTitle .panelTitle1{
+  font-size:32rpx;
+  margin-left: 30rpx;
+  margin-bottom: 30rpx;
+}
+
+.panelItem{
+  width:100%;
+  justify-content: space-between;
+  font-size:28rpx;
+  height:100rpx;
+  background-color: #fff;
+}
+
+.panelItem .panelItem1{
+  margin-left: 30rpx;
+  font-weight: 400;
+}
+.panelItem .panelItem2{
+  margin-right: 30rpx;
+  color:#787878;
+  font-weight: 400;
+}
+
+.Arrow{
+  width:16rpx;
+  height:26rpx;
+  margin-left: 30rpx;
+}

pages/other/userbook.js

@@ -76,6 +76,10 @@ Page({
 
     that.init();
 
+    wx.setNavigationBarColor({
+      frontColor: "#ffffff",
+      backgroundColor: "#FF9F33",
+    });
   },
   init: function () {
     var that = this;
@@ -148,7 +152,7 @@ Page({
     return {
       title: "《秒过学习法》用户手册",
       path: app.globalData.SharePath + '?type=userbook&UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: "../images/program_screenshot_usermanual.png",
+      imageUrl: app.globalData.uploadImageUrl +"web/program_screenshot_usermanual.png",
     }
   },
 })

pages/other/userbook.wxml

@@ -1,10 +1,10 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <block wx:if="{{PanelShow===-1}}">
-      <text class="text1">老用户\n请先关注公众号</text>
-      <text class="text2">手动关注公众号《秒过学习法》</text>
-      <view class="btn" bindtap='copyManager' data-copytype="公众号">复制公众号</view>
+    <text class="text1">老用户\n请先关注公众号</text>
+    <text class="text2">手动关注公众号《秒过学习法》</text>
+    <view class="btn" bindtap='copyManager' data-copytype="公众号">复制公众号</view>
   </block>
-  
+
   <block wx:if="{{PanelShow===0}}">
     <view class='text1'>尚未报名</view>
     <text class='text2'>首先打开公众号《秒过学习法》完成报名\n然后刷新状态</text>
@@ -17,38 +17,92 @@
         <image class='avatar' src="{{AvatarUrl}}" />
         <view class="nickname">{{NickName}}</view>
       </view>
-      <view></view>
-    </view>
-    <view class="panel10 panel1 FlexRow" wx:if="{{IsMember==1 && (ClassDayNumber>=16 || IsPay==1)}}">
-      <view class="left">有效期</view>
-      <view class="right FlexColumn">
-        <view class="panel11">{{ProductServiceTime}}</view>
+      <view class="right FlexRow" bindtap="goto" data-url="../main/systemsetting">
+        <image class='universalpic_setup_white_50x50' src="../images/universalpic_setup_white_50x50.png" />
+        <view>设置</view>
       </view>
     </view>
-    <view class="panel1 FlexRow" wx:if="{{IsMember==1 && (!(ClassDayNumber>=16 || IsPay==1) || (ClassDayNumber<0  && IsPay==0))}}">
+    <view class="panel10 panel1 FlexRow" wx:if="{{IsMember==1 && (ClassDayNumber>=0 || IsPay==1)}}">
       <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="{{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 class="panel2 FlexRow" wx:if="{{IsShow==1 && ClassDayNumber>=0 && ((ClassDayNumber<16 && IsPay==0) || IsPay==1)}}">
+      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/pay?PayType=5&EndDate={{ClassTimeEnd}}" wx:if="{{ClassDayNumber>=16 && (IsPay==0 || IsLoseEfficacy==1) }}">
+        <image class="usermanual_index_handshake" src='../images/usermanual_index_wallet.png' />
         <view>去续费</view>
       </view>
-      <view class="line2"></view>
-      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/coupon">
-        <image class="usermanual_index_wallet" src='../images/usermanual_index_coupon.png' />
+
+      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/coupon" wx:if="{{IsPay==1 && !IsLoseEfficacy}}">
+        <image class="usermanual_index_handshake" src='../images/usermanual_index_coupon.png' />
         <view>优惠券</view>
       </view>
+
+
+      <view class="panel21 FlexColumn" bindtap="goto" data-url="../../marketing/main/index" wx:if="{{IsPay==1 && !IsLoseEfficacy}}">
+        <image class="usermanual_index_handshake" src='../images/usermanual_index_handshake.png' />
+        <view>推广计划</view>
+      </view>
+
+      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/homework?EndTime={{ClassTimeEnd}}">
+        <image class="usermanual_index_handshake" src='../images/usermanual_index_writing.png' />
+        <view>作业清单</view>
+      </view>    
+
+      <view class="panel21 FlexColumn" bindtap="goto" data-url="./binding">
+        <image class="usermanual_index_handshake" src='../images/usermanual_index_link.png' />
+        <view>帐号绑定</view>
+      </view>
     </view>
     <view class='lineFooter'></view>
-    <view class="panelTitle FlexRow" wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>=0 && (ClassDayNumber<16 || IsPay==0)}}">
+    <view class="panel3 FlexRow" wx:if="{{IsShow==1 && ClassDayNumber>=0 && ((ClassDayNumber<16 && IsPay==0) || !IsLoseEfficacy)}}">
+      <view class="panel31 FlexColumn" bindtap="goto" data-url="../other/webview?PageID=0" wx:if="{{ClassDayNumber<16}}">
+        <view>新手包指南</view>
+      </view>
+      <view class="panel31 FlexColumn" bindtap="goto" data-url="../other/webview?PageID=8" wx:if="{{ClassDayNumber>=16}}">
+        <view>小组须知</view>
+      </view>
+      <view class="panel31 FlexColumn" bindtap="goto" data-url="../other/lessonlist">
+        <view>课程</view>
+      </view>
+      <view class="panel31 FlexColumn" bindtap="goto" data-url="./tips">
+        <view>小贴士</view>
+      </view>
+    </view>
+
+    <block wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>=16 && (IsPay==0 || IsLoseEfficacy==1) }}">
+      <view class='line'></view>
+      <view class="panelItem2 panelItem FlexColumn">
+        <text class="text11">使用期限已过期！续费后可立即恢复使用。</text>
+      </view>
+      <view class='lineFooter'></view>
+    </block>
+
+    <view class="panelItem3 panelItem FlexColumn" wx:if="{{PanelShow===2 && ClassDayNumber<0}}">
+      <view class="text41 text4">
+        您的开班时间：{{ClassTimeStart}}-{{ClassTimeEnd}}。
+      </view>
+      <view class="text4">
+        用户手册用于发布课程、优惠活动等最新消息。目前，尚未正式启用。更多消息，开班后请再过来看看。
+      </view>
+      <view class="text42 text4">
+        开班当日，会通过公众号向您发送资料和通知，请勿取消关注。
+      </view>
+    </view>
+
+    <view class="panelTitle FlexRow" wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>=0 && !IsLoseEfficacy}}">
       <view class="panelTitle1">会员活动</view>
       <view class="panelTitle2"></view>
     </view>
 
+    <block wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>0 && IsPay==1 && !IsLoseEfficacy}}">
+      <view class="panelItem FlexColumn">
+        <image class="salesactivity_a05_usermanual_banner" src='../images/salesactivity_a05_usermanual_banner.png' bindtap="goto" data-url="../../marketing/main/index" />
+        <view class="marketingDetail" bindtap="goto" data-url="../../pages/other/webview?PageID=7"></view>
+      </view>
+    </block>
+
     <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' />
@@ -90,32 +144,22 @@
       </view>
     </block>
 
+    <view class="panelItem FlexColumn" wx:if="{{PanelShow===1}}">
+      <text class="text3">开班事宜需要通过微信与您沟通。请添加班务员微信，否则无法继续为您服务。班务员服务时间：上午10点都晚上8点。\n\n班务员微信号：changyibzr</text>
+      <view class="btn" bindtap='copyManager'>复制微信号</view>
+      <text class="text3">添加后请等待确认。这需要一点时间。之后通过微信和您联系。</text>
+      <view class="btn4 btn" bindtap='gotoIndex'>刷新状态</view>
+    </view>
+
     <view class="panelTitle FlexRow">
       <view class="panelTitle1">最新消息</view>
       <view class="panelTitle2"></view>
     </view>
 
-    <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}}">
-      <text class="text3">感谢您的报名。您还没有加入在线辅导班群。请尽快联系秒过班务员为您安排开班事宜。\n\n联系方法，请添加班务员微信号：changyibzr</text>
-      <view class="btn" bindtap='copyManager'>复制微信号</view>
-      <text class="text3">如已添加，请稍等片刻，班务员正在为您办理相关手续，这需要一点时间。办完后将通过微信和您联系。</text>
-      <view class="btn" bindtap='gotoIndex'>刷新状态</view>
-    </view>
-
-    <view class="panelItem FlexColumn" wx:if="{{PanelShow===2 && ClassDayNumber<0}}">
-      <view class="text4">
-      您的开班时间：{{ClassTimeStart}}-{{ClassTimeEnd}}。
-      </view>
-      <view class="text4">
-      用户手册用于发布课程、优惠活动等最新消息。目前，尚未正式启用。更多消息，开班后请再过来看看。
-      </view>
-      <view class="text4">
-      开班当日，会通过公众号向您发送资料和通知，请勿取消关注。
-      </view>
+    <view class="panelItem FlexColumn" wx:if="{{PanelShow===2 && (ClassDayNumber>=16 && IsPay==1 && !IsLoseEfficacy) }}" bindtap="goto" data-url="../other/webview?PageID=8">
+      <image class="news_mustread" src='{{ImagePath}}web/news_lesson_b02.png' />
+      <view class="text7">新闻</view>
+      <view class="text8">秒过学习小组须知</view>
     </view>
 
     <view class="panelItem FlexColumn" wx:if="{{PanelShow===2 && (ClassDayNumber>=15 || IsPay==1) }}" bindtap="goto" data-url="../other/lesson?LessonID=5">
@@ -124,20 +168,20 @@
       <view class="text8">养孩子是一场Team Working，有你、有我、有秒过</view>
     </view>
 
-    <view class="panelItem FlexColumn" wx:for="{{ArrInformation}}" wx:key="index" wx:if="{{PanelShow===2  && ((ClassDayNumber>=item.PageID && ClassDayNumber<16) || IsPay==1) }}" bindtap="goto" data-url="../other/webview?PageID={{item.PageID}}">
+    <view class="panelItem FlexColumn" wx:for="{{ArrInformation}}" wx:key="index" wx:if="{{PanelShow===2  && ((ClassDayNumber>=item.PageID && ClassDayNumber<16) || (IsPay==1 && !IsLoseEfficacy)) }}" bindtap="goto" data-url="../other/webview?PageID={{item.PageID}}">
       <image class="news_lesson_a01" src='{{ImagePath}}web/news_kwk_0{{item.PageID}}.png' />
       <view class="text7">{{item.text1}}</view>
       <view class="text8">{{item.text2}}</view>
       <view class="text10">{{item.text3}}</view>
     </view>
 
-    <view class="panelItem FlexColumn" wx:if="{{PanelShow===2 && ((ClassDayNumber>=0 && ClassDayNumber<16) || IsPay==1) }}" bindtap="goto" data-url="../other/lessonlist">
+    <view class="panelItem FlexColumn" wx:if="{{PanelShow===2 && ((ClassDayNumber>=0 && ClassDayNumber<16) || (IsPay==1 && !IsLoseEfficacy)) }}" bindtap="goto" data-url="../other/lessonlist">
       <image class="news_lesson_a01" src='{{ImagePath}}web/news_lesson_a01.png' />
       <view class="text7">课程</view>
       <view class="text8">4节课程告诉您，家长做什么可以迅速提高孩子的成绩</view>
     </view>
 
-    <view class="panelItem FlexColumn" wx:if="{{PanelShow===2 && ((ClassDayNumber>=0 && ClassDayNumber<16) || IsPay==1) }}" bindtap="goto" data-url="../other/webview?PageID=0">
+    <view class="panelItem FlexColumn" wx:if="{{ ((PanelShow===1 || PanelShow===2) && !IsLoseEfficacy) || (IsPay==1 && !IsLoseEfficacy) }}" bindtap="goto" data-url="../other/webview?PageID=0">
       <image class="news_mustread" src='{{ImagePath}}web/news_mustread.png' />
       <view class="text7">新闻</view>
       <view class="text8">新手包使用指南</view>

pages/other/userbook.wxss

@@ -55,9 +55,14 @@
 .right {
   margin-right: 30rpx;
   margin-top: 30rpx;
-  align-items: flex-end;
+  font-size: 28rpx;
+  color:#fff;
+}
+.universalpic_setup_white_50x50{
+  width:30rpx;
+  height:30rpx;
+  margin-right: 10rpx;
 }
-
 .panel11 {
   color: #787878;
 }
@@ -73,15 +78,10 @@
   justify-content: space-between;
   border-top:1rpx solid #e3e3e3;
 }
-.usermanual_index_wallet {
-  width: 50rpx;
-  height: 50rpx;
-}
-
 .panel21{
-  width:374rpx;
+  flex:1;
   height:171rpx;
-  font-size:28rpx;
+  font-size:24rpx;
   font-weight: 400;
 }
 .line2{
@@ -89,6 +89,26 @@
   height:171rpx;
   background-color: #e3e3e3;
 }
+
+
+.panel3{
+  width:100%;
+  border-top: 50rpx solid #f0f0f0;
+  background-color: #f0f0f0;
+}
+.panel31{
+  width:220rpx;
+  height:93rpx;
+  font-size: 24rpx;
+  border-radius: 10rpx;
+  text-align: center;
+  line-height: 93rpx;
+  color: #1E1E1E;
+  background-color: #fff;
+  border: 2rpx solid #9b9b9b;
+  margin: 0 8rpx;
+}
+
 .panelTitle {
   width: 100%;
   justify-content: space-between;
@@ -108,16 +128,18 @@
   position: relative;
 }
 
+.panelItem3{
+  border-top:20rpx solid #f0f0f0;
+}
+
 .line {
   width: 100%;
   height: 20rpx;
   background-color: #f0f0f0;
 }
 
-
 .panelItem2 {
   width: 100%;
-  background-color: #B3443B;
   height:93rpx;
   justify-content: center;
 }
@@ -128,8 +150,9 @@
   font-size:24rpx;
 }
 .text11 {
-  color:#fff;
+  color: #B3443B;
   font-size:24rpx;
+  font-weight: 500;
 }
 
 .btn {
@@ -145,11 +168,23 @@
   margin: 40rpx 0 10rpx 0;
 }
 
+.btn4 {
+  border: 2rpx solid #fff;
+  margin: 60rpx 0 40rpx 0;
+}
+
 .text4 {
   width: 690rpx;
   margin-top: 20rpx;
 }
 
+.text41 {
+  margin-top: 40rpx;
+}
+.text42 {
+  margin-bottom: 40rpx;
+}
+
 .salesactivity_a01_usermanual_banner_header {
   width: 100%;
   height: 403rpx;
@@ -241,3 +276,23 @@
   width: 100%;
   height: 523rpx;
 }
+
+.usermanual_index_handshake{
+  width: 40rpx;
+  height: 40rpx;
+  margin-bottom: 10rpx;
+}
+
+.salesactivity_a05_usermanual_banner{
+  width:100%;
+  height:280rpx;
+  border-bottom: 20rpx solid #f0f0f0;
+}
+
+.marketingDetail{
+  position: absolute;
+  top:60rpx;
+  right:70rpx;
+  width:200rpx;
+  height:70rpx;
+}

pages/other/webview.js

@@ -21,9 +21,13 @@ Page({
     var path = "/pages/index/index?type=webview&PageID="+this.data.PageID;
     var title ="《秒过学习法》课外课";
     if (this.data.PageID==="0"){
-      imageUrl = "../images/program_screenshot_mustread.png";
+      imageUrl = app.globalData.uploadImageUrl +"web/program_screenshot_mustread.png";
       title="《秒过学习法》家长必读";
     }
+    else if (this.data.PageID === "8"){
+      imageUrl = app.globalData.uploadImageUrl + "web/program_screenshot_grouprule.png";
+      title = "秒过家长社群小组须知";
+    }
     return {
       title: title,
       path: path,

pages/plan/clicktype.js

@@ -5,6 +5,7 @@ const app = getApp();
 
 Page({
   data: {
+    ImagePath: app.globalData.uploadImageUrl,
     List: [
       {
         Name: "使用专属按钮",

pages/plan/clicktype.wxml

@@ -6,7 +6,7 @@
     </view>
     <view class="panelItem2">初始时，“学习中”的题卡仅显示段落1（通常是题目），您可以选择用何种操作方式显示段落2、段落3（通常是答案和备忘）和“记忆评价”。</view>
 
-    <image class="help_picture_clickshow_01" src='../images/help_picture_clickshow_01.png' />
+    <image class="help_picture_clickshow_01" src='{{ImagePath}}web/help_picture_clickshow_01.png' />
 
   </view>
   <view class='lineFooter'></view>
@@ -25,7 +25,7 @@
         </view>
         <view class='panelSelected1 FlexColumn'>
           <view class='text1'>{{item.Name}}</view>
-          <image wx:if="{{item.Image}}" src='../images/{{item.Image}}.png' class="{{item.Image}}" />
+          <image wx:if="{{item.Image}}" src='{{ImagePath}}web/{{item.Image}}.png' class="{{item.Image}}" />
           <view style="height:10rpx;" wx:if="{{!item.Image}}"></view>
         </view>
       </view>

pages/plan/clicktype.wxss

@@ -2,6 +2,7 @@
   width: 100%;
   margin-top: 50rpx;
   justify-content: flex-start;
+  background-color: #fff;
 }
 
 .panelTitle0 {

pages/plan/colorplan.js

@@ -5,6 +5,7 @@ const app = getApp();
 
 Page({
   data: {
+    ImagePath: app.globalData.uploadImageUrl,
   },
   onLoad: function (options) {
     var that = this;

pages/plan/colorplan.wxml

@@ -6,7 +6,7 @@
     </view>
     <view class="panelItem2">选择题卡的主题色。该功能的原理是利用“多变的环境对记忆的增效作用”，采用颜色元素，打破人体通过视觉对信息布局的识别形成记忆关系后产生的环境依赖。所以，推荐多选或全选颜色，比如根据您对颜色的喜好去除不喜欢的颜色，保留相对有吸引力的颜色就好。在选中多种颜色的情况下，系统将在每次学习时随机选择一款颜色。</view>
 
-    <image class="help_picture_themecolor" src='../images/help_picture_themecolor.png' />
+    <image class="help_picture_themecolor" src='{{ImagePath}}web/help_picture_themecolor.png' />
 
   </view>
   <view class='lineFooter'></view>

pages/plan/memoryLevel.js

@@ -5,6 +5,7 @@ const app = getApp();
 
 Page({
   data: {
+    ImagePath: app.globalData.uploadImageUrl,
   },
   onLoad: function () {
     var that = this;

pages/plan/memoryLevel.wxml

@@ -6,7 +6,7 @@
     </view>
     <view class="panelItem2">“记忆评价”是位于“学习中”界面底部的一行4色按钮。从左向最右分别是：红色、黄色、绿色和蓝色，它们的作用如下图：</view>
 
-    <image class="help_picture_fourcolor" src='../images/help_picture_fourcolor.png' />
+    <image class="help_picture_fourcolor" src='{{ImagePath}}web/help_picture_fourcolor.png' />
     <text class="panelItem1">请您根据孩子答题时的表现，从AI给出的选项中选择对应的“记忆评价”。\n
 为了方便辨识，您可根据自己的喜好选择一款更舒服的命名方式。名称虽有不同，但其背后的功能是一致的。</text>
   </view>

pages/plan/recommend.js

@@ -6,6 +6,7 @@ const DefaultSecondArray=[5,40,60];
 
 Page({
   data: {
+    ImagePath: app.globalData.uploadImageUrl,
     IsChangeRecommend: true,
     SecondConfig: [{
       Key: "蓝色",

pages/plan/recommend.wxml

@@ -7,7 +7,7 @@
     <text class="panelItem2">在孩子没有错答的情况下，面对“记忆评价”的黄、绿、蓝色选项时，如果您不知道该选哪个，该功能可为您提供计时参考。计时的用意，是把“回答问题的速度”的快慢用做衡量熟练程度的额外指标，在排除环境因素造成的影响后，为您提供一种简单易行的参考。\n
 请在已了解“记忆评价”的基础上启用，在尚未入门的情况下可能会干扰到您对整体功能的理解。\n
 在“学习中”它将以如下形式出现：</text>
-    <image class="help_picture_chooseadvice" src='../images/help_picture_chooseadvice.png' />
+    <image class="help_picture_chooseadvice" src='{{ImagePath}}web/help_picture_chooseadvice.png' />
 
   </view>
   <view class='lineFooter'></view>

pages/plan/setting.js

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

project.config.json

@@ -49,7 +49,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 6,
+			"current": 8,
 			"list": [
 				{
 					"id": 0,
@@ -97,7 +97,21 @@
 					"id": 6,
 					"name": "pages/index/index",
 					"pathName": "pages/index/index",
-					"query": "type=marketing&UserID=1",
+					"query": "type=help&ID=1&IDChild=2&UserID=1",
+					"scene": null
+				},
+				{
+					"id": 7,
+					"name": "pages/main/symbolsetting",
+					"pathName": "pages/main/symbolsetting",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "pages/index/test",
+					"pathName": "pages/index/test",
+					"query": "",
 					"scene": null
 				}
 			]

utils/util.js

@@ -1,22 +1,27 @@
 var Crypto = require('cryptojs.js').Crypto;
 var app = getApp();
 
-function formatTime(date,format,isShort) {
-  var year = date.getFullYear()
-  var month = date.getMonth() + 1
-  var day = date.getDate()
+function formatTime(date, format, isShort) {
+  if (date) {
+    date = new Date(ReplaceAllString(date.toString(),"-","/"));
+    var year = date.getFullYear()
+    var month = date.getMonth() + 1
+    var day = date.getDate()
 
-  var hour = date.getHours()
-  var minute = date.getMinutes()
-  var second = date.getSeconds()
+    var hour = date.getHours()
+    var minute = date.getMinutes()
+    var second = date.getSeconds()
 
-  if (!format)
-    format="-";
+    if (!format)
+      format = "/";
 
-  if (isShort)
-    return [year, month, day].map(formatNumber).join(format);
+    if (isShort)
+      return [year, month, day].map(formatNumber).join(format);
+    else
+      return [year, month, day].map(formatNumber).join(format) + ' ' + [hour, minute, second].map(formatNumber).join(':');
+  }
   else
-    return [year, month, day].map(formatNumber).join(format) + ' ' + [hour, minute, second].map(formatNumber).join(':')
+    return "";
 }
 
 function checkIsArray(obj) {
@@ -30,7 +35,7 @@ function formatDateCHS(date) {
     var month = date.substr(5, 2);
     var day = date.substr(8, 2);
 
-    if (year<="1900")
+    if (year <= "1900")
       return "";
     else
       return year + "年" + month + "月" + day + "日";
@@ -43,7 +48,7 @@ function formatDateENG(date, format) {
   if (date) {
     date = date.toString();
     if (!format)
-      format = "-";
+      format = "/";
     date = date.replace("年", format);
     date = date.replace("月", format);
     date = date.replace("日", "");
@@ -122,8 +127,8 @@ function RandomArray(arr) {
     maxCount++;
   }
   while (arrResult.length < arr.length && maxCount < 1000);
-  for(var i=0;i<arr.length;i++)
-    arr[i]=arrResult[i];
+  for (var i = 0; i < arr.length; i++)
+    arr[i] = arrResult[i];
   return arrResult;
 }