chengjie лет назад: 6
Родитель
Сommit
c78188dfe6

Разница между файлами не показана из-за своего большого размера
+ 2 - 2
app.js


BIN
pages/images/product_icon_mg_70x70.png


+ 23 - 21
pages/main/add.js

@@ -658,7 +658,7 @@ Page({
658
   },
658
   },
659
   //加符号
659
   //加符号
660
   addSymbol: function(e) {
660
   addSymbol: function(e) {
661
-    //console.log("addSymbol");
661
+    console.log("addSymbol");
662
     isEdit = true;
662
     isEdit = true;
663
     var that = this;
663
     var that = this;
664
 
664
 
@@ -693,15 +693,13 @@ Page({
693
       btnName ="(     )";
693
       btnName ="(     )";
694
     else if (btnName == "_")
694
     else if (btnName == "_")
695
       btnName = "_____";
695
       btnName = "_____";
696
-    //console.log("btnName:" + btnName);
696
+    console.log("addSymbol_btnName:" + btnName);
697
 
697
 
698
     if (!this.data.Focus) {
698
     if (!this.data.Focus) {
699
-      this.data.FieldContent = this.data.FieldContent + btnName;
700
-      this.setData({
701
-        FieldContent: this.data.FieldContent,
702
-      });
699
+      var obj = { detail: {cursor:tempCursor}};
700
+      this.onBindblur(obj);
703
     }
701
     }
704
-    //console.log("addSymbol:" + this.data.FieldContent);
702
+    console.log("addSymbol:" + this.data.FieldContent);
705
 
703
 
706
     setTimeout(function() {
704
     setTimeout(function() {
707
       that.setData({
705
       that.setData({
@@ -739,7 +737,8 @@ Page({
739
 
737
 
740
     this.updateField();
738
     this.updateField();
741
     tempCursor = e.detail.cursor;
739
     tempCursor = e.detail.cursor;
742
-    //console.log("tempCursor:" + tempCursor);
740
+    
741
+    console.log("tempCursor:" + tempCursor);
743
     if (tempCursor == undefined)
742
     if (tempCursor == undefined)
744
       tempCursor = this.data["FieldContent"].length;
743
       tempCursor = this.data["FieldContent"].length;
745
     var str1 = "",
744
     var str1 = "",
@@ -748,20 +747,23 @@ Page({
748
       str1 = this.data.FieldContent.substr(0, tempCursor);
747
       str1 = this.data.FieldContent.substr(0, tempCursor);
749
       str2 = this.data.FieldContent.substring(tempCursor, this.data.FieldContent.length);
748
       str2 = this.data.FieldContent.substring(tempCursor, this.data.FieldContent.length);
750
     }
749
     }
751
-    //console.log("str1:" + str1);
752
-    //console.log("btnName:" + btnName);
753
-    //console.log("str2:" + str2);
754
-    var cur = 1;
755
-    if (btnName == "[读]" || btnName == "[线]" || btnName == "[光]") {
756
-      cur = 3;
757
-    } else if (btnName == "[/读]" || btnName == "[/线]" || btnName == "[/光]") {
758
-      cur = 4;
759
-    } else if (btnName === "(     )") {
760
-      cur = 7;
761
-    } else if (btnName === "_____") {
762
-      cur = 5;
750
+    console.log("str1:" + str1);
751
+    console.log("btnName:" + btnName);
752
+    console.log("str2:" + str2);
753
+    var cur = 0;
754
+    if (btnName){
755
+      cur = 1;
756
+      if (btnName == "[读]" || btnName == "[线]" || btnName == "[光]") {
757
+        cur = 3;
758
+      } else if (btnName == "[/读]" || btnName == "[/线]" || btnName == "[/光]") {
759
+        cur = 4;
760
+      } else if (btnName === "(     )") {
761
+        cur = 7;
762
+      } else if (btnName === "_____") {
763
+        cur = 5;
764
+      }
763
     }
765
     }
764
-
766
+    
765
     this.data.FieldContent = str1 + btnName + str2;
767
     this.data.FieldContent = str1 + btnName + str2;
766
     this.setData({
768
     this.setData({
767
       FieldContent: this.data.FieldContent,
769
       FieldContent: this.data.FieldContent,

+ 0 - 2
pages/main/add.wxml

@@ -173,8 +173,6 @@
173
   <view class='panelBtnItem FlexColumn'>
173
   <view class='panelBtnItem FlexColumn'>
174
     <scroll-view scroll-x="true" class="panelBtnSmall" bindscroll="bindscrollHandler">
174
     <scroll-view scroll-x="true" class="panelBtnSmall" bindscroll="bindscrollHandler">
175
       <view class="btn0"></view>
175
       <view class="btn0"></view>
176
-      <!-- <view class="btn" bindtap="addSymbol" data-id="(     )">( )</view>
177
-      <view class="btn" bindtap="addSymbol" data-id="_____">_</view> -->
178
       <view class="btn" bindtap="addSymbol" wx:for="{{SymbolMain}}" wx:key="index" data-id="{{item.Name}}">{{item.Name}}</view>
176
       <view class="btn" bindtap="addSymbol" wx:for="{{SymbolMain}}" wx:key="index" data-id="{{item.Name}}">{{item.Name}}</view>
179
       <view class="btn2 btn" bindtap="gotoSymbol">更多</view>
177
       <view class="btn2 btn" bindtap="gotoSymbol">更多</view>
180
     </scroll-view>
178
     </scroll-view>

+ 25 - 7
pages/main/default.js

@@ -11,6 +11,7 @@ Page({
11
     TodayTaskNumber: 0,
11
     TodayTaskNumber: 0,
12
     IsStart: 0,
12
     IsStart: 0,
13
     IsShowMarketing: 1,
13
     IsShowMarketing: 1,
14
+    IsMaintain:0,
14
   },
15
   },
15
   onPullDownRefresh: function () {
16
   onPullDownRefresh: function () {
16
     wx.redirectTo({
17
     wx.redirectTo({
@@ -185,19 +186,36 @@ Page({
185
     var that=this;
186
     var that=this;
186
     main.UpdateMiaoguoCardTodayAll(true, function () {
187
     main.UpdateMiaoguoCardTodayAll(true, function () {
187
       main.getTaskTodayList(function (data) {
188
       main.getTaskTodayList(function (data) {
188
-        var TodayTaskNumber = data.ListNew.length + data.ListReview.length + data.ListHistory.length;
189
-        that.setData({
190
-          DayNumber: data.DayNumber,
191
-          TodayTaskNumber: TodayTaskNumber,
192
-          IsStart: data.IsStart,
193
-        });
189
+        if (data.IsMaintain==1){
190
+          that.setData({
191
+            IsMaintain:1,
192
+          });
193
+        }
194
+        else{
195
+          var TodayTaskNumber = data.ListNew.length + data.ListReview.length + data.ListHistory.length;
196
+          that.setData({
197
+            DayNumber: data.DayNumber,
198
+            TodayTaskNumber: TodayTaskNumber,
199
+            IsStart: data.IsStart,
200
+          });
201
+        }
194
       });
202
       });
195
     });
203
     });
196
   },
204
   },
197
   isNoSavedCard:function(){
205
   isNoSavedCard:function(){
198
     var that=this;
206
     var that=this;
199
     //判断是否有未保存的卡
207
     //判断是否有未保存的卡
200
-    if (wx.getStorageSync("TempCardNoSaved")) {
208
+    if (app.globalData.userInfo.IsMaintain==1) {
209
+      that.setData({
210
+        IsMaintain: app.globalData.userInfo.IsMaintain,
211
+      });
212
+      wx.setNavigationBarColor({
213
+        frontColor: "#ffffff",
214
+        backgroundColor: "#0B8457",
215
+      })
216
+    }
217
+    //判断是否有未保存的卡
218
+    else if (wx.getStorageSync("TempCardNoSaved")) {
201
       that.setData({
219
       that.setData({
202
         IsTempCardNoSaved: true,
220
         IsTempCardNoSaved: true,
203
       });
221
       });

+ 7 - 0
pages/main/default.wxml

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

+ 8 - 2
pages/main/default.wxss

@@ -125,13 +125,19 @@
125
   margin-top: 170rpx;
125
   margin-top: 170rpx;
126
   text-align: center;
126
   text-align: center;
127
 }
127
 }
128
+.TempCardNoSaved .RemindText2{
129
+  font-size:32rpx;
130
+  color:#fff;
131
+  margin-top: 105rpx;
132
+  text-align: center;
133
+}
128
 .TempCardNoSaved .btn1{
134
 .TempCardNoSaved .btn1{
129
   font-size:36rpx;
135
   font-size:36rpx;
130
   color:#fff;
136
   color:#fff;
131
   margin-top: 40rpx;
137
   margin-top: 40rpx;
132
-  border:5rpx solid #fff;
138
+  border:2rpx solid #fff;
133
   text-align: center;
139
   text-align: center;
134
-  width:520rpx;
140
+  width:600rpx;
135
   line-height: 90rpx;
141
   line-height: 90rpx;
136
   border-radius: 14rpx;
142
   border-radius: 14rpx;
137
 }
143
 }

+ 15 - 4
pages/main/searchCardList.js

@@ -4,16 +4,18 @@ import main from '../../utils/main';
4
 const app = getApp();
4
 const app = getApp();
5
 var intervalRefresh = 0;
5
 var intervalRefresh = 0;
6
 var arrOrder = [
6
 var arrOrder = [
7
+  {},
7
   { Name: "最近添加", Value: "ac.MiaoguoCardID desc", CSS: "numberContainerFooter1121Select" },
8
   { Name: "最近添加", Value: "ac.MiaoguoCardID desc", CSS: "numberContainerFooter1121Select" },
8
   { Name: "较早添加", Value: "ac.MiaoguoCardID asc" },
9
   { Name: "较早添加", Value: "ac.MiaoguoCardID asc" },
9
-  { Name: "练习次数", Value: "ac.LearnNumber desc,ac.MiaoguoCardID desc" }
10
+  { Name: "练习次数", Value: "ac.LearnNumber desc,ac.MiaoguoCardID desc" },
11
+  { Name: "最近练习", Value: "ac.LastTime desc" },
10
 ];
12
 ];
11
 
13
 
12
 Page({
14
 Page({
13
   data: {
15
   data: {
14
     HasPage: false,
16
     HasPage: false,
15
     ArrOrder: arrOrder,
17
     ArrOrder: arrOrder,
16
-    OrderType: arrOrder[0].Value,
18
+    OrderType: 0,
17
   },
19
   },
18
   onLoad: function (options) {
20
   onLoad: function (options) {
19
     var that = this;
21
     var that = this;
@@ -246,14 +248,17 @@ Page({
246
 
248
 
247
     var orderType = that.data.OrderType;
249
     var orderType = that.data.OrderType;
248
     if (orderType)
250
     if (orderType)
249
-      url += "&OrderType=" + orderType;
251
+      url += "&OrderType=" + arrOrder[orderType].Value;
250
 
252
 
251
 
253
 
252
     main.getData(url, function (data) {
254
     main.getData(url, function (data) {
253
       if (data) {
255
       if (data) {
254
 
256
 
255
         var list = app.globalData.CardList;
257
         var list = app.globalData.CardList;
258
+        
256
         for (var i = 0; i < data.List.length; i++) {
259
         for (var i = 0; i < data.List.length; i++) {
260
+          data.List[i].LastTimeStr = common.formatDateCHS(data.List[i].LastTime);
261
+          
257
           list.push(data.List[i]);
262
           list.push(data.List[i]);
258
         }
263
         }
259
         app.globalData.CardList = list;
264
         app.globalData.CardList = list;
@@ -264,6 +269,12 @@ Page({
264
             HasPage: false,
269
             HasPage: false,
265
           });
270
           });
266
         }
271
         }
272
+
273
+        if (orderType>0){
274
+          wx.setNavigationBarTitle({
275
+            title: "全部题卡:" + arrOrder[orderType].Name,
276
+          });
277
+        }
267
       }
278
       }
268
     });
279
     });
269
   },
280
   },
@@ -281,7 +292,7 @@ Page({
281
     var that = this;
292
     var that = this;
282
     var value = e.currentTarget.dataset.value;
293
     var value = e.currentTarget.dataset.value;
283
     for (var i = 0; i < this.data.ArrOrder.length; i++) {
294
     for (var i = 0; i < this.data.ArrOrder.length; i++) {
284
-      if (this.data.ArrOrder[i].Value == value)
295
+      if (i == value)
285
         this.data.ArrOrder[i].CSS = "numberContainerFooter1121Select";
296
         this.data.ArrOrder[i].CSS = "numberContainerFooter1121Select";
286
       else
297
       else
287
         this.data.ArrOrder[i].CSS = "";
298
         this.data.ArrOrder[i].CSS = "";

+ 4 - 2
pages/main/searchCardList.wxml

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

+ 2 - 1
pages/main/searchCardList.wxss

@@ -267,7 +267,7 @@
267
 
267
 
268
 .numberContainerFooter101 {
268
 .numberContainerFooter101 {
269
   width: 100%;
269
   width: 100%;
270
-  height: 234rpx;
270
+  height: 334rpx;
271
   justify-content: flex-start;
271
   justify-content: flex-start;
272
   align-items: flex-start;
272
   align-items: flex-start;
273
 }
273
 }
@@ -312,6 +312,7 @@
312
 
312
 
313
 .numberContainerFooter112 {
313
 .numberContainerFooter112 {
314
   justify-content: flex-start;
314
   justify-content: flex-start;
315
+  flex-wrap: wrap;
315
 }
316
 }
316
 
317
 
317
 .numberContainerFooter1121 {
318
 .numberContainerFooter1121 {

+ 1 - 1
pages/other/newuser.wxml

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

+ 5 - 0
pages/other/newuser.wxss

@@ -81,3 +81,8 @@
81
   color:#329468;
81
   color:#329468;
82
   text-align: center;
82
   text-align: center;
83
 }
83
 }
84
+
85
+.officialaccount{
86
+  width:700rpx;
87
+  margin: 50rpx;
88
+}

+ 8 - 1
project.config.json

@@ -49,7 +49,7 @@
49
 			"list": []
49
 			"list": []
50
 		},
50
 		},
51
 		"miniprogram": {
51
 		"miniprogram": {
52
-			"current": 1,
52
+			"current": 9,
53
 			"list": [
53
 			"list": [
54
 				{
54
 				{
55
 					"id": 0,
55
 					"id": 0,
@@ -113,6 +113,13 @@
113
 					"pathName": "pages/index/test",
113
 					"pathName": "pages/index/test",
114
 					"query": "",
114
 					"query": "",
115
 					"scene": null
115
 					"scene": null
116
+				},
117
+				{
118
+					"id": 9,
119
+					"name": "pages/index/index",
120
+					"pathName": "pages/index/index",
121
+					"query": "",
122
+					"scene": 1047
116
 				}
123
 				}
117
 			]
124
 			]
118
 		}
125
 		}