tplus-components-touch 3.19.1 → 3.21.2

package/dist/components/settlement/settlement.less

@@ -31,7 +31,7 @@
 
 .scanInput {
   // border-top:1px solid #E6E6EB;
-  padding-top:20px;
+  // padding-top:20px;
   border-radius: 6px;
   .icon{
     text-align: center;
@@ -127,6 +127,21 @@
       padding-left:0px;
     }
   }
+  .prototype {
+    padding-bottom: 10px;
+    .economize {
+      font-size: 18px;
+    }
+    .prototypeDetailed {
+      font-size: 18px;
+      position: relative;
+      .iconfont {
+        font-size: 10px;
+        position: absolute;
+        top: 6px;
+      }
+    }
+  }
 }
 .buttonRegion2{
   margin-top:14px !important;
@@ -322,6 +337,37 @@
         font-size: 20px;
       }
     }
+    .col4 {
+      width: 496px;
+      margin-left: 16px;
+      border-bottom: 1px solid #E6E6EB;
+      .ant-btn {
+        margin-right: 2px;
+        padding: 0 10px;
+        font-size: 14px;
+        border: none;
+        border-bottom: 2px solid;
+        border-radius: 0;
+        margin-bottom: -1px;
+        position: relative;
+      }
+      .couponBorder {
+        border-color: #E6E6EB;
+        &::after{
+          position: absolute;
+          bottom: -1px;
+          left: 0px;
+          content: '';
+          width: 100%;
+          height: 1px;
+          border-bottom: 1px solid white;
+        }
+      }
+      .couponTip {
+        color: #F83A41;
+        font-size: 12px;
+      }
+    }
   }
   .djq2outer{
     padding-top:8px;
@@ -414,7 +460,10 @@
             left: -5px;
         }
         .djqLeftCash{
-           background-image: linear-gradient(-137deg, #FD6E21 0%, #F9365D 100%);
+          //  background-image: linear-gradient(-137deg, #FD6E21 0%, #F9365D 100%);
+        }
+        .djqLeftCashGrey {
+          background-image: linear-gradient(137deg, #CBCAC9 0%, #B0B0B0 100%);
         }
         .djqLeftDiscount{
            background-image: linear-gradient(-137deg, #FF8F36 0%, #FD6B59 100%);
@@ -427,15 +476,15 @@
           background-color: #FFFFFF;
           border-radius: 1px 4px 4px 1px;
           text-align: left;
-          text-indent: 20px;
+          text-indent: 14px;
           cursor: pointer;
           .name{
             // padding-left:23px;
             padding-top:16px;
             padding-bottom: 19px;
             font-size: 17px;
-            color: #333333;
             line-height: 16px;
+            width: 136px;
           }
           .info{
             // padding-left:23px;
@@ -444,17 +493,35 @@
             color: #333333;
             line-height: 13px;
           }
-          .info_red{
-            color: #F5372F;
+          .noxuanzhong {
+            position: absolute;
+            top: 12px;
+            right: 12px;
+            border: 1px solid #979797;
+            border-radius: 0.83px;
+            width: 18px;
+            height: 18px;
+          }
+          .noxuanzhong1 {
+            position: absolute;
+            top: 6px;
+            right: 6px;
+            border: 1px solid #979797;
+            border-radius: 0.83px;
+            width: 18px;
+            height: 18px;
+            background: #F0F0F0;
           }
-
         }
 
         .djqRightSelected{
-          background:#FFFFFF url('http://newretail-static-pro-bj.oss-cn-beijing-internal.aliyuncs.com/pos/img/shiyong.png') no-repeat !important;
-          background-position: right bottom !important;
-          .name{
-            color:#FE7351;
+          // background:#FFFFFF url('http://newretail-static-pro-bj.oss-cn-beijing-internal.aliyuncs.com/pos/img/shiyong.png') no-repeat !important;
+          // background-position: right bottom !important;
+          .checkIcon {
+            font-size: 20px;
+            position: absolute;
+            top: 6px;
+            right: 6px;
           }
         }
       }
@@ -503,6 +570,9 @@
 .settlement-wraper2[role='dialog']{
   z-index: 1006 !important;
 }
+.protoWraper[role='dialog'] {
+  z-index: 1006 !important;
+}
 .settlement-wraper2{
   .ant-modal-body{
     padding:0px !important;
@@ -516,7 +586,6 @@
 }
 .settlement{
   width:100%;
-
   .settlementTop {
     display    : flex;
     align-items: center;
@@ -525,6 +594,10 @@
       height: calc(~"100vh - 115px");
       display: flex;
       flex-flow: column;
+      .prototypeDetailed {
+        font-size: 18px;
+        margin-bottom: 0 !important;
+      }
   }
   .newstyle2{
     .name {
@@ -546,6 +619,18 @@
     // max-height: calc(~"100% - 200px");
     // max-height: 200px;
     overflow-y: auto;
+    .prototypeDetailed {
+      text-align: right;
+      font-size: 18px;
+      margin-bottom: 26px;
+      display: flex;
+      justify-content: flex-end;
+      align-items: center;
+      cursor: pointer;
+      .icon-shouqi1 {
+        font-size: 6px;
+      }
+    }
     .detailempty{
       padding-top:200px;
     }
@@ -650,7 +735,7 @@
         background: #EAF6FE;
         border-radius: 6px;
         padding: 16px 16px 0px 16px;
-        margin-bottom: 24px;
+        margin-bottom: 8px;
       }
 
       .keyboard {
@@ -1395,6 +1480,18 @@
       border: 1px solid #C8C8CD;
       border-radius: 2px;
     }
+    .economize {
+      font-size: 18px;
+    }
+    .prototypeDetailed {
+      font-size: 18px;
+      position: relative;
+      .iconfont {
+        font-size: 10px;
+        position: absolute;
+        top: 6px;
+      }
+    }
   }
   .error{
     height:16px;