按钮排版

hdApp/src/admin/home/components/order-item.vue

@@ -5,7 +5,7 @@
 				<view class="image">
 					<image :src="info.cover" mode="aspectFit"></image>
 				</view>
-				<image class="scan-icon" :src="`${constant.imgUrl}/gathering/scan.jpg`" mode="aspectFit"></image>
+				<image class="scan-icon" v-if="info.repeat == 1 && info.payStatus == 1" :src="`${constant.imgUrl}/gathering/scan.jpg`" mode="aspectFit"></image>
 				<view class="list-msg">
 					<view><text>客户：</text><text>{{info.customName||''}}</text></view>
 					<view style="margin-top:3upx;"><text>配送：</text>
@@ -33,7 +33,6 @@
 						<text>备注：</text>
 						<text style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:420upx;display:inline-block;line-height:27upx;">{{info.remark||''}}</text>
 					</view>
-
 				</view>
 			</view>
 		</block>

hdApp/src/admin/home/order.vue

@@ -39,17 +39,16 @@
         @click.stop="$util.pageTo({url:'/admin/order/itemOrder?ids='+item.sameTimeIds})">
           本客户共有{{item.sameTimeIdsNum?item.sameTimeIdsNum:0}}个订单，可合并发货
         </view>
-
             <view class="list-button">
               <view class="admin-button-com middle" v-if="item.status == 2" @click.stop="">扣库存</view>
-                <view class="admin-button-com middle" v-if="item.status == 2" @click.stop="sendOrderFn(item)">发货</view>
-                <view class="admin-button-com default" v-else>发货</view>
-                <view class="admin-button-com middle" v-if="item.payStatus == 1" @click.stop="printOrder(item)">打印</view>
-                <view class="admin-button-com default" v-else>打印</view>
-                <view class="admin-button-com middle" v-if="item.sendStatus == '0' && (item.status > 1 && item.status < 4)" @click.stop="openExpressPage(item.id, true)">配送</view>
-                <view class="admin-button-com default" v-if="item.sendStatus == '1' && (item.status > 1 && item.status < 4)" @click.stop="cancelExpress(item.id)" style="background-color: #ff6b6b;">取消配送</view>
-                <view class="admin-button-com middle" v-if="item.sendStatus == '3' && (item.status > 1 && item.status < 4)" @click.stop="openExpressPage(item.id, false)">重新配送</view>
-                <view class="admin-button-com middle" v-if="item.sendStatus == '2' && item.status == 4" @click.stop="selectExpress(item.id)">配送成功</view>
+              <view class="admin-button-com middle" v-if="item.status == 2" @click.stop="sendOrderFn(item)">发货</view>
+              <view class="admin-button-com default" v-else>发货</view>
+              <view class="admin-button-com middle" v-if="item.payStatus == 1" @click.stop="printOrder(item)">打印</view>
+              <view class="admin-button-com default" v-else>打印</view>
+              <view class="admin-button-com middle" v-if="item.sendStatus == '0' && (item.status > 1 && item.status < 4)" @click.stop="openExpressPage(item.id, true)">配送</view>
+              <view class="admin-button-com default" v-if="item.sendStatus == '1' && (item.status > 1 && item.status < 4)" @click.stop="cancelExpress(item.id)" style="background-color: #ff6b6b;">取消配送</view>
+              <view class="admin-button-com middle" v-if="item.sendStatus == '3' && (item.status > 1 && item.status < 4)" @click.stop="openExpressPage(item.id, false)">重新配送</view>
+              <view class="admin-button-com middle" v-if="item.sendStatus == '2' && item.status == 4" @click.stop="selectExpress(item.id)">配送成功</view>
             </view>
           </view>
         </view>
@@ -314,9 +313,13 @@ export default {
         }
         .list-button {
           margin-top: 26upx;
+          display: flex;
+          justify-content: flex-end;
+          flex-wrap: nowrap;
           .admin-button-com {
-            margin-left: 50upx;
-            padding:20upx 30upx;
+            margin-left: 20upx;
+            padding: 16upx 20upx;
+            white-space: nowrap;
           }
         }
       }