bayi 2 år sedan
förälder
incheckning
70592cddc1
4 ändrade filer med 25 tillägg och 6 borttagningar
  1. 14 0
      pages/my/index.wxml
  2. 4 1
      pages/works/index.js
  3. 5 3
      pages/works/index.wxml
  4. 2 2
      utils/request.js

+ 14 - 0
pages/my/index.wxml

@@ -121,6 +121,20 @@
     </view>
     <view class="task">
       <view class="taskLeft">
+        <image class="img" src="/static/task1.png" alt="" mode="" />
+        <view class="taskContent">
+          <view class="tcTitle">
+            绑定手机
+          </view>
+          <view class="tcNum">+7天VIP</view>
+        </view>
+      </view>
+      <view class="taskRight {{tasks[0].completed?'taskRight-close':''}}" bindtap="submitTask"
+        data-type='{{tasks[0].id}}'>
+        {{tasks[0].completed?'已绑定':'绑定'}}</view>
+    </view>
+    <view class="task">
+      <view class="taskLeft">
         <image class="img" src="/static/task2.png" alt="" mode="" />
         <view class="taskContent">
           <view class="tcTitle">

+ 4 - 1
pages/works/index.js

@@ -4,7 +4,8 @@ import {
 } from '~/api/global'
 import share from '~/mixins/share'
 import {
-  getSelfRead
+  getSelfRead,
+  getFavoritesList
 } from '~/api/user'
 import {
   getFollowWorks
@@ -39,6 +40,8 @@ Page({
       this.getData(getFollowWorks, {})
     } else if (this.data.currentType == '5') {
       this.getData(getSelfRead, {})
+    } else if (this.data.currentType == '6') {
+      this.getData(getFavoritesList, {})
     }
   },
   changeType({

+ 5 - 3
pages/works/index.wxml

@@ -6,10 +6,12 @@
   <view class="selectType {{isFixed?'isFixed isFixed2':''}}" style="top:{{navBarHeight}}px;" bindtap="changeType">
     <view class="type {{currentType=='4'?'currentType':''}}" data-type='4'>关注作品</view>
     <view class="type {{currentType=='5'?'currentType':''}}" data-type='5'>我的作品</view>
+    <view class="type {{currentType=='6'?'currentType':''}}" data-type='6'>收藏作品</view>
   </view>
   <!-- 优秀作品展播及官方推荐列表组件 -->
-  <worksList id="worksList" videoType="{{currentType=='4'?'follow':'my'}}" worksList="{{list}}" tabBarPadding='true'
-    autoPlay='{{false}}' />
-  <emptyBg wx:if="{{nullList}}" message="{{currentType=='4'?'您还没有关注的用户哦':'您还没有作品哦,赶快去发表吧'}}"></emptyBg>
+  <worksList id="worksList" videoType="{{currentType=='4'||currentType=='6'?'follow':'my'}}" worksList="{{list}}"
+    tabBarPadding='true' autoPlay='{{false}}' />
+  <emptyBg wx:if="{{nullList}}"
+    message="{{currentType=='4'?'您还没有关注的用户哦':currentType=='5'?'您还没有作品哦,赶快去发表吧':'您还没有收藏作品哦'}}"></emptyBg>
 </view>
 <canvas id='share' type="2d"> </canvas>

+ 2 - 2
utils/request.js

@@ -35,10 +35,10 @@ function request(url, method, data, oldBaseUrl = false) {
         if (code == '200') {
           reslove(data)
         } else if (code == '1102' || code == '1204' || code == '506') {
-          console.log(code, '<=====code', message);
+          console.log(code, '<=====code1', message);
           wx.clearStorage()
         } else {
-          console.log(code, '<=====code', message);
+          console.log(code, '<=====code2', message);
           // reject(message)
         }
       },