提交修改

pages/index/index.wxml

@@ -10,7 +10,7 @@
       <text slot="footer" class='text-gray text-small' catchtap='gotoMoreProjects' data-type='1' data-name='最新活动'>更多</text>
       <text slot="footer" class='text-gray text-small' catchtap='gotoMoreProjects' data-type='1' data-name='最新活动'>更多</text>
     </i-cell>
     </i-cell>
     <i-row i-class="col-wrapper">
     <i-row i-class="col-wrapper">
-      <i-col span="8" i-class="col-class" wx:for="{{news}}" wx:for-index="idx" wx:for-item="n" wx:key="n.id" wx:if="{{idx < 3}}">
+      <i-col span="8" i-class="col-class" wx:for="{{news}}" wx:for-index="idx" wx:for-item="n" wx:key="n.id" wx:if="{{idx < 6}}">
         <view class='col-item' catchtap='handleProjectDetail' data-id='{{n.id}}'>
         <view class='col-item' catchtap='handleProjectDetail' data-id='{{n.id}}'>
           <image class='image' src="{{n.poster}}" mode='aspectFill'></image>
           <image class='image' src="{{n.poster}}" mode='aspectFill'></image>
           <view class='title'>{{n.title}}</view>
           <view class='title'>{{n.title}}</view>
@@ -28,7 +28,7 @@
       <text slot="footer" class='text-gray text-small' catchtap='gotoMoreProjects' data-type='2' data-name='爆款专区'>更多</text>
       <text slot="footer" class='text-gray text-small' catchtap='gotoMoreProjects' data-type='2' data-name='爆款专区'>更多</text>
     </i-cell>
     </i-cell>
     <i-row i-class="col-wrapper">
     <i-row i-class="col-wrapper">
-      <i-col span="8" i-class="col-class" wx:for="{{heats}}" wx:for-index="idx" wx:for-item="n" wx:key="n.id" wx:if="{{idx < 3}}">
+      <i-col span="8" i-class="col-class" wx:for="{{heats}}" wx:for-index="idx" wx:for-item="n" wx:key="n.id" wx:if="{{idx < 6}}">
         <view class='col-item' catchtap='handleProjectDetail' data-id='{{n.id}}'>
         <view class='col-item' catchtap='handleProjectDetail' data-id='{{n.id}}'>
           <image class='image' src="{{n.poster}}" mode='aspectFill'></image>
           <image class='image' src="{{n.poster}}" mode='aspectFill'></image>
           <view class='title'>{{n.title}}</view>
           <view class='title'>{{n.title}}</view>

pages/me/collection/index.js

@@ -2,9 +2,6 @@
 import api from '../../../utils/Api.js'
 import api from '../../../utils/Api.js'
 import Wx from '../../../utils/Wx.js'
 import Wx from '../../../utils/Wx.js'
 import Schedule from '../../../utils/Schedule.js'
 import Schedule from '../../../utils/Schedule.js'
-const {
-  $Toast
-} = require('../../../iview/base/index');
 
 
 Page({
 Page({
   /**
   /**
@@ -40,10 +37,6 @@ Page({
           loading: false,
           loading: false,
           currentPage: 2
           currentPage: 2
         })
         })
-        $Toast({
-          content: res.msg,
-          type: 'error'
-        })
       } else {
       } else {
         let _projects = this.data.projects
         let _projects = this.data.projects
         this.setData({
         this.setData({

pages/me/collection/index.json

@@ -3,7 +3,6 @@
   "enablePullDownRefresh": true,
   "enablePullDownRefresh": true,
   "usingComponents": {
   "usingComponents": {
     "project-item": "/components/project-item/index",
     "project-item": "/components/project-item/index",
-    "more": "/components/more/index",
-    "i-toast": "/iview/toast/index"
+    "more": "/components/more/index"
   }
   }
 }
 }
\ No newline at end of file

pages/me/collection/index.wxml

@@ -4,6 +4,5 @@
   <view class="projects-wrapper">
   <view class="projects-wrapper">
     <project-item wx:for="{{projects}}" wx:for-index="idx" wx:for-item="item" wx:key="n.id" project-item="{{item}}" />
     <project-item wx:for="{{projects}}" wx:for-index="idx" wx:for-item="item" wx:key="n.id" project-item="{{item}}" />
   </view>
   </view>
-  <i-toast id="toast" />
 </view>
 </view>
 <more hasMore="{{hasMore}}" loading="{{loading}}" page="{{currentPage}}" />
 <more hasMore="{{hasMore}}" loading="{{loading}}" page="{{currentPage}}" />
\ No newline at end of file

pages/me/vip/index.wxml

@@ -3,7 +3,7 @@
 
 
 <view class='card-box'>
 <view class='card-box'>
   <image src="/images/background-{{user.is_vip==1?'':'no'}}vip.png"></image>
   <image src="/images/background-{{user.is_vip==1?'':'no'}}vip.png"></image>
-  <text> {{user.is_vip==1?user.vip_endtime:''}}</text>
+  <text> {{user.is_vip==1?'过期时间：' + user.vip_endtime:''}}</text>
 </view>
 </view>
 
 
 <view class='calculation-box'>
 <view class='calculation-box'>
@@ -17,7 +17,7 @@
 </view>
 </view>
 
 
 <view class='vip_intro'>
 <view class='vip_intro'>
-  会员卡说明:用户购买一次会员卡后，增加一年的会员时限，多次购买则在先有的基础上延长时间,单词以1年为标准。
+  会员卡说明:用户购买一次会员卡后，增加一年的会员时限，多次购买则在先有的基础上延长时间,单次以1年为标准。
 </view>
 </view>
 
 
 <i-row class='height'>
 <i-row class='height'>