Merge branch 'dev' of xiongzhu/raex_front into master

src/App.vue

@@ -17,10 +17,9 @@
             <swiper
                 v-if="showSplash"
                 pagination
-                :space-between="16"
                 @reachEnd="reachEnd"
                 class="appSwiper"
-                :autoplay="{ delay: 1500, disableOnInteraction: false }"
+                :autoplay="{ delay: 3000, disableOnInteraction: false }"
             >
                 <swiper-slide>
                     <img src="@assets/splash1.jpg" alt="" />
@@ -40,7 +39,7 @@
                 <swiper-slide>
                     <img src="@assets/splash6.jpg" alt="" />
                 </swiper-slide>
-                <div class="tiaozhuan" @click="goApp">跳转</div>
+                <div class="tiaozhuan" @click="goApp">跳过</div>
             </swiper>
         </Transition>
     </div>
@@ -93,7 +92,7 @@ export default {
             checkEvent: null,
             keeps: [],
             bodyScroll: 0,
-            showSplash: false
+            showSplash: true
         };
     },
     watch: {
@@ -103,22 +102,17 @@ export default {
             });
         }
     },
-    mounted() {
-        // if (window.cordova && StatusBar) {
-        //     StatusBar.overlaysWebView(false);
-        // }
-    },
     methods: {
         goApp() {
+            this.showSplash = false;
             if (window.cordova && StatusBar) {
-                StatusBar.overlaysWebView(true);
+                StatusBar.styleDefault();
             }
-            this.showSplash = false;
         },
         reachEnd() {
             setTimeout(() => {
                 this.goApp();
-            }, 1500);
+            }, 3000);
         },
         setKeeps(keep = [], isAdd = true, isClear = false) {
             let keeps = [...this.keeps];
@@ -184,7 +178,7 @@ export default {
         img {
             width: 100%;
             height: 100%;
-            object-fit: contain;
+            object-fit: cover;
         }
     }
 
@@ -194,7 +188,7 @@ export default {
 
     .tiaozhuan {
         height: 26px;
-        background: rgba(0, 0, 0, 0.5);
+        background: rgba(0, 0, 0, 0.3);
         border-radius: 14px;
         font-size: 14px;
         font-weight: 400;
@@ -203,7 +197,7 @@ export default {
         padding: 0 16px;
         position: fixed;
         z-index: 30;
-        top: 36px;
+        top: calc(var(--safe-top) + 36px);
         right: 30px;
     }
 }

src/main.js

@@ -165,9 +165,9 @@ const loadSplash = (onload, onerror) =>
             if (isHide) return;
             isHide = true;
             splash.style.opacity = 0;
-            setTimeout(() => {
-                document.body.removeChild(splash);
-            }, 800);
+            // setTimeout(() => {
+            //     document.body.removeChild(splash);
+            // }, 800);
             resolve();
         }
 
@@ -178,7 +178,7 @@ const loadSplash = (onload, onerror) =>
             onload && onload();
             setTimeout(() => {
                 hideSplash();
-            }, 2000);
+            }, 0);
         };
         splash.onerror = () => {
             hideSplash();
@@ -186,9 +186,9 @@ const loadSplash = (onload, onerror) =>
         };
         setTimeout(() => {
             hideSplash();
-        }, 5000);
-        splash.src = 'https://cdn.raex.vip/splash.jpg';
-        document.body.append(splash);
+        }, 0);
+        // splash.src = 'https://cdn.raex.vip/splash.jpg';
+        // document.body.append(splash);
     });
 if (navigator.userAgent.includes('#review#')) {
     store.commit('setReview', true);
@@ -228,20 +228,25 @@ if (navigator.userAgent.includes('#cordova#')) {
                         }
                     });
             }
-            loadSplash(
-                () => {
-                    setTimeout(() => {
-                        navigator.splashscreen.hide();
-                    }, 100);
-                    mountApp();
-                },
-                () => {
-                    navigator.splashscreen.hide();
-                    mountApp();
-                }
-            ).then(res => {
-                StatusBar.styleDefault();
-            });
+            // loadSplash(
+            //     () => {
+            //         setTimeout(() => {
+            //             navigator.splashscreen.hide();
+            //         }, 100);
+            //         mountApp();
+            //     },
+            //     () => {
+            //         navigator.splashscreen.hide();
+            //         mountApp();
+            //     }
+            // ).then(res => {
+            //     StatusBar.styleDefault();
+            // });
+            setTimeout(() => {
+                navigator.splashscreen.hide();
+            }, 100);
+            mountApp();
+            // StatusBar.styleDefault();
             calcSafeArea();
             if ('android' === window.cordova.platformId) {
                 window.AndroidNotch.getInsetTop(

src/views/asset/Consignment.vue

@@ -154,6 +154,9 @@ export default {
             this.$http.post('/asset/getRoyalties?id=' + this.$route.query.id).then(res => {
                 this.royalties = res;
             });
+            // this.$http.post('/asset/getServicecharge?id=' + this.$route.query.id).then(res => {
+            //     this.serviceCharge = res;
+            // });
         });
     },
     methods: {