Merge remote-tracking branch 'origin/hotfix/editOrder'

@@ -300,26 +300,36 @@
 }
 }
 
 
 .cancel-dialog {
 .cancel-dialog {
+    width: 600px;
+    background: #fff;
+    padding: 20px 30px 35px 30px;
     header {
     header {
-        font-size: 14px;
-        padding-bottom: 10px;
-        border-bottom: 1px dotted #a7a7a7;
+        font-size: 18px;
+        padding-bottom: 20px;
+        border-bottom: 1px solid #e8e8e8;
         color: #000;
         color: #000;
         text-align: left;
         text-align: left;
     }
     }
-
-    ul {
+    .close{
+        top: 15px;
+        right: 30px;
+        .iconfont{
+            font-size: 30px;
+        }
+    }
+    .cancel-reason {
         text-align: left;
         text-align: left;
-        padding: 10px 0 0 25px;
 
 
         li {
         li {
+            float: left;
+            width: 50%;
             height: 28px;
             height: 28px;
             line-height: 28px;
             line-height: 28px;
-            font-size: 12px;
+            font-size: 14px;
         }
         }
 
 
         label {
         label {
-            padding-left: 10px;
+            padding-left: 3px;
         }
         }
 
 
         input[type="text"] {
         input[type="text"] {
@@ -332,35 +342,62 @@
     .cancel-tip {
     .cancel-tip {
         margin-top: 20px;
         margin-top: 20px;
         color: #d60248;
         color: #d60248;
-        font-size: 12px;
-        padding-left: 30px;
+        font-size: 14px;
+        padding-left: 17px;
         text-align: left;
         text-align: left;
     }
     }
 
 
     .btns {
     .btns {
-        padding: 15px 30px;
-        text-align: left;
+        padding: 15px 30px 0;
+        text-align: center;
 
 
         .btn {
         .btn {
             height: 35px;
             height: 35px;
-            font-size: 12px;
+            font-size: 15px;
             line-height: 35px;
             line-height: 35px;
         }
         }
 
 
         .cancel-sure {
         .cancel-sure {
             width: 130px;
             width: 130px;
-            border-radius: 3px;
             color: #fff;
             color: #fff;
-            background: #d60248;
+            background: #000;
             border: none;
             border: none;
         }
         }
 
 
         .cancel-no {
         .cancel-no {
-            background: #eaeaea;
-            border-radius: 3px;
-            color: #999;
-            border-color: #ebebeb;
-            width: 66px;
+            margin-left: 30px;
+            background: #fff;
+            color: #000;
+            border-color: #000;
+            width: 126px;
+        }
+    }
+    .tip{
+        margin: 20px 0 ;
+        font-size: 12px;
+        text-align: left;
+        color: #db3d50;
+    }
+    .reminder{
+        margin: 20px 0 10px;
+    }
+    .info-prompt{
+        ul{
+            margin-top: -10px;
+        }
+        li{
+            margin: 10px 0;
+            font-size: 14px;
+            line-height: 16px;
+            text-align: left;
+        }
+        i{
+            color:  #d70400;
+            font-family: SimSun;
+            font-size: 16px;
+            margin-right: 13px;
+            vertical-align: -6px;
+            margin-left: 5px;
         }
         }
     }
     }
 }
 }