1.4.8

pages/main/add.js

@@ -658,7 +658,7 @@ Page({
   },
   //加符号
   addSymbol: function(e) {
-    //console.log("addSymbol");
+    console.log("addSymbol");
     isEdit = true;
     var that = this;
 
@@ -693,15 +693,13 @@ Page({
       btnName ="(     )";
     else if (btnName == "_")
       btnName = "_____";
-    //console.log("btnName:" + btnName);
+    console.log("addSymbol_btnName:" + btnName);
 
     if (!this.data.Focus) {
-      this.data.FieldContent = this.data.FieldContent + btnName;
-      this.setData({
-        FieldContent: this.data.FieldContent,
-      });
+      var obj = { detail: {cursor:tempCursor}};
+      this.onBindblur(obj);
     }
-    //console.log("addSymbol:" + this.data.FieldContent);
+    console.log("addSymbol:" + this.data.FieldContent);
 
     setTimeout(function() {
       that.setData({
@@ -739,7 +737,8 @@ Page({
 
     this.updateField();
     tempCursor = e.detail.cursor;
-    //console.log("tempCursor:" + tempCursor);
+    
+    console.log("tempCursor:" + tempCursor);
     if (tempCursor == undefined)
       tempCursor = this.data["FieldContent"].length;
     var str1 = "",
@@ -748,20 +747,23 @@ Page({
       str1 = this.data.FieldContent.substr(0, tempCursor);
       str2 = this.data.FieldContent.substring(tempCursor, this.data.FieldContent.length);
     }
-    //console.log("str1:" + str1);
-    //console.log("btnName:" + btnName);
-    //console.log("str2:" + str2);
-    var cur = 1;
-    if (btnName == "[读]" || btnName == "[线]" || btnName == "[光]") {
-      cur = 3;
-    } else if (btnName == "[/读]" || btnName == "[/线]" || btnName == "[/光]") {
-      cur = 4;
-    } else if (btnName === "(     )") {
-      cur = 7;
-    } else if (btnName === "_____") {
-      cur = 5;
+    console.log("str1:" + str1);
+    console.log("btnName:" + btnName);
+    console.log("str2:" + str2);
+    var cur = 0;
+    if (btnName){
+      cur = 1;
+      if (btnName == "[读]" || btnName == "[线]" || btnName == "[光]") {
+        cur = 3;
+      } else if (btnName == "[/读]" || btnName == "[/线]" || btnName == "[/光]") {
+        cur = 4;
+      } else if (btnName === "(     )") {
+        cur = 7;
+      } else if (btnName === "_____") {
+        cur = 5;
+      }
     }
-
+    
     this.data.FieldContent = str1 + btnName + str2;
     this.setData({
       FieldContent: this.data.FieldContent,

pages/main/add.wxml

@@ -173,8 +173,6 @@
   <view class='panelBtnItem FlexColumn'>
     <scroll-view scroll-x="true" class="panelBtnSmall" bindscroll="bindscrollHandler">
       <view class="btn0"></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.Name}}">{{item.Name}}</view>
       <view class="btn2 btn" bindtap="gotoSymbol">更多</view>
     </scroll-view>

pages/main/default.js

@@ -11,6 +11,7 @@ Page({
     TodayTaskNumber: 0,
     IsStart: 0,
     IsShowMarketing: 1,
+    IsMaintain:0,
   },
   onPullDownRefresh: function () {
     wx.redirectTo({
@@ -185,19 +186,36 @@ Page({
     var that=this;
     main.UpdateMiaoguoCardTodayAll(true, function () {
       main.getTaskTodayList(function (data) {
-        var TodayTaskNumber = data.ListNew.length + data.ListReview.length + data.ListHistory.length;
-        that.setData({
-          DayNumber: data.DayNumber,
-          TodayTaskNumber: TodayTaskNumber,
-          IsStart: data.IsStart,
-        });
+        if (data.IsMaintain==1){
+          that.setData({
+            IsMaintain:1,
+          });
+        }
+        else{
+          var TodayTaskNumber = data.ListNew.length + data.ListReview.length + data.ListHistory.length;
+          that.setData({
+            DayNumber: data.DayNumber,
+            TodayTaskNumber: TodayTaskNumber,
+            IsStart: data.IsStart,
+          });
+        }
       });
     });
   },
   isNoSavedCard:function(){
     var that=this;
     //判断是否有未保存的卡
-    if (wx.getStorageSync("TempCardNoSaved")) {
+    if (app.globalData.userInfo.IsMaintain==1) {
+      that.setData({
+        IsMaintain: app.globalData.userInfo.IsMaintain,
+      });
+      wx.setNavigationBarColor({
+        frontColor: "#ffffff",
+        backgroundColor: "#0B8457",
+      })
+    }
+    //判断是否有未保存的卡
+    else if (wx.getStorageSync("TempCardNoSaved")) {
       that.setData({
         IsTempCardNoSaved: true,
       });

pages/main/default.wxml

@@ -46,6 +46,13 @@
   <view class='btn1' catchtap="onGiveupTempCard">丢弃</view>
 </view>
 
+<view wx:if="{{IsMaintain}}" class="TempCardNoSaved container FlexColumn" style='height:{{Containnerheight}}rpx;'>
+  <image class="Avatar" src='../images/universalpic_logo_200x200.png' />
+  <text class='RemindText'>数据正在排队维护\n联系天乐可为您加急做完</text>
+  <text class='RemindText2'>您还可以尝试重启，没准快要结束了</text>
+  <view class='btn1' catchtap="goto" data-url="../index/index">重启小程序</view>
+</view>
+
 <view wx:if="{{IsExit}}" class="IsExitContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
   <view class='IsExitText'>请竖起屏幕再打开小程序</view>
   <navigator class='isExit' open-type="exit" target="miniProgram">确认</navigator>

pages/main/default.wxss

@@ -125,13 +125,19 @@
   margin-top: 170rpx;
   text-align: center;
 }
+.TempCardNoSaved .RemindText2{
+  font-size:32rpx;
+  color:#fff;
+  margin-top: 105rpx;
+  text-align: center;
+}
 .TempCardNoSaved .btn1{
   font-size:36rpx;
   color:#fff;
   margin-top: 40rpx;
-  border:5rpx solid #fff;
+  border:2rpx solid #fff;
   text-align: center;
-  width:520rpx;
+  width:600rpx;
   line-height: 90rpx;
   border-radius: 14rpx;
 }

pages/main/searchCardList.js

@@ -4,16 +4,18 @@ import main from '../../utils/main';
 const app = getApp();
 var intervalRefresh = 0;
 var arrOrder = [
+  {},
   { Name: "最近添加", Value: "ac.MiaoguoCardID desc", CSS: "numberContainerFooter1121Select" },
   { Name: "较早添加", Value: "ac.MiaoguoCardID asc" },
-  { Name: "练习次数", Value: "ac.LearnNumber desc,ac.MiaoguoCardID desc" }
+  { Name: "练习次数", Value: "ac.LearnNumber desc,ac.MiaoguoCardID desc" },
+  { Name: "最近练习", Value: "ac.LastTime desc" },
 ];
 
 Page({
   data: {
     HasPage: false,
     ArrOrder: arrOrder,
-    OrderType: arrOrder[0].Value,
+    OrderType: 0,
   },
   onLoad: function (options) {
     var that = this;
@@ -246,14 +248,17 @@ Page({
 
     var orderType = that.data.OrderType;
     if (orderType)
-      url += "&OrderType=" + orderType;
+      url += "&OrderType=" + arrOrder[orderType].Value;
 
 
     main.getData(url, function (data) {
       if (data) {
 
         var list = app.globalData.CardList;
+        
         for (var i = 0; i < data.List.length; i++) {
+          data.List[i].LastTimeStr = common.formatDateCHS(data.List[i].LastTime);
+          
           list.push(data.List[i]);
         }
         app.globalData.CardList = list;
@@ -264,6 +269,12 @@ Page({
             HasPage: false,
           });
         }
+
+        if (orderType>0){
+          wx.setNavigationBarTitle({
+            title: "全部题卡：" + arrOrder[orderType].Name,
+          });
+        }
       }
     });
   },
@@ -281,7 +292,7 @@ Page({
     var that = this;
     var value = e.currentTarget.dataset.value;
     for (var i = 0; i < this.data.ArrOrder.length; i++) {
-      if (this.data.ArrOrder[i].Value == value)
+      if (i == value)
         this.data.ArrOrder[i].CSS = "numberContainerFooter1121Select";
       else
         this.data.ArrOrder[i].CSS = "";

pages/main/searchCardList.wxml

@@ -38,7 +38,9 @@
               </view>
             </view>
             <view class="panelItem2 FlexColumn">
-              <view>{{item.CreateTimeStr}}</view>
+              <view wx:if="{{OrderType<=2}}">{{item.CreateTimeStr}}</view>
+              <view wx:if="{{OrderType==3}}">{{item.LearnNumber}}次</view>
+              <view wx:if="{{OrderType==4}}">{{item.LastTimeStr}}</view>
               <view class='panelItem21'>
                 <image class="universalpic_fav_default_gray_26x24" src='../images/universalpic_fav_default_gray_26x24.png' wx:if="{{item.IsCollect==1}}" />
               </view>
@@ -97,7 +99,7 @@
       <view class='numberContainerFooter11 FlexColumn'>
         <view class='numberContainerFooter111'>调整排序</view>
         <view class='numberContainerFooter112 FlexRow'>
-          <view class='{{item.CSS}} numberContainerFooter1121' wx:for="{{ArrOrder}}" wx:key="index" catchtap='onOrder' data-value='{{item.Value}}'>{{item.Name}}</view>
+          <view class='{{item.CSS}} numberContainerFooter1121' wx:if="{{index>0}}" wx:for="{{ArrOrder}}" wx:key="index" catchtap='onOrder' data-value='{{index}}'>{{item.Name}}</view>
         </view>
       </view>
     </view>

pages/main/searchCardList.wxss

@@ -267,7 +267,7 @@
 
 .numberContainerFooter101 {
   width: 100%;
-  height: 234rpx;
+  height: 334rpx;
   justify-content: flex-start;
   align-items: flex-start;
 }
@@ -312,6 +312,7 @@
 
 .numberContainerFooter112 {
   justify-content: flex-start;
+  flex-wrap: wrap;
 }
 
 .numberContainerFooter1121 {

pages/other/newuser.wxml

@@ -17,13 +17,13 @@
         去报名
       </view>
     </view>
+    
     <view style="height:140rpx;"></view>
   </block>
   <block wx:if="{{PanelShow==1}}">
     <view class='text1'>报名步骤</view>
     <view class='text2'>第一步</view>
     <text class='text3'>手动关注公众号《秒过学习法》</text>
-
     <view class="btn" bindtap='copyManager'>复制公众号名称</view>
     <view class='text4'>第二步</view>
     <view class='text3'>关注后点击“开通新手包”</view>

pages/other/newuser.wxss

@@ -81,3 +81,8 @@
   color:#329468;
   text-align: center;
 }
+
+.officialaccount{
+  width:700rpx;
+  margin: 50rpx;
+}

project.config.json

@@ -49,7 +49,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 1,
+			"current": 9,
 			"list": [
 				{
 					"id": 0,
@@ -113,6 +113,13 @@
 					"pathName": "pages/index/test",
 					"query": "",
 					"scene": null
+				},
+				{
+					"id": 9,
+					"name": "pages/index/index",
+					"pathName": "pages/index/index",
+					"query": "",
+					"scene": 1047
 				}
 			]
 		}