Bladeren bron

style: --

chenlei 1 jaar geleden
bovenliggende
commit
a22680cd21

+ 1 - 1
src/components/Video/index.tsx

@@ -17,7 +17,7 @@ export const VideoWrap: FC<VideoWrapProps> = ({
       <Video
         className="video-wrap__video"
         enableProgressGesture={false}
-        objectFit="contain"
+        objectFit="cover"
         onWaiting={() => {
           Taro.showLoading();
         }}

BIN
src/pages/banner/images/Group35@2x-min.png


BIN
src/pages/banner/images/tab2@2x-min.png


+ 2 - 10
src/pages/banner/index.tsx

@@ -1,7 +1,7 @@
 import { Swiper, SwiperItem, View, Image, Video } from "@tarojs/components";
-import Taro, { FC, pxTransform, useDidShow } from "@tarojs/taro";
+import Taro, { FC, pxTransform } from "@tarojs/taro";
 import classNames from "classnames";
-import { useEffect, useRef, useState } from "react";
+import { useRef, useState } from "react";
 import TitleImg1 from "./images/tab2@2x-min.png";
 import TitleImg2 from "./images/tab1@2x-min.png";
 import TitleImg3 from "./images/tab3@2x-min.png";
@@ -68,14 +68,6 @@ const BannerPage: FC = () => {
   const isFirstMove = useRef(true);
   const [visitVisible, setVisitVisible] = useState(false);
 
-  useEffect(() => {
-    console.log("mount", Taro.getSystemInfoSync());
-
-    return () => {
-      console.log("unmount");
-    };
-  }, []);
-
   const handleClick = (idx: number) => {
     if (idx !== active) return;
 

+ 4 - 2
src/pages/home/components/Menu/index.tsx

@@ -28,7 +28,7 @@ export const Menu: FC<MenuProps> = observer((props) => {
   const LIST = useMemo(
     () => [
       {
-        label: "要素地图",
+        label: "慈善地图",
         icon: MapIcon,
         activeIcon: ActMapIcon,
         children: [
@@ -50,7 +50,9 @@ export const Menu: FC<MenuProps> = observer((props) => {
           },
           {
             label: "慈善博物馆",
-            link: "/pages/iframe/index?url=" + encodeURIComponent(MUSEUM_URL),
+            link:
+              "/subModule/pages/portrait-iframe/index?url=" +
+              encodeURIComponent(MUSEUM_URL),
           },
           {
             label: "慈善云学校",

+ 3 - 1
src/subModule/pages/museum/index.tsx

@@ -7,7 +7,9 @@ import "./index.scss";
 const MuseumPage: FC = () => {
   const goRoam = () => {
     Taro.navigateTo({
-      url: "/pages/iframe/index?url=" + encodeURIComponent(MUSEUM_URL),
+      url:
+        "/subModule/pages/portrait-iframe/index?url=" +
+        encodeURIComponent(MUSEUM_URL),
     });
   };
 

+ 1 - 2
src/utils/index.ts

@@ -7,8 +7,7 @@ export const TOKEN_KEY = "token";
 export const NICKNAME_KEY = "nickname";
 export const USER_INFO_KEY = "userinfo";
 
-export const MUSEUM_URL =
-  "https://sit-locbigsecen.4dage.com/wxScene/index.html?m=wxcs_SG-igv7wQAyyyG&showBack=1";
+export const MUSEUM_URL = "https://www.4dkankan.com/spg.html?m=SG-fwjuL9mtG2A";
 
 export const getSceneUrl = (scene?: number) => {
   const name = getStorageSync(NICKNAME_KEY);

BIN
src/videos/xszc.mp4


BIN
src/videos/ysdt.mp4