1.0.1.3

app.js

@@ -25,7 +25,7 @@ App({
     }
   },
   globalData: {
-    Version: "1.0.1.2",
+    Version: "1.0.1.3",
     IsProduction: true,
     ShareTitle: "可以用来记忆一切的工具",
     SharePath: "pages/index/index",
@@ -61,6 +61,7 @@ App({
     TempFieldNumber:0,//资料搜索时的段落编号
     TempSearcchBackNumber:3,//资料搜索时返回的页面数
     MemoryLevel:0,//记忆水平
+    ColorIndex:0,//色彩方案
 
   }
 })

app.json

@@ -1,6 +1,8 @@
 {
   "pages": [
     "pages/index/index",
+    "pages/other/test",
+    "pages/main/colorplan",
     "pages/index/notice",
     "pages/index/accredit",
     "pages/main/default",
@@ -14,7 +16,6 @@
     "pages/main/searchWeb1",
     "pages/main/searchWeb",
     "pages/main/detail",
-    "pages/main/colorplan",
     "pages/main/memoryLevel",
     "pages/main/setting"
   ],

pages/index/accredit.js

@@ -98,20 +98,12 @@ Page({
       app.globalData.userInfo.Province = data.Province;
       app.globalData.userInfo.Country = data.Country;
       
-      if (data.IsMember){
-        app.globalData.userInfo.Country=data.IsMember;
-        that.buildInitData();
-      }
-      else{
-        wx.navigateBack({
-          delta: 1
-        });
-      }
+      app.globalData.userInfo.IsMember=data.IsMember;
+      that.buildInitData();
     });
   },
   buildInitData: function () {
     //app.globalData.userInfo.UserID=4;
-
     wx.showLoading({
       title: '数据初始化',
     });

pages/index/index.js

@@ -4,13 +4,20 @@ import main from '../../utils/main';
 const app = getApp();
 const arrSentence = [
   "荀子曰:\n君子博学而日参省乎己，\n则知明而行无过矣",
+  "为什么订正过的题目还会错？\n用秒过，不再错",
   "子曰:\n学而时习之，不亦悦乎。",
-  "子曰:\n学而不思则罔，\n思而不学则殆。",
-  "荀子曰:\n青，取之于蓝，而青于蓝。\n冰，水为之，而寒于水。",
-  "荀子曰:\n不积跬步，无以至千里；\n不积小流，无以成江海。",
-  "荀子曰:\n骐骥一跃，不能十步；\n驽马十驾，功在不舍。",
-  "荀子曰:\n锲而舍之，朽木不折；\n锲而不舍，金石可镂。",
-  "孟子曰:\n故天将降大任于是人也，\n必先苦其心志，劳其筋骨，\n饿其体肤……",
+  "秒过之前，错字连篇\n秒过之后，错字罕见",
+  "子曰:\n学而不思则罔\n思而不学则殆",
+  "记忆是思考的残留物\n唯有不断思考才能记住",
+  "荀子曰:\n青，取之于蓝，而青于蓝\n冰，水为之，而寒于水",
+  "舒适区练习不会带来改变\n只有刻意练习才能提高",
+  "荀子曰:\n不积跬步，无以至千里\n不积小流，无以成江海",
+  "死记硬背? No! \n测试可以知晓自己\n问题在哪里。",
+  "荀子曰:\n骐骥一跃，不能十步\n驽马十驾，功在不舍",
+  "同一时间反复练习？No! \n要间隔练习、穿插练习、换环境练习",
+  "荀子曰:\n锲而舍之，朽木不折\n锲而不舍，金石可镂",
+  "所谓的粗心\n只是对细节缺乏敏感\n秒过关注每个细节",
+  "孟子曰:\n故天将降大任于是人也\n必先苦其心志，劳其筋骨\n饿其体肤……",
 ];
 
 Page({

pages/main/add.js

@@ -18,6 +18,7 @@ Page({
     FieldContent: "",
     SoundSign: "[读]",
     LineSign: "[线]",
+    IsTodayStudy:false,
     BtnArray: ["+", "-", "×", "÷", "=", "<", ">"],
   },
   onLoad: function (options) {
@@ -28,11 +29,16 @@ Page({
     if (options.type2)
       type2=options.type2;
 
+    var fieldNumber=0;
+    if (options.fieldid)
+      fieldNumber=options.fieldid;
+
     that.setData({
       Containnerheight: main.getWindowHeight(),
       UpdateType: options.type,
       ShowType:type2,
       MiaoguoCardID: options.id,
+      FieldNumber:fieldNumber,
     });
 
     var list = app.globalData.CardList;
@@ -77,6 +83,10 @@ Page({
           title: '编辑题卡'
         });
       }
+
+      if (that.data.UpdateType == "edit3") {
+        that.gotoAddItem({ currentTarget: { dataset: { fieldid: that.data.FieldNumber}}});
+      }
     }
   },
   onUnload: function () {
@@ -221,8 +231,7 @@ Page({
         //   param: common.Encrypt(JSON.stringify(param1))
         // }
         main.postData('AddMiaoguoCard?Type=' + that.data.UpdateType + '&UserID=' + userid, param1, function (data) {
-          if (that.data.UpdateType == "edit" || that.data.UpdateType == "edit2") {
-            
+          if (that.data.UpdateType == "edit" || that.data.UpdateType == "edit2" || that.data.UpdateType == "edit3") {
             that.onClose();
           }
           else {
@@ -239,9 +248,6 @@ Page({
             taskToday.CardNumber++;
             app.globalData.TaskToday=taskToday;
 
-            that.setData({
-              IsTodayStudy:false,
-            })
           }
           wx.removeStorageSync("TempCardInfo");
         });
@@ -589,14 +595,6 @@ Page({
 
   updateField: function (history) {
     var str = this.data.FieldContent;
-    // str = main.decryptUrl(str);
-
-    // str = str.replace(/\[读\]/g, "\n[读]");
-    // str = str.replace(/\[图\]/g, "\n[图]");
-    // str = str.replace(/\[\/读\]/g, "[\/读]\n");
-    // str = str.replace(/\[\/图\]/g, "[\/图]\n");
-    // str = str.replace(/\n\n\n/g, "\n\n");
-
     var list = app.globalData.CardList;
     var card={};
     for (var i = 0; i < list.length; i++) {

pages/main/add.wxml

@@ -73,15 +73,15 @@
     <view class='panelSave0' bindtap="saveCard">保存</view>
 
     <view class='panelSave00 FlexRow'>
-      <view class="panelSave4 panelSave2 panelSave1" bindtap="onPreview" wx:if="{{ShowType==1}}">
+      <view class="panelSave4 panelSave2 panelSave1" bindtap="onPreview">
         预览
       </view>
-      <view class="panelSave2 panelSave1" bindtap="onPreview" wx:if="{{ShowType==0}}">
+      <!-- <view class="panelSave2 panelSave1" bindtap="onPreview" wx:if="{{ShowType==0}}">
         预览
       </view>
       <view class="panelSave3 panelSave1 FlexRow" bindtap="onGotoList" wx:if="{{ShowType==0}}">
         <image src='../images/universalpic_card_gray_26x26.png' class="universalpic_card_gray_26x26" />
-      </view>
+      </view> -->
     </view>
   </view>
 </view>

pages/main/add.wxss

@@ -164,7 +164,7 @@
   font-size: 28rpx;
   color:#1e1e1e;
   text-align: left;
-  min-height:80rpx;
+  height:100rpx;
   line-height: 100rpx;
   flex-wrap: wrap;
   justify-content: flex-start;

pages/main/colorplan.wxml

@@ -15,9 +15,7 @@
     <view class="panelItem FlexColumn">
       <view style="height:30rpx;"></view>
       <view class="{{item.SelectedCSS}} panelItem0 FlexRow" wx:for="{{ColorList}}" wx:key="index" wx:if="{{index>0}}" bindtap="selectColor" data-index="{{index}}">
-        <view class='panelItem01' style='background-color:{{item.BackColor}};color:{{item.FrontColor}};'>{{item.Name}}</view>
-        <view class='panelItem02' style='background-color:{{item.BackColor1}};'></view>
-        <view class='panelItem03' style='background-color:{{item.BackColor2}};'></view>
+        <view class='panelItem01' style='background-color:{{item.BackColor}};'>{{item.Name}}</view>
       </view>
     </view>
     <view class='lineFooter'></view>

pages/main/colorplan.wxss

@@ -27,6 +27,7 @@
 .panelItem0{
   width:690rpx;
   height:100rpx;
+  color:#fff;
   border-radius: 10rpx;
   margin-bottom: 30rpx;
   border:1rpx solid #9B9B9B;
@@ -34,26 +35,15 @@
 
 .panelItemSelected{
   border:5rpx solid #fff;
-  box-shadow:0 0 0 3px #1e1e1e;
+  box-shadow:0 0 0 3px #0071EF;
 }
 
 .panelItem01{
-  width:360rpx;
+  width:100%;
   line-height: 100rpx;
   padding-left: 30rpx;
   font-weight: 400;
-  border-top-left-radius: 10rpx;
-  border-bottom-left-radius: 10rpx;
-}
-.panelItem02{
-  width:230rpx;
-  height:100rpx;
-}
-.panelItem03{
-  width:100rpx;
-  height:100rpx;
-  border-top-right-radius: 10rpx;
-  border-bottom-right-radius: 10rpx;
+  border-radius: 10rpx;
 }
 
 .panelItem .panelItem1{

pages/main/default.js

@@ -48,6 +48,11 @@ Page({
             });
           });
 
+          app.globalData.ColorIndex = wx.getStorageSync("ColorIndex");
+          var color = main.getDetailColor(-1);
+          if (!app.globalData.ColorIndex || app.globalData.ColorIndex > (color.length-1))
+            app.globalData.ColorIndex=0;
+
           that.getTaskTodayList();
         }
         else {

pages/main/detail.js

@@ -3,16 +3,15 @@ import main from '../../utils/main';
 
 const app = getApp();
 
-const arrFontSize = [46, 68, 108];
+const arrFontSize = [48, 36, 68, 108];
 
 var innerAudioContext1;
 
 var listTaskFinished = []; //完成的任务
 var timeStart; //计算时长
 var TaskList = [];
-var iTimeout = 0;
 var arrImage = [], arrImage2 = [];
-var intervalSound = 0, intervalRefresh=0;
+var intervalSound = 0, intervalRefresh = 0;
 
 Page({
   data: {
@@ -21,48 +20,36 @@ Page({
     NumberHistory: 30,
     IsShowNumberInfo: false,
     TaskInfo: {},
-    Color: {//配色1
-      Name: "黑白",
-      BackColor: "#ffffff",
-      BackColor1: "#D2D2D2",
-      FrontColor: "#1E1E1E",
-      FrontColor1: "rgba(0,0,0,0.3)",
-      BackColor2: "#E3E3E3",
-      BackColor20: 'rgba(227,227,227,0)',
-      FrontColor2: "#1E1E1E",
-      TagColor: "#9B9B9B",
-      FieldLineColor: "#4B3840",
-      IconColor: "black",
-      FrontColorNavigationBar: "#000000",
-    },
   },
   onLoad: function () {
     wx.hideShareMenu();
     var that = this;
-    var height = app.globalData.systemInfo.screenHeight * 2-90;
-    var height2=750;
-    if (app.globalData.IsIPad){
-      height=960;
-      height2=670;
+    var height = app.globalData.systemInfo.screenHeight * 2 - 90;
+    var height2 = 750;
+    if (app.globalData.IsIPad) {
+      height = 960;
+      height2 = 670;
     }
 
     that.setData({
       Containnerheight: height,
-      Containnerheight2: height-height2,
+      Containnerheight2: height - height2,
       IsShowAnswer: [0, 0],
       CanUndo: 1,
+      TaskInfo:{},
       IsIphoneX: main.checkIsIPhoneX(),
+      Color: main.getDetailColor(app.globalData.ColorIndex),
     });
 
     innerAudioContext1 = wx.createInnerAudioContext();
-    this.audioCtx=[];
+    this.audioCtx = [];
 
     this.getList();
 
     this.getColor();
 
     this.getMemoryLevel();
-    
+
   },
   onShow: function () {
     var that = this;
@@ -70,15 +57,16 @@ Page({
       that.data.NumberReview == 0 &&
       that.data.NumberHistory == 0) {
 
+      that.setData({
+        CanUndo: 0,
+        TaskInfo:{},
+      });
       listTaskFinished = [];
-      that.setSoundFile(1);
-
-      
+      that.getTaskTime();
     }
     else {
       that.setSoundFile(-1);
 
-
       var list = app.globalData.CardList;
       if (list && list.length > 0) {
         for (var i = 0; i < list.length; i++) {
@@ -88,7 +76,7 @@ Page({
             that.setData({
               TaskInfo: TaskList[0],
             });
-            app.globalData.CardList=[];
+            app.globalData.CardList = [];
             break;
           }
         }
@@ -96,11 +84,11 @@ Page({
 
     }
   },
-  onUnload:function(){
+  onUnload: function () {
     clearInterval(intervalSound);
   },
   onPullDownRefresh: function () {
-    this.onShowAnswer({currentTarget:{dataset:{start:true}}});
+    this.onShowAnswer({ currentTarget: { dataset: { start: true } } });
     wx.stopPullDownRefresh();
   },
   setSoundFile: function (isFinish) {//isFinish=3搁置 =2撤退 =1结束 =0正常 =-1开始
@@ -108,11 +96,13 @@ Page({
     var url = "/pages/sounds/";
     if (isFinish == 1) {
       url += "end.mp3";
-      that.getTaskTime();
     }
-    else if (isFinish == 2 || isFinish == 3) {
+    else if (isFinish == 2) {
       url += "short3.mp3";
     }
+    else if (isFinish == 3) {
+      url += "short1.mp3";
+    }
     else {
       url += "short2.mp3";
     }
@@ -127,25 +117,21 @@ Page({
   },
   getColor: function () {
     var that = this;
-    common.getStorageValue(that, "ColorIndex", 0, function () {
-      var color = main.getDetailColor(that.data.ColorIndex);
-      that.setData({
-        Color: color,
-      });
-      if (wx.setBackgroundColor) {
-        wx.setBackgroundColor({
-          backgroundColor: color.BackColor,
-          backgroundColorTop: color.BackColor, 
-          backgroundColorBottom: color.BackColor2, 
-        })
-      }
-      if (wx.setNavigationBarColor) {
-        wx.setNavigationBarColor({
-          frontColor: color.FrontColorNavigationBar,
-          backgroundColor: color.BackColor,
-        })
-      }
-    });
+
+    if (wx.setBackgroundColor) {
+      wx.setBackgroundColor({
+        backgroundColor: that.data.Color.BackColor,
+        backgroundColorTop: that.data.Color.BackColor,
+        backgroundColorBottom: that.data.Color.BackColor,
+      })
+    }
+    if (wx.setNavigationBarColor) {
+      wx.setNavigationBarColor({
+        frontColor: "#000000",
+        backgroundColor: that.data.Color.BackColor,
+      })
+    }
+
   },
   getList: function () {
     var task = app.globalData.TaskToday;
@@ -205,12 +191,16 @@ Page({
       arrImage = TaskList[0].ContentNew.Images;
       arrImage2 = TaskList[0].ContentNew.Images2;
     }
-    
+
+    var taskInfo = TaskList[0];
+    if (!taskInfo)
+      taskInfo={};
+
     that.setData({
       NumberNew: arrNew.length,
       NumberReview: that.data.NumberReview,
       NumberHistory: arrHistory.length,
-      TaskInfo: TaskList[0],
+      TaskInfo: taskInfo,
       CanUndo: 0,
     });
 
@@ -219,8 +209,19 @@ Page({
 
     function formatList(list) {
       for (var i = 0; i < list.length; i++) {
-        if (list[i].Content)
+        if (list[i].Content) {
           list[i].ContentNew = main.changeStringToView(list[i].Content);
+          list[i].TagWidth = 0;
+          if (list[i].ContentNew.Tags && list[i].ContentNew.Tags.length > 0) {
+            list[i].TagWidth = 92 + (list[i].ContentNew.Tags.length - 1) * 122;
+            for (var j = 0; j < list[i].ContentNew.Tags.length; j++) {
+              if (list[i].ContentNew.Tags[j].length > 2) {
+                list[i].TagWidth += 46 * (list[i].ContentNew.Tags[j].length - 2);
+              }
+            }
+          }
+        }
+
       }
       return list;
     }
@@ -228,7 +229,7 @@ Page({
     function updateNumberStr(list) {
       for (var i = 0; i < list.length; i++) {
         if (list[i].Number0)
-          list[i].Number0Str = main.getMemoryLevel(app.globalData.MemoryLevel,0,list[i].Number0);
+          list[i].Number0Str = main.getMemoryLevel(app.globalData.MemoryLevel, 0, list[i].Number0);
         if (list[i].Number1)
           list[i].Number1Str = main.getMemoryLevel(app.globalData.MemoryLevel, 1, list[i].Number1);
         if (list[i].Number2)
@@ -245,7 +246,7 @@ Page({
     var that = this;
     if (!(that.data.NumberNew == 0 &&
       that.data.NumberReview == 0 &&
-      that.data.NumberHistory == 0)) {
+      that.data.NumberHistory == 0) && !that.data.IsShowNumberInfo) {
 
       if (start) {
         that.data.IsShowAnswer[0] = 0;
@@ -273,7 +274,7 @@ Page({
     //console.log(res.tapIndex);
     var list = [];
     list.push(TaskList[0]);
-    app.globalData.CardList=list;
+    app.globalData.CardList = list;
     wx.navigateTo({
       url: './add?type=edit&type2=1&id=' + TaskList[0].MiaoguoCardID,
     });
@@ -294,7 +295,7 @@ Page({
     });
   },
   gotoPrev: function () {
-    clearTimeout(iTimeout);
+    var that = this;
     wx.showLoading({
       title: '请稍候',
       mask: true,
@@ -303,7 +304,6 @@ Page({
       var card = listTaskFinished.pop();
       //console.log(card);
 
-      var that = this;
       var url = "UndoMiaoguoCard?";
       url += "ID=" + card.Card.MiaoguoCardID;
       url += "&UserID=" + app.globalData.userInfo.UserID;
@@ -361,14 +361,14 @@ Page({
           image: "../images/universalpic_undo_white_120x90.png",
         });
       });
+      that.setSoundFile(2);
+    }
+    else {
+      wx.hideLoading();
     }
-    that.setSoundFile(2);
   },
   gotoNext: function (e) {
     var that = this;
-
-    clearTimeout(iTimeout);
-
     wx.showLoading({
       title: '请稍候',
       mask: true,
@@ -518,6 +518,8 @@ Page({
           CanUndo: 1,
         });
         that.setSoundFile(1);
+        that.getTaskTime();
+
       } else {
         arrImage = TaskList[0].ContentNew.Images;
         arrImage2 = TaskList[0].ContentNew.Images2;
@@ -544,8 +546,6 @@ Page({
           that.setSoundFile(0);
       }
     });
-
-
   },
   saveCard: function (obj, callback) {
     var url = "UpdateMiaoguoCardToday?";
@@ -557,8 +557,8 @@ Page({
     url += "&FontSize=" + TaskList[0].FontSize;
 
     var duration = common.diffDate("s", timeStart, new Date());
-    if (obj.btnnumber==1)
-      duration=0;
+    if (obj.btnnumber == 1)
+      duration = 0;
     url += "&Duration=" + duration;
 
     url += "&IsUndo=" + obj.IsUndo;
@@ -597,13 +597,13 @@ Page({
     }
 
     var arr = url.split(",");
-    this.audioCtx=[];
+    this.audioCtx = [];
     for (var i = 0; i < arr.length; i++) {
       this.audioCtx.push(wx.createAudioContext('myAudio' + i));
     }
 
     var index = 0;
-    if (arr.length>1){
+    if (arr.length > 1) {
       intervalSound = setInterval(function () {
         that.audioCtx[index].setSrc(arr[index]);
         that.audioCtx[index].play();
@@ -614,38 +614,15 @@ Page({
         }
       }, 1000);
     }
-    else{
-      if (arr[index].indexOf("http")>0)
+    else {
+      if (arr[index].indexOf("http") > 0)
         arr[index] = arr[index].substr(arr[index].indexOf("http"));
-      arr[index] = arr[index].replace("http","https");
+      arr[index] = arr[index].replace("http://", "https://");
 
-      console.log("play:" + arr[index]);
+      //console.log("play:" + arr[index]);
       that.audioCtx[index].setSrc(arr[index]);
       that.audioCtx[index].play();
     }
-
-    var fieldid = e.currentTarget.dataset.fieldid;
-    var content = TaskList[0].ContentNew.Field[fieldid];
-    var selectIndex = 0;
-    for (var i = 0; i < content.length; i++) {
-      if (content[i].Type == 'sound') {
-        if (content[i].Content == e.currentTarget.dataset.content) {
-          content[i].SoundImageName = "gif";
-          selectIndex = i;
-          break;
-        }
-      }
-    }
-    that.setData({
-      TaskInfo: TaskList[0],
-    });
-    iTimeout = setTimeout(function () {
-      content[selectIndex].SoundImageName = "png";
-      TaskList[0].ContentNew.Field[fieldid] = content;
-      that.setData({
-        TaskInfo: TaskList[0],
-      });
-    }, 2000);
   },
   getTaskTime: function () {
     var that = this;
@@ -653,7 +630,10 @@ Page({
     url += "UserID=" + app.globalData.userInfo.UserID;
     main.getData(url, function (data) {
       if (data) {
-        var duration = common.getMinuteSecond(data.Duration, true);
+        var duration = data.Duration;
+        if (duration > 0) {
+          duration = Math.round(duration / 60);
+        }
         var speed1 = Math.round(100 * data.Count / (data.Duration / 60)) / 100;
         var speed2 = common.getMinuteSecond(Math.round(data.Duration / data.Count), true);
 
@@ -699,8 +679,8 @@ Page({
           //console.log("serverUrl2:" + serverUrl);
           //console.log(res.tempFilePath);
           main.saveTempImage(serverUrl, res.tempFilePath);
-          for(var i=0;i<arrImage.length;i++){
-            if (arrImage[i] == oldTempUrl){
+          for (var i = 0; i < arrImage.length; i++) {
+            if (arrImage[i] == oldTempUrl) {
               arrImage[i] = res.tempFilePath;
             }
           }
@@ -727,7 +707,7 @@ Page({
       TaskInfo: this.data.TaskInfo,
     });
   },
-  onClose:function(){
+  onClose: function () {
     wx.navigateBack({
       delta: 1,
     });
@@ -740,6 +720,94 @@ Page({
     }
     app.globalData.MemoryLevel = index;
   },
+
+  buildShareImage: function () {
+    var that = this;
+    wx.showLoading({
+      title: '生成中',
+    });
+    //console.log(app.globalData.userInfo.AvatarUrl);
+    var avatarUrl = app.globalData.userInfo.AvatarUrl;
+    avatarUrl = avatarUrl.substring(0, avatarUrl.lastIndexOf("/") + 1);
+    avatarUrl = avatarUrl + "0";
+
+    wx.downloadFile({
+      url: avatarUrl, // 仅为示例，并非真实的资源
+      success(res) {
+        // 只要服务器有响应数据，就会把响应内容写入文件并进入 success 回调，业务需要自行判断是否下载到了想要的内容
+        if (res.statusCode === 200) {
+          var canvas = wx.createCanvasContext("shareCanvas", that);
+          canvas.setFillStyle(main.getShareImageBackColor());
+          canvas.fillRect(360, 0, 600, 360);
+          canvas.drawImage(res.tempFilePath, 0, 0, 360, 360);
+          canvas.drawImage("../images/universalpic_screenshot_jl_bgimage_360x360.png", 0, 0, 360, 360);
+          canvas.fillStyle = "#ffffff";
+          canvas.setTextBaseline('top');
+          canvas.setFontSize(24);
+          canvas.fillText(app.globalData.userInfo.NickName, 30, 282);
+
+          var today = common.formatTime(new Date(), ".", true);
+          canvas.setFontSize(18);
+          canvas.fillText(today, 30, 315);
+
+          canvas.setFontSize(20);
+          canvas.fillText("秒过学习", 390, 30);
+          canvas.setFontSize(44);
+          canvas.fillText("勤勉接力", 390, 58);
+          canvas.setFontSize(20);
+          canvas.fillText("见证成长", 390, 120);
+
+          canvas.setFontSize(68);
+          canvas.fillText(that.data.TodayTime, 390, 148);
+
+          canvas.font = "normal 500 68px caption";
+          var metrics = canvas.measureText(that.data.TodayTime.toString());
+          //console.log(JSON.stringify(metrics));
+
+          var h = 179;
+          if (app.globalData.IsIOS)
+            h = 176;
+          canvas.font = "normal 500 32px caption";
+          canvas.fillText("分钟", 393 + Math.round(metrics.width), h);
+
+
+          canvas.setFontSize(20);
+          canvas.fillText("迄今已接力", 390, 267);
+          canvas.setFontSize(32);
+          canvas.fillText(app.globalData.TaskToday.DayNumber + "次", 390, 295);
+
+          canvas.draw(1, function (n) {
+            wx.canvasToTempFilePath({
+              x: 0,
+              y: 0,
+              width: 600,
+              height: 360,
+              destWidth: 600,
+              destHeight: 360,
+              canvasId: 'shareCanvas',
+              success: function (res2) {
+                wx.hideLoading();
+
+                wx.previewImage({
+                  current: res2.tempFilePath, // 当前显示图片的http链接
+                  urls: [res2.tempFilePath] // 需要预览的图片http链接列表
+                });
+              },
+              fail:function(){
+                wx.hideLoading();
+              }
+            })
+          });
+        }
+        else{
+          wx.hideLoading();
+        }
+      },
+      fail: function () {
+        wx.hideLoading();
+      }
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/detail.json

@@ -1,4 +1,5 @@
 {
-  "navigationBarTitleText": "学习中",
+  "navigationBarTitleText": "练习中",
+  "navigationBarTextStyle": "black",
   "enablePullDownRefresh": true
 }

pages/main/detail.wxml

@@ -1,198 +1,231 @@
-<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;background-color:{{Color.BackColor2}}'>
-  <view class='panelTop FlexRow' style='background-color:{{Color.BackColor}};color:{{Color.FrontColor}};'>
-    <view class='panelCancel' wx:if="{{NumberNew+NumberReview+NumberHistory==0}}">
-    </view>
-    <view class='panelCancel' wx:if="{{NumberNew+NumberReview+NumberHistory==0}}">
-    </view>
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}}' bindtap='onShowAnswer'>
+  <!-- 练习中 -->
+  <block wx:if="{{(NumberNew+NumberReview+NumberHistory)>0}}">
 
-    <view class='panelCancel FlexRow' bindtap='gotoEdit' wx:if="{{NumberNew+NumberReview+NumberHistory>0}}">
-      <image src="../images/universalpic_edit_{{Color.IconColor}}_25x25.png" class='universalpic_edit_white_25x25' />
-    </view>
-    <view class='panelCancel FlexRow' bindtap='onFontSize' wx:if="{{NumberNew+NumberReview+NumberHistory>0}}">
-      <image src="../images/universalpic_typesize_{{Color.IconColor}}_30x18.png" class='universalpic_typesize_white_30x18' />
-    </view>
+    <!-- 工具栏 -->
+    <view class='panelTop FlexRow' style='background-color:{{Color.BackColor}};'>
+      <view class='panelCancel FlexRow' catchtouchstart='gotoEdit'>
+        <view class='panelCancel0 FlexRow'>
+          <image src="../images/universalpic_edit_gray_25x25.png" class='universalpic_edit_white_25x25' />
+        </view>
+      </view>
+      <view class='panelCancel FlexRow' catchtouchstart='onFontSize'>
+        <view class='panelCancel0 FlexRow'>
+          <image src="../images/universalpic_typesize_gray_30x18.png" class='universalpic_typesize_white_30x18' />
+        </view>
+      </view>
+      <view class='panelNumber FlexRow' catchtouchstart='showNumberContainner'>
+        <view class="panelNumber1">{{NumberNew}}</view>
+        <view class="panelNumber1">{{NumberHistory}}</view>
+        <view class="panelNumber1">{{NumberReview}}</view>
+        <view class="FlexColumn">
+          <view class='panelNumber2 panelNumber1'>{{NumberNew+NumberReview+NumberHistory}}</view>
+          <view class='panelNumber2Line' style='background-color:{{Color.LineColor}};'></view>
+        </view>
+      </view>
+      <view class='panelCancel FlexRow' catchtouchstart='gotoNext' data-time="1d" data-btnnumber="1">
+        <view class='panelCancel0 FlexRow'>
+          <image src="../images/universalpic_shelve_gray_26x26.png" class='universalpic_shelve_white_26x26' />
+        </view>
+      </view>
+      <view class='panelCancel FlexRow' wx:if="{{CanUndo==0}}">
+        <view class='panelCancel0 FlexRow'>
+          <image src="../images/universalpic_undo_gray_26x20.png" class='universalpic_undo_white_30p_26x20' />
+        </view>
+      </view>
+      <view class='panelCancel FlexRow' catchtouchstart='gotoPrev' wx:if="{{CanUndo==1}}">
+        <view class='panelCancel0 FlexRow'>
+          <image src="../images/universalpic_undo_gray_26x20.png" class='universalpic_undo_white_30p_26x20' />
+        </view>
+      </view>
 
-    <view class='panelNumber FlexRow' bindtap='showNumberContainner'>
-      <view class="panelNumber1" style='color:{{Color.FrontColor1}};'>{{NumberNew}}</view>
-      <view class="panelNumber1" style='color:{{Color.FrontColor1}};'>{{NumberHistory}}</view>
-      <view class="panelNumber1" style='color:{{Color.FrontColor1}};'>{{NumberReview}}</view>
-      <view class="panelNumber2 panelNumber1" style='background-color:{{Color.FrontColor1}};'>{{NumberNew+NumberReview+NumberHistory}}</view>
-    </view>
-    <view class='panelCancel FlexRow' bindtap='gotoNext' data-time="1d" data-btnnumber="1" wx:if="{{NumberNew+NumberReview+NumberHistory>0}}">
-      <image src="../images/universalpic_shelve_{{Color.IconColor}}_26x26.png" class='universalpic_shelve_white_26x26' />
-    </view>
-    <view class='panelCancel' wx:if="{{NumberNew+NumberReview+NumberHistory==0}}">
     </view>
 
-    <view class='panelCancel FlexRow' wx:if="{{CanUndo==0}}">
-      <image src="../images/universalpic_undo_black_30p_26x20.png" class='universalpic_undo_white_30p_26x20' />
-    </view>
-    <view class='panelCancel FlexRow' bindtap='gotoPrev' wx:if="{{CanUndo==1}}">
-      <image src="../images/universalpic_undo_{{Color.IconColor}}_26x20.png" class='universalpic_undo_white_30p_26x20' />
-    </view>
-
-  </view>
-
-  <!-- 学习页 -->
-  <block wx:if="{{(NumberNew+NumberReview+NumberHistory)>0}}">
+    <!-- 第一段 -->
 
     <view class="panelField10" style='background-color:{{Color.BackColor}};'></view>
-    <view class="panelField1 FlexColumn" bindtap="onShowAnswer" style='background-color:{{Color.BackColor}};color:{{Color.FrontColor}};'>
+
+    <view class="panelField1 FlexColumn" style='background-color:{{Color.BackColor}};'>
+      <view class="editFieldNull"></view>
       <view class="panelField11 panelItem FlexRow" style="font-size:{{TaskInfo.FontSize}}rpx;">
         <block wx:for="{{TaskInfo.ContentNew.Field[1]}}" wx:key="index">
           <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>
-          <view class="textBr" wx:if="{{index>0 && item.Type=='br'}}"></view>
+          <view class="textBr" wx:if="{{index>0 && item.Type=='br'}}" style="height:{{TaskInfo.FontSize/2}}rpx;"></view>
           <text class="textNormal" selectable="true" space='ensp' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
 
           <text class="textNormal FlexRow" selectable="true" space='ensp' wx:if="{{item.Type=='line'}}">
             <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem">
               <text space='ensp' wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
-            <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
-          </block>
+              <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
+            </block>
           </text>
 
-          <view class="panelSound FlexRow" wx:if="{{item.Type=='sound'}}" bindtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">
+          <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.{{item.SoundImageName}}' />
           </view>
 
-          <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">{{item.Content}}</text>
+          <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>
           <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
-      
+
         </block>
       </view>
-
-    </view>
-  <view class="panelTag FlexRow" bindtap="onShowAnswer" style='background-color:{{Color.BackColor2}};color:{{Color.FrontColor2}};'>
-    <view wx:if="{{!TaskInfo.ContentNew.Tags || TaskInfo.ContentNew.Tags.length==0}}"></view>
-    <view class="panelTag1 FlexRow" wx:if="{{TaskInfo.ContentNew.Tags && TaskInfo.ContentNew.Tags.length>0}}">
-      <view class='tagDot' style='background-color:{{Color.TagColor}};'></view>
-      <view class="tag" wx:for="{{TaskInfo.ContentNew.Tags}}" wx:key="index">{{item}}</view>
     </view>
 
-    <view class='right2 FlexRow' wx:if="{{IsShowAnswer[0]==0}}">
-      <image class="universalpic_show_white_30x30" src='../images/universalpic_show_{{Color.IconColor}}_30x30.png' />
-    </view>
-    <view class='right2 FlexRow' catchtap='onShowAnswer' data-start="true" wx:if="{{IsShowAnswer[0]==1}}">
-      <image class="universalpic_hide_white_34x34" src='../images/universalpic_hide_{{Color.IconColor}}_34x34.png' />
+    <!-- 标签 -->
+    <view class="panelTag FlexColumn" wx:if="{{TaskInfo.ContentNew.Tags.length>0}}">
+      <view class='panelTagLine' style='width:{{TaskInfo.TagWidth}}rpx;background-color:{{Color.LineColor}};'></view>
+      <view class="panelTag1 FlexRow">
+        <view class="tag" wx:for="{{TaskInfo.ContentNew.Tags}}" wx:key="index">{{item}}</view>
+      </view>
     </view>
 
-  </view>
+    <!-- 第二段和第三段 -->
+    <view class="panelField20 FlexColumn">
+      <view class="editFieldNull2"></view>
+      <view class="panelField2 FlexColumn" wx:for="{{[2,3]}}" wx:key="indexParent" wx:for-index="indexParent" wx:for-item="itemParent" wx:if="{{TaskInfo.ContentNew.Field[itemParent].length>0 && IsShowAnswer[itemParent-2]}}" style='background-color:{{Color.FieldBackColor}};'>
+        <view class="panelField21 panelItem FlexRow" style='color:{{Color.FieldColor}};'>
+          <block wx:for="{{TaskInfo.ContentNew.Field[itemParent]}}" wx:key="index">
+            <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>
+            <view class="textBr" wx:if="{{index>0 && item.Type=='br'}}"></view>
 
-  <view class="panelField20 FlexColumn" style='min-height:{{Containnerheight2}}rpx;background-color:{{Color.BackColor2}};color:{{Color.FrontColor2}};' bindtap="onShowAnswer">
-    <view class="panelField2 FlexColumn" wx:for="{{[2,3]}}" wx:key="indexParent" wx:for-index="indexParent" wx:for-item="itemParent" wx:if="{{TaskInfo.ContentNew.Field[itemParent].length>0 && IsShowAnswer[itemParent-2]}}">
-      <view wx:if="{{itemParent==3}}" class="lineField" style='background-color:{{Color.FieldLineColor}};'></view>
-      <view class="panelField21 panelItem FlexRow">
-        <block wx:for="{{TaskInfo.ContentNew.Field[itemParent]}}" wx:key="index">
-          <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>
-          <view class="textBr" wx:if="{{index>0 && item.Type=='br'}}"></view>
-        
-          <text class="textNormal2 textNormal" selectable="true" space='ensp' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
+            <text class="textNormal2 textNormal" selectable="true" space='ensp' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
 
-          <text class="textNormal2 FlexRow" selectable="true" space='ensp' wx:if="{{item.Type=='line'}}">
-            <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem">
-              <text space='ensp' wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
-              <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
-            </block>
+            <text class="textNormal2 FlexRow" selectable="true" space='ensp' wx:if="{{item.Type=='line'}}">
+              <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem">
+                <text space='ensp' wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
+            <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
+          </block>
           </text>
 
-          <view class="panelSound FlexRow" wx:if="{{item.Type=='sound'}}" bindtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">
+          <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.{{item.SoundImageName}}' />
           </view>
 
-          <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">{{item.Content}}</text>
-          <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
-        </block>
+          <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>
+          <image class="imageFree2" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
+          </block>
+        </view>
       </view>
     </view>
-  </view>
-  </block>
-
-  <!-- 最后一页 -->
-  <view class='panelLast FlexColumn' wx:if="{{NumberNew+NumberReview+NumberHistory==0}}" style='height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}};color:{{Color.FrontColor}};'>
-    <view class='text1'>做完了</view>
-
-    <view class="panelLastTime FlexColumn">
-      <view style='color:{{Color.FrontColor1}};'>今日用时</view>
-      <view class="time">{{TodayTime}}</view>
-    </view>
-    <view class="panelLastTime FlexColumn">
-      <view style='color:{{Color.FrontColor1}};'>每分钟可练习</view>
-      <view class="time">{{Speed1}}</view>
-    </view>
-    <view class="panelLastTime FlexColumn">
-      <view style='color:{{Color.FrontColor1}};'>单张题卡平均用时</view>
-      <view class="time">{{Speed2}}</view>
-    </view>
-
-    <view class='panelLastFooter' bindtap='onClose'>关闭</view>
-  </view>
 
-  <view class='footer' wx:if="{{NumberNew+NumberReview+NumberHistory>0}}" bindtap="onShowAnswer" ></view>
-  <view class='footer1 footer' wx:if="{{NumberNew+NumberReview+NumberHistory==0}}"></view>
+    <view class='footer0'></view>
 
-  <view class="panelFooter FlexColumn" wx:if="{{IsShowAnswer[1]}}">
-    <view class="panelBottomAnswer0" style='background:linear-gradient({{Color.BackColor20}},{{Color.BackColor2}});'></view>
-    <view class='panelBottomAnswer panelBottom FlexRow' style='background-color:{{Color.BackColor2}};color:{{Color.FrontColor2}};'>
-      <view class="Answer FlexColumn" hover-class="AnswerHover{{Color.ID}}" catchtap='gotoNext' data-time="{{TaskInfo.Number0}}" data-btnnumber="0">
-        <view class="Answer0 btnColor"></view>
-        <view class="btnTime">
-          {{TaskInfo.Number0Str}}
-        </view>
+    <!-- 下方按钮 -->
+    <!-- <view class="footerShade" style='background:linear-gradient({{Color.BackColor}},{{Color.BackColor2}});'></view> -->
+    <view class='footer FlexColumn' style='background-color:{{Color.BackColor}}'>
+      <view class="panelFooter FlexColumn" wx:if="{{!IsShowAnswer[0] && !IsShowAnswer[1]}}" catchtouchstart="onShowAnswer">
+        看答案
+      </view>
+      <view class="panelFooter FlexColumn" wx:if="{{IsShowAnswer[0] && !IsShowAnswer[1]}}" catchtouchstart="onShowAnswer">
+        显示第三段
       </view>
-      <view class="Answer FlexColumn" hover-class="AnswerHover{{Color.ID}}" catchtap='gotoNext' data-time="{{TaskInfo.Number1}}" data-btnnumber="3" wx:if="{{TaskInfo.Number1}}">
-        <view class="Answer1 btnColor"></view>
-        <view class="btnTime">
-          {{TaskInfo.Number1Str}}
+      <view class="panelFooter0 panelFooter FlexColumn" wx:if="{{IsShowAnswer[1]}}">
+        <view class='panelBottomAnswer panelBottom FlexRow'>
+          <view class="Answer FlexColumn" catchtouchstart='gotoNext' data-time="{{TaskInfo.Number0}}" data-btnnumber="0">
+            <view class="Answer0 btnColor"></view>
+            <view class="btnTime">
+              {{TaskInfo.Number0Str}}
+            </view>
+          </view>
+          <view class="Answer FlexColumn" catchtouchstart='gotoNext' data-time="{{TaskInfo.Number1}}" data-btnnumber="3" wx:if="{{TaskInfo.Number1}}">
+            <view class="Answer1 btnColor"></view>
+            <view class="btnTime">
+              {{TaskInfo.Number1Str}}
+            </view>
+          </view>
+          <view class="Answer FlexColumn" catchtouchstart='gotoNext' data-time="{{TaskInfo.Number2}}" data-btnnumber="4">
+            <view class="Answer2 btnColor"></view>
+            <view class="btnTime">
+              {{TaskInfo.Number2Str}}
+            </view>
+          </view>
+          <view class="Answer FlexColumn" catchtouchstart='gotoNext' data-time="{{TaskInfo.Number3}}" data-btnnumber="5" wx:if="{{TaskInfo.Number3}}">
+            <view class="Answer3 btnColor"></view>
+            <view class="btnTime">
+              {{TaskInfo.Number3Str}}
+            </view>
+          </view>
         </view>
+        <!-- <view class="iphoneX" wx:if="{{IsIphoneX}}" style='background-color:{{Color.BackColor2}};'></view> -->
       </view>
-      <view class="Answer FlexColumn" hover-class="AnswerHover{{Color.ID}}" catchtap='gotoNext' data-time="{{TaskInfo.Number2}}" data-btnnumber="4">
-        <view class="Answer2 btnColor"></view>
-        <view class="btnTime">
-          {{TaskInfo.Number2Str}}
+
+    </view>
+  </block>
+  <!-- 最后一页 -->
+  <block wx:if="{{NumberNew+NumberReview+NumberHistory==0}}">
+    <view class='panelLast FlexColumn' style='height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}};'>
+      <view class='text1'>做完了</view>
+
+      <view class="panelLastTime FlexColumn">
+        <view style='color:{{Color.FrontColor1}};'>今日练习总共用时</view>
+        <view class="time1 FlexRow" style='color:{{Color.LineColor}}'>
+          <view class='time11'>{{TodayTime}}</view>
+          <view>分钟</view>
         </view>
       </view>
-      <view class="Answer FlexColumn" hover-class="AnswerHover{{Color.ID}}" catchtap='gotoNext' data-time="{{TaskInfo.Number3}}" data-btnnumber="5" wx:if="{{TaskInfo.Number3}}">
-        <view class="Answer3 btnColor"></view>
-        <view class="btnTime">
-          {{TaskInfo.Number3Str}}
+      <view class="panelLastTime FlexColumn">
+        <view style='color:{{Color.FrontColor1}};'>单张题卡平均用时</view>
+        <view class="time2" style='color:{{Color.LineColor}}'>{{Speed2}}</view>
+      </view>
+      <view class="panelLastTime FlexColumn">
+        <view style='color:{{Color.FrontColor1}};'>每分钟可练习</view>
+        <view class="time2" style='color:{{Color.LineColor}}'>{{Speed1}}</view>
+      </view>
+
+
+      <view class='panelLastFooter'>
+        <view class="panelLastFooter1 FlexRow" bindtap='gotoPrev' wx:if="{{CanUndo==1}}">
+          <image src="../images/universalpic_undo_gray_26x20.png" class='universalpic_undo_gray_26x20' />
+          <view>回到题卡</view>
+        </view>
+        <view class="panelLastFooter1 FlexRow" bindtap='buildShareImage'>
+          <image src="../images/universalpic_screenshot_gray_30x30.png" class='universalpic_screenshot_gray_30x30' />
+          <view>群接力</view>
+        </view>
+        <view class="panelLastFooter2 FlexRow" bindtap='onClose'>
+          <view>关闭</view>
         </view>
       </view>
     </view>
-    <view class="iphoneX" wx:if="{{IsIphoneX}}" style='background-color:{{Color.BackColor2}};'></view>
-  </view>
-</view>
-
-<view wx:if="{{IsShowNumberInfo}}" catchtap='closeNumberContainner' class="numberContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
-  <view class='numberContainer1 FlexColumn'>
+  </block>
+  <!-- 今日任务量 -->
+  <view wx:if="{{IsShowNumberInfo}}" class="numberContainer FlexColumn" style='height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}};'>
     <view class="numberContainer11 FlexRow">
-      <view class='left'>今日剩余任务量{{NumberNew+NumberReview+NumberHistory}}张，包括：</view>
-      <view></view>
+      今日剩余任务量
     </view>
     <view class="numberContainer12 FlexRow">
       <view class='left'>新题卡</view>
       <view class='right3'>{{NumberNew}}张</view>
     </view>
     <view class="lineWidthAll FlexRow">
-      <view class="lineWidth700"></view>
+      <view class="lineWidth720"></view>
     </view>
     <view class="numberContainer12 FlexRow">
       <view class='left'>旧题卡</view>
       <view class='right3'>{{NumberHistory}}张</view>
     </view>
     <view class="lineWidthAll FlexRow">
-      <view class="lineWidth700"></view>
+      <view class="lineWidth720"></view>
     </view>
     <view class="numberContainer12 FlexRow">
-      <view class='left'>及时强化</view>
+      <view class='left'>需要及时强化</view>
       <view class='right3'>{{NumberReview}}张</view>
     </view>
+    <view class="lineWidthAll FlexRow">
+      <view class="lineWidth720"></view>
+    </view>
+    <view class="numberContainer12 FlexRow">
+      <view class='left'>总计</view>
+      <view class='right3' style='color:{{Color.LineColor}};'>{{NumberNew+NumberReview+NumberHistory}}张</view>
+    </view>
     <view class='lineFooter'></view>
-    <view class="numberContainer13 FlexRow">
-      <view>知道了</view>
+    <view class="numberContaineFooter FlexRow" catchtap='closeNumberContainner'>
+      <view>关闭</view>
     </view>
   </view>
 </view>
 
+<canvas class='Canvas' canvas-id="shareCanvas"></canvas>
 <audio hidden='true' id="myAudio0"></audio>
 <audio hidden='true' id="myAudio1"></audio>
 <audio hidden='true' id="myAudio2"></audio>

pages/main/detail.wxss

@@ -1,8 +1,10 @@
- .container {
+.container {
   justify-content: flex-start;
   font-weight: 500;
 }
 
+
+
 /* 工具栏 */
 
 .panelTop {
@@ -20,21 +22,28 @@
   margin: 0 5rpx;
 }
 
+.panelCancel0 {
+  width: 70rpx;
+  height: 70rpx;
+  background-color: rgba(0, 0, 0, 0.1);
+  border-radius: 50%;
+}
 
 .universalpic_undo_white_30p_26x20 {
   width: 26rpx;
   height: 19rpx;
 }
-.universalpic_typesize_white_30x18{
+
+.universalpic_typesize_white_30x18 {
   width: 29rpx;
   height: 18rpx;
 }
+
 .universalpic_shelve_white_26x26 {
   width: 26rpx;
   height: 26rpx;
 }
 
-
 .universalpic_edit_white_25x25 {
   width: 25rpx;
   height: 25rpx;
@@ -42,8 +51,9 @@
 
 .panelNumber {
   width: 218rpx;
-  height: 120rpx;
-  margin: 0 31rpx;
+  height: 50rpx;
+  margin: 20rpx 31rpx;
+  align-items: flex-start;
 }
 
 .panelNumber1 {
@@ -54,14 +64,27 @@
   min-width: 50rpx;
   text-align: center;
   line-height: 50rpx;
+  color: rgba(255, 255, 255, 0.5);
 }
 
 .panelNumber2 {
   color: #fff;
-  border-radius: 50%;
 }
 
-/* 段落 */
+.panelNumber2Line {
+  width: 70%;
+  height: 6rpx;
+  margin-top: -7rpx;
+}
+
+/* 段落显示************************ */
+
+.editFieldNull{
+  height:60rpx;
+}
+.editFieldNull2{
+  height:80rpx;
+}
 
 .panelItem {
   width: 650rpx;
@@ -71,68 +94,69 @@
   z-index: 5;
 }
 
-.panelField10{
+.panelField10 {
   width: 100%;
   height: 110rpx;
 }
 
 .panelField1 {
   width: 100%;
-  min-height: 320rpx;
   justify-content: flex-start;
-  border-bottom-left-radius: 50rpx;
-  border-bottom-right-radius: 50rpx;
 }
 
 .panelField11 {
-  font-size: 46rpx;
+  font-size: 48rpx;
   justify-content: flex-start;
-  margin: 40rpx 0 80rpx 0;
+  color: #fff;
 }
 
-
 .panelTag {
   width: 100%;
-  justify-content: space-between;
-  align-items: flex-end;
-  height:110rpx;
-  padding-bottom: 20rpx;
-  position: relative;
+  min-height: 95rpx;
+  align-items: flex-start;
+  justify-content: flex-start;
+  margin-top: 80rpx;
+  z-index: 5;
 }
 
-.panelTag1 {
-  font-size: 28rpx;
-  margin-left: 50rpx;
+.panelTag .panelTagLine {
+  margin: 0 0 0 50rpx;
+  max-width: 650rpx;
+  height: 10rpx;
 }
 
-.panelTag .tagDot{
-  width:20rpx;
-  height:20rpx;
-  border-radius: 5rpx;
-  background-color: #7F4B52;
-  margin-right: 20rpx;
+.panelTag .panelTag1 {
+  margin: 0 0 0 50rpx;
+  width: 650rpx;
+  flex-wrap: wrap;
+  align-items: flex-start;
+  justify-content: flex-start;
 }
 
 .panelTag .tag {
-  margin: 6rpx 20rpx 6rpx 0;
+  font-size: 46rpx;
+  margin: 20rpx 30rpx 0 0;
+  font-weight: 400;
+  color: #d2d2d2;
 }
 
 .right2 {
   position: absolute;
-  top:0;
-  right:0;
-  width:134rpx;
-  height:150rpx;
+  top: 0;
+  right: 0;
+  width: 134rpx;
+  height: 150rpx;
   align-items: flex-start;
 }
 
 .line1 {
   width: 4rpx;
   height: 30rpx;
-  background-color: rgba(255,255,255,0.2);
+  background-color: rgba(255, 255, 255, 0.2);
   margin-top: 66rpx;
 }
-.universalpic_show_white_30x30{
+
+.universalpic_show_white_30x30 {
   width: 36rpx;
   height: 36rpx;
   margin: 68rpx 50rpx 0 50rpx;
@@ -147,25 +171,19 @@
 .panelField20 {
   width: 100%;
   justify-content: flex-start;
+  z-index: 5; 
 }
 
 .panelField2 {
-  width: 100%;
+  width: 710rpx;
   margin-bottom: 20rpx;
+  border-radius: 20rpx;
 }
 
 .panelField21 {
   width: 650rpx;
   font-size: 36rpx;
-  margin: 40rpx 30rpx 0 30rpx;
-  min-height: 50rpx;
-}
-
-.lineField{
-  width:650rpx;
-  height:3rpx;
-  background-color: #4B3840;
-  margin-top: 30rpx;
+  margin: 50rpx 40rpx;
 }
 
 .panelItem .panelSound {
@@ -176,6 +194,13 @@
   border-radius: 50%;
 }
 
+.panelItem .panelSoundHover {
+  background-color: #d2d2d2;
+}
+.panelItem .panelSoundHover1 {
+  color: #d2d2d2;
+}
+
 .panelItem .universalpic_read_mark_black_20x20 {
   width: 21rpx;
   height: 20rpx;
@@ -185,12 +210,12 @@
   text-decoration: underline;
 }
 
-.panelItem .textNormal{
-  min-height:50rpx;
+.panelItem .textNormal {
+  min-height: 50rpx;
 }
 
-.panelItem .textNormal2{
-  font-size:36rpx;
+.panelItem .textNormal2 {
+  font-size: 36rpx;
 }
 
 .panelItem .textPinyin {
@@ -201,18 +226,23 @@
 .panelItem .imageBishun {
   width: 360rpx;
   height: 360rpx;
-  margin: 30rpx 0;
+  margin: 6rpx 0;
 }
 
 .panelItem .imageFree {
   width: 650rpx;
-  margin: 30rpx 0;
+  margin: 6rpx 0;
   border-radius: 20rpx;
 }
 
-.panelItem .textBr{
-  width:100%;
-  height:20rpx;
+.panelItem .imageFree2 {
+  width: 650rpx;
+  border-radius: 10rpx;
+}
+
+.panelItem .textBr {
+  width: 100%;
+  height: 24rpx;
 }
 
 .panelItem .textReturn {
@@ -224,14 +254,39 @@
   height: 30rpx;
 }
 
+/* ******************************** */
 
 /* 底部记忆选择 */
 
-.panelFooter{
+.footerShade{
   width: 100%;
   position: fixed;
+  height:480rpx;
+  bottom: 0;
+  z-index: 7;
+}
+
+.footer{
+  width: 710rpx;
+  position: fixed;
   bottom: 0;
   z-index: 10;
+  border-top-left-radius: 20rpx;
+  border-top-right-radius: 20rpx;
+}
+.panelFooter {
+  width: 710rpx;
+  margin-bottom: 20rpx;
+  background-color: #181a21;
+  border-radius: 20rpx;
+  color: #d2d2d2;
+  font-size: 48rpx;
+  text-align: center;
+  line-height: 140rpx;
+}
+
+.panelFooter0 {
+  line-height: 40rpx;
 }
 
 .panelBottomAnswer0 {
@@ -242,13 +297,13 @@
 
 .panelBottomAnswer {
   width: 100%;
-  font-size: 20rpx;
+  font-size: 28rpx;
   justify-content: space-between;
   z-index: 10;
-  height:130rpx;
+  height: 140rpx;
 }
 
-.iphoneX{
+.iphoneX {
   width: 100%;
   height: 60rpx;
   z-index: 10;
@@ -256,157 +311,182 @@
 
 .Answer {
   flex: 1;
-  height: 130rpx;
-  font-size: 24rpx;
+  font-size: 28rpx;
   justify-content: flex-start;
+  height: 140rpx;
 }
 
-.AnswerHover1{
-  background-color: #F0F0F0;
+.Answer .btnColor {
+  height: 14rpx;
+  width: 75%;
+  border-radius: 4rpx;
+  margin-top: 34rpx;
 }
-.AnswerHover2{
-  background-color: #49354C;
+
+.Answer .btnTime {
+  margin-top: 14rpx;
 }
-.AnswerHover3{
-  background-color: #504F5A;
+
+.Answer .Answer0 {
+  background-color: #fe6659;
 }
-.AnswerHover4{
-  background-color: #373B4F;
+
+.Answer .Answer1 {
+  background-color: #ffbc00;
 }
-.AnswerHover5{
-  background-color: #34384C;
+
+.Answer .Answer2 {
+  background-color: #329468;
 }
-.AnswerHover6{
-  background-color: #32304C;
+
+.Answer .Answer3 {
+  background-color: #0a60be;
 }
-.AnswerHover7{
-  background-color: #3D3838;
+
+
+.footer0 {
+  height: 180rpx;
+  width: 100%;
+  z-index: 1;
 }
-.AnswerHover8{
-  background-color: #473F52;
+
+/* 最后一页 */
+
+.panelLast {
+  width: 100%;
+  justify-content: flex-start;
+  align-items: flex-start;
+  position: fixed;
+  top: 0;
+  color: #fff;
+  z-index: 20;
 }
 
+.text1 {
+  margin: 100rpx 0 60rpx 40rpx;
+  font-size: 90rpx;
+}
 
-.Answer .btnColor {
-  height: 30rpx;
-  width: 90%;
-  border-radius: 6rpx;
-  margin-top: 30rpx;
+.panelLastTime {
+  font-size: 28rpx;
+  font-weight: 400;
+  color: #e3e3e3;
+  margin: 0 0 40rpx 40rpx;
+  align-items: flex-start;
 }
 
-.Answer .btnTime {
-  margin-top: 10rpx;
+.panelLastTime .time1 {
+  font-size: 90rpx;
+}
+.panelLastTime .time11 {
+  font-size: 108rpx;
+  font-family: 'Roboto-Black';
+}
+
+.panelLastTime .time2 {
+  font-size: 36rpx;
+  font-family: 'Roboto-Black';
+}
+
+.panelLastFooter {
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+  align-items: flex-start;
+  font-size: 36rpx;
 }
 
-.Answer0 {
-  background-color: #FE6659;
+.panelLastFooter .panelLastFooter1 {
+  width: 100%;
+  height: 131rpx;
+  border-top: 1rpx solid rgba(0, 0, 0, 0.2);
+  justify-content: flex-start;
 }
 
-.Answer1 {
-  background-color: #FFBC00;
+.panelLastFooter .panelLastFooter2 {
+  width: 100%;
+  border-top: 1rpx solid rgba(0, 0, 0, 0.2);
+  text-align: center;
+  line-height: 131rpx;
 }
 
-.Answer2 {
-  background-color: #329468;
+.universalpic_undo_gray_26x20 {
+  width: 26rpx;
+  height: 19rpx;
+  margin: 0 20rpx 0 30rpx;
 }
 
-.Answer3 {
-  background-color: #0A60BE;
+.universalpic_screenshot_gray_30x30 {
+  width: 30rpx;
+  height: 30rpx;
+  margin: 0 20rpx 0 30rpx;
 }
 
+
 .numberContainer {
-  background-color: rgba(0, 0, 0, 0.7);
-  position: fixed;
   width: 100%;
+  justify-content: flex-start;
+  align-items: flex-start;
+  position: fixed;
   top: 0;
+  color: #fff;
   z-index: 20;
 }
 
-.numberContainer1 {
-  background-color: #f0f0f0;
-  margin-top: 10rpx;
-  width: 730rpx;
-  border-radius: 10rpx;
-  font-size: 28rpx;
-  color: #1e1e1e;
-}
-
-.numberContainer11 {
-  border-top-left-radius: 10rpx;
-  border-top-right-radius: 10rpx;
-  justify-content: space-between;
-  height: 100rpx;
-  width: 100%;
+.numberContainer .numberContainer11 {
+  margin: 50rpx 0 0 30rpx;
+  font-size:32rpx;
 }
 
 .numberContainer .left {
   margin-left: 30rpx;
   font-weight: 400;
+  font-size:28rpx;
 }
 
 .numberContainer .right3 {
   margin-right: 30rpx;
-  color:#787878;
   font-weight: 500;
+  font-size:28rpx;
 }
 
-.numberContainer12 {
+.numberContainer .numberContainer12 {
   justify-content: space-between;
   height: 100rpx;
   width: 100%;
-  background-color: #fff;
   font-weight: 400;
 }
 
-.numberContainer13 {
-  height: 100rpx;
+.numberContainer .numberContaineFooter{
   width: 100%;
-  color: #0071ef;
-  border-bottom-left-radius: 10rpx;
-  border-bottom-right-radius: 10rpx;
+  position: fixed;
+  bottom: 0;
+  align-items: flex-start;
+  font-size: 36rpx;
+  border-top: 1rpx solid rgba(0, 0, 0, 0.2);
   text-align: center;
-  font-weight: 500;
+  line-height: 131rpx;
 }
 
-.footer{
-  height:180rpx;
+.lineWidthAll{
   width: 100%;
+  justify-content: flex-end;
+  height: 1rpx;
+  background-color: transparent;
 }
-
-.panelLast {
-  width: 100%;
-  justify-content: flex-start;
-  position: fixed;
-  top:0;
+.lineWidth720{
+  width: 720rpx;
+  height: 1rpx;
+  background-color:rgba(0, 0, 0, 0.2);
 }
 
-.text1 {
-  margin: 230rpx 0 60rpx 0;
-  font-size: 64rpx;
-}
-
-.panelLastTime {
-  font-size: 28rpx;
-  font-weight: 400;
-  margin-bottom: 40rpx;
-}
-
-.panelLastTime .time {
-  font-size: 30rpx;
-  font-family: 'Roboto-Black';
-}
-
-.panelLastFooter{
+.lineFooter{
   width: 100%;
-  height:130rpx;
-  border-top:1rpx solid rgba(0, 0, 0, 0.2);
-  font-size:36rpx;
-  text-align: center;
-  line-height: 130rpx;
-  position: fixed;
-  bottom: 0;
+  height: 1rpx;
+  background-color:rgba(0, 0, 0, 0.2);
 }
-.practice_introduction_marks_a{
+
+.practice_introduction_marks_a {
   width: 22rpx;
   height: 16rpx;
   margin-top: 104rpx;
@@ -419,16 +499,23 @@
   text-align: center;
 }
 
-.practice_introduction_marks_b{
+.practice_introduction_marks_b {
   width: 22rpx;
   height: 16rpx;
   margin-top: 30rpx;
 }
 
-
 .text3 {
   margin-top: 40rpx;
   font-size: 20rpx;
   font-weight: 500;
   text-align: center;
+}
+
+
+.Canvas{
+  width: 600px; 
+  height: 360px;
+  position: fixed;
+  left:760rpx;
 }

pages/main/preview.js

@@ -2,7 +2,7 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
-var iTimeout = 0, intervalSound = 0, intervalRefresh = 0;
+var intervalSound = 0, intervalRefresh = 0;
 var arrImage = [];
 var isCopying = false;
 var isPlaying = false;
@@ -23,22 +23,39 @@ Page({
       Containnerheight: main.getWindowHeight(),
       ShowType: options.type,
       MiaoguoCardID: id,
+      Color: main.getDetailColor(app.globalData.ColorIndex),
     });
     console.log("MiaoguoCardID:" + id);
 
     this.audioCtx = [];
 
 
-    if (options.type == "share") {
-      wx.setNavigationBarTitle({
-        title: "来自分享"
-      });
-    }
-    else if (options.type == "show") {
+    if (options.type == "show") {
       wx.setNavigationBarTitle({
         title: "查看题卡"
       });
     }
+    else{
+      if (options.type == "share") {
+        wx.setNavigationBarTitle({
+          title: "来自分享"
+        });
+      }
+    
+      if (wx.setBackgroundColor) {
+        wx.setBackgroundColor({
+          backgroundColor: that.data.Color.BackColor,
+          backgroundColorTop: that.data.Color.BackColor,
+          backgroundColorBottom: that.data.Color.BackColor,
+        })
+      }
+      if (wx.setNavigationBarColor) {
+        wx.setNavigationBarColor({
+          frontColor: "#ffffff",
+          backgroundColor: that.data.Color.BackColor,
+        })
+      }
+    }
   },
   onShow: function () {
     var that = this;
@@ -56,7 +73,6 @@ Page({
         that.init();
   },
   onUnload: function () {
-    clearTimeout(iTimeout);
     clearInterval(intervalSound);
   },
   init: function () {
@@ -114,10 +130,21 @@ Page({
         }
       }
     }
+
+    var TagWidth = 0;
+    if (card.Tags && card.Tags.length > 0) {
+      TagWidth = 92 + (card.Tags.length - 1) * 122;
+      for (var j = 0; j < card.Tags.length; j++) {
+        if (card.Tags[j].length > 2) {
+          TagWidth += 46 * (card.Tags[j].length - 2);
+        }
+      }
+    }
     this.setData({
       ID: card.MiaoguoCardID,
       Field: card.Field,
       Tags: card.Tags,
+      TagWidth: TagWidth,
       PrevID: prevId,
       NextID: nextId,
       FontSize: card.FontSize,
@@ -295,63 +322,33 @@ Page({
         this.audioCtx.push(wx.createAudioContext('myAudio' + i));
       }
       var index = 0;
-      intervalSound = setInterval(function () {
-        that.audioCtx[index].setSrc(arr[index]);
-        that.audioCtx[index].play();
+      if (arr.length > 1) {
+        
+        intervalSound = setInterval(function () {
+          that.audioCtx[index].setSrc(arr[index]);
+          that.audioCtx[index].play();
 
-        index++;
-        if (index >= arr.length) {
-          clearInterval(intervalSound);
-        }
-      }, 1000);
-
-      var fieldid = e.currentTarget.dataset.fieldid;
-      var content = that.data.Field[fieldid];
-      var selectIndex = 0;
-      for (var i = 0; i < content.length; i++) {
-        if (content[i].Type == 'sound') {
-          if (content[i].Content == e.currentTarget.dataset.content) {
-            content[i].SoundImageName = "gif";
-            selectIndex = i;
-            break;
+          index++;
+          if (index >= arr.length) {
+            clearInterval(intervalSound);
           }
-        }
+        }, 1000);
+      }
+      else {
+        if (arr[index].indexOf("http") > 0)
+          arr[index] = arr[index].substr(arr[index].indexOf("http"));
+        arr[index] = arr[index].replace("http://", "https://");
+
+        that.audioCtx[index].setSrc(arr[index]);
+        that.audioCtx[index].play();
       }
-      that.setData({
-        Field: that.data.Field,
-      });
-      iTimeout = setTimeout(function () {
-        content[selectIndex].SoundImageName = "png";
-        that.data.Field[fieldid] = content;
-        that.setData({
-          Field: that.data.Field,
-        });
-      }, 2000);
     }
   },
-  onMore: function () {
-    var that = this;
-    wx.showActionSheet({
-      itemList: ["详细信息", "编辑题卡", "删除题卡"],
-      success(res) {
-        //console.log(res.tapIndex);
-        if (res.tapIndex == 0) {
-          wx.navigateTo({
-            url: './cardInfo?id=' + that.data.MiaoguoCardID,
-          });
-        }
-        else if (res.tapIndex == 1) {
-          wx.navigateTo({
-            url: './add?type=edit2&type2=1&id=' + that.data.MiaoguoCardID,
-          });
-        }
-        else if (res.tapIndex == 2) {
-          that.deleteCard();
-        }
-      },
-    })
+  getDetailInfo:function(){
+    wx.navigateTo({
+      url: './cardInfo?id=' + this.data.MiaoguoCardID,
+    });
   },
-
   deleteCard: function () {
     var that = this;
     wx.showModal({
@@ -384,7 +381,6 @@ Page({
     });
   },
   onPreview: function (e) {
-    clearTimeout(iTimeout);
     var id = e.currentTarget.dataset.id;
     wx.redirectTo({
       url: './preview?type=show&id=' + id,

pages/main/preview.json

@@ -1,7 +1,3 @@
 {
-  "navigationBarBackgroundColor": "#ffffff",
-  "navigationBarTextStyle": "black",
-  "navigationBarTitleText": "预览",
-  "backgroundColor": "#E3E3E3",
-  "backgroundColorTop":"#ffffff"
+  "navigationBarTitleText": "格式预览"
 }

pages/main/preview.wxml

@@ -1,79 +1,101 @@
-<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}}'>
+  <!-- 顶端工具栏 -->
   <block wx:if="{{ShowType=='show'}}">
     <view class="panelTop FlexRow">
-      <view class='left FlexRow'>
+      <view class='left FlexColumn'>
         <view class="text1">到期时间</view>
         <view class="text2">{{LimitTimeStr}}</view>
       </view>
       <view class='right FlexRow'>
+        <view class="panelTopBtn FlexRow" bindtap='deleteCard'>
+          <image class="universalpic_del_black_20x28" src='../images/universalpic_del_black_20x28.png' />
+        </view>
+        <view class="panelTopBtn FlexRow" bindtap='getDetailInfo'>
+          <image class="universalpic_info_black_26x26" src='../images/universalpic_info_black_26x26.png' />
+        </view>
         <view class="text3" bindtap='practiceToday' hidden="{{!IsTodayPractice}}">今天必练</view>
         <view class="text4 text3" bindtap='shelveTask' hidden="{{IsTodayPractice}}">今天不练</view>
       </view>
     </view>
     <view class="panelTop1"></view>
   </block>
-  <view class="panelField{{ShowType}} panelField1 FlexColumn">
-    <view class="panelField11 panelItem FlexRow" style="font-size:{{FontSize}}rpx;">
+
+  <!-- 第一段 -->
+  <view class="panelField1 FlexColumn" style='background-color:{{Color.BackColor}};'>
+    <view class="editFieldNull" hidden="{{ShowType=='sharepreview'}}"></view>
+    <view class="editFieldNull1" hidden="{{ShowType!='sharepreview'}}"></view>
+    
+    <view class="editField" bindtap='editField' data-id="1" wx:if="{{ShowType == 'show'}}">编辑段落1</view>
+    <view class="panelField11 panelItem FlexRow" style="font-size:46rpx;">
       <block wx:for="{{Field[1]}}" wx:key="index">
         <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>
         <view class="textBr" wx:if="{{index>0 && item.Type=='br'}}"></view>
-        
         <text class="textNormal" selectable="true" space='ensp' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
+
         <text class="textNormal FlexRow" selectable="true" space='ensp' wx:if="{{item.Type=='line'}}">
-          <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem">
+            <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem">
               <text space='ensp' wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
         <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
       </block>
       </text>
-      <view class="panelSound FlexRow" wx:if="{{item.Type=='sound'}}" bindtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">
+
+      <view class="panelSound FlexRow" hover-class='panelSoundHover' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" bindtap="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.{{item.SoundImageName}}' />
       </view>
-      <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">{{item.Content}}</text>
+
+      <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>
       <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
+
       </block>
     </view>
   </view>
 
-  <view class="panelTag FlexRow" wx:if="{{Tags && Tags.length>0}}">
-    <view class="panelTag1 FlexRow" wx:if="{{Tags && Tags.length>0}}">
-      <view class='tagDot'></view>
+  <!-- 标签 -->
+  <view class="panelTag FlexColumn" wx:if="{{Tags.length>0}}">
+    <view class='panelTagLine' style='width:{{TagWidth}}rpx;background-color:{{Color.LineColor}};'></view>
+    <view class="panelTag1 FlexRow">
       <view class="tag" wx:for="{{Tags}}" wx:key="index">{{item}}</view>
     </view>
-    <view wx:if="{{true}}"></view>
   </view>
 
-  <view class="panelField2 FlexColumn" wx:for="{{[2,3]}}" wx:key="indexParent" wx:for-index="indexParent" wx:for-item="itemParent" wx:if="{{Field[itemParent].length>0}}" >
-    <view wx:if="{{itemParent==3}}" class="lineField"></view>
+  <!-- 第二段和第三段 -->
+  <view class="panelField20 FlexColumn">
+    <view class="editFieldNull2"  hidden="{{ShowType=='sharepreview'}}"></view>
+    <view class="editFieldNull3"  hidden="{{ShowType!='sharepreview'}}"></view>
+    
+    <block wx:for="{{[2,3]}}" wx:key="indexParent" wx:for-index="indexParent" wx:for-item="itemParent" wx:if="{{Field[itemParent].length>0}}" >
+    <view class="editField" bindtap='editField' data-id="{{itemParent}}" wx:if="{{ShowType == 'show'}}">编辑段落{{itemParent}}</view>
+    <view class="panelField2 FlexColumn" style='background-color:{{Color.FieldBackColor}};'>
+      <view class="panelField21 panelItem FlexRow" style='color:{{Color.FieldColor}};'>
+        <block wx:for="{{Field[itemParent]}}" wx:key="index">
+          <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>
+          <view class="textBr" wx:if="{{index>0 && item.Type=='br'}}"></view>
 
-    <view class="panelField21 panelItem FlexRow">
-      <block wx:for="{{Field[itemParent]}}" wx:key="index">
-        <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>
-        <view class="textBr" wx:if="{{index>0 && item.Type=='br'}}"></view>
-        
-        <text class="textNormal" selectable="true" space='ensp' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
+          <text class="textNormal2 textNormal" selectable="true" space='ensp' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
 
-        <text class="textNormal FlexRow" selectable="true" space='ensp' wx:if="{{item.Type=='line'}}">
+          <text class="textNormal2 FlexRow" selectable="true" space='ensp' wx:if="{{item.Type=='line'}}">
             <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem">
               <text space='ensp' wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
-        <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
-      </block>
-      </text>
-
-      <view class="panelSound FlexRow" wx:if="{{item.Type=='sound'}}" bindtap="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.{{item.SoundImageName}}' />
-      </view>
+          <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
+        </block>
+        </text>
 
-      <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">{{item.Content}}</text>
+        <view class="panelSound FlexRow" hover-class='panelSoundHover' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" bindtap="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.{{item.SoundImageName}}' />
+        </view>
 
-      <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
-
-      </block>
+        <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>
+        <image class="imageFree2" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
+        </block>
+      </view>
     </view>
+    </block>
   </view>
 
+
   <view style='height:150rpx'></view>
 
-  <view class='panelSave' bindtap="close" wx:if="{{ShowType=='preview'}}">关闭</view>
+  <view class='panelSave' bindtap="close" wx:if="{{ShowType=='preview'}}">退出预览</view>
 
   <view class='panelSaveShare panelSave FlexRow' wx:if="{{ShowType=='share'}}">
     <view class='text5 text3' bindtap="returnDefault">首页</view>
@@ -89,9 +111,6 @@
     <view class='btn2 FlexRow'>
       <button class="btn21" open-type='share'>分享给大家</button>
     </view>
-    <view class='btn2 FlexRow' bindtap="onMore">
-      <image class="universalpic_more_40x10" src='../images/universalpic_more_40x10.png' />
-    </view>
     <view class='btn1 FlexRow' bindtap="onPreview" data-id="{{NextID}}" wx:if="{{NextID>0}}">
       <image class="universalpic_prev_black_30x30" src='../images/universalpic_next_black_30x30.png' />
     </view>

pages/main/preview.wxss

@@ -26,74 +26,190 @@
 .left {
   margin-left: 25rpx;
   font-weight: 400;
+  align-items: flex-start;
 }
 
 .right {
-  margin-right: 30rpx;
+  margin-right: 20rpx;
+}
+
+.panelTopBtn{
+  width:100rpx;
+  height:120rpx;
+}
+
+.universalpic_del_black_20x28{
+  width:20rpx;
+  height:28rpx;
+}
+
+.universalpic_info_black_26x26{
+  width:26rpx;
+  height:26rpx;
 }
 
+.text1 {
+  font-size:24rpx;
+}
 .text2 {
   color: #787878;
-  margin-left: 30rpx;
   font-weight: 500;
+  font-size:28rpx;
 }
 
 .text3 {
   color: #787878;
-  width: 132rpx;
+  width: 156rpx;
   line-height: 80rpx;
   text-align: center;
   background-color: #fff;
   border:1rpx solid #9B9B9B;
   border-radius: 10rpx;
   font-size: 24rpx;
+  margin-left: 20rpx;
 }
 
 .text4 {
   color: #A20602;
 }
 
+.editField{
+  color:#fff;
+  font-size:24rpx;
+  align-self: flex-start;
+  margin: 0 0 20rpx 50rpx;
+}
+
+/* 段落显示************************ */
+
+.editFieldNull{
+  height:60rpx;
+}
+.editFieldNull1{
+  height:40rpx;
+}
+.editFieldNull2{
+  height:80rpx;
+}
+.editFieldNull3{
+  height:30rpx;
+}
+
 .panelItem {
   width: 650rpx;
   font-weight: 400;
   flex-wrap: wrap;
   justify-content: flex-start;
-  color: #1e1e1e;
+  z-index: 5;
+}
+
+.panelField10 {
+  width: 100%;
+  height: 110rpx;
 }
 
 .panelField1 {
   width: 100%;
-  background-color: #fff;
-  min-height: 320rpx;
   justify-content: flex-start;
-  border-bottom-left-radius: 50rpx;
-  border-bottom-right-radius: 50rpx;
-}
-.panelFieldsharepreview{
-  min-height: 0rpx;
-  border-bottom-left-radius: 0;
-  border-bottom-right-radius: 0;
 }
+
 .panelField11 {
+  font-size: 48rpx;
+  justify-content: flex-start;
+  color: #fff;
+}
+
+.panelTag {
+  width: 100%;
+  min-height: 95rpx;
+  align-items: flex-start;
+  justify-content: flex-start;
+  margin-top: 80rpx;
+  z-index: 5;
+}
+
+.panelTag .panelTagLine {
+  margin: 0 0 0 50rpx;
+  max-width: 650rpx;
+  height: 10rpx;
+}
+
+.panelTag .panelTag1 {
+  margin: 0 0 0 50rpx;
+  width: 650rpx;
+  flex-wrap: wrap;
+  align-items: flex-start;
+  justify-content: flex-start;
+}
+
+.panelTag .tag {
   font-size: 46rpx;
+  margin: 20rpx 30rpx 0 0;
+  font-weight: 400;
+  color: #d2d2d2;
+}
+
+.right2 {
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 134rpx;
+  height: 150rpx;
+  align-items: flex-start;
+}
+
+.line1 {
+  width: 4rpx;
+  height: 30rpx;
+  background-color: rgba(255, 255, 255, 0.2);
+  margin-top: 66rpx;
+}
+
+.universalpic_show_white_30x30 {
+  width: 36rpx;
+  height: 36rpx;
+  margin: 68rpx 50rpx 0 50rpx;
+}
+
+.universalpic_hide_white_34x34 {
+  width: 36rpx;
+  height: 20rpx;
+  margin: 68rpx 50rpx 0 50rpx;
+}
+
+.panelField20 {
+  width: 100%;
   justify-content: flex-start;
-  margin: 40rpx 0 80rpx 0;
+  z-index: 5; 
 }
 
-.panelItem .universalpic_read_gray_40x40 {
-  width: 40rpx;
-  height: 40rpx;
-  margin: 0 10rpx 0 10rpx;
+.panelField2 {
+  width: 710rpx;
+  margin-bottom: 20rpx;
+  border-radius: 20rpx;
+}
+
+.panelField21 {
+  width: 650rpx;
+  font-size: 36rpx;
+  margin: 50rpx 40rpx;
 }
 
 .panelItem .panelSound {
   width: 40rpx;
   height: 40rpx;
   margin: 0 10rpx 0 0;
-  background-color: #F0F0F0;
+  background-color: #fff;
   border-radius: 50%;
 }
 
+.panelItem .panelSoundHover {
+  background-color: #d2d2d2;
+}
+.panelItem .panelSoundHover1 {
+  color: #d2d2d2;
+}
+
 .panelItem .universalpic_read_mark_black_20x20 {
   width: 21rpx;
   height: 20rpx;
@@ -104,9 +220,13 @@
 }
 
 .panelItem .textNormal {
-  width:650rpx;
-  justify-content: flex-start;
+  min-height: 50rpx;
+}
+
+.panelItem .textNormal2 {
+  font-size: 36rpx;
 }
+
 .panelItem .textPinyin {
   text-decoration: underline;
   margin-right: 10rpx;
@@ -115,87 +235,35 @@
 .panelItem .imageBishun {
   width: 360rpx;
   height: 360rpx;
-  margin: 30rpx 0;
+  margin: 6rpx 0;
 }
 
 .panelItem .imageFree {
   width: 650rpx;
-  margin: 30rpx 0;
+  margin: 6rpx 0;
   border-radius: 20rpx;
 }
 
-.panelItem .textBr{
-  width:100%;
-  height:20rpx;
+.panelItem .imageFree2 {
+  width: 650rpx;
+  border-radius: 10rpx;
 }
 
-.panelItem .textReturn {
+.panelItem .textBr {
   width: 100%;
+  height: 24rpx;
 }
 
-.panelItem .textReturn2 {
+.panelItem .textReturn {
   width: 100%;
-  height: 30rpx;
 }
 
-.panelTag {
+.panelItem .textReturn2 {
   width: 100%;
-  justify-content: space-between;
-  margin: 60rpx 0 20rpx 0;
-}
-
-.panelTag1 {
-  font-size: 28rpx;
-  margin-left: 50rpx;
-}
-
-.panelTag .tagDot{
-  width:20rpx;
-  height:20rpx;
-  border-radius: 5rpx;
-  background-color: #9B9B9B;
-  margin-right: 20rpx;
-}
-
-.panelTag .tag {
-  color: #1E1E1E;
-  margin: 6rpx 20rpx 6rpx 0;
-}
-
-.right2 {
-  margin-right: 50rpx;
-}
-
-.line1 {
-  width: 4rpx;
   height: 30rpx;
-  background-color: #d2d2d2;
-}
-
-.universalpic_restore_black_34x34 {
-  width: 26rpx;
-  height: 26rpx;
-  margin-left: 50rpx;
-}
-
-.panelField2 {
-  width: 100%;
-  margin-bottom: 20rpx;
-}
-
-.panelField21 {
-  width: 650rpx;
-  font-size: 36rpx;
-  margin: 40rpx 0 0 0;
-}
-
-.lineField{
-  width:650rpx;
-  height:3rpx;
-  background-color: #D2D2D2;
-  margin-top: 30rpx;
 }
 
+/* ******************************** */
 .panelSave {
   width: 100%;
   background-color: #fff;
@@ -215,24 +283,18 @@
 }
 
 .btn2 {
-  width: 225rpx;
+  width: 450rpx;
   height: 120rpx;
   background-color: #fff;
 }
 
 .btn21 {
-  width: 160rpx;
-  height: 80rpx;
-  font-size: 24rpx;
+  font-size: 36rpx;
   color: #0071ef;
-  line-height: 80rpx;
   text-align: center;
   padding-left: 0;
   padding-right: 0;
   background-color: #fff;
-  border:1rpx solid #9B9B9B;
-  border-radius: 10rpx;
-  margin: 0;
 }
 
 .btn21::after {

pages/main/searchWeb1.js

@@ -67,7 +67,7 @@ Page({
         }
         arr.unshift(search);
 
-        if (arr.length > 10) {
+        while (arr.length > 10){
           arr.pop();
         }
 
@@ -97,7 +97,7 @@ Page({
         break;
       }
     }
-    this.searchResult(obj.Key,obj.Type,obj.Author);
+    this.searchResult(obj.Key,obj.Type,obj.Author,obj.Url);
     
   },
   close: function (e) {
@@ -113,7 +113,7 @@ Page({
     });
     wx.removeStorageSync("SearchTextList");
   },
-  searchResult: function (search, searchType, author) {
+  searchResult: function (search, searchType, author,shiciUrl) {
 
     wx.showLoading({
       title: '查询中',
@@ -126,6 +126,8 @@ Page({
       url += "&SearchType=" + searchType;
     if (author)
       url += "&Author=" + author;
+    if (shiciUrl)
+      url += "&ShiciUrl=" + shiciUrl;
     main.getData(url, function (data) {
       wx.hideLoading();
       wx.setNavigationBarTitle({
@@ -161,6 +163,7 @@ Page({
             obj.Type = "shici";
             obj.TypeName = "诗词";
             obj.Content = data.CHN.PeomContent.join("").substr(0, 26);
+            obj.ShiciUrl=shiciUrl;
           }
           else if (data.CHN){
             obj.Type = "zici";

pages/main/searchWeb1.wxml

@@ -29,24 +29,7 @@
           <view class="panelTag0">{{item}}</view>
         </view>
       </view>
-      <!-- <block wx:for="{{SearchTextList}}" wx:key="index">
-        <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
-          <view class="lineWidth720"></view>
-        </view>
-        <view class="panelItemSearch0 FlexRow">
-          <view class="panelItemSearch01">
-          </view>
-          <view class="panelItemSearch02 FlexRow">
-            <view class="panelItemSearchText01" bindtap='onSearch' data-search="{{item}}">
-              {{item}}
-            </view>
-            <view class="panelItemSearch021 FlexRow" bindtap='deleteItem' data-id="{{index}}">
-              <image src='../images/universalpic_del_gray_14x14.png' class="universalpic_del_gray_14x14" />
-            </view>
-          </view>
-        </view>
-
-      </block> -->
+      
       <view class='lineFooter'></view>
     </block>
   </block>

pages/main/searchWeb2.wxss

@@ -44,6 +44,7 @@
   border:1rpx solid #9B9B9B;
   background-color: #fff;
   margin: 30rpx 0  0 30rpx;
+  min-height: 100rpx;
 }
 
 .Select1 {

pages/other/test.js

@@ -0,0 +1,66 @@
+// pages/other/test.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/other/test.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/other/test.wxml

@@ -0,0 +1,2 @@
+<!--pages/other/test.wxml-->
+<text class='textPinyin'>鲜花盛开</text>

pages/other/test.wxss

@@ -0,0 +1,6 @@
+/* pages/other/test.wxss */
+.textPinyin {
+  border-bottom: 1px solid;
+  margin-right: 10rpx;
+  line-height:66rpx;
+}

utils/main.js

@@ -421,8 +421,8 @@ function changeStringToView(field) {
             obj.Type = "normal";
             obj.Content = arr[k];
             arrResult.push(obj);
-          } 
-          else if (k>0 && arr[k] == "") {
+          }
+          else if (k > 0 && arr[k] == "") {
             var obj = {};
             obj.Type = "br";
             obj.Content = "";
@@ -432,6 +432,21 @@ function changeStringToView(field) {
           obj.Type = "return";
           arrResult.push(obj);
         }
+
+        //去掉前回车换行
+        while (arrResult[0].Type == "return"
+          || arrResult[0].Type == "br") {
+          arrResult.shift();
+        }
+        //去掉后回车换行
+        for (var i = arrResult.length - 1; i >= 0; i--) {
+          if (arrResult[i].Type == "return"
+            || arrResult[i].Type == "br")
+            arrResult.pop();
+          else {
+            break;
+          }
+        }
         result.Field.push(arrResult);
 
       }
@@ -471,7 +486,7 @@ function getTaskTodayList(callback) {
     wx.hideLoading();
 
     if (data) {
-      app.globalData.TaskToday= data;
+      app.globalData.TaskToday = data;
       callback(data);
 
     }
@@ -510,28 +525,39 @@ function saveTempImage(serverUrl, tempUrl) {
     list.push({ "ServerUrl": serverUrl, "TempUrl": tempUrl });
   }
 
-  if (list.length>200){
+  if (list.length > 200) {
     list.pop();
   }
   wx.setStorageSync("TempImageList", list);
 }
 
-function updateSearchList(obj){
+function updateSearchList(obj) {
   var arr = wx.getStorageSync("SearchWord3");
   if (!arr)
     arr = [];
-  
-  if (obj.Type=="shici"){
-    if (obj.Key.indexOf("《")==0)
-      obj.Key=obj.Key.substring(1,obj.Key.length-1);
+
+  if (obj.Type == "shici") {
+    if (obj.Key.indexOf("《") == 0)
+      obj.Key = obj.Key.substring(1, obj.Key.length - 1);
   }
   for (var i = 0; i < arr.length; i++) {
     if (arr[i].Key == obj.Key
       && arr[i].Type == obj.Type
-      && arr[i].Author == obj.Author) {
-      obj.Value = arr[i].Value;
-      arr.splice(i, 1);
-      break;
+      && arr[i].Author == obj.Author
+    ) {
+      if (obj.Type == "shici") {
+        if (arr[i].ShiciUrl==obj.ShiciUrl){
+          obj.Value = arr[i].Value;
+          arr.splice(i, 1);
+          break;
+        }
+      }
+      else{
+        obj.Value = arr[i].Value;
+        arr.splice(i, 1);
+        break;
+      }
+      
     }
   }
   arr.unshift(obj);
@@ -540,13 +566,13 @@ function updateSearchList(obj){
     arr.pop();
   }
   wx.setStorageSync("SearchWord3", arr);
-  
+
   app.globalData.SearchItem = obj.Value;
 }
 
-function checkIsIPhoneX(){
+function checkIsIPhoneX() {
   var isIphoneX = false;
-  if (app.globalData.systemInfo.model.indexOf("iPhone X")>=0
+  if (app.globalData.systemInfo.model.indexOf("iPhone X") >= 0
     || app.globalData.systemInfo.model.indexOf("iPhone X") >= 0) {
     isIphoneX = true;
   }
@@ -572,8 +598,8 @@ function getMemoryLevelAll() {
 }
 
 function getMemoryLevel(index, number, time) {
-  var arr=getMemoryLevelAll();
-  if (index<3)
+  var arr = getMemoryLevelAll();
+  if (index < 3)
     return arr[index].Value[number];
   else
     return replaceStr(time);
@@ -608,141 +634,57 @@ function getDetailColor(index) {
     },
     {
       ID: 1,
-      Name: "黑白",
-      BackColor: "#ffffff",
-      BackColor1: "#D2D2D2",
-      FrontColor: "#1E1E1E",
-      FrontColor1: "rgba(0,0,0,0.3)",
-      BackColor2: "#E3E3E3",
-      BackColor20: 'rgba(227,227,227,0)',
-      FrontColor2: "#1E1E1E",
-      TagColor: "#9B9B9B",
-      FieldLineColor: "#4B3840",
-      IconColor: "black",
-      FrontColorNavigationBar: "#000000",
-      BtnPressDownColor: "#F0F0F0",
+      Name: "阿拉斯加海湾",
+      BackColor: "#1F3C88",
+      BackColor2: "#19306C",
+      LineColor: "#D38E02",
+      FieldBackColor: "#15295E",
+      FieldColor: "#ACC3DC",
     },
     {
       ID: 2,
-      Name: "珊瑚树",
-      BackColor: "#A5656E",
-      BackColor1: "#7F4B52",
-      FrontColor: "#ffffff",
-      FrontColor1: "rgba(255,255,255,0.5)",
-      BackColor2: "#362738",
-      BackColor20: 'rgba(54,39,56,0)',
-      FrontColor2: "#D2AFBC",
-      TagColor: "#7F4B52",
-      FieldLineColor: "#D2D2D2",
-      IconColor: "white",
-      FrontColorNavigationBar: "#ffffff",
-      BtnPressDownColor: "#49354C",
-    },
-    {
-      ID: 3,
-      Name: "水果沙拉",
-      BackColor: "#67A05D",
-      BackColor1: "#467A5C",
-      FrontColor: "#ffffff",
-      FrontColor1: "rgba(255,255,255,0.5)",
-      BackColor2: "#403F48",
-      BackColor20: 'rgba(64,63,72,0)',
-      FrontColor2: "#E3D9CA",
-      TagColor: "#467A5C",
-      FieldLineColor: "#605F6C",
-      IconColor: "white",
-      FrontColorNavigationBar: "#ffffff",
-      BtnPressDownColor: "#504F5A",
-    },
-    {
-      ID: 4,
-      Name: "瞭望",
-      BackColor: "#0B8457",
-      BackColor1: "#1F6349",
-      FrontColor: "#ffffff",
-      FrontColor1: "rgba(255,255,255,0.5)",
-      BackColor2: "#292C3B",
-      BackColor20: 'rgba(41,44,59,0)',
-      FrontColor2: "#AAC4C0",
-      TagColor: "#1F6349",
-      FieldLineColor: "#353A4C",
-      IconColor: "white",
-      FrontColorNavigationBar: "#ffffff",
-      BtnPressDownColor: "#373B4F",
-    },
-    {
-      ID: 5,
-      Name: "软糖豆",
-      BackColor: "#018790",
-      BackColor1: "#1C686C",
-      FrontColor: "#ffffff",
-      FrontColor1: "rgba(255,255,255,0.5)",
-      BackColor2: "#262938",
-      BackColor20: 'rgba(38,41,56,0)',
-      FrontColor2: "#A9AEC5",
-      TagColor: "#1C686C",
-      FieldLineColor: "#414760",
-      IconColor: "white",
-      FrontColorNavigationBar: "#ffffff",
-      BtnPressDownColor: "#34384C",
-    },
-    {
-      ID: 6,
-      Name: "沙漏",
-      BackColor: "#A3816A",
-      BackColor1: "#7D614E",
-      FrontColor: "#ffffff",
-      FrontColor1: "rgba(255,255,255,0.5)",
-      BackColor2: "#242337",
-      BackColor20: 'rgba(36,35,55,0)',
-      FrontColor2: "#A6A4C5",
-      TagColor: "#7D614E",
-      FieldLineColor: "#3B3F56",
-      IconColor: "white",
-      FrontColorNavigationBar: "#ffffff",
-      BtnPressDownColor: "#32304C",
-    },
-    {
-      ID: 7,
-      Name: "曼巴",
-      BackColor: "#7E7373",
-      BackColor1: "#E08371",
-      FrontColor: "#ffffff",
-      FrontColor1: "rgba(255,255,255,0.5)",
-      BackColor2: "#2B2828",
-      BackColor20: 'rgba(43,40,40,0)',
-      FrontColor2: "#D3C0C0",
-      TagColor: "#E08371",
-      FieldLineColor: "#4E4949",
-      IconColor: "white",
-      FrontColorNavigationBar: "#ffffff",
-      BtnPressDownColor: "#3D3838",
-    },
-    {
-      ID: 8,
-      Name: "烧赭",
-      BackColor: "#FB6C54",
-      BackColor1: "#CC554D",
-      FrontColor: "#ffffff",
-      FrontColor1: "rgba(255,255,255,0.5)",
-      BackColor2: "#36303F",
-      BackColor20: 'rgba(54,48,63,0)',
-      FrontColor2: "#AAA8BC",
-      TagColor: "#CC554D",
-      FieldLineColor: "#3D3B4D",
-      IconColor: "white",
-      FrontColorNavigationBar: "#ffffff",
-      BtnPressDownColor: "#473F52",
+      Name: "塔斯马尼亚的尤加利",
+      BackColor: "#1B5E20",
+      BackColor2: "#1C4417",
+      LineColor: "#FF945B",
+      FieldBackColor: "#1C4417",
+      FieldColor: "#AFEFB4",
     },
+    // {
+    //   ID: 3,
+    //   Name: "特立尼达的傍晚",
+    //   BackColor: "#E64A19",
+    //   BackColor2: "#C12A16",
+    //   LineColor: "#ADD303",
+    //   FieldBackColor: "#A9361D",
+    //   FieldColor: "#FBCAC4",
+    // },
   ];
   if (index > 0)
     return arr[index];
   else if (index == 0)
-    return arr[common.random(2, arr.length - 1)];
+    return arr[common.random(1, arr.length - 1)];
   else if (index == -1)
     return arr;
 }
 
+function getShareImageBackColor() {
+  var arr = [
+    "#F83B2D",
+    "#D81B60",
+    "#8E24AA",
+    "#6639B5",
+    "#3F51B5",
+    "#1E88E5",
+    "#00ACC1",
+    "#43A047",
+    "#0B8457",
+    "#616161",
+    "#634033",
+    "#FF5722",
+  ];
+  return arr[common.random(0, 11)];
+}
 
 function getPinyin(pinyin) {
   var result = [];
@@ -2269,4 +2211,5 @@ module.exports = {
   checkIsIPhoneX: checkIsIPhoneX,
   getMemoryLevelAll: getMemoryLevelAll,
   getMemoryLevel: getMemoryLevel,
+  getShareImageBackColor: getShareImageBackColor,
 }

utils/util.js

@@ -1,7 +1,7 @@
 var Crypto = require('cryptojs.js').Crypto;
 var app = getApp();
 
-function formatTime(date) {
+function formatTime(date,format,isShort) {
   var year = date.getFullYear()
   var month = date.getMonth() + 1
   var day = date.getDate()
@@ -10,8 +10,13 @@ function formatTime(date) {
   var minute = date.getMinutes()
   var second = date.getSeconds()
 
+  if (!format)
+    format="-";
 
-  return [year, month, day].map(formatNumber).join('-') + ' ' + [hour, minute, second].map(formatNumber).join(':')
+  if (isShort)
+    return [year, month, day].map(formatNumber).join(format);
+  else
+    return [year, month, day].map(formatNumber).join(format) + ' ' + [hour, minute, second].map(formatNumber).join(':')
 }
 
 function checkIsArray(obj) {