更新

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

@@ -1272,8 +1272,8 @@ export default {
         margin-right: 8upx;
     }
     .selected {
-        color: #09c567;
-        border: 1upx solid #09c567;
+        color: $mainColor;
+        border: 1upx solid $mainColor;
     }
 }
 .grey-color {
@@ -1366,8 +1366,8 @@ export default {
         align-items: center;
         justify-content: center;
         border-radius: 8upx;
-        background: rgba(248, 255, 248, 0.95);
-        border: 1upx solid #c8ecd8;
+        background: rgba(243, 247, 255, 0.96);
+        border: 1upx solid #c5d6f5;
         box-sizing: border-box;
         pointer-events: auto;
     }
@@ -1376,7 +1376,7 @@ export default {
     }
     .history-entry__icon {
         font-size: 22upx;
-        color: #09c567;
+        color: $mainColor;
         line-height: 1;
     }
     .rcv-pay-block {
@@ -1428,9 +1428,9 @@ export default {
         margin-left: 0;
     }
     .rcv-item-chip.active {
-        background-color: #09c567;
+        background-color: $mainColor;
         color: #ffffff;
-        border-color: #09c567;
+        border-color: $mainColor;
     }
     .rcv-customer-line {
         font-size: 13upx;
@@ -1468,7 +1468,7 @@ export default {
     }
     .change-label-ok {
         font-size: 13upx;
-        color: #09c567;
+        color: $mainColor;
     }
     .change-label-bad {
         font-size: 13upx;
@@ -1480,7 +1480,7 @@ export default {
     }
     .change-hint-ok {
         font-size: 15upx;
-        color: #09c567;
+        color: $mainColor;
     }
     .change-hint-bad {
         font-size: 15upx;
@@ -1525,10 +1525,10 @@ export default {
         text-align: center;
         font-size: 16upx;
         padding: 14upx 16upx;
-        background: #09c567;
+        background: $mainColor;
         color: #ffffff;
         border-radius: 8upx;
-        border: 1upx solid #09c567;
+        border: 1upx solid $mainColor;
         font-weight: 600;
         box-sizing: border-box;
     }
@@ -1540,8 +1540,8 @@ export default {
     }
     .pay-submit-btn-stash {
         background: #ffffff;
-        color: #09c567;
-        border-color: #09c567;
+        color: $mainColor;
+        border-color: $mainColor;
         font-weight: 600;
     }
     .pay-submit-btn:active {
@@ -1555,8 +1555,8 @@ export default {
         margin-top: 0;
         margin-bottom: 10upx;
         &.calc-section-active {
-            border-color: #09c567;
-            background: #f8fff8;
+            border-color: $mainColor;
+            background: #f3f7ff;
         }
     }
     .gather-pin-entry {
@@ -1576,8 +1576,8 @@ export default {
         box-sizing: border-box;
     }
     .gather-pin-entry--on {
-        border-color: #09c567;
-        background: rgba(240, 255, 245, 0.95);
+        border-color: $mainColor;
+        background: rgba(238, 244, 255, 0.96);
     }
     .gather-pin-entry--hover {
         opacity: 0.85;
@@ -1588,7 +1588,7 @@ export default {
         line-height: 1;
     }
     .gather-pin-entry--on .gather-pin-entry__icon {
-        color: #09c567;
+        color: $mainColor;
     }
     .calc-title {
         text-align: center;
@@ -1597,8 +1597,8 @@ export default {
         margin-bottom: 8upx;
     }
     .calc-formula {
-        min-height: 36upx;
-        font-size: 14upx;
+        min-height: 40upx;
+        font-size: 18upx;
         color: #333333;
         text-align: center;
         line-height: 1.4;
@@ -1612,14 +1612,14 @@ export default {
         justify-content: center;
     }
     .calc-placeholder {
-        font-size: 12upx;
+        font-size: 16upx;
         color: #999999;
     }
     .calc-num {
         color: #333333;
     }
     .calc-op {
-        color: #09c567;
+        color: #333333;
     }
     .calc-total-row {
         display: flex;
@@ -1636,7 +1636,7 @@ export default {
     .calc-total-val {
         font-size: 16upx;
         font-weight: bold;
-        color: #09c567;
+        color: $mainColor;
     }
     .calc-discount-row {
         display: flex;
@@ -1680,9 +1680,9 @@ export default {
         }
     }
     .calc-btn-primary {
-        background: #09c567;
+        background: $mainColor;
         color: #ffffff;
-        border-color: #09c567;
+        border-color: $mainColor;
     }
     .calc-history-popup {
         width: 45vw;
@@ -1710,7 +1710,7 @@ export default {
     }
     .calc-history-popup-close {
         font-size: 13upx;
-        color: #09c567;
+        color: $mainColor;
         padding: 4upx 8upx;
     }
     .calc-history-popup-body {
@@ -1748,7 +1748,7 @@ export default {
     }
     .history-total {
         font-size: 11upx;
-        color: #09c567;
+        color: $mainColor;
     }
     .history-detail {
         font-size: 11upx;
@@ -1796,7 +1796,7 @@ export default {
         line-height: 36upx;
         font-size: 13upx;
         color: #ffffff;
-        background: #09c567;
+        background: $mainColor;
         border-radius: 6upx;
         text-align: center;
         box-sizing: border-box;
@@ -1804,7 +1804,7 @@ export default {
     .discount-toolbar-hint {
         display: block;
         font-size: 11upx;
-        color: #09c567;
+        color: $mainColor;
         line-height: 1.4;
         padding: 8upx 4upx 0;
     }
@@ -1828,8 +1828,8 @@ export default {
         box-sizing: border-box;
     }
     .discount-option--active {
-        border-color: #09c567;
-        background: #f0fff4;
+        border-color: $mainColor;
+        background: #eef4ff;
     }
     .discount-option-text {
         font-size: 14upx;
@@ -1837,7 +1837,7 @@ export default {
     }
     .discount-option-check {
         font-size: 14upx;
-        color: #09c567;
+        color: $mainColor;
         font-weight: bold;
     }
     .discount-option--with-del {
@@ -2024,13 +2024,12 @@ export default {
 	min-height: 52upx;
 }
 .numpad-keyboard-grid .numpad-key.numpad-key-op-add {
-	background: #09c567;
+	background: $mainColor;
 	color: #ffffff;
 	font-weight: 600;
-	box-shadow: 0 2upx 0 #078a4a;
 }
 .numpad-keyboard-grid .numpad-key.numpad-key-op-add:active {
-	background: #08b35d;
+	background: #2d7ae8;
 }
 
 .numpad-key-text-clear {
@@ -2095,12 +2094,12 @@ export default {
     background: #f7f7f7;
 }
 .numpad-key-ok {
-    background: #09c567;
+    background: $mainColor;
     color: #ffffff;
     font-weight: 600;
-    box-shadow: 0 2upx 0 #078a4a;
+    box-shadow: 0 2upx 0 #2563c9;
 }
 .numpad-key-ok:active {
-    background: #08b35d;
+    background: #2d7ae8;
 }
 </style>

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

@@ -1594,8 +1594,8 @@ export default {
         margin-bottom: 8upx;
     }
     .calc-formula {
-        min-height: 36upx;
-        font-size: 14upx;
+        min-height: 40upx;
+        font-size: 18upx;
         color: #333333;
         text-align: center;
         line-height: 1.4;
@@ -1609,7 +1609,7 @@ export default {
         justify-content: center;
     }
     .calc-placeholder {
-        font-size: 12upx;
+        font-size: 16upx;
         color: #999999;
     }
     .calc-num {
@@ -2024,7 +2024,6 @@ export default {
 	background: #09c567;
 	color: #ffffff;
 	font-weight: 600;
-	box-shadow: 0 2upx 0 #078a4a;
 }
 .numpad-keyboard-grid .numpad-key.numpad-key-op-add:active {
 	background: #08b35d;