Merge remote-tracking branch 'v2-origin/master' into master-v2

src/views/account/validate.vue

@@ -69,15 +69,15 @@ export default {
     display: flex;
     flex-direction: column;
 }
-/deep/ .el-alert__content {
+::v-deep .el-alert__content {
     margin-top: 20px;
     text-align: center;
 }
-/deep/ .el-alert__title {
+::v-deep .el-alert__title {
     font-size: 18px;
     line-height: 25px;
 }
-/deep/ .el-alert__icon.is-big {
+::v-deep .el-alert__icon.is-big {
     font-size: 60px;
     width: 60px;
 }

src/views/form/DraggableItem.vue

@@ -132,18 +132,18 @@ export default {
 }
 </script>
 <style scoped>
-/deep/ .el-radio-group,
-/deep/ .el-checkbox-group {
+::v-deep .el-radio-group,
+::v-deep .el-checkbox-group {
     margin-left: 10px;
 }
-/deep/ .el-radio,
-/deep/ .el-checkbox {
+::v-deep .el-radio,
+::v-deep .el-checkbox {
     display: block;
     min-height: 23px;
     line-height: 23px;
 }
-/deep/ .el-radio__label,
-/deep/ .el-checkbox__label {
+::v-deep .el-radio__label,
+::v-deep .el-checkbox__label {
     font-size: 14px;
     padding-left: 10px;
     text-overflow: ellipsis;
@@ -152,11 +152,11 @@ export default {
     vertical-align: middle;
     display: inline-block;
 }
-/deep/ .item-other-input {
+::v-deep .item-other-input {
     margin-left: 20px;
     -webkit-tap-highlight-color: rgba(255, 255, 255, 0);
 }
-/deep/ .item-other-input:focus {
+::v-deep .item-other-input:focus {
     outline: none;
 }
 </style>

src/views/form/PreView.vue

@@ -66,12 +66,12 @@ export default {
     padding-top: 30px;
     background-color: #f7f7f7;
 }
-/deep/ .el-tabs__header {
+::v-deep .el-tabs__header {
     width: 300px;
     margin: 0 auto;
     border: none;
 }
-/deep/ .el-tabs--card > .el-tabs__header .el-tabs__item {
+::v-deep .el-tabs--card > .el-tabs__header .el-tabs__item {
     background-color: white;
     border: 1px solid white;
 }

src/views/form/setting.vue

@@ -851,19 +851,19 @@ export default {
     height: 49px;
     border-radius: 6px;
 }
-/deep/ .setting-input input {
+::v-deep .setting-input input {
     border: none;
     border-bottom: 1px solid rgba(187, 187, 187, 100);
     border-radius: 0;
     line-height: 20px;
     height: 20px;
 }
-/deep/ .collection-date-picker input {
+::v-deep .collection-date-picker input {
     border: none;
     border-bottom: 1px solid rgba(187, 187, 187, 100);
     border-radius: 0;
 }
-/deep/ .el-form-item--mini.el-form-item,
+::v-deep .el-form-item--mini.el-form-item,
 .el-form-item--small.el-form-item {
     margin: 0;
 }

src/views/form/statistics.vue

@@ -303,25 +303,25 @@ export default {
     width: 80%;
     margin: 0 auto;
 }
-/deep/ .el-icon-setting {
+::v-deep .el-icon-setting {
     font-size: 24px;
     line-height: 25px;
     color: white;
 }
-/deep/ .data-table-header .cell {
+::v-deep .data-table-header .cell {
     text-overflow: ellipsis !important;
     white-space: nowrap !important;
 }
 
 /* 1.显示滚动条：当内容超出容器的时候，可以拖动： */
-/deep/ .el-drawer__body {
+::v-deep .el-drawer__body {
     overflow: auto;
 
     /* overflow-x: auto; */
 }
 
 /* 2.隐藏滚动条，太丑了 */
-/deep/ .el-drawer__container ::-webkit-scrollbar {
+::v-deep .el-drawer__container ::-webkit-scrollbar {
     display: none;
 }