Merge remote-tracking branch 'origin/feature-logisticsModify-hulh-1128' into logisticsModify-1203

src/main/webapp/resources/view/common/modal/delivery_rule_modal.html

@@ -1,6 +1,6 @@
 <style>
     /*配送规则弹框*/
-    .com-del-box {
+    .modal-dialog .modal-content{
         position: fixed;
         z-index: 2;
         opacity: 1;
@@ -75,6 +75,18 @@
     .modal{
         box-shadow: none!important ;
     }
+    .modal-content{
+        box-shadow: none!important ;
+    }
+    .modal.in .modal-dialog{
+        transform: none;
+    }
+    .modal.fade .modal-dialog{
+        transform: none;
+    }
+    .modal-backdrop {
+        background-color: transparent ;
+    }
 </style>
 <div class="com-del-box" name="rule_model">
     <div class="title">

src/main/webapp/resources/view/vendor/forstore/vendor_index.html

@@ -12,81 +12,6 @@
         border-radius: 4px;
         margin-right: 5px;
     }
-    /*配送规则弹框*/
-    .com-del-box {
-        position: fixed;
-        z-index: 2;
-        opacity: 1;
-        background-color: white;
-        -webkit-box-shadow: 0 5px 15px rgba(0,0,0,.5);
-        box-shadow: 0 5px 15px rgba(0,0,0,.5);
-        top: 55%;
-        left: 50%;
-        height: 155px;
-        width: 290px;
-        margin: -145px 0 0 -77px;
-    }
-    .com-del-box .title {
-        height: 30px;
-        background-color: #5078cb;
-        text-align: right;
-        padding-right: 15px;
-        line-height: 30px;
-    }
-    .com-del-box .title a {
-        color: white;
-        font-size: 16px;
-    }
-    .com-del-box .content{
-        padding: 15px 12px 14px 20px;
-        width: 100%;
-        text-align: center;
-        margin: 0 auto;
-    }
-    .com-del-box .content p{
-        font-size: 14px;
-        padding-top: 10px;
-        padding-bottom: 10px;
-        margin-bottom: 7px;
-        overflow: hidden;
-        line-height: 0;
-    }
-    .com-del-box .content p .fa-exclamation-circle{
-        float: left;
-        margin-top: 3px;
-        margin-right: 6px;
-        color: #5078cb;
-        font-size: 18px;
-    }
-    .com-del-box .content p span{
-        float: left;
-        width: 230px;
-        line-height: 21px;
-        text-align: left;
-        font-size: 14px;
-        color: #333333
-    }
-    .com-del-box .content div {
-        margin: 0 auto;
-        text-align: center;
-    }
-    .com-del-box .content div a{
-        margin-right: 15px ;
-        width: 74px;
-        height: 28px;
-        line-height: 28px;
-        display: inline-block;
-        text-align: center;
-        font-size: 14px;
-        color: #fff;
-    }
-    .com-del-box .content div a:first-child {
-        margin-right: 15px ;
-        background: #c8c6c6;
-    }
-    .com-del-box .content div a:last-child {
-        background: #5078cb;
-    }
 </style>
 <div class="user_right fr">
     <div class="right_l">