优化

ghsApp/src/admin/tools/calculator.vue

@@ -1072,7 +1072,10 @@ export default {
 			this.checkType = 0
 		},
 		submitCashierPay() {
-			this._submitCashierPayCore()
+			const that = this
+			this.$util.confirmModal({ title: '提示', content: '确认提交？' }, () => {
+				that._submitCashierPayCore()
+			})
 		},
 		_resolveXjPayload() {
 			try {
@@ -1237,8 +1240,8 @@ export default {
 }
 
 .calc-section-active {
-	border-color: #09c567;
-	background: linear-gradient(180deg, #f6fff9 0%, #fff 52%);
+	border-color: $mainColor;
+	background: linear-gradient(180deg, #f3f7ff 0%, #fff 52%);
 }
 
 .calc-actions-top {
@@ -1280,8 +1283,8 @@ export default {
 	width: 64upx;
 	height: 64upx;
 	border-radius: 12upx;
-	background: rgba(248, 255, 248, 0.95);
-	border: 2upx solid #c8ecd8;
+	background: rgba(243, 247, 255, 0.96);
+	border: 2upx solid #c5d6f5;
 	display: flex;
 	align-items: center;
 	justify-content: center;
@@ -1293,7 +1296,7 @@ export default {
 
 .history-entry-icon {
 	font-size: 34upx;
-	color: #09c567;
+	color: $mainColor;
 }
 
 .calc-formula {
@@ -1328,7 +1331,7 @@ export default {
 .calc-op {
 	font-size: 42upx;
 	font-weight: 700;
-	color: #09c567;
+	color: $mainColor;
 }
 
 .calc-total-row {
@@ -1348,7 +1351,7 @@ export default {
 .calc-total-val {
 	font-size: 44upx;
 	font-weight: 700;
-	color: #09c567;
+	color: $mainColor;
 	line-height: 1.2;
 }
 
@@ -1405,7 +1408,7 @@ export default {
 
 .customer-strip-action {
 	font-size: 32upx;
-	color: #09c567;
+	color: $mainColor;
 	flex-shrink: 0;
 	margin-left: 12upx;
 }
@@ -1465,9 +1468,9 @@ export default {
 }
 
 .rcv-item-chip.active {
-	background: #09c567;
+	background: $mainColor;
 	color: #fff;
-	border-color: #09c567;
+	border-color: $mainColor;
 }
 
 .pay-cash-panel {
@@ -1511,7 +1514,7 @@ export default {
 
 .pay-cash-amt-selected {
 	color: #fff;
-	background: #09c567;
+	background: $mainColor;
 	padding: 8upx 16upx;
 	border-radius: 10upx;
 	display: inline-block;
@@ -1525,7 +1528,7 @@ export default {
 
 .lbl-ok {
 	font-size: 24upx;
-	color: #09c567;
+	color: $mainColor;
 }
 .lbl-bad {
 	font-size: 24upx;
@@ -1539,7 +1542,7 @@ export default {
 .amt-ok {
 	font-size: 34upx;
 	font-weight: 700;
-	color: #09c567;
+	color: $mainColor;
 	display: block;
 }
 .amt-bad {
@@ -1566,19 +1569,19 @@ export default {
 	text-align: center;
 	font-size: 30upx;
 	padding: 30upx 22upx;
-	background: #09c567;
+	background: $mainColor;
 	color: #fff;
 	border-radius: 12upx;
 	font-weight: 600;
 	box-sizing: border-box;
-	border: 2upx solid #09c567;
+	border: 2upx solid $mainColor;
 }
 
 .pay-submit-btn-outline {
 	flex: 1;
 	background: #fff;
-	color: #09c567;
-	border: 2upx solid #09c567;
+	color: $mainColor;
+	border: 2upx solid $mainColor;
 	font-weight: 600;
 	border-radius: 12upx;
 	text-align: center;
@@ -1732,9 +1735,8 @@ export default {
 .numpad-grid-wrap .numpad-key.numpad-key-op-add {
 	font-size: 48upx;
 	font-weight: 700;
-	background: #52b384;
-	color: #063d2b;
-	box-shadow: 0 4upx 0 #388f65;
+	background: #5b8ef5;
+	color: #0f2d52;
 }
 
 .numpad-key-muted {
@@ -1789,10 +1791,19 @@ export default {
 
 .mob-popup-close {
 	font-size: 28upx;
-	color: #09c567;
+	color: $mainColor;
 	padding: 8upx 16upx;
 }
 
+/* 仅「暂存记录」弹层：标题/关闭与列表同档加大，不影响折扣弹层 */
+.mob-popup-history .mob-popup-title {
+	font-size: 36upx;
+}
+
+.mob-popup-history .mob-popup-close {
+	font-size: 32upx;
+}
+
 .mob-popup-body {
 	max-height: 46vh;
 	box-sizing: border-box;
@@ -1833,7 +1844,7 @@ export default {
 	line-height: 72upx;
 	font-size: 28upx;
 	color: #fff;
-	background: #09c567;
+	background: $mainColor;
 	border-radius: 10upx;
 	text-align: center;
 	box-sizing: border-box;
@@ -1843,7 +1854,7 @@ export default {
 .discount-toolbar-hint {
 	display: block;
 	font-size: 24upx;
-	color: #09c567;
+	color: $mainColor;
 	line-height: 1.45;
 	padding: 14upx 6upx 0;
 }
@@ -1876,8 +1887,8 @@ export default {
 }
 
 .discount-option-active {
-	border-color: #09c567;
-	background: #f0fff5;
+	border-color: $mainColor;
+	background: #eef4ff;
 }
 
 .discount-option-text {
@@ -1887,7 +1898,7 @@ export default {
 
 .discount-option-check {
 	font-size: 30upx;
-	color: #09c567;
+	color: $mainColor;
 	font-weight: bold;
 }
 
@@ -1928,7 +1939,7 @@ export default {
 
 .history-del {
 	flex-shrink: 0;
-	font-size: 26upx;
+	font-size: 34upx;
 	color: #e54545;
 	padding: 10upx 16upx;
 	margin-left: 12upx;
@@ -1942,18 +1953,18 @@ export default {
 }
 
 .history-time {
-	font-size: 24upx;
+	font-size: 32upx;
 	color: #9aa4b2;
 }
 
 .history-total {
-	font-size: 24upx;
-	color: #09c567;
+	font-size: 32upx;
+	color: $mainColor;
 	font-weight: 600;
 }
 
 .history-detail {
-	font-size: 24upx;
+	font-size: 32upx;
 	color: #5c6573;
 	word-break: break-all;
 	line-height: 1.35;
@@ -1961,7 +1972,7 @@ export default {
 
 .history-empty {
 	text-align: center;
-	font-size: 26upx;
+	font-size: 34upx;
 	color: #c5ccd6;
 	padding: 60upx 0;
 }