调整

component/video-swiper/index.less

@@ -222,7 +222,7 @@
         .foot_box {
             width: 100%;
             height: 65rpx;
-            margin-top: 43rpx;
+            margin-top: 20rpx;
             display: flex;
             justify-content: space-between;
             padding-left: 20rpx;
@@ -320,7 +320,7 @@
             display: flex;
             align-items: center;
             justify-content: center;
-            margin-top: 45rpx;
+            margin-top: 38rpx;
             margin-bottom: 10rpx;
             padding-bottom: 20rpx;
             box-sizing: border-box;

component/video-swiper/index.wxml

@@ -28,9 +28,6 @@
             </view>
             <video id="video_{{index}}" class="video_item" loop="{{loop}}" enable-play-gesture enable-progress-gesture show-center-play-btn="{{false}}" controls="{{true}}" src="{{item.url}}" object-fit="contain" data-index="{{index}}" data-id="{{item.id}}" bindplay="onPlay" bindended="onEnded">
             </video>
-            <view class="video_title">
-                <text>{{item.title}}</text>
-            </view>
             <view class="foot_box">
                 <view class="foot_left">
                     <view class="video_btn collect_btn" catchtap="collectTap" data-index="{{index}}" data-id="{{item.id}}" data-type="{{item.type}}">
@@ -102,9 +99,6 @@
         </view>
         <video wx:if="{{item.videoShow}}" id="video_{{index}}" class="video_item" loop="{{loop}}" show-center-play-btn="{{!item.ifCheck ? true : false}}" controls="{{!item.ifCheck ? true : false}}" src="{{item.url ? item.url : '' }}" autoplay="{{true}}" object-fit="contain" data-index="{{index}}" data-id="{{item.id}}" bindplay="onPlayList" bindended="onEndedList" binderror="onError">
         </video>
-        <view class="video_title">
-            <text>{{item.title}}</text>
-        </view>
         <view class="foot_box" wx:if="{{!item.ifCheck}}">
             <view class="foot_left">
                 <view class="video_btn collect_btn" catchtap="collectTap" data-index="{{index}}" data-id="{{item.id}}" data-type="{{item.type}}">

component/video-swiper/index.wxss

@@ -78,12 +78,6 @@
   font-size: 30rpx;
   color: rgba(0, 0, 0, 0.8);
   font-weight: bold;
-  font-size: 30rpx;
-  max-width: 210rpx;
-  height: 40rpx;
-  overflow: hidden;
-  white-space:nowrap;
-  text-overflow: ellipsis;
 }
 .swiper_container .swiper_item .head_box .user_box .user_right .efun_tag {
   width: 68rpx;
@@ -158,13 +152,6 @@
   right: 0;
   margin: 0 auto;
 }
-.swiper_container .swiper_item .video_place .activity_tigs {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  height: 49rpx;
-}
 .swiper_container .swiper_item .video_place .place_img {
   width: 100%;
   height: 100%;
@@ -196,7 +183,7 @@
 .swiper_container .swiper_item .foot_box {
   width: 100%;
   height: 65rpx;
-  margin-top: 43rpx;
+  margin-top: 20rpx;
   display: flex;
   justify-content: space-between;
   padding-left: 20rpx;
@@ -283,7 +270,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  margin-top: 45rpx;
+  margin-top: 38rpx;
   margin-bottom: 10rpx;
   padding-bottom: 20rpx;
   box-sizing: border-box;

component/videoPreview/index.less

@@ -1,5 +1,5 @@
 .work {
-    margin-bottom: 12rpx;
+    margin-bottom: 20rpx;
     background-color: white;
 
     .workHead {
@@ -111,13 +111,9 @@
     }
 
     .workFooter {
-        .title {
-            padding: 14rpx 20rpx;
-            font-size: 32rpx;
-            font-weight: bold;
-        }
 
         .mange {
+            margin-top: 15rpx;
             display: flex;
             justify-content: space-between;
             align-items: center;
@@ -138,7 +134,6 @@
                     }
 
                     .icon-name {
-                        font-weight: bold;
                         margin-left: 10rpx;
                         font-size: 28rpx;
                     }

component/videoPreview/index.wxml

@@ -42,7 +42,6 @@
         </video>
     </view>
     <view class="workFooter">
-        <view class="title">{{videoInfo.userRead.title}}</view>
         <!-- <view class="mange" wx:if="{{videoInfo.userRead.status!='CHECK'}}"> -->
         <view class="mange">
             <view class="mangeL" bindtap="collect">

component/videoPreview/index.wxss

@@ -1,5 +1,5 @@
 .work {
-  margin-bottom: 12rpx;
+  margin-bottom: 20rpx;
   background-color: white;
 }
 .work .workHead {
@@ -92,12 +92,8 @@
   width: 100%;
   height: 422rpx;
 }
-.work .workFooter .title {
-  padding: 14rpx 20rpx;
-  font-size: 32rpx;
-  font-weight: bold;
-}
 .work .workFooter .mange {
+  margin-top: 15rpx;
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -117,7 +113,6 @@
   height: 44rpx;
 }
 .work .workFooter .mange .mangeL .mangeL-box .icon-name {
-  font-weight: bold;
   margin-left: 10rpx;
   font-size: 28rpx;
 }

pages/index/index.js

@@ -106,7 +106,7 @@ Page({
         })
     },
     jumpMy() {
-        wx.navigateTo({
+        wx.redirectTo({
             url: '/pages/my/index'
         });
     },

pages/my/index.js

@@ -17,9 +17,8 @@ Page({
     data: {
         userInfo: {},
         vipTime: '',
-        isIos: false,
         tasks: [],
-        // isIos: app.globalData.isIOS,
+        isIos: app.globalData.isIOS,
         productNum: {},
         productVip: {}
     },
@@ -150,7 +149,9 @@ Page({
     switcher({
         currentTarget
     }) {
-        wx.navigateTo({
+
+        console.log('zx', currentTarget.dataset);
+        wx.redirectTo({
             url: `/pages/index/index?tabbarIndx=${currentTarget.dataset.index}`
         });
     },
@@ -161,6 +162,17 @@ Page({
         }
         this.selectComponent('#advert').rewardedVideo();
     },
+    clipboar() {
+        wx.setClipboardData({
+            data: this.data.userInfo.user.eid,
+            success: function(res) { //成功回调函数
+                wx.showToast({
+                    title: '已复制',
+                    icon: "none"
+                })
+            }
+        })
+    },
     // 分享配置
     onShareAppMessage: function(res) {
         const user = wx.getStorageSync('user');

pages/my/index.less

@@ -341,4 +341,10 @@
             border: none;
         }
     }
+    .eid{
+        margin-top:30rpx;
+        font-size: 26rpx;
+        text-align: center;
+        color: rgb(156, 155, 155);
+    }
 }

pages/my/index.wxml

@@ -19,12 +19,12 @@
     <view class="userBox">
         <image class='avatar' src='{{ userInfo.user.avatar}}'></image>
         <view class="userRight">
-            <view class="uRtop">
+            <view class="uRtop" bindtap="jump" data-url="/pages/user/myEdit/myEdit">
                 <view class="uRtopleft">
                     <view class="nickName textOver">昵称：{{userInfo.user.nickName }}</view>
                     <view class="gradeText">年级：{{filters.gradeFilter(userInfo.user.grade)}}</view>
                 </view>
-                <view class="uRtopRight" bindtap="jump" data-url="/pages/user/myEdit/myEdit">
+                <view class="uRtopRight">
                     <image class="edit" src="/static/image/edit_new.png" mode="" />
                     <text>编辑</text>
                 </view>
@@ -116,8 +116,7 @@
                     <view class="tcNum">+{{tasks[0].award}}次</view>
                 </view>
             </view>
-            <view class="taskRight {{tasks[0].completed?'taskRight-close':''}}" bindtap="submitTask"
-                data-type='{{tasks[0].id}}'>
+            <view class="taskRight {{tasks[0].completed?'taskRight-close':''}}" bindtap="submitTask" data-type='{{tasks[0].id}}'>
                 {{tasks[0].completed?'已签到':'签到'}}</view>
         </view>
         <view class="task">
@@ -151,6 +150,10 @@
             </view>
         </view>
     </view>
+    <!-- 学号 -->
+    <view class="eid" bindtap="clipboar">
+        学号：{{userInfo.user.eid}}
+    </view>
 </view>
 <!-- 广告组件 -->
 <rewardedVideo id='advert' bind:taskOver="setUserInfo" />

pages/my/index.wxss

@@ -286,3 +286,9 @@
 .container .taskBox .advert {
   border: none;
 }
+.container .eid {
+  margin-top: 30rpx;
+  font-size: 26rpx;
+  text-align: center;
+  color: #9c9b9b;
+}