bayi hai 1 ano
pai
achega
e153657a19

+ 1 - 1
pages/activity/index.wxml

@@ -6,7 +6,7 @@
                 <image src="/static/ranking-i.png" class="logo" />
                 排行榜
             </view>
-            <view class="toAll" bindtap="goRanking">查看更多
+            <view class="toAll" bindtap="activityEvent" data-info="{{rankList[0]}}">查看更多
                 <image src="/static/black.png" class="backIcon" />
             </view>
         </view>

+ 8 - 8
pages/userWorks/index.js

@@ -15,18 +15,18 @@ Page({
     behaviors: [reachBottom, share, event],
     data: {
         firstWork: '',
-        type: 'my'
+        type: 'my',
+        emptyText: '您还没有作品哦,赶快去发表吧!'
     },
     onLoad(options) {
-        if (options.type) {
+        if (options.type && options.type != 'my') {
             this.setData({
-                type: options.type
+                type: options.type,
+                emptyText: options.type == 'follow' ? '您还没有关注用户哦' : '快去收藏喜欢的作品吧!'
+            })
+            wx.setNavigationBarTitle({
+                title: options.type == 'follow' ? '关注作品' : '收藏作品'
             })
-            if(options.type!='my'){
-                wx.setNavigationBarTitle({
-                    title:options.type=='follow'?'关注作品':'收藏作品'
-                })
-            }
         }
         if (options.id) {
             this.getreadInfo(options.id)

+ 3 - 1
pages/userWorks/index.less

@@ -1,3 +1,5 @@
 .worksBox {
-
+    .empty {
+        margin-top: 200rpx;
+    }
 }

+ 1 - 1
pages/userWorks/index.wxml

@@ -2,5 +2,5 @@
     <!-- 作品列表 -->
     <canvas id='share' type="2d"> </canvas>
     <worksList id="worksList" videoType="{{type=='my'?'my':'follow'}}" worksList="{{list}}" autoPlay='{{false}}' />
-    <emptyBg wx:if="{{list.length==0}}" message='您还没有作品哦,赶快去发表吧!'></emptyBg>
+    <emptyBg class="empty" wx:if="{{nullList}}" message='{{emptyText}}'></emptyBg>
 </view>

+ 3 - 0
pages/userWorks/index.wxss

@@ -0,0 +1,3 @@
+.worksBox .empty {
+  margin-top: 200rpx;
+}

+ 2 - 2
pages/works/index.less

@@ -1,5 +1,5 @@
 .worksBox {
-    padding-top: 30rpx;
+    padding-top: 50rpx;
     padding-bottom: calc(140rpx + env(safe-area-inset-bottom)) !important;
 
     .itemize {
@@ -26,7 +26,7 @@
         display: flex;
         align-items: center;
         font-size: 36rpx;
-
+        color: #000000;
         .icon {
             width: 50rpx;
             height: 50rpx;

+ 2 - 1
pages/works/index.wxss

@@ -1,5 +1,5 @@
 .worksBox {
-  padding-top: 30rpx;
+  padding-top: 50rpx;
   padding-bottom: calc(140rpx + env(safe-area-inset-bottom)) !important;
 }
 .worksBox .itemize {
@@ -23,6 +23,7 @@
   display: flex;
   align-items: center;
   font-size: 36rpx;
+  color: #000000;
 }
 .worksBox .logo .icon {
   width: 50rpx;

+ 3 - 3
utils/request.js

@@ -6,13 +6,13 @@ const {
         envVersion
     }
 } = wx.getAccountInfoSync();
-if (envVersion == 'develop') {
+/* if (envVersion == 'develop') {
     baseUrl = 'https://reader-api.efunbox.cn/wx'
     oldUrl = 'https://reader-api.efunbox.cn'
-} else {
+} else { */
     baseUrl = 'https://reader-api.ai160.com/wx'
     oldUrl = 'https://reader-api.ai160.com'
-}
+// }
 
 function request(url, method, data, oldBaseUrl = false, intercept = true) {
     let header = {