1.0.0.19

app.js

@@ -25,7 +25,7 @@ App({
     }
   },
   globalData: {
-    Version: "1.0.0.18",
+    Version: "1.0.0.19",
     IsProduction: true,
     ShareTitle: "可以用来记忆一切的工具",
     SharePath: "pages/index/index",

pages/index/index.js

@@ -58,7 +58,7 @@ Page({
         });
       }
 
-      if (options.Share==1) {
+      if (options.Share == 1) {
         this.setData({
           MiaoguoCardID: options.MiaoguoCardID,
         });
@@ -66,7 +66,7 @@ Page({
     }
     this.setData({
       Containnerheight: main.getWindowHeight(),
-      Sentence: arrSentence[common.random(0,arrSentence.length-1)],
+      Sentence: arrSentence[common.random(0, arrSentence.length - 1)],
     });
 
     this.updateProgram();
@@ -190,32 +190,37 @@ Page({
           //   url: url,
           // });
 
-          var url = '../main/default?IsStart=1';
 
-          if (that.data.MiaoguoCardID){
-            url += "&Share=1&MiaoguoCardID=" + that.data.MiaoguoCardID;
+          if (that.data.MiaoguoCardID) {
+            wx.reLaunch({
+              url: '../main/preview?type=share&id=' + that.data.MiaoguoCardID,
+            });
           }
+          else {
+            var url = '../main/default?IsStart=1';
 
-          setTimeout(function () {
-            wx.redirectTo({
-              url: url,
-            });
-          }, 2000);
+            setTimeout(function () {
+              wx.redirectTo({
+                url: url,
+              });
+            }, 2000);
 
+            that.getTaskTodayList();
+          }
           that.getBaiduToken();
-          that.getTaskTodayList();
+
         }
       });
 
     });
   },
   getBaiduToken: function () {
-      main.getData('GetBaiduToken', function (data) {
-        if (data) {
-          app.globalData.BaiduToken = data;
-          //console.log(app.globalData.BaiduToken);
-        }
-      });
+    main.getData('GetBaiduToken', function (data) {
+      if (data) {
+        app.globalData.BaiduToken = data;
+        //console.log(app.globalData.BaiduToken);
+      }
+    });
   },
   //得到当天任务
   getTaskTodayList: function () {
@@ -238,8 +243,8 @@ Page({
                 IsStart: data.IsStart,
               });
 
-              app.globalData.TaskToday=data;
-              app.globalData.CardList=[];
+              app.globalData.TaskToday = data;
+              app.globalData.CardList = [];
             }
           });
         });

pages/main/detail.wxml

@@ -42,11 +42,11 @@
         <block wx:for="{{TaskInfo.ContentNew.Field[1]}}" wx:key="index">
           <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>
 
-          <text class="textNormal" wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
+          <text class="textNormal" space='nbsp' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
 
-          <text class="textNormal FlexRow" wx:if="{{item.Type=='line'}}">
+          <text class="textNormal FlexRow" space='nbsp' wx:if="{{item.Type=='line'}}">
             <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem">
-              <text wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
+              <text space='nbsp' wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
           <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
         </block>
         </text>
@@ -88,11 +88,11 @@
         <block wx:for="{{TaskInfo.ContentNew.Field[itemParent]}}" wx:key="index">
           <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>
 
-          <text class="textNormal2 textNormal" wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
+          <text class="textNormal2 textNormal" space='nbsp' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
 
-          <text class="textNormal2 FlexRow" wx:if="{{item.Type=='line'}}">
+          <text class="textNormal2 FlexRow" space='nbsp' wx:if="{{item.Type=='line'}}">
             <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem">
-              <text wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
+              <text space='nbsp' wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
           <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
         </block>
         </text>
@@ -170,7 +170,7 @@
 <view wx:if="{{IsShowNumberInfo}}" catchtap='closeNumberContainner' class="numberContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
   <view class='numberContainer1 FlexColumn'>
     <view class="numberContainer11 FlexRow">
-      <view class='left'>今天剩余{{NumberNew+NumberReview+NumberHistory}}张</view>
+      <view class='left'>今日剩余任务量{{NumberNew+NumberReview+NumberHistory}}张，包括：</view>
       <view></view>
     </view>
     <view class="numberContainer12 FlexRow">

pages/main/preview.js

@@ -39,7 +39,7 @@ Page({
         var url = "GetMiaoguoCardInfo?UserID=" + app.globalData.introducer + "&MiaoguoCardID=" + that.data.MiaoguoCardID;
         main.getData(url, function (data) {
           if (data) {
-            app.globalData.CardList=[data];
+            app.globalData.CardList = [data];
             that.init();
           }
         });
@@ -52,7 +52,7 @@ Page({
     clearInterval(intervalSound);
   },
   init: function () {
-    var that=this;
+    var that = this;
     var list = app.globalData.CardList;
     var card = {};
     var prevId = 0;
@@ -86,28 +86,26 @@ Page({
 
     var isTodayPractice = true;
     var task = app.globalData.TaskToday;
-
-    for (var i = 0; i < task.ListNew.length; i++) {
-      if (task.ListNew[i].MiaoguoCardID == that.data.MiaoguoCardID) {
-        isTodayPractice = false;
-        break;
+    if (task && (task.ListNew.length > 0 || task.ListHistory.length>0 || task.ListReview.length>0)) {
+      for (var i = 0; i < task.ListNew.length; i++) {
+        if (task.ListNew[i].MiaoguoCardID == that.data.MiaoguoCardID) {
+          isTodayPractice = false;
+          break;
+        }
       }
-    }
-    for (var i = 0; i < task.ListHistory.length; i++) {
-      if (task.ListHistory[i].MiaoguoCardID == that.data.MiaoguoCardID) {
-        isTodayPractice = false;
-        break;
+      for (var i = 0; i < task.ListHistory.length; i++) {
+        if (task.ListHistory[i].MiaoguoCardID == that.data.MiaoguoCardID) {
+          isTodayPractice = false;
+          break;
+        }
       }
-    }
-    for (var i = 0; i < task.ListReview.length; i++) {
-      if (task.ListReview[i].MiaoguoCardID == that.data.MiaoguoCardID) {
-        isTodayPractice = false;
-        break;
+      for (var i = 0; i < task.ListReview.length; i++) {
+        if (task.ListReview[i].MiaoguoCardID == that.data.MiaoguoCardID) {
+          isTodayPractice = false;
+          break;
+        }
       }
     }
-
-
-
     this.setData({
       ID: card.MiaoguoCardID,
       Field: card.Field,
@@ -145,7 +143,7 @@ Page({
                 break;
               }
             }
-            app.globalData.CardList=list;
+            app.globalData.CardList = list;
             wx.showToast({
               title: '改为今天练',
               icon: 'none',
@@ -188,7 +186,7 @@ Page({
                 break;
               }
             }
-            app.globalData.CardList=list;
+            app.globalData.CardList = list;
             wx.showToast({
               title: '改为明天练',
               icon: 'none',
@@ -348,11 +346,11 @@ Page({
                 break;
               }
             }
-            app.globalData.CardList=list;
+            app.globalData.CardList = list;
 
             var taskToday = app.globalData.TaskToday;
             taskToday.CardNumber--;
-            app.globalData.TaskToday=taskToday;
+            app.globalData.TaskToday = taskToday;
 
             wx.navigateBack({
               delta: 1,
@@ -417,10 +415,15 @@ Page({
       that.init();
     }, 1000);
   },
+  returnDefault: function () {
+    wx.reLaunch({
+      url: './default?IsStart=1',
+    });
+  },
   onShareAppMessage: function () {
     var that = this;
     this.setData({
-      ShowType: 'preview'
+      ShowType: 'sharepreview'
     });
     setTimeout(function () {
       that.setData({

pages/main/preview.wxml

@@ -12,14 +12,14 @@
     </view>
     <view class="panelTop1"></view>
   </block>
-  <view class="panelField1 FlexColumn" bindlongpress='editField' data-id="1">
+  <view class="panelField{{ShowType}} panelField1 FlexColumn" bindlongpress='editField' data-id="1">
     <view class="panelField11 panelItem FlexRow" style="font-size:{{FontSize}}rpx;">
       <block wx:for="{{Field[1]}}" wx:key="index">
         <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>
-        <text class="textNormal" wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
-        <text class="textNormal FlexRow" wx:if="{{item.Type=='line'}}">
+        <text class="textNormal" space='nbsp' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
+        <text class="textNormal FlexRow" space='nbsp' wx:if="{{item.Type=='line'}}">
           <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem">
-              <text wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
+              <text space='nbsp' wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
           <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
         </block>
         </text>
@@ -47,11 +47,11 @@
       <block wx:for="{{Field[itemParent]}}" wx:key="index">
         <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>
 
-        <text class="textNormal" wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
+        <text class="textNormal" space='nbsp' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
 
-        <text class="textNormal FlexRow" wx:if="{{item.Type=='line'}}">
+        <text class="textNormal FlexRow" space='nbsp' wx:if="{{item.Type=='line'}}">
             <block wx:for="{{item.Content}}" wx:key="contentIndex" wx:for-item="contentItem">
-              <text wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
+              <text space='nbsp' wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
           <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
         </block>
         </text>
@@ -75,7 +75,7 @@
   <view class='panelSave' bindtap="close" wx:if="{{ShowType=='preview'}}">关闭</view>
 
   <view class='panelSave FlexRow' wx:if="{{ShowType=='share'}}">
-    <view class='btn3' bindtap="close">首页</view>
+    <view class='btn3' bindtap="returnDefault">首页</view>
     <view class='btn31 btn3' bindtap="copyCard" wx:if="{{!IsExistCard}}">另存为我的题卡</view>
   </view>
 

pages/main/preview.wxss

@@ -50,7 +50,7 @@
 }
 
 .text4 {
-  color: #1e1e1e;
+  color: #A20602;
 }
 
 .panelItem {
@@ -69,7 +69,11 @@
   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: 46rpx;
   justify-content: flex-start;

pages/main/setting.js

@@ -4,8 +4,8 @@ import main from '../../utils/main';
 const app = getApp();
 const arrSortType = ["时间较早的题卡", "时间较近的题卡"];
 const arrSortType2 = ["较早的", "较近的"];
-var arrUserName = ["程杰", "程晟涵", "大耳兔", "teresa", "古利古拉", "Lucy-chan"];
-var arrUserID = [1, 2, 11, 8, 9, 10];
+var arrUserName = ["程晟涵", "大耳兔", "teresa", "古利古拉", "Lucy-chan","刘华润"];
+var arrUserID = [2, 11, 8, 9, 10,12];
 
 Page({
   data: {

pages/main/setting.wxml

@@ -1,6 +1,6 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelTitle FlexRow">
-    <view class="panelTitle1">任务量</view>
+    <view class="panelTitle1">初始任务量</view>
     <view class="panelTitle2">每天{{CardMaxNumberNew+CardMaxNumberHistory}}张题卡</view>
   </view>
   <view class="panelItem FlexRow">

project.config.json

@@ -37,13 +37,13 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 1,
+			"current": 0,
 			"list": [
 				{
 					"id": 0,
 					"name": "分享",
 					"pathName": "pages/index/index",
-					"query": "UserID=1&Share=1&MiaoguoCardID=4024",
+					"query": "UserID=1&Share=1&MiaoguoCardID=4769",
 					"scene": null
 				},
 				{