Merge branch 'master' of http://git.huihenduo.com.cn:3000/wzh/JiangYunPhotosCargoOwner_WebApp into wuchan

src/apis/cloudLogin.js

@@ -9,8 +9,11 @@ const auth = tcb.auth({
 });
 
 async function AnonymousLogin() {
-  await auth.anonymousAuthProvider().signIn();
-  const loginState = await auth.getLoginState();
+  return new Promise(async (resolve, reject) => {
+    let signIn = await auth.anonymousAuthProvider().signIn();
+    const loginState = await auth.getLoginState();
+    resolve();
+  });
 }
-AnonymousLogin();
-export default tcb;
+
+export { AnonymousLogin, tcb };

src/components/Header.vue

@@ -47,7 +47,7 @@
 import store from "../store";
 import router from "../router";
 import { onMounted, ref } from "vue";
-import tcb from "../apis/cloudLogin";
+import { AnonymousLogin, tcb } from "../apis/cloudLogin";
 const db = tcb.database();
 const v = db.collection("huihenduo_versions");
 const __ = db.command;
@@ -98,7 +98,7 @@ export default {
     let timelineData = ref([]);
     // timelineData.value = vs.reverse();
     onMounted(() => {
-      getAbledVersions();
+      cloudLogin();
     });
     async function getAbledVersions() {
       let res = await v
@@ -107,6 +107,11 @@ export default {
         .get();
       timelineData.value = res.data.reverse();
     }
+
+    async function cloudLogin() {
+      await AnonymousLogin();
+      getAbledVersions();
+    }
     return {
       quit,
       contactName,

src/views/voyage/voyageDetail.vue

@@ -697,10 +697,10 @@
         </div>
       </div>
     </div>
-    <el-dialog v-model="mediaModal" :title="modalTitle" width="20%">
+    <el-dialog v-model="mediaModal" :title="modalTitle">
       <el-image
         v-if="modalType == 1"
-        style="width: 100%; height: 100%"
+        style="max-width: 80vw; max-height: 60vh; display: flex"
         fit="contain"
         :src="currentUrl"
         :preview-src-list="modalPreview"