no message

src/packageWorkorder/pages/orderDetail.vue

@@ -607,70 +607,64 @@
       <Loading :type="3" :loadStatus="loadStatus" :isLoadAnimation="false" />
 
       <template slot="footer">
-        <view class="bottom-container">
-          <view class="left" style="width: 100%" v-if="detail">
-            <!-- 待抢单 -->
-            <block v-if="orderStatus_v == 'DQD' && (detail.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)">
-              <u-button type="primary" text="抢单" @tap="qdOrder(detail)"></u-button>
-            </block>
-          </view>
-          <view class="right" v-if="detail">
-            <!-- 待接单 -->
-            <block v-if="orderStatus_v == 'DJD'">
-              <u-button
-                plain
-                type="primary"
-                text="配件申请"
-                v-if="detail.orderType != 'INSTALL'"
-                @tap="toPartsApply()"
-              ></u-button>
-              <u-button
-                plain
-                type="primary"
-                text="取消加急"
-                @tap="actionUrgent(false)"
-                v-if="detail.pgOrderFlags && detail.pgOrderFlags.some(o => o.tag == 'JIA_JI')"
-              ></u-button>
-              <u-button plain type="primary" text="加急" @tap="actionUrgent(true)" v-else></u-button>
-            </block>
-
+        <view class="bottom-container" v-if="detail">
+          <!-- 待抢单 -->
+          <block v-if="orderStatus_v == 'DQD' && (detail.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)">
+            <u-button type="primary" text="抢单" @tap="qdOrder(detail)"></u-button>
+          </block>
+          <u-button
+            v-if="
+              (orderStatus_v == 'DJD' || (detail.isImportExcel && !detail.isMeet)) &&
+              (detail.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)
+            "
+            type="primary"
+            text="接单"
+            @tap="actionReceive()"
+          ></u-button>
+          <!-- 待接单 -->
+          <block v-if="orderStatus_v == 'DJD'">
             <u-button
-              v-if="
-                (orderStatus_v == 'DJD' || (detail.isImportExcel && !detail.isMeet)) &&
-                (detail.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)
-              "
+              plain
               type="primary"
-              text="接单"
-              @tap="actionReceive()"
+              text="配件申请"
+              v-if="detail.orderType != 'INSTALL'"
+              @tap="toPartsApply()"
             ></u-button>
-
-            <!-- 服务中 -->
-            <block v-if="orderStatus_v == 'FWZ' || orderStatus_v == 'YCD'">
-              <u-button
-                v-if="userInfo.workerNumber == detail.workerNumber"
-                plain
-                type="primary"
-                text="变更小工"
-                @tap="biangengxiaogong()"
-              ></u-button>
-              <u-button
-                plain
-                type="primary"
-                text="配件申请"
-                v-if="detail.orderType != 'INSTALL'"
-                @tap="toPartsApply()"
-              ></u-button>
-              <u-button
-                plain
-                type="primary"
-                text="辅材收费"
-                @tap="toCharge('M')"
-                v-if="detail.orderType == 'INSTALL'"
-              ></u-button>
-              <u-button plain type="primary" text="配件收费" @tap="toCharge('P')" v-else></u-button>
-              <u-button type="primary" text="过程反馈" @tap="toFeedback()"></u-button>
-            </block>
-          </view>
+            <u-button
+              plain
+              type="primary"
+              text="取消加急"
+              @tap="actionUrgent(false)"
+              v-if="detail.pgOrderFlags && detail.pgOrderFlags.some(o => o.tag == 'JIA_JI')"
+            ></u-button>
+            <u-button plain type="primary" text="加急" @tap="actionUrgent(true)" v-else></u-button>
+          </block>
+          <!-- 服务中 -->
+          <block v-if="orderStatus_v == 'FWZ' || orderStatus_v == 'YCD'">
+            <u-button
+              v-if="userInfo.workerNumber == detail.workerNumber"
+              plain
+              type="primary"
+              text="变更小工"
+              @tap="biangengxiaogong()"
+            ></u-button>
+            <u-button
+              plain
+              type="primary"
+              text="配件申请"
+              v-if="detail.orderType != 'INSTALL'"
+              @tap="toPartsApply()"
+            ></u-button>
+            <u-button
+              plain
+              type="primary"
+              text="辅材收费"
+              @tap="toCharge('M')"
+              v-if="detail.orderType == 'INSTALL'"
+            ></u-button>
+            <u-button plain type="primary" text="配件收费" @tap="toCharge('P')" v-else></u-button>
+            <u-button type="primary" text="过程反馈" @tap="toFeedback()"></u-button>
+          </block>
         </view>
       </template>
     </zj-page-layout>
@@ -1356,9 +1350,9 @@ export default {
     align-items: center;
     flex-wrap: wrap;
     ::v-deep .u-button {
-      width: 190rpx;
+      width: 175rpx;
       margin: 0;
-      margin-left: 20rpx;
+      margin-left: 10rpx;
     }
     text {
       font-size: 28rpx;
@@ -1712,17 +1706,20 @@ export default {
 }
 
 .bottom-container {
-  padding: 20rpx;
+  box-sizing: border-box;
   display: flex;
-  justify-content: space-between;
-
-  .right {
-    display: flex;
-
-    ::v-deep .u-button {
-      width: 160rpx;
-      margin-left: 20rpx;
-    }
+  align-items: center;
+  justify-content: flex-end;
+  flex-wrap: wrap;
+  padding: 20rpx 20rpx 20rpx 0;
+
+  ::v-deep .u-button {
+    width: 175rpx;
+    box-sizing: border-box;
+    padding: 10rpx;
+    margin: 0;
+    margin-left: 10rpx;
+    margin-bottom: 10rpx;
   }
 }
 

src/packageWorkorder/pages/orderList.vue

@@ -143,7 +143,6 @@
                 ></u-button>
                 <u-button plain type="primary" text="加急" @tap="actionUrgent(item.id, true)" v-else></u-button>
               </block>
-
               <u-button
                 v-if="
                   (orderStatus_v(item.orderStatus) == 'DJD' || (item.isImportExcel && !item.isMeet)) &&
@@ -153,7 +152,6 @@
                 text="接单"
                 @tap="actionReceive(item)"
               ></u-button>
-
               <!-- 服务中 -->
               <block v-if="orderStatus_v(item.orderStatus) == 'FWZ' || orderStatus_v(item.orderStatus) == 'YCD'">
                 <u-button
@@ -1017,19 +1015,20 @@ export default {
     }
 
     .item-btn {
+      box-sizing: border-box;
       display: flex;
       align-items: center;
       justify-content: flex-end;
       flex-wrap: wrap;
-      padding: 30rpx 0;
+      padding: 20rpx 20rpx 20rpx 0;
 
       ::v-deep .u-button {
-        width: 180rpx;
+        width: 175rpx;
         box-sizing: border-box;
-        padding: 20rpx;
+        padding: 10rpx;
         margin: 0;
-        margin-left: 20rpx;
-        margin-bottom: 20rpx;
+        margin-left: 10rpx;
+        margin-bottom: 10rpx;
       }
     }
   }