shish hace 10 meses
padre
commit
917cfc07c2
Se han modificado 2 ficheros con 82 adiciones y 22 borrados
  1. 42 12
      ghsApp/src/pagesOrder/detail.vue
  2. 40 10
      hdApp/src/admin/order/detail.vue

+ 42 - 12
ghsApp/src/pagesOrder/detail.vue

@@ -508,17 +508,17 @@
 			<text class="modal-title">请选择</text>
 			<text class="modal-close" @click="hideMnPop">×</text>
 			</view>
-			<view class="modal-body">
-			<button class="admin-button-com middle" @click="setMnNum(10000)">订单创建成功,等待接单</button>
-			<button class="admin-button-com middle" @click="setMnNum(20000)">商家取消订单</button>
-			<button class="admin-button-com middle" @click="setMnNum(20001)">配送方取消订单</button>
-			<button class="admin-button-com middle" @click="setMnNum(30000)">配送员接单</button>
-			<button class="admin-button-com middle" @click="setMnNum(40000)">配送员到店</button>
-			<button class="admin-button-com middle" @click="setMnNum(50000)">配送中</button>
-			<button class="admin-button-com middle" @click="setMnNum(60000)">配送员撤单</button>
-			<button class="admin-button-com middle" @click="setMnNum(70000)">配送完成</button>
-			<button class="admin-button-com middle" @click="setMnNum(90000)">配送异常</button>
-			</view>
+		<view class="modal-body">
+		<button class="admin-button-com modal-action-btn" @click="setMnNum(10000)">开始呼叫配送员</button>
+		<button class="admin-button-com modal-action-btn" @click="setMnNum(30000)">配送员接单</button>
+		<button class="admin-button-com modal-action-btn" @click="setMnNum(40000)">配送员到店</button>
+		<button class="admin-button-com modal-action-btn" @click="setMnNum(50000)">配送中</button>
+		<button class="admin-button-com modal-action-btn" @click="setMnNum(70000)">配送完成</button>
+		<button class="admin-button-com modal-action-btn" @click="setMnNum(20001)">配送方取消订单</button>
+		<button class="admin-button-com modal-action-btn" @click="setMnNum(60000)">配送员撤单</button>
+		<button class="admin-button-com modal-action-btn" @click="setMnNum(90000)">配送异常</button>
+		<button class="admin-button-com modal-action-btn" @click="setMnNum(20000)">商家取消订单</button>
+		</view>
 			<view class="modal-footer">
 			<button class="modal-btn cancel-btn" @click="hideMnPop">取消</button>
 			</view>
@@ -1622,7 +1622,10 @@ export default {
 }
 
 .modal-body {
-  padding: 40upx;
+  padding: 30upx 40upx;
+  display: flex;
+  flex-direction: column;
+  gap: 20upx;
 }
 
 .modal-input {
@@ -1677,6 +1680,33 @@ export default {
   }
 }
 
+/* 模态框按钮样式 */
+.modal-action-btn {
+  width: 100% !important;
+  height: 80upx !important;
+  line-height: 80upx !important;
+  padding: 0 20upx !important;
+  font-size: 28upx !important;
+  border-radius: 8upx !important;
+  background-color: #3385ff !important;
+  color: #fff !important;
+  border: 1px solid #3385ff !important;
+  transition: all 0.3s ease !important;
+  box-shadow: 0 2upx 8upx rgba(51, 133, 255, 0.2) !important;
+  
+  &:hover {
+    background-color: #2d74e7 !important;
+    border-color: #2d74e7 !important;
+    transform: translateY(-2upx) !important;
+    box-shadow: 0 4upx 12upx rgba(51, 133, 255, 0.3) !important;
+  }
+  
+  &:active {
+    transform: translateY(0) !important;
+    box-shadow: 0 2upx 6upx rgba(51, 133, 255, 0.2) !important;
+  }
+}
+
 // 备注区域样式
 .remark-content-wrapper {
   display: flex;

+ 40 - 10
hdApp/src/admin/order/detail.vue

@@ -393,15 +393,15 @@
           <text class="modal-close" @click="hideMnPop">×</text>
         </view>
         <view class="modal-body">
-          <button class="admin-button-com middle" @click="setMnNum(10000)">订单创建成功,等待接单</button>
-          <button class="admin-button-com middle" @click="setMnNum(20000)">商家取消订单</button>
-          <button class="admin-button-com middle" @click="setMnNum(20001)">配送方取消订单</button>
-          <button class="admin-button-com middle" @click="setMnNum(30000)">配送员接单</button>
-          <button class="admin-button-com middle" @click="setMnNum(40000)">配送员到店</button>
-          <button class="admin-button-com middle" @click="setMnNum(50000)">配送中</button>
-          <button class="admin-button-com middle" @click="setMnNum(60000)">配送员撤单</button>
-          <button class="admin-button-com middle" @click="setMnNum(70000)">配送完成</button>
-          <button class="admin-button-com middle" @click="setMnNum(90000)">配送异常</button>
+          <button class="admin-button-com modal-action-btn" @click="setMnNum(10000)">开始呼叫配送员</button>
+          <button class="admin-button-com modal-action-btn" @click="setMnNum(30000)">配送员接单</button>
+          <button class="admin-button-com modal-action-btn" @click="setMnNum(40000)">配送员到店</button>
+          <button class="admin-button-com modal-action-btn" @click="setMnNum(50000)">配送中</button>
+          <button class="admin-button-com modal-action-btn" @click="setMnNum(70000)">配送完成</button>
+          <button class="admin-button-com modal-action-btn" @click="setMnNum(20001)">配送方取消订单</button>
+          <button class="admin-button-com modal-action-btn" @click="setMnNum(60000)">配送员撤单</button>
+          <button class="admin-button-com modal-action-btn" @click="setMnNum(90000)">配送异常</button>
+          <button class="admin-button-com modal-action-btn" @click="setMnNum(20000)">商家取消订单</button>
         </view>
         <view class="modal-footer">
           <button class="modal-btn cancel-btn" @click="hideMnPop">取消</button>
@@ -923,7 +923,10 @@ export default {
 }
 
 .modal-body {
-  padding: 40upx;
+  padding: 30upx 40upx;
+  display: flex;
+  flex-direction: column;
+  gap: 20upx;
 }
 
 .modal-input {
@@ -977,4 +980,31 @@ export default {
     }
   }
 }
+
+/* 模态框按钮样式 */
+.modal-action-btn {
+  width: 100% !important;
+  height: 80upx !important;
+  line-height: 80upx !important;
+  padding: 0 20upx !important;
+  font-size: 28upx !important;
+  border-radius: 8upx !important;
+  background-color: #3385ff !important;
+  color: #fff !important;
+  border: 1px solid #3385ff !important;
+  transition: all 0.3s ease !important;
+  box-shadow: 0 2upx 8upx rgba(51, 133, 255, 0.2) !important;
+  
+  &:hover {
+    background-color: #2d74e7 !important;
+    border-color: #2d74e7 !important;
+    transform: translateY(-2upx) !important;
+    box-shadow: 0 4upx 12upx rgba(51, 133, 255, 0.3) !important;
+  }
+  
+  &:active {
+    transform: translateY(0) !important;
+    box-shadow: 0 2upx 6upx rgba(51, 133, 255, 0.2) !important;
+  }
+}
 </style>