chengjie 7 年之前
父節點
當前提交
bef817d64e

+ 5 - 5
app.json

@@ -4,11 +4,11 @@
4 4
     "pages/main/list",
5 5
     "pages/main/detail",
6 6
     "pages/main/search",
7
-    "pages/main/about",
8
-    "pages/main/cooperation",
9
-    "pages/main/payfinished",
10
-    "pages/main/paylist",
11
-    "pages/main/newuserlist",
7
+    "pages/about/about",
8
+    "pages/about/cooperation",
9
+    "pages/about/payfinished",
10
+    "pages/about/paylist",
11
+    "pages/about/newuserlist",
12 12
     "pages/main/index"
13 13
   ],
14 14
   "window": {

二進制
images/02029.png


二進制
images/02030.png


二進制
images/05014.png


二進制
images/05018.png


二進制
images/05019.png


二進制
images/05020.png


二進制
images/06005.png


二進制
images/06006.png


二進制
images/06007.png


二進制
images/06008.png


二進制
images/06009.png


+ 2 - 2
pages/main/about.js

@@ -12,7 +12,7 @@ Page({
12 12
       ListProgram: server.getProgramList(),
13 13
     });
14 14
 
15
-    if (options.id =="Cooperation"){
15
+    if (options.id == "Cooperation") {
16 16
       wx.pageScrollTo({
17 17
         scrollTop: 905
18 18
       });
@@ -32,7 +32,7 @@ Page({
32 32
   },
33 33
   getAppID: function (e) {
34 34
     wx.navigateTo({
35
-      url: "./cooperation"
35
+      url: "../about/cooperation"
36 36
     });
37 37
   },
38 38
   onShareAppMessage: function () {

pages/main/about.json → pages/about/about.json


pages/main/about.wxml → pages/about/about.wxml


pages/main/about.wxss → pages/about/about.wxss


pages/main/cooperation.js → pages/about/cooperation.js


pages/main/cooperation.json → pages/about/cooperation.json


pages/main/cooperation.wxml → pages/about/cooperation.wxml


pages/main/cooperation.wxss → pages/about/cooperation.wxss


pages/main/newuserlist.js → pages/about/newuserlist.js


pages/main/newuserlist.json → pages/about/newuserlist.json


pages/main/newuserlist.wxml → pages/about/newuserlist.wxml


pages/main/newuserlist.wxss → pages/about/newuserlist.wxss


+ 2 - 2
pages/main/payfinished.js

@@ -18,12 +18,12 @@ Page({
18 18
   },
19 19
   gotoPayList: function () {
20 20
     wx.navigateTo({
21
-      url: './paylist',
21
+      url: '../about/paylist',
22 22
     });
23 23
   },
24 24
   gotoNewUserList: function () {
25 25
     wx.navigateTo({
26
-      url: './newuserlist',
26
+      url: '../about/newuserlist',
27 27
     });
28 28
   },
29 29
   onShareAppMessage: function () {

pages/main/payfinished.json → pages/about/payfinished.json


pages/main/payfinished.wxml → pages/about/payfinished.wxml


pages/main/payfinished.wxss → pages/about/payfinished.wxss


+ 3 - 3
pages/main/paylist.js

@@ -5,7 +5,7 @@ const app = getApp();
5 5
 
6 6
 Page({
7 7
   data: {
8
-    PayList:[],
8
+    PayList: [],
9 9
   },
10 10
   onLoad: function (options) {
11 11
     this.setData({
@@ -17,8 +17,8 @@ Page({
17 17
     var that = this;
18 18
     server.getData('GetHanziUserPayInfoList?UserID=' + app.globalData.userInfo.UserID, function (data) {
19 19
       if (data) {
20
-        var list=[];
21
-        for(var i=data.List.length-1;i>=0;i--){
20
+        var list = [];
21
+        for (var i = data.List.length - 1; i >= 0; i--) {
22 22
           list.push(data.List[i]);
23 23
         }
24 24
         var serviceTime = data.ProductServiceTime;

pages/main/paylist.json → pages/about/paylist.json


pages/main/paylist.wxml → pages/about/paylist.wxml


pages/main/paylist.wxss → pages/about/paylist.wxss


+ 36 - 19
pages/main/detail.js

@@ -66,22 +66,25 @@ Page({
66 66
     common.getStorageValue(that, "IsAutoPlay", true, function () {
67 67
       common.getStorageValue(that, "IsAutoPage", false, function () {
68 68
         common.getStorageValue(that, "SelectedRandom", false, function () {
69
-          common.getStorageValue(that, "ShowPinyin", true, function () {
70
-            common.getStorageValue(that, "IntervalSecondIndex", 2, function () {
71
-              common.getStorageValue(that, "IsAudioLengthChecked", true, function () {
72
-                common.getStorageValue(that, "SpeakerMan", 0, function () {
73
-                  that.settingPlay(null, that.data.IsAutoPlay);
74
-                  that.settingPage(null, that.data.IsAutoPage);
75
-                  that.settingSort(null, that.data.SelectedRandom.toString());
76
-                  that.settingShowPinyin(null, that.data.ShowPinyin);
77
-                  that.settingAudioLength(null, that.data.IsAudioLengthChecked);
78
-                  that.settingSpeaker(null, that.data.SpeakerMan);
79
-                  if (that.data.WordType == "normal")
80
-                    that.init();
81
-                  else if (that.data.WordType == "review")
82
-                    that.initReview();
83
-                  else if (that.data.WordType == "search")
84
-                    that.initSearch();
69
+          common.getStorageValue(that, "ShowHanzi", true, function () {
70
+            common.getStorageValue(that, "ShowPinyin", true, function () {
71
+              common.getStorageValue(that, "IntervalSecondIndex", 2, function () {
72
+                common.getStorageValue(that, "IsAudioLengthChecked", true, function () {
73
+                  common.getStorageValue(that, "SpeakerMan", 0, function () {
74
+                    that.settingPlay(null, that.data.IsAutoPlay);
75
+                    that.settingPage(null, that.data.IsAutoPage);
76
+                    that.settingSort(null, that.data.SelectedRandom.toString());
77
+                    that.settingShowPinyin(null, that.data.ShowPinyin);
78
+                    that.settingShowHanzi(null, that.data.ShowHanzi);
79
+                    that.settingAudioLength(null, that.data.IsAudioLengthChecked);
80
+                    that.settingSpeaker(null, that.data.SpeakerMan);
81
+                    if (that.data.WordType == "normal")
82
+                      that.init();
83
+                    else if (that.data.WordType == "review")
84
+                      that.initReview();
85
+                    else if (that.data.WordType == "search")
86
+                      that.initSearch();
87
+                  });
85 88
                 });
86 89
               });
87 90
             });
@@ -90,7 +93,7 @@ Page({
90 93
       });
91 94
     });
92 95
 
93
-    common.getStorageValue(that, "IsHelpPosition1", 1, function () {});
96
+    common.getStorageValue(that, "IsHelpPosition1", 1, function () { });
94 97
 
95 98
     if (this.data.WordType == "normal")
96 99
       this.submitData();
@@ -415,8 +418,8 @@ Page({
415 418
       IsShowPrev: isShowPrev,
416 419
       IsShowNext: isShowNext,
417 420
       IsShowWordDetail: false,
421
+      ShowHanzi: wx.getStorageSync("ShowHanzi"),
418 422
     });
419
-
420 423
   },
421 424
   getImageError: function () {
422 425
     var that = this;
@@ -433,7 +436,7 @@ Page({
433 436
       setTimeout(function () {
434 437
         wx.hideLoading();
435 438
         wx.redirectTo({
436
-          url: "./detail?Type=" + that.data.WordType + "&bookid=" + that.data.BookID + "&unitid=" + that.data.UnitID + "&wordid=" + that.data.CurrentIndex + "&isfinished=" + that.data.IsFinished,
439
+          url: "../main/detail?Type=" + that.data.WordType + "&bookid=" + that.data.BookID + "&unitid=" + that.data.UnitID + "&wordid=" + that.data.CurrentIndex + "&isfinished=" + that.data.IsFinished,
437 440
         });
438 441
       }, 5000);
439 442
     });
@@ -582,6 +585,20 @@ Page({
582 585
     });
583 586
     wx.setStorageSync('SpeakerMan', result);
584 587
   },
588
+  settingShowHanzi: function (e, b) {
589
+    var result = !this.data.ShowHanzi;
590
+    if (b != undefined)
591
+      result = b;
592
+    this.setData({
593
+      ShowHanzi: result,
594
+    });
595
+    wx.setStorageSync('ShowHanzi', result);
596
+  },
597
+  showHanziFunction: function () {
598
+    this.setData({
599
+      ShowHanzi: true,
600
+    });
601
+  },
585 602
   settingShowPinyin: function (e, b) {
586 603
     var result = !this.data.ShowPinyin;
587 604
     if (b != undefined)

+ 35 - 6
pages/main/detail.wxml

@@ -8,6 +8,15 @@
8 8
       </view>
9 9
       <image binderror='getImageError' wx:if="{{!IsImageError}}" src='{{List[CurrentIndex].WordUrl}}' class="wordImage" />
10 10
       <image catchtap='getImageDownload' wx:if="{{IsImageError}}" src='../../images/05014.png' class="wordImage" />
11
+      <view class="ShowHanziContainer FlexRow" wx:if="{{!ShowHanzi}}">
12
+        <view class="btn FlexRow" bindtap='playAudio' data-click="true">
13
+          <image src='../../images/05019.png' class="image05019" />
14
+        </view>
15
+        <view class="line"></view>
16
+        <view class="btn FlexRow" catchtap='showHanziFunction'>
17
+          <image src='../../images/05020.png' class="image05020" />
18
+        </view>
19
+      </view>
11 20
     </block>
12 21
     <block wx:if="{{CurrentIndex==List.length-1}}">
13 22
       <view class="hanziEnd FlexColumn" wx:if="{{hanziType!='review'}}">
@@ -31,7 +40,7 @@
31 40
     <view class="{{RemindCss}} Remind" animation="{{animationData}}">{{RemindStr}}</view>
32 41
 
33 42
   </view>
34
-  <view class="detail" wx:if="{{IsShowWordDetail}}" >
43
+  <view class="detail" wx:if="{{IsShowWordDetail}}">
35 44
     <block wx:if="{{Detail.BiShunUrl}}">
36 45
       <image src='{{Detail.BiShunUrl}}' class="bishun" />
37 46
       <view class="line"></view>
@@ -142,12 +151,12 @@
142 151
 
143 152
 <!-- 帮助 -->
144 153
 <view class="help container FlexColumn" style="height:{{Height}}rpx;" wx:if="{{IsHelpPosition1==1}}">
145
-  <view wx:if="{{IsHelpPosition1==1}}" class="help1" bindtap='playAudio' data-click="true" ></view>
146
-  <image wx:if="{{IsHelpPosition1==1}}" src='../../images/05012.gif' class="helpPosition1 helpGif" bindtap='playAudio' data-click="true"  />
154
+  <view wx:if="{{IsHelpPosition1==1}}" class="help1" bindtap='playAudio' data-click="true"></view>
155
+  <image wx:if="{{IsHelpPosition1==1}}" src='../../images/05012.gif' class="helpPosition1 helpGif" bindtap='playAudio' data-click="true" />
147 156
 </view>
148 157
 
149 158
 <!-- 设置 -->
150
-<view class="settingContainer container FlexColumn" style='height:{{Height}}rpx;' wx:if="{{IsShowSetting}}">
159
+<view class="settingContainer container FlexColumn" style='min-height:{{Height}}rpx;' wx:if="{{IsShowSetting}}">
151 160
 
152 161
   <view class="title1">
153 162
     <view class="title1_1">内容</view>
@@ -168,7 +177,17 @@
168 177
 
169 178
   <view class="title2 FlexRow">
170 179
     <view class="title2_1 FlexColumn">
171
-      <view>拼音显示</view>
180
+      <view>显示汉字</view>
181
+    </view>
182
+    <switch class='title2_2' checked="{{ShowHanzi}}" bindchange="settingShowHanzi" />
183
+  </view>
184
+  <view class="line FlexColumn" wx:if="{{!IsAutoPage}}">
185
+    <view class="line1"></view>
186
+  </view>
187
+
188
+  <view class="title2 FlexRow">
189
+    <view class="title2_1 FlexColumn">
190
+      <view>显示拼音</view>
172 191
     </view>
173 192
     <switch class='title2_2' checked="{{ShowPinyin}}" bindchange="settingShowPinyin" />
174 193
   </view>
@@ -206,6 +225,16 @@
206 225
     </view>
207 226
     <switch class='title2_2' checked="{{IsAudioLengthChecked}}" bindchange="settingAudioLength" />
208 227
   </view>
228
+  <view class="line FlexColumn" wx:if="{{!IsAutoPage}}">
229
+    <view class="line1"></view>
230
+  </view>
231
+  <view class="title2 FlexRow" bindtap='showSettingMenu' data-status="speaker" wx:if="{{!IsAutoPage}}">
232
+    <view class="title2_1">首选词语</view>
233
+    <view class="title2_2 FlexRow">
234
+      <image src='../../images/Arrow.png' class="Arrow" />
235
+    </view>
236
+  </view>
237
+
209 238
   <view class="line FlexColumn" wx:if="{{!IsAutoPage}}">
210 239
     <view class="line1"></view>
211 240
   </view>
@@ -235,7 +264,7 @@
235 264
     </view>
236 265
 
237 266
   </view>
238
-
267
+  <view style='height:200rpx;'></view>
239 268
 
240 269
   <view class="bottom FlexColumn" bindtap='closeSetting'>
241 270
     <view class="bottom1 FlexRow">

+ 28 - 1
pages/main/detail.wxss

@@ -83,6 +83,33 @@
83 83
   height:370rpx;
84 84
 }
85 85
 
86
+.main .ShowHanziContainer{
87
+  width: 100%;
88
+  position: fixed;
89
+  top:320rpx;
90
+  left:0;
91
+  background-color: #F0F0F0;
92
+}
93
+.main .ShowHanziContainer .btn{
94
+  width: 48%;
95
+  height:404rpx;
96
+}
97
+.main .ShowHanziContainer .line{
98
+  width: 4rpx;
99
+  height:120rpx;
100
+  background-color: #D2D2D2;
101
+}
102
+.main .ShowHanziContainer .image05019{
103
+  width:123rpx;
104
+  height:103rpx;
105
+}
106
+.main .ShowHanziContainer .image05020{
107
+  width:100rpx;
108
+  height:100rpx;
109
+}
110
+
111
+
112
+
86 113
 .detail{
87 114
   width:100%;
88 115
   justify-content: flex-start;
@@ -214,7 +241,7 @@
214 241
 }
215 242
 
216 243
 .settingContainer {
217
-  position: fixed;
244
+  position: absolute;
218 245
   top: 0;
219 246
   background-color: #E3E3E3;
220 247
   color: #1e1e1e;

+ 31 - 14
pages/main/index.js

@@ -21,7 +21,7 @@ Page({
21 21
     NavClass1: "",
22 22
     NavClass2: "nav2",
23 23
     IsRemind: false,
24
-    IsMemberForeverRemind:false,
24
+    IsMemberForeverRemind: false,
25 25
   },
26 26
   onReady: function (e) {
27 27
   },
@@ -38,13 +38,13 @@ Page({
38 38
       });
39 39
     }
40 40
 
41
-    common.getStorageValue(this, "IsRemind", true, function () {});
41
+    common.getStorageValue(this, "IsRemind", true, function () { });
42 42
 
43 43
     this.updateProgram();
44 44
   },
45 45
   onShow: function () {
46 46
     this.getData();
47
-    
47
+
48 48
     if (!this.data.IsAccredit) {
49 49
       var IsRemindAccredit = wx.getStorageSync("IsRemindAccredit");
50 50
       if (IsRemindAccredit == 1) {
@@ -208,7 +208,7 @@ Page({
208 208
         wx.setStorageSync("ReviewList", data.ReviewList);
209 209
 
210 210
         common.getStorageValue(that, "IsMemberForeverRemind", 0, function () {
211
-          if (that.data.IsMemberForeverRemind==0 && that.data.NewUserNumber >= app.globalData.NewUserNumberMax){
211
+          if (that.data.IsMemberForeverRemind == 0 && that.data.NewUserNumber >= app.globalData.NewUserNumberMax) {
212 212
             that.setData({
213 213
               IsMemberForeverRemind: 1,
214 214
             });
@@ -223,7 +223,7 @@ Page({
223 223
 
224 224
         if (data.IsShow)
225 225
           app.globalData.IsShow = data.IsShow;
226
-        
226
+
227 227
         app.globalData.userInfo.IsMember = data.IsMember;
228 228
 
229 229
       }
@@ -251,36 +251,36 @@ Page({
251 251
   goto: function (e) {
252 252
     var id = e.currentTarget.dataset.id;
253 253
     wx.navigateTo({
254
-      url: "./list?id=" + id,
254
+      url: "../main/list?id=" + id,
255 255
     });
256 256
   },
257 257
   gotoSearch: function (e) {
258 258
     wx.navigateTo({
259
-      url: "./search",
259
+      url: "../main/search",
260 260
     });
261 261
   },
262 262
   gotoAbout: function (e) {
263
-    var id=e.currentTarget.dataset.id;
263
+    var id = e.currentTarget.dataset.id;
264 264
     wx.navigateTo({
265
-      url: "./about?id="+id
265
+      url: "../about/about?id=" + id
266 266
     });
267 267
   },
268 268
   gotoReview: function () {
269 269
     var id = "review";
270 270
     wx.navigateTo({
271
-      url: './detail?Type=' + id,
271
+      url: '../main/detail?Type=' + id,
272 272
     });
273 273
   },
274 274
   gotoNewUser: function () {
275 275
     wx.navigateTo({
276
-      url: './newuserlist',
276
+      url: '../about/newuserlist',
277 277
     });
278 278
   },
279 279
   gotoPayList: function () {
280 280
     wx.navigateTo({
281
-      url: './paylist',
281
+      url: '../about/paylist',
282 282
     });
283
-  }, 
283
+  },
284 284
   close: function () {
285 285
     this.setData({
286 286
       IsMemberForeverRemind: 2,
@@ -293,7 +293,7 @@ Page({
293 293
       var money = app.globalData.PayMoney;
294 294
       server.payMoney(3, money, function () {
295 295
         wx.navigateTo({
296
-          url: './payfinished',
296
+          url: '../about/payfinished',
297 297
         });
298 298
       });
299 299
       setTimeout(function () {
@@ -334,6 +334,23 @@ Page({
334 334
 
335 335
     });
336 336
   },
337
+  updateMember: function () {
338
+    if (app.globalData.userInfo.UserID == 1) {
339
+      if (app.globalData.userInfo.IsMember == 1) {
340
+        app.globalData.userInfo.IsMember = 0;
341
+        this.setData({
342
+          IsMember: false,
343
+        });
344
+      }
345
+      else {
346
+        app.globalData.userInfo.IsMember = 1;
347
+        this.setData({
348
+          IsMember: true,
349
+        });
350
+      }
351
+
352
+    }
353
+  },
337 354
   onShareAppMessage: function () {
338 355
     return {
339 356
       title: app.globalData.ShareTitle,

+ 32 - 14
pages/main/list.js

@@ -16,7 +16,7 @@ Page({
16 16
       NavClass2: "nav2",
17 17
       IsShowNav1: true,
18 18
       BookID: bookID,
19
-      IsShowPayInfo:false,
19
+      IsShowPayInfo: false,
20 20
       IsShow: app.globalData.IsShow,
21 21
     });
22 22
   },
@@ -49,6 +49,8 @@ Page({
49 49
             }
50 50
           }
51 51
 
52
+          item.WordLength = item.Words.length;
53
+
52 54
           for (var k = 0; k < item.Words.length; k++) {
53 55
             item.Words[k].ReviewCss = "";
54 56
             for (var l = 0; l < arrReview.length; l++) {
@@ -58,6 +60,18 @@ Page({
58 60
               }
59 61
             }
60 62
           }
63
+
64
+          if (item.WordLength % 6 > 0) {
65
+            var count = 6 - (item.WordLength % 6);
66
+            console.log(count);
67
+            for (var n = 0; n < count; n++) {
68
+              var obj = {
69
+                Name: "",
70
+                ReviewCss: "boxNull",
71
+              };
72
+              item.Words.push(obj);
73
+            }
74
+          }
61 75
         }
62 76
         break;
63 77
       }
@@ -97,18 +111,22 @@ Page({
97 111
       });
98 112
     }
99 113
     else {
100
-      var bookid = e.currentTarget.dataset.bookid;
101
-      var unitid = e.currentTarget.dataset.unitid;
102
-      var wordid = e.currentTarget.dataset.wordid;
103
-      var isfinished = e.currentTarget.dataset.isfinished;
104
-      if (!wordid)
105
-        wordid = 0
106
-      else {
107
-        wx.setStorageSync('SelectedRandom', false);
114
+      var word = e.currentTarget.dataset.word;
115
+      if (word) {
116
+        var bookid = e.currentTarget.dataset.bookid;
117
+        var unitid = e.currentTarget.dataset.unitid;
118
+        var wordid = e.currentTarget.dataset.wordid;
119
+        var isfinished = e.currentTarget.dataset.isfinished;
120
+
121
+        if (!wordid)
122
+          wordid = 0
123
+        else {
124
+          wx.setStorageSync('SelectedRandom', false);
125
+        }
126
+        wx.navigateTo({
127
+          url: "../main/detail?bookid=" + bookid + "&unitid=" + unitid + "&wordid=" + wordid + "&isfinished=" + isfinished,
128
+        });
108 129
       }
109
-      wx.navigateTo({
110
-        url: "./detail?bookid=" + bookid + "&unitid=" + unitid + "&wordid=" + wordid + "&isfinished=" + isfinished,
111
-      });
112 130
     }
113 131
   },
114 132
   getFinished: function () {
@@ -151,7 +169,7 @@ Page({
151 169
       var money = app.globalData.PayMoney;
152 170
       server.payMoney(3, money, function () {
153 171
         wx.navigateTo({
154
-          url: './payfinished',
172
+          url: '../about/payfinished',
155 173
         });
156 174
       });
157 175
       setTimeout(function () {
@@ -161,7 +179,7 @@ Page({
161 179
   },
162 180
   gotoNewUser: function () {
163 181
     wx.navigateTo({
164
-      url: './newuserlist',
182
+      url: '../about/newuserlist',
165 183
     });
166 184
   },
167 185
   close: function () {

+ 6 - 2
pages/main/list.wxml

@@ -35,7 +35,7 @@
35 35
             </view>
36 36
             <view class="right2 FlexRow">
37 37
               <image src='../../images/04008.png' class="img04008" />
38
-              <view class="title3">{{item.Words.length}}个</view>
38
+              <view class="title3">{{item.WordLength}}个</view>
39 39
             </view>
40 40
           </view>
41 41
         </view>
@@ -52,7 +52,11 @@
52 52
         <view class="title1">{{item.Name}}</view>
53 53
       </view>
54 54
       <view class="table FlexRow">
55
-        <view class="{{itemChild.ReviewCss}} box" wx:for="{{item.Words}}" wx:key="i" wx:for-item="itemChild" wx:for-index="i" bindtap="goto" data-islocked='{{item.IsLocked}}' data-bookid='{{BookID}}' data-unitid='{{item.ID}}' data-wordid='{{i}}' data-isfinished='{{item.IsFinished}}'>{{itemChild.Name}}</view>
55
+        <view class="{{itemChild.ReviewCss}} box" wx:for="{{item.Words}}" wx:key="i" wx:for-item="itemChild" wx:for-index="i" 
56
+        bindtap="goto" data-islocked='{{item.IsLocked}}' 
57
+        data-bookid='{{BookID}}' data-unitid='{{item.ID}}' 
58
+        data-wordid='{{i}}' data-word='{{itemChild.Name}}' data-isfinished='{{item.IsFinished}}'
59
+        >{{itemChild.Name}}</view>
56 60
       </view>
57 61
     </view>
58 62
 

+ 9 - 3
pages/main/list.wxss

@@ -155,15 +155,15 @@
155 155
   font-size:28rpx;
156 156
 }
157 157
 .group .table{
158
-  margin: 40rpx 20rpx 60rpx 30rpx;
158
+  margin: 40rpx 20rpx 60rpx 20rpx;
159 159
   font-size:48rpx;
160
-  justify-content: flex-start;
160
+  /* justify-content: flex-start; */
161 161
   align-items: flex-start;
162 162
   flex-wrap: wrap;
163 163
   /* background-color: #000; */
164 164
 }
165 165
 .group .box{
166
-  margin: 0 7rpx 7rpx 0;
166
+  margin: 0 3rpx 7rpx 3rpx;
167 167
   background-color: #fff;
168 168
   width:106rpx;
169 169
   height:106rpx;
@@ -179,6 +179,12 @@
179 179
   width:106rpx;
180 180
   height:106rpx;
181 181
 }
182
+.group .boxNull{
183
+  background-color: #F5E2BE;
184
+  border:1rpx solid #F5E2BE;
185
+  width:106rpx;
186
+  height:106rpx;
187
+}
182 188
 
183 189
 
184 190
 .PayInfo{

+ 3 - 3
pages/main/search.js

@@ -52,10 +52,10 @@ Page({
52 52
           wx.setStorageSync('IsAutoPage', false);
53 53
 
54 54
           wx.navigateTo({
55
-            url: "./detail?Type=search",
55
+            url: "../main/detail?Type=search",
56 56
           });
57 57
         }
58
-        else{
58
+        else {
59 59
           that.setData({
60 60
             IsSearchResult: true,
61 61
           });
@@ -70,7 +70,7 @@ Page({
70 70
   },
71 71
   goto: function (e) {
72 72
     var word = e.currentTarget.dataset.word;
73
-    this.researchWord({detail:{value:word}});
73
+    this.researchWord({ detail: { value: word } });
74 74
   },
75 75
   onShareAppMessage: function () {
76 76
     return {

+ 2 - 2
project.config.json

@@ -59,13 +59,13 @@
59 59
 				{
60 60
 					"id": -1,
61 61
 					"name": "\b关于",
62
-					"pathName": "pages/main/about",
62
+					"pathName": "pages/about/about",
63 63
 					"query": ""
64 64
 				},
65 65
 				{
66 66
 					"id": 5,
67 67
 					"name": "\b活动",
68
-					"pathName": "pages/main/paylist",
68
+					"pathName": "pages/about/paylist",
69 69
 					"query": ""
70 70
 				}
71 71
 			]

+ 3 - 8
utils/util.js

@@ -229,14 +229,9 @@ function checkError(err) {
229 229
     case 503:
230 230
     case 504:
231 231
     case 505:
232
-      wx.navigateTo({
233
-        url: '../About/ErrorPage',
234
-        fail: function (e) {
235
-          wx.showToast({
236
-            title: '网络故障,请稍候再试!',
237
-            duration: 3000
238
-          });
239
-        }
232
+      wx.showToast({
233
+        title: '网络故障,请稍候再试!',
234
+        duration: 3000
240 235
       });
241 236
       break;
242 237
   }