课程显示多少天之前学的

.idea/efunbox-schedule-miniApps.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/efunbox-schedule-miniApps.iml" filepath="$PROJECT_DIR$/.idea/efunbox-schedule-miniApps.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

.idea/workspace.xml

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="4f17d6f9-a5b0-4bb4-9071-d9334baf6515" name="Default" comment="" />
+    <ignored path="$PROJECT_DIR$/.tmp/" />
+    <ignored path="$PROJECT_DIR$/temp/" />
+    <ignored path="$PROJECT_DIR$/tmp/" />
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>downUp</find>
+    </findStrings>
+    <dirStrings>
+      <dir>$PROJECT_DIR$</dir>
+    </dirStrings>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsGulpfileManager">
+    <detection-done>true</detection-done>
+    <sorting>DEFINITION_ORDER</sorting>
+  </component>
+  <component name="NodePackageJsonFileManager">
+    <packageJsonPaths />
+  </component>
+  <component name="ProjectFrameBounds" fullScreen="true">
+    <option name="width" value="1440" />
+    <option name="height" value="900" />
+  </component>
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="efunbox-schedule-miniApps" type="b2602c69:ProjectViewProjectNode" />
+              <item name="efunbox-schedule-miniApps" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="efunbox-schedule-miniApps" type="b2602c69:ProjectViewProjectNode" />
+              <item name="efunbox-schedule-miniApps" type="462c0819:PsiDirectoryNode" />
+              <item name="compontents" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="4f17d6f9-a5b0-4bb4-9071-d9334baf6515" name="Default" comment="" />
+      <created>1524652260223</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1524652260223</updated>
+      <workItem from="1524652261658" duration="616000" />
+      <workItem from="1524663262852" duration="109000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="725000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="0" y="0" width="1440" height="900" extended-state="0" />
+    <layout>
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Version Control" order="7" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="bottom" id="Terminal" order="7" />
+      <window_info id="Favorites" order="2" side_tool="true" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Message" order="0" />
+    </layout>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+</project>

app.json

@@ -16,7 +16,8 @@
     "pages/grade_rank/grade_rank",
     "pages/quantity_rank/quantity_rank",
     "pages/accuracy_rank/accuracy_rank",
-    "pages/set_name/set_name"
+    "pages/set_name/set_name",
+    "pages/particulars/particulars"
   ],
   "window": {
     "backgroundTextStyle": "light",

compontents/chat/chat.js

@@ -1,4 +1,7 @@
 // compontents/chat/chat.js
+const util = require('../../utils/util.js');
+const APIClient = require('../../utils/APIClient.js');
+const login = require('../../utils/loginSchedule.js');
 
 Component({
   /**
@@ -63,12 +66,47 @@ Component({
           }
       })
     },
+    //分享
     shareImage: function(e){
       console.log(e);
       //分享查询单条的时候会用到这两个值
       const postId = e.currentTarget.dataset.postsid;
       this.share.showPopup(postId);
+
+    },
+    //跳转详情页
+    particulars: function (e) {
+      const postId = e.currentTarget.dataset.postsid;
+      const type = e.currentTarget.dataset.type;
+      //取消小点
+      login.getOpenidSessionKey(function(res) {
+        APIClient.cancelDian({
+          uid: res.data.data.uid
+        }, {
+          "postsId":postId
+        }).success((res) => {
+          console.log(res);
+        })
+      }, function() {
+        wx.showModal({
+          title: '提示',
+          content: '需要获取您的公开信息（昵称、头像等），请从小程序列表删除小学王者班后再次扫码进入，允许授权后可正常使用',
+          showCancel: false,
+          success: function (res) {
+            if (res.confirm) {
+              console.log('用户点击确定')
+            } else if (res.cancel) {
+              console.log('用户点击取消')
+            }
+          }
+        })
+      });
+      wx.navigateTo({
+        url: '../../pages/particulars/particulars?postId=' + postId + '&type=' + type
+      })
+
     },
+    //查看更多
     examine: function () {
       //console.log(1)
       var myEventDetail = {} // detail对象，提供给事件监听函数

compontents/chat/chat.wxml

@@ -8,39 +8,46 @@
     </view>
     <view wx:if="{{productionData.list}}">
         <view class="share-con" wx:for="{{productionData.list}}" wx:key="{{index}}">
-            <view class="head">
-                <view class="head-img">
-                    <image src="{{item.featureMap.headImgUrl}}"></image>
-                </view>    
-                <view class="lesson-name">
-                    <text>{{item.featureMap.wechatName}}</text>
-                    <text style="height: 100%">{{item.title}}</text>
+            <view bindtap="particulars" data-postsId="{{item.id}}" data-type="{{type}}">
+                <view class="head">
+                    <view class="head-img">
+                        <image src="{{item.featureMap.headImgUrl}}"></image>
+                    </view>    
+                    <view class="lesson-name">
+                        <text>{{item.featureMap.wechatName}}</text>
+                        <text style="height: 100%">{{item.title}}</text>
+                    </view>
+                    <view wx:if="{{type == 1 && (item.currentReplyCount > 0)}}" class="message"></view>
                 </view>
-                <view class="share-up-box" wx:if="{{type == 2}}" bindtap="shareImage" data-postsId="{{item.id}}">
-                    <image class="share_up" src="../../pages/image/share_up.png"></image>
+                <view class="picture" wx:if="{{type == 2}}">
+                    <block wx:for="{{item.imagesList}}" wx:for-item="items" wx:key="{{items.id}}">
+                        <image src="{{items.path}}" catchtap="listenerButtonPreviewImage" data-img="{{items.path}}"></image>
+                    </block>
                 </view>
-                <image wx:if="{{type == 1}}" class="message" src="../../pages/image/message.png"></image>
-            </view>
-            <view class="picture" wx:if="{{type == 2}}">
-                <block wx:for="{{item.imagesList}}" wx:for-item="items" wx:key="{{items.id}}">
-                    <image src="{{items.path}}" bindtap="listenerButtonPreviewImage" data-img="{{items.path}}"></image>
-                </block>
-            </view>
-            <view class="icon">
-                <view>
-                    <image src="../../pages/image/zan.png" class="zan"></image>
-                    <text>{{item.postsAttributeInfo ? item.postsAttributeInfo.favors : '0'}}</text>
-                </view>
-                <view>
-                    <image src="../../pages/image/weatch.png" class="weatch"></image>
-                    <text>{{item.postsAttributeInfo ? item.postsAttributeInfo.views : '0'}}</text>
-                </view>
-                <view>
-                    <image src="../../pages/image/discuss.png" class="discuss"></image>
-                    <text>{{item.replyCount}}</text>
+                <view class="icon" wx:if="{{type == 2}}">
+                    <view>
+                        <image src="../../pages/image/zan.png" class="zan"></image>
+                        <text>{{item.postsAttributeInfo ? item.postsAttributeInfo.favors : '0'}}</text>
+                    </view>
+                    <view>
+                        <image src="../../pages/image/weatch.png" class="weatch"></image>
+                        <text>{{item.postsAttributeInfo ? item.postsAttributeInfo.views : '0'}}</text>
+                    </view>
+                    <view>
+                        <image src="../../pages/image/discuss.png" class="discuss"></image>
+                        <text>{{item.replyCount}}</text>
+                    </view>
                 </view>
             </view>
-            <discuss discussData="{{item.replyList}}" uid="{{item.userId}}" postsId="{{item.id}}" id="discuss" type="{{type}}"/>
+            <!--分享按钮 -->
+            <!--暂时注释海报分享功能改为直接分享
+            <view class="share-up-box" wx:if="{{type == 2}}" bindtap="shareImage" data-postsId="{{item.id}}">
+                <image class="share_up" src="../../pages/image/share_up.png"></image>
+            </view>
+            -->
+            <button class='transmit' open-type="share" id="transmit" data-userId="{{userId}}" data-postId="{{item.id}}"  wx:if="{{type == 2}}">
+                <image class="share_up" src="../../pages/image/share_up.png"></image>
+            </button> 
         </view>
         <view class="more" bindtap="examine">查看更多</view>
     </view>

compontents/chat/chat.wxss

@@ -45,12 +45,11 @@
 .questions {
     position:relative;
     margin-top: 28rpx;
-    padding-bottom: 58rpx;
+    padding-bottom: 10rpx;
     border-bottom: 2rpx #878787 solid;
 }
 
 .share-con .head {
-    position:relative;
     padding:20rpx 0;
 }
 
@@ -88,10 +87,11 @@
 
 .picture {
     display: flex;
-    justify-content: center;    
+    justify-content: center; 
+    height:176rpx;   
     margin: 24rpx 112rpx 17rpx 103rpx;
-
 }
+
 .picture image {
      width: 236rpx;
      height: 176rpx;
@@ -122,8 +122,10 @@
     position: absolute;
     right: 0;
     top: 10rpx;
-    width: 68rpx;
-    height: 56rpx;    
+    width: 20rpx;
+    height: 20rpx;
+    background: red;
+    border-radius: 50%;    
 }
 
 .icon {
@@ -211,4 +213,30 @@
     font-size: 24rpx;
     color: #C0C0C0;
     transform: translate(-50%);
+}
+
+/*分享按钮*/
+.transmit {
+    position: absolute;
+    right: -20rpx;
+    top: -20rpx;
+    height: 100rpx;
+    width: 100rpx;
+    background: #fff;
+    margin:0;
+    padding:0;
+    line-height: normal;
+}
+
+.transmit:after {
+    content: '';
+    border: none;
+}
+
+.transmit image {
+    position: absolute;
+    right: 20rpx;
+    top: 20rpx;
+    height: 19rpx;
+    width: 19rpx;    
 }

compontents/discuss/discuss.js

@@ -3,23 +3,6 @@ const APIClient = require('../../utils/APIClient.js');
 const login = require('../../utils/loginSchedule.js');
 
 Component({
-  relations: {
-    '../chat/chat': {
-      type: 'parent', // 关联的目标节点应为父节点
-      linked: function(target) {
-        // 每次被插入到custom-ul时执行，target是custom-ul节点实例对象，触发在attached生命周期之后
-        console.log(target)
-      },
-      linkChanged: function(target) {
-        // 每次被移动后执行，target是custom-ul节点实例对象，触发在moved生命周期之后
-        console.log(target)        
-      },
-      unlinked: function(target) {
-        // 每次被移除时执行，target是custom-ul节点实例对象，触发在detached生命周期之后
-        console.log(target)
-      }
-    }
-  },
   /**
    * 组件的属性列表
    */
@@ -50,7 +33,8 @@ Component({
     text: '',
     discussDatas: [],
     animationData: {},
-    messageLength: ''
+    messageLength: '',
+    downUp: '展开'
   },
 
   /**
@@ -61,10 +45,16 @@ Component({
       let flage = e.target.dataset.flag;
       if(flage){
         this.util(flage, '0rpx');
-        this.setData({'flag': false})
+        this.setData({
+          'flag': false,
+          'downUp': '展开'
+        })
       } else {
         this.util(flage, '800rpx');
-        this.setData({'flag': true})
+        this.setData({
+          'flag': true,
+          'downUp': '收起'
+        })
       }
     },
     /* 创建动画并执行 */

compontents/discuss/discuss.wxml

@@ -9,4 +9,4 @@
         <text bindtap="sendText">发送</text>
     </view>
 </view>
-<text class="unfold" data-flag="{{flag}}" bindtap="onTap">展开</text>
+<text class="unfold" data-flag="{{flag}}" bindtap="onTap">{{downUp}}</text>

compontents/lesson_list/lessonList.js

@@ -16,6 +16,7 @@ Component({
   data: {
     flag: false,
     animationData: {},
+    downUp: '展开'
   },
 
   /**
@@ -24,13 +25,19 @@ Component({
   methods: {
     onTap (e) {
       let flage = e.target.dataset.flag;
-      const height = this.properties.lessonData.length * 70;
+      const height = this.properties.lessonData.length * 65;
       if(flage){
         this.util(flage, '270rpx');
-        this.setData({'flag': false})
+        this.setData({
+          'flag': false,
+          'downUp': '展开'
+      })
       } else {
         this.util(flage, height + 'rpx');
-        this.setData({'flag': true})
+        this.setData({
+          'flag': true,
+          'downUp': '收起'
+        })
       }
     },
     /* 创建动画并执行 */

compontents/lesson_list/lessonList.wxml

@@ -19,5 +19,5 @@
             </view>
         </view>
     </view>
-    <text class="unfold" data-flag="{{flag}}" bindtap="onTap">展开</text>
+    <text class="unfold" data-flag="{{flag}}" bindtap="onTap">{{downUp}}</text>
 </view>

compontents/lesson_list/lessonList.wxss

@@ -41,7 +41,7 @@
 
 /* 时间轴 */
 .timer-shaft {
-    height: 276rpx;
+    height: 270rpx;
     overflow: hidden;
     margin: 0 0 68rpx 10rpx;
     padding: 0 25rpx;

compontents/preview/preview.js

@@ -16,6 +16,7 @@ Component({
   data: {
     flag: false,
     animationData: {},
+    downUp: '展开'
   },
 
   /**
@@ -24,13 +25,19 @@ Component({
   methods: {
     onTap (e) {
       let flage = e.target.dataset.flag;
-      const height = this.properties.materialData.length * 70;
+      const height = this.properties.materialData.length * 65;
       if(flage){
         this.util(flage, '270rpx');
-        this.setData({'flag': false})
+        this.setData({
+          'flag': false,
+          'downUp': '展开'
+        })
       } else {
         this.util(flage, height + 'rpx');
-        this.setData({'flag': true})
+        this.setData({
+          'flag': true,
+          'downUp': '收起'
+        })
       }
     },
     /* 创建动画并执行 */

compontents/preview/preview.wxml

@@ -9,11 +9,13 @@
             <text>本周和历史学习资料</text>
         </view>
     </view>
+
     <view class="material-con" animation="{{animationData}}">
-        <view class="art-img" wx:for="{{materialData}}" wx:key="{{index}}">
+        <view wx:if="{{ item.warePath }}" class="art-img" wx:for="{{materialData}}" wx:key="{{index}}">
             <text>{{item.warePath}}</text>
             <text>点击预览</text>
         </view>
     </view>
-    <text class="unfold" data-flag="{{flag}}" bindtap="onTap">展开</text>
+
+    <text class="unfold" data-flag="{{flag}}" bindtap="onTap">{{downUp}}</text>
 </view>

compontents/ranking/ranking.js

@@ -37,6 +37,10 @@ Component({
    * 组件的方法列表
    */
   methods: {
-
+    more () {
+      var myEventDetail = {} // detail对象，提供给事件监听函数
+      var myEventOption = {} // 触发事件的选项
+      this.triggerEvent('lookMore', myEventDetail, myEventOption)
+    }
   }
 })

compontents/ranking/ranking.wxml

@@ -4,17 +4,19 @@
         <text>{{title}}</text>
     </view>
     <view class="my-rank">
-        <view class="head-rank" wx:for="{{friendsThreeData}}" wx:key="{{index}}">
-            <image src="{{item.users.headImgUrl}}" class="big-head-img"></image>
-            <view class="head">
-                <image src="../../pages/image/bg_{{item.rank}}.png" class="bg"></image>
+        <block wx:for="{{friendsThreeData}}" wx:key="{{index}}">
+            <view class="head-rank-{{item.rank == 2 ? '0' : (item.rank == 3 ? '2' : item.rank)}}">
+                <image src="{{item.users.headImgUrl}}" class="big-head-img"></image>
+                <view class="head">
+                    <image src="../../pages/image/bg_{{item.rank}}.png" class="bg"></image>
+                </view>
+                <view class="txt">
+                    <text class="name">{{item.users.wechatName}}</text>
+                    <text wx:if="{{myData.exp >= 0}}" class="medal-num">LV{{item.number}}({{item.exp}})</text>
+                    <text wx:else class="medal-num">{{item.number}}{{str}}</text>     
+                </view>      
             </view>
-            <view class="txt">
-                <text class="name">{{item.users.wechatName}}</text>
-                <text wx:if="{{myData.exp >= 0}}" class="medal-num">LV{{item.number}}({{item.exp}})</text>
-                <text wx:else class="medal-num">{{item.number}}{{str}}</text>     
-            </view>      
-        </view>
+        </block>
     </view>
     <view class="rank-list">
         <view class="rank-friend" wx:for="{{friendsData}}" wx:key="{{index}}">
@@ -36,7 +38,7 @@
         <text wx:if="{{myData.exp >= 0}}" class="medal-num" style="color: #5b82fa">LV{{myData.number}}({{myData.exp}})</text>
         <text wx:else class="medal-num" style="color: #5b82fa">{{myData.number}}{{str}}</text>
     </view> 
-    <view class="particular">
+    <view class="particular" bindtap="more">
         查看更多
     </view>
 </view>

compontents/ranking/ranking.wxss

@@ -19,32 +19,43 @@
     height: 266rpx;
 }
 
-.head-rank {
-    text-align: center;
-}
-
-.my-rank .head-rank:nth-child(1) {
+.my-rank .head-rank-0 {
     position: absolute;
     left: 120rpx;
     top: 0rpx;
     width: 116rpx;
+    text-align: center;   
+    word-break:keep-all;/* 不换行 */   
+    white-space:nowrap;/* 不换行 */  
+    overflow:hidden;/* 内容超出宽度时隐藏超出部分的内容 */   
+    text-overflow:ellipsis;/* 当对象内文本溢出时显示省略标记(...) ；需与overflow:hidden;一起使用。*/
 }
 
-.my-rank .head-rank:nth-child(2) {
+.my-rank .head-rank-1 {
     position: absolute;
     left: 295rpx;
     top: 0rpx;
     width: 136rpx;
+    text-align: center;  
+    word-break:keep-all;/* 不换行 */   
+    white-space:nowrap;/* 不换行 */  
+    overflow:hidden;/* 内容超出宽度时隐藏超出部分的内容 */   
+    text-overflow:ellipsis;/* 当对象内文本溢出时显示省略标记(...) ；需与overflow:hidden;一起使用。*/    
 }
 
-.my-rank .head-rank:nth-child(3) {
+.my-rank .head-rank-2 {
     position: absolute;
     left: 485rpx;
     top: 0rpx;
     width: 116rpx;
+    text-align: center;  
+    word-break:keep-all;/* 不换行 */   
+    white-space:nowrap;/* 不换行 */  
+    overflow:hidden;/* 内容超出宽度时隐藏超出部分的内容 */   
+    text-overflow:ellipsis;/* 当对象内文本溢出时显示省略标记(...) ；需与overflow:hidden;一起使用。*/    
 }
 
-.my-rank .head-rank:nth-child(even) .head{
+.my-rank .head-rank-1 .head{
     position: absolute;
     left: 0;
     top: 0;
@@ -53,7 +64,8 @@
     height: 200rpx;
 }
 
-.my-rank .head-rank:nth-child(odd) .head{
+.my-rank .head-rank-0 .head,
+.my-rank .head-rank-2 .head {
     position: absolute;
     left: 0;
     top: 30rpx;
@@ -68,7 +80,7 @@
 }
 
 
-.my-rank .head-rank:nth-child(even) .big-head-img{
+.my-rank .head-rank-1 .big-head-img{
     position: absolute;
     left: 5rpx;
     top: 55rpx;
@@ -77,7 +89,8 @@
     height: 130rpx;
 }
 
-.my-rank .head-rank:nth-child(odd) .big-head-img{
+.my-rank .head-rank-0 .big-head-img,
+.my-rank .head-rank-2 .big-head-img {
     position: absolute;
     left: 2rpx;
     top: 75rpx;

compontents/target/target.js

@@ -15,7 +15,8 @@ Component({
    */
   data: {
     flag: false,
-    animationData: {} 
+    animationData: {},
+    downUp: '展开'
   },
 
   /**
@@ -26,10 +27,16 @@ Component({
       let flage = e.target.dataset.flag;
       if(flage){
         this.util(flage, '156rpx');
-        this.setData({'flag': false})
+        this.setData({
+          'flag': false,
+          'downUp': '展开'
+        })
       } else {
         this.util(flage, '200rpx');
-        this.setData({'flag': true})
+        this.setData({
+          'flag': true,
+          'downUp': '收起'
+        })
       }
     },
     /* 创建动画并执行 */

compontents/target/target.wxml

@@ -6,5 +6,5 @@
     <view class="{{ flag ? 'target-txt-show' : 'target-txt'}}" animation="{{animationData}}">
         <text class="week">第五周：{{wxObjectives}}</text>
     </view>
-    <text class="unfold" data-flag="{{flag}}" bindtap="onTap">展开</text>
+    <text class="unfold" data-flag="{{flag}}" bindtap="onTap">{{downUp}}</text>
 </view>

pages/art/art.js

@@ -12,6 +12,8 @@ Page({
     courseData: {},
     num1: 0,
     num2: 0,
+    position: '',
+    questionsdian: ''
   },
 
   /* 区分答疑和分享 */
@@ -41,7 +43,7 @@ Page({
       })
     });
   },
-
+  /*点击加载更多*/
   onMyEvent: function(e){
     let type = e.currentTarget.dataset.type;
     const columnId = util.column('6').columnId;
@@ -54,8 +56,13 @@ Page({
         if(res.data.success) {
           console.log(res.data.data)
           this.setData({
-            questionsData: res.data.data,
-          })      
+            questionsData: res.data.data
+          }) 
+          if(res.data.data) {
+            this.setData({
+              questionsdian: util.replyNo(res.data.data.list)
+            })
+          }    
         }
       });
     }
@@ -70,12 +77,23 @@ Page({
           console.log(res.data.data)
           this.setData({
             productionData: res.data.data,
-          })   
+          })  
         }
       });
     }
   },
 
+  /*点击定位*/
+  location: function (e) {
+    const position = e.currentTarget.dataset.id;
+    console.log(position)
+    this.setData({
+      position: position
+    })
+  },
+
+
+
   onLoad: function (options) {
     //分享按钮
     wx.showShareMenu({
@@ -90,7 +108,7 @@ Page({
       if(res.data.success) {
         console.log(res.data.data)
         this.setData({
-          productionData: res.data.data,
+          productionData: res.data.data
         })
       }
       
@@ -100,19 +118,22 @@ Page({
       if(res.data.success) {
         console.log(res.data.data)
         this.setData({
-          questionsData: res.data.data,
+          questionsData: res.data.data
         })
+        if(res.data.data) {
+          this.setData({
+            questionsdian: util.replyNo(res.data.data.list)
+          })
+        }
       }
     });
     /*科目信息*/
     login.getOpenidSessionKey((res) => {
-      //console.log(res.data.data.uid);
       APIClient.getEachSchedule({
         uid: res.data.data.uid
       }, {
         "category": 6
       }).success((res) => {
-        //console.log('科目信息' + JSON.stringify(res));
         this.setData({
           courseData: res.data.data
         })

pages/art/art.wxml

@@ -4,7 +4,7 @@
   <tarbar id="tarbar"/>
   <!-- 内容 -->
   <view class="content">
-      <scroll-view scroll-y="true"  scroll-with-animation="true" scroll-with-animation="true" enable-back-to-top="true">
+      <scroll-view scroll-y="true"  scroll-with-animation="true" scroll-with-animation="true" enable-back-to-top="true" scroll-into-view="{{position}}">
           <!-- 科学艺术 -->
           <view class="art">
             <target wxObjectives="{{courseData.weekCourseConfig.wxObjectives}}"/>
@@ -13,7 +13,7 @@
 
             <preview materialData="{{courseData.lessonPage.list}}"/>
 
-            <chat 
+            <chat id="upload"
                 productionData="{{productionData}}" 
                 title="作品分享"
                 query="分享作品"
@@ -22,7 +22,7 @@
                 bind:myevent="onMyEvent"
                 data-type="2"/>
 
-            <chat 
+            <chat id="questions"
                 productionData="{{questionsData}}" 
                 title="答疑讨论"
                 query="我有疑问"
@@ -31,14 +31,13 @@
                 bind:myevent="onMyEvent"
                 data-type="1"/>
 
-            <view class="questions-one">
+            <view class="questions-one" data-id="questions" bindtap="location">
                 <image src="../image/q_discuss.png" ></image>
-                <text class="row" wx:if="{{questionsData.list.length}}">{{questionsData.list.length}}</text>
+                <text class="row" wx:if="{{questionsdian > 0}}"></text>
             </view>
 
-            <view class="upload-one">
+            <view class="upload-one" data-id="upload" bindtap="location">
                 <image src="../image/works.png" ></image>
-                <text class="row" wx:if="{{productionData.list.length}}">{{productionData.list.length}}</text>
             </view>  
           </view>
       </scroll-view>

pages/chinese/chinese.js

@@ -9,7 +9,9 @@ Page({
     flag: false,
     questionsData: {},
     courseData: {},
-    num1: 0
+    num1: 0,
+    position: '',
+    questionsdian: ''
   },
 
   /* 区分答疑和分享 */
@@ -52,12 +54,25 @@ Page({
         if(res.data.success) {
           console.log(res.data.data)
           this.setData({
-            questionsData: res.data.data,
-          })      
+            questionsData: res.data.data
+          })
+          if(res.data.data) {
+            this.setData({
+              questionsdian: util.replyNo(res.data.data.list)
+            })
+          }      
         }
       });
     }
   },
+  /*点击定位*/
+  location: function (e) {
+    const position = e.currentTarget.dataset.id;
+    console.log(position)
+    this.setData({
+      position: position
+    })
+  },
 
   onLoad: function (options) {
    
@@ -70,8 +85,13 @@ Page({
       if(res.data.success) {
         console.log(res.data.data)
         this.setData({
-          questionsData: res.data.data,
+          questionsData: res.data.data
         })
+        if(res.data.data) {
+          this.setData({
+            questionsdian: util.replyNo(res.data.data.list)
+          })
+        }
       }
     });
     /*科目信息*/

pages/chinese/chinese.wxml

@@ -4,7 +4,7 @@
   <tarbar id="tarbar"/>
   <!-- 内容 -->
   <view class="content">
-      <scroll-view scroll-y="true"  scroll-with-animation="true" scroll-with-animation="true" enable-back-to-top="true">
+      <scroll-view scroll-y="true"  scroll-with-animation="true" scroll-with-animation="true" enable-back-to-top="true" scroll-into-view="{{position}}">
           <!--中文  -->
           <view class="chinese">
             <target wxObjectives="{{courseData.weekCourseConfig.wxObjectives}}"/>
@@ -13,7 +13,7 @@
 
             <preview materialData="{{courseData.lessonPage.list}}"/>
 
-            <chat 
+            <chat id="questions"
                 productionData="{{questionsData}}" 
                 title="答疑讨论"
                 query="我有疑问"
@@ -23,9 +23,9 @@
                 data-type="1"/>
 
 
-            <view class="questions-one">
+            <view class="questions-one" data-id="questions" bindtap="location">
                 <image src="../image/q_discuss.png" ></image>
-                <text class="row" wx:if="{{questionsData.list.length}}">{{questionsData.list.length}}</text>
+                <text class="row" wx:if="{{questionsdian > 0}}"></text>
             </view>
           </view>
       </scroll-view>

pages/competition/competition.js

@@ -14,6 +14,10 @@ Page({
     friendsThreeData: {},
     myData: {}
   },
+  /*点击查看更多*/
+  lookMore: function () {
+    console.log('排名查看更多')
+  },
 
   /**
    * 生命周期函数--监听页面加载

pages/competition/competition.wxml

@@ -11,7 +11,8 @@
             friendsThreeData="{{friendsThreeData}}"
             myData="{{myData}}"
             str="位好友"
-            title="好友数排名"/>
+            title="好友数排名"
+            bind:lookMore="lookMore"/>
         </view>
       </scroll-view>
   </view>

pages/english/english.js

@@ -9,7 +9,9 @@ Page({
     flag: false,
     questionsData: {},
     courseData: {},
-    num1: 0
+    num1: 0,
+    position: '',
+    questionsdian: ''
   },
 
   /* 区分答疑和分享 */
@@ -53,11 +55,24 @@ Page({
           console.log(res.data.data)
           this.setData({
             questionsData: res.data.data,
-          })      
+          })
+          if(res.data.data) {
+            this.setData({
+              questionsdian: util.replyNo(res.data.data.list)
+            })
+          }       
         }
       });
     }
   },
+  /*点击定位*/
+  location: function (e) {
+    const position = e.currentTarget.dataset.id;
+    console.log(position)
+    this.setData({
+      position: position
+    })
+  },
 
   onLoad: function (options) {
 
@@ -72,6 +87,11 @@ Page({
         this.setData({
           questionsData: res.data.data,
         })
+        if(res.data.data) {
+          this.setData({
+            questionsdian: util.replyNo(res.data.data.list)
+          })
+        } 
       }
     });
     /*科目信息*/

pages/english/english.wxml

@@ -4,7 +4,7 @@
   <tarbar id="tarbar"/>
   <!-- 内容 -->
   <view class="content">
-      <scroll-view scroll-y="true"  scroll-with-animation="true" scroll-with-animation="true" enable-back-to-top="true">
+      <scroll-view scroll-y="true"  scroll-with-animation="true" scroll-with-animation="true" enable-back-to-top="true" scroll-into-view="{{position}}">
           <!-- 英语分级阅读 -->
           <view class="english">
             <target wxObjectives="{{courseData.weekCourseConfig.wxObjectives}}"/>
@@ -13,7 +13,7 @@
 
             <preview materialData="{{courseData.lessonPage.list}}"/>
 
-            <chat 
+            <chat id="questions"
                 productionData="{{questionsData}}" 
                 title="答疑讨论"
                 query="我有疑问"
@@ -23,9 +23,9 @@
                 data-type="1"/>
 
 
-            <view class="questions-one">
+            <view class="questions-one" data-id="questions" bindtap="location">
                 <image src="../image/q_discuss.png" ></image>
-                <text class="row" wx:if="{{questionsData.list.length}}">{{questionsData.list.length}}</text>
+                <text class="row" wx:if="{{questionsdian > 0}}"></text>
             </view>
           </view>
       </scroll-view>

pages/language/language.js

@@ -9,7 +9,9 @@ Page({
     flag: false,
     questionsData: {},
     courseData: {},
-    num1: 0
+    num1: 0,
+    position: '',
+    questionsdian: ''
   },
 
   /* 区分答疑和分享 */
@@ -53,11 +55,24 @@ Page({
           console.log(res.data.data)
           this.setData({
             questionsData: res.data.data,
-          })      
+          })  
+          if(res.data.data) {
+            this.setData({
+              questionsdian: util.replyNo(res.data.data.list)
+            })
+          }           
         }
       });
     }
   },
+  /*点击定位*/
+  location: function (e) {
+    const position = e.currentTarget.dataset.id;
+    console.log(position)
+    this.setData({
+      position: position
+    })
+  },
 
   onLoad: function (options) {
   },
@@ -71,6 +86,11 @@ Page({
         this.setData({
           questionsData: res.data.data,
         })
+        if(res.data.data) {
+          this.setData({
+            questionsdian: util.replyNo(res.data.data.list)
+          })
+        }       
       }
     });
     /*科目信息*/

pages/language/language.wxml

@@ -4,7 +4,7 @@
   <tarbar id="tarbar"/>
   <!-- 内容 -->
   <view class="content">
-      <scroll-view scroll-y="true"  scroll-with-animation="true" scroll-with-animation="true" enable-back-to-top="true">
+      <scroll-view scroll-y="true"  scroll-with-animation="true" scroll-with-animation="true" enable-back-to-top="true" scroll-into-view="{{position}}">
           <!-- 语文 -->
           <view class="language">
             <target wxObjectives="{{courseData.weekCourseConfig.wxObjectives}}"/>
@@ -13,7 +13,7 @@
 
             <preview materialData="{{courseData.lessonPage.list}}"/>
 
-            <chat 
+            <chat id="questions"
                 productionData="{{questionsData}}" 
                 title="答疑讨论"
                 query="我有疑问"
@@ -23,9 +23,9 @@
                 data-type="1"/>
 
 
-            <view class="questions-one">
+            <view class="questions-one" class="questions-one" data-id="questions" bindtap="location">
                 <image src="../image/q_discuss.png" ></image>
-                <text class="row" wx:if="{{questionsData.list.length}}">{{questionsData.list.length}}</text>
+                <text class="row" wx:if="{{questionsdian > 0}}"></text>
             </view>
           </view>
       </scroll-view>

pages/mathematics/mathematics.js

@@ -9,7 +9,9 @@ Page({
     flag: false,
     questionsData: {},
     courseData: {},
-    num1: 0
+    num1: 0,
+    position: '',
+    questionsdian: ''
   },
 
   /* 区分答疑和分享 */
@@ -53,7 +55,12 @@ Page({
           console.log(res.data.data)
           this.setData({
             questionsData: res.data.data,
-          })      
+          })
+          if(res.data.data) {
+            this.setData({
+              questionsdian: util.replyNo(res.data.data.list)
+            })
+          }           
         }
       });
     }
@@ -61,6 +68,14 @@ Page({
 
   onLoad: function (options) {
   },
+  /*点击定位*/
+  location: function (e) {
+    const position = e.currentTarget.dataset.id;
+    console.log(position)
+    this.setData({
+      position: position
+    })
+  },
 
   onShow: function () {
     const columnId = util.column('2').columnId;
@@ -71,6 +86,11 @@ Page({
         this.setData({
           questionsData: res.data.data,
         })
+        if(res.data.data) {
+          this.setData({
+            questionsdian: util.replyNo(res.data.data.list)
+          })
+        }     
       }
     });
     /*科目信息*/

pages/mathematics/mathematics.wxml

@@ -4,7 +4,7 @@
   <tarbar id="tarbar"/>
   <!-- 内容 -->
   <view class="content">
-      <scroll-view scroll-y="true"  scroll-with-animation="true" scroll-with-animation="true" enable-back-to-top="true">
+      <scroll-view scroll-y="true"  scroll-with-animation="true" scroll-with-animation="true" enable-back-to-top="true" scroll-into-view="{{position}}">
           <!-- 数学 -->
           <view class="mathematics">
             <target wxObjectives="{{courseData.weekCourseConfig.wxObjectives}}"/>
@@ -13,7 +13,7 @@
 
             <preview materialData="{{courseData.lessonPage.list}}"/>
 
-            <chat 
+            <chat id="questions"
                 productionData="{{questionsData}}" 
                 title="答疑讨论"
                 query="我有疑问"
@@ -23,9 +23,9 @@
                 data-type="1"/>
 
 
-            <view class="questions-one">
+            <view class="questions-one" class="questions-one" data-id="questions" bindtap="location">
                 <image src="../image/q_discuss.png" ></image>
-                <text class="row" wx:if="{{questionsData.list.length}}">{{questionsData.list.length}}</text>
+                <text class="row" wx:if="{{questionsdian > 0}}"></text>
             </view>
           </view>
       </scroll-view>

pages/particulars/particulars.js

@@ -0,0 +1,198 @@
+// pages/particulars/particulars.js
+const app = getApp()
+const util = require('../../utils/util.js');
+const APIClient = require('../../utils/APIClient.js');
+const login = require('../../utils/loginSchedule.js');
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    productionData: {},
+    text: '',
+    discussDatas: [],
+    messageLength: '',
+    type: '',
+    favors: '',
+    like: false
+  },
+  /* 获取输入内容 */
+  bindKeyInput (e) {
+    this.setData({
+      text: e.detail.value
+    })
+  },
+  /* 发送评论 */
+  sendText (e) {
+    let text = this.data.text.trim();
+    let postsId = e.currentTarget.dataset.id;
+    let _this = this;
+    if(text == ''){
+      wx.showModal({
+        title: '提示',
+        content: '请输入评论内容',
+        success: function(res) {
+          if (res.confirm) {
+            console.log('用户点击确定')
+          } else if (res.cancel) {
+            console.log('用户点击取消')
+          }
+        }
+      })
+      return false;
+    }
+    this.data.text = "";
+    let data = {
+      "postsId": postsId,
+      "content": text
+    };
+    login.getOpenidSessionKey((res) => {
+      //console.log(res.data.data.uid);
+      APIClient.getDiscussSchedule({
+        uid: res.data.data.uid
+      }, data).success((res) => {
+        if(res.data.success) {
+          this.data.discussDatas.push(res.data.data);
+          this.setData({
+            discussDatas: this.data.discussDatas,
+            messageLength: this.data.discussDatas.length
+          });
+        };
+      });        
+    }, function() {
+      wx.showModal({
+        title: '提示',
+        content: '需要获取您的公开信息（昵称、头像等），请从小程序列表删除小学王者班后再次扫码进入，允许授权后可正常使用',
+        showCancel: false,
+        success: function (res) {
+          if (res.confirm) {
+            console.log('用户点击确定')
+          } else if (res.cancel) {
+            console.log('用户点击取消')
+          }
+        }
+      })
+    });
+    this.setData({
+      text: ''
+    })
+  },
+
+  /*预览图片*/
+  listenerButtonPreviewImage: function(e) {
+    let imgUrl = [];
+    imgUrl.push(e.target.dataset.img);
+    wx.previewImage({
+        current: '', // 当前显示图片的http链接
+        urls: imgUrl, // 需要预览的图片http链接列表
+        //这根本就不走
+        success: function(res) {
+            //console.log(res);
+        },
+        //也根本不走
+        fail: function() {
+            //console.log('fail')
+        }
+    })
+  },
+  /*点赞接口*/
+  like: function () {
+    const postsId = util.getUrl().postId;
+    //判断分享过来的参数是否有postId查询单挑显示
+    if(postsId) {
+      login.getOpenidSessionKey(res => {
+        APIClient.getLikeSchedule({
+          uid: res.data.data.uid
+        }, {
+          postsId, 
+        }).success(res => {
+          console.log(res.data)
+          if(res.data.success) {
+            this.setData({
+              favors: res.data.data.favors,
+              like: true
+            })
+          }
+        })
+      }, function() {
+        wx.showModal({
+          title: '提示',
+          content: '需要获取您的公开信息（昵称、头像等），请从小程序列表删除小学王者班后再次扫码进入，允许授权后可正常使用',
+          showCancel: false,
+          success: function (res) {
+            if (res.confirm) {
+              console.log('用户点击确定')
+            } else if (res.cancel) {
+              console.log('用户点击取消')
+            }
+          }
+        })
+      });      
+    };
+  },
+
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    const type = options.type;
+    this.setData({
+      type: type
+    })
+    if(type == 2) {
+      wx.setNavigationBarTitle({
+        title: '作品分享'
+      })
+    }
+    if(type == 1) {
+      wx.setNavigationBarTitle({
+        title: '答疑讨论'
+      })
+    }
+
+
+    const postsId = options.postId || '';
+    //判断分享过来的参数是否有postId查询单挑显示
+    if(postsId) {
+      login.getOpenidSessionKey(res => {
+        APIClient.getOneSchedule({
+          uid: res.data.data.uid
+        }, {
+          postsId, 
+        }).success(res => {
+          console.log(res.data)
+          if(res.data.success) {
+            this.setData({
+              productionData: res.data.data,
+              discussDatas: res.data.data.replyList,
+              messageLength: res.data.data.replyList.length,
+              favors:res.data.data.postsAttributeInfo.favors
+            })
+          }
+        })
+      }, function() {
+        wx.showModal({
+          title: '提示',
+          content: '需要获取您的公开信息（昵称、头像等），请从小程序列表删除小学王者班后再次扫码进入，允许授权后可正常使用',
+          showCancel: false,
+          success: function (res) {
+            if (res.confirm) {
+              console.log('用户点击确定')
+            } else if (res.cancel) {
+              console.log('用户点击取消')
+            }
+          }
+        })
+      });      
+    };
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+      
+  },
+})

pages/particulars/particulars.json

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

pages/particulars/particulars.wxml

@@ -0,0 +1,53 @@
+<!--pages/particulars/particulars.wxml-->
+<view class="content">
+    <scroll-view scroll-y="true" scroll-with-animation="true" scroll-with-animation="true" enable-back-to-top="true">
+        <!-- 科学艺术 -->
+        <view class="works">
+            <view class="share-con">
+                <view class="head">
+                    <view class="head-img">
+                        <image src="{{productionData.featureMap.headImgUrl}}"></image>
+                    </view>    
+                    <view class="lesson-name">
+                        <text>{{productionData.featureMap.wechatName}}</text>
+                        <text style="height: 100%">{{productionData.title}}</text>
+                    </view>
+                </view>
+                <view class="picture" wx:if="{{type == 2}}">
+                    <block wx:for="{{productionData.imagesList}}" wx:for-item="items" wx:key="{{items.id}}">
+                        <image src="{{items.path}}" bindtap="listenerButtonPreviewImage" data-img="{{items.path}}"></image>
+                    </block>
+                </view>
+                <view class="icon" wx:if="{{type == 2}}">
+                    <view bindtap="like">
+                        <image src="../../pages/image/zan.png" class="zan" wx:if="{{like}}"></image>
+                        <image src="../../pages/image/nozan.png" class="zan" wx:else></image>
+                        <text>{{favors ? favors : '0'}}</text>
+                    </view>
+                    <view>
+                        <image src="../../pages/image/weatch.png" class="weatch"></image>
+                        <text>{{productionData.postsAttributeInfo ? productionData.postsAttributeInfo.views : '0'}}</text>
+                    </view>
+                    <view>
+                        <image src="../../pages/image/discuss.png" class="discuss"></image>
+                        <text>{{messageLength}}</text>
+                    </view>
+                </view>
+            </view>
+        </view>            
+        <view class="comment" >
+            <view  wx:for="{{discussDatas}}" wx:key="{{item.id}}">
+                <text style="color: {{productionData.userId == item.userId ? '#000' : '#f7085e'}}">{{item.featureMap.wechatName}}：</text>
+                <text>{{item.content}}</text>
+            </view>  
+        </view>
+    </scroll-view>
+</view>
+<view class="text">
+    <image src="../../pages/image/input.png" class="input-img"></image>
+    <view class="input-text">
+        <input placeholder="Enter You My Essage" value="{{text}}" bindinput="bindKeyInput" type="text" />
+        <view bindtap="sendText" data-id="{{productionData.id}}"></view>
+    </view>
+</view>
+

pages/particulars/particulars.wxss

@@ -0,0 +1,191 @@
+/* pages/particulars/particulars.wxss */
+.content {
+    padding-bottom: 140rpx;
+    box-sizing: border-box;
+}
+
+.works {
+    width: 100%;
+    border-radius: 25rpx;
+    box-sizing: border-box;
+    background: #fff;
+    position: relative;
+}
+
+/* 分享评论 */
+.works {
+    padding: 0 25rpx;
+}
+
+.share-con,
+.questions {
+    position:relative;
+}
+
+.share-con .head {
+    position:relative;
+    padding:20rpx 0;
+}
+
+.head-img {
+    width: 86rpx;
+    height: 86rpx;
+    float: left;  
+    margin-right: 18rpx; 
+}
+
+.head-img image {
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+}
+
+.lesson-name {
+    display: flex;
+    flex-direction: column;
+    margin: 8rpx  16rpx;
+}
+
+.lesson-name text:nth-child(1) {
+    height: 38rpx;
+    font-size: 32rpx;
+    font-weight: 600;
+}
+
+.lesson-name text:nth-child(2) {
+    height: 30rpx;
+    margin-top: 10rpx;
+    font-size: 24rpx;
+    color: #C3C3C3;
+}
+
+.picture {
+    display: flex;
+    justify-content: center;    
+    margin: 24rpx 112rpx 17rpx 103rpx;
+
+}
+.picture image {
+     width: 236rpx;
+     height: 176rpx;
+     border-radius: 15rpx;
+ }
+
+.picture image:nth-child(2) {
+    margin-left: 8rpx;
+}
+
+.share-up-box {
+    position: absolute;
+    right: 0;
+    top: 20rpx;
+    height: 100rpx;
+    width: 100rpx;
+}
+
+.share_up {
+    position: absolute;
+    right: 0;
+    top: 0rpx;
+    height: 19rpx;
+    width: 19rpx;
+}
+
+.message {
+    position: absolute;
+    right: 0;
+    top: 10rpx;
+    width: 68rpx;
+    height: 56rpx;    
+}
+
+.icon {
+    display: flex;
+    align-items: center;
+    margin: 0 112rpx 17rpx 103rpx;
+}
+
+.icon view {
+    display: flex;
+    align-items: center;
+    margin-right: 60rpx;
+}
+
+.icon .zan {
+    width: 26rpx;
+    height: 23rpx;
+}
+
+.icon .weatch {
+    width: 30rpx;
+    height: 23rpx;
+}
+
+.icon .discuss {
+    width: 32rpx;
+    height: 29rpx;  
+}
+
+.icon view text {
+    font-size: 24rpx;
+    color: #878787;
+    margin-left: 14rpx;
+}
+
+
+.more {
+    margin-top: 18rpx;
+    font-size: 28rpx;
+    text-align: center;
+    color: #787878;
+}
+
+/* 评论内容展开 */
+ .comment {
+    width: 100%;
+    padding: 0 25rpx;
+    box-sizing: border-box;
+ }
+
+ .comment view {
+     margin-top: 20rpx; 
+     font-size: 28rpx;
+ }
+
+ .text {
+     position: absolute;
+     bottom: 0;
+     width: 100%;
+     height: 140rpx;
+     background: #fff;
+ }
+
+ .input-text {
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    height: 140rpx;
+    z-index: 99; 
+ }
+
+ .text input {
+     width: 80%;
+     float: left;
+     height: 100%;
+     padding-left: 30rpx;
+ }
+
+.input-text view {
+    width: 15%;
+    height: 140rpx;
+    float: right;
+}
+
+.input-img {
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    height: 140rpx;
+}

pages/recommend/recommend.js

@@ -7,6 +7,7 @@ const login = require('../../utils/loginSchedule.js');
 Page({
   data: {
     recommendData: {},
+    downUp: '展开'    
   },
 
   onLoad: function (options) {

pages/recommend/recommend.wxml

@@ -51,7 +51,7 @@
                 </view>
                 <view class="strategy-con">
                     <view>春季攻略，怎样打败怪兽春季攻略，怎样打败怪兽春季攻略，怎样打败怪兽春季攻略，怎样打败怪兽春季攻略，怎样打败怪兽春季攻略，怎样打败怪兽春季攻略，怎样打败怪兽春季攻略，怎样打败怪兽</view>
-                    <text class="unfold">展开</text>
+                    <text class="unfold">{{downUp}}</text>
                 </view>
             </view>
         </view> 

pages/science/science.js

@@ -11,7 +11,9 @@ Page({
     questionsData: {},
     courseData: {},
     num1: 0,
-    num2: 0
+    num2: 0,
+    position: '',
+    questionsdian: ''
   },
   /* 区分答疑和分享 */
   distinction: function(type, columnId, pageNo, pageSize, success) {
@@ -54,7 +56,12 @@ Page({
           console.log(res.data.data)
           this.setData({
             questionsData: res.data.data,
-          })      
+          })
+          if(res.data.data) {
+            this.setData({
+              questionsdian: util.replyNo(res.data.data.list)
+            })
+          }        
         }
       });
     }
@@ -69,11 +76,19 @@ Page({
           console.log(res.data.data)
           this.setData({
             productionData: res.data.data,
-          })   
+          })  
         }
       });
     }
   },
+  /*点击定位*/
+  location: function (e) {
+    const position = e.currentTarget.dataset.id;
+    console.log(position)
+    this.setData({
+      position: position
+    })
+  },
   onLoad: function (options) {
     //分享按钮
     wx.showShareMenu({
@@ -89,7 +104,7 @@ Page({
         console.log(res.data.data)
         this.setData({
           productionData: res.data.data,
-        })
+        }) 
       }
       
     });
@@ -100,6 +115,11 @@ Page({
         this.setData({
           questionsData: res.data.data,
         })
+        if(res.data.data) {
+          this.setData({
+            questionsdian: util.replyNo(res.data.data.list)
+          })
+        }  
       }
     });
     /*科目信息*/

pages/science/science.wxml

@@ -4,7 +4,7 @@
   <tarbar id="tarbar"/>
   <!-- 内容 -->
   <view class="content">
-      <scroll-view scroll-y="true"  scroll-with-animation="true" scroll-with-animation="true" enable-back-to-top="true">
+      <scroll-view scroll-y="true"  scroll-with-animation="true" scroll-with-animation="true" enable-back-to-top="true" scroll-into-view="{{position}}">
           <!-- 科学 -->
           <view class="science">
             <target wxObjectives="{{courseData.weekCourseConfig.wxObjectives}}"/>
@@ -13,7 +13,7 @@
 
             <preview materialData="{{courseData.lessonPage.list}}"/>
 
-            <chat 
+            <chat id="upload"
                 productionData="{{productionData}}" 
                 title="作品分享"
                 query="分享作品"
@@ -22,7 +22,7 @@
                 bind:myevent="onMyEvent"
                 data-type="2"/>
 
-            <chat 
+            <chat id="questions"
                 productionData="{{questionsData}}" 
                 title="答疑讨论"
                 query="我有疑问"
@@ -31,14 +31,13 @@
                 bind:myevent="onMyEvent"
                 data-type="1"/>
 
-            <view class="questions-one">
+            <view class="questions-one" data-id="questions" bindtap="location">
                 <image src="../image/q_discuss.png" ></image>
-                <text class="row" wx:if="{{questionsData.list.length}}">{{questionsData.list.length}}</text>
+                <text class="row" wx:if="{{questionsdian > 0}}"></text>
             </view>
 
-            <view class="upload-one">
+            <view class="upload-one" data-id="upload" bindtap="location">
                 <image src="../image/works.png" ></image>
-                <text class="row" wx:if="{{productionData.list.length}}">{{productionData.list.length}}</text>
             </view>  
           </view>
       </scroll-view>

pages/transmit/transmit.js

@@ -9,7 +9,9 @@ Page({
    * 页面的初始数据
    */
   data: {
-    productionData: {}
+    productionData: {},
+    favors: '',
+    like: false
   },
   /*预览图片*/
   listenerButtonPreviewImage: function(e) {
@@ -30,7 +32,7 @@ Page({
   },
   /*点赞接口*/
   like: function () {
-    const postsId = util.getUrl().postsId;
+    const postsId = util.getUrl().postId;
     //判断分享过来的参数是否有postId查询单挑显示
     if(postsId) {
       login.getOpenidSessionKey(res => {
@@ -42,7 +44,8 @@ Page({
           console.log(res.data)
           if(res.data.success) {
             this.setData({
-              productionData: res.data.data,
+              favors: res.data.data.favors,
+              like: true
             })
           }
         })
@@ -81,6 +84,7 @@ Page({
           if(res.data.success) {
             this.setData({
               productionData: res.data.data,
+              favors:res.data.data.postsAttributeInfo.favors
             })
           }
         })

pages/transmit/transmit.wxml

@@ -13,7 +13,7 @@
                     <text class="">分享作品</text>
                     <image src="../../pages/image/xing.png" class="xing"></image>
                 </view>
-                <view class="share-con" wx:key="{{index}}">
+                <view class="share-con">
                     <view class="head">
                         <view class="head-img">
                             <image src="{{productionData.featureMap.headImgUrl}}"></image>
@@ -30,8 +30,9 @@
                     </view>
                     <view class="icon">
                         <view bindtap="like">
-                            <image src="../../pages/image/zan.png" class="zan"></image>
-                            <text>{{productionData.postsAttributeInfo ? productionData.postsAttributeInfo.favors : '0'}}</text>
+                            <image src="../../pages/image/zan.png" class="zan" wx:if="{{like}}"></image>
+                            <image src="../../pages/image/nozan.png" class="zan" wx:else></image>
+                            <text>{{favors ? favors : '0'}}</text>
                         </view>
                         <view>
                             <image src="../../pages/image/weatch.png" class="weatch"></image>
@@ -42,7 +43,6 @@
                             <text>{{productionData.replyCount}}</text>
                         </view>
                     </view>
-                    <discuss discussData="{{productionData.replyList}}" uid="{{productionData.userId}}" postsId="{{productionData.id}}" id="discuss" type="{{2}}"/>
                 </view>
             </view>            
           </view>

utils/APIClient.js

@@ -57,5 +57,10 @@ module.exports = {
 	getLikeSchedule(header, data) {
 		let url = genAPIUrl('wx/posts/attribute');
 		return request.getInstance().url(url).header(header).data(data).method('GET').send();
+	},
+	//取消小点
+	cancelDian(header, data) {
+		let url = genAPIUrl('wx/posts/readCount');
+		return request.getInstance().url(url).header(header).data(data).method('GET').send();
 	}
 }

utils/util.js

@@ -150,6 +150,14 @@ function topThree (arr) {
    return arr1;
 }
 
+//获取回复条数
+function replyNo (arr) {
+  let num = 0;
+  for( let item of arr) {
+    num += item.currentReplyCount
+  }
+  return num
+}
 
 module.exports = {
   formatTime: formatTime,
@@ -159,5 +167,6 @@ module.exports = {
   getUrl,
   column,
   url,
-  topThree
+  topThree,
+  replyNo
 }