2.3.3

app.js

@@ -1,6 +1,6 @@
 App({
   globalData: {
-    Version: "2.3.2",
+    Version: "2.3.3",
     IsProduction: true,
     //IsProduction: false,
     ShareTitle: "高效学习从秒过开始",

pages/main/default.js

@@ -389,22 +389,7 @@ Page({
     var fieldStr = "&FieldStr=NickName,AvatarUrl";
     if (userid) {
       that.getUserInfo(userid, fieldStr, function (data) {
-        if (type1 == 0) {
-          that.setData({
-            NewUserAvatar: data.AvatarUrl,
-            NewUserNickName: data.NickName,
-          });
-        } else if (type1 == 1) {
-          that.setData({
-            IntroducerAvatar: data.AvatarUrl,
-            IntroducerNickName: data.NickName,
-          });
-        } else if (type1 == 2) {
-          that.setData({
-            GroupUserAvatar: data.AvatarUrl,
-            GroupUserNickName: data.NickName,
-          });
-        } else if (type1 == 3) {
+        if (type1 == 3) {
           that.setData({
             RefundUserAvatar: data.AvatarUrl,
             RefundUserNickName: data.NickName,
@@ -429,49 +414,6 @@ Page({
       }
     });
   },
-  setUserGroup: function (e) {
-    var that = this;
-    if (that.data.ChangeGroupUserID) {
-      if (app.globalData.userInfo.UserID == 1 ||
-        app.globalData.userInfo.UserID == 2 ||
-        app.globalData.userInfo.UserID == 3 ||
-        app.globalData.userInfo.UserID == 4) {
-        var id = e.currentTarget.dataset.id;
-        var url = "UpdateUserMemberInfo?UserID=" + that.data.ChangeGroupUserID + "&GroupID=" + id;
-        main.getData(url, function (data) {
-          that.setData({
-            ChangeGroupUserID: null,
-            GroupUserAvatar: null,
-          });
-          wx.showToast({
-            title: '群更改成功',
-          })
-        });
-      }
-    }
-  },
-  setUserIntroducer: function (e) {
-    var that = this;
-    if (that.data.ChangeNewUserID && that.data.ChangeIntroducerUserID) {
-      if (app.globalData.userInfo.UserID == 1 ||
-        app.globalData.userInfo.UserID == 2 ||
-        app.globalData.userInfo.UserID == 3 ||
-        app.globalData.userInfo.UserID == 4) {
-        var url = "UpdateIntroducer?UserID=" + that.data.ChangeNewUserID + "&Introducer=" + that.data.ChangeIntroducerUserID;
-        main.getData(url, function (data) {
-          that.setData({
-            ChangeNewUserID: null,
-            ChangeIntroducerUserID: null,
-            NewUserAvatar: null,
-            IntroducerAvatar: null,
-          });
-          wx.showToast({
-            title: '介绍人更改成功',
-          })
-        });
-      }
-    }
-  },
   selectPayItem: function (e) {
     var that = this;
     var id = e.currentTarget.dataset.id;

pages/main/default.wxml

@@ -73,36 +73,6 @@
     <view class="hiddenline"></view>
     <button class="btnShowUserID" bindtap="goto" data-url="../other/paycustom">自定义开据</button>
     
-    <!-- 更改介绍人 -->
-    <view class="hiddenline"></view>
-    <view class="panel2 FlexRow">
-      <input class='input2 input' type="number"  always-embed="true"  placeholder="新用户ID" value="{{ChangeNewUserID}}" bindinput="onKeyInput" data-type="newuserid"/>
-      <button class="btn2" bindtap="getUserInfoFunction" data-id="{{ChangeNewUserID}}" data-type="0">查看</button>
-      <image class="Avatar2" src='{{NewUserAvatar}}' wx:if="{{NewUserAvatar}}"/>
-      <view class="NickName2" wx:if="{{NewUserAvatar}}">{{NewUserNickName}}</view>
-    </view>
-    <view class="panel20 panel2 FlexRow">
-      <input class='input2 input' type="number"  always-embed="true"  placeholder="介绍人ID" value="{{ChangeIntroducerUserID}}" bindinput="onKeyInput" data-type="introduceruserid"/>
-      <button class="btn2" bindtap="getUserInfoFunction" data-id="{{ChangeIntroducerUserID}}" data-type="1">查看</button>
-      <image class="Avatar2" src='{{IntroducerAvatar}}' wx:if="{{IntroducerAvatar}}"/>
-      <view  class="NickName2" wx:if="{{IntroducerAvatar}}">{{IntroducerNickName}}</view>
-    </view>
-    <button class="btnShowUserID" bindtap="setUserIntroducer">更改用户介绍人</button>
-    
-    <!-- 更改班群 -->
-    <view class="hiddenline"></view>
-    <view class="panel2 FlexRow">
-      <input class='input2 input' type="number"  always-embed="true"  placeholder="用户ID" value="{{ChangeGroupUserID}}" bindinput="onKeyInput" data-type="groupuserid"/>
-      <button class="btn2" bindtap="getUserInfoFunction" data-id="{{ChangeGroupUserID}}" data-type="2">查看</button>
-      <image class="Avatar2" src='{{GroupUserAvatar}}'  wx:if="{{GroupUserAvatar}}"/>
-      <view  class="NickName2"  wx:if="{{GroupUserAvatar}}">{{GroupUserNickName}}</view>
-    </view>
-    <view class="panel21 panel2 FlexRow">
-      <button class="btnShowUserID" bindtap="setUserGroup" data-id="1">群改彩虹</button>
-      <button class="btnShowUserID" bindtap="setUserGroup" data-id="2">群改润雨</button>
-      <button class="btnShowUserID" bindtap="setUserGroup" data-id="3">群改扬帆</button>
-    </view>
-
     <!-- 退款 -->
     <view class="hiddenline"></view>
     <view class="panel2 FlexRow">

pages/main/detail.js

@@ -1415,9 +1415,6 @@ Page({
     var cardType = wx.getStorageSync("CardType");
     main.GotoTaskList(2,cardType);
   },
-  resetTodayTask:function(){
-    main.ResetTodayTask();
-  },
   clearTimeoutEveryCard: function () {
     for(var i=0;i<timeoutEveryCard.length;i++){
       clearTimeout(timeoutEveryCard[i]);

pages/main/detail.wxml

@@ -208,12 +208,16 @@
           </view>
         </view>
       </view>
+      <view class="panelLastTime4 FlexRow" catchtap="goto" data-url="../plan/setting?Type=ShowReset">
+        <view class="panelLastTime41 FlexRow">
+          <image src="../images/icon_reload_1.png" class='icon_reload_1' />
+          <view>重置今天的任务量</view>
+        </view>
+        <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+      </view>
       <view class="panelLastTime3">点击左上角返回首页</view>
       
-      <!-- <view class="panelLastTime4 FlexRow">
-        <view class="panelLastTime41">对本次练习用时的说明</view>
-        <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
-      </view> -->
+      
 
       <view class="panelLastFooter FlexColumn">
         <view class="panelLastFooter1 FlexRow">
@@ -225,10 +229,6 @@
             <image src="../images/icon_report_1.png" class='icon_report_1' />
             <view>详细报告</view>
           </view>
-          <view class="panelLastFooter11 FlexColumn" catchtap="resetTodayTask">
-            <image src="../images/icon_reload_1.png" class='icon_reload_1' />
-            <view>重置任务量</view>
-          </view>
         </view>
         <view class="panelLastFooter2 FlexColumn" bindtap="goto" data-url="../share/shareitem?TaskID=-1">
           <image src="../images/icon_flag_3.png" class='icon_flag_3' />

pages/main/detail.wxss

@@ -585,7 +585,7 @@ page{
 .panelLastTime4{
   width: 710rpx;
   height:100rpx;
-  margin:60rpx 0 0 20rpx;
+  margin:20rpx 0 0 20rpx;
   justify-content: space-between;
   background-color: rgba(0, 0, 0, 0.2);
   border-radius: 20rpx;
@@ -618,7 +618,7 @@ page{
 }
 
 .panelLastFooter .panelLastFooter11 {
-  width:243rpx;
+  width:365rpx;
   height:140rpx;
   font-size: 24rpx;
   color:#D2D2D2;
@@ -627,7 +627,7 @@ page{
 .icon_reload_1{
   width: 30rpx;
   height: 30rpx;
-  margin-bottom: 20rpx;
+  margin: 0 20rpx 0 0;
 }
 
 .icon_report_1{
@@ -643,7 +643,7 @@ page{
   height:100rpx;
   position: absolute;
   bottom:90rpx;
-  left:92rpx;
+  left:150rpx;
   justify-content: flex-end;
 }
 

pages/plan/setting.js

@@ -5,14 +5,40 @@ const app = getApp();
 
 Page({
   data: {
+    ShowReset:false,
+    ImagePath: app.globalData.uploadImageUrl,
   },
-  onLoad: function () {
+  onLoad: function (options) {
     var that = this;
 
     that.setData({
       Containnerheight: main.getWindowHeight(),
     });
-    
+
+    if (options.Type=="ShowReset"){
+      that.setData({
+        ShowReset: true,
+      });
+      wx.setNavigationBarTitle({
+        title: '重置',
+      });
+      wx.setNavigationBarColor({
+        frontColor: "#000000",
+        backgroundColor: "#F8F8F8",
+      })
+    }
+  },
+  showSetting:function(){
+    this.setData({
+      ShowReset: false,
+    });
+    wx.setNavigationBarTitle({
+      title: '模式设置',
+    });
+    wx.setNavigationBarColor({
+      frontColor: "#000000",
+      backgroundColor: "#ffffff",
+    })
   },
   onShow: function () {
     var that = this;

pages/plan/setting.wxml

@@ -1,4 +1,4 @@
-<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+<view wx:if="{{!ShowReset}}" class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="line"></view>
   <view class="panelItem FlexRow" bindtap="goto" data-url="./studyplandetail?CardType=0">
     <view class="panelItem1">日常练习模式</view>
@@ -61,4 +61,9 @@
     </view>
   </view>
   <view class='lineFooter'></view>
+</view>
+
+<view wx:if="{{ShowReset}}" class="container2 container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <image src='{{ImagePath}}web/help_board_tips_chongzhi.png' class="help_board_tips_chongzhi" />
+	<view class="btnReset" bindtap="showSetting">前往重置</view>		
 </view>

pages/plan/setting.wxss

@@ -123,4 +123,25 @@
 
 .panelItemBottom{
   margin-top: 300rpx;
+}
+
+.container2{
+  background-color: #f8f8f8;
+}
+
+.help_board_tips_chongzhi{
+  width:630rpx;
+  height: 530rpx;
+  margin: 100rpx 0;
+}
+
+.btnReset{
+  background: #5282FA;
+  border-radius: 20rpx;
+  font-size: 36rpx;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 100rpx;
+  width:600rpx;
+  margin-top: 200rpx;
 }

pages/plan/studyplan.wxml

@@ -195,7 +195,7 @@
 				</view>
 			</view>
 
-			<view class="panel222 panel21 FlexColumn" bindtap="showHelp" data-id="2">
+			<view class="panel222 panel21 FlexColumn" bindtap="goto" data-url="./setting?Type=ShowReset">
 				<view class="panel212 FlexRow">
 					<image src='../images/universalpic_questionmark_blue_40x40.png'
 						class="universalpic_questionmark_blue_40x40" />
@@ -246,14 +246,11 @@
 				<image src='../images/universalpic_close_black_24x24.png' class="universalpic_close_black_24x24" />
 			</view>
 			<view wx:if="{{HelpID==1}}"></view>
-			<view wx:if="{{HelpID==2}}" class="HelpPanel112" catchtap="goto" data-url="./setting">前往重置</view>
 			<view wx:if="{{HelpID==3}}" class="HelpPanel113 HelpPanel112" catchtap="changePlanOK">更换</view>
 		</view>
 		<view class="HelpPanel12 FlexColumn">
 			<image wx:if="{{HelpID==1}}" src='{{ImagePath}}web/help_board_tips_shouyeshezhi.png'
 				class="help_board_tips_shouyeshezhi" />
-			<image wx:if="{{HelpID==2}}" src='{{ImagePath}}web/help_board_tips_chongzhi.png'
-				class="help_board_tips_chongzhi" />
 			<block wx:if="{{HelpID==3}}">
 				<view class="panel11 FlexRow">
 					<view class="panel111">启用哪种「练习模式」</view>
@@ -297,4 +294,4 @@
 			</block>
 		</view>
 	</view>
-</view>
+</view>

pages/plan/studyplan.wxss

@@ -709,11 +709,6 @@
   border-top:1rpx solid #D2D2D2;
 }
 
-.help_board_tips_chongzhi{
-  width:630rpx;
-  height: 530rpx;
-  margin: 80rpx 0;
-}
 .help_board_tips_shouyeshezhi{
   width:630rpx;
   height: 500rpx;

pages_agent/marketing/shareuser.js

@@ -126,6 +126,11 @@ Page({
     }, timeout);
 
   },
+  gotoShareIndex:function(){
+    wx.navigateTo({
+      url: "../../pages/share/shareindex",
+    });
+  },
   buildUrl: function () {
     wx.setClipboardData({
       data: shareUrl,

pages_agent/marketing/shareuser.wxml

@@ -3,10 +3,11 @@
   <view class="panel FlexColumn" wx:for="{{List}}" wx:key="*this">
     <view class="text1 FlexRow">{{item.Text1}}<view class="Number">{{index+1}}</view></view>
     <view class="text2">{{item.Text2}}</view>
+    <image wx:if="{{item.Image}}" class="img2" src="{{ServerImage}}{{item.Image}}"></image>
     <button wx:if="{{item.BtnStr}}" class="btn FlexRow" open-type="{{item.OpenType}}" bindtap="{{item.BindTap}}">
       <view class="Arrow"></view>
       <view>{{item.BtnStr}}</view>
-      <image src='../images/arrow_right_orange.png' class="Arrow" />
+      <image src='../../pages/images/arrow_right_orange.png' class="Arrow" />
     </button>
     <view class="panel1 FlexRow" wx:if="{{item.Images}}">
       <image bindtap="buildImage" data-id="{{itemChild.id}}" class="img" src="{{ServerImage}}{{itemChild.icon}}" wx:for="{{item.Images}}" wx:key="index" wx:for-item="itemChild"></image>

pages_agent/marketing/shareuser.wxss

@@ -42,6 +42,12 @@
   margin: 0 10rpx;
 }
 
+.panel .img2{
+  width:234rpx;
+  height:206rpx;
+  margin: 60rpx 0 0 0;
+}
+
 .panel .text3{
   font-size:24rpx;
   margin: 40rpx 0;