优化发起人订单删除状态

wumengyu
pages/order/order.wxml
--- a/pages/order/order.wxml
查看文件 @c91f9eb
+++ b/pages/order/order.wxml
查看文件 @c91f9eb
@@ -17,7 +17,7 @@
         <!--<image src="../../images/lishi@2x.png" class="thumb"></image>-->
         <image src="{{item.pic}}" class="thumb" mode="aspectFill"></image>
         <view class="lish-right">
-            <!--（0全部，2待拼成，3人数不足未拼成,4已拼成，5已取消，6已完成，7已评价，8已拼成（活动未结束）,9删除-->
+            <!--（0全部，2待拼成，3人数不足未拼成,4已拼成，5已取消，6已完成，7已评价，8已拼成（活动未结束）,9删除，10已取消（发起人已拼成后取消）-->
             <view class="title-box">
                 <view class="title">{{item.title}}</view>
                 <text wx:if="{{item.status === 2}}" class="state">待拼成</text>
@@ -32,22 +32,32 @@
                 <view class="name-left">
                     <!--<image src="../../images/avatar@2x.png" class="avatar"></image>-->
                     <image src="{{item.userPic}}" class="avatar"></image>
-                    <image src="{{item.userSex === 1?'../../images/man.png':'../../images/women.png'}}" class="sex-icon"></image>
+                    <image src="{{item.userSex === 1?'../../images/man.png':'../../images/women.png'}}"
+                           class="sex-icon"></image>
                     <text>{{item.userName}}</text>
                 </view>
                 <view class="btn">
-                    <text wx:if="{{item.status === 5 || item.status === 6 || item.status === 3 || item.status === 7}}" catchtap="cancel" data-id="{{item.id}}">删除</text>
-                    <text wx:if="{{item.status === 4}}"  catchtap="complete" data-id="{{item.id}}">完成</text>
+                    <!--2参与人-->
+                    <block wx:if="{{item.type === 2}}">
+                        <text wx:if="{{item.status === 5 || item.status === 6 || item.status === 3 || item.status === 7}}"
+                              catchtap="cancel" data-id="{{item.id}}">删除</text>
+                    </block>
+                    <!--1发起人-->
+                    <block wx:if="{{item.type === 1}}">
+                        <text wx:if="{{item.status === 10 || item.status === 6 || item.status === 3 || item.status === 7}}"
+                              catchtap="cancel" data-id="{{item.id}}">删除</text>
+                    </block>
+                    <text wx:if="{{item.status === 4}}" catchtap="complete" data-id="{{item.id}}">完成</text>
                 </view>
             </view>
         </view>
     </view>
 </view>
 <!--底部tab-->
-<import src="/templates/templates.wxml" />
-<template is="tabBar" data='{{...tabcurrent}}' />
+<import src="/templates/templates.wxml"/>
+<template is="tabBar" data='{{...tabcurrent}}'/>
 <!--去答题弹框-->
-<view class="input-box"  wx:if="{{is_showAnswer}}" catchtouchmove="disableScroll">
+<view class="input-box" wx:if="{{is_showAnswer}}" catchtouchmove="disableScroll">
     <image class="sorry-img" src="../../images/sorry@2x.png"></image>
     <view class="title">目前只对</view>
     <view class="title">首批会员开放发布功能</view>
@@ -56,7 +66,7 @@
 </view>
 <view class="modal_box" wx:if="{{is_showAnswer}}" bindtap="handleBackground" catchtouchmove="disableScroll"></view>
 <!--去完善个人信息弹框-->
-<view class="input-box"  wx:if="{{is_showUserInfo}}" catchtouchmove="disableScroll">
+<view class="input-box" wx:if="{{is_showUserInfo}}" catchtouchmove="disableScroll">
     <image class="sorry-img" src="../../images/user_info@2x.png"></image>
     <view class="title">为了更好的体验</view>
     <view class="title">请先完善个人信息</view>
@@ -65,7 +75,7 @@
 <view class="modal_box" wx:if="{{is_showUserInfo}}" bindtap="handleBackground" catchtouchmove="disableScroll"></view>
 <!--发布-->
 <view class="release-btn-box" wx:if="{{is_showRelease}}">
-    <view class="left-btn"  bindtap="releaseMeal">
+    <view class="left-btn" bindtap="releaseMeal">
         <image src="../../images/pincan@2x.png"></image>
         <view class="text">发布拼餐</view>
     </view>
@@ -76,7 +86,7 @@
 </view>
 <view class="modal_box" wx:if="{{is_showRelease}}" bindtap="handleBackground" catchtouchmove="disableScroll"></view>
 <!--分数>=80弹框-->
-<view class="input-box score-box"  wx:if="{{show_gold_modal}}" catchtouchmove="disableScroll">
+<view class="input-box score-box" wx:if="{{show_gold_modal}}" catchtouchmove="disableScroll">
     <image class="sorry-img gold-img" src="../../images/gold@2x.png"></image>
     <view class="title text">恭喜您</view>
     <view class="title text">获得首批入场卷</view>
@@ -90,7 +100,7 @@
 <view class="modal_box" wx:if="{{show_gold_modal}}" bindtap="handleBackground" catchtouchmove="disableScroll"></view>
 <!--分数<80弹框-->
-<view class="input-box score-box normal-box"  wx:if="{{show_normal_modal}}" catchtouchmove="disableScroll">
+<view class="input-box score-box normal-box" wx:if="{{show_normal_modal}}" catchtouchmove="disableScroll">
     <image class="sorry-img img" src="../../images/achieve-answer-img@2x.png"></image>
     <view class="title text margin">恭喜您获得入场卷</view>
     <view class="title text margin">等待开放权限</view>