2.3.0

app.json

@@ -1,6 +1,14 @@
 {
   "pages": [
+
     "pages/index/index",
+
+    "pages/share/cardlist",
+    
+    "pages/share/shareitem",
+    "pages/share/shareindex",
+    "pages/share/sharewall",
+    "pages/share/milestone",
     "pages/main/health",
     "pages/main/folderEdit",
     "pages/main/folderIcon",
@@ -17,12 +25,6 @@
     "pages/index/accredit",
     "pages/other/openSetting",
 
-    "pages/test/index",
-    "pages/test/list",
-    "pages/test/item",
-    "pages/test/wordlist",
-    "pages/test/report",
-
     "pages/main/default",
     "pages/main/cardInfo",
     "pages/main/cardInfoDetail",
@@ -91,6 +93,16 @@
         "marketing/award",
         "marketing/index"
       ]
+    },
+    {
+      "root": "pages_test",
+      "pages": [
+        "test/index",
+        "test/list",
+        "test/item",
+        "test/wordlist",
+        "test/report"
+      ]
     }
   ],
   "preloadRule": {
@@ -99,6 +111,12 @@
       "packages": [
         "pages_agent"
       ]
+    },
+    "pages_test/test/index": {
+      "network": "all",
+      "packages": [
+        "pages_test"
+      ]
     }
   },
   "requiredBackgroundModes": [

app.wxss

@@ -108,6 +108,53 @@
   border-bottom-right-radius: 20rpx;
 }
 
+/* 帮助*************** */
+
+.panelHelpCommon{
+  background-image: linear-gradient(180deg, #CAEDFD 0%, #C1E8FC 14%, #B9E3FB 29%, #B2DDFB 43%, #ABD8FA 57%, #A5D2F9 71%, #A0CCF8 86%, #9CC6F7 100%);
+  border-radius: 20rpx;
+  width:710rpx;
+  height:130rpx;
+  justify-content: space-between;
+}
+
+.panelHelpCommon11{
+  width:70rpx;
+  background: #FFFFFF;
+  border-radius: 50%;
+  height:70rpx;
+  margin-left: 30rpx;
+}
+
+
+.panelHelpCommonIcon{
+  width:22rpx;
+  height:30rpx;
+}
+
+.panelHelpCommon12{
+  align-items: flex-start;
+  margin-left: 30rpx;
+}
+
+.panelHelpCommonText1{
+  opacity: 0.9;
+  font-size: 22rpx;
+  color: #12457C;
+}
+
+.panelHelpCommonText2{
+  opacity: 0.9;
+  font-size: 28rpx;
+  color: #12457C;
+}
+
+.panelHelpCommonNextPage{
+  width:16rpx;
+  height:26rpx;
+  margin-right: 30rpx;
+}
+/* ******** */
 
 @font-face {
     font-family: 'Roboto-Black';

pages/index/index.js

@@ -259,11 +259,11 @@ Page({
           wx.removeStorageSync("UserName");
 
           // //测试****************
-          // var url = '../other/newuser';
-          // wx.redirectTo({
-          //   url: url,
-          // });
-          // return;
+          var url = '../share/shareindex';
+          wx.redirectTo({
+            url: url,
+          });
+          return;
           // //测试****************
 
           if (that.data.gotoType == "share") {

pages/index/test.wxss

@@ -25,6 +25,6 @@ view, text {
  .navbar-wrap .column.fixed {
   position: fixed;
 
-  border-bottom: solid 1px #1e1e1e;
+  border-bottom: solid 1rpx #1e1e1e;
  }
   

pages/main/cardmain.js

@@ -7,7 +7,7 @@ Page({
   data: {
     ImagePath: app.globalData.uploadImageUrl,
     IsIPhoneX: app.globalData.IsIPhoneX,
-    IsYearReport:true,
+    IsYearReport:false,
     IsShowOrder:false,
     IsIPad:app.globalData.IsIPad,
   },
@@ -22,11 +22,11 @@ Page({
 
     var year=new Date(app.globalData.userInfo.CreateTime).getFullYear();
     //console.log(year);
-    if (new Date().getFullYear()>=2021 && year<2020){
-      that.setData({
-        IsYearReport: true,
-      });
-    }
+    // if (new Date().getFullYear()>=2021 && year<2020){
+    //   that.setData({
+    //     IsYearReport: true,
+    //   });
+    // }
    
   },
   onPullDownRefresh: function () {

pages/main/cardmain.wxml

@@ -68,10 +68,17 @@
       <image class="zhishijianyan_70x75" src='../images/wangzhan_70x75.png' />
     </view>
   </view>
+  <!-- 年度报告 -->
   <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="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="panelItem6 FlexRow" wx:if="{{FolderArr}}">
     <view class="panelItem61 FlexColumn">
       <view>题卡卡单</view>
@@ -115,19 +122,19 @@
 
   <view class='panelBottom FlexColumn' catchtap="">
     <view class='panelBottom1 FlexRow'>
-      <view class='panelBottom11 FlexColumn' catchtap="gotoReLaunch" data-url="../test/index">
+      <view class='panelBottom11 FlexColumn' catchtap="gotoReLaunch" data-url="../../pages_test/test/index">
         <view>检验</view>
       </view>
-      <view class='panelBottom11 FlexColumn' catchtap="gotoReLaunch" data-url="../main/default">
+      <view class='panelBottom11 FlexColumn' catchtap="gotoReLaunch" data-url="../../pages/main/default">
         <view>练习</view>
       </view>
-      <view class='panelBottom11 FlexColumn' catchtap="goto" data-url="../main/add?type=add&id=0">
+      <view class='panelBottom11 FlexColumn' catchtap="goto" data-url="../../pages/main/add?type=add&id=0">
         <image class="tabbar_add_red_70x70" src='../images/tabbar_add_red_70x70.png' />
       </view>
       <view class='panelBottom11 FlexColumn'>
         <view class='text5'>题卡</view>
       </view>
-      <view class='panelBottom11 FlexColumn' catchtap="goto" data-url="../other/userbook">
+      <view class='panelBottom11 FlexColumn' catchtap="goto" data-url="../../pages/other/userbook">
         <view>手册</view>
       </view>
     </view>

pages/main/cardmain.wxss

@@ -1,4 +1,4 @@
-.panel{
+.panel {
   width: 100%;
 }
 
@@ -34,232 +34,250 @@
   background-color: #fff;
   margin: 30rpx 0;
 }
+
 .panelTemp1 {
   margin-left: 30rpx;
   justify-content: flex-start;
   font-weight: 400;
-  font-size:28rpx;
-  height:140rpx;
+  font-size: 28rpx;
+  height: 140rpx;
 }
-.avatar{
-  width:80rpx;
-  height:80rpx;
+
+.avatar {
+  width: 80rpx;
+  height: 80rpx;
   background-color: #D8D8D8;
   border-radius: 10rpx;
 }
-.text6{
-  font-size:28rpx;
+
+.text6 {
+  font-size: 28rpx;
   margin-left: 20rpx;
 }
 
 /* 中部样式************************* */
-.panelItem2{
-  width:100%;
+.panelItem2 {
+  width: 100%;
   background-color: #fff;
 }
-.panelItem21{
-  width:172rpx;
-  height:180rpx;
-  font-size:28rpx;
-  color:#1e1e1e;
+
+.panelItem21 {
+  width: 172rpx;
+  height: 180rpx;
+  font-size: 28rpx;
+  color: #1e1e1e;
 }
-.tabbar_allcards_56x50{
-  width:56rpx;
-  height:50rpx;
+
+.tabbar_allcards_56x50 {
+  width: 56rpx;
+  height: 50rpx;
   margin-bottom: 10rpx;
 }
-.panelItem3{
+
+.panelItem3 {
   margin-top: 30rpx;
 }
-.panelItem31{
-  width:355rpx;
-  height:190rpx;
+
+.panelItem31 {
+  width: 355rpx;
+  height: 190rpx;
   background-color: #fff;
   border-top-left-radius: 20rpx;
   border-bottom-left-radius: 20rpx;
   justify-content: space-between;
 }
-.panelItem32{
-  width:355rpx;
-  height:190rpx;
+
+.panelItem32 {
+  width: 355rpx;
+  height: 190rpx;
   background-color: #fff;
   border-top-right-radius: 20rpx;
   border-bottom-right-radius: 20rpx;
   justify-content: space-between;
 }
 
-.panelItem311{
+.panelItem311 {
   align-items: flex-start;
-  font-size:32rpx;
-  color:#1e1e1e;
+  font-size: 32rpx;
+  color: #1e1e1e;
   margin-left: 40rpx;
 }
-.panelItem3111{
+
+.panelItem3111 {
   font-family: 'Roboto-Black';
-  font-size:36rpx;
+  font-size: 36rpx;
 }
-.richang_80x90{
-  width:80rpx;
-  height:90rpx;
+
+.richang_80x90 {
+  width: 80rpx;
+  height: 90rpx;
   margin-right: 30rpx;
 }
 
-.panelItem41{
-  width:345rpx;
-  height:180rpx;
+.panelItem41 {
+  width: 345rpx;
+  height: 180rpx;
   background-color: #fff;
   border-radius: 20rpx;
-  margin:0 10rpx;
+  margin: 0 10rpx;
   justify-content: space-between;
 }
-.panelItem411{
-  font-size:20rpx;
-  color:#4D4D4D;
-  margin-top:4rpx;
+
+.panelItem411 {
+  font-size: 20rpx;
+  color: #4D4D4D;
+  margin-top: 4rpx;
 }
 
-.panelItem5{
-  width:710rpx;
-  height:105rpx;
+.panelItem5 {
+  width: 710rpx;
+  height: 105rpx;
   background-color: #fff;
   border-radius: 20rpx;
   justify-content: space-between;
   margin: 30rpx 0 0 0;
 }
 
-.panelItem51{
-  color:#1E1E1E;
-  font-size:32rpx;
+.panelItem51 {
+  color: #1E1E1E;
+  font-size: 32rpx;
   margin-left: 40rpx;
 }
-.panelItem511{
-  color:#4d4d4d;
-  font-size:20rpx;
+
+.panelItem511 {
+  color: #4d4d4d;
+  font-size: 20rpx;
   margin-left: 30rpx;
 }
-.zhishijianyan_70x75{
-  width:70rpx;
-  height:76rpx;
+
+.zhishijianyan_70x75 {
+  width: 70rpx;
+  height: 76rpx;
   margin-right: 30rpx;
 }
 
-.report_2021-banner{
-  width:710rpx;
-  height:180rpx;
+.report_2021-banner {
+  width: 710rpx;
+  height: 180rpx;
   margin: 30rpx 0 0 0;
 }
 
-
-.panelItem6{
-  width:100%;
+.panelItem6 {
+  width: 100%;
   background-color: #fff;
   justify-content: space-between;
   margin: 30rpx 0 0 0;
-  color:#4d4d4d;
+  color: #4d4d4d;
 }
 
-.panelItem61{
-  color:#1E1E1E;
-  font-size:32rpx;
+.panelItem61 {
+  color: #1E1E1E;
+  font-size: 32rpx;
   margin: 60rpx 0 0 30rpx;
   align-items: flex-start;
 }
 
-.panelItem611{
-  font-size:20rpx;
+.panelItem611 {
+  font-size: 20rpx;
   margin: 4rpx 0 10rpx 0;
 }
 
 
-.panelItem62{
+.panelItem62 {
   margin: 60rpx 30rpx 0 0;
 }
 
-.panelItem621{
-  width:80rpx;
-  height:80rpx;
+.panelItem621 {
+  width: 80rpx;
+  height: 80rpx;
   margin: 0 0 0 10rpx;
 }
 
-.universalpic_add_black_34x34{
-  width:34rpx;
-  height:34rpx;
+.universalpic_add_black_34x34 {
+  width: 34rpx;
+  height: 34rpx;
   margin-bottom: 10rpx;
 }
-.universalpic_add_black_22x22{
-  width:22rpx;
-  height:22rpx;
+
+.universalpic_add_black_22x22 {
+  width: 22rpx;
+  height: 22rpx;
 }
 
-.universalpic_arrow_updown_black_26x22{
-  width:26rpx;
-  height:22rpx;
+.universalpic_arrow_updown_black_26x22 {
+  width: 26rpx;
+  height: 22rpx;
 }
 
-.panelItem7{
-  width:100%;
+.panelItem7 {
+  width: 100%;
   justify-content: flex-start;
   align-items: flex-start;
   flex-wrap: wrap;
   background-color: #fff;
 }
 
-.panelFolder{
-  width:345rpx;
-  height:210rpx;
+.panelFolder {
+  width: 345rpx;
+  height: 210rpx;
   border-radius: 10rpx;
-  margin:20rpx 0 0 20rpx;
+  margin: 20rpx 0 0 20rpx;
 }
-.universalpic_add_black_34x34{
-  width:34rpx;
-  height:34rpx;
+
+.universalpic_add_black_34x34 {
+  width: 34rpx;
+  height: 34rpx;
 }
 
-.panelFolder0{
-  width:341rpx;
-  height:388rpx;
+.panelFolder0 {
+  width: 341rpx;
+  height: 388rpx;
   background-color: #F8F8F8;
   justify-content: flex-start;
 }
 
-.panelFolder1{
-  width:100%;
-  height:210rpx;
+.panelFolder1 {
+  width: 100%;
+  height: 210rpx;
   background-color: #6B727C;
   border-top-left-radius: 10rpx;
   border-top-right-radius: 10rpx;
 }
-.panelFolder2{
-  border:2rpx solid #e3e3e3;
+
+.panelFolder2 {
+  border: 2rpx solid #e3e3e3;
 }
-.panelItem72{
+
+.panelItem72 {
   width: 305rpx;
-  height:80rpx;
-  margin-top:30rpx;
-  font-size:28rpx;
+  height: 80rpx;
+  margin-top: 30rpx;
+  font-size: 28rpx;
   font-weight: 400;
   overflow: hidden;
 }
-.panelItem73{
-  width:100%;
+
+.panelItem73 {
+  width: 100%;
   justify-content: flex-end;
-  margin:10rpx 0 30rpx 0;
+  margin: 10rpx 0 30rpx 0;
   align-content: flex-end;
 }
-.universalpic_card_gray_22x22{
-  width:22rpx;
-  height:22rpx;
-  margin-right:10rpx;
+
+.universalpic_card_gray_22x22 {
+  width: 22rpx;
+  height: 22rpx;
+  margin-right: 10rpx;
 }
 
-.panelItem731{
+.panelItem731 {
   font-family: 'Roboto-Black';
-  font-size:24rpx;
-  color:#787878;
-  margin-right:20rpx;
+  font-size: 24rpx;
+  color: #787878;
+  margin-right: 20rpx;
 }
 
-.panelHeight160{
+.panelHeight160 {
   width: 100%;
   height: 160rpx;
   background-color: #fff;
@@ -271,49 +289,55 @@
   bottom: 0;
   width: 100%;
 }
+
 .panelBottom1 {
   width: 100%;
   background-color: #fff;
-  border-top:1rpx solid #d2d2d2;
+  border-top: 1rpx solid #d2d2d2;
 }
 
 .panelBottom11 {
-  color:#9B9B9B;
-  height:98rpx;
-  width:150rpx;
-  font-size:36rpx;
+  color: #9B9B9B;
+  height: 98rpx;
+  width: 150rpx;
+  font-size: 36rpx;
 }
 
 .panelBottom12 {
-  color:#9B9B9B;
-  height:98rpx;
-  width:300rpx;
-  font-size:36rpx;
+  color: #9B9B9B;
+  height: 98rpx;
+  width: 300rpx;
+  font-size: 36rpx;
 }
 
-.text5{
-  color:#1e1e1e;
+.text5 {
+  color: #1e1e1e;
 }
-.text51{
-  width:220rpx;
+
+.text51 {
+  width: 220rpx;
   text-align: right;
 }
-.universalpic_indicator_right_gray{
-  width:16rpx;
-  height:26rpx;
+
+.universalpic_indicator_right_gray {
+  width: 16rpx;
+  height: 26rpx;
   margin-left: 30rpx;
-  margin-right:30rpx;
+  margin-right: 30rpx;
 }
-.universalpic_fav_default_gray_26x24{
-  width:26rpx;
-  height:24rpx;
+
+.universalpic_fav_default_gray_26x24 {
+  width: 26rpx;
+  height: 24rpx;
   margin-right: 20rpx;
 }
-.iphone10plus{
-  width:100%;
-  height:30rpx;
+
+.iphone10plus {
+  width: 100%;
+  height: 30rpx;
   background-color: #fff;
 }
+
 .tabbar_add_red_70x70 {
   width: 70rpx;
   height: 70rpx;
@@ -321,123 +345,156 @@
 
 /* *********************** */
 
-.HelpContainer{
-  background-color:rgba(0,0,0,0.16);
+.HelpContainer {
+  background-color: rgba(0, 0, 0, 0.16);
   position: fixed;
-  top:0;
+  top: 0;
   z-index: 100;
 }
 
-.HelpContainer .HelpPanel1{
+.HelpContainer .HelpPanel1 {
   position: fixed;
-  width:100%;
-  bottom:0;
+  width: 100%;
+  bottom: 0;
   background-color: #F8F8F8;
-  border-top:1rpx solid #b6b6b6;
+  border-top: 1rpx solid #b6b6b6;
 }
 
-.HelpContainer .HelpPanel11{
-  width:100%;
+.HelpContainer .HelpPanel11 {
+  width: 100%;
   height: 100rpx;
   justify-content: space-between;
-  border-bottom:1rpx solid #d2d2d2;
+  border-bottom: 1rpx solid #d2d2d2;
 }
 
-.HelpContainer .HelpPanel111{
-  width:80rpx;
-  height:80rpx;
+.HelpContainer .HelpPanel111 {
+  width: 80rpx;
+  height: 80rpx;
   margin-left: 20rpx;
 }
 
-.universalpic_close_black_24x24{
-  width:24rpx;
-  height:24rpx;
+.universalpic_close_black_24x24 {
+  width: 24rpx;
+  height: 24rpx;
 }
 
 /* ************************** */
 
-.PanelOrder{
+.PanelOrder {
   width: 100%;
   background-color: #F8F8F8;
 }
 
-.PanelOrder1{
+.PanelOrder1 {
   width: 100%;
   justify-content: flex-start;
-  color:#4D4D4D;
+  color: #4D4D4D;
 }
 
-.PanelOrder11{
+.PanelOrder11 {
   font-size: 32rpx;
   margin: 60rpx 0 0 30rpx;
 }
 
-.PanelOrder2{
+.PanelOrder2 {
   width: 100%;
 }
 
-.PanelOrderBtn{
+.PanelOrderBtn {
   border-radius: 10rpx;
-  height:80rpx;
-  line-height:80rpx;
+  height: 80rpx;
+  line-height: 80rpx;
   min-width: 155rpx;
-  font-size:24rpx;
+  font-size: 24rpx;
   text-align: center;
-  border:2rpx solid #dcdcdc;
+  border: 2rpx solid #dcdcdc;
   margin: 0 15rpx;
   background-color: #fff;
-  color:#1e1e1e;
+  color: #1e1e1e;
 }
 
-.PanelOrderBtn0{
-  width:350rpx;
+.PanelOrderBtn0 {
+  width: 350rpx;
 }
 
-.PanelOrderBtn2{
-  width:330rpx;
+.PanelOrderBtn2 {
+  width: 330rpx;
 }
 
-.PanelOrderBtn4{
-  width:690rpx;
-  height:100rpx;
-  font-size:24rpx;
+.PanelOrderBtn4 {
+  width: 690rpx;
+  height: 100rpx;
+  font-size: 24rpx;
   justify-content: space-between;
   margin-bottom: 30rpx;
 }
 
-.PanelOrderBtn3{
+.PanelOrderBtn3 {
   margin: 0 5rpx;
 }
 
-.PanelOrder31{
+.PanelOrder31 {
   font-size: 24rpx;
   margin: 30rpx 0 20rpx 30rpx;
-  color:#4D4D4D;
+  color: #4D4D4D;
   font-weight: 400;
 }
-.PanelOrder32{
+
+.PanelOrder32 {
   margin-left: 240rpx;
 }
-.PanelOrderLine60{
-  height:60rpx;
-  width:100%;
+
+.PanelOrderLine60 {
+  height: 60rpx;
+  width: 100%;
 }
-.PanelOrderLine30{
-  height:30rpx;
-  width:100%;
+
+.PanelOrderLine30 {
+  height: 30rpx;
+  width: 100%;
 }
 
-.PanelOrderBtnText{
+.PanelOrderBtnText {
   margin: 0 30rpx;
 }
 
-.PanelBtnSelect{
+.PanelBtnSelect {
   background-color: #5282FA;
-  color:#fff;
-  font-size:32rpx;
+  color: #fff;
+  font-size: 32rpx;
+}
+
+.folderImage {
+  width: 150rpx;
+  height: 150rpx;
+}
+
+.panelShare {
+  width: 710rpx;
+  height: 180rpx;
+  margin-top: 30rpx;
+  background: #FFDE5A;
+  border-radius: 20rpx;
+  justify-content: space-between;
+}
+
+.panelShare1 {
+  align-items: flex-start;
+  margin-left: 40rpx;
+}
+
+.text1 {
+  font-size: 32rpx;
+  color: #1E1E1E;
+}
+
+.text2 {
+  font-size: 20rpx;
+  color: #1E1E1E;
 }
 
-.folderImage{
-  width:150rpx;
-  height:150rpx;
+.directory_main_pic_9 {
+  width: 410rpx;
+  height: 180rpx;
+  border-radius: 0 20rpx 20rpx 0;
 }

pages/main/default.wxml

@@ -22,7 +22,7 @@
     <image class="study_index_footer" src='../images/practise_index_footer.png' />
 
     <view class='panelBottom1 FlexRow'>
-      <view class='panelBottom11 FlexColumn' catchtap="gotoReLaunch" data-url="../test/index">
+      <view class='panelBottom11 FlexColumn' catchtap="gotoReLaunch" data-url="../../pages_test/test/index">
         <view>检验</view>
       </view>
       <view class='panelBottom11 FlexColumn'>

pages/main/detail.js

@@ -51,7 +51,6 @@ Page({
     IsAutoSoundStart: false, //是否开始自动播放
     Title: "",
     FontSizeArray: constant.arrFontSize,
-    IsBuildReport:false,
   },
   onReady: function () {
     var that = this;
@@ -86,7 +85,6 @@ Page({
     }
 
     that.setData({
-      IsBuildReport:false,
       Containnerheight: height,
       Containnerheight2: height - height2,
       IsShowAnswer: [0, 0],
@@ -922,25 +920,17 @@ Page({
         if (duration > 0) {
           duration = Math.round(duration / 60);
         }
-
-        var speed1 = 0;
-        if (data.Duration > 0)
-          speed1 = Math.round(100 * data.Count / (data.Duration / 60)) / 100;
-
-        var speed2 = 0 + "秒";
-        if (data.Count > 0)
-          speed2 = common.getMinuteSecond(Math.round(data.Duration / data.Count), true);
-
-
+        
         app.globalData.TaskToday.DayNumber = data.DayNumber;
         that.setData({
           TodayTime: duration,
-          Speed1: speed1 + "张题卡",
-          Speed2: speed2,
           Title: "报告",
+          DayNumber:data.DayNumber,
+          CardCount:data.CardCount,
+          PracticeCount:data.PracticeCount,
         });
 
-        if (speed1 == "0张题卡" && speed2 == "0秒" && duration.toString() == "1") {
+        if (data.CardCount==0 && duration.toString() == "1") {
           wx.showModal({
             title: '提醒',
             showCancel: false,
@@ -1153,139 +1143,6 @@ Page({
       MemoryLevel: index,
     });
   },
-
-  buildShareImage: function () {
-    var that = this;
-
-    that.setData({
-      IsBuildReport:true,
-    });
-    wx.showLoading({
-      title: '生成中',
-    });
-    setTimeout(function () {
-      wx.hideLoading();
-    }, 5000);
-    //console.log(app.globalData.userInfo.AvatarUrl);
-    var avatarUrl = app.globalData.userInfo.AvatarUrl;
-    avatarUrl = avatarUrl.substring(0, avatarUrl.lastIndexOf("/") + 1);
-    avatarUrl = avatarUrl + "0";
-    //console.log(avatarUrl);
-
-    wx.downloadFile({
-      url: avatarUrl, 
-      success(resDownload) {
-        // 只要服务器有响应数据，就会把响应内容写入文件并进入 success 回调，业务需要自行判断是否下载到了想要的内容
-        if (resDownload.statusCode === 200) {
-
-          const query = wx.createSelectorQuery();
-          query.select('#shareCanvas')
-            .fields({
-              node: true,
-              size: true
-            })
-            .exec((res) => {
-              const canvas = res[0].node;
-              const ctx = canvas.getContext('2d');
-
-              const dpr = wx.getSystemInfoSync().pixelRatio;
-              canvas.width = res[0].width * dpr;
-              canvas.height = res[0].height * dpr;
-              ctx.scale(dpr, dpr);
-
-              var img = canvas.createImage();
-              img.src = resDownload.tempFilePath;
-              img.onerror = err =>{
-                  console.log(err);
-              };
-              img.onload = e => {
-                ctx.drawImage(img, 0, 0, 360, 360);
-                var img2 = canvas.createImage();
-                img2.src = "../images/universalpic_screenshot_jl_bgimage_360x360.png";
-                img2.onload = e => {
-                  ctx.drawImage(img2, 0, 0, 360, 360);
-
-                  ctx.fillStyle = main.getShareImageBackColor();
-                  
-                  ctx.fillRect(360, 0, 240, 360);
-
-                  ctx.fillStyle = "#ffffff";
-                  ctx.font = "24px";
-                  ctx.fillText(app.globalData.userInfo.NickName, 30, 306);
-
-                  var today = common.formatTime(new Date(), ".", true);
-                  ctx.font = "18px";
-                  ctx.fillText(today, 30, 335);
-
-                  ctx.font = "20px";
-                  ctx.fillText("秒过学习", 390, 40);
-                  ctx.font = "44px";
-                  ctx.fillText("勤勉接力", 390, 88);
-                  ctx.font = "20px";
-                  ctx.fillText("见证成长", 390, 140);
-
-                  ctx.font = "68px";
-                  if (!that.data.TodayTime)
-                    that.data.TodayTime = 0;
-
-                  ctx.fillText(that.data.TodayTime, 390, 209);
-
-                  ctx.font = "normal 500 68px caption";
-                  var metrics = ctx.measureText(that.data.TodayTime.toString());
-                  //console.log(JSON.stringify(metrics));
-
-                  var h = 209;
-                  if (app.globalData.IsIOS)
-                    h = 206;
-                  ctx.font = "normal 500 32px caption";
-                  ctx.fillText("分钟", 393 + Math.round(metrics.width), h);
-
-
-                  ctx.font = "20px";
-                  ctx.fillText("迄今已接力", 390, 295);
-
-                  ctx.font = "32px";
-                  ctx.fillText(app.globalData.TaskToday.DayNumber + "次", 390, 333);
-                  //console.log("生成前");
-                  setTimeout(function () {
-                    //console.log("生成后1");
-                    wx.canvasToTempFilePath({
-                      x: 0,
-                      y: 0,
-                      width: 600,
-                      height: 360,
-                      destWidth: 600,
-                      destHeight: 360,
-                      canvas: canvas,
-                      success: function (res2) {
-                        wx.hideLoading();
-                        //console.log("生成后2");
-                        wx.previewImage({
-                          current: res2.tempFilePath, // 当前显示图片的http链接
-                          urls: [res2.tempFilePath] // 需要预览的图片http链接列表
-                        });
-
-                        main.getData("ShareMiaoguoTask?UserID=" + app.globalData.userInfo.UserID, function (data) {});
-                      },
-                      fail: function (e) {
-                        wx.hideLoading();
-                        //console.log("生成错误："+e);
-                      }
-                    })
-                  }, 500);
-                };
-              };
-
-            });
-        } else {
-          wx.hideLoading();
-        }
-      },
-      fail: function (e) {
-        wx.hideLoading();
-      }
-    });
-  },
   saveCardType: function (event) {
     var that = this;
     var foldertype = event.currentTarget.dataset.foldertype;
@@ -1554,6 +1411,13 @@ Page({
       url: url,
     });
   },
+  gotoTaskList: function (e) {
+    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

@@ -4,6 +4,9 @@
   <view slot="left" wx:if="{{NumberNew+NumberReview+NumberHistory>0}}">
     <view bindtap="onClose" class="square">退出练习</view>
   </view>
+  <view class="CombinedShape1 FlexRow" bindtap='onClose' slot="left" wx:if="{{NumberNew+NumberReview+NumberHistory==0}}">
+    <image src="../images/CombinedShape1.png" class='CombinedShape11' />
+  </view>
   <view slot="center" bindtap="showNumberContainner" class='panelNumber FlexRow'>
     <block wx:if="{{!Title}}">
       <view class="FlexColumn">
@@ -181,23 +184,66 @@
   <block wx:if="{{NumberNew+NumberReview+NumberHistory==0}}">
     <view class='panelLast FlexColumn'
       style='height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}};top:{{topBarHeight}}rpx;'>
-      <view class='text1{{IsIPad}}'>做完了</view>
+      <view class='text1{{IsIPad}}' style='color:{{Color.LineColor}};'>练完了</view>
       <view class="panelLastTime FlexColumn">
-        <view style='color:{{Color.FrontColor1}};'>今日练习总共用时</view>
-        <view class="time1 FlexRow" style='color:{{Color.LineColor}}'>
+        <view>今天复习了</view>
+        <view class="time1 FlexRow">
           <view class='time11'>{{TodayTime}}</view>
-          <view>分钟</view>
+          <view class='time11_1'>分钟</view>
         </view>
       </view>
-      <view class="panelLastTime FlexColumn">
+      <view class="panelLastTime2 FlexRow">
+        <view class="panelLastTime21 FlexColumn">
+          <view class="panelLastTime211">练习题卡</view>
+          <view class="time2 FlexRow">
+            <view class='time21'>{{CardCount}}</view>
+            <view class='time21_1'>张</view>
+          </view>
+        </view>
+        <view class="panelLastTime21 FlexColumn">
+          <view class="panelLastTime211">记忆评价</view>
+          <view class="time2 FlexRow">
+            <view class='time21'>{{PracticeCount}}</view>
+            <view class='time21_1'>次</view>
+          </view>
+        </view>
+      </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">
+          <view class="panelLastFooter11 FlexColumn" bindtap="goto" data-url="../share/shareitem?TaskID=-1&Day={{DayNumber}}">
+            <view class="icon_reload_1"></view>
+            <view>勤勉接力</view>
+          </view>
+          <view class="panelLastFooter11 FlexColumn" catchtap="gotoTaskList">
+            <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&Day={{DayNumber}}">
+          <view class="panelLastFooter21">{{DayNumber}}</view>
+          <view>DAYS</view>
+        </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> -->
+      <!-- <view class='panelLastFooter'>
         <view class="panelLastFooter1 FlexRow" bindtap='buildShareImage'>
           <image src="../images/universalpic_screenshot_gray_30x30.png" class='universalpic_screenshot_gray_30x30' />
           <view>群接力</view>
@@ -205,7 +251,7 @@
         <view class="panelLastFooter2 FlexRow" bindtap='onClose'>
           <view>关闭</view>
         </view>
-      </view>
+      </view> -->
     </view>
   </block>
   <!-- 今日任务量 -->
@@ -318,8 +364,7 @@
       <view class="FolderTitle"
         wx:if="{{IsFinallyCount && IsFinallyCount>0 && FolderList[0].FolderID==0 && FolderList[0].Total==0}}">点「关闭」练完它们
       </view>
-
-      <view style="height:60rpx"></view>
+      <view style="height:180rpx"></view>
     </scroll-view>
     <view class='numberContainerFooter105 FlexRow' style="background-color:{{Color.BackColor}};">
       <view class="numberContainerFooter1051 FlexColumn">
@@ -335,7 +380,4 @@
   </view>
 </view>
 
-<!-- <canvas style="width:600px;height:360px;background-color: {{Color.BackColor}};" canvas-id="shareCanvas"></canvas> -->
-<canvas wx:if="{{IsBuildReport}}" type="2d" style="width:600px;height:360px;background-color: {{Color.BackColor}};" id="shareCanvas"></canvas>
-
 <audio hidden='true' src="{{AudioSrc}}" id="myAudio" bindended="audioBindEnded" binderror="audioBindError"></audio>

pages/main/detail.wxss

@@ -15,6 +15,17 @@ page{
   position: relative;
 }
 
+.CombinedShape1{
+  width:80rpx;
+  height:80rpx;
+  justify-content: flex-start;
+}
+
+.CombinedShape11{
+  width:19rpx;
+  height:34rpx;
+}
+
 /* 工具栏 */
 .panelTop {
   width: 100%;
@@ -505,58 +516,146 @@ page{
 
 
 .text1 {
-  margin: 100rpx 0 60rpx 40rpx;
-  font-size: 90rpx;
+  margin: 80rpx 0 60rpx 40rpx;
+  font-size: 144rpx;
 }
 
 .text1_iPad {
-  margin: 20rpx 0 60rpx 40rpx;
-  font-size: 90rpx;
+  margin: -80rpx 0 10rpx 40rpx;
+  font-size: 144rpx;
 }
 
 .panelLastTime {
-  font-size: 28rpx;
+  font-size: 36rpx;
   font-weight: 400;
-  color: #e3e3e3;
+  color: #d2d2d2;
   margin: 0 0 40rpx 40rpx;
   align-items: flex-start;
 }
 
 .panelLastTime .time1 {
-  font-size: 90rpx;
+  font-size: 28rpx;
 }
 .panelLastTime .time11 {
-  font-size: 108rpx;
+  font-size: 144rpx;
   font-family: 'Roboto-Black';
 }
+.panelLastTime .time11_1 {
+  margin-top: 70rpx;
+}
 
-.panelLastTime .time2 {
-  font-size: 36rpx;
+.panelLastTime2{
+  width:100%;
+}
+.panelLastTime2 .panelLastTime21{
+  width:345rpx;
+  height:212rpx;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-radius:20rpx;
+  margin: 0 10rpx;
+  font-size:36rpx;
+  color:#d2d2d2;
+  font-weight: 400;
+  align-items: flex-start;
+}
+
+.panelLastTime2 .panelLastTime211{
+  margin-left: 70rpx;
+  font-weight: 400;
+}
+
+.panelLastTime2 .time2 {
+  margin-left: 70rpx;
+  justify-content: flex-start;
+}
+.panelLastTime2 .time21{
+  font-size: 96rpx;
   font-family: 'Roboto-Black';
 }
+.panelLastTime2 .time21_1{
+  margin: 30rpx 0 0 10rpx;
+}
+
+.panelLastTime3{
+  margin: 30rpx 0 0 50rpx;
+  font-size: 24rpx;
+  color:#d2d2d2;
+}
+
+.panelLastTime4{
+  width: 710rpx;
+  height:100rpx;
+  margin:60rpx 0 0 20rpx;
+  justify-content: space-between;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-radius: 20rpx;
+}
+
+.panelLastTime4 .panelLastTime41{
+  font-size: 28rpx;
+  margin-left: 30rpx;
+  color:#f2f2f2;
+}
 
 .panelLastFooter {
   width: 100%;
   position: fixed;
   bottom: 0;
-  align-items: flex-start;
-  font-size: 36rpx;
+  justify-content: flex-end;
+  z-index: 100;
 }
 
 .panelLastFooter .panelLastFooter1 {
-  width: 100%;
-  height: 131rpx;
-  border-top: 1rpx solid rgba(0, 0, 0, 0.2);
-  justify-content: flex-start;
+  width: 730rpx;
+  height: 140rpx;
+  border-top-left-radius: 10rpx;
+  border-top-right-radius: 10rpx;
+  border-bottom-left-radius: 40rpx;
+  border-bottom-right-radius: 40rpx;
+  background-color: #181A21;
+  margin-bottom: 10rpx;
+  position: relative;
 }
 
-.panelLastFooter .panelLastFooter2 {
-  width: 100%;
-  border-top: 1rpx solid rgba(0, 0, 0, 0.2);
-  text-align: center;
-  line-height: 131rpx;
+.panelLastFooter .panelLastFooter11 {
+  width:243rpx;
+  height:140rpx;
+  font-size: 24rpx;
+  color:#D2D2D2;
+}
+
+.icon_reload_1{
+  width: 30rpx;
+  height: 30rpx;
+  margin-bottom: 20rpx;
+}
+
+.icon_report_1{
+  width: 24rpx;
+  height: 30rpx;
+  margin-bottom: 20rpx;
 }
 
+.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;
+}
+
+.panelLastFooter2 .panelLastFooter21{
+  font-family: Roboto-Black;
+  font-size: 24rpx;
+  color: rgba(255,255,255,0.50);
+}
+
+
 .universalpic_undo_gray_26x20 {
   width: 26rpx;
   height: 19rpx;

pages/main/preview.js

@@ -29,6 +29,7 @@ Page({
     innerAudioContext1.onPlay(() => {
       console.log('开始播放')
     });
+    
     innerAudioContext1.onError((res) => {
       console.log("innerAudioContext1.errMsg:" + res.errMsg);
       console.log("innerAudioContext1.errCode:" + res.errCode);
@@ -123,9 +124,7 @@ Page({
         TextSpace:"nbsp",
       });
     }
-
     
-
     if (options.PrintID){
       that.setData({
         PrintID:options.PrintID,

pages/main/preview.wxss

@@ -415,7 +415,7 @@
 }
 
 .btn21::after {
-  border: 0px;
+  border: 0rpx;
 }
 
 

pages/plan/clicktype.wxss

@@ -26,7 +26,7 @@
 
 .panelItemSelected {
   border: 5rpx solid #fff;
-  box-shadow: 0 0 0 3px #0071ef;
+  box-shadow: 0 0 0 3rpx #0071ef;
 }
 
 .panelItem01 {

pages/plan/colorplan.wxss

@@ -33,7 +33,7 @@
 
 .panelItemSelected{
   border:5rpx solid #fff;
-  box-shadow:0 0 0 3px #0071EF;
+  box-shadow:0 0 0 3rpx #0071EF;
 }
 
 .panelItem01{

pages/plan/setting.js

@@ -40,38 +40,7 @@ Page({
     });
   },
   resetTodayTask:function(){
-    wx.showModal({
-      title: '提醒',
-      content: '此操作无法撤销。确认重置今天的任务量吗？',
-      showCancel:true,
-      cancelText:"确定",
-      confirmColor:"#000000",
-      confirmText:"取消",
-      success (res) {
-        if (res.confirm) {
-          //console.log('用户点击取消');
-        } else if (res.cancel) {
-          //console.log('用户点击确定')
-          var url = "ResetMiaoguoCardTask?UserID=" + app.globalData.userInfo.UserID;
-          main.getData(url, function (data) {
-            if (data) {
-              wx.showModal({
-                title: '提醒',
-                content: '重置已完成。请重新开始今天的练习吧。',
-                showCancel:false,
-                confirmColor:"#000000",
-                confirmText:"返回首页",
-                success (res) {
-                  wx.navigateBack({
-                    delta: 2,
-                  });
-                }
-              });
-            }
-          });
-        }
-      }
-    });
+    main.ResetTodayTask();
   },
   onShareAppMessage: function () {
     return {

pages/plan/sortRule.wxss

@@ -105,7 +105,7 @@
 
 .panelItemSelected {
   border: 5rpx solid #fff;
-  box-shadow: 0 0 0 3px #0071ef;
+  box-shadow: 0 0 0 3rpx #0071ef;
 }
 
 

pages/plan/studyplan.js

@@ -194,51 +194,8 @@ Page({
     });
   },
   gotoTaskList: function (e) {
-    wx.showLoading({
-      title: '请稍候',
-    });
-    setTimeout(function () {
-      wx.hideLoading();
-    }, 5000);
-
-    var that = this;
-    //未练完的题卡
-    if (e.currentTarget.dataset.id == 1) {
-      main.getTaskTodayList(function (task) {
-        var list = [];
-        for (var i = 0; i < task.ListNew.length; i++) {
-          list.push(task.ListNew[i]);
-        }
-        for (var i = 0; i < task.ListHistory.length; i++) {
-          list.push(task.ListHistory[i]);
-        }
-        for (var i = 0; i < task.ListReview.length; i++) {
-          list.push(task.ListReview[i]);
-        }
-        app.globalData.CardList = list;
-        wx.navigateTo({
-          url: '../main/mainlist?type=1&Count=' + list.length,
-        });
-      });
-    } else {
-      var url = 'GetMiaoguoCardList2?UserID=' + app.globalData.userInfo.UserID + "&IsToday=2&CardType=" + that.data.CardType+"&OrderType=ac.LastTime desc";
-      main.getData(url, function (data) {
-        if (data) {
-          var list = [];
-
-          for (var i = 0; i < data.List.length; i++) {
-            data.List[i].LastTimeStr = common.formatDateCHS(data.List[i].LastTime);
-
-            list.push(data.List[i]);
-          }
-          app.globalData.CardList = list;
-          wx.navigateTo({
-            url: '../main/mainlist?type=2&Count=' + data.length,
-          });
-        }
-      });
-    }
-
+    var id=e.currentTarget.dataset.id;
+    main.GotoTaskList(id,this.data.CardType);
   },
   showHelp:function(e){
     var id=e.currentTarget.dataset.id;

pages/plan/studyplandetail.wxml

@@ -11,7 +11,7 @@
 	</view>
 	<view class="panelItem0 panelItem FlexRow">
 		<template class="fan" is="fanTemplate" data="{{Angle1,Angle2,BGColor,FanSize,FanScale,Color1,Color2,ShowNumber}}">
-		</template>
+    </template>
 	</view>
 	<view class="panelItem FlexColumn">
 		<view class="panelItemSquare FlexRow">

pages/share/cardlist.js

@@ -0,0 +1,23 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+    var that = this;
+
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/share/cardlist.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarBackgroundColor": "#F2F2F2",
+  "navigationBarTextStyle": "black",
+  "navigationBarTitleText": "详细报告"
+}

pages/share/cardlist.wxml

@@ -0,0 +1,72 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelTop FlexRow">
+    <view class="text1">今天已练完</view>
+    <view class="panelTopRight FlexRow">
+      <view class="panelTopRight1 FlexRow">
+        <image class="icon_transfer_1" src="../images/icon_transfer_1.png"></image>
+      </view>
+      <view class="panelTopRight1 FlexRow">
+        <image class="icon_back2top_1" src="../images/icon_back2top_1.png"></image>
+      </view>
+    </view>
+  </view>
+  <view class="panelHeight"></view>
+
+  <view class="panelHelpCommon FlexRow">
+    <view class="panelHelpCommon1 FlexRow">
+      <view class="panelHelpCommon11 FlexRow">
+        <image class="panelHelpCommonIcon" src="../images/icon_light_1.png"></image>
+      </view>
+      <view class="panelHelpCommon12 FlexColumn">
+        <view class="panelHelpCommonText1">帮助</view>
+        <view class="panelHelpCommonText2">教您看懂详细报告，活学活用</view>
+      </view>
+    </view>
+    <image class="panelHelpCommonNextPage" src="../images/icon_nextpage_7.png"></image>
+  </view>
+
+  <view class="text2">1234张题卡</view>
+
+  <view class="panelCard FlexColumn">
+    <view class="cardText1">n. 管理，行政;</view>
+    <view class="cardText2">administration</view>
+    <view class="panelCard1 FlexRow">
+      <view class="panelCardLeft FlexRow">
+        <image class="universalpic_cardlist_gray_22x20" src="../images/universalpic_cardlist_gray_22x20.png"></image>
+        <view class="cardText3 cardText">卡单名称</view>
+        <image class="universalpic_star_yellow_20x20" src="../images/universalpic_star_yellow_20x20.png"></image>
+        <view class="cardText4 cardText">日常</view>
+      </view>
+      <view class="panelCardRight FlexRow">
+        <view class="panelCardLine"></view>
+        <view class="cardText5 cardText">到期</view>
+        <view class="cardText6 cardText">2020年02月03日</view>
+        <image class="universalpic_arrow_down_black_14x10" src="../images/universalpic_arrow_down_black_14x10.png"></image>
+      </view>
+    </view>
+    <view class="panelCardLine2"></view>
+    <view class="panelCard2 FlexRow" wx:for="{{[1,2,3]}}">
+      <view class="panelCardLeft FlexRow">
+        <view class="cardText7 cardText">1次</view>
+        <view class="cardTextColor"></view>
+        <view class="cardText7 cardText">点红</view>
+      </view>
+      <view class="panelCardRight FlexRow">
+        <view class="cardText8 cardText">10秒</view>
+      </view>
+    </view>
+    <view class="panelCardHeight"></view>
+  </view>
+
+  <view class="panelFooter FlexRow">
+    <view class="panelFooter1 FlexRow">
+      <image class="icon_chart_4" src="../images/icon_chart_4.png"></image>
+      <view class="panelFooterText">归类分析</view>
+    </view>
+  </view>
+</view>
+
+<!-- 选择分类 -->
+<view wx:if="{{true}}" class="container2 container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class=""></view>
+</view>

pages/share/cardlist.wxss

@@ -0,0 +1,203 @@
+.panelTop {
+  width: 100%;
+  justify-content: space-between;
+  height: 100rpx;
+  position: fixed;
+  top: 0;
+  background-color: #f2f2f2;
+  border-bottom: 1rpx solid #d2d2d2;
+}
+
+.text1 {
+  margin-left: 30rpx;
+  font-size: 28rpx;
+  color: #4D4D4D;
+}
+
+.panelTopRight {
+  margin-right: 20rpx;
+}
+
+.panelTopRight1 {
+  width: 80rpx;
+  height: 80rpx;
+}
+
+.icon_transfer_1 {
+  width: 32rpx;
+  height: 26rpx;
+}
+
+.icon_back2top_1 {
+  width: 26rpx;
+  height: 28rpx;
+}
+
+.panelHeight {
+  width: 100%;
+  height: 130rpx;
+}
+
+.text2 {
+  margin: 60rpx 0 10rpx 30rpx;
+  font-size: 32rpx;
+  color: #4D4D4D;
+  align-self: flex-start;
+}
+
+.panelCard {
+  background: #FFFFFF;
+  border-radius: 10rpx;
+  width: 710rpx;
+  min-height: 279rpx;
+  margin: 20rpx 0;
+  justify-content: flex-start;
+}
+
+.cardText1 {
+  font-size: 30rpx;
+  color: #1E1E1E;
+  width: 650rpx;
+  margin-top: 30rpx;
+}
+
+.cardText2 {
+  font-size: 22rpx;
+  color: #1E1E1E;
+  width: 650rpx;
+  margin-top: 8rpx;
+  font-weight: 400;
+}
+
+.panelCard1 {
+  width: 100%;
+  margin-top: 20rpx;
+  justify-content: space-between;
+}
+
+.panelCardLeft {
+  margin-left: 30rpx;
+  justify-content: flex-start;
+}
+
+.panelCardRight {
+  margin-right: 30rpx;
+  justify-content: flex-end;
+}
+
+.universalpic_cardlist_gray_22x20 {
+  width: 22rpx;
+  height: 20rpx;
+}
+
+.universalpic_star_yellow_20x20 {
+  width: 20rpx;
+  height: 20rpx;
+  margin-left: 20rpx;
+}
+
+.universalpic_arrow_down_black_14x10 {
+  width: 14rpx;
+  height: 10rpx;
+}
+
+.cardText {
+  font-size: 20rpx;
+  color: #787878;
+}
+
+.cardText3 {
+  width: 164rpx;
+  overflow: hidden;
+  margin-left: 10rpx;
+}
+
+.cardText4 {
+  margin-left: 20rpx;
+}
+
+.panelCardLine {
+  margin-right: 20rpx;
+  width: 2rpx;
+  height: 20rpx;
+  background-color: #d2d2d2;
+}
+
+.cardText5 {
+  margin-right: 15rpx;
+}
+
+.cardText6 {
+  margin-right: 10rpx;
+}
+
+.panelCardLine2 {
+  width: 650rpx;
+  height: 1rpx;
+  background-color: #e3e3e3;
+  margin: 30rpx 0 10rpx 0;
+}
+
+.panelCard2 {
+  width: 100%;
+  margin-top: 20rpx;
+  justify-content: space-between;
+}
+
+.cardText7 {
+  font-weight: 400;
+  font-size: 22rpx;
+  width: 70rpx;
+}
+
+.cardTextColor {
+  background: #FE6659;
+  border-radius: 4rpx;
+  width: 26rpx;
+  height: 16rpx;
+  margin-right: 10rpx;
+}
+
+.cardText8 {
+  font-weight: 400;
+  font-size: 22rpx;
+}
+
+.panelCardHeight {
+  height: 30rpx;
+}
+
+.panelFooter {
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  height: 130rpx;
+  z-index: 10;
+  background-color: #fff;
+  border-top: 1rpx solid #d2d2d2;
+}
+
+.panelFooter1 {
+  width: 720rpx;
+  height: 100rpx;
+  background: #5282FA;
+  border-radius: 20rpx;
+}
+
+.icon_chart_4 {
+  width: 30rpx;
+  height: 30rpx;
+}
+
+.panelFooterText {
+  font-size: 36rpx;
+  color: #FFFFFF;
+  margin-left: 20rpx;
+}
+
+.container2{
+  position: absolute;
+  top:0;
+  background-color: rgba(0,0,0,0.16);
+  z-index: 20;
+}

pages/share/milestone.js

@@ -0,0 +1,54 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+import fanObj from '../template/FanObject';
+const app = getApp();
+
+Page({
+  data: {
+
+  },
+  onLoad: function (options) {
+    var that = this;
+
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+    that.init();
+  },
+  init: function () {
+    var that = this;
+
+    var url = 'GetMilestoneList?UserID=' + app.globalData.userInfo.UserID;
+    main.getData(url, function (data) {
+
+      var arr = [];
+      for (var i = 0; i < data.MilestoneRemain.length; i++) {
+        var arrTemp = data.MilestoneRemain[i].Name.split("\n");
+        var obj = {};
+        obj.Name1 = arrTemp[0];
+        obj.Name2 = arrTemp[1];
+        arr.push(obj);
+      }
+      data.MilestoneRemain = arr;
+      that.setData({
+        Info: data,
+      });
+      fanObj.init(that, data.RemainRate, 80, 4.0, "#11CC33", "#D2D2D2", data.RemainRateStr);
+
+    });
+  },
+  gotoDetail:function(e){
+    var id=e.currentTarget.dataset.id;
+    wx.navigateTo({
+      url: "./shareitem?TaskID="+id,
+    });
+    
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/share/milestone.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarBackgroundColor": "#ffffff",
+  "navigationBarTextStyle": "black",
+  "backgroundColorTop":"#ffffff",
+  "backgroundColor": "#ffffff",
+  "navigationBarTitleText": "里程碑"
+}

pages/share/milestone.wxml

@@ -0,0 +1,50 @@
+<import src="../template/Fan.wxml" />
+
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <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="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>
+        <view class="text4" wx:if="{{!item.Date}}">{{item.Name}}</view>
+        <view class="text2">{{item.Date}}</view>
+      </view>
+      <view class="FlexColumn">
+        <view class="line"></view>
+        <view class="circle"></view>
+      </view>
+    </view>
+
+    <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="text2">{{Info.MilestoneFinished[Info.MilestoneFinished.length-1].Date}}</view>
+    </view>
+
+    <template class="fan" is="fanTemplate" data="{{Angle1,Angle2,BGColor,FanSize,FanScale,Color1,Color2,ShowNumber}}">
+		</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>
+    </view>
+
+    <view class="panel22 FlexRow">
+      <view class="panelItem FlexColumn" wx:for="{{Info.MilestoneRemain}}" wx:key="*this">
+        <view class="text8">{{item.Name1}}</view>
+        <view class="text9">{{item.Name2}}</view>
+      </view>
+    </view>
+  </view>
+</view>

pages/share/milestone.wxss

@@ -0,0 +1,152 @@
+@import "../template/Fan.wxss";
+
+.container{
+  background-color: #fff;
+  color:#4D4D4D;
+}
+.panel1{
+  width:710rpx;
+  min-height:100rpx;
+  background: #F2F2F2;
+  border-radius: 20rpx;
+}
+.panelNull{
+  width:100%;
+  height:60rpx;
+}
+
+.line{
+  width:4rpx;
+  height:130rpx;
+  background-color: #d2d2d2;
+}
+
+.circle{
+  width:30rpx;
+  height:30rpx;
+  border-radius: 50%;
+  background-color: #d2d2d2;
+}
+
+.panel11{
+  margin-bottom: 60rpx;
+}
+
+.panel12{
+  position: relative;
+  width:100%;
+}
+
+.text1{
+  font-family: Roboto-Black;
+  font-size: 48rpx;
+  text-align: center;
+  margin-top: 20rpx;
+}
+.text2{
+  font-family: Roboto-Black;
+  font-size: 24rpx;
+  text-align: center;
+  margin-top: 10rpx;
+}
+
+.text3{
+  border-radius: 27rpx;
+  font-family: Roboto-Black;
+  font-size: 28rpx;
+  color: #FFFFFF;
+  text-align: center;
+  line-height:53rpx;
+  width: 218rpx;
+}
+.arrow{
+  width:12rpx;
+  height:18rpx;
+  margin: 0 10rpx;
+}
+
+.panel121{
+  position: absolute;
+  bottom:-50rpx;
+}
+
+.text4{
+  font-family: Roboto-Black;
+  font-size: 48rpx;
+}
+
+
+.fan{
+  width:80rpx;
+  height:80rpx;
+  background-color: #f2f2f2;
+  position: absolute;
+  top:162rpx;
+  left:336rpx;
+  z-index: 10;
+  text-align: center;
+  line-height: 80rpx;
+  font-size:20rpx;
+  justify-self: center;
+}
+
+.text5{
+  width:690rpx;
+  font-size:22rpx;
+  margin-top: 30rpx;
+}
+.text6{
+  width:690rpx;
+  font-size:22rpx;
+  margin: 10rpx 0 30rpx 0;
+}
+
+.line2{
+  width:690rpx;
+  height:1rpx;
+  background: #BCBCBC;
+}
+
+
+.panel2{
+  margin:60rpx 0 92rpx 0;
+  width: 100%;
+}
+.panel21{
+  justify-content: flex-start;
+  width: 100%;
+}
+
+.text7{
+  font-size: 36rpx;
+  color: #4D4D4D;
+  margin-left: 30rpx;
+}
+.panel22{
+  justify-content: flex-start;
+  width: 730rpx;
+  margin-top: 20rpx;
+  flex-wrap: wrap;
+}
+
+.panelItem{
+  background: #D2D2D2;
+  border-radius: 20rpx;
+  width:345rpx;
+  height:210rpx;
+  margin: 10rpx;
+}
+
+.text8{
+  font-family: Roboto-Black;
+  font-size: 48rpx;
+  color: #FFFFFF;
+  text-align: center;
+}
+
+.text9{
+  font-family: Roboto-Black;
+  font-size: 24rpx;
+  color: #FFFFFF;
+  text-align: center;
+}

pages/share/shareindex.js

@@ -0,0 +1,119 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    Weeks:["周一","周二","周三","周四","周五","周六","周日"],
+    List:[],
+  },
+  onLoad: function (options) {
+    var that = this;
+    
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+
+    that.init();
+  }, 
+  init:function(){
+    var that = this;
+    var url = 'GetHardworkingList?UserID=' + app.globalData.userInfo.UserID;
+    main.getData(url, function (data) {
+      data.Today=common.formatDateCHS(common.formatTime(new Date()));
+      data.Days=[];
+      var days=that.getDays();
+      for(var j=0;j<days.length;j++){
+        var obj={};
+        obj.Name=days[j];
+        obj.BgColor="#f2f2f2";
+        obj.Color="#9B9B9B";
+        for(var i=0;i<data.CurrentMonth.length;i++){
+          if (data.CurrentMonth[i].Day==days[j]){
+              obj.BgColor="#d2d2d2";
+              obj.Color="#4D4D4D";
+              if (data.CurrentMonth[i].IsShare || data.CurrentMonth[i].Image){
+                obj.ID=data.CurrentMonth[i].ID;
+                obj.DayNumber=data.DayNumber;
+                  
+                if (data.CurrentMonth[i].Image){
+                  obj.Image=data.CurrentMonth[i].Image;
+                  obj.AphorismID=data.CurrentMonth[i].AphorismID;
+                  obj.Color="#FFFFFF";
+                }
+                else{
+                  obj.BgColor="#3D3D3D";
+                  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',
+          frontColor:"#000000",
+        });
+      }
+      else{
+        wx.setNavigationBarColor({
+          backgroundColor: '#FFD66E',
+          frontColor:"#000000",
+        });
+      }
+    });    
+  },
+  getDays:function(){
+    var calendar= common.initMonthCalendar(common.formatTime(new Date(),"-",true));
+    //console.log(calendar);
+    return calendar;
+  },
+  goto: function (e) {
+    var url=e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
+  gotoDetail:function(e){
+    var id=e.currentTarget.dataset.id;
+    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,
+      });
+    }
+    else if (isshare){
+      wx.navigateTo({
+        url: "./shareitem?TaskID="+id+"&IsHistory=1&Day="+e.currentTarget.dataset.day,
+      });
+    }
+  },
+  showHelpImage: function (e) {
+    main.ShowHelpImage();
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/share/shareindex.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarBackgroundColor": "#FFD66E",
+  "navigationBarTextStyle": "black",
+  "backgroundColorTop":"#FFD66E",
+  "navigationBarTitleText": "勤勉接力"
+}

pages/share/shareindex.wxml

@@ -0,0 +1,119 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <block wx:if="{{Info.DayNumber>0}}">
+    <view class="panel1 FlexColumn">
+      <view class="panelBg"></view> -->
+      <text class="text1">I do\nmy best</text>
+      <view class="panel11 FlexRow">
+        <view class="text2">最近接力</view>
+        <view></view>
+      </view>
+      <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}}">
+          <image wx:if="{{item.Image}}" lazy-load="true" class="CardImg" src="{{item.Image}}"></image>
+          <view class="img2 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>
+        </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>
+        </view>
+      </scroll-view>
+    </view>
+
+    <view class="panel2 FlexColumn">
+      <view class="panel21 FlexRow">
+        <view class="text2">接力墙</view>
+      </view>
+      <view class="panel22 panel21 FlexColumn">
+        <view class="panelWeeks FlexRow">
+          <view class="week" wx:for="{{Weeks}}" wx:key="*this">{{item}}</view>
+        </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}}">
+              <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>
+          </block>
+
+
+        </view>
+        <view class="panel2Line"></view>
+        <view class="panel23">今天是{{Info.Today}}。</view>
+        <view class="panel23">本月：练习{{Info.CurrentMonth.length}}天，接力{{Info.ShareNumberMonth}}次，有{{Info.CurrentMonth.length-Info.ShareNumberMonth}}天没接力。</view>
+        <view class="panel2Line2"></view>
+        <view class="panel25 FlexRow">
+          <text class="text13">自{{Info.ShareFirstDay}}首次接力以来共接力</text>
+          <view class="panel251 FlexRow"><text class="text3">{{Info.ShareNumber}}</text><text class="text14">次</text></view>
+        </view>
+        <view class="panel26" bindtap="goto" data-url="./sharewall">
+          查看全部
+        </view>
+
+      </view>
+    </view>
+
+    <view class="panel2 FlexColumn">
+      <view class="panel21 FlexRow">
+        <view class="text2">我的里程碑</view>
+      </view>
+      <view class="panel220 panel22 panel21 FlexColumn">
+        <view class="panel221"></view>
+        <image class="qmjl_main_pic_1" src="../images/qmjl_main_pic_1.png"></image>
+        <text class="text4">距离下一个里程碑\n还要练习</text>
+        <view class="panel222 FlexRow">
+          <view class="text6"></view>
+          <view class="text5">{{Info.RemainingDays}}</view>
+          <view class="text6">天</view>
+        </view>
+        <view class="panel223 FlexRow">
+          <view class="text7">{{Info.MilestonePrev.Name}}</view>
+          <view class="text7">{{Info.MilestoneNext.Name}}</view>
+        </view>
+        <view class="panel224 FlexRow">
+          <view class="panel2241" style="width:{{Info.Rate}};"></view>
+        </view>
+        <view class="panel225" bindtap="goto" data-url="./milestone">
+          查看全部
+        </view>
+      </view>
+    </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 class="panelHelpCommon1 FlexRow">
+      <view class="panelHelpCommon11 FlexRow">
+        <image class="panelHelpCommonIcon" src="../images/icon_light_1.png"></image>
+      </view>
+      <view class="panelHelpCommon12 FlexColumn">
+        <view class="panelHelpCommonText1">帮助</view>
+        <view class="panelHelpCommonText2">勤勉接力怎么玩？</view>
+      </view>
+    </view>
+    <image class="panelHelpCommonNextPage" src="../images/icon_nextpage_7.png"></image>
+  </view>
+  <view class="panelHeight"></view>
+</view>

pages/share/shareindex.wxss

@@ -0,0 +1,382 @@
+.container{
+  background-color: #FFFFFF;
+}
+.panel1{
+  width:100%;
+  position: relative;
+  align-items: flex-start;
+}
+.panelBg{
+  position: absolute;
+  top:0;
+  width: 100%;
+  height:720rpx;
+  background-image: linear-gradient(180deg, #FFD66E 0%, #FFFFFF 100%);
+}
+.text1{
+  font-family: Roboto-Black;
+  font-size: 64rpx;
+  color: #2E2E2E;
+  z-index: 10;
+  margin-left: 30rpx;
+}
+
+.panel11{
+  margin-top: 30rpx;
+  width: 100%;
+  justify-content: space-between;
+  z-index: 10;
+}
+.text2{
+  font-size: 36rpx;
+  color: #4D4D4D;
+  margin-left: 30rpx;
+}
+
+.panelCard{
+  width:100%;
+  height:435rpx;
+  white-space: nowrap;
+  margin-top: 30rpx;
+  z-index: 10;
+}
+
+.Card0{
+  width:20rpx;
+  height:435rpx;
+  display: inline-block;
+}
+
+.Card{
+  width:580rpx;
+  height:435rpx;
+  display: inline-block;
+  margin: 0 20rpx 0 0;
+  position: relative;
+  border-radius: 20rpx;
+}
+
+.CardImg{
+  border-radius: 20rpx;
+  width:580rpx;
+  height:435rpx;
+}
+
+.CardText{
+  position: absolute;
+  top:0;
+  left:0;
+  width:580rpx;
+  height:435rpx;
+  color:#fff;
+  justify-content: flex-start;
+  align-items: flex-start;
+
+  display: flex;
+}
+.Card1{
+  font-family: Roboto-Black;
+  font-size: 28rpx;
+  text-shadow: 0 3rpx 0 rgba(0,0,0,0.20);
+  margin: 40rpx 0 0 40rpx;
+}
+.Card2{
+  font-family: Roboto-Black;
+  font-size: 72rpx;
+  text-shadow: 0 3rpx 0 rgba(0,0,0,0.20);
+  margin: 0 0 0 40rpx;
+}
+.Card3{
+  font-size: 24rpx;
+  text-shadow: 0 3rpx 0 rgba(0,0,0,0.20);
+  margin: 30rpx 0 0 10rpx;
+}
+.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-align: left;
+  white-space:pre-wrap;
+  justify-content: flex-end;
+  align-items: flex-start;
+}
+.Card6{
+  font-family: Roboto-Black;
+  font-size: 72rpx;
+  text-shadow: 0 3rpx 0 rgba(0,0,0,0.20);
+  margin: 0 0 0 40rpx;
+}
+
+.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;
+  position: relative;
+}
+
+.CardEnd1{
+  width:240rpx;
+  height:435rpx;
+  position: absolute;
+}
+
+.icon_flag_1{
+  width:30rpx;
+  height:30rpx;
+  margin-bottom: 20rpx;
+}
+
+.Card5{
+  color: #FFFFFF;
+  text-shadow: 0 3rpx 0 rgba(0,0,0,0.50);
+  font-size: 28rpx;
+}
+
+.panel2{
+  margin:45rpx 0 60rpx 0;
+  width: 100%;
+}
+.panel21{
+  justify-content: flex-start;
+  width: 100%;
+}
+.panel22{
+  border-radius: 20rpx;
+  background-color: #F2F2F2;
+  margin-top: 30rpx;
+  width:710rpx;
+}
+.panelWeeks{
+  font-size: 20rpx;
+  color: #787878;
+  margin: 40rpx 0 30rpx 0;
+}
+.week{
+  font-size: 20rpx;
+  color: #787878;
+  margin: 0 28rpx 0 28rpx;
+}
+
+.panelDays{
+  width: 690rpx;
+  margin-left: 20rpx;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+.day{
+  margin: 0 28rpx 0 28rpx;
+  font-family: Roboto-Black;
+  color:#4D4D4D;
+  border-radius: 4rpx;
+  margin: 3rpx;
+  width:90rpx;
+  height:90rpx;
+  position: relative;
+}
+
+.day0{
+  background: #FFFFFF;
+  border: 6rpx solid #fff;
+  border-radius: 4rpx;
+  width:78rpx;
+  height:78rpx;
+}
+
+.img{
+  width:90rpx;
+  height:90rpx;
+  position: absolute;
+  border-radius: 4rpx;
+}
+
+.img2{
+  background-color: rgba(0,0,0,0.20);
+  border-radius: 4rpx;
+}
+
+.text12{
+  font-size: 24rpx;
+  color: #9B9B9B;
+  text-align: center;
+  z-index: 10;
+}
+
+
+.panel2Line{
+  background: #BCBCBC;
+  width: 650rpx;
+  height:1rpx;
+  margin: 40rpx 0 30rpx 0;
+}
+
+.panel2Line2{
+  background: #BCBCBC;
+  width: 650rpx;
+  height:1rpx;
+  margin: 20rpx 0 30rpx 0;
+}
+
+.panel23{
+  font-size: 24rpx;
+  color: #4D4D4D;
+  margin-bottom: 10rpx;
+  padding-left: 30rpx;
+  align-self: flex-start;
+}
+
+.panel25{
+  width:100%;
+  align-items: flex-start;
+  align-self: flex-start;
+  justify-content: space-between;
+}
+
+.text13{
+  margin-left: 30rpx;
+  font-size: 24rpx;
+  color: #4D4D4D;
+  
+}
+
+.panel251{
+  margin: 0 50rpx 0 0;
+  justify-content: flex-start;
+  align-items: flex-end;
+}
+
+.text3{
+  font-family: Roboto-Black;
+  font-size: 64rpx;
+  color: #4D4D4D;
+  margin-top: -20rpx;
+
+}
+.text14{
+  font-size: 20rpx;
+  color: #4D4D4D;
+  margin: 0 0 15rpx 4rpx;
+}
+
+.panel26{
+  width:500rpx;
+  line-height:90rpx;
+  background-color: #fff;
+  border-radius: 20rpx;
+  font-size: 36rpx;
+  color: #4D4D4D;
+  text-align: center;
+  margin: 30rpx 0 60rpx 0;
+}
+
+.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);
+  border-radius: 50%;
+  width: 100rpx;
+  height:100rpx;
+  margin-top: 72rpx;
+}
+.qmjl_main_pic_1{
+  width:85rpx;
+  height:92rpx;
+  position: absolute;
+  top:49rpx;
+}
+
+.text4{
+  font-size: 32rpx;
+  color:#4D4D4D;
+  margin-top: 21rpx;
+  text-align: center;
+}
+
+
+.text5{
+  font-family: Roboto-Black;
+  font-size: 72rpx;
+  color: #4D4D4D;
+  text-align: center;
+  margin: 0 10rpx;
+}
+
+.text6{
+  font-size: 20rpx;
+  color: #4D4D4D;
+  margin-top: 30rpx;
+  width:20rpx;
+}
+
+.panel223{
+  margin-top: 50rpx;
+  width:500rpx;
+  justify-content: space-between;
+}
+
+.text7{
+  font-family: Roboto-Black;
+  font-size: 28rpx;
+  color: #4D4D4D;
+}
+
+.panel224{
+  background: #F0F0F0;
+  border-radius: 8rpx;
+  width:500rpx;
+  justify-content: flex-start;
+  margin-top: 10rpx;
+  height:16rpx;
+}
+
+.panel2241{
+  background: #F38121;
+  border-radius: 8rpx 0 0 8rpx;
+  height:16rpx;  
+}
+
+.panel225{
+  background: #FFFFFF;
+  border-radius: 20rpx;
+  font-size: 36rpx;
+  color: #4D4D4D;
+  text-align: center;
+  width:500rpx;
+  line-height: 90rpx;
+  margin: 60rpx 0;
+}
+
+
+.text10{
+  font-size: 36rpx;
+  color: #4D4D4D;
+  margin: 100rpx 0 0 30rpx;
+  align-self: flex-start;
+}
+.text11{
+  font-size: 24rpx;
+  color: #4D4D4D;
+  margin: 30rpx 0 0 30rpx;
+  align-self: flex-start;
+}
+
+.panelHelpCommon_0{
+  position: fixed;
+  left:20rpx;
+  bottom:60rpx;
+  margin: 0 0 0 0;
+}
+
+.panelHeight{
+  width:100%;
+  height:90rpx;
+}

pages/share/shareitem.js

@@ -0,0 +1,456 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+var innerAudioContext1;
+
+Page({
+  data: {
+    IPhoneX: "",
+    IsPlay: false,
+  },
+  onReady: function () {
+    var that = this;
+    innerAudioContext1 = wx.createInnerAudioContext();
+    innerAudioContext1.onPlay(() => {
+      console.log('开始播放');
+    });
+
+    innerAudioContext1.onEnded(() => {
+      console.log('停止播放');
+      that.playSound();
+    });
+
+    innerAudioContext1.onError((res) => {
+      console.log("innerAudioContext1.errMsg:" + res.errMsg);
+      console.log("innerAudioContext1.errCode:" + res.errCode);
+      main.getBaiduToken();
+      that.setData({
+        IsPlay: false,
+      });
+    });
+  },
+  onLoad: function (options) {
+    var that = this;
+    var ishistory = 0;
+    if (options.IsHistory)
+      ishistory = 1;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      IsHistory: ishistory,
+      IsBuildReport: false,
+      IsBuildReportHistory: false,
+    });
+
+    that.init(options.TaskID, options.Day, ishistory);
+
+  },
+
+  onUnload: function () {
+    if (innerAudioContext1) {
+      innerAudioContext1.stop();
+    }
+  },
+  init: function (taskid, day, isHistory) {
+    var that = this;
+
+    var url = 'GetShareItemInfo?IsHistory=' + isHistory + '&UserID=' + app.globalData.userInfo.UserID + "&TaskID=" + taskid;
+    main.getData(url, function (data) {
+      data.Day = day;
+      that.setData({
+        Info: data,
+      });
+
+      if (that.data.IsHistory) {
+        that.setData({
+          Avatar: app.globalData.userInfo.AvatarUrl,
+          NickName: app.globalData.userInfo.NickName,
+          BgColor: main.getShareImageBackColor(),
+        });
+      }
+    });
+
+    if (app.globalData.IsIPhoneX) {
+      that.setData({
+        IPhoneX: "_IPhoneX",
+      });
+    }
+
+    //如果没有生成过二维码，则生成
+    if (!app.globalData.userInfo.HasACode) {
+      var imageQRCode = "BuildMiaoguoQRCode?IsWeb=1&UserID=" + app.globalData.userInfo.UserID;
+      main.getData(imageQRCode, function (data) {});
+      app.globalData.userInfo.HasACode = 1;
+    }
+  },
+  showImageSource: function (e) {
+    var name = e.currentTarget.dataset.image;
+    name = name.replace("_b_", "_a_");
+    wx.previewImage({
+      current: name,
+      urls: [name],
+    });
+  },
+  playSound: function () {
+    var that = this;
+    that.data.IsPlay = !that.data.IsPlay;
+    that.setData({
+      IsPlay: that.data.IsPlay,
+    });
+    if (that.data.IsPlay) {
+      var str = "古往今来肺腑之言，常用名句收入囊中。\n";
+      str += "小朋友，你好。\n";
+      str += "今天来给你打气的是【" + that.data.Info.AuthorCn + "】\n";
+      str += "他要对你说：\n";
+      str += that.data.Info.Content + "\n";
+
+      str += that.data.Info.AuthorCn + "是谁？";
+      str += "他是" + that.data.Info.Country + "的" + that.data.Info.Title + "。\n";
+      str += "有兴趣的小朋友，可以了解一下他的故事。我们下次接力再见。";
+
+      var url = app.globalData.audioUrlBaidu;
+      url = url.replace("[token]", app.globalData.BaiduToken);
+      url = url.replace("[word]", str);
+      url = url.replace("spd=3", "spd=5");
+
+      url = encodeURI(url);
+      wx.showLoading({
+        title: '音频下载中',
+        mask: true,
+      });
+      var timeout = setTimeout(function () {
+        wx.hideLoading();
+      }, 30000);
+      //console.log(url);
+      wx.downloadFile({
+        url: url,
+        success(res) {
+          wx.hideLoading();
+          clearTimeout(timeout);
+
+          innerAudioContext1.src = res.tempFilePath;
+          innerAudioContext1.play();
+        },
+        fail(err) {
+          wx.hideLoading();
+        }
+      });
+    } else {
+      if (innerAudioContext1)
+        innerAudioContext1.stop();
+    }
+  },
+  //生成里程碑分享图片
+  buildShareImageMilestone: function () {
+    var that = this;
+
+    that.setData({
+      IsBuildReport: true,
+    });
+
+    var url1 = that.data.Info.MilestoneImage;
+    var url3 = app.globalData.userInfo.AvatarUrl;
+    var _uid = common.Encrypt(app.globalData.userInfo.UserID);
+    if (_uid.indexOf("/") >= 0)
+      _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) {
+          const query = wx.createSelectorQuery();
+          query.select('#shareCanvas')
+            .fields({
+              node: true,
+              size: true
+            })
+            .exec((res) => {
+              
+                
+              const canvas = res[0].node;
+              const ctx = canvas.getContext('2d');
+
+              const dpr = wx.getSystemInfoSync().pixelRatio;
+              canvas.width = res[0].width * dpr;
+              canvas.height = res[0].height * dpr;
+              ctx.scale(dpr, dpr);
+
+              var img = canvas.createImage();
+              img.src = tempFilePath1;
+              img.onload = e => {
+                ctx.drawImage(img, 0, 0, 700, 1050);
+              };
+
+              setTimeout(function(){
+
+                ctx.fillStyle = "#ffffff";
+                ctx.shadowBlur=4;
+                ctx.shadowOffsetY=2;
+                ctx.shadowColor="rgba(0,0,0,0.3)";
+                ctx.fillRect(570, 70, 90, 90);
+  
+                var img3 = canvas.createImage();
+                img3.src = tempFilePath3;
+                img3.onload = e => {
+                  ctx.drawImage(img3, 575, 75, 80, 80);
+                };
+
+                var img4 = canvas.createImage();
+                img4.src = tempFilePath4;
+                img4.onload = e => {
+                  ctx.drawImage(img4, 530, 880, 140, 140);
+                };
+
+                ctx.fillStyle = "#f2f2f2";
+                ctx.font = "normal 500 24px caption";
+                ctx.fillText(that.data.Info.Content1, 56, 650);
+                ctx.fillText(that.data.Info.Content2, 56, 683);
+                ctx.fillText(that.data.Info.Content3, 56, 716);
+                
+                ctx.fillStyle = "#4d4d4d";
+                ctx.font = "normal 500 16px caption";
+                ctx.shadowBlur=0;
+                ctx.shadowOffsetY=0;
+                for(var i=0;i< that.data.Info.Content.length;i++)
+                  ctx.fillText(that.data.Info.Content[i], 50, 917+i*30);
+                
+                main.BuildImage(700, 1050, canvas, function () {
+                  main.getData("ShareMiaoguoTask?UserID=" + app.globalData.userInfo.UserID, function (data) {
+                    that.setData({
+                      IsBuildReport: false,
+                    });
+                  });
+                });
+
+              },500);
+            });
+        });
+      });
+    });
+  },
+  //生成分享图片
+  buildShareImage: function () {
+    var that = this;
+
+    that.setData({
+      IsBuildReport: true,
+    });
+
+    var url1 = that.data.Info.Image.replace("_b_", "_d_");
+    var url2 = that.data.Info.WordImage;
+    var url3 = app.globalData.userInfo.AvatarUrl;
+    var _uid = common.Encrypt(app.globalData.userInfo.UserID);
+    if (_uid.indexOf("/") >= 0)
+      _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) {
+            const query = wx.createSelectorQuery();
+            query.select('#shareCanvas')
+              .fields({
+                node: true,
+                size: true
+              })
+              .exec((res) => {
+                const canvas = res[0].node;
+                const ctx = canvas.getContext('2d');
+
+                const dpr = wx.getSystemInfoSync().pixelRatio;
+                canvas.width = res[0].width * dpr;
+                canvas.height = res[0].height * dpr;
+                ctx.scale(dpr, dpr);
+
+                var img = canvas.createImage();
+                img.src = tempFilePath1;
+                img.onload = e => {
+                  ctx.drawImage(img, 0, 0, 700, 520);
+                };
+
+                var img2 = canvas.createImage();
+                img2.src = tempFilePath2;
+                img2.onload = e => {
+                  ctx.drawImage(img2, 0, 520, 700, 270);
+                };
+
+                ctx.fillStyle = "#ffffff";
+                ctx.fillRect(0, 790, 700, 260);
+
+                var img3 = canvas.createImage();
+                img3.src = tempFilePath3;
+                img3.onload = e => {
+                  ctx.drawImage(img3, 610, 807, 60, 60);
+                  var img5 = canvas.createImage();
+                  img5.src = "../../pages/images/promotion_face_circle.png";
+                  img5.onload = e => {
+                    ctx.drawImage(img5, 610, 807, 60, 60);
+                  };
+                };
+
+                var img4 = canvas.createImage();
+                img4.src = tempFilePath4;
+                img4.onload = e => {
+                  ctx.drawImage(img4, 530, 880, 140, 140);
+                };
+
+                ctx.fillStyle = "#4d4d4d";
+                ctx.fillRect(30, 836, 560, 2);
+
+                ctx.font = "normal 600 18px caption";
+                ctx.fillText("我的「秒过」勤勉接力", 30, 866);
+
+                ctx.font = "normal 600 18px caption";
+                ctx.fillText("坚持练习", 30, 911);
+
+                ctx.font = "normal 600 18px caption";
+                ctx.fillText("天", 30, 1016);
+
+                ctx.font = "normal 600 16px caption";
+                ctx.fillText("勇敢挑战", 266, 934);
+
+                ctx.font = "normal 600 16px caption";
+                ctx.fillText("个知识点", 266, 998);
+
+                ctx.font = "normal 600 16px caption";
+                ctx.fillText("专注复习", 370, 934);
+
+                ctx.font = "normal 600 16px caption";
+                ctx.fillText("分钟", 370, 998);
+
+                ctx.font = "normal 500 18px Roboto-Black";
+                ctx.fillText(that.data.Info.CreateTimeStr1, 30, 823);
+
+                ctx.font = "normal 500 96px Roboto-Black";
+                ctx.fillText(that.data.Info.Day, 30, 994);
+
+                ctx.font = "normal 500 36px Roboto-Black";
+                ctx.fillText(that.data.Info.CardTaskTotal, 266, 974);
+
+                ctx.font = "normal 500 36px Roboto-Black";
+                ctx.fillText(that.data.Info.DurationTotal, 370, 974);
+
+                main.BuildImage(700, 1050, canvas, function () {
+                  main.getData("ShareMiaoguoTask?UserID=" + app.globalData.userInfo.UserID, function (data) {
+                    that.setData({
+                      IsBuildReport: false,
+                    });
+                  });
+                });
+
+              });
+          });
+        });
+      });
+    });
+
+  },
+  //生成分享图片(历史)
+  buildShareImageHistory: function () {
+    var that = this;
+
+    that.setData({
+      IsBuildReportHistory: true,
+    });
+
+    var date = that.data.Info.CreateTimeStr1
+    var todayTime = that.data.Info.DurationMinute;
+    var dayNumber = that.data.Info.Day;
+
+    var avatarUrl = app.globalData.userInfo.AvatarUrl;
+    avatarUrl = avatarUrl.substring(0, avatarUrl.lastIndexOf("/") + 1);
+    avatarUrl = avatarUrl + "0";
+
+    main.DownloadFile(avatarUrl, function (tempFilePath) {
+      const query = wx.createSelectorQuery();
+      query.select('#shareCanvasHistory')
+        .fields({
+          node: true,
+          size: true
+        })
+        .exec((res) => {
+          const canvas = res[0].node;
+          const ctx = canvas.getContext('2d');
+
+          const dpr = wx.getSystemInfoSync().pixelRatio;
+          canvas.width = res[0].width * dpr;
+          canvas.height = res[0].height * dpr;
+          ctx.scale(dpr, dpr);
+
+          var img = canvas.createImage();
+          img.src = tempFilePath;
+          img.onerror = err => {
+            console.log(err);
+          };
+          img.onload = e => {
+            ctx.drawImage(img, 0, 0, 360, 360);
+            var img2 = canvas.createImage();
+            img2.src = "../images/universalpic_screenshot_jl_bgimage_360x360.png";
+            img2.onload = e => {
+              ctx.drawImage(img2, 0, 0, 360, 360);
+
+              ctx.fillStyle = that.data.BgColor;
+
+              ctx.fillRect(360, 0, 240, 360);
+
+              ctx.fillStyle = "#ffffff";
+              ctx.font = "normal 500 24px caption";
+              ctx.fillText(app.globalData.userInfo.NickName, 30, 306);
+
+              ctx.font = "normal 500 18px caption";
+              ctx.fillText(date, 30, 335);
+
+              ctx.font = "normal 500 20px caption";
+              ctx.fillText("秒过学习", 390, 40);
+              ctx.font = "normal 500 44px caption";
+              ctx.fillText("勤勉接力", 390, 88);
+              ctx.font = "normal 500 20px caption";
+              ctx.fillText("见证成长", 390, 140);
+
+              ctx.font = "normal 500 68px caption";
+              if (!todayTime)
+                todayTime = 0;
+
+              ctx.fillText(todayTime, 390, 209);
+
+              ctx.font = "normal 500 68px caption";
+              var metrics = ctx.measureText(todayTime.toString());
+              //console.log(JSON.stringify(metrics));
+
+              var h = 209;
+              if (app.globalData.IsIOS)
+                h = 206;
+              ctx.font = "normal 500 32px caption";
+              ctx.fillText("分钟", 393 + Math.round(metrics.width), h);
+
+
+              ctx.font = "normal 500 20px caption";
+              ctx.fillText("迄今已练习", 390, 295);
+
+              ctx.font = "normal 500 32px caption";
+              ctx.fillText(dayNumber + "天", 390, 333);
+
+              main.BuildImage(600, 360, canvas, function () {
+                that.setData({
+                  IsBuildReportHistory: false,
+                });
+              });
+            };
+          };
+        });
+    });
+  },
+
+  showHelpImage: function (e) {
+    main.ShowHelpImage();
+  },
+
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/share/shareitem.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarBackgroundColor": "#FFFFFF",
+  "navigationBarTextStyle": "black",
+  "backgroundColorTop":"#FFFFFF",
+  "navigationBarTitleText": "勤勉接力"
+}

pages/share/shareitem.wxml

@@ -0,0 +1,109 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <block wx:if="{{!IsHistory && !Info.MilestoneDayNumber}}">
+    <view class="panel1 FlexRow">
+      <view class="panel11 FlexColumn">
+        <view class="panel111 FlexRow">
+          <view class="text1">{{Info.Day}}</view>
+          <view class="text2">th</view>
+        </view>
+        <view class="text3">RELAY</view>
+      </view>
+      <view class="line1"></view>
+      <view class="panel12 FlexColumn">
+        <text class="text4">{{Info.CreateTimeStr2}}</text>
+        <text class="text5">复习之后小歇片刻，名言美景沁人心脾</text>
+      </view>
+    </view>
+    <image bindtap="showImageSource" data-image="{{Info.Image}}" class="panelImage1" lazy-load="true" mode="widthFix" src="{{Info.Image}}">
+    </image>
+    <view class="text6">{{Info.AuthorCn}}</view>
+    <view class="text7">来给你打气</view>
+    <image class="icon_punctuation_1" lazy-load="true" src="../images/icon_punctuation_1.png"></image>
+    <text class="text8">{{Info.Content}}</text>
+    <image class="icon_punctuation_2" lazy-load="true" src="../images/icon_punctuation_2.png"></image>
+    <view class="text9">Ta是谁？</view>
+    <view class="text10">{{Info.Country}}</view>
+    <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="panelFooter{{IPhoneX}} panelFooter FlexRow">
+      <view class="panelFooter1 FlexRow" bindtap="playSound">
+        <image wx:if="{{!IsPlay}}" class="icon_player_1" src="../images/icon_player_1.png"></image>
+        <image wx:if="{{IsPlay}}" class="icon_player_1" src="../images/icon_player_2.png"></image>
+        <view wx:if="{{!IsPlay}}" class="text14">播报</view>
+        <view wx:if="{{IsPlay}}" class="text14">停止</view>
+      </view>
+      <view class="panelFooter2 FlexRow" bindtap="buildShareImage">
+        <image class="icon_player_1" src="../images/icon_flag_1.png"></image>
+        <view class="text15">生成群接力图片</view>
+      </view>
+    </view>
+  </block>
+
+  <block wx:if="{{!IsHistory && Info.MilestoneDayNumber}}">
+    
+    <view class="panelMilestone FlexColumn" style="{{Info.Color}}">
+      <view class="panelMilestoneText1">祝贺您</view>
+      <view class="panelMilestoneText2 panelMilestoneText1">获得里程碑</view>
+      <view class="panelMilestoneText3">{{Info.Name[0]}}</view>
+      <view class="panelMilestoneText4 panelMilestoneText3">{{Info.Name[1]}}</view>
+      <view class="panelMilestoneText5">{{Info.Content1+Info.Content2+Info.Content3}}</view>
+    </view>
+
+    <view class="panelFooter{{IPhoneX}} panelFooter FlexRow">
+      <view class="panelFooter3 panelFooter2 FlexRow" bindtap="buildShareImageMilestone">
+        <image class="icon_player_1" src="../images/icon_flag_1.png"></image>
+        <view class="text15">生成群接力图片</view>
+      </view>
+    </view>
+  </block>
+
+  <block wx:if="{{IsHistory}}">
+    <view class="text18">历史快照</view>
+
+    <view class="panel2 FlexRow" style="background-color: {{BgColor}};">
+      <image class="panel2Image" src="{{Avatar}}"></image>
+      <view class="panel21 FlexColumn">
+        <view class="text27">{{NickName}}</view>
+        <view class="text28">{{Info.CreateTimeStr1}}</view>
+      </view>
+      <view class="panel22 FlexColumn">
+        <view class="text20">秒过学习</view>
+        <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>
+    </view>
+
+    <text class="text19">这是勤勉接力老版本的图片格式，给您留作纪念。如果左侧头像不能正常显示，请前往手册栏目，点击顶部用户头像，然后重新授权用户信息，刷新后即可解决。
+      感谢您在秒过最初的三年里坚持接力。欢迎继续使用新版勤勉接力。内容更丰富，画面更精美。</text>
+
+    <view class="panelHelpCommon FlexRow" bindtap="showHelpImage">
+      <view class="panelHelpCommon1 FlexRow">
+        <view class="panelHelpCommon11 FlexRow">
+          <image class="panelHelpCommonIcon" src="../images/icon_light_1.png"></image>
+        </view>
+        <view class="panelHelpCommon12 FlexColumn">
+          <view class="panelHelpCommonText1">帮助</view>
+          <view class="panelHelpCommonText2">勤勉接力怎么玩？</view>
+        </view>
+      </view>
+      <image class="panelHelpCommonNextPage" src="../images/icon_nextpage_7.png"></image>
+    </view>
+
+    <view class="panelFooter{{IPhoneX}} panelFooter FlexRow">
+      <view class="panelFooter3 panelFooter2 FlexRow" bindtap="buildShareImageHistory">
+        <image class="icon_player_1" src="../images/icon_flag_1.png"></image>
+        <view class="text15">生成群接力图片</view>
+      </view>
+    </view>
+  </block>
+</view>
+
+<canvas wx:if="{{IsBuildReport}}" type="2d" id="shareCanvas"></canvas>
+
+<canvas wx:if="{{IsBuildReportHistory}}" type="2d" id="shareCanvasHistory"></canvas>

pages/share/shareitem.wxss

@@ -0,0 +1,320 @@
+.container {
+  background-color: #fff;
+  color: #4D4D4D;
+}
+
+.panel1 {
+  width: 100%;
+  justify-content: flex-start;
+  margin: 30rpx 0;
+  align-items: flex-start;
+}
+
+.panel11 {
+  align-items: flex-start;
+  width: 201rpx;
+  margin-left: 50rpx;
+  justify-content: flex-start;
+}
+
+.panel11 {
+  margin-top: 4rpx;
+}
+
+.text1 {
+  font-family: Roboto-Black;
+  font-size: 64rpx;
+}
+
+.text2 {
+  font-family: Roboto-Black;
+  font-size: 24rpx;
+  margin-top: 30rpx;
+}
+
+.text3 {
+  font-family: Roboto-Black;
+  font-size: 16rpx;
+}
+
+.line1 {
+  background: #4D4D4D;
+  width: 8rpx;
+  height: 130rpx;
+  margin: 0 30rpx 0 0;
+}
+
+.panel12 {
+  align-items: flex-start;
+  justify-content: flex-start;
+  margin-top: 14rpx;
+}
+
+.text4 {
+  font-size: 24rpx;
+  margin-bottom: 10rpx;
+}
+
+.text5 {
+  font-size: 22rpx;
+}
+
+.panelImage1 {
+  width: 750rpx;
+}
+
+.text6 {
+  align-self: flex-start;
+  margin: 80rpx 0 0 50rpx;
+  font-size: 36rpx;
+}
+
+.text7 {
+  align-self: flex-start;
+  margin: 0 0 0 50rpx;
+  font-size: 24rpx;
+}
+
+.icon_punctuation_1 {
+  width: 40rpx;
+  height: 30rpx;
+  margin: 60rpx 0 60rpx 50rpx;
+  align-self: flex-start;
+}
+
+.text8 {
+  width: 590rpx;
+  height: 200rpx;
+  font-size: 48rpx;
+}
+
+.icon_punctuation_2 {
+  width: 40rpx;
+  height: 30rpx;
+  margin: 60rpx 50rpx 80rpx 0;
+  align-self: flex-end;
+}
+
+.text9 {
+  font-size: 36rpx;
+  align-self: flex-start;
+  margin-left: 50rpx;
+}
+
+.text10 {
+  font-size: 28rpx;
+  margin: 30rpx 0 0 50rpx;
+  align-self: flex-start;
+}
+
+.text11 {
+  font-size: 28rpx;
+  margin: 0 0 0 50rpx;
+  align-self: flex-start;
+}
+
+.text12 {
+  font-size: 28rpx;
+  margin: 0 0 60rpx 50rpx;
+  align-self: flex-start;
+}
+
+.text13 {
+  font-size: 24rpx;
+  color: #1E1E1E;
+  letter-spacing: 1.6rpx;
+  line-height: 48rpx;
+  font-weight: 400;
+  width: 650rpx;
+  margin: 60rpx 0 190rpx 0;
+}
+
+.panelFooter {
+  position: fixed;
+  width: 100%;
+  height: 130rpx;
+  bottom: 0;
+  background-color: #fff;
+  border-top: 1rpx solid #d2d2d2;
+  align-items: flex-start;
+  z-index: 10;
+}
+
+.panelFooter_IPhoneX {
+  height: 150rpx;
+}
+
+.panelFooter1 {
+  width: 200rpx;
+  height: 130rpx;
+}
+
+.panelFooter2 {
+  width: 510rpx;
+  height: 100rpx;
+  background: #5282FA;
+  border-radius: 20rpx;
+  margin-top: 15rpx;
+}
+
+.panelFooter3 {
+  width: 710rpx;
+}
+
+.text14 {
+  font-size: 28rpx;
+  margin-left: 10rpx;
+}
+
+.icon_player_1 {
+  width: 30rpx;
+  height: 30rpx;
+}
+
+.text15 {
+  font-size: 36rpx;
+  color: #FFFFFF;
+  margin-left: 20rpx;
+}
+
+.text18 {
+  align-self: flex-start;
+  margin: 60rpx 0 0 30rpx;
+  font-size: 36rpx;
+}
+
+.text19 {
+  width: 690rpx;
+  font-size: 24rpx;
+  color: #1E1E1E;
+  line-height: 48rpx;
+  letter-spacing: 1.6rpx;
+  margin: 60rpx 0;
+  font-weight: 400;
+}
+
+.panel2 {
+  align-self: flex-start;
+  width: 600rpx;
+  height: 360rpx;
+  margin: 30rpx 0 0 30rpx;
+  justify-content: flex-start;
+  align-items: flex-start;
+  position: relative;
+  color: #FFFFFF;
+}
+
+.panel2Image {
+  width: 360rpx;
+  height: 360rpx;
+}
+
+.panel21 {
+  position: absolute;
+  bottom: 20rpx;
+  left: 30rpx;
+  align-items: flex-start;
+}
+
+.text27 {
+  font-size: 24rpx;
+}
+
+.text28 {
+  font-size: 18rpx;
+}
+
+.panel22 {
+  align-items: flex-start;
+  justify-content: flex-start;
+  margin-left: 30rpx;
+  width: 240rpx;
+}
+
+.text20 {
+  font-size: 20rpx;
+  margin-top: 30rpx;
+}
+
+.text21 {
+  font-size: 44rpx;
+}
+
+.text22 {
+  font-size: 20rpx;
+}
+
+.text23 {
+  font-size: 68rpx;
+}
+
+.text24 {
+  font-size: 32rpx;
+  margin-top: 20rpx;
+}
+
+.text25 {
+  font-size: 20rpx;
+  margin-top: 24rpx;
+}
+
+.text26 {
+  font-size: 32rpx;
+}
+
+.panelMilestone {
+  width: 100%;
+  height: 1075rpx;
+  justify-content: flex-start;
+  align-items: flex-start;
+  position: fixed;
+  top: 0;
+}
+
+.panelMilestoneText1 {
+  font-size: 48rpx;
+  text-shadow: 5rpx 5rpx 0 rgba(0, 0, 0, 0.10);
+  margin-left: 50rpx;
+  margin-top: 120rpx;
+  color: #FFFFFF;
+}
+
+.panelMilestoneText2 {
+  margin-top: 0rpx;
+}
+
+.panelMilestoneText3 {
+  margin-top: 0rpx;
+  font-family: Roboto-Black;
+  font-size: 220rpx;
+  color: #F2F2F2;
+  text-shadow: 6rpx 6rpx 0 rgba(0, 0, 0, 0.10);
+  margin-left: 50rpx;
+}
+
+.panelMilestoneText4 {
+  font-size:100rpx;
+  margin-top: -31rpx;
+}
+
+.panelMilestoneText5 {
+  font-size: 28rpx;
+  color: #FFFFFF;
+  width:600rpx;
+  margin: 40rpx 0 0 50rpx;
+}
+
+
+#shareCanvas {
+  width: 700px;
+  height: 1050px;
+  position: absolute;
+  left: 800rpx;
+}
+
+#shareCanvasHistory {
+  width: 600px;
+  height: 360px;
+  position: absolute;
+  left: 800rpx;
+}

pages/share/sharewall.js

@@ -0,0 +1,54 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    List:[],
+  },
+  onLoad: function (options) {
+    var that = this;
+    
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+
+    that.getList({currentTarget:{dataset:{id:99999}}});
+  }, 
+  getList:function(e){
+    var that = this;
+    var pageindex="&PageIndex="+e.currentTarget.dataset.id;
+  
+    var url = 'GetShareWall?UserID=' + app.globalData.userInfo.UserID+pageindex;
+    main.getData(url, function (data) {
+      
+      that.setData({
+        Info:data,
+      });
+      
+    });
+  },
+  gotoDetail:function(e){
+    var id=e.currentTarget.dataset.id;
+    var ismilestone=e.currentTarget.dataset.ismilestone;
+    if (ismilestone || e.currentTarget.dataset.image){
+      wx.navigateTo({
+        url: "./shareitem?TaskID="+id+"&Day="+e.currentTarget.dataset.day,
+      });
+    }
+    else if (!e.currentTarget.dataset.image){
+      wx.navigateTo({
+        url: "./shareitem?TaskID="+id+"&IsHistory=1&Day="+e.currentTarget.dataset.day,
+      });
+    }
+
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/share/sharewall.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarBackgroundColor": "#2E2E2E",
+  "navigationBarTextStyle": "white",
+  "backgroundColorTop":"#2E2E2E",
+  "navigationBarTitleText": "接力墙"
+}

pages/share/sharewall.wxml

@@ -0,0 +1,28 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <scroll-view scroll-x class="panel0 FlexRow">
+    <view class="panel00"></view>
+    <view bindtap="getList" data-id="{{item.PageIndex}}" class="text0_{{item.IsSelected}} text0" wx:for="{{Info.Menu}}" wx:key="*this">{{item.Name}}</view>
+    <view class="panel00"></view>
+  </scroll-view>
+  <view class="lineWidthAll FlexRow">
+    <view class="lineWidth720"></view>
+  </view>
+  <view class="panel1 FlexColumn">
+    <view class="text1">接力记录</view>
+    <view class="panel11 FlexRow">
+      <view class="text2">{{Info.DateStart}} - {{Info.DateEnd}}</view>
+    </view>
+  </view>
+
+  <view class="panel2 FlexRow">
+    <view class="panelImage{{item.IsMilestone}} panelImage FlexColumn" 
+    style="border-color:{{item.Color1}};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>
+  </view>
+</view>

pages/share/sharewall.wxss

@@ -0,0 +1,134 @@
+.container {
+  background-color: #2E2E2E;
+  color: #fff;
+}
+
+.panel0 {
+  width: 100%;
+  white-space: nowrap;
+}
+.panel00 {
+  width: 30rpx;
+  height:73rpx;
+  display: inline-block;
+}
+.panel01 {
+  width: 10rpx;
+  height:73rpx;
+  display: inline-block;
+}
+
+.text0 {
+  background-color: #4D4D4D;
+  border-radius: 20rpx;
+  font-size: 24rpx;
+  color: #FFFFFF;
+  min-width: 151rpx;
+  text-align: center;
+  line-height: 73rpx;
+  display: inline-block;
+  margin-right: 10rpx;
+  padding: 0 20rpx;
+}
+
+.text0_1{
+  background: #5282FA;
+}
+
+.lineWidthAll{
+  width: 100%;
+  justify-content: flex-end;
+  background-color:#2E2E2E;
+  height: 1rpx;
+  margin: 30rpx 0 60rpx 0;
+}
+.lineWidth720{
+  background-color: #787878; 
+}
+.panel1 {
+  width: 100%;
+  position: relative;
+  align-items: flex-start;
+}
+
+.text1 {
+  font-size: 36rpx;
+  color: #FFFFFF;
+  margin-left: 30rpx;
+}
+
+.panel11 {
+  width: 100%;
+  justify-content: space-between;
+  margin-top: 10rpx;
+}
+
+.text2 {
+  font-size: 28rpx;
+  margin-left: 30rpx;
+  color: #9B9B9B;
+}
+
+.text3 {
+  font-size: 24rpx;
+  color: #5282FA;
+  margin-right: 30rpx;
+}
+
+.panel2{
+  width:100%;
+  margin-top: 30rpx;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+.panelImage {
+  width:249rpx;
+  height:185rpx;
+  background: rgba(0,0,0,0.20);
+  position: relative;
+  margin: 0;
+  margin: 0 1rpx 1rpx 0;
+}
+
+.panelImage1 {
+  width:209rpx;
+  height:145rpx;
+  border: 20rpx solid #2E2E2E;
+}
+
+.panelImage .img{
+  width:250rpx;
+  height:186rpx;
+  position: absolute;
+  top:0;
+  left:0;
+}
+
+
+.panelImage .img2{
+  background-color: rgba(0,0,0,0.20);
+}
+
+.icon_relay_1{
+  width:30rpx;
+  height:30rpx;
+  margin-bottom: 20rpx;
+}
+
+.text4{
+  font-family: Roboto-Black;
+  font-size: 24rpx;
+  text-align: center;
+  z-index: 10;
+  color:#D2D2D2;
+}
+.text5{
+  font-family: Roboto-Black;
+  font-size: 24rpx;
+  color: #D2D2D2;
+  position: absolute;
+  left:20rpx;
+  bottom:20rpx;
+}

pages/template/Fan.js

@@ -1,2 +0,0 @@
-Page({data: {},});
-

pages/template/Fan.json

@@ -1 +0,0 @@
-{}

pages/template/cardShow.wxml

@@ -19,14 +19,14 @@
       </text>
 
       <view class="panelSound FlexRow" hover-class='panelSoundHover' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">
-        <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.png' />
+        <image class="universalpic_read_mark_black_20x20" src='../../pages/images/universalpic_read_mark_black_20x20.png' />
       </view>
 
       <view class="textPinyin" hover-class='panelSoundHover1' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">{{item.Content}}</view>
 
       <view class="panelRecorder FlexRow" wx:if="{{item.Type=='recorder'}}">
         <view class="panelRecorder0 FlexRow" hover-class='panelSoundHover' hover-stay-time="1000" catchtap="playSound" data-content="recorder" data-soundmark="{{item.SoundMark}}" data-fieldid="1">
-          <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.png' />
+          <image class="universalpic_read_mark_black_20x20" src='../../pages/images/universalpic_read_mark_black_20x20.png' />
         </view>
       </view>
 
@@ -75,14 +75,14 @@
           </text>
 
           <view class="panelSound FlexRow" hover-class='panelSoundHover' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">
-            <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.png' />
+            <image class="universalpic_read_mark_black_20x20" src='../../pages/images/universalpic_read_mark_black_20x20.png' />
           </view>
 
           <view class="textPinyin" hover-class='panelPinyinHover1' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">{{item.Content}}</view>
 
           <view class="panelRecorder FlexRow" wx:if="{{item.Type=='recorder'}}">
             <view class="panelRecorder0 FlexRow" hover-class='panelSoundHover' hover-stay-time="1000" catchtap="playSound" data-content="recorder" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">
-              <image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.png' />
+              <image class="universalpic_read_mark_black_20x20" src='../../pages/images/universalpic_read_mark_black_20x20.png' />
             </view>
           </view>
           <view class="imageContainer2 FlexColumn" wx:if="{{item.Type=='image'}}" style='width:{{item.Width}}rpx;height:{{item.Height}}rpx;'>

pages_agent/marketing/shareuser.js

@@ -75,7 +75,7 @@ Page({
                   var canvas = wx.createCanvasContext("shareCanvas", that);
                   canvas.drawImage(imageUrl, 0, 0, 750, 1110);
                   canvas.drawImage(res2.tempFilePath, 30, 995, 70, 70);
-                  canvas.drawImage("../../pages_agent/images/promotion_face_circle.png", 30, 995, 70, 70);
+                  canvas.drawImage("../../pages/images/promotion_face_circle.png", 30, 995, 70, 70);
                   canvas.drawImage(res.tempFilePath, 600, 970, 120, 120);
                   
                   canvas.draw(1, function (n) {