diff --git a/public/index.html b/public/index.html
index 45df6a9..af81e0f 100644
--- a/public/index.html
+++ b/public/index.html
@@ -8,13 +8,10 @@
-->
-
-
-
diff --git a/src/mixins/leaveDialog.js b/src/mixins/leaveDialog.js
index 832e167..a1e3139 100644
--- a/src/mixins/leaveDialog.js
+++ b/src/mixins/leaveDialog.js
@@ -29,6 +29,11 @@ export default {
},
beforeRouteLeave(to, from, next) {
+ console.log(to.path);
+ if (to.path=='/videoCreate') {
+ next()
+ return
+ }
let that=this
setTimeout(() => {
Dialog.confirm({
diff --git a/src/views/model/editModel.vue b/src/views/model/editModel.vue
index aaf5548..761bd1a 100644
--- a/src/views/model/editModel.vue
+++ b/src/views/model/editModel.vue
@@ -1371,7 +1371,7 @@ export default {
// scrollbar-width: none;
// -ms-overflow-style: none;
display: flex;
- justify-content: start;
+ justify-content: flex-start;
align-items: flex-start;
flex-wrap: wrap;
margin-top: 10px;
@@ -1437,47 +1437,47 @@ export default {
height: 16px;
}
}
- .list {
- font-size: 10px;
- width: 100%;
- height: 210px;
- overflow-y: scroll;
- // scrollbar-width: none;
- // -ms-overflow-style: none;
- display: flex;
- justify-content: start;
- align-items: flex-start;
- flex-wrap: wrap;
- margin-top: 10px;
-
- .listItem {
- display: flex;
- justify-content: space-between;
- padding: 12px;
- margin-bottom: 10px;
- margin-left: 10px;
- // width: 170px;
- width: 45%;
- height: 50px;
- overflow: hidden;
- background: rgba(186, 186, 189, 0.5);
- border-radius: 24px;
- color: #fff;
-
- img {
- width: 32px;
- }
-
- > div {
- flex: 1;
- margin-left: 12px;
- }
- }
-
- .active {
- background: #7264f5;
- }
- }
+ // .list {
+ // font-size: 10px;
+ // width: 100%;
+ // height: 210px;
+ // overflow-y: scroll;
+ // // scrollbar-width: none;
+ // // -ms-overflow-style: none;
+ // display: flex;
+ // justify-content: start;
+ // align-items: flex-start;
+ // flex-wrap: wrap;
+ // margin-top: 10px;
+
+ // .listItem {
+ // display: flex;
+ // justify-content: space-between;
+ // padding: 12px;
+ // margin-bottom: 10px;
+ // margin-left: 10px;
+ // // width: 170px;
+ // width: 45%;
+ // height: 50px;
+ // overflow: hidden;
+ // background: rgba(186, 186, 189, 0.5);
+ // border-radius: 24px;
+ // color: #fff;
+
+ // img {
+ // width: 32px;
+ // }
+
+ // > div {
+ // flex: 1;
+ // margin-left: 12px;
+ // }
+ // }
+
+ // .active {
+ // background: #7264f5;
+ // }
+ // }
.list::-webkit-scrollbar {
width: 0;
display: none;
diff --git a/src/views/model/videoCreate.vue b/src/views/model/videoCreate.vue
index 8d64098..be9e0f4 100644
--- a/src/views/model/videoCreate.vue
+++ b/src/views/model/videoCreate.vue
@@ -37,7 +37,7 @@ export default {
data() {
return {
inPage: false,
- countdown: 10000,
+ countdown: 10,
timer: null
};
},