chengjie 6 年之前
父节点
当前提交
3eacc531cf
共有 52 个文件被更改,包括 555 次插入425 次删除
  1. 1 1
      app.js
  2. 0 1
      app.json
  3. 二进制
      marketing/images/program_screenshot_promotion.png
  4. 37 87
      marketing/main/extenduser.js
  5. 1 17
      marketing/main/extenduser.wxml
  6. 13 2
      marketing/main/extenduser.wxss
  7. 10 0
      marketing/main/index.js
  8. 8 18
      marketing/main/index.wxml
  9. 10 2
      marketing/main/shareuser.js
  10. 二进制
      pages/images/program_screenshot_promotion.png
  11. 18 31
      pages/index/accredit.js
  12. 14 4
      pages/index/accredit.wxml
  13. 9 5
      pages/index/accredit.wxss
  14. 7 6
      pages/index/index.js
  15. 0 20
      pages/index/notice.js
  16. 0 4
      pages/index/notice.json
  17. 0 6
      pages/index/notice.wxml
  18. 0 20
      pages/index/notice.wxss
  19. 30 13
      pages/main/add.js
  20. 2 2
      pages/main/add.wxml
  21. 9 2
      pages/main/default.js
  22. 1 1
      pages/main/default.wxml
  23. 2 0
      pages/main/detail.js
  24. 3 1
      pages/main/preview.js
  25. 16 2
      pages/main/searchCard.js
  26. 14 0
      pages/main/searchCard.wxml
  27. 14 0
      pages/main/searchCard.wxss
  28. 11 5
      pages/main/searchCardList.js
  29. 37 0
      pages/main/searchWeb.js
  30. 25 15
      pages/main/searchWeb.wxml
  31. 38 0
      pages/main/searchWeb.wxss
  32. 12 5
      pages/main/searchWeb2.js
  33. 13 15
      pages/main/searchWeb2.wxml
  34. 7 5
      pages/main/searchWeb2.wxss
  35. 1 15
      pages/main/systemsetting.js
  36. 21 29
      pages/main/systemsetting.wxml
  37. 4 2
      pages/other/activity.wxml
  38. 6 0
      pages/other/activity.wxss
  39. 12 10
      pages/other/binding.js
  40. 25 14
      pages/other/coupon.js
  41. 19 3
      pages/other/coupon.wxml
  42. 48 1
      pages/other/coupon.wxss
  43. 0 25
      pages/other/lessonlist.js
  44. 0 12
      pages/other/lessonlist.wxml
  45. 3 2
      pages/other/pay.js
  46. 8 1
      pages/other/userbook.js
  47. 2 1
      pages/other/userbook.json
  48. 9 10
      pages/other/userbook.wxml
  49. 5 0
      pages/other/userbook.wxss
  50. 1 1
      pages/plan/setting.js
  51. 9 9
      project.config.json
  52. 20 0
      utils/main.js

+ 1 - 1
app.js

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

+ 0 - 1
app.json

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

二进制
marketing/images/program_screenshot_promotion.png


+ 37 - 87
marketing/main/extenduser.js

@@ -2,18 +2,14 @@ import common from '../../utils/util';
2
 import main from '../../utils/main';
2
 import main from '../../utils/main';
3
 
3
 
4
 const app = getApp();
4
 const app = getApp();
5
-const ArrFilter1 = ["全部", "仅看未报名"];
6
-const ArrFilter2 = ["全部", "仅看未续费"];
7
-var AllList = [];
5
+var AllList = [],List1=[];
8
 
6
 
9
 Page({
7
 Page({
10
   data: {
8
   data: {
11
   },
9
   },
12
   onLoad: function (options) {
10
   onLoad: function (options) {
13
-    if (options){
14
-      app.globalData.userInfo={};
15
-      app.globalData.userInfo.UserID=options.UserID;
16
-    }
11
+    
12
+    //app.globalData.userInfo.UserID=9;
17
     
13
     
18
     var pageType = 0;
14
     var pageType = 0;
19
     if (options.PageType == 1) {
15
     if (options.PageType == 1) {
@@ -25,12 +21,9 @@ Page({
25
     this.setData({
21
     this.setData({
26
       Containnerheight: main.getWindowHeight(),
22
       Containnerheight: main.getWindowHeight(),
27
       ArrMenu: [
23
       ArrMenu: [
28
-        { Name: "打开过", Selected: 1 },
29
-        { Name: "报过名", Selected: 0 },
30
-        { Name: "已续费", Selected: 0 }
24
+        { Name: "报名了", Selected: 1 },
25
+        { Name: "续费了", Selected: 0 }
31
       ],
26
       ],
32
-      Filter1: ArrFilter1[0],
33
-      Filter2: ArrFilter2[0],
34
       ArrAward: [
27
       ArrAward: [
35
         { Name: "等待出账", Remark: "等待用户渡过7天退款期的名单",List:[] },
28
         { Name: "等待出账", Remark: "等待用户渡过7天退款期的名单",List:[] },
36
         { Name: "出账", Remark: "已符合奖励条件的名单", List: [] },
29
         { Name: "出账", Remark: "已符合奖励条件的名单", List: [] },
@@ -38,33 +31,46 @@ Page({
38
       ],
31
       ],
39
       PageType: pageType,
32
       PageType: pageType,
40
     });
33
     });
41
-    this.init();
34
+
35
+    if (app.globalData.userInfo.Subscribe == 1) {
36
+      this.init();
37
+    }
38
+    else{
39
+      wx.redirectTo({
40
+        url: '../../pages/other/userbook',
41
+      });
42
+    }
43
+    
42
   },
44
   },
43
   init: function () {
45
   init: function () {
44
     var that = this;
46
     var that = this;
45
     main.getData('GetIntroducerUserList?UserID=' + app.globalData.userInfo.UserID, function (data) {
47
     main.getData('GetIntroducerUserList?UserID=' + app.globalData.userInfo.UserID, function (data) {
46
       wx.hideLoading();
48
       wx.hideLoading();
47
       if (data) {
49
       if (data) {
48
-        AllList = data;
50
+        List1=data.List1;
51
+        AllList = data.List2;
49
         if (that.data.PageType == 0) {
52
         if (that.data.PageType == 0) {
50
           that.setData({
53
           that.setData({
51
-            List: data,
54
+            List: data.List1,
52
           });
55
           });
53
         }
56
         }
54
         else {
57
         else {
55
           var sevenday = common.formatTime(common.addDate("d",-7,new Date()));
58
           var sevenday = common.formatTime(common.addDate("d",-7,new Date()));
59
+          //console.log(sevenday);
56
           for (var i = 0; i < AllList.length; i++) {
60
           for (var i = 0; i < AllList.length; i++) {
57
             if (AllList[i].IsPay == 1 && AllList[i].IsMember == 1){
61
             if (AllList[i].IsPay == 1 && AllList[i].IsMember == 1){
58
               var payTime = AllList[i].PayTime;
62
               var payTime = AllList[i].PayTime;
59
-              if (sevenday < payTime) {
60
-                that.data.ArrAward[0].List.push(AllList[i]);
61
-              }
62
-              else {
63
-                if (AllList[i].IsRebate == 0) {
64
-                  that.data.ArrAward[1].List.push(AllList[i]);
63
+              if (payTime != "1900-01-01 00:00:00"){
64
+                if (sevenday < payTime) {
65
+                  that.data.ArrAward[0].List.push(AllList[i]);
65
                 }
66
                 }
66
                 else {
67
                 else {
67
-                  that.data.ArrAward[2].List.push(AllList[i]);
68
+                  if (AllList[i].IsRebate == 0) {
69
+                    that.data.ArrAward[1].List.push(AllList[i]);
70
+                  }
71
+                  else {
72
+                    that.data.ArrAward[2].List.push(AllList[i]);
73
+                  }
68
                 }
74
                 }
69
               }
75
               }
70
             }
76
             }
@@ -79,83 +85,27 @@ Page({
79
   changeMenu: function (e) {
85
   changeMenu: function (e) {
80
     var that = this;
86
     var that = this;
81
     var id = e.currentTarget.dataset.id;
87
     var id = e.currentTarget.dataset.id;
82
-    for (var i = 0; i < 3; i++) {
83
-      if (id == i)
84
-        that.data.ArrMenu[i].Selected = 1;
85
-      else
86
-        that.data.ArrMenu[i].Selected = 0;
87
-    }
88
-
89
     var list = [];
88
     var list = [];
90
-
91
-    for (var i = 0; i < AllList.length; i++) {
92
-      if (id == 1) {
93
-        if (AllList[i].IsMember == 1)
94
-          list.push(AllList[i]);
95
-      }
96
-      else if (id == 2) {
97
-        if (AllList[i].IsPay == 1)
98
-          list.push(AllList[i]);
99
-      }
100
-      else
101
-        list.push(AllList[i]);
89
+    if (id == 0) {
90
+      that.data.ArrMenu[0].Selected = 1;
91
+      that.data.ArrMenu[1].Selected = 0;
92
+      list = List1;
93
+    }  
94
+    else {
95
+      that.data.ArrMenu[0].Selected = 0;
96
+      that.data.ArrMenu[1].Selected = 1;
97
+      list = AllList;
102
     }
98
     }
103
 
99
 
104
     that.setData({
100
     that.setData({
105
       ArrMenu: that.data.ArrMenu,
101
       ArrMenu: that.data.ArrMenu,
106
       List: list,
102
       List: list,
107
-      Filter1: ArrFilter1[0],
108
-      Filter2: ArrFilter2[0],
109
     });
103
     });
110
 
104
 
111
     wx.pageScrollTo({
105
     wx.pageScrollTo({
112
       scrollTop: 0,
106
       scrollTop: 0,
113
     });
107
     });
114
   },
108
   },
115
-  filterData1: function (e) {
116
-    var that = this;
117
-    wx.showActionSheet({
118
-      itemList: ArrFilter1,
119
-      success(res) {
120
-        var list = [];
121
-        for (var i = 0; i < AllList.length; i++) {
122
-          if (res.tapIndex == 1) {
123
-            if (AllList[i].IsMember == 0)
124
-              list.push(AllList[i]);
125
-          }
126
-          else
127
-            list.push(AllList[i]);
128
-        }
129
-
130
-        that.setData({
131
-          Filter1: ArrFilter1[res.tapIndex],
132
-          List: list,
133
-        });
134
-      },
135
-    })
136
-  },
137
-  filterData2: function (e) {
138
-    var that = this;
139
-    wx.showActionSheet({
140
-      itemList: ArrFilter2,
141
-      success(res) {
142
-        var list = [];
143
-        for (var i = 0; i < AllList.length; i++) {
144
-          if (res.tapIndex == 1) {
145
-            if (AllList[i].IsPay == 0 && AllList[i].IsMember == 1)
146
-              list.push(AllList[i]);
147
-          }
148
-          else if (AllList[i].IsMember == 1)
149
-            list.push(AllList[i]);
150
-        }
151
-
152
-        that.setData({
153
-          Filter2: ArrFilter2[res.tapIndex],
154
-          List: list,
155
-        });
156
-      },
157
-    })
158
-  },
159
   gogoShareUser: function () {
109
   gogoShareUser: function () {
160
     wx.navigateTo({
110
     wx.navigateTo({
161
       url: './shareuser',
111
       url: './shareuser',

+ 1 - 17
marketing/main/extenduser.wxml

@@ -6,24 +6,8 @@
6
       <view class="line1{{item.Selected}}"></view>
6
       <view class="line1{{item.Selected}}"></view>
7
     </view>
7
     </view>
8
   </view>
8
   </view>
9
+  <view class="line2"></view>
9
   <view class="panel FlexColumn">
10
   <view class="panel FlexColumn">
10
-    <view class="panel1 FlexRow" bindtap="filterData1" wx:if="{{ArrMenu[0].Selected==1}}">
11
-      <view class="left">筛选</view>
12
-      <view class="right FlexRow">
13
-        <view class="panel11">{{Filter1}}</view>
14
-        <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
15
-      </view>
16
-    </view>
17
-    <view class="panel1 FlexRow" bindtap="filterData2" wx:if="{{ArrMenu[1].Selected==1}}">
18
-      <view class="left">筛选</view>
19
-      <view class="right FlexRow">
20
-        <view class="panel11">{{Filter2}}</view>
21
-        <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
22
-      </view>
23
-    </view>
24
-    <view class="lineWidthAll FlexRow" wx:if="{{ArrMenu[2].Selected==0}}">
25
-      <view class="lineWidth720"></view>
26
-    </view>
27
     <view class="panel2 FlexRow">
11
     <view class="panel2 FlexRow">
28
       <view class="left">共{{List.length}}人</view>
12
       <view class="left">共{{List.length}}人</view>
29
     </view>
13
     </view>

+ 13 - 2
marketing/main/extenduser.wxss

@@ -1,3 +1,8 @@
1
+.container{
2
+  width:100%;
3
+  background-color:#fff;
4
+}
5
+
1
 .panelTop{
6
 .panelTop{
2
   width:100%;
7
   width:100%;
3
   position: fixed;
8
   position: fixed;
@@ -6,7 +11,7 @@
6
 }
11
 }
7
 
12
 
8
 .panelTop1{
13
 .panelTop1{
9
-  width:250rpx;
14
+  width:375rpx;
10
   height: 90rpx;
15
   height: 90rpx;
11
   justify-content: flex-end;
16
   justify-content: flex-end;
12
   background-color: #fff;
17
   background-color: #fff;
@@ -25,6 +30,13 @@
25
   margin-bottom: 20rpx;
30
   margin-bottom: 20rpx;
26
 }
31
 }
27
 
32
 
33
+.line2{
34
+  width:100%;
35
+  height:20rpx;
36
+  background-color: #f0f0f0;
37
+  margin-top: 90rpx;
38
+}
39
+
28
 .line10{
40
 .line10{
29
   width:84rpx;
41
   width:84rpx;
30
   height:10rpx;
42
   height:10rpx;
@@ -38,7 +50,6 @@
38
 
50
 
39
 .panel{
51
 .panel{
40
   width:100%;
52
   width:100%;
41
-  margin-top: 110rpx;
42
   background-color: #fff;
53
   background-color: #fff;
43
   justify-content: flex-start;
54
   justify-content: flex-start;
44
 }
55
 }

+ 10 - 0
marketing/main/index.js

@@ -7,6 +7,11 @@ Page({
7
   data: {
7
   data: {
8
   },
8
   },
9
   onLoad: function (options) {
9
   onLoad: function (options) {
10
+    if (options && options.UserID){
11
+      app.globalData.userInfo={};
12
+      app.globalData.userInfo.UserID=options.UserID;
13
+    }
14
+
10
     this.setData({
15
     this.setData({
11
       Containnerheight: main.getWindowHeight(),
16
       Containnerheight: main.getWindowHeight(),
12
     });
17
     });
@@ -21,6 +26,11 @@ Page({
21
       url: './shareuser',
26
       url: './shareuser',
22
     });
27
     });
23
   },
28
   },
29
+  gotoWeb:function(){
30
+    wx.navigateTo({
31
+      url: '../../pages/other/webview?PageID=7',
32
+    });
33
+  },
24
   onShareAppMessage: function () {
34
   onShareAppMessage: function () {
25
     return {
35
     return {
26
       title: app.globalData.ShareTitle,
36
       title: app.globalData.ShareTitle,

+ 8 - 18
marketing/main/index.wxml

@@ -4,16 +4,16 @@
4
     <view class="panelTitle1">推广</view>
4
     <view class="panelTitle1">推广</view>
5
     <view class="panelTitle2"></view>
5
     <view class="panelTitle2"></view>
6
   </view>
6
   </view>
7
-  <!-- <view class="panelItem FlexRow">
8
-    <view class="panelItem1">规则说明</view>
7
+  <view class="panelItem FlexRow" bindtap="gotoWeb">
8
+    <view class="panelItem1">活动规则</view>
9
     <view class="panelItem2 FlexRow">
9
     <view class="panelItem2 FlexRow">
10
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
10
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
11
     </view>
11
     </view>
12
   </view>
12
   </view>
13
   <view class="lineWidthAll FlexRow">
13
   <view class="lineWidthAll FlexRow">
14
     <view class="lineWidth720"></view>
14
     <view class="lineWidth720"></view>
15
-  </view> -->
16
-  <view class="panelItem FlexRow"  bindtap="gogoShareUser">
15
+  </view>
16
+  <view class="panelItem FlexRow" bindtap="gogoShareUser">
17
     <view class="panelItem1">我的宣传品</view>
17
     <view class="panelItem1">我的宣传品</view>
18
     <view class="panelItem2 FlexRow">
18
     <view class="panelItem2 FlexRow">
19
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
19
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
@@ -23,14 +23,14 @@
23
     <view class="lineWidth720"></view>
23
     <view class="lineWidth720"></view>
24
   </view>
24
   </view>
25
   <view class="panelItem FlexRow" bindtap="gogoExtendUser" data-id="0">
25
   <view class="panelItem FlexRow" bindtap="gogoExtendUser" data-id="0">
26
-    <view class="panelItem1">推广名单</view>
26
+    <view class="panelItem1">推广效果</view>
27
     <view class="panelItem2 FlexRow">
27
     <view class="panelItem2 FlexRow">
28
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
28
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
29
     </view>
29
     </view>
30
   </view>
30
   </view>
31
   <view class='lineFooter'></view>
31
   <view class='lineFooter'></view>
32
 
32
 
33
-  <view class="panelTitle FlexRow">
33
+  <!-- <view class="panelTitle FlexRow">
34
     <view class="panelTitle1">奖励</view>
34
     <view class="panelTitle1">奖励</view>
35
     <view class="panelTitle2"></view>
35
     <view class="panelTitle2"></view>
36
   </view>
36
   </view>
@@ -39,7 +39,8 @@
39
     <view class="panelItem2 FlexRow">
39
     <view class="panelItem2 FlexRow">
40
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
40
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
41
     </view>
41
     </view>
42
-  </view>
42
+  </view> -->
43
+
43
   <!-- <view class="lineWidthAll FlexRow">
44
   <!-- <view class="lineWidthAll FlexRow">
44
     <view class="lineWidth720"></view>
45
     <view class="lineWidth720"></view>
45
   </view>
46
   </view>
@@ -60,15 +61,4 @@
60
   </view> -->
61
   </view> -->
61
   <view class='lineFooter'></view>
62
   <view class='lineFooter'></view>
62
 
63
 
63
-  <!-- <view class="panelTitle FlexRow">
64
-    <view class="panelTitle1">辅助</view>
65
-    <view class="panelTitle2"></view>
66
-  </view>
67
-  <view class="panelItem FlexRow">
68
-    <view class="panelItem1">过程提醒</view>
69
-    <view class="panelItem2 FlexRow">
70
-      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
71
-    </view>
72
-  </view>
73
-  <view class='lineFooter'></view> -->
74
 </view>
64
 </view>

+ 10 - 2
marketing/main/shareuser.js

@@ -24,6 +24,13 @@ Page({
24
         });
24
         });
25
       }
25
       }
26
     });
26
     });
27
+    main.getData("GetClassList?Flag=0", function (data) {
28
+      if (data && data.length > 0) {
29
+        that.setData({
30
+          StartDate: common.formatDateCHS(data[0].StartDate),
31
+        })
32
+      }
33
+    });
27
   }, 
34
   }, 
28
   buildImage:function(){
35
   buildImage:function(){
29
 
36
 
@@ -38,7 +45,7 @@ Page({
38
     var imageUrl = '../images/promotion_leaflet_a01.png';
45
     var imageUrl = '../images/promotion_leaflet_a01.png';
39
     var imageQRCode = app.globalData.serverUrl;
46
     var imageQRCode = app.globalData.serverUrl;
40
     imageQRCode += common.Encrypt("BuildWXServiceQRCode?QRCodeType=0&UserID=" + app.globalData.userInfo.UserID + "&SourceID=" + app.globalData.ProgramID);
47
     imageQRCode += common.Encrypt("BuildWXServiceQRCode?QRCodeType=0&UserID=" + app.globalData.userInfo.UserID + "&SourceID=" + app.globalData.ProgramID);
41
-
48
+    console.log(imageQRCode);
42
     var that = this;
49
     var that = this;
43
     var downloadTask = wx.downloadFile({
50
     var downloadTask = wx.downloadFile({
44
       url: imageQRCode,
51
       url: imageQRCode,
@@ -50,7 +57,7 @@ Page({
50
           canvas.drawImage(res.tempFilePath, 550, 1068, 160, 160);
57
           canvas.drawImage(res.tempFilePath, 550, 1068, 160, 160);
51
           canvas.fillStyle = "#1e1e1e";
58
           canvas.fillStyle = "#1e1e1e";
52
           canvas.setFontSize(28);
59
           canvas.setFontSize(28);
53
-          canvas.fillText("开班时间:2019-09-01", 50, 1212);
60
+          canvas.fillText("开班时间:"+that.data.StartDate, 50, 1212);
54
           canvas.draw(1, function (n) {
61
           canvas.draw(1, function (n) {
55
 
62
 
56
             wx.canvasToTempFilePath({
63
             wx.canvasToTempFilePath({
@@ -81,6 +88,7 @@ Page({
81
         }
88
         }
82
       },
89
       },
83
       fail: function (err) {
90
       fail: function (err) {
91
+        console.log("err:"+err);
84
         wx.hideLoading();
92
         wx.hideLoading();
85
         downloadNumber++;
93
         downloadNumber++;
86
         if (downloadNumber<3)
94
         if (downloadNumber<3)

二进制
pages/images/program_screenshot_promotion.png


+ 18 - 31
pages/index/accredit.js

@@ -12,13 +12,21 @@ Page({
12
     urlRedirectTo = options.url;
12
     urlRedirectTo = options.url;
13
     this.setData({
13
     this.setData({
14
       Containnerheight: main.getWindowHeight(),
14
       Containnerheight: main.getWindowHeight(),
15
+      IsShow: app.globalData.userInfo.IsShow,
15
     });
16
     });
16
 
17
 
18
+    this.init();
19
+
17
     if (!app.globalData.userInfo)
20
     if (!app.globalData.userInfo)
18
       app.globalData.userInfo={};
21
       app.globalData.userInfo={};
19
   },
22
   },
20
-  onUnload: function () {
21
-
23
+  init: function () {
24
+    var that=this;
25
+    main.getData("GetAccreditInfo?IsShow=" + app.globalData.userInfo.IsShow, function (data) {
26
+      that.setData({
27
+        Info: data,
28
+      });
29
+    });
22
   },
30
   },
23
   goto: function () {
31
   goto: function () {
24
     var that = this;
32
     var that = this;
@@ -30,9 +38,6 @@ Page({
30
             success() {
38
             success() {
31
               that.getUserInfo();
39
               that.getUserInfo();
32
             },
40
             },
33
-            fail() {
34
-              
35
-            }
36
           })
41
           })
37
         }
42
         }
38
         else {
43
         else {
@@ -60,15 +65,10 @@ Page({
60
             that.login(app.globalData.userInfo, res.userInfo);
65
             that.login(app.globalData.userInfo, res.userInfo);
61
           },
66
           },
62
           fail: function (res) {
67
           fail: function (res) {
63
-            wx.navigateBack({
64
-              delta: 1
65
-            });
68
+            that.gotoReturn();
66
           }
69
           }
67
         });
70
         });
68
       },
71
       },
69
-      fail: function () {
70
-
71
-      }
72
     });
72
     });
73
   },
73
   },
74
   login: function (param, param2) {
74
   login: function (param, param2) {
@@ -102,31 +102,18 @@ Page({
102
       app.globalData.userInfo.IsMember=data.IsMember;
102
       app.globalData.userInfo.IsMember=data.IsMember;
103
 
103
 
104
       if (app.globalData.userInfo.UserID)
104
       if (app.globalData.userInfo.UserID)
105
-        that.buildInitData();
105
+        main.buildInitData(function(){
106
+          that.gotoReturn();
107
+        });
106
       else{
108
       else{
107
         app.globalData.userInfo.UserID = data.UserID;
109
         app.globalData.userInfo.UserID = data.UserID;
108
-        wx.navigateBack({
109
-          delta: 1
110
-        });
110
+        that.gotoReturn();
111
       }
111
       }
112
     });
112
     });
113
   },
113
   },
114
-  buildInitData: function () {
115
-    //app.globalData.userInfo.UserID=4;
116
-    wx.showLoading({
117
-      title: '数据初始化',
118
-    });
119
-    setTimeout(function () {
120
-      wx.hideLoading();
121
-    }, 5000);
122
-    
123
-    main.getData('BuildInitData?UserID=' + app.globalData.userInfo.UserID, function (data) {
124
-      wx.hideLoading();
125
-      if (data) {
126
-        wx.navigateBack({
127
-          delta: 1
128
-        });
129
-      }
114
+  gotoReturn:function(){
115
+    wx.navigateBack({
116
+      delta: 1
130
     });
117
     });
131
   },
118
   },
132
   onShareAppMessage: function () {
119
   onShareAppMessage: function () {

+ 14 - 4
pages/index/accredit.wxml

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

+ 9 - 5
pages/index/accredit.wxss

@@ -18,6 +18,12 @@
18
   text-align: center;
18
   text-align: center;
19
 }
19
 }
20
 
20
 
21
+.text1{
22
+  font-size:32rpx;
23
+  margin-top: 20rpx;
24
+  text-align: center;
25
+}
26
+
21
 .btn{
27
 .btn{
22
   width:600rpx;
28
   width:600rpx;
23
   height:90rpx;
29
   height:90rpx;
@@ -27,11 +33,9 @@
27
   margin-top: 40rpx;
33
   margin-top: 40rpx;
28
   color:#fff;
34
   color:#fff;
29
 }
35
 }
30
-
31
-.text1{
32
-  font-size:28rpx;
33
-  margin-top: 40rpx;
34
-  text-align: center;
36
+.btn2{
37
+  width:280rpx;
38
+  margin: 40rpx 20rpx;
35
 }
39
 }
36
 
40
 
37
 .universalpic_share_white_52x40{
41
 .universalpic_share_white_52x40{

+ 7 - 6
pages/index/index.js

@@ -23,9 +23,7 @@ const arrSentence = [
23
 var timeout1 = 0;
23
 var timeout1 = 0;
24
 
24
 
25
 Page({
25
 Page({
26
-  data: {
27
-
28
-  },
26
+  data: {},
29
   onPullDownRefresh: function () {
27
   onPullDownRefresh: function () {
30
     wx.reLaunch({
28
     wx.reLaunch({
31
       url: './index',
29
       url: './index',
@@ -143,7 +141,6 @@ Page({
143
       success: function (res0) {
141
       success: function (res0) {
144
         app.globalData.userInfo = {};
142
         app.globalData.userInfo = {};
145
         app.globalData.userInfo.Code = res0.code;
143
         app.globalData.userInfo.Code = res0.code;
146
-        //console.log("Code:" + res0.code);
147
         console.log("Time2:" + new Date().getTime());
144
         console.log("Time2:" + new Date().getTime());
148
         wx.getSetting({
145
         wx.getSetting({
149
           scope: "scope.userInfo",
146
           scope: "scope.userInfo",
@@ -239,7 +236,7 @@ Page({
239
             }
236
             }
240
           }
237
           }
241
 
238
 
242
-          app.globalData.IsShow = isShow;
239
+          app.globalData.userInfo.IsShow = isShow;
243
           if (app.globalData.userInfo.IsMember == 1)
240
           if (app.globalData.userInfo.IsMember == 1)
244
             app.globalData.IsLocked = 0;
241
             app.globalData.IsLocked = 0;
245
 
242
 
@@ -324,8 +321,12 @@ Page({
324
         content: '新版本已经准备好,是否重启应用?',
321
         content: '新版本已经准备好,是否重启应用?',
325
         success: function (res) {
322
         success: function (res) {
326
           if (res.confirm) {
323
           if (res.confirm) {
324
+            wx.removeStorageSync("UserID");
325
+            wx.removeStorageSync("UserName");
326
+            wx.removeStorageSync("SearchWord3");
327
+
327
             // 新的版本已经下载好,调用 applyUpdate 应用新版本并重启
328
             // 新的版本已经下载好,调用 applyUpdate 应用新版本并重启
328
-            updateManager.applyUpdate()
329
+            updateManager.applyUpdate();
329
           }
330
           }
330
         }
331
         }
331
       });
332
       });

+ 0 - 20
pages/index/notice.js

@@ -1,20 +0,0 @@
1
-import common from '../../utils/util';
2
-import main from '../../utils/main';
3
-
4
-const app = getApp();
5
-
6
-Page({
7
-  data: {
8
-  },
9
-  onLoad: function (options) {
10
-    this.setData({
11
-      Containnerheight: main.getWindowHeight(),
12
-    });
13
-
14
-  },
15
-  onPullDownRefresh:function(){
16
-    wx.reLaunch({
17
-      url: './index',
18
-    })
19
-  }
20
-});

+ 0 - 4
pages/index/notice.json

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

+ 0 - 6
pages/index/notice.wxml

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

+ 0 - 20
pages/index/notice.wxss

@@ -1,20 +0,0 @@
1
-.container {
2
-  background-color: #fff;
3
-  position: fixed;
4
-  top:0;
5
-}
6
-
7
-.text1{
8
-  position: fixed;
9
-  top:380rpx;
10
-  font-size:68rpx;
11
-  font-weight: 400;
12
-}
13
-.text2{
14
-  position: fixed;
15
-  top:515rpx;
16
-  font-size:28rpx;
17
-  font-weight: 400;
18
-  line-height: 20rpx;
19
-  text-align: center;
20
-}

+ 30 - 13
pages/main/add.js

@@ -67,6 +67,7 @@ Page({
67
       MiaoguoCardID: options.id,
67
       MiaoguoCardID: options.id,
68
       FieldNumber: fieldNumber,
68
       FieldNumber: fieldNumber,
69
       PracticeTimeStr: PracticeTimeArr[0].Name,
69
       PracticeTimeStr: PracticeTimeArr[0].Name,
70
+      IsShow: app.globalData.userInfo.IsShow,
70
     });
71
     });
71
 
72
 
72
     var list = app.globalData.CardList;
73
     var list = app.globalData.CardList;
@@ -758,27 +759,43 @@ Page({
758
     var isSave = e.currentTarget.dataset.idsave;
759
     var isSave = e.currentTarget.dataset.idsave;
759
     if (isSave == "true") {
760
     if (isSave == "true") {
760
       isUnload = false;
761
       isUnload = false;
761
-      this.updateField();
762
+      var content = encodeURI(that.data.FieldContent)
763
+      main.getData("MsgSecCheck?content=" + content, function (data) {
764
+        if (data && data.errcode == 0) {
765
+          next(that);
766
+        }
767
+        else {
768
+          wx.showToast({
769
+            title: data.errmsg,
770
+            duration: 2000,
771
+            image: "../images/universalpic_wrong_white_120x120.png",
772
+          });
773
+        }
774
+      });
762
     }
775
     }
763
     else if (isSave == "false") {
776
     else if (isSave == "false") {
764
       var content = wx.getStorageSync("TempCardInfoAddItem");
777
       var content = wx.getStorageSync("TempCardInfoAddItem");
765
       this.setData({
778
       this.setData({
766
         FieldContent: content,
779
         FieldContent: content,
767
-      })
768
-      this.updateField();
780
+      });
781
+      next(that);
769
     }
782
     }
770
 
783
 
771
-    this.setData({
772
-      HiddenFieldEdit: true,
773
-    });
784
+    function next(obj){
785
+      obj.updateField();
786
+
787
+      obj.setData({
788
+        HiddenFieldEdit: true,
789
+      });
774
 
790
 
775
-    var title = "编辑题卡";
776
-    if (that.data.UpdateType == "add2") {
777
-      title = "添加题卡";
791
+      var title = "编辑题卡";
792
+      if (obj.data.UpdateType == "add2") {
793
+        title = "添加题卡";
794
+      }
795
+      wx.setNavigationBarTitle({
796
+        title: title,
797
+      });
778
     }
798
     }
779
-    wx.setNavigationBarTitle({
780
-      title: title,
781
-    });
782
   },
799
   },
783
 
800
 
784
   updateField: function () {
801
   updateField: function () {
@@ -971,7 +988,7 @@ Page({
971
     var that = this;
988
     var that = this;
972
     if (that.checkRecorderCount()) {
989
     if (that.checkRecorderCount()) {
973
       that.recorderInit();
990
       that.recorderInit();
974
-      tempRecorderFile="";
991
+      tempRecorderFile = "";
975
       wx.setNavigationBarTitle({
992
       wx.setNavigationBarTitle({
976
         title: '录音',
993
         title: '录音',
977
       });
994
       });

+ 2 - 2
pages/main/add.wxml

@@ -143,11 +143,11 @@
143
         <image class="universalpic_read_end_white_38x22" src='../images/universalpic_read_end_white_38x22.png' />
143
         <image class="universalpic_read_end_white_38x22" src='../images/universalpic_read_end_white_38x22.png' />
144
       </view>
144
       </view>
145
 
145
 
146
-      <view class="panelSaveTag2 panelSaveTag1 FlexRow" catchtap="uploadImageField">
146
+      <view class="panelSaveTag2 panelSaveTag1 FlexRow" catchtap="uploadImageField" wx:if="{{IsShow==1}}">
147
         <image class="universalpic_picture_gray_26x26" src='../images/universalpic_picture_gray_26x26.png' />
147
         <image class="universalpic_picture_gray_26x26" src='../images/universalpic_picture_gray_26x26.png' />
148
       </view>
148
       </view>
149
 
149
 
150
-      <view class="panelSaveTag2 panelSaveTag1 FlexRow" catchtap="recorderAccredit">
150
+      <view class="panelSaveTag2 panelSaveTag1 FlexRow" catchtap="recorderAccredit" wx:if="{{IsShow==1}}">
151
         <image class="universalpic_voicerecorder_normal_gray_21x26" src='../images/universalpic_voicerecorder_normal_gray_21x26.png' />
151
         <image class="universalpic_voicerecorder_normal_gray_21x26" src='../images/universalpic_voicerecorder_normal_gray_21x26.png' />
152
       </view>
152
       </view>
153
     </view>
153
     </view>

+ 9 - 2
pages/main/default.js

@@ -40,7 +40,7 @@ Page({
40
     var that = this;
40
     var that = this;
41
     wx.getSetting({
41
     wx.getSetting({
42
       success(res) {
42
       success(res) {
43
-        if (res.authSetting['scope.userInfo']) {
43
+        if (res.authSetting['scope.userInfo'] || app.globalData.userInfo.IsShow == 0) {
44
 
44
 
45
           if (!app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1){
45
           if (!app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1){
46
             if (app.globalData.userInfo.Subscribe == 1) {
46
             if (app.globalData.userInfo.Subscribe == 1) {
@@ -76,7 +76,9 @@ Page({
76
               app.globalData.GotoUrl="";
76
               app.globalData.GotoUrl="";
77
             }
77
             }
78
           }
78
           }
79
-          
79
+          else if (app.globalData.userInfo.IsShow == 0){
80
+            main.buildInitData(function () {});
81
+          }
80
           
82
           
81
           that.setData({
83
           that.setData({
82
             IsAccredit: true,
84
             IsAccredit: true,
@@ -183,6 +185,11 @@ Page({
183
     wx.removeStorageSync("TempCardNoSaved");
185
     wx.removeStorageSync("TempCardNoSaved");
184
     that.isNoSavedCard();
186
     that.isNoSavedCard();
185
   },
187
   },
188
+  gotoSearchCard:function(){
189
+    wx.reLaunch({
190
+      url: './searchCard',
191
+    });
192
+  },
186
   onShareAppMessage: function () {
193
   onShareAppMessage: function () {
187
     return {
194
     return {
188
       title: app.globalData.ShareTitle,
195
       title: app.globalData.ShareTitle,

+ 1 - 1
pages/main/default.wxml

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

+ 2 - 0
pages/main/detail.js

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

+ 3 - 1
pages/main/preview.js

@@ -419,6 +419,8 @@ Page({
419
 
419
 
420
     if (url.indexOf("http") > 0)
420
     if (url.indexOf("http") > 0)
421
       url = url.substr(url.indexOf("http"));
421
       url = url.substr(url.indexOf("http"));
422
+    if (url.indexOf("'") > 0)
423
+      url = common.ReplaceAllString(url,"'","");
422
     url = url.replace("http://", "https://");
424
     url = url.replace("http://", "https://");
423
 
425
 
424
     url = encodeURI(url);
426
     url = encodeURI(url);
@@ -435,7 +437,7 @@ Page({
435
       setTimeout(function () {
437
       setTimeout(function () {
436
         wx.hideLoading();
438
         wx.hideLoading();
437
       }, 30000);
439
       }, 30000);
438
-
440
+      console.log(url);
439
       wx.downloadFile({
441
       wx.downloadFile({
440
         url: url,
442
         url: url,
441
         success(res) {
443
         success(res) {

+ 16 - 2
pages/main/searchCard.js

@@ -10,6 +10,9 @@ Page({
10
     var that = this;
10
     var that = this;
11
     that.setData({
11
     that.setData({
12
       Containnerheight: main.getWindowHeight(),
12
       Containnerheight: main.getWindowHeight(),
13
+      AvatarUrl: app.globalData.userInfo.AvatarUrl,
14
+      NickName: app.globalData.userInfo.NickName,
15
+      IsShow: app.globalData.userInfo.IsShow,
13
     });
16
     });
14
     
17
     
15
   },
18
   },
@@ -28,9 +31,9 @@ Page({
28
     
31
     
29
   },
32
   },
30
   gotoDefault:function(){
33
   gotoDefault:function(){
31
-    wx.redirectTo({
34
+    wx.reLaunch({
32
       url: './default',
35
       url: './default',
33
-    })
36
+    });
34
   },
37
   },
35
   goto: function (e) {
38
   goto: function (e) {
36
     var url = e.currentTarget.dataset.url;
39
     var url = e.currentTarget.dataset.url;
@@ -97,6 +100,17 @@ Page({
97
       });
100
       });
98
     }
101
     }
99
   },
102
   },
103
+  gotoAccredit:function(){
104
+    wx.getSetting({
105
+      success(res) {
106
+        if (!res.authSetting['scope.userInfo']){
107
+          wx.navigateTo({
108
+            url: '../index/accredit',
109
+          })
110
+        }
111
+      }
112
+    });
113
+  },
100
   onShareAppMessage: function () {
114
   onShareAppMessage: function () {
101
     return {
115
     return {
102
       title: app.globalData.ShareTitle,
116
       title: app.globalData.ShareTitle,

+ 14 - 0
pages/main/searchCard.wxml

@@ -6,6 +6,20 @@
6
         <view>搜索我的题卡</view>
6
         <view>搜索我的题卡</view>
7
       </view>
7
       </view>
8
     </view>
8
     </view>
9
+    <block wx:if="{{IsShow==0}}">
10
+    <view class='panelBtn FlexColumn'>
11
+      <view class="panelItem3 panelItem FlexRow" bindtap="gotoAccredit">
12
+        <view class="panelItem1 FlexRow">
13
+          <image class="avatar" src='{{AvatarUrl}}' />
14
+          <view class="text6" wx:if="{{NickName=='陌生用户'}}">点击这里登录</view>
15
+          <view class="text6" wx:if="{{NickName!='陌生用户'}}">{{NickName}}</view>
16
+        </view>
17
+        <view class="panelItem2 FlexRow">
18
+        </view>
19
+      </view>
20
+    </view>
21
+    <view class='lineFooter'></view>
22
+    </block>
9
     <view class='panelBtn FlexColumn'>
23
     <view class='panelBtn FlexColumn'>
10
       <view class="panelItem FlexRow" bindtap="getList" data-id="0">
24
       <view class="panelItem FlexRow" bindtap="getList" data-id="0">
11
         <view class="panelItem1">
25
         <view class="panelItem1">

+ 14 - 0
pages/main/searchCard.wxss

@@ -96,4 +96,18 @@
96
   width:26rpx;
96
   width:26rpx;
97
   height:24rpx;
97
   height:24rpx;
98
   margin-right: 20rpx;
98
   margin-right: 20rpx;
99
+}
100
+
101
+.panelItem3{
102
+  height:140rpx;
103
+}
104
+.avatar{
105
+  width:80rpx;
106
+  height:80rpx;
107
+  background-color: #D8D8D8;
108
+  border-radius: 10rpx;
109
+}
110
+.text6{
111
+  font-size:28rpx;
112
+  margin-left: 20rpx;
99
 }
113
 }

+ 11 - 5
pages/main/searchCardList.js

@@ -39,9 +39,9 @@ Page({
39
       IsCollect = 1;
39
       IsCollect = 1;
40
     }
40
     }
41
 
41
 
42
-    var count=0;
42
+    var count = 0;
43
     if (options.count)
43
     if (options.count)
44
-      count=options.count;
44
+      count = options.count;
45
 
45
 
46
     that.setData({
46
     that.setData({
47
       IsCollect: IsCollect,
47
       IsCollect: IsCollect,
@@ -132,11 +132,11 @@ Page({
132
         }
132
         }
133
       });
133
       });
134
     }
134
     }
135
-    else if (that.data.Search){
135
+    else if (that.data.Search) {
136
       that.setData({
136
       that.setData({
137
         List: list,
137
         List: list,
138
         Count: list.length,
138
         Count: list.length,
139
-        HasPage: false,
139
+        HasPage: true,
140
       });
140
       });
141
     }
141
     }
142
     else {
142
     else {
@@ -258,6 +258,12 @@ Page({
258
         }
258
         }
259
         app.globalData.CardList = list;
259
         app.globalData.CardList = list;
260
         that.getList();
260
         that.getList();
261
+
262
+        if (data.List.length < 20) {
263
+          that.setData({
264
+            HasPage: false,
265
+          });
266
+        }
261
       }
267
       }
262
     });
268
     });
263
   },
269
   },
@@ -330,7 +336,7 @@ Page({
330
             app.globalData.CardList = list;
336
             app.globalData.CardList = list;
331
             that.setData({
337
             that.setData({
332
               List: list,
338
               List: list,
333
-              Count:--that.data.Count,
339
+              Count: --that.data.Count,
334
             });
340
             });
335
           });
341
           });
336
         }
342
         }

+ 37 - 0
pages/main/searchWeb.js

@@ -39,6 +39,9 @@ Page({
39
             break;
39
             break;
40
         }
40
         }
41
         
41
         
42
+        arr[i].ScrollLeft = 0;
43
+        arr[i].DeleteStr = "删除";
44
+
42
         list.push(arr[i]);
45
         list.push(arr[i]);
43
       }
46
       }
44
     }
47
     }
@@ -61,6 +64,40 @@ Page({
61
       url: './searchWeb2',
64
       url: './searchWeb2',
62
     });
65
     });
63
   },
66
   },
67
+  DeleteItem: function (e) {
68
+    var that = this;
69
+    var index = e.currentTarget.dataset.index;
70
+    var list = that.data.SelectList;
71
+    var b = true;
72
+    for (var i = 0; i < list.length; i++) {
73
+      var item = list[i];
74
+      if (index == i) {
75
+        if (item.DeleteStr == "删除") {
76
+          item.ScrollLeft = 160;
77
+          item.DeleteStr = "确认删除";
78
+        }
79
+        else if (item.DeleteStr == "确认删除") {
80
+          b = false;
81
+          item.DeleteStr = "删除";
82
+          item.ScrollLeft = 0;
83
+          that.data.SelectList.splice(index, 1);
84
+          that.setData({
85
+            SelectList: that.data.SelectList,
86
+          });
87
+          wx.setStorageSync("SearchWord3", that.data.SelectList);
88
+        }
89
+      }
90
+      else {
91
+        item.DeleteStr = "删除";
92
+        item.ScrollLeft = 0;
93
+      }
94
+    }
95
+    if (b) {
96
+      that.setData({
97
+        SelectList: list,
98
+      });
99
+    }
100
+  },
64
   deleteItem: function (e) {
101
   deleteItem: function (e) {
65
     var that = this;
102
     var that = this;
66
     var index = e.currentTarget.dataset.index;
103
     var index = e.currentTarget.dataset.index;

+ 25 - 15
pages/main/searchWeb.wxml

@@ -15,26 +15,36 @@
15
     <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
15
     <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
16
       <view class="lineWidth720"></view>
16
       <view class="lineWidth720"></view>
17
     </view>
17
     </view>
18
-    <view class="panelItemSearch FlexColumn" bindtap='onSearchHistory' data-index="{{index}}" data-type="many">
19
-        <view class="panelItemSearch1 FlexRow">
20
-          <view class="panelItemSearch11">
21
-            {{item.Key}}
18
+
19
+    <scroll-view class="ScrollView" scroll-left="{{item.ScrollLeft}}" scroll-x="true" data-index="{{index}}">
20
+      <view class='CellItem'>
21
+        <view class="panelItemSearch FlexColumn" bindtap='onSearchHistory' data-index="{{index}}" data-type="many">
22
+          <view class="panelItemSearch1 FlexRow">
23
+            <view class="panelItemSearch11">
24
+              {{item.Key}}
25
+            </view>
26
+            <view class="panelItemSearch12 FlexRow" wx:if="{{item.Type=='shici' || item.Type=='eng'}}">
27
+              {{item.TypeName}}
28
+            </view>
22
           </view>
29
           </view>
23
-          <view class="panelItemSearch12 FlexRow" wx:if="{{item.Type=='shici' || item.Type=='eng'}}">
24
-            {{item.TypeName}}
30
+          <view class="panelItemSearch2 FlexRow" wx:if="{{item.Type=='zici' || item.Type=='eng'}}">
31
+            {{item.Remark}}
32
+          </view>
33
+          <view class="panelItemSearch2 FlexRow" wx:if="{{item.Type=='shici'}}">
34
+            {{item.Author}} {{item.Dynasty}}
35
+          </view>
36
+          <view class="panelItemSearch3 FlexRow">
37
+            {{item.Content}}
25
           </view>
38
           </view>
26
         </view>
39
         </view>
27
-        <view class="panelItemSearch2 FlexRow" wx:if="{{item.Type=='zici' || item.Type=='eng'}}">
28
-          {{item.Remark}}
29
-        </view>
30
-        <view class="panelItemSearch2 FlexRow" wx:if="{{item.Type=='shici'}}">
31
-          {{item.Author}} {{item.Dynasty}}
32
-        </view>
33
-        <view class="panelItemSearch3 FlexRow">
34
-          {{item.Content}}
40
+      </view>
41
+      <view class='CellDelete'>
42
+        <view class='DeleteItem' catchtap='DeleteItem' data-index="{{index}}">
43
+          <block wx:if="{{item.DeleteStr=='确认删除'}}">{{item.DeleteStr}}</block>
44
+          <image class="universalpic_del_white_20x28" src='../images/universalpic_del_white_20x28.png' wx:if="{{item.DeleteStr=='删除'}}" />
35
         </view>
45
         </view>
36
       </view>
46
       </view>
37
-    
47
+    </scroll-view>
38
   </block>
48
   </block>
39
   <view class='lineFooter'></view>
49
   <view class='lineFooter'></view>
40
   <view style='height:100rpx;'></view>
50
   <view style='height:100rpx;'></view>

+ 38 - 0
pages/main/searchWeb.wxss

@@ -57,6 +57,26 @@
57
 
57
 
58
 }
58
 }
59
 
59
 
60
+
61
+.ScrollView {
62
+  width: 100%;
63
+  display: flex;
64
+  white-space: nowrap;
65
+  background-color: #fff;
66
+}
67
+
68
+.CellItem {
69
+  width: 750rpx;
70
+  display: inline-block;
71
+  position: relative;
72
+}
73
+
74
+.CellDelete {
75
+  width: 160rpx;
76
+  display: inline-block;
77
+  position: relative;
78
+}
79
+
60
 .panelItemSearch {
80
 .panelItemSearch {
61
   width: 100%;
81
   width: 100%;
62
   min-height: 100rpx;
82
   min-height: 100rpx;
@@ -109,4 +129,22 @@
109
   margin-left: 30rpx;
129
   margin-left: 30rpx;
110
   font-size:24rpx;
130
   font-size:24rpx;
111
   margin-bottom: 30rpx;
131
   margin-bottom: 30rpx;
132
+}
133
+
134
+.DeleteItem {
135
+  background-color: #B3443B;
136
+  width: 160rpx;
137
+  height: 167rpx;
138
+  line-height: 167rpx;
139
+  color: #fff;
140
+  text-align: center;
141
+  font-size: 30rpx;
142
+  position: absolute;
143
+  top: -58rpx;
144
+  left: 0;
145
+}
146
+
147
+.universalpic_del_white_20x28 {
148
+  width: 20rpx;
149
+  height: 28rpx;
112
 }
150
 }

+ 12 - 5
pages/main/searchWeb2.js

@@ -7,6 +7,7 @@ var hasStart = {};
7
 Page({
7
 Page({
8
   data: {
8
   data: {
9
     IsShowHelp: 1,
9
     IsShowHelp: 1,
10
+    ShowKaiti:0,
10
     CSS: {},
11
     CSS: {},
11
   },
12
   },
12
   onLoad: function (options) {
13
   onLoad: function (options) {
@@ -63,10 +64,10 @@ Page({
63
       if (tag == "发音")
64
       if (tag == "发音")
64
         this.data.CSS[css].SoundMark = soundmark;
65
         this.data.CSS[css].SoundMark = soundmark;
65
 
66
 
66
-      if (tag == "读写") {
67
-        var pinyin = e.currentTarget.dataset.pinyin;
68
-        if (pinyin)
69
-          this.data.CSS[css].SoundMark = pinyin;
67
+      if (tag == "默写" || tag=="拼音") {
68
+        var soundmark = e.currentTarget.dataset.soundmark;
69
+        if (soundmark)
70
+          this.data.CSS[css].SoundMark = e.currentTarget.dataset.soundmark;
70
       }
71
       }
71
 
72
 
72
       this.data.CSS[css].Number = "1";
73
       this.data.CSS[css].Number = "1";
@@ -133,7 +134,7 @@ Page({
133
               if (item.Tag == "发音") {
134
               if (item.Tag == "发音") {
134
                 str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
135
                 str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
135
               }
136
               }
136
-              else if (item.Tag == "拼音" || item.Tag == "写") {
137
+              else if (item.Tag == "拼音" || item.Tag == "写") {
137
                 if (item.SoundMark)
138
                 if (item.SoundMark)
138
                   str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
139
                   str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
139
                 else
140
                 else
@@ -185,6 +186,12 @@ Page({
185
       })
186
       })
186
     }
187
     }
187
   },
188
   },
189
+  changeBishun:function(e){
190
+    var id=e.currentTarget.dataset.id;
191
+    this.setData({
192
+      ShowKaiti: id,
193
+    });
194
+  },
188
   openHelp: function () {
195
   openHelp: function () {
189
     this.setData({
196
     this.setData({
190
       IsShowHelp: 0,
197
       IsShowHelp: 0,

+ 13 - 15
pages/main/searchWeb2.wxml

@@ -23,7 +23,7 @@
23
       <view class="panelTitle1">拼音</view>
23
       <view class="panelTitle1">拼音</view>
24
     </view>
24
     </view>
25
     <view class="panelItem FlexRow">
25
     <view class="panelItem FlexRow">
26
-      <view class="{{CSS['CHN_PinYin_'+index+'_pinyin'].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PinYin}}" wx:key="pinyin" bindtap='getInputData' data-type="sound" data-content="{{item.pinyin}}" data-css="CHN_PinYin_{{index}}_pinyin" data-tag="拼音">
26
+      <view class="{{CSS['CHN_PinYin_'+index+'_pinyin'].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PinYin}}" wx:key="pinyin" bindtap='getInputData' data-type="sound" data-content="{{item.pinyin}}" data-css="CHN_PinYin_{{index}}_pinyin" data-soundmark="{{Result.CHN.PinyinTone}}" data-tag="拼音">
27
         <view class="{{CSS['CHN_PinYin_'+index+'_pinyin'].Css2}} panelSelect0">{{CSS['CHN_PinYin_'+index+'_pinyin'].Number}}</view>
27
         <view class="{{CSS['CHN_PinYin_'+index+'_pinyin'].Css2}} panelSelect0">{{CSS['CHN_PinYin_'+index+'_pinyin'].Number}}</view>
28
         <view class="text2 text1">{{item.pinyin}}</view>
28
         <view class="text2 text1">{{item.pinyin}}</view>
29
       </view>
29
       </view>
@@ -37,7 +37,7 @@
37
       <view class="panelTitle1">单字默写</view>
37
       <view class="panelTitle1">单字默写</view>
38
     </view>
38
     </view>
39
     <view class="panelItem FlexRow">
39
     <view class="panelItem FlexRow">
40
-      <view class="{{CSS['CHN_TianKong_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.TianKong}}" wx:key="*this" bindtap='getInputData' data-type="sound" data-content="{{item}}" data-css="CHN_TianKong_{{index}}" data-pinyin="{{Result.CHN.PinYin[0].pinyin}}"
40
+      <view class="{{CSS['CHN_TianKong_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.TianKong}}" wx:key="*this" bindtap='getInputData' data-type="sound" data-content="{{item}}" data-css="CHN_TianKong_{{index}}" data-pinyin="{{Result.CHN.PinYin[0].pinyin}}" data-soundmark="{{Result.CHN.PinyinTone}}"
41
         data-tag="默写">
41
         data-tag="默写">
42
         <view class="{{CSS['CHN_TianKong_'+index].Css2}} panelSelect0">{{CSS['CHN_TianKong_'+index].Number}}</view>
42
         <view class="{{CSS['CHN_TianKong_'+index].Css2}} panelSelect0">{{CSS['CHN_TianKong_'+index].Number}}</view>
43
         <view class="text1">{{item}}</view>
43
         <view class="text1">{{item}}</view>
@@ -46,32 +46,30 @@
46
     <view class='lineFooter'></view>
46
     <view class='lineFooter'></view>
47
   </block>
47
   </block>
48
 
48
 
49
-  <!-- 笔顺和楷书 -->
50
-  <block wx:if="{{Result.CHN.HanZiImageUrl || Result.CHN.BiShunUrl }}">
49
+  <!-- 楷书数组 -->
50
+  <block wx:if="{{Result.CHN.KaitiArr && Result.CHN.KaitiArr.length>0 && ShowKaiti==0}}">
51
     <view class="panelTitle FlexRow">
51
     <view class="panelTitle FlexRow">
52
       <view class="panelTitle1">书写</view>
52
       <view class="panelTitle1">书写</view>
53
+      <view class="panelTitle2" bindtap="changeBishun" data-id="1">换成笔顺</view>
53
     </view>
54
     </view>
54
     <view class="panelItem FlexRow">
55
     <view class="panelItem FlexRow">
55
-      <view wx:if="{{Result.CHN.HanZiImageUrl}}" class="{{CSS.CHN_HanZiImageUrl.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="image" data-content="{{Result.CHN.HanZiImageUrl}}" data-css="CHN_HanZiImageUrl" data-tag="书写">
56
-        <view class="{{CSS.CHN_HanZiImageUrl.Css2}} panelSelect0">{{CSS.CHN_HanZiImageUrl.Number}}</view>
57
-        <image class="image1" src="{{Result.CHN.HanZiImageUrl}}" />
58
-      </view>
59
-      <view wx:if="{{Result.CHN.BiShunUrl}}" class="{{CSS.CHN_BiShunUrl.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="image" data-content="{{Result.CHN.BiShunUrl}}" data-css="CHN_BiShunUrl" data-tag="书写">
60
-        <view class="{{CSS.CHN_BiShunUrl.Css2}} panelSelect0">{{CSS.CHN_BiShunUrl.Number}}</view>
61
-        <image class="image1" src="{{Result.CHN.BiShunUrl}}" />
56
+      <view class="{{CSS['CHN_KaitiArr_'+index].Css1}} panelItemFrame1 panelItemFrame FlexRow" wx:for="{{Result.CHN.KaitiArr}}" wx:key="*this" bindtap='getInputData' data-type="image" data-content="{{item}}" data-css="CHN_KaitiArr_{{index}}" data-tag="书写">
57
+        <view class="{{CSS['CHN_KaitiArr_'+index].Css2}} panelSelect0">{{CSS['CHN_KaitiArr_'+index].Number}}</view>
58
+        <image class="image1" src="{{item}}" />
62
       </view>
59
       </view>
63
     </view>
60
     </view>
64
     <view class='lineFooter'></view>
61
     <view class='lineFooter'></view>
65
   </block>
62
   </block>
66
 
63
 
67
-  <!-- 楷书数组 -->
68
-  <block wx:if="{{Result.CHN.BiShunArr && Result.CHN.BiShunArr.length>0}}">
64
+  <!-- 笔顺数组 -->
65
+  <block wx:if="{{Result.CHN.BiShunArr2 && Result.CHN.BiShunArr2.length>0 && ShowKaiti==1 }}">
69
     <view class="panelTitle FlexRow">
66
     <view class="panelTitle FlexRow">
70
       <view class="panelTitle1">书写</view>
67
       <view class="panelTitle1">书写</view>
68
+      <view class="panelTitle2" bindtap="changeBishun" data-id="0">换成静图</view>
71
     </view>
69
     </view>
72
     <view class="panelItem FlexRow">
70
     <view class="panelItem FlexRow">
73
-      <view class="{{CSS['CHN_BiShunArr_'+index].Css1}} panelItemFrame1 panelItemFrame FlexRow" wx:for="{{Result.CHN.BiShunArr}}" wx:key="*this" bindtap='getInputData' data-type="image" data-content="{{item}}" data-css="CHN_BiShunArr_{{index}}" data-tag="书写">
74
-        <view class="{{CSS['CHN_BiShunArr_'+index].Css2}} panelSelect0">{{CSS['CHN_BiShunArr_'+index].Number}}</view>
71
+      <view class="{{CSS['CHN_BiShunArr2_'+index].Css1}} panelItemFrame1 panelItemFrame FlexRow" wx:for="{{Result.CHN.BiShunArr2}}" wx:key="*this" bindtap='getInputData' data-type="image" data-content="{{item}}" data-css="CHN_BiShunArr2_{{index}}" data-tag="书写">
72
+        <view class="{{CSS['CHN_BiShunArr2_'+index].Css2}} panelSelect0">{{CSS['CHN_BiShunArr2_'+index].Number}}</view>
75
         <image class="image1" src="{{item}}" />
73
         <image class="image1" src="{{item}}" />
76
       </view>
74
       </view>
77
     </view>
75
     </view>

+ 7 - 5
pages/main/searchWeb2.wxss

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

+ 1 - 15
pages/main/systemsetting.js

@@ -27,7 +27,7 @@ Page({
27
       Version: app.globalData.Version,
27
       Version: app.globalData.Version,
28
       ProductServiceTime: productServiceTime,
28
       ProductServiceTime: productServiceTime,
29
       IsPay: isPay,
29
       IsPay: isPay,
30
-      IsShow: app.globalData.IsShow,
30
+      IsShow: app.globalData.userInfo.IsShow,
31
       ChildUserID: childUserID,
31
       ChildUserID: childUserID,
32
     });
32
     });
33
   },
33
   },
@@ -55,20 +55,6 @@ Page({
55
       url: '../index/index',
55
       url: '../index/index',
56
     })
56
     })
57
   },
57
   },
58
-  gotoPayTemp: function (e) {
59
-    if (app.globalData.userInfo.UserID <= 7) {
60
-      wx.navigateTo({
61
-        url: '../other/pay?paypanel=0&payindex=0',
62
-      });
63
-    }
64
-  },
65
-  gotoLesson: function () {
66
-    if (app.globalData.userInfo.UserID <= 7) {
67
-      wx.navigateTo({
68
-        url: '../other/lessonlist',
69
-      });
70
-    }
71
-  },
72
   gotoMarketingUserList: function (e) {
58
   gotoMarketingUserList: function (e) {
73
     wx.navigateTo({
59
     wx.navigateTo({
74
       url: '../../marketing/main/index',
60
       url: '../../marketing/main/index',

+ 21 - 29
pages/main/systemsetting.wxml

@@ -1,33 +1,25 @@
1
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
1
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
2
-
3
-  <view class="panelTitle FlexRow">
4
-    <view class="panelTitle1">用户</view>
5
-    <view class="panelTitle2"></view>
6
-  </view>
7
-  <view class="panelItem FlexRow" bindtap='gotoUserbook'>
8
-    <view class="panelItem1">用户手册</view>
9
-    <view class="panelItem2 FlexRow">
10
-      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
2
+  <block wx:if="{{IsShow==1}}">
3
+    <view class="panelTitle FlexRow">
4
+      <view class="panelTitle1">用户</view>
5
+      <view class="panelTitle2"></view>
11
     </view>
6
     </view>
12
-  </view>
13
-  <view class="lineWidthAll FlexRow">
14
-    <view class="lineWidth720"></view>
15
-  </view>
16
-  <view class="panelItem FlexRow" bindtap='gotoMarketingUserList'>
17
-    <view class="panelItem1">推广计划</view>
18
-    <view class="panelItem2 FlexRow">
19
-      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
7
+    <view class="panelItem FlexRow" bindtap='gotoUserbook'>
8
+      <view class="panelItem1">用户手册</view>
9
+      <view class="panelItem2 FlexRow">
10
+        <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
11
+      </view>
20
     </view>
12
     </view>
21
-  </view>
22
-  <!-- <view class="lineWidthAll FlexRow">
23
-    <view class="lineWidth720"></view>
24
-  </view>
25
-  <view class="panelItem FlexRow" bindtap='gotoPay'>
26
-    <view class="panelItem1">续费</view>
27
-    <view class="panelItem2 FlexRow">
28
-      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
13
+    <view class="lineWidthAll FlexRow">
14
+      <view class="lineWidth720"></view>
15
+    </view>
16
+    <view class="panelItem FlexRow" bindtap='gotoMarketingUserList' wx:if="{{IsShow==1}}">
17
+      <view class="panelItem1">推广计划</view>
18
+      <view class="panelItem2 FlexRow">
19
+        <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
20
+      </view>
29
     </view>
21
     </view>
30
-  </view> -->
22
+  </block>
31
   <view class='lineFooter'></view>
23
   <view class='lineFooter'></view>
32
 
24
 
33
   <view class="panelTitle FlexRow">
25
   <view class="panelTitle FlexRow">
@@ -46,8 +38,8 @@
46
     重启小程序
38
     重启小程序
47
   </view>
39
   </view>
48
   <view class='lineFooter'></view>
40
   <view class='lineFooter'></view>
49
-  <view style='width:100%;height:50rpx;' bindtap='gotoPayTemp'></view>
50
-  <text class='text1'>©2016-2019 {{ProgramName}}\n唱意教育微信小程序 版本 {{Version}}</text>
51
-  <view style='width:100%;height:100rpx;' bindtap='gotoLesson'></view>
41
+  <view style='width:100%;height:50rpx;'></view>
42
+  <text class='text1'>©2019 秒过™学习\n唱意教育微信小程序 版本 {{Version}}</text>
43
+  <view style='width:100%;height:100rpx;'></view>
52
 
44
 
53
 </view>
45
 </view>

+ 4 - 2
pages/other/activity.wxml

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

+ 6 - 0
pages/other/activity.wxss

@@ -17,6 +17,12 @@
17
   text-align: center;
17
   text-align: center;
18
 }
18
 }
19
 
19
 
20
+.text3{
21
+  font-size:32rpx;
22
+  text-align: center;
23
+  font-weight: 400;
24
+}
25
+
20
 .panel1{
26
 .panel1{
21
   width:560rpx;
27
   width:560rpx;
22
   height:90rpx;
28
   height:90rpx;

+ 12 - 10
pages/other/binding.js

@@ -67,18 +67,20 @@ Page({
67
   },
67
   },
68
   onShow: function () {
68
   onShow: function () {
69
     var that = this;
69
     var that = this;
70
-    wx.getSetting({
71
-      success(res) {
72
-        if (res.authSetting['scope.userInfo']) {
70
+    if (app.globalData.userInfo.IsShow==1){
71
+      wx.getSetting({
72
+        success(res) {
73
+          if (res.authSetting['scope.userInfo']) {
73
 
74
 
75
+          }
76
+          else {
77
+            wx.navigateTo({
78
+              url: '../index/accredit',
79
+            });
80
+          }
74
         }
81
         }
75
-        else {
76
-          wx.navigateTo({
77
-            url: '../index/accredit',
78
-          });
79
-        }
80
-      }
81
-    });
82
+      });
83
+    }
82
   },
84
   },
83
   shareFinished: function () {
85
   shareFinished: function () {
84
     wx.showModal({
86
     wx.showModal({

+ 25 - 14
pages/other/coupon.js

@@ -12,6 +12,7 @@ Page({
12
 
12
 
13
     that.setData({
13
     that.setData({
14
       Containnerheight: main.getWindowHeight(),
14
       Containnerheight: main.getWindowHeight(),
15
+      IsSuccess:0,
15
     });
16
     });
16
 
17
 
17
     that.init();
18
     that.init();
@@ -20,6 +21,11 @@ Page({
20
     var that = this;
21
     var that = this;
21
     main.getData("GetMiaoguoCoupon?UserID=" + app.globalData.userInfo.UserID, function (data) {
22
     main.getData("GetMiaoguoCoupon?UserID=" + app.globalData.userInfo.UserID, function (data) {
22
       if (data){
23
       if (data){
24
+        for(var i=0;i<data.length;i++){
25
+          if (data[i].Content[1].indexOf("[CouponNumber]")>0){
26
+            data[i].Content[1] = data[i].Content[1].replace("[CouponNumber]",data[i].CouponNumber);
27
+          }
28
+        }
23
         that.setData({
29
         that.setData({
24
           List: data,
30
           List: data,
25
         });
31
         });
@@ -29,26 +35,31 @@ Page({
29
   getCoupon: function (e) {
35
   getCoupon: function (e) {
30
     var that = this;
36
     var that = this;
31
     var coupontype = e.currentTarget.dataset.coupontype;
37
     var coupontype = e.currentTarget.dataset.coupontype;
38
+    var couponnumber = e.currentTarget.dataset.couponnumber;
32
     var isloseefficacy = e.currentTarget.dataset.isloseefficacy;
39
     var isloseefficacy = e.currentTarget.dataset.isloseefficacy;
33
-    if (!isloseefficacy && coupontype==134){
34
-      wx.showModal({
35
-        title: '兑换成功',
36
-        content: '必须重新启动小程序,然后到“用户手册”检查有效期。',
37
-        showCancel: false,
38
-        confirmText: "重启程序",
39
-        success(res) {
40
-          if (res.confirm) {
41
-              wx.reLaunch({
42
-                url: '../index/index?type=userbook',
43
-              });
44
-          }
45
-        },
40
+    if (!isloseefficacy && couponnumber>0){
41
+      wx.setNavigationBarColor({
42
+        frontColor: '#ffffff',
43
+        backgroundColor: '#0B8457',
44
+      });
45
+      
46
+      var ProductServiceTimeNew = common.formatTime(common.addDate("d", couponnumber, new Date(app.globalData.userInfo.ProductServiceTime))); 
47
+      
48
+      that.setData({
49
+        IsSuccess:1,
50
+        ProductServiceTimeOld: common.formatDateCHS(app.globalData.userInfo.ProductServiceTime),
51
+        ProductServiceTimeNew: common.formatDateCHS(ProductServiceTimeNew),
46
       });
52
       });
47
       setTimeout(function(){
53
       setTimeout(function(){
48
-        main.getData("UseMiaoguoCoupon?UserID=" + app.globalData.userInfo.UserID + "&CouponType=" + coupontype, function (data) {});
54
+        main.getData("UseMiaoguoCoupon?UserID=" + app.globalData.userInfo.UserID + "&CouponType=" + coupontype+"&CouponNumber="+couponnumber, function (data) {});
49
       },500);
55
       },500);
50
     }
56
     }
51
   },
57
   },
58
+  gotoIndex:function(){
59
+    wx.reLaunch({
60
+      url: '../index/index?type=userbook',
61
+    });
62
+  },
52
   onShareAppMessage: function () {
63
   onShareAppMessage: function () {
53
     return {
64
     return {
54
       title: app.globalData.ShareTitle,
65
       title: app.globalData.ShareTitle,

+ 19 - 3
pages/other/coupon.wxml

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

+ 48 - 1
pages/other/coupon.wxss

@@ -78,4 +78,51 @@
78
 .panelNone{
78
 .panelNone{
79
   margin-top: 462rpx;
79
   margin-top: 462rpx;
80
   font-size:48rpx;
80
   font-size:48rpx;
81
-}
81
+}
82
+
83
+.Success{
84
+  position: fixed;
85
+  top:0;
86
+  background-color: #0B8457;
87
+  color:#fff;
88
+}
89
+
90
+.img{
91
+  width:200rpx;
92
+  height:200rpx;
93
+  margin-top: 150rpx;
94
+}
95
+
96
+.text10{
97
+  font-size:54rpx;
98
+  text-align: center;
99
+  margin-top: 170rpx;
100
+}
101
+
102
+.text11{
103
+  font-size:32rpx;
104
+  margin-top: 40rpx;
105
+}
106
+
107
+.text12{
108
+  font-size:32rpx;
109
+  margin-top: 10rpx;
110
+}
111
+
112
+.btn {
113
+  font-size: 36rpx;
114
+  width: 600rpx;
115
+  height: 90rpx;
116
+  border-radius: 14rpx;
117
+  text-align: center;
118
+  line-height: 90rpx;
119
+  margin-top: 40rpx;
120
+  background-color: #0B8457;
121
+  border:1rpx solid #fff;
122
+  color:#fff;
123
+}
124
+
125
+.text13{
126
+  font-size:28rpx;
127
+  margin-top: 40rpx;
128
+}

+ 0 - 25
pages/other/lessonlist.js

@@ -29,31 +29,6 @@ Page({
29
       url: '../other/lesson?LessonID=' + id,
29
       url: '../other/lesson?LessonID=' + id,
30
     });
30
     });
31
   },
31
   },
32
-  gotoUserList: function (e) {
33
-    wx.navigateTo({
34
-      url: '../other/userlist',
35
-    });
36
-  },
37
-  gotoMarketingUserList: function (e) {
38
-    wx.navigateTo({
39
-      url: '../../marketing/main/index',
40
-    });
41
-  },
42
-  gotoCheckList: function () {
43
-    var url = '../other/homework';
44
-    if (this.data.CheckListUserID)
45
-      url += "?UserID=" + this.data.CheckListUserID;
46
-    wx.navigateTo({
47
-      url: url,
48
-    });
49
-  },
50
-  onKeyInput: function (e) {
51
-    var userid = e.detail.value;
52
-    var that = this;
53
-    that.setData({
54
-      CheckListUserID: userid,
55
-    });
56
-  },
57
   onShareAppMessage: function () {
32
   onShareAppMessage: function () {
58
     return {
33
     return {
59
       title: app.globalData.ShareTitle,
34
       title: app.globalData.ShareTitle,

+ 0 - 12
pages/other/lessonlist.wxml

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

+ 3 - 2
pages/other/pay.js

@@ -23,7 +23,7 @@ Page({
23
   init: function (PayType, EndDate) {
23
   init: function (PayType, EndDate) {
24
     var that = this;
24
     var that = this;
25
 
25
 
26
-    EndDate = common.formatDateENG(EndDate, "-");
26
+    EndDate = common.formatDateENG(EndDate, "/");
27
     
27
     
28
     main.getData('GetMiaoguoPayInfo3?EndDate=' + EndDate + '&PayType=' + PayType + '&UserID=' + app.globalData.userInfo.UserID, function (data) {
28
     main.getData('GetMiaoguoPayInfo3?EndDate=' + EndDate + '&PayType=' + PayType + '&UserID=' + app.globalData.userInfo.UserID, function (data) {
29
       if (data) {
29
       if (data) {
@@ -41,12 +41,13 @@ Page({
41
     detail.Introducer = app.globalData.userInfo.Introducer;
41
     detail.Introducer = app.globalData.userInfo.Introducer;
42
     for (var i = 0; i < that.data.Info.List1.length; i++) {
42
     for (var i = 0; i < that.data.Info.List1.length; i++) {
43
       if (that.data.Info.List1[i].Name == "有效期") {
43
       if (that.data.Info.List1[i].Name == "有效期") {
44
-        detail.EndTime = common.formatDateENG(that.data.Info.List1[i].Content);
44
+        detail.EndTime = common.formatDateENG(that.data.Info.List1[i].Content,"/");
45
       }
45
       }
46
     }
46
     }
47
 
47
 
48
     detail = JSON.stringify(detail);
48
     detail = JSON.stringify(detail);
49
 
49
 
50
+    console.log(detail);
50
     console.log(money);
51
     console.log(money);
51
     main.payMoney(7, null, money, detail, function () {
52
     main.payMoney(7, null, money, detail, function () {
52
       that.setData({
53
       that.setData({

+ 8 - 1
pages/other/userbook.js

@@ -48,6 +48,12 @@ Page({
48
     ImagePath: app.globalData.uploadImageUrl,
48
     ImagePath: app.globalData.uploadImageUrl,
49
     PanelShow: 0,
49
     PanelShow: 0,
50
   },
50
   },
51
+  onPullDownRefresh: function () {
52
+    wx.reLaunch({
53
+      url: '../../pages/index/index',
54
+    })
55
+    wx.stopPullDownRefresh();
56
+  },
51
   onLoad: function () {
57
   onLoad: function () {
52
     var that = this;
58
     var that = this;
53
 
59
 
@@ -62,6 +68,7 @@ Page({
62
       AvatarUrl: app.globalData.userInfo.AvatarUrl,
68
       AvatarUrl: app.globalData.userInfo.AvatarUrl,
63
       ProductServiceTime: productServiceTime,
69
       ProductServiceTime: productServiceTime,
64
       ArrInformation: arr,
70
       ArrInformation: arr,
71
+      IsShow: app.globalData.userInfo.IsShow,
65
       IsMember: app.globalData.userInfo.IsMember,
72
       IsMember: app.globalData.userInfo.IsMember,
66
       IsPay: app.globalData.userInfo.IsPay,
73
       IsPay: app.globalData.userInfo.IsPay,
67
       IsLoseEfficacy: app.globalData.userInfo.IsLoseEfficacy,
74
       IsLoseEfficacy: app.globalData.userInfo.IsLoseEfficacy,
@@ -140,7 +147,7 @@ Page({
140
   onShareAppMessage: function () {
147
   onShareAppMessage: function () {
141
     return {
148
     return {
142
       title: "《秒过学习法》用户手册",
149
       title: "《秒过学习法》用户手册",
143
-      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
150
+      path: app.globalData.SharePath + '?type=userbook&UserID=' + app.globalData.userInfo.UserID,
144
       imageUrl: "../images/program_screenshot_usermanual.png",
151
       imageUrl: "../images/program_screenshot_usermanual.png",
145
     }
152
     }
146
   },
153
   },

+ 2 - 1
pages/other/userbook.json

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

+ 9 - 10
pages/other/userbook.wxml

@@ -25,14 +25,14 @@
25
         <view class="panel11">{{ProductServiceTime}}</view>
25
         <view class="panel11">{{ProductServiceTime}}</view>
26
       </view>
26
       </view>
27
     </view>
27
     </view>
28
-    <view class="panel1 FlexRow" wx:if="{{IsMember==1 && (!(ClassDayNumber>=16 || IsPay==1) || ClassDayNumber<0)}}">
28
+    <view class="panel1 FlexRow" wx:if="{{IsMember==1 && (!(ClassDayNumber>=16 || IsPay==1) || (ClassDayNumber<0  && IsPay==0))}}">
29
       <view class="left">有效期</view>
29
       <view class="left">有效期</view>
30
       <view class="right FlexColumn">
30
       <view class="right FlexColumn">
31
         <view class="panel11">{{ProductServiceTime}}</view>
31
         <view class="panel11">{{ProductServiceTime}}</view>
32
         <view class="panel12">新手包16天体验</view>
32
         <view class="panel12">新手包16天体验</view>
33
       </view>
33
       </view>
34
     </view>
34
     </view>
35
-    <view class="panel2 FlexRow" wx:if="{{IsPay==1}}">
35
+    <view class="panel2 FlexRow" wx:if="{{IsShow==1 && IsPay==1}}">
36
       <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/pay?PayType=5&EndDate={{ClassTimeEnd}}">
36
       <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/pay?PayType=5&EndDate={{ClassTimeEnd}}">
37
         <image class="usermanual_index_wallet" src='../images/usermanual_index_wallet.png' />
37
         <image class="usermanual_index_wallet" src='../images/usermanual_index_wallet.png' />
38
         <view>去续费</view>
38
         <view>去续费</view>
@@ -44,13 +44,12 @@
44
       </view>
44
       </view>
45
     </view>
45
     </view>
46
     <view class='lineFooter'></view>
46
     <view class='lineFooter'></view>
47
-
48
-    <view class="panelTitle FlexRow" wx:if="{{PanelShow===2 && ClassDayNumber>=0 && (ClassDayNumber<16 || IsPay==0)}}">
47
+    <view class="panelTitle FlexRow" wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>=0 && (ClassDayNumber<16 || IsPay==0)}}">
49
       <view class="panelTitle1">会员活动</view>
48
       <view class="panelTitle1">会员活动</view>
50
       <view class="panelTitle2"></view>
49
       <view class="panelTitle2"></view>
51
     </view>
50
     </view>
52
 
51
 
53
-    <block wx:if="{{PanelShow===2 && ClassDayNumber>=16 && IsPay==0}}">
52
+    <block wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>=16 && IsPay==0}}">
54
       <view class="panelItem FlexColumn">
53
       <view class="panelItem FlexColumn">
55
         <image class="salesactivity_a04_usermanual_banner_header" src='{{ImagePath}}web/salesactivity_a04_usermanual_banner_header.png' />
54
         <image class="salesactivity_a04_usermanual_banner_header" src='{{ImagePath}}web/salesactivity_a04_usermanual_banner_header.png' />
56
         <view class="btn3 btn2 btn" bindtap="goto" data-url="../other/pay?PayType=4&EndDate={{ClassTimeEnd}}">续费</view>
55
         <view class="btn3 btn2 btn" bindtap="goto" data-url="../other/pay?PayType=4&EndDate={{ClassTimeEnd}}">续费</view>
@@ -59,7 +58,7 @@
59
       <view class="line"></view>
58
       <view class="line"></view>
60
     </block>
59
     </block>
61
 
60
 
62
-    <block wx:if="{{PanelShow===2 && ClassDayNumber>=13 && ClassDayNumber<16}}">
61
+    <block wx:if="{{IsShow==1 && PanelShow===2 && IsPay==0 && ClassDayNumber>=13 && ClassDayNumber<16}}">
63
       <view class="panelItem FlexColumn">
62
       <view class="panelItem FlexColumn">
64
         <image class="salesactivity_a02_usermanual_banner_header" src='{{ImagePath}}web/salesactivity_a03_usermanual_banner_header.png' />
63
         <image class="salesactivity_a02_usermanual_banner_header" src='{{ImagePath}}web/salesactivity_a03_usermanual_banner_header.png' />
65
         <view class="text9">截止日期:{{ClassTimeEnd}}</view>
64
         <view class="text9">截止日期:{{ClassTimeEnd}}</view>
@@ -69,7 +68,7 @@
69
       <view class="line"></view>
68
       <view class="line"></view>
70
     </block>
69
     </block>
71
 
70
 
72
-    <block wx:if="{{PanelShow===2 && ClassDayNumber>=4 && ClassDayNumber<10}}">
71
+    <block wx:if="{{IsShow==1 && PanelShow===2 && IsPay==0 && ClassDayNumber>=4 && ClassDayNumber<10}}">
73
       <view class="panelItem FlexColumn">
72
       <view class="panelItem FlexColumn">
74
         <image class="salesactivity_a02_usermanual_banner_header" src='{{ImagePath}}web/salesactivity_a02_usermanual_banner_header.png' />
73
         <image class="salesactivity_a02_usermanual_banner_header" src='{{ImagePath}}web/salesactivity_a02_usermanual_banner_header.png' />
75
         <view class="text9">活动日期:{{EarlyBirdTimeStart}}-{{EarlyBirdTimeEnd}}</view>
74
         <view class="text9">活动日期:{{EarlyBirdTimeStart}}-{{EarlyBirdTimeEnd}}</view>
@@ -79,7 +78,7 @@
79
       <view class="line"></view>
78
       <view class="line"></view>
80
     </block>
79
     </block>
81
 
80
 
82
-    <block wx:if="{{PanelShow===2 && ClassDayNumber>=0 && ClassDayNumber<16}}">
81
+    <block wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>=0 && ClassDayNumber<16}}">
83
       <view class="panelItem FlexColumn">
82
       <view class="panelItem FlexColumn">
84
         <image class="salesactivity_a01_usermanual_banner_header" src='{{ImagePath}}web/salesactivity_a01_usermanual_banner_header.png' />
83
         <image class="salesactivity_a01_usermanual_banner_header" src='{{ImagePath}}web/salesactivity_a01_usermanual_banner_header.png' />
85
         <view class="text5">截止日期:{{ClassTimeEnd}}</view>
84
         <view class="text5">截止日期:{{ClassTimeEnd}}</view>
@@ -96,8 +95,8 @@
96
       <view class="panelTitle2"></view>
95
       <view class="panelTitle2"></view>
97
     </view>
96
     </view>
98
 
97
 
99
-    <view class="panelItem2 panelItem FlexColumn" wx:if="{{PanelShow===2 && ClassDayNumber>=16 && (IsPay==0 || IsLoseEfficacy==1) }}">
100
-      <text class="text3">您的有效期已过期。请尽快续费。续费后可立即恢复使用。</text>
98
+    <view class="panelItem2 panelItem FlexColumn" wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>=16 && (IsPay==0 || IsLoseEfficacy==1) }}">
99
+      <text class="text11">您的有效期已过期。请尽快续费。续费后可立即恢复使用。</text>
101
     </view>
100
     </view>
102
 
101
 
103
     <view class="panelItem FlexColumn" wx:if="{{PanelShow===1}}">
102
     <view class="panelItem FlexColumn" wx:if="{{PanelShow===1}}">

+ 5 - 0
pages/other/userbook.wxss

@@ -123,6 +123,11 @@
123
 }
123
 }
124
 
124
 
125
 .text3 {
125
 .text3 {
126
+  margin-top: 30rpx;
127
+  width:690rpx;
128
+  font-size:24rpx;
129
+}
130
+.text11 {
126
   color:#fff;
131
   color:#fff;
127
   font-size:24rpx;
132
   font-size:24rpx;
128
 }
133
 }

+ 1 - 1
pages/plan/setting.js

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

+ 9 - 9
project.config.json

@@ -49,13 +49,13 @@
49
 			"list": []
49
 			"list": []
50
 		},
50
 		},
51
 		"miniprogram": {
51
 		"miniprogram": {
52
-			"current": 1,
52
+			"current": 6,
53
 			"list": [
53
 			"list": [
54
 				{
54
 				{
55
 					"id": 0,
55
 					"id": 0,
56
 					"name": "分享",
56
 					"name": "分享",
57
 					"pathName": "pages/index/index",
57
 					"pathName": "pages/index/index",
58
-					"query": "UserID=1&Share=1&MiaoguoCardID=32401",
58
+					"query": "UserID=1&type=share&MiaoguoCardID=71228",
59
 					"scene": null
59
 					"scene": null
60
 				},
60
 				},
61
 				{
61
 				{
@@ -65,13 +65,6 @@
65
 					"query": "type=activity&ActivityID=3&EndTime=2019年09月10日",
65
 					"query": "type=activity&ActivityID=3&EndTime=2019年09月10日",
66
 					"scene": 1007
66
 					"scene": 1007
67
 				},
67
 				},
68
-				{
69
-					"id": 2,
70
-					"name": "marketing/main/index",
71
-					"pathName": "marketing/main/index",
72
-					"query": "UserID=1",
73
-					"scene": null
74
-				},
75
 				{
68
 				{
76
 					"id": 3,
69
 					"id": 3,
77
 					"name": "webview",
70
 					"name": "webview",
@@ -99,6 +92,13 @@
99
 					"pathName": "pages/index/index",
92
 					"pathName": "pages/index/index",
100
 					"query": "type=userbook",
93
 					"query": "type=userbook",
101
 					"scene": null
94
 					"scene": null
95
+				},
96
+				{
97
+					"id": 6,
98
+					"name": "pages/index/index",
99
+					"pathName": "pages/index/index",
100
+					"query": "type=marketing&UserID=1",
101
+					"scene": null
102
 				}
102
 				}
103
 			]
103
 			]
104
 		}
104
 		}

+ 20 - 0
utils/main.js

@@ -781,6 +781,25 @@ function setCollect(id, collect, callback) {
781
   });
781
   });
782
 }
782
 }
783
 
783
 
784
+function buildInitData (callback) {
785
+  var that = this;
786
+  //app.globalData.userInfo.UserID=4;
787
+  wx.showLoading({
788
+    title: '数据初始化',
789
+  });
790
+  setTimeout(function () {
791
+    wx.hideLoading();
792
+  }, 5000);
793
+
794
+  getData('BuildInitData?UserID=' + app.globalData.userInfo.UserID, function (data) {
795
+    wx.hideLoading();
796
+    if (data) {
797
+      if (callback)
798
+        callback();
799
+    }
800
+  });
801
+}
802
+
784
 function getMemoryLevelAll() {
803
 function getMemoryLevelAll() {
785
   return [
804
   return [
786
     {
805
     {
@@ -2424,4 +2443,5 @@ module.exports = {
2424
   UploadUserConfig: UploadUserConfig,
2443
   UploadUserConfig: UploadUserConfig,
2425
   getServerImage: getServerImage,
2444
   getServerImage: getServerImage,
2426
   getBaiduToken: getBaiduToken,
2445
   getBaiduToken: getBaiduToken,
2446
+  buildInitData: buildInitData,
2427
 }
2447
 }