合并代码并解决合并的问题

pages/art/art.js

@@ -179,7 +179,7 @@ Page({
         "category": 6
       }).success((res) => {
         const lessonListLength = res.data.data.lessonPage.list.length;
-        const previewLength = util.preview(res.data.data.lessonPage.list).length;
+        const previewLength = res.data.data.lessonPage.list.length;
         console.log(res)
         if(lessonListLength > 4) {
           this.setData({

pages/chinese/chinese.js

@@ -118,7 +118,7 @@ Page({
         "category": 3
       }).success((res) => {
         const lessonListLength = res.data.data.lessonPage.list.length;
-        const previewLength = util.preview(res.data.data.lessonPage.list).length;
+        const previewLength = res.data.data.lessonPage.list.length;
         console.log(res)
         if(lessonListLength > 4) {
           this.setData({

pages/english/english.js

@@ -119,7 +119,7 @@ Page({
       }).success((res) => {
         //console.log('科目信息' + JSON.stringify(res));
         const lessonListLength = res.data.data.lessonPage.list.length;
-        const previewLength = util.preview(res.data.data.lessonPage.list).length;
+        const previewLength = res.data.data.lessonPage.list.length;
         console.log(res)
         if(lessonListLength > 4) {
           this.setData({

pages/index/index.js

@@ -88,7 +88,24 @@ Page({
           }
         }
       })
-    });  
+    }); 
+    /* 分享 */
+    const columnId = util.column('6').columnId;
+    this.distinction(2, columnId, 1, 2, res => {
+      if(res.data.success) {
+        console.log(res.data.data)
+        this.setData({
+          productionData: res.data.data
+        })
+        if(res.data.data) {
+          if(res.data.data.totalSize > 2) {
+            this.setData({
+              productionMore: true
+            })
+          }
+        }
+      }
+    }); 
   },
   onLoad: function (options) {
     //获取更改年级组件
@@ -179,18 +196,7 @@ Page({
         "pageSize": pageSize
       }).success(success)
     }, function() {
-      // wx.showModal({
-      //   title: '提示',
-      //   content: '需要获取您的公开信息（昵称、头像等），请从小程序列表删除小学王者班后再次扫码进入，允许授权后可正常使用',
-      //   showCancel: false,
-      //   success: function (res) {
-      //     if (res.confirm) {
-      //       console.log('用户点击确定')
-      //     } else if (res.cancel) {
-      //       console.log('用户点击取消')
-      //     }
-      //   }
-      // })
+      
     });
   },
   /*点击加载更多*/

pages/index/index.json

@@ -2,9 +2,10 @@
 {
     "usingComponents": {
      "tarbar": "/compontents/tarbar/tarbar",
-     "curriculum": "/compontents/curriculum/curriculum",
-     "recommend": "../recommend/recommend",
      "art": "../art/art",
-     "dialog": "/compontents/dialog/dialog"
+     "curriculum": "/compontents/curriculum/curriculum",
+     "dialog": "/compontents/dialog/dialog",
+     "chat": "/compontents/chat/chat",
+     "setGrade": "/compontents/set_grade/set_grade"
     }
   }

pages/language/language.js

@@ -116,7 +116,7 @@ Page({
         "category": 1
       }).success((res) => {
         const lessonListLength = res.data.data.lessonPage.list.length;
-        const previewLength = util.preview(res.data.data.lessonPage.list).length;
+        const previewLength = res.data.data.lessonPage.list.length;
         console.log(res)
         if(lessonListLength > 4) {
           this.setData({

pages/mathematics/mathematics.js

@@ -119,7 +119,7 @@ Page({
       }).success((res) => {
         //console.log('科目信息' + JSON.stringify(res));
         const lessonListLength = res.data.data.lessonPage.list.length;
-        const previewLength = util.preview(res.data.data.lessonPage.list).length;
+        const previewLength = res.data.data.lessonPage.list.length;
         console.log(res)
         if(lessonListLength > 4) {
           this.setData({

pages/mistakes/mistakes.wxml

@@ -34,7 +34,7 @@
                     <image class="questions" src="{{item.questions.img}}"></image>
                     <view class="answer {{flag[index] ? 'unfold' : ''}}" animation="{{flag[index]? animationData : ''}}">
                         <view class="answer-txt">
-                            <text>你的答案：{{item.userQuestionResult.answer === "" ? '不知道' : userQuestionResult.answer}}</text>
+                            <text>你的答案：{{item.userQuestionResult.answer === "" ? '不知道' : item.userQuestionResult.answer}}</text>
                             <text>{{item.questions.answer == item.userQuestionResult.answer ? "" : "（错误）"}}</text>
                         </view>
                         <view class="analysis" bindtap="particulars" data-flag="{{flag[index]}}" data-index="{{index}}">

pages/science/science.js

@@ -164,8 +164,7 @@ Page({
       }).success((res) => {
         //console.log('科目信息' + JSON.stringify(res));
         const lessonListLength = res.data.data.lessonPage.list.length;
-        const previewLength = util.preview(res.data.data.lessonPage.list).length;
-        console.log(res)
+        const previewLength = res.data.data.lessonPage.list.length;
         if(lessonListLength > 4) {
           this.setData({
             lessonListHeight: 280