Merge branch 'develop'

src/main/ui/static/templates/payment/v4/payment.css

@@ -16,6 +16,7 @@
     margin-top: 15px;
     margin-bottom: 15px;
 }
+
 body {
     -webkit-touch-callout: auto;
     -webkit-user-select: auto;
@@ -30,12 +31,14 @@ body {
 div, span, p, ul, li {
     box-sizing: border-box;
 }
+
 .warning-sm {
     color: red;
     font-size: 10px;
     transform-origin: left;
     transform: scale(0.8);
 }
+
 .weui_grid {
     padding: 7px;
     height: 53px;
@@ -169,7 +172,7 @@ input.value:focus {
     right: 0;
     bottom: 0;
     overflow-x: hidden;
-    background-color: #fbf9fe;
+    background-color: #FFFFFF;
 }
 
 .new_year {
@@ -181,6 +184,7 @@ input.value:focus {
     z-index: -1;
     border-radius: 0 0 25px 25px;
 }
+
 .bankpay {
     text-align: center;
     padding: 20px;
@@ -194,6 +198,7 @@ input.value:focus {
         color: #FFFFFF;
     }
 }
+
 .row {
     width: 100%;
     padding: 0 30px;
@@ -466,8 +471,9 @@ input.value:focus {
 #coupon-box-toggle {
     padding: 0 20px;
     margin-bottom: 10px;
+    margin-top: 15px;
     text-align: right;
-    color: #30af69;
+    color: #FF7E28;
     font-size: 12px;
     cursor: pointer;
 }
@@ -535,7 +541,7 @@ input.value:focus {
 .coupons-container .coupon-box-title > .title {
     float: left;
     display: block;
-    color: #0BB20C;
+    color: #FF7E28;
 }
 
 .coupons-container .coupon-box-title > #close-coupon-box {
@@ -571,6 +577,25 @@ input.value:focus {
     -webkit-appearance: none;
 }
 
+.remark-textarea-new {
+    background-color: #FFFFFF;
+    box-shadow: none;
+    font-size: 13px;
+    width: calc(100% - 40px);
+    margin: 0 20px;
+    padding: 10px 0;
+    height: 18px;
+    border: 1px solid #FFFFFF;
+    border-radius: 0;
+    border-bottom-color: #BCBCBC;
+    -webkit-appearance: none;
+}
+
+.remark-textarea-new::-webkit-input-placeholder {
+    font-size: 13px;
+    color: #BCBCBC;
+}
+
 .remark-textarea::-webkit-input-placeholder {
     font-size: 13px;
     color: #BCBCBC;
@@ -614,6 +639,7 @@ input.value:focus {
     cursor: pointer;
     margin: 11px;
 }
+
 input::-webkit-input-placeholder {
     font-size: 50px;
     color: #FFFFFF;
@@ -633,3 +659,13 @@ input::-webkit-input-placeholder{
     padding-left: 10px;
     padding-top: 20px;
 }
+
+.advertisement {
+    display: flex;
+    justify-content: center;
+    margin-top: 10px;
+}
+
+.arrow-color {
+    color: #FF7E28;
+}