1.0.0.19

app.js

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

pages/main/detail.js

@@ -67,6 +67,8 @@ Page({
 
       listTaskFinished = [];
       that.setSoundFile(1);
+
+      
     }
     else {
       that.setSoundFile(-1);
@@ -93,6 +95,8 @@ Page({
     clearInterval(intervalSound);
   },
   onPullDownRefresh: function () {
+    this.onShowAnswer({currentTarget:{dataset:{start:true}}});
+    wx.stopPullDownRefresh();
   },
   setSoundFile: function (isFinish) {//isFinish=3搁置 =2撤退 =1结束 =0正常 =-1开始
     var that = this;
@@ -668,6 +672,10 @@ Page({
           Speed1: speed1 + "张题卡",
           Speed2: speed2,
         });
+
+        wx.setNavigationBarTitle({
+          title: "报告"
+        });
       }
     });
   },

pages/main/detail.json

@@ -1,3 +1,4 @@
 {
-  "navigationBarTitleText": "学习中"
+  "navigationBarTitleText": "学习中",
+  "enablePullDownRefresh": true
 }

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" space='nbsp' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
+          <text class="textNormal" selectable="true" space='ensp' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
 
-          <text class="textNormal FlexRow" space='nbsp' wx:if="{{item.Type=='line'}}">
+          <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='nbsp' wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
+              <text space='ensp' 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" space='nbsp' 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" space='nbsp' 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='nbsp' wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
+              <text space='ensp' wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
           <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
         </block>
         </text>

pages/main/preview.js

@@ -21,7 +21,7 @@ Page({
       ShowType: options.type,
       MiaoguoCardID: id,
     });
-    //console.log("MiaoguoCardID:" + id);
+    console.log("MiaoguoCardID:" + id);
 
     this.audioCtx = [];
 
@@ -86,7 +86,7 @@ Page({
 
     var isTodayPractice = true;
     var task = app.globalData.TaskToday;
-    if (task && (task.ListNew.length > 0 || task.ListHistory.length>0 || task.ListReview.length>0)) {
+    if (task && task.ListNew && (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;

pages/main/preview.wxml

@@ -12,22 +12,22 @@
     </view>
     <view class="panelTop1"></view>
   </block>
-  <view class="panelField{{ShowType}} panelField1 FlexColumn" bindlongpress='editField' data-id="1">
+  <view class="panelField{{ShowType}} panelField1 FlexColumn">
     <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" space='nbsp' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
-        <text class="textNormal FlexRow" space='nbsp' wx:if="{{item.Type=='line'}}">
+        <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='nbsp' 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">
-          <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>
-        <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" />
+              <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">
+        <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>
+      <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>
@@ -39,33 +39,33 @@
     </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}}" bindlongpress='editField' data-id="{{itemParent}}">
+
+  <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="panelField21 panelItem FlexRow">
       <block wx:for="{{Field[itemParent]}}" wx:key="index">
         <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>
 
-        <text class="textNormal" space='nbsp' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
+        <text class="textNormal" selectable="true" space='ensp' wx:if="{{item.Type=='normal'}}">{{item.Content}}</text>
 
-        <text class="textNormal FlexRow" space='nbsp' wx:if="{{item.Type=='line'}}">
+        <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='nbsp' wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
-          <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
-        </block>
-        </text>
+              <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>
+      <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="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">{{item.Content}}</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>
 
-        <!-- <image class="imageBishun" wx:if="{{item.Type=='image' && !item.Url}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" />
+      <!-- <image class="imageBishun" wx:if="{{item.Type=='image' && !item.Url}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" />
          -->
-        <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" />
-      
+      <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>

pages/main/preview.wxss

@@ -103,6 +103,9 @@
   text-decoration: underline;
 }
 
+.panelItem .textNormal {
+  width:650rpx;
+}
 .panelItem .textPinyin {
   text-decoration: underline;
   margin-right: 10rpx;

project.config.json

@@ -43,7 +43,7 @@
 					"id": 0,
 					"name": "分享",
 					"pathName": "pages/index/index",
-					"query": "UserID=1&Share=1&MiaoguoCardID=4769",
+					"query": "UserID=1&Share=1&MiaoguoCardID=4997",
 					"scene": null
 				},
 				{