miniprogram / match-west-road · 提交

转到一个项目

作者 wumengyu
提交 245955047087019233a6361bd9aebd5cf7d061ac 1 个父辈 533d0174

优化最高最低人数可以相等，修改餐票title地点人名，倒计时文字不换行，添加推荐页，优化订单取消完成的权限，

内嵌 并排对比
正在显示 21 个修改的文件 包含 151 行增加 和 55 行删除
@@ -39,7 +39,7 @@ App({ @@ -39,7 +39,7 @@ App({
39 return new Promise(function (resolve, reject) { 39 return new Promise(function (resolve, reject) {
40 wx.getUserInfo({ 40 wx.getUserInfo({
41 success: function (user) { 41 success: function (user) {
42 - console.log('获取用户信息',user);// gender:性别 0：未知、1：男、2：女 42 + console.log('获取用户信息', user);// gender:性别 0：未知、1：男、2：女
43 // 登录 43 // 登录
44 let url = '/portal/Login/getToken'; 44 let url = '/portal/Login/getToken';
45 wx.login({ 45 wx.login({
@@ -182,22 +182,20 @@ App({ @@ -182,22 +182,20 @@ App({
182 return H; 182 return H;
183 }, 183 },
184 //获取截止时间的前几个小时 184 //获取截止时间的前几个小时
185 - preTime(over_time,n) {  
186 - var nowDate = new Date(over_time),  
187 - nowDate = nowDate.setHours(nowDate.getHours() - n),  
188 - nowDate = new Date(nowDate),  
189 - y = nowDate.getFullYear(),  
190 - m = nowDate.getMonth() + 1,  
191 - d = nowDate.getDate(),  
192 - h = nowDate.getHours(),  
193 - mi = nowDate.getMinutes();  
194 - console.log('nowDate',nowDate,new Date(over_time)) 185 + preTime(over_time, n) {
  186 + console.log('over_time', over_time);
  187 + var time = new Date(new Date(over_time).getTime() - n * 60 * 60 * 1000);
  188 + console.log('time', time);
  189 + var y = time.getFullYear(),
  190 + m = time.getMonth() + 1,
  191 + d = time.getDate(),
  192 + h = time.getHours(),
  193 + mi = time.getMinutes();
195 m = m < 10 ? '0' + m : m; 194 m = m < 10 ? '0' + m : m;
196 d = d < 10 ? '0' + d : d; 195 d = d < 10 ? '0' + d : d;
197 h = h < 10 ? '0' + h : h; 196 h = h < 10 ? '0' + h : h;
198 mi = mi < 10 ? '0' + mi : mi; 197 mi = mi < 10 ? '0' + mi : mi;
199 - console.log('截止时间',y,over_time, m, d, h,mi);  
200 - // return y + over_time + m + over_time + d + ' ' + h + ':' + mi; 198 + console.log('截止时间', time, m, d, h, mi);
201 return y + '-' + m + '-' + d + ' ' + h + ':' + mi; 199 return y + '-' + m + '-' + d + ' ' + h + ':' + mi;
202 }, 200 },
203 timeFormat(param) { //小于10的格式化函数 201 timeFormat(param) { //小于10的格式化函数
@@ -25,7 +25,8 @@ @@ -25,7 +25,8 @@
25 "pages/order/complain/complain", 25 "pages/order/complain/complain",
26 "pages/order/order-detail/order-detail", 26 "pages/order/order-detail/order-detail",
27 "pages/comment/comment", 27 "pages/comment/comment",
28 - "pages/index/city-list/city-list" 28 + "pages/index/city-list/city-list",
  29 + "pages/index/recommend-list/recommend-list"
29 ], 30 ],
30 "window": { 31 "window": {
31 "backgroundTextStyle": "light", 32 "backgroundTextStyle": "light",
@@ -56,7 +56,7 @@ Page({ @@ -56,7 +56,7 @@ Page({
56 }, 56 },
57 //输入最高人数失去焦点时 57 //输入最高人数失去焦点时
58 maxNumBlur() { 58 maxNumBlur() {
59 - if(+this.data.min_num >= +this.data.max_num) { 59 + if(+this.data.min_num > +this.data.max_num) {
60 wx.showToast({title:'最高人数要大于最低人数',icon:'none'}); 60 wx.showToast({title:'最高人数要大于最低人数',icon:'none'});
61 this.setData({max_num:''}); 61 this.setData({max_num:''});
62 } 62 }
@@ -100,6 +100,7 @@ Page({ @@ -100,6 +100,7 @@ Page({
100 let end_time = app.preTime(this.data.date + ' ' +this.data.time, this.data.over_time);//截止时间 100 let end_time = app.preTime(this.data.date + ' ' +this.data.time, this.data.over_time);//截止时间
101 let endTime = new Date(end_time).getTime(); //截止时间戳 101 let endTime = new Date(end_time).getTime(); //截止时间戳
102 // console.log('newTime', 'endTime', 'end_time', endTime - newTime >=0,newTime, endTime, end_time,this.data.date + ' ' +this.data.time); 102 // console.log('newTime', 'endTime', 'end_time', endTime - newTime >=0,newTime, endTime, end_time,this.data.date + ' ' +this.data.time);
  103 + console.log('开始时间和截止时间',this.data.date + ' ' +this.data.time,end_time);
103 if (endTime - newTime <= 0) { //不可发布目前时间到截止小时內的订单 104 if (endTime - newTime <= 0) { //不可发布目前时间到截止小时內的订单
104 wx.showToast({title:'截止时间无效',icon:'none'}); 105 wx.showToast({title:'截止时间无效',icon:'none'});
105 this.setData({over_time:''}) 106 this.setData({over_time:''})
@@ -69,12 +69,9 @@ @@ -69,12 +69,9 @@
69 <view class="title-box"> 69 <view class="title-box">
70 <view class="title">{{detail.title}}</view> 70 <view class="title">{{detail.title}}</view>
71 <view class="over-time"> 71 <view class="over-time">
72 - <text class='' wx:if="{{detail.time[0].day !== '00'}}">  
73 - {{detail.time[0].day}}天{{detail.time[0].hou}}:{{detail.time[0].min}}:{{detail.time[0].sec}}  
74 - </text>  
75 - <text class='' wx:else="">{{detail.time[0].hou}}:{{detail.time[0].min}}:{{detail.time[0].sec}}  
76 - </text>  
77 - 后结束 72 + <text class='' wx:if="{{detail.time[0].day !== '00'}}">{{detail.time[0].day}}天{{detail.time[0].hou}}:{{detail.time[0].min}}:{{detail.time[0].sec}}</text>
  73 + <text class='' wx:else="">{{detail.time[0].hou}}:{{detail.time[0].min}}:{{detail.time[0].sec}}</text>
  74 + <text class="text">后结束</text>
78 </view> 75 </view>
79 <!--<view>--> 76 <!--<view>-->
80 <!--<text class=''>{{detail.time[0].hou}}</text>--> 77 <!--<text class=''>{{detail.time[0].hou}}</text>-->
@@ -159,9 +159,11 @@ swiper { @@ -159,9 +159,11 @@ swiper {
159 font-size: 28rpx; 159 font-size: 28rpx;
160 } 160 }
161 .area-box .title-box .over-time { 161 .area-box .title-box .over-time {
162 - /* width: 34%; */  
163 - color: #999999;  
164 - font-size: 22rpx; 162 + width: 40%;
  163 + text-align: right;
  164 + display: flex;
  165 + align-items: center;
  166 + justify-content: flex-end;
165 } 167 }
166 .area-box .title-box .over-time text { 168 .area-box .title-box .over-time text {
167 text-align: right; 169 text-align: right;
@@ -169,6 +171,10 @@ swiper { @@ -169,6 +171,10 @@ swiper {
169 font-size: 24rpx; 171 font-size: 24rpx;
170 margin-right: 18rpx; 172 margin-right: 18rpx;
171 } 173 }
  174 +.area-box .title-box .over-time .text {
  175 + color: #999999;
  176 + font-size: 20rpx;
  177 +}
172 .area-content { 178 .area-content {
173 color: #666666; 179 color: #666666;
174 font-size: 24rpx; 180 font-size: 24rpx;
@@ -212,7 +218,7 @@ swiper { @@ -212,7 +218,7 @@ swiper {
212 box-sizing: border-box; 218 box-sizing: border-box;
213 display: flex; 219 display: flex;
214 align-items: center; 220 align-items: center;
215 - justify-content: space-between; 221 + justify-content: flex-start;
216 overflow-x: scroll; 222 overflow-x: scroll;
217 /* display: -webkit-box; */ 223 /* display: -webkit-box; */
218 -webkit-overflow-scrolling: touch; 224 -webkit-overflow-scrolling: touch;
@@ -223,7 +229,7 @@ swiper { @@ -223,7 +229,7 @@ swiper {
223 flex-direction: column; 229 flex-direction: column;
224 align-items: center; 230 align-items: center;
225 justify-content: center; 231 justify-content: center;
226 - /* margin-right: 60rpx; */ 232 + margin-right: 30rpx;
227 } 233 }
228 .people:nth-last-child(1){ 234 .people:nth-last-child(1){
229 margin-right: 0; 235 margin-right: 0;
1 { 1 {
  2 + "navigationBarTitleText": "专题页",
2 "usingComponents": {} 3 "usingComponents": {}
3 } 4 }
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <view class="content"> 2 <view class="content">
3 <image src="{{pic}}" class="banner" mode="widthFix"></image> 3 <image src="{{pic}}" class="banner" mode="widthFix"></image>
4 <view class='content_box'> 4 <view class='content_box'>
5 - <view class="no-data" wx:if="{{list.length === 0}}">暂无活动</view> 5 + <!-- <view class="no-data" wx:if="{{list.length === 0}}">暂无活动</view> -->
6 <view class='content_item' wx:for='{{list}}' wx:key="index" wx:if="{{list.length>0}}" 6 <view class='content_item' wx:for='{{list}}' wx:key="index" wx:if="{{list.length>0}}"
7 bindtap='goPostDetail' data-id="{{item.id}}" data-type="{{item.type}}"> 7 bindtap='goPostDetail' data-id="{{item.id}}" data-type="{{item.type}}">
8 <!--<image src="http://pk86rwhci.bkt.clouddn.com/activity_img@2x.png"></image>--> 8 <!--<image src="http://pk86rwhci.bkt.clouddn.com/activity_img@2x.png"></image>-->
  1 +// pages/index/recommend-list/recommend-list.js
  2 +Page({
  3 +
  4 + /**
  5 + * 页面的初始数据
  6 + */
  7 + data: {
  8 +
  9 + },
  10 +
  11 + /**
  12 + * 生命周期函数--监听页面加载
  13 + */
  14 + onLoad: function (options) {
  15 +
  16 + },
  17 +
  18 + /**
  19 + * 生命周期函数--监听页面初次渲染完成
  20 + */
  21 + onReady: function () {
  22 +
  23 + },
  24 +
  25 + /**
  26 + * 生命周期函数--监听页面显示
  27 + */
  28 + onShow: function () {
  29 +
  30 + },
  31 +
  32 + /**
  33 + * 生命周期函数--监听页面隐藏
  34 + */
  35 + onHide: function () {
  36 +
  37 + },
  38 +
  39 + /**
  40 + * 生命周期函数--监听页面卸载
  41 + */
  42 + onUnload: function () {
  43 +
  44 + },
  45 +
  46 + /**
  47 + * 页面相关事件处理函数--监听用户下拉动作
  48 + */
  49 + onPullDownRefresh: function () {
  50 +
  51 + },
  52 +
  53 + /**
  54 + * 页面上拉触底事件的处理函数
  55 + */
  56 + onReachBottom: function () {
  57 +
  58 + },
  59 +
  60 + /**
  61 + * 用户点击右上角分享
  62 + */
  63 + onShareAppMessage: function () {
  64 +
  65 + }
  66 +})
  1 +{
  2 + "navigationBarTitleText": "推荐页",
  3 + "usingComponents": {}
  4 +}
  1 +<!--pages/index/recommend-list/recommend-list.wxml-->
  2 +<view class="content">
  3 + <image src="../../../images/long-img.jpg" mode="widthFix" class="image"></image>
  4 +</view>
  1 +/* pages/index/recommend-list/recommend-list.wxss */
  2 +.content {
  3 + padding: 20rpx;
  4 + -webkit-box-sizing: border-box;
  5 + -moz-box-sizing: border-box;
  6 + box-sizing: border-box;
  7 +}
  8 +.image {
  9 + width: 100%;
  10 + height: auto;
  11 +}
@@ -65,11 +65,9 @@ @@ -65,11 +65,9 @@
65 <view class="title-box"> 65 <view class="title-box">
66 <view class="title">{{detail.title}}</view> 66 <view class="title">{{detail.title}}</view>
67 <view class="over-time"> 67 <view class="over-time">
68 - <text class='' wx:if="{{detail.time[0].day !== '00'}}">  
69 - {{detail.time[0].day}}天{{detail.time[0].hou}}:{{detail.time[0].min}}:{{detail.time[0].sec}}  
70 - </text> 68 + <text class='' wx:if="{{detail.time[0].day !== '00'}}">{{detail.time[0].day}}天{{detail.time[0].hou}}:{{detail.time[0].min}}:{{detail.time[0].sec}}</text>
71 <text class='' wx:else="">{{detail.time[0].hou}}:{{detail.time[0].min}}:{{detail.time[0].sec}}</text> 69 <text class='' wx:else="">{{detail.time[0].hou}}:{{detail.time[0].min}}:{{detail.time[0].sec}}</text>
72 - 后结束 70 + <text class="text">后结束</text>
73 </view> 71 </view>
74 <!--<view>--> 72 <!--<view>-->
75 <!--<text class=''>{{detail.time[0].hou}}</text>--> 73 <!--<text class=''>{{detail.time[0].hou}}</text>-->
@@ -153,22 +153,23 @@ swiper { @@ -153,22 +153,23 @@ swiper {
153 justify-content: space-between; 153 justify-content: space-between;
154 margin-bottom: 26rpx; 154 margin-bottom: 26rpx;
155 } 155 }
156 -.area-box .title-box .title {  
157 - width:55%;  
158 - color: #333333;  
159 - font-size: 28rpx;  
160 -}  
161 .area-box .title-box .over-time { 156 .area-box .title-box .over-time {
162 - /* width:34%; */  
163 - color: #999999;  
164 - font-size: 22rpx;  
165 - /* flex:1; */ 157 + width: 40%;
  158 + text-align: right;
  159 + display: flex;
  160 + align-items: center;
  161 + justify-content: flex-end;
166 } 162 }
167 .area-box .title-box .over-time text { 163 .area-box .title-box .over-time text {
  164 + text-align: right;
168 color:#DA4F2A; 165 color:#DA4F2A;
169 font-size: 24rpx; 166 font-size: 24rpx;
170 margin-right: 18rpx; 167 margin-right: 18rpx;
171 } 168 }
  169 +.area-box .title-box .over-time .text {
  170 + color: #999999;
  171 + font-size: 20rpx;
  172 +}
172 .area-content { 173 .area-content {
173 color: #666666; 174 color: #666666;
174 font-size: 24rpx; 175 font-size: 24rpx;
@@ -245,7 +246,7 @@ swiper { @@ -245,7 +246,7 @@ swiper {
245 align-items: center; 246 align-items: center;
246 } 247 }
247 .people-num .name { 248 .people-num .name {
248 - /* width:100rpx; */ 249 + max-width:100rpx;
249 margin-right:10rpx; 250 margin-right:10rpx;
250 text-align: center; 251 text-align: center;
251 /* margin-right: 10rpx; */ 252 /* margin-right: 10rpx; */
@@ -53,7 +53,7 @@ Page({ @@ -53,7 +53,7 @@ Page({
53 //输入最高人数失去焦点时 53 //输入最高人数失去焦点时
54 maxNumBlur() { 54 maxNumBlur() {
55 console.log('最低人数-最高人数',+this.data.min_num, +this.data.max_num,this.data.min_num>this.data.max_num,+this.data.min_num>+this.data.max_num); 55 console.log('最低人数-最高人数',+this.data.min_num, +this.data.max_num,this.data.min_num>this.data.max_num,+this.data.min_num>+this.data.max_num);
56 - if(+this.data.min_num >= +this.data.max_num) { 56 + if(+this.data.min_num > +this.data.max_num) {
57 wx.showToast({title:'最高人数要大于最低人数',icon:'none'}); 57 wx.showToast({title:'最高人数要大于最低人数',icon:'none'});
58 this.setData({max_num:''}); 58 this.setData({max_num:''});
59 } 59 }
@@ -293,9 +293,9 @@ Page({ @@ -293,9 +293,9 @@ Page({
293 this.setData({over_time:''}); 293 this.setData({over_time:''});
294 }else { 294 }else {
295 let newTime = new Date().getTime();//当前时间戳 295 let newTime = new Date().getTime();//当前时间戳
296 - let end_time = app.preTime(this.data.date + ' ' +this.data.time, this.data.over_time);//截止时间 296 + let end_time = app.preTime(this.data.date + ' ' +this.data.time, +this.data.over_time);//截止时间
297 let endTime = new Date(end_time).getTime(); //截止时间戳 297 let endTime = new Date(end_time).getTime(); //截止时间戳
298 - // console.log('newTime', 'endTime', 'end_time', newTime, endTime, end_time,this.data.date + ' ' +this.data.time); 298 + console.log('开始时间和截止时间',this.data.date + ' ' +this.data.time,end_time);
299 if (endTime - newTime <= 0) { //不可发布目前时间到截止小时內的订单 299 if (endTime - newTime <= 0) { //不可发布目前时间到截止小时內的订单
300 wx.showToast({title:'截止时间无效',icon:'none'}); 300 wx.showToast({title:'截止时间无效',icon:'none'});
301 this.setData({over_time:''}) 301 this.setData({over_time:''})
@@ -32,7 +32,7 @@ Page({ @@ -32,7 +32,7 @@ Page({
32 * 生命周期函数--监听页面加载 32 * 生命周期函数--监听页面加载
33 */ 33 */
34 onLoad: function (options) { 34 onLoad: function (options) {
35 - 35 + this.setData({nickName:app.globalData.userInfo.nickName})
36 }, 36 },
37 37
38 /** 38 /**
@@ -9,14 +9,14 @@ @@ -9,14 +9,14 @@
9 <image src="../../../images/quxiao@2x.png" wx:if="{{item.status === 10}}" class="flag-img"></image> 9 <image src="../../../images/quxiao@2x.png" wx:if="{{item.status === 10}}" class="flag-img"></image>
10 <view class="detail {{item.status === 6?'change-color':''}}"> 10 <view class="detail {{item.status === 6?'change-color':''}}">
11 <view class="area"> 11 <view class="area">
12 - <text class="addr">{{item.addr}}</text>  
13 - <text>{{item.userName}}</text> 12 + <text class="addr">{{item.title}}</text>
  13 + <text>{{nickName}}</text>
14 </view> 14 </view>
15 <view class="time"> 15 <view class="time">
16 <text>时间：{{item.time}}</text> 16 <text>时间：{{item.time}}</text>
17 </view> 17 </view>
18 <view class="address"> 18 <view class="address">
19 - <text class="addr">地址：{{item.address}}</text> 19 + <text class="addr">地点：{{item.addr}}</text>
20 <text>{{item.number}}人</text> 20 <text>{{item.number}}人</text>
21 </view> 21 </view>
22 </view> 22 </view>
@@ -92,6 +92,7 @@ Page({ @@ -92,6 +92,7 @@ Page({
92 console.log('完成订单', res); 92 console.log('完成订单', res);
93 if (+res.code === 1) { 93 if (+res.code === 1) {
94 wx.showToast({title:'订单已完成',icon:'none'}); 94 wx.showToast({title:'订单已完成',icon:'none'});
  95 + self.getOrderDetail();
95 // self.setData({ 96 // self.setData({
96 // detail: res.data, 97 // detail: res.data,
97 // }); 98 // });
@@ -53,16 +53,20 @@ @@ -53,16 +53,20 @@
53 <text class="cancel-btn" wx:if="{{detail.status === 2}}" bindtap="cancel">取消订单</text> 53 <text class="cancel-btn" wx:if="{{detail.status === 2}}" bindtap="cancel">取消订单</text>
54 <text class="cancel-btn gray" wx:if="{{detail.status === 2}}">待拼成</text> 54 <text class="cancel-btn gray" wx:if="{{detail.status === 2}}">待拼成</text>
55 <!--<text class="cancel-btn gray" wx:if="{{detail.status === 8}}">已拼成</text>--> 55 <!--<text class="cancel-btn gray" wx:if="{{detail.status === 8}}">已拼成</text>-->
56 - <text class="confirm-btn" wx:if="{{detail.status === 4}}" bindtap="confirm">完成</text>  
57 - <text class="confirm-btn gray" wx:if="{{detail.status === 4}}">待完成</text>  
58 <!--1发布人，2拼餐/拼活动人--> 56 <!--1发布人，2拼餐/拼活动人-->
59 <block wx:if="{{detail.sonType === 1}}"> 57 <block wx:if="{{detail.sonType === 1}}">
60 - <text class="confirm-btn" wx:if="{{detail.status === 8}}" bindtap="cancel">取消订单</text> 58 + <text class="confirm-btn" wx:if="{{detail.status === 3 || detail.status === 8}}" bindtap="cancel">取消订单</text><!--开始前6小时内不能取消-->
61 <text class="cancel-btn gray" wx:if="{{detail.status === 8}}">待完成</text> 59 <text class="cancel-btn gray" wx:if="{{detail.status === 8}}">待完成</text>
  60 + <text class="cancel-btn gray" wx:if="{{detail.status === 3}}">未拼成</text>
  61 + <text class="confirm-btn add-width" wx:if="{{detail.status === 4}}" bindtap="confirm">完成</text><!--待完成时并且活动时间已开始，发布人可点击完成,发布人只显示完成按钮-->
  62 + <text class="confirm-btn add-width gray" wx:if="{{detail.status === 6}}">已完成</text>
62 </block> 63 </block>
63 <block wx:if="{{detail.sonType === 2}}"> 64 <block wx:if="{{detail.sonType === 2}}">
64 - <text class="cancel-btn gray border" wx:if="{{detail.status === 8}}">取消订单</text>  
65 - <text class="cancel-btn gray" wx:if="{{detail.status === 8}}">待完成</text> 65 + <!--<text class="cancel-btn gray border" wx:if="{{detail.status === 8}}">取消订单</text>-->
  66 + <text class="cancel-btn gray add-width" wx:if="{{detail.status === 8}}">待完成</text>
  67 + <text class="confirm-btn gray add-width" wx:if="{{detail.status === 3}}">未拼成</text>
  68 + <text class="confirm-btn gray add-width" wx:if="{{detail.status === 4}}">待完成</text>
  69 + <text class="confirm-btn add-width gray" wx:if="{{detail.status === 6}}">已完成</text>
66 </block> 70 </block>
67 </view> 71 </view>
68 </view> 72 </view>
@@ -150,6 +150,9 @@ @@ -150,6 +150,9 @@
150 color: #E1C8AF; 150 color: #E1C8AF;
151 border:0; 151 border:0;
152 } 152 }
  153 +.bottom .add-width {
  154 + width: 100%;
  155 +}
153 .bottom .border { 156 .bottom .border {
154 border-right: 1rpx solid #fff; 157 border-right: 1rpx solid #fff;
155 } 158 }
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 <!--<image src="../../images/lishi@2x.png" class="thumb"></image>--> 17 <!--<image src="../../images/lishi@2x.png" class="thumb"></image>-->
18 <image src="{{item.pic}}" class="thumb" mode="aspectFill"></image> 18 <image src="{{item.pic}}" class="thumb" mode="aspectFill"></image>
19 <view class="lish-right"> 19 <view class="lish-right">
20 - <!--（0全部，2待拼成，3人数不足未拼成,4已拼成，5已取消(未拼成取消)，6已完成，7已评价，8已拼成（活动未结束）,9删除，10已取消（发起人已拼成后取消）--> 20 + <!--（0全部，2待拼成，3人数不足未拼成,4已拼成，5已取消(未拼成取消)，6已完成，7已评价，8已拼成（活动未结束）,9删除，10已取消（发起人已拼成后取消）,11已过期-->
21 <view class="title-box"> 21 <view class="title-box">
22 <view class="title">{{item.title}}</view> 22 <view class="title">{{item.title}}</view>
23 <text wx:if="{{item.status === 2}}" class="state">待拼成</text> 23 <text wx:if="{{item.status === 2}}" class="state">待拼成</text>
@@ -47,8 +47,8 @@ @@ -47,8 +47,8 @@
47 <block wx:if="{{item.type === 1}}"> 47 <block wx:if="{{item.type === 1}}">
48 <text wx:if="{{item.status === 11 || item.status === 5 || item.status === 10 || item.status === 6 || item.status === 3 || item.status === 7}}" 48 <text wx:if="{{item.status === 11 || item.status === 5 || item.status === 10 || item.status === 6 || item.status === 3 || item.status === 7}}"
49 catchtap="del" data-id="{{item.id}}">删除</text> 49 catchtap="del" data-id="{{item.id}}">删除</text>
  50 + <text wx:if="{{item.status === 4}}" catchtap="complete" data-id="{{item.id}}">完成</text>
50 </block> 51 </block>
51 - <text wx:if="{{item.status === 4}}" catchtap="complete" data-id="{{item.id}}">完成</text>  
52 </view> 52 </view>
53 </view> 53 </view>
54 </view> 54 </view>