commit

src/assets/styles/mixin.less

@@ -679,32 +679,46 @@
         border: 0;
     }
     }
-    .btnDanger.ant-btn:extend(.ant-table-expanded-row .btnPrimary.ant-btn) {
-        background: linear-gradient(0deg, @m-red0, @m-red1);
-        color: @m-white0;
-        font-size: 14px;
-        &:hover,
-        &:focus {
-            background: linear-gradient(0deg, @m-red0-hover 0%, @m-red1-hover 99%);
-            color: rgba(@m-white0, 0.8);
-            border: 0;
-        }
-    }
-    .btnDeafault.ant-btn:extend(.ant-table-expanded-row .btnPrimary.ant-btn) {
-        background: linear-gradient(0deg, @m-grey12 0%, @m-grey13 100%);
-        color: @m-white0;
-        font-size: 14px;
-        &:hover,
-        &:focus {
-            background: linear-gradient(0deg, @m-grey12-hover 0%, @m-grey13-hover 99%);
-            color: rgba(@m-white0, 0.8);
-            border: 0;
-        }
-    }
     .ant-btn+.ant-btn {
         margin-left: 10px;
     }
 }
+.btnDanger.ant-btn{
+    margin-left: 10px;
+    width: 80px;
+    height: 30px;
+    line-height: 31px;
+    text-align: center;
+    border: 0;
+    color: @m-white0;
+    font-size: 14px;
+    background: linear-gradient(0deg, @m-red0 0%, @m-red1 99%);
+    .rounded-corners(3px);
+    &:hover,
+    &:focus {
+        background: linear-gradient(0deg, @m-red0-hover 0%, @m-red1-hover 99%);
+        color: rgba(@m-white0, 0.8);
+        border: 0;
+    }
+}
+.btnDeafault.ant-btn {
+    margin-left: 10px;
+    width: 80px;
+    height: 30px;
+    line-height: 31px;
+    text-align: center;
+    border: 0;
+    color: @m-white0;
+    font-size: 14px;
+    background: linear-gradient(0deg, @m-grey12 0%, @m-grey13 100%);
+    .rounded-corners(3px);
+    &:hover,
+    &:focus {
+        background: linear-gradient(0deg, @m-grey12-hover 0%, @m-grey13-hover 99%);
+        color: rgba(@m-white0, 0.8);
+        border: 0;
+    }
+}
 .hiddenFirstCol {
     .ant-table {
         .ant-table-content {
@@ -971,4 +985,135 @@
             }
         }
     }
+}
+
+.tltLeft {
+    font-size: 16px;
+    text-align: left;
+    .icon {
+        font-size: 20px;
+        fill: @m-blue0;
+        margin-right: 10px;
+    }
+}
+
+.ant-collapse.spotCollapse.ant-collapse-borderless {
+    margin-top: 10px;
+    background-color: transparent;
+    .ant-collapse-item {
+        border-bottom: 0;
+        .ant-collapse-header {
+            color: @m-grey17;
+            font-size: 14px;
+            border-bottom: 1px solid @m-grey18;
+            padding: 10px 8px 10px 44px;
+            height: 43px;
+            .ant-collapse-arrow {
+                fill: @m-grey17;
+                width: 16px;
+                height: 16px;
+                font-size: 16px;
+                left: 0;
+            }
+        }
+        .ant-collapse-content {
+            .ant-collapse-content-box {
+                padding: 0 0 0 30px;
+                background-color: transparent;
+                .ant-row.contRow {
+                    width: 100%;
+                    height: 40px;
+                    line-height: 40px;
+                    font-size: 16px;
+                    color: @m-white1;
+                    margin-bottom: 10px;
+                    background: #0f161c;
+                    border: 1px solid #172b56;
+                    border-radius: 3px;
+                    padding-left: 14px;
+                    padding-right: 12px;
+                    .ant-col:last-child {
+                        text-align: right;
+                    }
+                    .ant-col:first-child {
+                        text-align: left;
+                    }
+                }
+                .contRow:first-child {
+                    margin-top: 9px;
+                }
+                .contRow:last-child {
+                    margin-bottom: 20px;
+                }
+            }
+        }
+    }
+}
+.ant-collapse.busyCollapse.ant-collapse-borderless {
+    margin-top: 10px;
+    background: #0f161c;
+    border: 1px solid #172b56;
+    .rounded-corners(3px);
+    .ant-collapse-item {
+        border-bottom: 0;
+        .ant-collapse-header {
+            color: @m-grey17;
+            font-size: 14px;
+            border-bottom: 0;
+            padding: 0;
+            line-height: 43px;
+            .ant-collapse-arrow {
+                fill: @m-grey17;
+                width: 16px;
+                height: 16px;
+                font-size: 16px;
+                left: 0;
+            }
+            .ant-row.contRow {
+                width: 100%;
+                // height: 40px;
+                line-height: 40px;
+                font-size: 16px;
+                color: @m-white1;
+                margin-bottom: 10px;
+                // background: #0f161c;
+                border: 0 !important;
+                // border-radius: 3px;
+                padding-left: 14px;
+                padding-right: 12px;
+                .ant-col:last-child {
+                    text-align: right;
+                }
+                .ant-col:first-child {
+                    text-align: left;
+                }
+            }
+            .contRow:first-child {
+                margin-top: 0 !important;
+            }
+            .contRow:last-child {
+                margin-bottom: 0 !important;
+            }
+        }
+        .ant-collapse-content.ant-collapse-content-active {
+            .ant-collapse-content-box {
+                padding: 0 0 0 30px;
+                background-color: transparent;
+                .btn-list {
+                    width: calc(100% - 10px);
+                    justify-content: flex-end;
+                    padding-right: 10px;
+                    padding-bottom: 10px;
+                }
+            }
+        }
+    }
+}
+.ant-row.headRow {
+    .ant-col:first-child {
+        text-align: left;
+    }
+    .ant-col:nth-child(3) {
+        text-align: right;
+    }
 }

src/views/information/account_info/list/account_info_business/index.vue

@@ -66,13 +66,13 @@
             </a-col>
           </a-row>
         </template>
-        <a-collapse class="spotCollapse"
+        <a-collapse class="busyCollapse"
                     v-for="(item, i) in merchandiserList"
                     :key="i + '11'"
                     :bordered="false">
           <a-collapse-panel :show-arrow="false">
             <template #header>
-              <a-row class="headRow">
+              <a-row class="contRow">
                 <a-col :span="12">{{item.accountname}}-{{item.logincode}}</a-col>
                 <a-col :span="12">{{getLoginStatus(item.loginstatus)}}</a-col>
               </a-row>
@@ -125,5 +125,24 @@ export default defineComponent({
 
 <style lang="less">
 .account_info_business {
+    .tltLeft {
+        padding-left: 12px;
+    }
+    .ant-collapse.spotCollapse.ant-collapse-borderless {
+        padding-left: 43px;
+        padding-right: 43px;
+    }
+    .ant-row.headRow {
+        .ant-col:nth-child(2) {
+            text-align: right;
+            .operBtn.ant-btn {
+                float: right;
+                margin-top: -3px;
+                margin-bottom: 10px;
+                height: 26px;
+                line-height: 27px;
+            }
+        }
+    }
 }
 </style>

src/views/information/goods/components/rightHedging/index.vue

@@ -270,64 +270,57 @@ export default defineComponent({
         }
     }
 }
-.ant-collapse.spotCollapse.ant-collapse-borderless {
-    margin-top: 10px;
-    background-color: transparent;
-    .ant-collapse-item {
-        border-bottom: 0;
-        .ant-collapse-header {
-            color: @m-grey17;
-            font-size: 14px;
-            border-bottom: 1px solid @m-grey18;
-            padding: 10px 8px 10px 44px;
-            height: 43px;
-            .ant-collapse-arrow {
-                fill: @m-grey17;
-                width: 16px;
-                height: 16px;
-                font-size: 16px;
-                left: 0;
-            }
-        }
-        .ant-collapse-content {
-            .ant-collapse-content-box {
-                padding: 0 0 0 30px;
-                background-color: transparent;
-                .ant-row.contRow {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    font-size: 16px;
-                    color: @m-white1;
-                    margin-bottom: 10px;
-                    background: #0f161c;
-                    border: 1px solid #172b56;
-                    border-radius: 3px;
-                    padding-left: 14px;
-                    padding-right: 12px;
-                    .ant-col:last-child {
-                        text-align: right;
-                    }
-                    .ant-col:first-child {
-                        text-align: left;
-                    }
-                }
-                .contRow:first-child {
-                    margin-top: 9px;
-                }
-                .contRow:last-child {
-                    margin-bottom: 20px;
-                }
-            }
-        }
-    }
-}
-.ant-row.headRow {
-    .ant-col:first-child {
-        text-align: left;
-    }
-    .ant-col:nth-child(3) {
-        text-align: right;
-    }
-}
+// .ant-collapse.spotCollapse.ant-collapse-borderless {
+//     margin-top: 10px;
+//     background-color: transparent;
+//     .ant-collapse-item {
+//         border-bottom: 0;
+//         .ant-collapse-header {
+//             color: @m-grey17;
+//             font-size: 14px;
+//             border-bottom: 1px solid @m-grey18;
+//             padding: 10px 8px 10px 44px;
+//             height: 43px;
+//             .ant-collapse-arrow {
+//                 fill: @m-grey17;
+//                 width: 16px;
+//                 height: 16px;
+//                 font-size: 16px;
+//                 left: 0;
+//             }
+//         }
+//         .ant-collapse-content {
+//             .ant-collapse-content-box {
+//                 padding: 0 0 0 30px;
+//                 background-color: transparent;
+//                 .ant-row.contRow {
+//                     width: 100%;
+//                     height: 40px;
+//                     line-height: 40px;
+//                     font-size: 16px;
+//                     color: @m-white1;
+//                     margin-bottom: 10px;
+//                     background: #0f161c;
+//                     border: 1px solid #172b56;
+//                     border-radius: 3px;
+//                     padding-left: 14px;
+//                     padding-right: 12px;
+//                     .ant-col:last-child {
+//                         text-align: right;
+//                     }
+//                     .ant-col:first-child {
+//                         text-align: left;
+//                     }
+//                 }
+//                 .contRow:first-child {
+//                     margin-top: 9px;
+//                 }
+//                 .contRow:last-child {
+//                     margin-bottom: 20px;
+//                 }
+//             }
+//         }
+//     }
+// }
+
 </style>;

src/views/information/goods/components/rightSpot/index.vue

@@ -179,14 +179,7 @@ export default defineComponent({
             align-self: center;
             align-items: center;
         }
-        .tltLeft {
-            font-size: 16px;
-            .icon {
-                font-size: 20px;
-                fill: @m-blue0;
-                margin-right: 10px;
-            }
-        }
+
         .tltBtns {
             .ant-btn + .ant-btn {
                 margin-left: 10px;
@@ -252,58 +245,6 @@ export default defineComponent({
         }
     }
 }
-.ant-collapse.spotCollapse.ant-collapse-borderless {
-    margin-top: 10px;
-    background-color: transparent;
-    .ant-collapse-item {
-        border-bottom: 0;
-        .ant-collapse-header {
-            color: @m-grey17;
-            font-size: 14px;
-            border-bottom: 1px solid @m-grey18;
-            padding: 10px 8px 10px 44px;
-            height: 43px;
-            .ant-collapse-arrow {
-                fill: @m-grey17;
-                width: 16px;
-                height: 16px;
-                font-size: 16px;
-                left: 0;
-            }
-        }
-        .ant-collapse-content {
-            .ant-collapse-content-box {
-                padding: 0 0 0 30px;
-                background-color: transparent;
-                .ant-row.contRow {
-                    width: 100%;
-                    height: 40px;
-                    line-height: 40px;
-                    font-size: 16px;
-                    color: @m-white1;
-                    margin-bottom: 10px;
-                    background: #0f161c;
-                    border: 1px solid #172b56;
-                    border-radius: 3px;
-                    padding-left: 14px;
-                    padding-right: 12px;
-                    .ant-col:last-child {
-                        text-align: right;
-                    }
-                    .ant-col:first-child {
-                        text-align: left;
-                    }
-                }
-                .contRow:first-child {
-                    margin-top: 9px;
-                }
-                .contRow:last-child {
-                    margin-bottom: 20px;
-                }
-            }
-        }
-    }
-}
 .ant-row.headRow {
     .ant-col:first-child {
         text-align: left;