上传新分支

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 * 60;
       if(flage){
-        this.util(flage, '270rpx');
-        this.setData({'flag': false})
+        this.util(flage, '260rpx');
+        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: 260rpx;
     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 * 60;
       if(flage){
-        this.util(flage, '270rpx');
-        this.setData({'flag': false})
+        this.util(flage, '260rpx');
+        this.setData({
+          'flag': false,
+          'downUp': '展开'
+        })
       } else {
         this.util(flage, height + 'rpx');
-        this.setData({'flag': true})
+        this.setData({
+          'flag': true,
+          'downUp': '收起'
+        })
       }
     },
     /* 创建动画并执行 */

compontents/preview/preview.wxml

@@ -15,5 +15,5 @@
             <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/preview/preview.wxss

@@ -41,7 +41,7 @@
 
 /* 预览图片 */
 .material-con {
-    height: 270rpx;
+    height: 260rpx;
     margin: 0 0 68rpx 10rpx;
     padding: 0 25rpx;
     overflow: hidden;

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/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/index/index.wxml

@@ -15,12 +15,12 @@
                   <view class='left'>
                     <view class="name">
                       {{data.users.wechatName}}
-                      <text class='LV'>{{grade}}</text>
                     </view>
                     <view class="student">
                       学号：
                       <text>{{data.users.eid}}</text>
                     </view>
+                    <view class='LV'>{{grade}}</view>
                   </view>
                 </view>
                 <view class='grade'>

pages/index/index.wxss

@@ -38,6 +38,11 @@
   display: flex;
   flex-direction: column;
   justify-content: center;
+  width: 340rpx;  
+  word-break:keep-all;/* 不换行 */   
+  white-space:nowrap;/* 不换行 */  
+  overflow:hidden;/* 内容超出宽度时隐藏超出部分的内容 */   
+  text-overflow:ellipsis;/* 当对象内文本溢出时显示省略标记(...) ；需与overflow:hidden;一起使用。*/
   margin-left: 34rpx;
 }
 
@@ -54,6 +59,9 @@
 }
 
 .LV {
+  position: absolute;
+  right:100rpx;
+  top:110rpx;
   font-size: 24rpx;
 }
 

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>