Просмотр исходного кода

制作单的排序和备注问题

shish 4 лет назад
Родитель
Сommit
3b2432e627

+ 2 - 3
hdPad/src/pages/home/components/workInfo.vue

@@ -12,9 +12,8 @@
         <view v-if="orderInfo.hasReachTime == 1"><text class="left">配送</text>
         <view v-if="orderInfo.hasReachTime == 1"><text class="left">配送</text>
           <text class="right" style="color:red;font-weight:bold;">{{orderInfo.reachDate == today ? '今天' : orderInfo.reachDate.substr(5,9)}} {{orderInfo.reachPeriod == 0 ? '上午':orderInfo.reachPeriod==1?'下午':orderInfo.reachPeriod==2?'晚上':'其它'}}</text>
           <text class="right" style="color:red;font-weight:bold;">{{orderInfo.reachDate == today ? '今天' : orderInfo.reachDate.substr(5,9)}} {{orderInfo.reachPeriod == 0 ? '上午':orderInfo.reachPeriod==1?'下午':orderInfo.reachPeriod==2?'晚上':'其它'}}</text>
         </view>
         </view>
-        <view v-if="!$util.isEmpty(orderInfo.remark)">
-          <text class="left">备注</text>
-          <text class="right" style="color:red;font-weight:bold;">{{orderInfo.remark}}</text>
+        <view v-if="!$util.isEmpty(orderInfo.remark)" style="height:35upx;">
+          <text class="right" style="color:red;font-weight:bold;width:190upx;">{{orderInfo.remark}}</text>
         </view>
         </view>
         <view v-if="Number(orderInfo.orderPrice)>0">
         <view v-if="Number(orderInfo.orderPrice)>0">
           <text class="left">订单金额</text>
           <text class="left">订单金额</text>

+ 2 - 2
hdPad/src/pages/home/components/workList.vue

@@ -2,9 +2,9 @@
     <view class="itemList-box">
     <view class="itemList-box">
         <view class="title">列表</view>
         <view class="title">列表</view>
         <view class="order-status">
         <view class="order-status">
-            <view @tap="changeStatus('')" :class="[{'checked':status===''}]">全部</view>
             <view @tap="changeStatus(0)" :class="[{'checked':status===0}]">待完成</view>
             <view @tap="changeStatus(0)" :class="[{'checked':status===0}]">待完成</view>
             <view @tap="changeStatus(1)" :class="[{'checked':status===1}]">已完成</view>
             <view @tap="changeStatus(1)" :class="[{'checked':status===1}]">已完成</view>
+            <view @tap="changeStatus('')" :class="[{'checked':status===''}]">全部</view>
         </view>
         </view>
         <scroll-view class="itemList-item_box" scroll-y="true" @scrolltolower="reachBottom" lower-threshold="50" refresher-enabled="true" 
         <scroll-view class="itemList-item_box" scroll-y="true" @scrolltolower="reachBottom" lower-threshold="50" refresher-enabled="true" 
         :refresher-triggered="triggered" @refresherrefresh="onRefresh" @refresherrestore="onRestore">
         :refresher-triggered="triggered" @refresherrefresh="onRefresh" @refresherrestore="onRestore">
@@ -47,7 +47,7 @@ export default {
             currentJobType:'bill',
             currentJobType:'bill',
             currentJobId:0,
             currentJobId:0,
             groupList:[],
             groupList:[],
-            status:'',
+            status:0,
             selectOrderId:0,
             selectOrderId:0,
             triggered:false,
             triggered:false,
             _freshing: false,
             _freshing: false,