|
|
@@ -116,44 +116,48 @@
|
|
|
<view class="keyboard-body_box">
|
|
|
<view class="numpad">
|
|
|
<view class="numpad-grid-wrap">
|
|
|
- <view class="numpad-digits">
|
|
|
- <view class="numpad-row">
|
|
|
- <view class="numpad-key" data-char="1" @tap="onNumpadTap">1</view>
|
|
|
- <view class="numpad-key" data-char="2" @tap="onNumpadTap">2</view>
|
|
|
- <view class="numpad-key" data-char="3" @tap="onNumpadTap">3</view>
|
|
|
- </view>
|
|
|
- <view class="numpad-row">
|
|
|
- <view class="numpad-key" data-char="4" @tap="onNumpadTap">4</view>
|
|
|
- <view class="numpad-key" data-char="5" @tap="onNumpadTap">5</view>
|
|
|
- <view class="numpad-key" data-char="6" @tap="onNumpadTap">6</view>
|
|
|
- </view>
|
|
|
- <view class="numpad-row">
|
|
|
- <view class="numpad-key" data-char="7" @tap="onNumpadTap">7</view>
|
|
|
- <view class="numpad-key" data-char="8" @tap="onNumpadTap">8</view>
|
|
|
- <view class="numpad-key" data-char="9" @tap="onNumpadTap">9</view>
|
|
|
- </view>
|
|
|
- <view class="numpad-row">
|
|
|
- <view class="numpad-key numpad-key-muted" data-char="." @tap="onNumpadTap">.</view>
|
|
|
- <view class="numpad-key" data-char="0" @tap="onNumpadTap">0</view>
|
|
|
- <view class="numpad-key" data-char="00" @tap="onNumpadTap">00</view>
|
|
|
- </view>
|
|
|
- <view class="numpad-row numpad-row-actions">
|
|
|
- <view class="numpad-key numpad-key-action numpad-key-action-dual" @tap.stop="cancel">
|
|
|
- <text class="numpad-key-text">取消</text>
|
|
|
+ <view class="numpad-main-band">
|
|
|
+ <view class="numpad-digits">
|
|
|
+ <view class="numpad-row">
|
|
|
+ <view class="numpad-key" data-char="1" @tap="onNumpadTap">1</view>
|
|
|
+ <view class="numpad-key" data-char="2" @tap="onNumpadTap">2</view>
|
|
|
+ <view class="numpad-key" data-char="3" @tap="onNumpadTap">3</view>
|
|
|
</view>
|
|
|
- <view class="numpad-key numpad-key-danger numpad-key-action-dual" data-action="backspace" @tap="onNumpadTap">
|
|
|
- <text class="numpad-key-text">删除</text>
|
|
|
+ <view class="numpad-row">
|
|
|
+ <view class="numpad-key" data-char="4" @tap="onNumpadTap">4</view>
|
|
|
+ <view class="numpad-key" data-char="5" @tap="onNumpadTap">5</view>
|
|
|
+ <view class="numpad-key" data-char="6" @tap="onNumpadTap">6</view>
|
|
|
+ </view>
|
|
|
+ <view class="numpad-row">
|
|
|
+ <view class="numpad-key" data-char="7" @tap="onNumpadTap">7</view>
|
|
|
+ <view class="numpad-key" data-char="8" @tap="onNumpadTap">8</view>
|
|
|
+ <view class="numpad-key" data-char="9" @tap="onNumpadTap">9</view>
|
|
|
+ </view>
|
|
|
+ <view class="numpad-row">
|
|
|
+ <view class="numpad-key numpad-key-muted" data-char="." @tap="onNumpadTap">.</view>
|
|
|
+ <view class="numpad-key" data-char="0" @tap="onNumpadTap">0</view>
|
|
|
+ <view class="numpad-key" data-char="00" @tap="onNumpadTap">00</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
+ <view class="numpad-op-col">
|
|
|
+ <view class="numpad-key numpad-key-op" data-action="calc-mul" @tap="onNumpadTap">×</view>
|
|
|
+ <view class="numpad-key numpad-key-op" data-action="calc-add" @tap="onNumpadTap">+</view>
|
|
|
+ <view class="numpad-key numpad-key-op" data-action="calc-sub" @tap="onNumpadTap">−</view>
|
|
|
+ <view class="numpad-key numpad-key-op" data-action="calc-div" @tap="onNumpadTap">÷</view>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
- <view class="numpad-op-col">
|
|
|
- <view class="numpad-key numpad-key-op" data-action="calc-mul" @tap="onNumpadTap">×</view>
|
|
|
- <view class="numpad-key numpad-key-op" data-action="calc-add" @tap="onNumpadTap">+</view>
|
|
|
- <view class="numpad-key numpad-key-op" data-action="calc-sub" @tap="onNumpadTap">−</view>
|
|
|
- <view class="numpad-key numpad-key-op" data-action="calc-div" @tap="onNumpadTap">÷</view>
|
|
|
- <view class="numpad-key numpad-key-op numpad-key-op-muted" data-action="calc-clear" @tap="onNumpadTap">
|
|
|
+ <view class="numpad-row numpad-row-actions numpad-row-full">
|
|
|
+ <view class="numpad-key numpad-key-action-dual numpad-key-op-muted" data-action="calc-clear" @tap="onNumpadTap">
|
|
|
<text class="numpad-key-text numpad-key-text-clear">清空</text>
|
|
|
</view>
|
|
|
+ <view class="numpad-key numpad-key-danger numpad-key-action-dual" data-action="backspace" @tap="onNumpadTap">
|
|
|
+ <text class="numpad-key-text">删除</text>
|
|
|
+ </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>
|
|
|
@@ -1905,18 +1909,25 @@ export default {
|
|
|
box-sizing: border-box;
|
|
|
}
|
|
|
.numpad-grid-wrap {
|
|
|
- flex: 1;
|
|
|
- display: flex;
|
|
|
- flex-direction: row;
|
|
|
- align-items: stretch;
|
|
|
- min-height: 0;
|
|
|
+ flex: 1;
|
|
|
+ min-height: 0;
|
|
|
+ display: flex;
|
|
|
+ flex-direction: column;
|
|
|
+ align-items: stretch;
|
|
|
+}
|
|
|
+.numpad-main-band {
|
|
|
+ flex: 1;
|
|
|
+ min-height: 0;
|
|
|
+ display: flex;
|
|
|
+ flex-direction: row;
|
|
|
+ align-items: stretch;
|
|
|
}
|
|
|
.numpad-digits {
|
|
|
- flex: 1;
|
|
|
- min-width: 0;
|
|
|
- display: flex;
|
|
|
- flex-direction: column;
|
|
|
- min-height: 0;
|
|
|
+ flex: 1;
|
|
|
+ min-width: 0;
|
|
|
+ display: flex;
|
|
|
+ flex-direction: column;
|
|
|
+ min-height: 0;
|
|
|
}
|
|
|
.numpad-digits .numpad-row {
|
|
|
flex: 1;
|
|
|
@@ -1944,9 +1955,6 @@ export default {
|
|
|
.numpad-op-col .numpad-key-op + .numpad-key-op {
|
|
|
margin-top: 8upx;
|
|
|
}
|
|
|
-.numpad-op-col .numpad-key-op.numpad-key-op-muted {
|
|
|
- font-size: 14upx;
|
|
|
-}
|
|
|
.numpad-key-op-muted {
|
|
|
font-size: 14upx;
|
|
|
font-weight: 600;
|
|
|
@@ -2007,6 +2015,25 @@ 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;
|
|
|
+}
|
|
|
.numpad-row-actions {
|
|
|
margin-top: 10upx;
|
|
|
}
|
