xiongzhu 4 роки тому
батько
коміт
b2490c93a4

+ 1 - 13
src/main/nine-space/public/index.html

@@ -16,18 +16,6 @@
     <meta name="x5-fullscreen" content="true" />
     <meta name="theme-color" content="#000000" />
     <title><%= htmlWebpackPlugin.options.title %></title>
-    <style>
-      html,
-      body,
-      #app,
-      .scroll-wrapper {
-        padding: 0;
-        margin: 0;
-        height: 100vh;
-        overflow: hidden;
-        -webkit-overflow-scrolling: touch;
-      }
-    </style>
   </head>
   <body>
     <noscript>
@@ -43,7 +31,7 @@
       document.body.addEventListener(
         'touchmove',
         function (e) {
-          e.preventDefault()
+          //e.preventDefault()
         },
         { passive: false },
       )

+ 5 - 4
src/main/nine-space/src/App.vue

@@ -56,10 +56,11 @@ export default {
             this.keeps = keeps;
         },
         init() {
-            this.bs = new BetterScroll(this.$refs.scroll, {
-                scrollY: true,
-                click: true
-            });
+            // this.bs = new BetterScroll(this.$refs.scroll, {
+            //     scrollY: true,
+            //     click: true,
+            //     bounce: false
+            // });
         },
         onLoad() {
             this.loading = true;

+ 1 - 1
src/main/nine-space/src/mixins/common.js

@@ -71,7 +71,7 @@ export default {
                 return !!item;
             });
             if (imgs.length > 0) {
-                return imgs[0];
+                return imgs[0] + (/\.gif$/i.test(imgs[0]) ? '' : '?x-oss-process=image/resize,h_300,m_lfit');
             } else {
                 return '';
             }

+ 89 - 70
src/main/nine-space/src/styles/app.less

@@ -1,97 +1,116 @@
 :root {
-  --van-primary-color: @prim;
-  --van-tabbar-item-active-background-color: @bg;
-  --van-tabbar-background-color: @bg;
-  --van-nav-bar-background-color: @bg;
-  --van-cell-background-color: @bg;
-  --van-text-color: #fff;
-  --van-gray-6: #939599;
-  --van-gray-3: @bg3;
-  --van-tabbar-item-active-color: #fff;
-  --van-button-plain-background-color: transparent;
-  --van-grid-item-content-background-color: transparent;
-  --van-button-mini-height: 26px;
-  --van-button-mini-font-size: 14px;
-  --van-tabs-nav-background-color: @bg;
-  --van-tabs-default-color: @prim;
-  --van-tabs-bottom-bar-color: @prim;
-  --van-tab-active-text-color: @prim;
-  --van-tab-disabled-text-color: #fff;
-  --van-cell-border-color: @bg3;
-  --van-cell-background-color: transparent;
-  --van-cell-group-background-color: transparent;
-  --van-font-size-lg: 14px;
-  --van-divider-border-color: #202122;
-  --van-divider-text-color: #202122;
-  --van-divider-margin: 0;
-  --van-field-error-message-color: #fdfb60;
-  --van-action-sheet-item-text-color: #000;
-  --van-uploader-upload-active-color: transparent;
-  --van-uploader-upload-background-color: transparent;
-  --van-uploader-file-background-color: transparent;
-  --van-active-color: @bg3;
-  --van-image-placeholder-background-color: @bg2;
-  --van-search-background-color: #181818;
-  --van-search-content-background-color: #0f0f0f;
+    --van-primary-color: @prim;
+    --van-tabbar-item-active-background-color: @bg;
+    --van-tabbar-background-color: @bg;
+    --van-nav-bar-background-color: @bg;
+    --van-cell-background-color: @bg;
+    --van-text-color: #fff;
+    --van-gray-6: #939599;
+    --van-gray-3: @bg3;
+    --van-tabbar-item-active-color: #fff;
+    --van-button-plain-background-color: transparent;
+    --van-grid-item-content-background-color: transparent;
+    --van-button-mini-height: 26px;
+    --van-button-mini-font-size: 14px;
+    --van-tabs-nav-background-color: @bg;
+    --van-tabs-default-color: @prim;
+    --van-tabs-bottom-bar-color: @prim;
+    --van-tab-active-text-color: @prim;
+    --van-tab-disabled-text-color: #fff;
+    --van-cell-border-color: @bg3;
+    --van-cell-background-color: transparent;
+    --van-cell-group-background-color: transparent;
+    --van-font-size-lg: 14px;
+    --van-divider-border-color: #202122;
+    --van-divider-text-color: #202122;
+    --van-divider-margin: 0;
+    --van-field-error-message-color: #fdfb60;
+    --van-action-sheet-item-text-color: #000;
+    --van-uploader-upload-active-color: transparent;
+    --van-uploader-upload-background-color: transparent;
+    --van-uploader-file-background-color: transparent;
+    --van-active-color: @bg3;
+    --van-image-placeholder-background-color: @bg2;
+    --van-search-background-color: #181818;
+    --van-search-content-background-color: #0f0f0f;
 }
 
-[contenteditable="true"],
+[contenteditable='true'],
 input,
 textarea {
-  -webkit-user-select: auto !important;
-  -khtml-user-select: auto !important;
-  -moz-user-select: auto !important;
-  -ms-user-select: auto !important;
-  -o-user-select: auto !important;
-  user-select: auto !important;
+    -webkit-user-select: auto !important;
+    -khtml-user-select: auto !important;
+    -moz-user-select: auto !important;
+    -ms-user-select: auto !important;
+    -o-user-select: auto !important;
+    user-select: auto !important;
 }
 
 .van-divider::after,
 .van-divider::before {
-  height: 5px;
+    height: 5px;
+}
+
+html,
+body,
+#app,
+.scroll-wrapper {
+    padding: 0;
+    margin: 0;
+    height: 100vh;
+    overflow: hidden;
+    -webkit-overflow-scrolling: touch;
+}
+.scroll-wrapper {
+    overflow: auto;
+    -webkit-overflow-scrolling: touch;
+}
+::-webkit-scrollbar {
+    display: none;
+    opacity: 0;
 }
 body {
-  font-size: 14px;
-  color: var(--van-text-color);
+    font-size: 14px;
+    color: var(--van-text-color);
 }
 
 input:-webkit-autofill {
-  box-shadow: 0 0 0px 1000px @bg inset;
-  -webkit-text-fill-color: #fff;
+    box-shadow: 0 0 0px 1000px @bg inset;
+    -webkit-text-fill-color: #fff;
 }
 
 .van-dialog {
-  color: #000;
+    color: #000;
 }
 
 .flex1 {
-  flex-grow: 1;
+    flex-grow: 1;
 }
 .van-dialog {
-  border-radius: 8px;
-  .van-dialog__header {
-    font-size: 16px;
-    font-weight: bold;
-    padding-top: 20px;
-  }
-  .van-hairline--left::after {
-    border-color: #f2f4f5;
-  }
-  .van-hairline--top::after {
-    border-color: #f2f4f5;
-  }
+    border-radius: 8px;
+    .van-dialog__header {
+        font-size: 16px;
+        font-weight: bold;
+        padding-top: 20px;
+    }
+    .van-hairline--left::after {
+        border-color: #f2f4f5;
+    }
+    .van-hairline--top::after {
+        border-color: #f2f4f5;
+    }
 
-  .van-dialog__message--has-title {
-    padding: 20px 40px 30px;
-  }
+    .van-dialog__message--has-title {
+        padding: 20px 40px 30px;
+    }
 }
 .van-dialog__footer {
-  .van-button--default {
-    color: #626366;
-  }
-  .van-dialog__confirm {
-    .van-button__text {
-      color: #ffa746;
+    .van-button--default {
+        color: #626366;
+    }
+    .van-dialog__confirm {
+        .van-button__text {
+            color: #ffa746;
+        }
     }
-  }
 }

+ 3 - 6
src/main/nine-space/src/views/Discover.vue

@@ -121,7 +121,9 @@ export default {
                 message: '加载中...',
                 forbidClick: true
             });
-            Promise.all([this.getBanner(), this.getList()]).then(() => {});
+            Promise.all([this.getBanner(), this.getList()]).then(() => {
+                this.$toast.clear();
+            });
         },
         getBanner() {
             this.$http
@@ -203,7 +205,6 @@ export default {
 
 .discover {
     background-color: @bg3;
-    padding-bottom: 100px;
 }
 
 /deep/ .mySwiper {
@@ -284,10 +285,6 @@ export default {
     padding: 0 8px;
 }
 
-.discover {
-    padding-bottom: 50px;
-}
-
 /deep/.van-tab {
     color: #fff;
     flex: 0;

+ 2 - 5
src/main/nine-space/src/views/Home.vue

@@ -125,10 +125,7 @@ export default {
             }),
             this.getMiner()
         ]).then(() => {
-            setTimeout(() => {
-                this.$toast.clear();
-                this.bs.value.refresh();
-            }, 100);
+            this.$toast.clear();
         });
     },
     methods: {
@@ -200,7 +197,7 @@ export default {
     width: 100%;
 }
 .home {
-    padding: 10px 0 100px;
+    padding: 10px 0 0 0;
 }
 
 .hot {

+ 1 - 1
src/main/nine-space/src/views/Store.vue

@@ -150,6 +150,7 @@ export default {
                     this.list = res.content;
                     this.empty = res.empty;
                     this.scrollRefreash();
+                    this.$toast.clear();
                 });
         },
         change(isFixed) {
@@ -292,7 +293,6 @@ export default {
 }
 
 .discover {
-    padding-bottom: 50px;
 }
 
 /deep/.van-tab {