Browse Source

开发改版

bayi 1 năm trước cách đây
mục cha
commit
2c6c5855e4

+ 1 - 0
components/authority/index.less

@@ -76,6 +76,7 @@
                         width: 100%;
                         height: 40rpx;
                         bottom: 0px;
+                        padding: 4rpx;
                         background: linear-gradient(0deg, rgba(0, 0, 0, .3), transparent);
                         display: flex;
                         align-items: center;

+ 1 - 0
components/authority/index.wxss

@@ -68,6 +68,7 @@
   width: 100%;
   height: 40rpx;
   bottom: 0px;
+  padding: 4rpx;
   background: linear-gradient(0deg, rgba(0, 0, 0, 0.3), transparent);
   display: flex;
   align-items: center;

+ 5 - 0
pages/index/index.js

@@ -120,6 +120,11 @@ Page({
             data: new Date()
         })
     },
+    jumpSearch() {
+        wx.navigateTo({
+            url: '/pages/childClassify/index?type=search',
+        })
+    },
     onUnload() {
         this.storeBindings.destroyStoreBindings()
     },

+ 1 - 1
pages/index/index.less

@@ -4,7 +4,7 @@
     padding-bottom: calc(140rpx + env(safe-area-inset-bottom)) !important;
 
     .firstClassify {
-        margin: 55rpx auto 35rpx;
+        margin: 50rpx auto;
         width: 700rpx;
         padding: 40rpx 10rpx;
         box-sizing: border-box;

+ 1 - 1
pages/index/index.wxml

@@ -11,7 +11,7 @@
         <view class="classifyBox">
             <image bindtap="showTips" class="icon" src="/static/future.png" />
         </view>
-        <view class="searchBox">
+        <view class="searchBox" bindtap="jumpSearch">
             内容搜索
             <image src="/static/search-3.png" class="search-icon" />
         </view>

+ 1 - 1
pages/index/index.wxss

@@ -4,7 +4,7 @@
   padding-bottom: calc(140rpx + env(safe-area-inset-bottom)) !important;
 }
 .recommend .firstClassify {
-  margin: 55rpx auto 35rpx;
+  margin: 50rpx auto;
   width: 700rpx;
   padding: 40rpx 10rpx;
   box-sizing: border-box;

+ 75 - 68
pages/message/index.less

@@ -2,12 +2,8 @@
 
 .messagePage {
     overflow: hidden;
-    border-top-left-radius: 24rpx;
-    border-top-right-radius: 24rpx;
-    background-color: #F2F6FC;
-
-
-    .input {
+    padding-top: 55rpx;
+    /*   .input {
         display: flex;
         align-items: center;
         justify-content: space-between;
@@ -27,95 +23,106 @@
                 height: 24rpx;
             }
         }
-    }
+    } */
 
     .messageList {
-        padding: 0rpx 36rpx 250rpx;
+        padding: 0rpx 25rpx 250rpx;
         box-sizing: border-box;
 
         .fixed {
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            padding: 20rpx 0rpx;
-            border-bottom: 1rpx solid #D8D8D8;
-
-            .authority {
-                position: relative;
+            margin: 0 auto 55rpx;
+            width: 700rpx;
+            padding: 46rpx 50rpx 40rpx;
+            box-sizing: border-box;
+            background: #FFFFFF;
+            box-shadow: 0rpx 2rpx 14rpx 0rpx rgba(0, 0, 0, 0.07);
+            border-radius: 30rpx;
+
+            .inletBox {
                 display: flex;
                 align-items: center;
-
-                .avatar {
-                    border-radius: 50rpx;
-                    width: 66rpx;
-                    height: 66rpx;
-                    margin-right: 14rpx;
-                }
-
-                .name {
-                    font-size: 28rpx;
-                }
-
-                .unread {
-                    top: -4rpx;
-                    left: 48rpx;
-                    position: absolute;
-                    width: 32rpx;
-                    height: 32rpx;
-                    line-height: 32rpx;
-                    border-radius: 550rpx;
-                    color: white;
-                    font-size: 20rpx;
-                    text-align: center;
-                    background-color: #FF0000;
+                justify-content: space-between;
+
+                .authority {
+                    position: relative;
+                    display: flex;
+                    align-items: center;
+
+                    .avatar {
+                        width: 86rpx;
+                        height: 125rpx;
+                    }
+
+                    .unread {
+                        top: -4rpx;
+                        right: -10rpx;
+                        position: absolute;
+                        width: 32rpx;
+                        height: 32rpx;
+                        line-height: 32rpx;
+                        border-radius: 550rpx;
+                        color: white;
+                        font-size: 20rpx;
+                        text-align: center;
+                        background-color: #FF0000;
+                    }
                 }
             }
+
         }
 
         .base {
             display: flex;
             align-items: center;
             justify-content: space-between;
-            padding: 20rpx 0rpx 20rpx 20rpx;
-            border-bottom: 1rpx solid #D8D8D8;
 
             .avatar {
+                margin-right: 20rpx;
                 border-radius: 50rpx;
                 width: 80rpx;
                 height: 80rpx;
                 background-color: #EEEEEE;
             }
 
-            .body {
+            .infoBox {
                 flex: 1;
-                padding: 0rpx 20rpx;
-                .name {
-                    max-width: 330rpx;
-                    font-size: 30rpx;
-                    font-weight: bolder;
-                }
-            }
-
-            .right {
-                min-width: 140rpx;
                 display: flex;
-                flex-direction: column;
-                align-items: flex-end;
-
-                .date {
-                    font-size: 24rpx;
+                align-items: center;
+                justify-content: space-between;
+                border-bottom: 1rpx solid #D8D8D8;
+                padding: 20rpx 0;
+
+                .body {
+                    flex: 1;
+
+                    .name {
+                        max-width: 330rpx;
+                        font-size: 30rpx;
+                        font-weight: bolder;
+                    }
                 }
 
-                .unread {
-                    margin-top: 6rpx;
-                    width: 32rpx;
-                    height: 32rpx;
-                    line-height: 32rpx;
-                    border-radius: 550rpx;
-                    color: white;
-                    font-size: 20rpx;
-                    text-align: center;
-                    background-color: #FF0000;
+                .right {
+                    min-width: 140rpx;
+                    display: flex;
+                    flex-direction: column;
+                    align-items: flex-end;
+
+                    .date {
+                        font-size: 24rpx;
+                    }
+
+                    .unread {
+                        margin-top: 6rpx;
+                        width: 32rpx;
+                        height: 32rpx;
+                        line-height: 32rpx;
+                        border-radius: 550rpx;
+                        color: white;
+                        font-size: 20rpx;
+                        text-align: center;
+                        background-color: #FF0000;
+                    }
                 }
             }
         }

+ 29 - 29
pages/message/index.wxml

@@ -2,33 +2,31 @@
 <navigationBar></navigationBar>
 <import src="./index.skeleton" />
 <view class="messagePage">
-    <view class="input" bindtap="setSearch">
+    <!--  <view class="input" bindtap="setSearch">
         查找朋友(昵称/学号/手机号)
         <view class="searchBtn">
             <image src="/static/search-2.png" class="img" />
         </view>
-    </view>
+    </view> -->
     <view class="messageList">
         <view class="fixed">
-            <view class="authority" bindtap="jump" data-url='friend'>
-                <image src="/static/concern.png" class="avatar" />
-                <view class="name">朋友</view>
-                <view class="unread" wx:if="{{authorityMsg.newFansCount>0}}">{{authorityMsg.newFansCount}}</view>
-            </view>
-            <view class="authority" bindtap="jump" data-url='like'>
-                <image src="/static/zan.png" class="avatar" />
-                <view class="name">赞</view>
-                <view class="unread" wx:if="{{authorityMsg.likeCount>0}}">{{authorityMsg.likeCount}}</view>
-            </view>
-            <view class="authority" bindtap="jump" data-url='comment'>
-                <image src="/static/message3.png" class="avatar" />
-                <view class="name">评论</view>
-                <view class="unread" wx:if="{{authorityMsg.postsCount>0}}">{{authorityMsg.postsCount}}</view>
-            </view>
-            <view class="authority" bindtap="jump" data-url='notice'>
-                <image src="/static/notice.png" class="avatar" />
-                <view class="name">通知</view>
-                <view class="unread" wx:if="{{authorityMsg.messageCount>0}}">{{authorityMsg.messageCount}}</view>
+            <view class="inletBox">
+                <view class="authority" bindtap="jump" data-url='friend'>
+                    <image src="/static/concern.png" class="avatar" />
+                    <view class="unread" wx:if="{{authorityMsg.newFansCount>0}}">{{authorityMsg.newFansCount}}</view>
+                </view>
+                <view class="authority" bindtap="jump" data-url='like'>
+                    <image src="/static/zan.png" class="avatar" />
+                    <view class="unread" wx:if="{{authorityMsg.likeCount>0}}">{{authorityMsg.likeCount}}</view>
+                </view>
+                <view class="authority" bindtap="jump" data-url='comment'>
+                    <image src="/static/message3.png" class="avatar" />
+                    <view class="unread" wx:if="{{authorityMsg.postsCount>0}}">{{authorityMsg.postsCount}}</view>
+                </view>
+                <view class="authority" bindtap="jump" data-url='notice'>
+                    <image src="/static/notice.png" class="avatar" />
+                    <view class="unread" wx:if="{{authorityMsg.messageCount>0}}">{{authorityMsg.messageCount}}</view>
+                </view>
             </view>
         </view>
         <view class="base user" wx:for="{{authorityMsg.topList}}" wx:key="index" data-item='{{item}}'
@@ -52,15 +50,17 @@
             <view class="base user" wx:for="{{list}}" wx:key="index" data-item='{{item}}' data-top="{{false}}"
                 bind:longpress="onLongPress" hover-class='pressHover' bindtap="jumpChat">
                 <image src="{{item.user.avatar}}" class="avatar" />
-                <view class="body">
-                    <view class="name textOver">{{item.user.nickName||item.user.eid}}</view>
-                    <view class="info textOver">
-                        {{item.content}}
+                <view class="infoBox">
+                    <view class="body">
+                        <view class="name textOver">{{item.user.nickName||item.user.eid}}</view>
+                        <view class="info textOver">
+                            {{item.content}}
+                        </view>
+                    </view>
+                    <view class="right">
+                        <view class="date">{{filters.formatDate(item.gmtModified,5)}}</view>
+                        <view class="unread" wx:if="{{item.unReadCount>0}}">{{item.unReadCount}}</view>
                     </view>
-                </view>
-                <view class="right">
-                    <view class="date">{{filters.formatDate(item.gmtModified,5)}}</view>
-                    <view class="unread" wx:if="{{item.unReadCount>0}}">{{item.unReadCount}}</view>
                 </view>
             </view>
         </block>

+ 52 - 44
pages/message/index.wxss

@@ -207,57 +207,59 @@
 }
 .messagePage {
   overflow: hidden;
-  border-top-left-radius: 24rpx;
-  border-top-right-radius: 24rpx;
-  background-color: #F2F6FC;
-}
-.messagePage .input {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  background-color: white;
-  font-size: 28rpx;
-  margin: 30rpx 30rpx 10rpx;
-  padding: 16rpx 30rpx;
-  border-radius: 50rpx;
-}
-.messagePage .input .searchBtn {
-  padding: 4rpx 44rpx;
-  background: #00C657;
-  border-radius: 40rpx;
-}
-.messagePage .input .searchBtn .img {
-  width: 24rpx;
-  height: 24rpx;
+  padding-top: 55rpx;
+  /*   .input {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        background-color: white;
+        font-size: 28rpx;
+        margin: 30rpx 30rpx 10rpx;
+        padding: 16rpx 30rpx;
+        border-radius: 50rpx;
+
+        .searchBtn {
+            padding: 4rpx 44rpx;
+            background: #00C657;
+            border-radius: 40rpx;
+
+            .img {
+                width: 24rpx;
+                height: 24rpx;
+            }
+        }
+    } */
 }
 .messagePage .messageList {
-  padding: 0rpx 36rpx 250rpx;
+  padding: 0rpx 25rpx 250rpx;
   box-sizing: border-box;
 }
 .messagePage .messageList .fixed {
+  margin: 0 auto 55rpx;
+  width: 700rpx;
+  padding: 46rpx 50rpx 40rpx;
+  box-sizing: border-box;
+  background: #FFFFFF;
+  box-shadow: 0rpx 2rpx 14rpx 0rpx rgba(0, 0, 0, 0.07);
+  border-radius: 30rpx;
+}
+.messagePage .messageList .fixed .inletBox {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: 20rpx 0rpx;
-  border-bottom: 1rpx solid #D8D8D8;
 }
-.messagePage .messageList .fixed .authority {
+.messagePage .messageList .fixed .inletBox .authority {
   position: relative;
   display: flex;
   align-items: center;
 }
-.messagePage .messageList .fixed .authority .avatar {
-  border-radius: 50rpx;
-  width: 66rpx;
-  height: 66rpx;
-  margin-right: 14rpx;
-}
-.messagePage .messageList .fixed .authority .name {
-  font-size: 28rpx;
+.messagePage .messageList .fixed .inletBox .authority .avatar {
+  width: 86rpx;
+  height: 125rpx;
 }
-.messagePage .messageList .fixed .authority .unread {
+.messagePage .messageList .fixed .inletBox .authority .unread {
   top: -4rpx;
-  left: 48rpx;
+  right: -10rpx;
   position: absolute;
   width: 32rpx;
   height: 32rpx;
@@ -272,34 +274,40 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: 20rpx 0rpx 20rpx 20rpx;
-  border-bottom: 1rpx solid #D8D8D8;
 }
 .messagePage .messageList .base .avatar {
+  margin-right: 20rpx;
   border-radius: 50rpx;
   width: 80rpx;
   height: 80rpx;
   background-color: #EEEEEE;
 }
-.messagePage .messageList .base .body {
+.messagePage .messageList .base .infoBox {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-bottom: 1rpx solid #D8D8D8;
+  padding: 20rpx 0;
+}
+.messagePage .messageList .base .infoBox .body {
   flex: 1;
-  padding: 0rpx 20rpx;
 }
-.messagePage .messageList .base .body .name {
+.messagePage .messageList .base .infoBox .body .name {
   max-width: 330rpx;
   font-size: 30rpx;
   font-weight: bolder;
 }
-.messagePage .messageList .base .right {
+.messagePage .messageList .base .infoBox .right {
   min-width: 140rpx;
   display: flex;
   flex-direction: column;
   align-items: flex-end;
 }
-.messagePage .messageList .base .right .date {
+.messagePage .messageList .base .infoBox .right .date {
   font-size: 24rpx;
 }
-.messagePage .messageList .base .right .unread {
+.messagePage .messageList .base .infoBox .right .unread {
   margin-top: 6rpx;
   width: 32rpx;
   height: 32rpx;

+ 16 - 21
pages/works/index.less

@@ -1,35 +1,30 @@
 .worksBox {
-    padding-top: 70rpx;
+    padding-top: 55rpx;
     padding-bottom: calc(140rpx + env(safe-area-inset-bottom)) !important;
 
     .itemize {
-        margin-bottom: 70rpx;
-        padding: 0 60rpx;
+        margin: 0 auto 43rpx;
+        width: 700rpx;
+        height: 250rpx;
+        background: #FFFFFF;
+        box-shadow: 0rpx 2rpx 14rpx 0rpx rgba(0, 0, 0, 0.07);
+        border-radius: 30rpx;
+        padding: 0 52rpx;
+        box-sizing: border-box;
         display: flex;
         align-items: center;
         justify-content: space-between;
 
         .box {
-            position: relative;
-            text-align: center;
-            font-size: 28rpx;
-
-            .count {
-                position: absolute;
-                top: 0;
-                right: 0;
-                padding: 4rpx 11rpx;
-                background: #FED806;
-                border-radius: 20rpx 20rpx 20rpx 2rpx;
-                font-size: 18rpx;
-                font-weight: 500;
-                color: #F01515;
+            .img {
+                width: 111rpx;
+                height: 131rpx;
             }
 
-            .img {
-                margin-bottom: 10rpx;
-                width: 156rpx;
-                height: 111rpx;
+            .count {
+                font-size: 20rpx;
+                text-align: center;
+                color: #A39C9C;
             }
         }
     }

+ 1 - 4
pages/works/index.wxml

@@ -4,23 +4,20 @@
         <view class="box" bindtap="jump" data-type='my'>
             <image src="/static/works-1.png" class="img" />
             <view class="count">{{count.myReadCount}}</view>
-            <view>我的作品</view>
         </view>
         <view class="box" bindtap="jump" data-type='follow'>
             <image src="/static/works-2.png" class="img" />
             <view class="count">{{count.myFansReadCount}}</view>
-            <view>关注作品</view>
         </view>
         <view class="box" bindtap="jump" data-type='collect'>
             <image src="/static/works-3.png" class="img" />
             <view class="count">{{count.myFavoritesCount}}</view>
-            <view>收藏作品</view>
         </view>
     </view>
     <!-- 优秀作品展播-->
     <view class="logo">
         <image src="/static/works.png" class="icon" />优秀作品展播
     </view>
-    <worksList id="worksList" worksList="{{list}}" videoType="public" tabBarPadding='true' autoPlay='{{true}}' />
+    <worksList id="worksList" worksList="{{list}}" videoType="public" tabBarPadding='true' autoPlay='{{false}}' />
 </view>
 <canvas id='share' type="2d"> </canvas>

+ 15 - 21
pages/works/index.wxss

@@ -1,34 +1,28 @@
 .worksBox {
-  padding-top: 70rpx;
+  padding-top: 55rpx;
   padding-bottom: calc(140rpx + env(safe-area-inset-bottom)) !important;
 }
 .worksBox .itemize {
-  margin-bottom: 70rpx;
-  padding: 0 60rpx;
+  margin: 0 auto 43rpx;
+  width: 700rpx;
+  height: 250rpx;
+  background: #FFFFFF;
+  box-shadow: 0rpx 2rpx 14rpx 0rpx rgba(0, 0, 0, 0.07);
+  border-radius: 30rpx;
+  padding: 0 52rpx;
+  box-sizing: border-box;
   display: flex;
   align-items: center;
   justify-content: space-between;
 }
-.worksBox .itemize .box {
-  position: relative;
-  text-align: center;
-  font-size: 28rpx;
+.worksBox .itemize .box .img {
+  width: 111rpx;
+  height: 131rpx;
 }
 .worksBox .itemize .box .count {
-  position: absolute;
-  top: 0;
-  right: 0;
-  padding: 4rpx 11rpx;
-  background: #FED806;
-  border-radius: 20rpx 20rpx 20rpx 2rpx;
-  font-size: 18rpx;
-  font-weight: 500;
-  color: #F01515;
-}
-.worksBox .itemize .box .img {
-  margin-bottom: 10rpx;
-  width: 156rpx;
-  height: 111rpx;
+  font-size: 20rpx;
+  text-align: center;
+  color: #A39C9C;
 }
 .worksBox .logo {
   margin: 26rpx 30rpx;

BIN
static/concern.png


BIN
static/message3.png


BIN
static/notice.png


BIN
static/works-1.png


BIN
static/works-2.png


BIN
static/works-3.png


BIN
static/zan.png