更新

ghsPad/src/pages/home/components/selectPrice.vue

@@ -106,8 +106,11 @@
                         </view>
                     </view>
                     <view class="pay-submit-row">
-                        <view class="pay-submit-btn pay-submit-btn-stash" @tap.stop="stashCurrent">暂存</view>
-                        <view class="pay-submit-btn" @tap.stop="submitCashierPay">提交</view>
+                        <view class="pay-submit-left-pair">
+                            <view class="pay-submit-btn pay-submit-btn-secondary pay-submit-btn-cancel" @tap.stop="cancel">取消</view>
+                            <view class="pay-submit-btn pay-submit-btn-stash" @tap.stop="stashCurrent">暂存</view>
+                        </view>
+                        <view class="pay-submit-btn pay-submit-btn-submit" @tap.stop="submitCashierPay">提交</view>
                     </view>
                     </view>
                 </view>
@@ -160,11 +163,6 @@
                                     <view class="numpad-key numpad-key-op" data-action="calc-div" @tap="onNumpadTap">÷</view>
                                 </view>
                             </view>
-                            <view class="numpad-row numpad-row-cancelrow numpad-row-full">
-                                <view class="numpad-key numpad-key-action numpad-key-cancel-bar" @tap.stop="cancel">
-                                    <text class="numpad-key-text">取消</text>
-                                </view>
-                            </view>
                         </view>
                     </view>
                 </view>
@@ -1501,12 +1499,28 @@ export default {
         margin-top: 12upx;
         align-items: stretch;
     }
-    .pay-submit-row .pay-submit-btn {
+    .pay-submit-left-pair {
         flex: 1;
+        display: flex;
+        flex-direction: row;
+        align-items: stretch;
+        min-width: 0;
     }
-    .pay-submit-row .pay-submit-btn + .pay-submit-btn {
+    .pay-submit-left-pair .pay-submit-btn {
+        flex: 1;
+        min-width: 0;
+    }
+    .pay-submit-left-pair .pay-submit-btn + .pay-submit-btn {
         margin-left: 8upx;
     }
+    .pay-submit-row > .pay-submit-btn-submit {
+        flex: 1;
+        min-width: 0;
+        margin-left: 8upx;
+    }
+    .pay-submit-btn-cancel {
+        font-weight: 600;
+    }
     .pay-submit-btn {
         text-align: center;
         font-size: 16upx;
@@ -1896,16 +1910,18 @@ export default {
         min-height: 0;
         display: flex;
         flex-direction: column;
+        justify-content: center;
         padding-top: 0;
         border-top: none;
         overflow: hidden;
     }
 }
 .keyboard-body_box .numpad {
-    flex: 1;
+    flex: none;
+	width: 100%;
+	box-sizing: border-box;
     display: flex;
     flex-direction: column;
-    min-height: 0;
 }
 .numpad {
     width: 100%;
@@ -1915,20 +1931,22 @@ export default {
     box-sizing: border-box;
 }
 .numpad-grid-wrap {
-	flex: 1;
-	min-height: 0;
+	flex: none;
+	width: 100%;
+	box-sizing: border-box;
 	display: flex;
 	flex-direction: column;
 	align-items: stretch;
 }
 /* 5 行 × 4 列，与示意图一致；不用 gap，用单元格外边距（兼容 nvue） */
 .numpad-keyboard-grid {
-	flex: 1;
-	min-height: 0;
+	flex: none;
+	width: 100%;
+	box-sizing: border-box;
 	min-width: 0;
 	display: grid;
 	grid-template-columns: 1fr 1fr 1fr 26%;
-	grid-template-rows: repeat(5, minmax(0, 1fr));
+	grid-template-rows: repeat(5, minmax(52upx, auto));
 	align-items: stretch;
 	justify-items: stretch;
 	margin-right: -8upx;
@@ -2003,7 +2021,7 @@ export default {
 	font-size: 22upx;
 	font-weight: 600;
 	line-height: normal;
-	min-height: 0;
+	min-height: 52upx;
 }
 .numpad-keyboard-grid .numpad-key.numpad-key-op-add {
 	background: #09c567;
@@ -2019,20 +2037,12 @@ export default {
     color: #d32f2f;
     font-weight: 600;
 }
-.numpad-row {
-    display: flex;
-    flex-direction: row;
-    margin-top: 8upx;
-    &:first-child {
-        margin-top: 0;
-    }
-}
 .keyboard-body_box .numpad-key {
     display: flex;
     align-items: center;
     justify-content: center;
     height: auto;
-    min-height: 44upx;
+    min-height: 52upx;
     line-height: normal;
 }
 .numpad-key {
@@ -2062,22 +2072,6 @@ export default {
 .numpad-key-text {
     font-size: 14upx;
 }
-.keyboard-body_box .numpad-row.numpad-row-full {
-	flex: none !important;
-	min-height: 44upx;
-}
-.numpad-row.numpad-row-full {
-	width: 100%;
-	flex-shrink: 0;
-	box-sizing: border-box;
-}
-.numpad-row.numpad-row-full.numpad-row-cancelrow {
-	margin-top: 8upx;
-}
-.numpad-key-cancel-bar {
-    flex: 1;
-    margin-left: 0;
-}
 .numpad-key-danger .numpad-key-text {
     font-weight: 600;
 }

hdPad/src/pages/home/components/selectPrice.vue

@@ -107,8 +107,11 @@
                         </view>
                     </view>
                     <view class="pay-submit-row">
-                        <view class="pay-submit-btn pay-submit-btn-stash" @tap.stop="stashCurrent">暂存</view>
-                        <view class="pay-submit-btn" @tap.stop="submitCashierPay">提交</view>
+                        <view class="pay-submit-left-pair">
+                            <view class="pay-submit-btn pay-submit-btn-secondary pay-submit-btn-cancel" @tap.stop="cancel">取消</view>
+                            <view class="pay-submit-btn pay-submit-btn-stash" @tap.stop="stashCurrent">暂存</view>
+                        </view>
+                        <view class="pay-submit-btn pay-submit-btn-submit" @tap.stop="submitCashierPay">提交</view>
                     </view>
                     </view>
                 </view>
@@ -161,11 +164,6 @@
                                     <view class="numpad-key numpad-key-op" data-action="calc-div" @tap="onNumpadTap">÷</view>
                                 </view>
                             </view>
-                            <view class="numpad-row numpad-row-cancelrow numpad-row-full">
-                                <view class="numpad-key numpad-key-action numpad-key-cancel-bar" @tap.stop="cancel">
-                                    <text class="numpad-key-text">取消</text>
-                                </view>
-                            </view>
                         </view>
                     </view>
                 </view>
@@ -1498,12 +1496,28 @@ export default {
         margin-top: 12upx;
         align-items: stretch;
     }
-    .pay-submit-row .pay-submit-btn {
+    .pay-submit-left-pair {
         flex: 1;
+        display: flex;
+        flex-direction: row;
+        align-items: stretch;
+        min-width: 0;
     }
-    .pay-submit-row .pay-submit-btn + .pay-submit-btn {
+    .pay-submit-left-pair .pay-submit-btn {
+        flex: 1;
+        min-width: 0;
+    }
+    .pay-submit-left-pair .pay-submit-btn + .pay-submit-btn {
         margin-left: 8upx;
     }
+    .pay-submit-row > .pay-submit-btn-submit {
+        flex: 1;
+        min-width: 0;
+        margin-left: 8upx;
+    }
+    .pay-submit-btn-cancel {
+        font-weight: 600;
+    }
     .pay-submit-btn {
         text-align: center;
         font-size: 16upx;
@@ -1893,16 +1907,18 @@ export default {
         min-height: 0;
         display: flex;
         flex-direction: column;
+        justify-content: center;
         padding-top: 0;
         border-top: none;
         overflow: hidden;
     }
 }
 .keyboard-body_box .numpad {
-    flex: 1;
+    flex: none;
+	width: 100%;
+	box-sizing: border-box;
     display: flex;
     flex-direction: column;
-    min-height: 0;
 }
 .numpad {
     width: 100%;
@@ -1912,20 +1928,22 @@ export default {
     box-sizing: border-box;
 }
 .numpad-grid-wrap {
-	flex: 1;
-	min-height: 0;
+	flex: none;
+	width: 100%;
+	box-sizing: border-box;
 	display: flex;
 	flex-direction: column;
 	align-items: stretch;
 }
 /* 5 行 × 4 列，与示意图一致；不用 gap，用单元格外边距（兼容 nvue） */
 .numpad-keyboard-grid {
-	flex: 1;
-	min-height: 0;
+	flex: none;
+	width: 100%;
+	box-sizing: border-box;
 	min-width: 0;
 	display: grid;
 	grid-template-columns: 1fr 1fr 1fr 26%;
-	grid-template-rows: repeat(5, minmax(0, 1fr));
+	grid-template-rows: repeat(5, minmax(52upx, auto));
 	align-items: stretch;
 	justify-items: stretch;
 	margin-right: -8upx;
@@ -2000,7 +2018,7 @@ export default {
 	font-size: 22upx;
 	font-weight: 600;
 	line-height: normal;
-	min-height: 0;
+	min-height: 52upx;
 }
 .numpad-keyboard-grid .numpad-key.numpad-key-op-add {
 	background: #09c567;
@@ -2016,20 +2034,12 @@ export default {
     color: #d32f2f;
     font-weight: 600;
 }
-.numpad-row {
-    display: flex;
-    flex-direction: row;
-    margin-top: 8upx;
-    &:first-child {
-        margin-top: 0;
-    }
-}
 .keyboard-body_box .numpad-key {
     display: flex;
     align-items: center;
     justify-content: center;
     height: auto;
-    min-height: 44upx;
+    min-height: 52upx;
     line-height: normal;
 }
 .numpad-key {
@@ -2064,22 +2074,6 @@ export default {
 .numpad-key-text {
     font-size: 14upx;
 }
-.keyboard-body_box .numpad-row.numpad-row-full {
-	flex: none !important;
-	min-height: 44upx;
-}
-.numpad-row.numpad-row-full {
-	width: 100%;
-	flex-shrink: 0;
-	box-sizing: border-box;
-}
-.numpad-row.numpad-row-full.numpad-row-cancelrow {
-	margin-top: 8upx;
-}
-.numpad-key-cancel-bar {
-    flex: 1;
-    margin-left: 0;
-}
 .numpad-key-danger .numpad-key-text {
     font-weight: 600;
 }