chengjie hace 1 año
padre
commit
89131228ad

+ 2 - 3
app.js

@@ -1,8 +1,7 @@
1 1
 App({
2 2
   globalData: {
3
-    Version: "2.3.79",
4
-    //IsProduction: true,
5
-    IsProduction: false,
3
+    Version: "2.3.82",
4
+    IsProduction: true,
6 5
     ShareTitle: "高效学习从秒过开始",
7 6
     SharePath: "pages/index/index",
8 7
     ShareImage: '../images/program_screenshot_main.png',

+ 3 - 2
pages/index/accredit.wxml

@@ -6,8 +6,6 @@
6 6
 <view class="container{{IsIPad}} FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
7 7
   <view class="text1">{{Info.Text1}}</view>
8 8
 
9
-  <text class="panel3 panel1" wx:if="{{Info.Text2}}">{{Info.Text2}}</text>
10
-
11 9
   <view class="panel1 FlexRow">
12 10
     <view class="text3">头像</view>
13 11
     <button class="avatar-wrapper" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar">
@@ -28,4 +26,7 @@
28 26
   </block>
29 27
 
30 28
   <view class="btn1" bindtap="gotoReturn">{{Info.Text4}}</view>
29
+
30
+  <text class="panel3 panel1" wx:if="{{Info.Text2}}">{{Info.Text2}}</text>
31
+
31 32
 </view>

+ 1 - 1
pages/index/accredit.wxss

@@ -24,7 +24,7 @@
24 24
 }
25 25
 
26 26
 .panel3{
27
-  margin-top: 30rpx;
27
+  margin-top: 60rpx;
28 28
   font-size: 24rpx;
29 29
 }
30 30
 .panel2{

+ 0 - 1
pages/main/systemsetting.wxml

@@ -1,5 +1,4 @@
1 1
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
2
-  
3 2
   <view class="panelTitle FlexRow">
4 3
     <view class="panelTitle1">通用</view>
5 4
     <view class="panelTitle2"></view>

+ 5 - 0
pages/other/lessonlistselect.js

@@ -12,6 +12,11 @@ Page({
12 12
     that.setData({
13 13
       Containnerheight: main.getWindowHeight(),
14 14
     });
15
+
16
+    wx.setNavigationBarColor({
17
+      frontColor: "#ffffff",
18
+      backgroundColor: "#009942",
19
+    });
15 20
   },
16 21
   goto: function (e) {
17 22
     var url=e.currentTarget.dataset.url;

+ 4 - 1
pages/other/userbook.js

@@ -68,6 +68,7 @@ Page({
68 68
     // for (var i = arrInformation.length - 1; i >= 1; i--) {
69 69
     //   arr.push(arrInformation[i]);
70 70
     // }
71
+    //debugger;
71 72
     that.setData({
72 73
       Containnerheight: main.getWindowHeight(),
73 74
       ProductServiceTime: productServiceTime,
@@ -105,7 +106,9 @@ Page({
105 106
       var earlyBirdTimeEnd = common.formatDateCHS(common.formatTime(common.addDate("d", that.data.ClassTotalDayNumber-1, new Date(app.globalData.userInfo.ClassStartDate))));
106 107
 
107 108
       var ClassDayNumber = app.globalData.userInfo.ClassDayNumber;
108
-      //console.log("ClassDayNumber:" + ClassDayNumber);
109
+      
110
+      console.log("ClassTimeEnd:" + ClassTimeEnd);
111
+      console.log("ClassDayNumber:" + ClassDayNumber);
109 112
 
110 113
       that.setData({
111 114
         ClassTimeStart: ClassTimeStart,

+ 2 - 2
pages/other/userbook.wxml

@@ -54,7 +54,7 @@
54 54
         <view>作业清单</view>
55 55
       </view>    
56 56
 
57
-      <view class="panel21 FlexColumn" bindtap="goto" data-url="../../pages_agent/marketing/index" wx:if="{{IsPay==1 && !IsLoseEfficacy}}">
57
+      <view class="panel21 FlexColumn" bindtap="goto" data-url="../../pages_agent/marketing/index" wx:if="{{IsPay==1 && !IsLoseEfficacy && !ChildUserID && CurrentUserID==UserID}}">
58 58
         <image class="usermanual_index_handshake" src='../images/usermanual_index_handshake.png' />
59 59
         <view>推广计划</view>
60 60
       </view>
@@ -111,7 +111,7 @@
111 111
     <block wx:if="{{IsShow==1 && PanelShow===3 && ClassDayNumber>=ClassTotalDayNumber && IsPay==0 && !ChildUserID}}">
112 112
       <view class="panelItem FlexColumn">
113 113
         <image class="salesactivity_a04_usermanual_banner_header" src='{{ImagePath}}web/salesactivity_a04_usermanual_banner_header.png' />
114
-        <view class="btn6 btn5" bindtap="goto" data-url="../other/pay?PayType=5&EndDate={{ClassTimeEnd}}">续费</view>
114
+        <view class="btn6 btn5" bindtap="goto" data-url="../other/pay?PayType=5&EndDate={{EndDate}}">续费</view>
115 115
       </view>
116 116
       <view class='lineFooter'></view>
117 117
     </block>

+ 18 - 5
pages_agent/marketing/shareuser.js

@@ -6,13 +6,18 @@ var downloadNumber = 0;
6 6
 var shareUrl = "";
7 7
 
8 8
 Page({
9
-  data: {},
9
+  data: {
10
+    Containnerheight:0,
11
+    ServerImage:"",
12
+  },
10 13
   onLoad: function (options) {
11
-    this.setData({
14
+    var that=this;
15
+    that.setData({
12 16
       Containnerheight: main.getWindowHeight(),
13 17
       ServerImage: app.globalData.uploadImageUrl + "web/"
14 18
     });
15
-    this.init();
19
+    
20
+    that.init();
16 21
     downloadNumber = 0;
17 22
 
18 23
     shareUrl = "WebExtend?UserID=" + app.globalData.userInfo.UserID;
@@ -61,7 +66,11 @@ Page({
61 66
       app.globalData.userInfo.HasACode=1;
62 67
     }
63 68
 
64
-    var downloadUrl = app.globalData.uploadImageUrl + "MiaoguoUser" + common.Encrypt(app.globalData.userInfo.UserID) + ".png";
69
+    var idStr=common.Encrypt(app.globalData.userInfo.UserID);
70
+    idStr=idStr.replace("/","___");
71
+    idStr=idStr.replace("+","___");
72
+
73
+    var downloadUrl = app.globalData.uploadImageUrl + "MiaoguoUser" + idStr + ".png";
65 74
     setTimeout(function () {
66 75
       var downloadTask = wx.downloadFile({
67 76
         url: downloadUrl,
@@ -105,6 +114,10 @@ Page({
105 114
                 }
106 115
               }
107 116
             });
117
+          }
118
+          else if (res.statusCode === 404){
119
+            console.log("图片404");
120
+            wx.hideLoading();
108 121
           } else {
109 122
             wx.hideLoading();
110 123
           }
@@ -158,5 +171,5 @@ Page({
158 171
       path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
159 172
       imageUrl: "../../pages/images/program_screenshot_main.png",
160 173
     }
161
-  },
174
+  }
162 175
 });

+ 3 - 1
project.private.config.json

@@ -1,5 +1,7 @@
1 1
 {
2
-  "setting": {},
2
+  "setting": {
3
+    "urlCheck": true
4
+  },
3 5
   "condition": {
4 6
     "miniprogram": {
5 7
       "list": [