2.3.1

app.js

@@ -1,8 +1,8 @@
 App({
   globalData: {
-    Version: "2.3.0",
-    //IsProduction: true,
-    IsProduction: false,
+    Version: "2.3.2",
+    IsProduction: true,
+    //IsProduction: false,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",
     ShareImage: '../images/program_screenshot_main.png',

pages/index/index.js

@@ -259,11 +259,11 @@ Page({
           wx.removeStorageSync("UserName");
 
           // //测试****************
-          var url = '../share/shareindex';
-          wx.redirectTo({
-            url: url,
-          });
-          return;
+          // var url = '../share/shareindex';
+          // wx.redirectTo({
+          //   url: url,
+          // });
+          // return;
           // //测试****************
 
           if (that.data.gotoType == "share") {
@@ -298,14 +298,12 @@ Page({
             }
             main.getUserConfig();
           }
-          that.getBaiduToken();
+          main.getServerSoundErrorArr();
+          main.getBaiduToken();
         }
       });
     });
   },
-  getBaiduToken: function () {
-    main.getBaiduToken();
-  },
   
   updateProgram: function () {
     const updateManager = wx.getUpdateManager();

pages/main/cardmain.js

@@ -45,12 +45,13 @@ Page({
   },
   init:function(){
     var that=this;
-    main.getData("GetUserCardCount?UserID="+app.globalData.userInfo.UserID, function (data) {
+    main.getData("GetUserCardCount?HasHardworking=1&UserID="+app.globalData.userInfo.UserID, function (data) {
       if (data) {
         that.setData({
           CardNumber: data.CardNumber,
           NormalNumber:data.NormalNumber,
           UrgentNumber:data.UrgentNumber,
+          Hardworking:data.Hardworking,
         });
 
         if (data.UrgentNumber){

pages/main/cardmain.wxml

@@ -72,13 +72,31 @@
   <block wx:if="{{IsYearReport}}">
     <image class="report_2021-banner" src='{{ImagePath}}web/report_2021-banner.png' bindtap="goto" data-url="../other/annualreport" />
   </block>
-  <view class="panelShare FlexRow">
+  <!-- 没有勤勉接力 -->
+  <view class="panelShare FlexRow" wx:if="{{!Hardworking}}">
     <view class="panelShare1 FlexColumn">
       <view class="text1">勤勉接力</view>
       <view class="text2">激励自己见证成长</view>
     </view>
     <image class="directory_main_pic_9" src='../images/directory_main_pic_9.png' bindtap="goto" data-url="../../pages/share/shareindex" />
   </view>
+  <!-- 有勤勉接力 -->
+  <view class="panelShare FlexRow" wx:if="{{Hardworking}}" bindtap="goto" data-url="../../pages/share/shareindex"
+  style="{{Hardworking.BgColor}}">
+    <image class="hardworkingImg" mode="center" wx:if="{{Hardworking.Image}}" src='{{Hardworking.Image}}'  />
+    <view class="hardworkingImg2 hardworkingImg"></view>
+    <view class="panelShare1 FlexColumn">
+      <view class="text3 text1">勤勉接力</view>
+      <view class="text4 text2">激励自己见证成长</view>
+    </view>
+    <view class="panelShare2 FlexColumn">
+      <view class="text8">{{Hardworking.HardworkingNumber}}{{Hardworking.OrdinalPostfix}}</view>
+      <view class="text7">{{Hardworking.Name}}</view>
+    </view>
+    
+  </view>
+
+
   <view class="panelItem6 FlexRow" wx:if="{{FolderArr}}">
     <view class="panelItem61 FlexColumn">
       <view>题卡卡单</view>

pages/main/cardmain.wxss

@@ -476,11 +476,38 @@
   background: #FFDE5A;
   border-radius: 20rpx;
   justify-content: space-between;
+  position: relative;
+}
+
+.directory_main_pic_9 {
+  width: 410rpx;
+  height: 180rpx;
+  border-radius: 0 20rpx 20rpx 0;
+}
+
+.hardworkingImg{
+  width:710rpx;
+  height:180rpx;
+  border-radius: 20rpx;
+  position: absolute;
+  left:0;
+  top:0;
+}
+.hardworkingImg2{
+  position: absolute;
+  background: rgba(0,0,0,0.20);
+  z-index: 10;
 }
 
 .panelShare1 {
   align-items: flex-start;
   margin-left: 40rpx;
+  z-index: 20;
+}
+.panelShare2 {
+  align-items: flex-end;
+  margin-right: 40rpx;
+  z-index: 20;
 }
 
 .text1 {
@@ -490,11 +517,27 @@
 
 .text2 {
   font-size: 20rpx;
+  margin-top: 4rpx;
   color: #1E1E1E;
 }
-
-.directory_main_pic_9 {
-  width: 410rpx;
-  height: 180rpx;
-  border-radius: 0 20rpx 20rpx 0;
+.text3 {
+  color: #fff;
+}
+.text4 {
+  color: #f2f2f2;
+}
+.text8{
+  font-family: Roboto-Black;
+  font-size: 64rpx;
+  color: #FFFFFF;
+  text-align: right;
+}
+.text7 {
+  font-family: Roboto-Black;
+  font-size: 24rpx;
+  color: #FFFFFF;
+  text-align: right;
+  text-shadow: 0 2rpx 0 rgba(0,0,0,0.30);
+  position: absolute;
+  bottom:35rpx;
 }

pages/main/detail.wxml

@@ -209,14 +209,15 @@
         </view>
       </view>
       <view class="panelLastTime3">点击左上角返回首页</view>
-      <view class="panelLastTime4 FlexRow">
+      
+      <!-- <view class="panelLastTime4 FlexRow">
         <view class="panelLastTime41">对本次练习用时的说明</view>
         <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
-      </view>
+      </view> -->
 
       <view class="panelLastFooter FlexColumn">
         <view class="panelLastFooter1 FlexRow">
-          <view class="panelLastFooter11 FlexColumn" bindtap="goto" data-url="../share/shareitem?TaskID=-1&Day={{DayNumber}}">
+          <view class="panelLastFooter11 FlexColumn" bindtap="goto" data-url="../share/shareitem?TaskID=-1">
             <view class="icon_reload_1"></view>
             <view>勤勉接力</view>
           </view>
@@ -226,32 +227,14 @@
           </view>
           <view class="panelLastFooter11 FlexColumn" catchtap="resetTodayTask">
             <image src="../images/icon_reload_1.png" class='icon_reload_1' />
-            <view>重围任务量</view>
+            <view>重置任务量</view>
           </view>
         </view>
-        <view class="panelLastFooter2 FlexColumn" bindtap="goto" data-url="../share/shareitem?TaskID=-1&Day={{DayNumber}}">
-          <view class="panelLastFooter21">{{DayNumber}}</view>
-          <view>DAYS</view>
+        <view class="panelLastFooter2 FlexColumn" bindtap="goto" data-url="../share/shareitem?TaskID=-1">
+          <image src="../images/icon_flag_3.png" class='icon_flag_3' />
         </view>
       </view>
       
-      <!-- <view class="panelLastTime FlexColumn">
-        <view style='color:{{Color.FrontColor1}};'>单张题卡平均用时</view>
-        <view class="time2" style='color:{{Color.LineColor}}'>{{Speed2}}</view>
-      </view>
-      <view class="panelLastTime FlexColumn">
-        <view style='color:{{Color.FrontColor1}};'>每分钟可练习</view>
-        <view class="time2" style='color:{{Color.LineColor}}'>{{Speed1}}</view>
-      </view> -->
-      <!-- <view class='panelLastFooter'>
-        <view class="panelLastFooter1 FlexRow" bindtap='buildShareImage'>
-          <image src="../images/universalpic_screenshot_gray_30x30.png" class='universalpic_screenshot_gray_30x30' />
-          <view>群接力</view>
-        </view>
-        <view class="panelLastFooter2 FlexRow" bindtap='onClose'>
-          <view>关闭</view>
-        </view>
-      </view> -->
     </view>
   </block>
   <!-- 今日任务量 -->

pages/main/detail.wxss

@@ -639,20 +639,18 @@ page{
 .panelLastFooter2{
   background-image: linear-gradient(141deg, #746D6B 0%, #504846 100%);
   border-radius: 10rpx;
-  font-family: Roboto-Black;
-  font-size: 16rpx;
-  color: rgba(255,255,255,0.50);
   width:80rpx;
   height:100rpx;
   position: absolute;
   bottom:90rpx;
   left:92rpx;
+  justify-content: flex-end;
 }
 
-.panelLastFooter2 .panelLastFooter21{
-  font-family: Roboto-Black;
-  font-size: 24rpx;
-  color: rgba(255,255,255,0.50);
+.icon_flag_3{
+  width:80rpx;
+  height:75rpx;
+  border-radius: 0 0 10rpx 10rpx;
 }
 
 

pages/other/webview.js

@@ -17,7 +17,7 @@ Page({
     else{
       that.setData({
         PageID:options.PageID,
-        Url:"https://www.kylx365.com/webpage?PageID="+options.PageID,
+        Url:"https://www.kylx365.com/webpage?PageID="+options.PageID+"&UserID="+app.globalData.userInfo.UserID,
       });
     }
   },

pages/share/milestone.js

@@ -33,7 +33,7 @@ Page({
       that.setData({
         Info: data,
       });
-      fanObj.init(that, data.RemainRate, 80, 4.0, "#11CC33", "#D2D2D2", data.RemainRateStr);
+      fanObj.init(that, data.RemainRate, 80, 3.0, "#11CC33", "#D2D2D2", data.RemainRateStr);
 
     });
   },

pages/share/milestone.wxml

@@ -4,12 +4,9 @@
   <view class="panel1 FlexColumn">
     <view class="panelNull"></view>
 
-    <view class="panel12 FlexRow" wx:for="{{Info.MilestoneFinished}}" wx:key="*this" 
-      wx:if="{{index<Info.MilestoneFinished.length-1}}">
-      <view class="panel121 FlexColumn" style="{{item.Position}}"
-        bindtap="gotoDetail" data-id="{{item.ID}}">
+    <view class="panel12 FlexRow" wx:for="{{Info.MilestoneFinished}}" wx:key="*this" wx:if="{{index<Info.MilestoneFinished.length-1}}">
+      <view class="panel121 FlexColumn" style="{{item.Position}}" bindtap="gotoDetail" data-id="{{item.ID}}">
         <view class="text3 FlexRow" wx:if="{{item.Date}}" style="background-color: {{item.Color}};">
-          <view class="arrow"></view>
           <view class="text31">{{item.Name}}</view>
           <image class="arrow" src="../images/icon_nextpage_5.png"></image>
         </view>
@@ -25,16 +22,21 @@
     <view class="panel11 FlexColumn" bindtap="gotoDetail" data-id="{{Info.MilestoneFinished[Info.MilestoneFinished.length-1].ID}}">
       <view class="line"></view>
       <view class="circle"></view>
-      <view class="text1">{{Info.MilestoneFinished[Info.MilestoneFinished.length-1].Name}}</view>
+      <view class="text1 FlexRow">
+        <view>{{Info.MilestoneFinished[Info.MilestoneFinished.length-1].Name}}</view>
+        <image class="arrow2" src="../images/icon_nextpage_2.png"></image>
+      </view>
       <view class="text2">{{Info.MilestoneFinished[Info.MilestoneFinished.length-1].Date}}</view>
     </view>
 
+    <view class="line2"></view>
+
+    <text class="text5">点击以上里程碑可生成群接力图片。</text>
+    <text class="text6">里程碑是勤勉接力的特别版。为了帮您记录这个特殊的日子，即使该天没有接力，也会帮您自动生成。</text>
+
     <template class="fan" is="fanTemplate" data="{{Angle1,Angle2,BGColor,FanSize,FanScale,Color1,Color2,ShowNumber}}">
-		</template>
+    </template>
   </view>
-  <text class="text5">点击以上里程碑可生成群接力图片。</text>
-  <text class="text6">里程碑是勤勉接力的特别版。为了帮您记录这个特殊的日子，即使该天没有接力，也会帮您自动生成。</text>
-  <view class="line2"></view>
   <view class="panel2 FlexColumn">
     <view class="panel21 FlexRow">
       <view class="text7">尚未达到的里程碑</view>

pages/share/milestone.wxss

@@ -16,7 +16,7 @@
 }
 
 .line{
-  width:4rpx;
+  width:6rpx;
   height:130rpx;
   background-color: #d2d2d2;
 }
@@ -57,13 +57,18 @@
   color: #FFFFFF;
   text-align: center;
   line-height:53rpx;
-  width: 218rpx;
+  padding: 0 20rpx 0 30rpx;
 }
 .arrow{
   width:12rpx;
   height:18rpx;
   margin: 0 10rpx;
 }
+.arrow2{
+  width:16rpx;
+  height:26rpx;
+  margin: 0 10rpx;
+}
 
 .panel121{
   position: absolute;
@@ -91,25 +96,25 @@
 }
 
 .text5{
-  width:690rpx;
+  width:650rpx;
   font-size:22rpx;
-  margin-top: 30rpx;
 }
 .text6{
-  width:690rpx;
+  width:650rpx;
   font-size:22rpx;
-  margin: 10rpx 0 30rpx 0;
+  margin: 10rpx 0 60rpx 0;
 }
 
 .line2{
-  width:690rpx;
+  width:650rpx;
   height:1rpx;
+  margin:40rpx 0 30rpx 0;
   background: #BCBCBC;
 }
 
 
 .panel2{
-  margin:60rpx 0 92rpx 0;
+  margin:80rpx 0 92rpx 0;
   width: 100%;
 }
 .panel21{

pages/share/shareindex.js

@@ -7,10 +7,21 @@ Page({
   data: {
     Weeks:["周一","周二","周三","周四","周五","周六","周日"],
     List:[],
+    ShowActivity:1,
+    Info:{
+      DayNumber:-1,
+    },
   },
   onLoad: function (options) {
     var that = this;
     
+    var date=common.formatTime(new Date(app.globalData.userInfo.CreateTime),"-",true);
+    //console.log(date);
+    if (app.globalData.userInfo.CreateTime>="2022-09-21"){
+      that.setData({
+        ShowActivity:0,
+      });
+    }
     that.setData({
       Containnerheight: main.getWindowHeight(),
     });
@@ -19,8 +30,12 @@ Page({
   }, 
   init:function(){
     var that = this;
+    wx.showLoading({
+      title: '读取中',
+    });
     var url = 'GetHardworkingList?UserID=' + app.globalData.userInfo.UserID;
     main.getData(url, function (data) {
+      wx.hideLoading();
       data.Today=common.formatDateCHS(common.formatTime(new Date()));
       data.Days=[];
       var days=that.getDays();
@@ -33,38 +48,37 @@ Page({
           if (data.CurrentMonth[i].Day==days[j]){
               obj.BgColor="#d2d2d2";
               obj.Color="#4D4D4D";
-              if (data.CurrentMonth[i].IsShare || data.CurrentMonth[i].Image){
+              if (data.CurrentMonth[i].IsShare || data.CurrentMonth[i].Image || data.CurrentMonth[i].IsMilestone){
                 obj.ID=data.CurrentMonth[i].ID;
-                obj.DayNumber=data.DayNumber;
+                obj.HardworkingNumber=data.CurrentMonth[i].HardworkingNumber;
                   
                 if (data.CurrentMonth[i].Image){
                   obj.Image=data.CurrentMonth[i].Image;
                   obj.AphorismID=data.CurrentMonth[i].AphorismID;
-                  obj.Color="#FFFFFF";
+                }
+                else if (data.CurrentMonth[i].IsMilestone){
+                  obj.BgColor=data.CurrentMonth[i].Color1;
+                  obj.IsMilestone=data.CurrentMonth[i].IsMilestone;
                 }
                 else{
                   obj.BgColor="#3D3D3D";
-                  obj.Color="#FFFFFF";
                 }
+
+                obj.Color="#FFFFFF";
                 obj.IsShare=data.CurrentMonth[i].IsShare;
                 obj.Name=data.CurrentMonth[i].Day;
               }
-              if (data.CurrentMonth[i].IsMilestone){
-                obj.BgColor=data.CurrentMonth[i].Color1;
-                obj.Name=data.CurrentMonth[i].Name;
-                obj.IsMilestone=data.CurrentMonth[i].IsMilestone;
-              }
+              
               break;
           }
         }
         data.Days.push(obj);
       }
-      
 
       that.setData({
         Info:data,
       });
-
+      
       if (data.SevenDays.length==0){
         wx.setNavigationBarColor({
           backgroundColor: '#ffffff',
@@ -92,19 +106,33 @@ Page({
   },
   gotoDetail:function(e){
     var id=e.currentTarget.dataset.id;
+    var name=e.currentTarget.dataset.name;
     var ismilestone=e.currentTarget.dataset.ismilestone;
     var aphorismid=e.currentTarget.dataset.aphorismid;
     var isshare=e.currentTarget.dataset.isshare;
     if (ismilestone || aphorismid){
       wx.navigateTo({
-        url: "./shareitem?TaskID="+id+"&Day="+e.currentTarget.dataset.day,
+        url: "./shareitem?TaskID="+id,
       });
     }
     else if (isshare){
       wx.navigateTo({
-        url: "./shareitem?TaskID="+id+"&IsHistory=1&Day="+e.currentTarget.dataset.day,
+        url: "./shareitem?TaskID="+id+"&IsHistory=1",
       });
     }
+    else if (name){
+      if (Number(name)<=(new Date().getDate())){
+        wx.showToast({
+          title: '没有接力',
+          image: "../images/icon_flag_2.png",
+        });
+      }
+      else{
+        wx.showToast({
+          title: '未到时间',
+        });
+      }
+    }
   },
   showHelpImage: function (e) {
     main.ShowHelpImage();

pages/share/shareindex.wxml

@@ -10,29 +10,56 @@
       <scroll-view scroll-x class="panelCard FlexRow">
         <view class="Card0"></view>
 
-        <view class="Card" style="{{item.Color2}}" 
-        wx:for="{{Info.SevenDays}}" wx:key="index" 
-        bindtap="gotoDetail" data-id="{{item.ID}}" data-aphorismid="{{item.AphorismID}}" data-day="{{item.DayNumber}}" 
-        data-ismilestone="{{item.IsMilestone}}">
+        <view class="Card" style="{{item.Color2}}" wx:for="{{Info.SevenDays}}" wx:key="index" bindtap="gotoDetail" data-id="{{item.ID}}" data-aphorismid="{{item.AphorismID}}"  data-ismilestone="{{item.IsMilestone}}">
           <image wx:if="{{item.Image}}" lazy-load="true" class="CardImg" src="{{item.Image}}"></image>
-          <view class="img2 CardImg"></view>
+          <view class="CardImg2 CardImg"></view>
           <view class="CardText FlexColumn">
             <view class="Card1">{{item.CreateTime}}</view>
-            <view class="Card2 FlexRow" wx:if="{{!item.Name}}">{{item.DayNumber}}<text class="Card3">th</text></view>
-            <view class="Card6 FlexRow" wx:if="{{item.Name}}">{{item.Name}}</view>
-            <view class="Card4 FlexColumn"><text class="">{{item.Content}}</text></view>
+            <view class="Card2 FlexRow" >{{item.HardworkingNumber}}<text class="Card3">{{item.OrdinalPostfix}}</text></view>
+            <view class="Card4 FlexColumn" wx:if="{{item.Content}}"><text class="">{{item.Content}}</text></view>
+            <view class="Card6 FlexRow" wx:if="{{item.Name}}">里程碑</view>
+            <view class="Card7 FlexRow" wx:if="{{item.Name}}">{{item.Name}}</view>
+            
           </view>
         </view>
 
         <view class="CardEnd" bindtap="goto" data-url="./sharewall">
           <view class="CardEnd1 FlexColumn">
             <image class="icon_flag_1" src="../images/icon_flag_1.png"></image>
-            <view class="Card5" >查看全部</view>
+            <view class="Card5">查看全部</view>
           </view>
         </view>
       </scroll-view>
     </view>
 
+    <view class="panel2 FlexColumn" wx:if="{{ShowActivity}}">
+      <view class="panel21 FlexRow">
+        <view class="text2">秒过学习小组活动</view>
+      </view>
+      <view class="panel2200 panel22 FlexColumn">
+        <image src="../images/qmjl_main_pic_2.png" class="qmjl_main_pic_2"></image>
+        <image src="../images/qmjl_main_pic_3.png" class="qmjl_main_pic_3"></image>
+        <image src="../images/qmjl_main_pic_4.png" class="qmjl_main_pic_4"></image>
+        <view class="panel22001 FlexRow">
+          <view class="panel220011 FlexRow" style="width:{{Info.ShareNumberYearRate}}%;">
+            <view class="panel2200111"></view>
+            <view class="panel2200112 panel2200111"></view>
+          </view>
+          <view wx:if="{{Info.ShareNumberYearRate<50}}" class="panel220013 panel220012 FlexRow"></view>
+          <view wx:if="{{Info.ShareNumberYearRate>=50 && Info.ShareNumberYearRate<100}}" class="panel220013 panel220014 FlexRow"></view>
+        
+          <view wx:if="{{Info.ShareNumberYearRate<100}}" class="panel220012 FlexRow"></view>
+          <view wx:if="{{Info.ShareNumberYearRate==100}}" class="panel220014 FlexRow"></view>
+        </view>
+        <view class="panel22002 FlexRow">
+          <view class="text15">今年已接力</view>
+          <view class="text16 FlexRow">{{Info.ShareNumberYear}}<text class="text17">次</text></view>
+        </view>
+        <view class="panel22003" bindtap="goto" data-url="../other/webview?PageID=10">规则详情</view>
+        <text class="text18" bindtap="goto" data-url="../other/userbook">活动截止：2022年12月31日，发奖：2023年1月8日，\n有效期大于发奖日才能领奖。<text class="text19">查看有效期</text></text>
+      </view>
+    </view>
+
     <view class="panel2 FlexColumn">
       <view class="panel21 FlexRow">
         <view class="text2">接力墙</view>
@@ -43,15 +70,14 @@
         </view>
         <view class="panelDays FlexRow">
           <block wx:for="{{Info.Days}}" wx:key="*this">
-            <view class="day FlexColumn" wx:if="{{!item.IsMilestone}}" style="background-color: {{item.BgColor}};" 
-            bindtap="gotoDetail" data-id="{{item.ID}}" data-aphorismid="{{item.AphorismID}}"  data-day="{{item.DayNumber}}" data-isshare="{{item.IsShare}}">
+            <view class="day FlexColumn" wx:if="{{!item.IsMilestone}}" style="background-color: {{item.BgColor}};" bindtap="gotoDetail" data-name="{{item.Name}}" data-id="{{item.ID}}" data-aphorismid="{{item.AphorismID}}" data-isshare="{{item.IsShare}}">
               <image wx:if="{{item.Image}}" lazy-load="true" class="img" src="{{item.Image}}"></image>
               <view wx:if="{{item.Image}}" class="img2 img"></view>
               <text class="text12" style="color:{{item.Color}};">{{item.Name}}</text>
             </view>
 
-            <view class="day0 day FlexColumn" wx:if="{{item.IsMilestone}}" style="border-color:{{item.BgColor}};" bindtap="gotoDetail" data-id="{{item.ID}}" data-ismilestone="{{item.IsMilestone}}">
-              <text class="text12" style="color:{{item.BgColor}}">{{item.Name}}</text>
+            <view class="day FlexColumn" wx:if="{{item.IsMilestone}}" style="background-color:{{item.BgColor}};" bindtap="gotoDetail" data-id="{{item.ID}}" data-ismilestone="{{item.IsMilestone}}">
+              <text class="text12" style="color:{{item.Color}};">{{item.Name}}</text>
             </view>
           </block>
 
@@ -97,13 +123,15 @@
         </view>
       </view>
     </view>
+    <view class="panelHeight2"></view>
   </block>
+  
   <block wx:if="{{Info.DayNumber==0}}">
     <text class="text10">暂无内容</text>
     <text class="text11">请先完成第一次练习，并在做完后进行一次\n勤勉接力，然后回到这里看看</text>
   </block>
 
-  <view class="panelHelpCommon_{{Info.DayNumber}} panelHelpCommon FlexRow" bindtap="showHelpImage">
+  <view wx:if="{{Info.DayNumber>=0}}" class="panelHelpCommon_{{Info.DayNumber}} panelHelpCommon FlexRow" bindtap="showHelpImage">
     <view class="panelHelpCommon1 FlexRow">
       <view class="panelHelpCommon11 FlexRow">
         <image class="panelHelpCommonIcon" src="../images/icon_light_1.png"></image>

pages/share/shareindex.wxss

@@ -1,19 +1,22 @@
-.container{
+.container {
   background-color: #FFFFFF;
 }
-.panel1{
-  width:100%;
+
+.panel1 {
+  width: 100%;
   position: relative;
   align-items: flex-start;
 }
-.panelBg{
+
+.panelBg {
   position: absolute;
-  top:0;
+  top: 0;
   width: 100%;
-  height:720rpx;
+  height: 720rpx;
   background-image: linear-gradient(180deg, #FFD66E 0%, #FFFFFF 100%);
 }
-.text1{
+
+.text1 {
   font-family: Roboto-Black;
   font-size: 64rpx;
   color: #2E2E2E;
@@ -21,187 +24,212 @@
   margin-left: 30rpx;
 }
 
-.panel11{
+.panel11 {
   margin-top: 30rpx;
   width: 100%;
   justify-content: space-between;
   z-index: 10;
 }
-.text2{
+
+.text2 {
   font-size: 36rpx;
   color: #4D4D4D;
   margin-left: 30rpx;
 }
 
-.panelCard{
-  width:100%;
-  height:435rpx;
+.panelCard {
+  width: 100%;
+  height: 435rpx;
   white-space: nowrap;
   margin-top: 30rpx;
   z-index: 10;
 }
 
-.Card0{
-  width:20rpx;
-  height:435rpx;
+.Card0 {
+  width: 20rpx;
+  height: 435rpx;
   display: inline-block;
 }
 
-.Card{
-  width:580rpx;
-  height:435rpx;
+.Card {
+  width: 580rpx;
+  height: 435rpx;
   display: inline-block;
   margin: 0 20rpx 0 0;
   position: relative;
   border-radius: 20rpx;
 }
 
-.CardImg{
+.CardImg {
   border-radius: 20rpx;
-  width:580rpx;
-  height:435rpx;
+  width: 580rpx;
+  height: 435rpx;
 }
 
-.CardText{
+.CardImg2 {
+  background-image: linear-gradient(180deg, rgba(0,0,0,0.10) 0%, rgba(0,0,0,0.40) 100%);
   position: absolute;
-  top:0;
   left:0;
-  width:580rpx;
-  height:435rpx;
-  color:#fff;
+  top:0;
+}
+
+.CardText {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 580rpx;
+  height: 435rpx;
+  color: #fff;
   justify-content: flex-start;
   align-items: flex-start;
 
   display: flex;
 }
-.Card1{
+
+.Card1 {
   font-family: Roboto-Black;
   font-size: 28rpx;
-  text-shadow: 0 3rpx 0 rgba(0,0,0,0.20);
+  text-shadow: 0 3rpx 0 rgba(0, 0, 0, 0.20);
   margin: 40rpx 0 0 40rpx;
 }
-.Card2{
+
+.Card2 {
   font-family: Roboto-Black;
   font-size: 72rpx;
-  text-shadow: 0 3rpx 0 rgba(0,0,0,0.20);
+  text-shadow: 0 3rpx 0 rgba(0, 0, 0, 0.20);
   margin: 0 0 0 40rpx;
 }
-.Card3{
+
+.Card3 {
   font-size: 24rpx;
-  text-shadow: 0 3rpx 0 rgba(0,0,0,0.20);
+  text-shadow: 0 3rpx 0 rgba(0, 0, 0, 0.20);
   margin: 30rpx 0 0 10rpx;
 }
-.Card4{
+
+.Card4 {
   margin: 72rpx 0 0 40rpx;
   font-family: Roboto-Black;
   font-size: 24rpx;
-  text-shadow: 0 3rpx 0 rgba(0,0,0,0.50);
-  width:500rpx;
-  height:165rpx;
+  text-shadow: 0 3rpx 0 rgba(0, 0, 0, 0.50);
+  width: 500rpx;
+  height: 165rpx;
   text-align: left;
-  white-space:pre-wrap;
+  white-space: pre-wrap;
   justify-content: flex-end;
   align-items: flex-start;
 }
-.Card6{
+
+.Card6 {
+  margin: 147rpx 0 0 40rpx;
+  font-size: 24rpx;
+  color: #FFFFFF;
+  text-shadow: 0 3rpx 0 rgba(0,0,0,0.50);
+}
+
+.Card7 {
   font-family: Roboto-Black;
-  font-size: 72rpx;
-  text-shadow: 0 3rpx 0 rgba(0,0,0,0.20);
+  font-size: 48rpx;
+  text-shadow: 0 3rpx 0 rgba(0, 0, 0, 0.20);
   margin: 0 0 0 40rpx;
 }
 
-.CardEnd{
+.CardEnd {
   background-image: linear-gradient(135deg, #88817B 0%, #202529 100%);
   display: inline-block;
   margin: 0 20rpx 0 0;
-  border-radius: 20rpx;  
-  width:240rpx;
-  height:435rpx;
+  border-radius: 20rpx;
+  width: 240rpx;
+  height: 435rpx;
   position: relative;
 }
 
-.CardEnd1{
-  width:240rpx;
-  height:435rpx;
+.CardEnd1 {
+  width: 240rpx;
+  height: 435rpx;
   position: absolute;
 }
 
-.icon_flag_1{
-  width:30rpx;
-  height:30rpx;
+.icon_flag_1 {
+  width: 30rpx;
+  height: 30rpx;
   margin-bottom: 20rpx;
 }
 
-.Card5{
+.Card5 {
   color: #FFFFFF;
-  text-shadow: 0 3rpx 0 rgba(0,0,0,0.50);
+  text-shadow: 0 3rpx 0 rgba(0, 0, 0, 0.50);
   font-size: 28rpx;
 }
 
-.panel2{
-  margin:45rpx 0 60rpx 0;
+.panel2 {
+  margin: 80rpx 0 0rpx 0;
   width: 100%;
 }
-.panel21{
+
+.panel21 {
   justify-content: flex-start;
   width: 100%;
 }
-.panel22{
+
+.panel22 {
   border-radius: 20rpx;
   background-color: #F2F2F2;
   margin-top: 30rpx;
-  width:710rpx;
+  width: 710rpx;
 }
-.panelWeeks{
+
+.panelWeeks {
   font-size: 20rpx;
   color: #787878;
   margin: 40rpx 0 30rpx 0;
 }
-.week{
+
+.week {
   font-size: 20rpx;
   color: #787878;
   margin: 0 28rpx 0 28rpx;
 }
 
-.panelDays{
+.panelDays {
   width: 690rpx;
   margin-left: 20rpx;
   flex-wrap: wrap;
   justify-content: flex-start;
   align-items: flex-start;
 }
-.day{
+
+.day {
   margin: 0 28rpx 0 28rpx;
   font-family: Roboto-Black;
-  color:#4D4D4D;
-  border-radius: 4rpx;
+  color: #4D4D4D;
+  border-radius: 8rpx;
   margin: 3rpx;
-  width:90rpx;
-  height:90rpx;
+  width: 90rpx;
+  height: 90rpx;
   position: relative;
 }
 
-.day0{
+.day0 {
   background: #FFFFFF;
   border: 6rpx solid #fff;
-  border-radius: 4rpx;
-  width:78rpx;
-  height:78rpx;
+  border-radius: 8rpx;
+  width: 78rpx;
+  height: 78rpx;
 }
 
-.img{
-  width:90rpx;
-  height:90rpx;
+.img {
+  width: 90rpx;
+  height: 90rpx;
   position: absolute;
-  border-radius: 4rpx;
+  border-radius: 8rpx;
 }
 
-.img2{
-  background-color: rgba(0,0,0,0.20);
-  border-radius: 4rpx;
+.img2 {
+  background-color: rgba(0, 0, 0, 0.20);
+  border-radius: 8rpx;
 }
 
-.text12{
+.text12 {
   font-size: 24rpx;
   color: #9B9B9B;
   text-align: center;
@@ -209,21 +237,21 @@
 }
 
 
-.panel2Line{
+.panel2Line {
   background: #BCBCBC;
   width: 650rpx;
-  height:1rpx;
+  height: 1rpx;
   margin: 40rpx 0 30rpx 0;
 }
 
-.panel2Line2{
+.panel2Line2 {
   background: #BCBCBC;
   width: 650rpx;
-  height:1rpx;
+  height: 1rpx;
   margin: 20rpx 0 30rpx 0;
 }
 
-.panel23{
+.panel23 {
   font-size: 24rpx;
   color: #4D4D4D;
   margin-bottom: 10rpx;
@@ -231,42 +259,43 @@
   align-self: flex-start;
 }
 
-.panel25{
-  width:100%;
+.panel25 {
+  width: 100%;
   align-items: flex-start;
   align-self: flex-start;
   justify-content: space-between;
 }
 
-.text13{
+.text13 {
   margin-left: 30rpx;
   font-size: 24rpx;
   color: #4D4D4D;
-  
+
 }
 
-.panel251{
+.panel251 {
   margin: 0 50rpx 0 0;
   justify-content: flex-start;
   align-items: flex-end;
 }
 
-.text3{
+.text3 {
   font-family: Roboto-Black;
   font-size: 64rpx;
   color: #4D4D4D;
   margin-top: -20rpx;
 
 }
-.text14{
+
+.text14 {
   font-size: 20rpx;
   color: #4D4D4D;
   margin: 0 0 15rpx 4rpx;
 }
 
-.panel26{
-  width:500rpx;
-  line-height:90rpx;
+.panel26 {
+  width: 500rpx;
+  line-height: 90rpx;
   background-color: #fff;
   border-radius: 20rpx;
   font-size: 36rpx;
@@ -275,34 +304,36 @@
   margin: 30rpx 0 60rpx 0;
 }
 
-.panel220{
+.panel220 {
   background-image: linear-gradient(180deg, #FBE8B0 0%, #FDE1AB 14%, #FED9A7 29%, #FFD2A3 43%, #FFCAA1 57%, #FFC3A0 71%, #FEBC9F 86%, #FCB59F 100%);
   border-radius: 20rpx;
   position: relative;
 }
-.panel221{
-  background: rgba(255,255,255,0.60);
+
+.panel221 {
+  background: rgba(255, 255, 255, 0.60);
   border-radius: 50%;
   width: 100rpx;
-  height:100rpx;
+  height: 100rpx;
   margin-top: 72rpx;
 }
-.qmjl_main_pic_1{
-  width:85rpx;
-  height:92rpx;
+
+.qmjl_main_pic_1 {
+  width: 85rpx;
+  height: 92rpx;
   position: absolute;
-  top:49rpx;
+  top: 49rpx;
 }
 
-.text4{
+.text4 {
   font-size: 32rpx;
-  color:#4D4D4D;
+  color: #4D4D4D;
   margin-top: 21rpx;
   text-align: center;
 }
 
 
-.text5{
+.text5 {
   font-family: Roboto-Black;
   font-size: 72rpx;
   color: #4D4D4D;
@@ -310,73 +341,205 @@
   margin: 0 10rpx;
 }
 
-.text6{
+.text6 {
   font-size: 20rpx;
   color: #4D4D4D;
   margin-top: 30rpx;
-  width:20rpx;
+  width: 20rpx;
 }
 
-.panel223{
+.panel223 {
   margin-top: 50rpx;
-  width:500rpx;
+  width: 500rpx;
   justify-content: space-between;
 }
 
-.text7{
+.text7 {
   font-family: Roboto-Black;
   font-size: 28rpx;
   color: #4D4D4D;
 }
 
-.panel224{
+.panel224 {
   background: #F0F0F0;
   border-radius: 8rpx;
-  width:500rpx;
+  width: 500rpx;
   justify-content: flex-start;
   margin-top: 10rpx;
-  height:16rpx;
+  height: 16rpx;
 }
 
-.panel2241{
+.panel2241 {
   background: #F38121;
   border-radius: 8rpx 0 0 8rpx;
-  height:16rpx;  
+  height: 16rpx;
 }
 
-.panel225{
+.panel225 {
   background: #FFFFFF;
   border-radius: 20rpx;
   font-size: 36rpx;
   color: #4D4D4D;
   text-align: center;
-  width:500rpx;
+  width: 500rpx;
   line-height: 90rpx;
   margin: 60rpx 0;
 }
 
 
-.text10{
+.text10 {
   font-size: 36rpx;
   color: #4D4D4D;
   margin: 100rpx 0 0 30rpx;
   align-self: flex-start;
 }
-.text11{
+
+.text11 {
   font-size: 24rpx;
   color: #4D4D4D;
   margin: 30rpx 0 0 30rpx;
   align-self: flex-start;
 }
 
-.panelHelpCommon_0{
+.panelHelpCommon_0 {
   position: fixed;
-  left:20rpx;
-  bottom:60rpx;
+  left: 20rpx;
+  bottom: 60rpx;
   margin: 0 0 0 0;
 }
 
-.panelHeight{
-  width:100%;
-  height:90rpx;
+.panelHeight {
+  width: 100%;
+  height: 90rpx;
+}
+
+.panelHeight2 {
+  width: 100%;
+  height: 60rpx;
+}
+
+.panel2200 {
+  position: relative;
+  justify-content: flex-start;
+  background-image: linear-gradient(180deg, #CFF4C8 0%, #DAF0C2 14%, #E4ECBE 29%, #ECE8BD 43%, #F3E4BD 57%, #F8E0BF 71%, #FBDDC3 86%, #FCDAC7 100%);
+}
+
+.qmjl_main_pic_2 {
+  width: 670rpx;
+  height: 360rpx;
+  margin-top: 30rpx;
+}
+
+.qmjl_main_pic_3 {
+  width: 116rpx;
+  height: 116rpx;
+  position: absolute;
+  left: 348rpx;
+  top: 385rpx;
+  z-index: 10;
+}
+
+.qmjl_main_pic_4 {
+  width: 147rpx;
+  height: 159rpx;
+  position: absolute;
+  right: 0rpx;
+  top: 342rpx;
+  z-index: 10;
+}
+
+
+.panel22001 {
+  width: 456rpx;
+  height: 16rpx;
+  margin-top: 120rpx;
+  background: #FFFFFF;
+  border-radius: 8rpx;
+  position: relative;
+}
+
+.panel220011 {
+  position: absolute;
+  left: 0;
+  height: 16rpx;
+  border-radius: 8rpx 0 0 8rpx;
+  background: #F38121;
+}
+
+.panel2200111 {
+  
+}
+
+.panel220012 {
+  width: 18rpx;
+  height: 18rpx;
+  background: #9B9B9B;
+  border: 6rpx solid #FFFFFF;
+  border-radius: 50%;
+  position: absolute;
+  top: -8rpx;
+  right: 0;
+}
+.panel220014 {
+  width: 30rpx;
+  height: 30rpx;
+  background: #F38121;
+  border-radius: 50%;
+  position: absolute;
+  top: -8rpx;
+  right: 0rpx;
+}
+
+.panel220013 {
+  right: 222rpx;
+}
+
+.panel22002 {
+  margin-top: 10rpx;
+  width: 456rpx;
+  justify-content: space-between;
+  align-items: flex-start;
+}
+
+.text15 {
+  font-size: 24rpx;
+  color: #4D4D4D;
+  margin-top: 10rpx;
+}
+
+.text16 {
+  font-family: Roboto-Black;
+  font-size: 64rpx;
+  color: #4D4D4D;
+  text-align: right;
+}
+
+.text17 {
+  font-size: 20rpx;
+  color: #4D4D4D;
+  text-align: right;
+  margin: 20rpx 0 0 4rpx;
+}
+
+.panel22003 {
+  background: #FFFFFF;
+  border-radius: 20rpx;
+  font-size: 36rpx;
+  color: #4D4D4D;
+  text-align: center;
+  width: 500rpx;
+  line-height: 90rpx;
+  margin-top: 30rpx;
+}
+
+.text18 {
+  font-weight: 400;
+  font-size: 20rpx;
+  color: #4D4D4D;
+  text-align: center;
+  margin: 30rpx 0 60rpx 0;
+}
+
+.text19 {
+  color: #5282FA;
 }

pages/share/shareitem.js

@@ -42,7 +42,7 @@ Page({
       IsBuildReportHistory: false,
     });
 
-    that.init(options.TaskID, options.Day, ishistory);
+    that.init(options.TaskID, ishistory);
 
   },
 
@@ -51,12 +51,16 @@ Page({
       innerAudioContext1.stop();
     }
   },
-  init: function (taskid, day, isHistory) {
+  init: function (taskid, isHistory) {
     var that = this;
-
+    wx.showLoading({
+      title: '读取中',
+    });
     var url = 'GetShareItemInfo?IsHistory=' + isHistory + '&UserID=' + app.globalData.userInfo.UserID + "&TaskID=" + taskid;
     main.getData(url, function (data) {
-      data.Day = day;
+      wx.hideLoading();
+      if (!data.MilestoneDayNumber && !that.data.IsHistory && data.Remark)
+        data.Remark=data.Remark.split("\n");
       that.setData({
         Info: data,
       });
@@ -155,9 +159,16 @@ Page({
       _uid = common.ReplaceAllString(_uid, "/", "___");
     var url4 = app.globalData.uploadImageUrl + "MiaoguoUser" + _uid + ".png";
 
-    main.DownloadFile(url1, function (tempFilePath1) {
-      main.DownloadFile(url3, function (tempFilePath3) {
-        main.DownloadFile(url4, function (tempFilePath4) {
+    wx.showLoading({
+      title: '生成中',
+    });
+    setTimeout(function () {
+      wx.hideLoading();
+    }, 20000);
+
+    main.DownloadFile(url1,0,function (tempFilePath1) {
+      main.DownloadFile(url3,0,function (tempFilePath3) {
+        main.DownloadFile(url4,0,function (tempFilePath4) {
           const query = wx.createSelectorQuery();
           query.select('#shareCanvas')
             .fields({
@@ -215,6 +226,9 @@ Page({
                   ctx.fillText(that.data.Info.Content[i], 50, 917+i*30);
                 
                 main.BuildImage(700, 1050, canvas, function () {
+                  
+                  wx.hideLoading();
+
                   main.getData("ShareMiaoguoTask?UserID=" + app.globalData.userInfo.UserID, function (data) {
                     that.setData({
                       IsBuildReport: false,
@@ -244,10 +258,17 @@ Page({
       _uid = common.ReplaceAllString(_uid, "/", "___");
     var url4 = app.globalData.uploadImageUrl + "MiaoguoUser" + _uid + ".png";
 
-    main.DownloadFile(url1, function (tempFilePath1) {
-      main.DownloadFile(url2, function (tempFilePath2) {
-        main.DownloadFile(url3, function (tempFilePath3) {
-          main.DownloadFile(url4, function (tempFilePath4) {
+    wx.showLoading({
+      title: '生成中',
+    });
+    setTimeout(function () {
+      wx.hideLoading();
+    }, 20000);
+
+    main.DownloadFile(url1,0,function (tempFilePath1) {
+      main.DownloadFile(url2,0,function (tempFilePath2) {
+        main.DownloadFile(url3,0,function (tempFilePath3) {
+          main.DownloadFile(url4,0,function (tempFilePath4) {
             const query = wx.createSelectorQuery();
             query.select('#shareCanvas')
               .fields({
@@ -323,7 +344,7 @@ Page({
                 ctx.fillText(that.data.Info.CreateTimeStr1, 30, 823);
 
                 ctx.font = "normal 500 96px Roboto-Black";
-                ctx.fillText(that.data.Info.Day, 30, 994);
+                ctx.fillText(that.data.Info.DayNumber, 30, 994);
 
                 ctx.font = "normal 500 36px Roboto-Black";
                 ctx.fillText(that.data.Info.CardTaskTotal, 266, 974);
@@ -332,6 +353,9 @@ Page({
                 ctx.fillText(that.data.Info.DurationTotal, 370, 974);
 
                 main.BuildImage(700, 1050, canvas, function () {
+                  
+                  wx.hideLoading();
+
                   main.getData("ShareMiaoguoTask?UserID=" + app.globalData.userInfo.UserID, function (data) {
                     that.setData({
                       IsBuildReport: false,
@@ -356,13 +380,20 @@ Page({
 
     var date = that.data.Info.CreateTimeStr1
     var todayTime = that.data.Info.DurationMinute;
-    var dayNumber = that.data.Info.Day;
+    var dayNumber = that.data.Info.HardworkingNumber;
 
     var avatarUrl = app.globalData.userInfo.AvatarUrl;
     avatarUrl = avatarUrl.substring(0, avatarUrl.lastIndexOf("/") + 1);
     avatarUrl = avatarUrl + "0";
 
-    main.DownloadFile(avatarUrl, function (tempFilePath) {
+    wx.showLoading({
+      title: '生成中',
+    });
+    setTimeout(function () {
+      wx.hideLoading();
+    }, 20000);
+
+    main.DownloadFile(avatarUrl,0,function (tempFilePath) {
       const query = wx.createSelectorQuery();
       query.select('#shareCanvasHistory')
         .fields({
@@ -426,12 +457,13 @@ Page({
 
 
               ctx.font = "normal 500 20px caption";
-              ctx.fillText("迄今已练习", 390, 295);
+              ctx.fillText("迄今已接力", 390, 295);
 
               ctx.font = "normal 500 32px caption";
-              ctx.fillText(dayNumber + "天", 390, 333);
+              ctx.fillText(dayNumber + "次", 390, 333);
 
               main.BuildImage(600, 360, canvas, function () {
+                wx.hideLoading();
                 that.setData({
                   IsBuildReportHistory: false,
                 });

pages/share/shareitem.wxml

@@ -3,14 +3,15 @@
     <view class="panel1 FlexRow">
       <view class="panel11 FlexColumn">
         <view class="panel111 FlexRow">
-          <view class="text1">{{Info.Day}}</view>
-          <view class="text2">th</view>
+          <view class="text1">{{Info.HardworkingNumber}}</view>
+          <view class="text2">{{Info.OrdinalPostfix}}</view>
         </view>
         <view class="text3">RELAY</view>
       </view>
       <view class="line1"></view>
       <view class="panel12 FlexColumn">
         <text class="text4">{{Info.CreateTimeStr2}}</text>
+        <text class="text41">第{{Info.HardworkingNumber}}次接力 第{{Info.DayNumber}}天练习</text>
         <text class="text5">复习之后小歇片刻，名言美景沁人心脾</text>
       </view>
     </view>
@@ -26,7 +27,9 @@
     <view class="text11">{{Info.Title}}</view>
     <view class="text12">{{Info.BirthAndDeath}}</view>
     <image class="panelImage1" lazy-load="true" mode="widthFix" src="{{Info.AuthorImage}}"></image>
-    <text class="text13">{{Info.Remark}}</text>
+    <view class="text13 FlexColumn">
+      <text class="text131" wx:key="*this" wx:for="{{Info.Remark}}">{{item}}</text>
+    </view>
 
     <view class="panelFooter{{IPhoneX}} panelFooter FlexRow">
       <view class="panelFooter1 FlexRow" bindtap="playSound">
@@ -44,7 +47,7 @@
 
   <block wx:if="{{!IsHistory && Info.MilestoneDayNumber}}">
     
-    <view class="panelMilestone FlexColumn" style="{{Info.Color}}">
+    <view class="panelMilestone FlexColumn" style="height:{{Containnerheight-120}}rpx;{{Info.Color}}">
       <view class="panelMilestoneText1">祝贺您</view>
       <view class="panelMilestoneText2 panelMilestoneText1">获得里程碑</view>
       <view class="panelMilestoneText3">{{Info.Name[0]}}</view>
@@ -74,14 +77,15 @@
         <view class="text21">勤勉接力</view>
         <view class="text22">见证成长</view>
         <view class="text23 FlexRow">{{Info.DurationMinute}}<text class="text24">分钟</text></view>
-        <view class="text25">迄今已练习</view>
-        <view class="text26">{{Info.Day}}天</view>
+        <view class="text25">迄今已接力</view>
+        <view class="text26">{{Info.HardworkingNumber}}次</view>
       </view>
     </view>
 
-    <text class="text19">这是勤勉接力老版本的图片格式，给您留作纪念。如果左侧头像不能正常显示，请前往手册栏目，点击顶部用户头像，然后重新授权用户信息，刷新后即可解决。
-      感谢您在秒过最初的三年里坚持接力。欢迎继续使用新版勤勉接力。内容更丰富，画面更精美。</text>
-
+    <view class="text19 FlexColumn">
+      <text class="text131">这是勤勉接力老版本的图片格式，给您留作纪念。如果左侧头像不能正常显示，请前往手册栏目，点击顶部用户头像，然后重新授权用户信息，刷新后即可解决。</text>
+      <text class="text131"> 感谢您在秒过最初的三年里坚持接力。欢迎继续使用新版勤勉接力。内容更丰富，画面更精美。</text>
+      </view>
     <view class="panelHelpCommon FlexRow" bindtap="showHelpImage">
       <view class="panelHelpCommon1 FlexRow">
         <view class="panelHelpCommon11 FlexRow">

pages/share/shareitem.wxss

@@ -6,13 +6,12 @@
 .panel1 {
   width: 100%;
   justify-content: flex-start;
-  margin: 30rpx 0;
+  margin: 30rpx 0 60rpx 0;
   align-items: flex-start;
 }
 
 .panel11 {
   align-items: flex-start;
-  width: 201rpx;
   margin-left: 50rpx;
   justify-content: flex-start;
 }
@@ -29,7 +28,7 @@
 .text2 {
   font-family: Roboto-Black;
   font-size: 24rpx;
-  margin-top: 30rpx;
+  margin: 30rpx 30rpx 0 0;
 }
 
 .text3 {
@@ -40,7 +39,7 @@
 .line1 {
   background: #4D4D4D;
   width: 8rpx;
-  height: 130rpx;
+  height: 150rpx;
   margin: 0 30rpx 0 0;
 }
 
@@ -52,7 +51,11 @@
 
 .text4 {
   font-size: 24rpx;
-  margin-bottom: 10rpx;
+}
+
+.text41 {
+  font-size: 24rpx;
+  margin-bottom: 20rpx;
 }
 
 .text5 {
@@ -84,7 +87,6 @@
 
 .text8 {
   width: 590rpx;
-  height: 200rpx;
   font-size: 48rpx;
 }
 
@@ -120,13 +122,18 @@
 }
 
 .text13 {
+  align-items: flex-start;
+  width: 650rpx;
+  margin: 60rpx 0 190rpx 0;
+}
+
+.text131 {
   font-size: 24rpx;
   color: #1E1E1E;
   letter-spacing: 1.6rpx;
   line-height: 48rpx;
   font-weight: 400;
-  width: 650rpx;
-  margin: 60rpx 0 190rpx 0;
+  margin-bottom: 24rpx;
 }
 
 .panelFooter {
@@ -264,7 +271,6 @@
 
 .panelMilestone {
   width: 100%;
-  height: 1075rpx;
   justify-content: flex-start;
   align-items: flex-start;
   position: fixed;

pages/share/sharewall.json

@@ -2,5 +2,6 @@
   "navigationBarBackgroundColor": "#2E2E2E",
   "navigationBarTextStyle": "white",
   "backgroundColorTop":"#2E2E2E",
+  "backgroundColorBottom":"#2E2E2E",
   "navigationBarTitleText": "接力墙"
 }

pages/share/sharewall.wxml

@@ -15,14 +15,19 @@
   </view>
 
   <view class="panel2 FlexRow">
-    <view class="panelImage{{item.IsMilestone}} panelImage FlexColumn" 
-    style="border-color:{{item.Color1}};background-color: {{item.Color2}};" 
+    <view class="panelImage FlexColumn" 
+    style="background-color: {{item.Color2}};" 
     wx:for="{{Info.List}}" wx:key="*this" bindtap="gotoDetail" data-id="{{item.ID}}" data-image="{{item.Image}}" data-day="{{item.DayNumber}}" data-ismilestone="{{item.IsMilestone}}">
       <image wx:if="{{!item.IsMilestone && item.Image}}" class="img" lazy-load="true" src="{{item.Image}}"></image>
-      <view class="img2 img" wx:if="{{!item.IsMilestone}}" ></view>
-      <view class="text5" wx:if="{{!item.IsMilestone}}">{{item.DayNumber}}th</view>
-      <image wx:if="{{item.IsMilestone}}" class="icon_relay_1" src="../images/icon_relay_1.png"></image>
-      <text class="text4" wx:if="{{item.IsMilestone}}">{{item.Name}}</text>
+      <view class="img2 img"></view>
+      <view class="text5">{{item.HardworkingNumber}}{{item.OrdinalPostfix}}</view>
+      
+      <view class="panel21 FlexColumn" wx:if="{{item.IsMilestone}}" >
+        <image class="icon_relay_1" src="../images/icon_relay_1.png"></image>
+        <view class="text6">里程碑</view>
+        <view class="text4">{{item.Name}}</view>
+      </view>
+    
     </view>
   </view>
 </view>

pages/share/sharewall.wxss

@@ -1,3 +1,4 @@
+
 .container {
   background-color: #2E2E2E;
   color: #fff;
@@ -92,15 +93,9 @@
   margin: 0 1rpx 1rpx 0;
 }
 
-.panelImage1 {
-  width:209rpx;
-  height:145rpx;
-  border: 20rpx solid #2E2E2E;
-}
-
 .panelImage .img{
-  width:250rpx;
-  height:186rpx;
+  width:249rpx;
+  height:185rpx;
   position: absolute;
   top:0;
   left:0;
@@ -110,25 +105,36 @@
 .panelImage .img2{
   background-color: rgba(0,0,0,0.20);
 }
+.text5{
+  font-family: Roboto-Black;
+  font-size: 24rpx;
+  color: #D2D2D2;
+  position: absolute;
+  left:20rpx;
+  bottom:20rpx;
+}
+
+.panel21{
+  position: absolute;
+  right:20rpx;
+  bottom:20rpx;
+  align-items: flex-end;
+}
 
 .icon_relay_1{
   width:30rpx;
   height:30rpx;
-  margin-bottom: 20rpx;
+}
+
+.text6{
+  font-size: 20rpx;
+  color: #D2D2D2;
+  text-align: right;
 }
 
 .text4{
   font-family: Roboto-Black;
   font-size: 24rpx;
-  text-align: center;
-  z-index: 10;
+  text-align: right;
   color:#D2D2D2;
-}
-.text5{
-  font-family: Roboto-Black;
-  font-size: 24rpx;
-  color: #D2D2D2;
-  position: absolute;
-  left:20rpx;
-  bottom:20rpx;
-}
+}

utils/constant.js

@@ -1,31 +1,4 @@
 module.exports = {
-  arrSoundError:[
-    {
-      Word: "藤蔓",
-      Sound: "藤蔓(wan4)",
-    }, {
-      Word: "呲牙",
-      Sound: "呲(ci1)牙",
-    }, {
-      Word: "呢(ne)",
-      Sound: "呢",
-    }, {
-      Word: "卑劣",
-      Sound: "卑(liè)",
-    }, {
-      Word: "刚才",
-      Sound: "(gāng)(cái)",
-    },{
-      Word: "吐蕃",
-      Sound: "(tǔ)(bō)",
-    },{
-      Word: "游说",
-      Sound: "(yóu)(shuì)",
-    },{
-      Word: "lan=en&text=Mr&",
-      Sound: "lan=en&text=Mister&",
-    },
-  ],
   arrMenuText: [{
       Text1: "更换练习模式吗？",
       Text2: "恭喜您，制作了第一张紧急练习题卡。\n要练习这张题卡必须更改当前练习模式，现在就更换吗？",

utils/main.js

@@ -1239,6 +1239,16 @@ function getHanzi(callback) {
   });
 }
 
+function getServerSoundErrorArr(){
+  var time = wx.getStorageSync("SoundErrorUpdateTime");
+  getData('GetSoundErrorArr?UpdateTime=' + time, function (data) {
+    if (data && data.List) {
+      wx.setStorageSync("SoundErrorArr", data.List);
+      wx.setStorageSync("SoundErrorUpdateTime", data.UpdateTime);
+    } 
+  });
+}
+
 function getEnglish(callback) {
   var that = this;
   wx.showLoading({
@@ -1568,14 +1578,16 @@ function downloadBishunKaitiImage(url, serverUrl, dataType, Fields, callback) {
 }
 
 function GetSoundError(str) {
-  var arr = constant.arrSoundError;
   var result = str;
-  for (var i = 0; i < arr.length; i++) {
-    if (str.indexOf(arr[i].Word) > 0) {
-      result = common.ReplaceAllString(str, arr[i].Word, arr[i].Sound);
-      break;
-    } else if (str == arr[i].Word) {
-      result = arr[i].Sound;
+  var arr = wx.getStorageSync('SoundErrorArr');
+  if (arr && arr.length>0){
+    for (var i = 0; i < arr.length; i++) {
+      if (str.indexOf(arr[i].Word) > 0) {
+        result = common.ReplaceAllString(str, arr[i].Word, arr[i].Sound);
+        break;
+      } else if (str == arr[i].Word) {
+        result = arr[i].Sound;
+      }
     }
   }
   return result;
@@ -1787,14 +1799,15 @@ function resetTodayTask(){
 }
 
 //下载图片
-function downloadFile(url,callback){
-  wx.showLoading({
-    title: '下载中',
-  });
-  setTimeout(function () {
-    wx.hideLoading();
-  }, 5000);
-  
+function downloadFile(url,isShowLoading,callback){
+  if (isShowLoading){
+    wx.showLoading({
+      title: '下载中',
+    });
+    setTimeout(function () {
+      wx.hideLoading();
+    }, 5000);
+  }
   wx.downloadFile({
     url: url,
     success(resDownload) {
@@ -1807,10 +1820,12 @@ function downloadFile(url,callback){
           title: '图片不存在',
         });
       }
-      wx.hideLoading();
+      if (isShowLoading)
+        wx.hideLoading();
     },
     fail: function (e) {
-      wx.hideLoading();
+      if (isShowLoading)
+        wx.hideLoading();
       wx.showToast({
         title: '下载失败',
       });
@@ -1908,5 +1923,6 @@ module.exports = {
   ResetTodayTask:resetTodayTask,
   DownloadFile:downloadFile,
   BuildImage:buildImage,
-  ShowHelpImage:showHelpImage
+  ShowHelpImage:showHelpImage,
+  getServerSoundErrorArr:getServerSoundErrorArr,
 }