upup 平板视频、平板监测、平板很多东西

public/configExcel.js

@@ -141,140 +141,160 @@ var configExcel = {
       "类型": "五律",
       "朝代": "唐",
       "作者": "李白",
-      "正文": "野竹攒石生 含烟映江岛\n翠色落波深 虚声带寒早\n龙吟曾未听 凤曲吹应好\n不学蒲柳凋 贞心尝自保"
+      "正文": "野竹攒石生 含烟映江岛\n翠色落波深 虚声带寒早\n龙吟曾未听 凤曲吹应好\n不学蒲柳凋 贞心尝自保",
+      "顶部距离": '11vh'
     },
     {
       "标题": "严郑公宅同咏竹",
       "类型": "五律",
       "朝代": "唐",
       "作者": "杜甫",
-      "正文": "绿竹半含箨 新梢才出墙\n色侵书帙晚 阴过酒樽凉\n雨洗娟娟净 风吹细细香\n但令无剪伐 会见拂云长"
+      "正文": "绿竹半含箨 新梢才出墙\n色侵书帙晚 阴过酒樽凉\n雨洗娟娟净 风吹细细香\n但令无剪伐 会见拂云长",
+      "顶部距离": '20vh'
     },
     {
       "标题": "竹里馆",
       "类型": "五绝",
       "朝代": "唐",
       "作者": "王维",
-      "正文": "独坐幽篁里 弹琴复长啸\n深林人不知 明月来相照"
+      "正文": "独坐幽篁里 弹琴复长啸\n深林人不知 明月来相照",
+      "顶部距离": '11vh'
     },
     {
       "标题": "庭竹",
       "类型": "五绝",
       "朝代": "唐",
       "作者": "刘禹锡",
-      "正文": "露涤铅粉节 风摇青玉枝\n依依似君子 无地不相宜"
+      "正文": "露涤铅粉节 风摇青玉枝\n依依似君子 无地不相宜",
+      "顶部距离": '11vh'
     },
     {
       "标题": "於潜僧绿筠轩",
       "类型": "五律",
       "朝代": "宋",
       "作者": "苏轼",
-      "正文": "宁可食无肉 不可居无竹\n无肉令人瘦 无竹令人俗\n人瘦尚可肥 士俗不可医\n旁人笑此言 似高还似痴\n若对此君仍大嚼 世间那有扬州鹤"
+      "正文": "宁可食无肉 不可居无竹\n无肉令人瘦 无竹令人俗\n人瘦尚可肥 士俗不可医\n旁人笑此言 似高还似痴\n若对此君仍大嚼 世间那有扬州鹤",
+      "顶部距离": '18vh'
     },
     {
       "标题": "竹颂",
       "类型": "五绝",
       "朝代": "宋",
       "作者": "黄庭坚",
-      "正文": "深根藏器时 寸寸抱奇节\n遭时上风云 故可傲冰雪"
+      "正文": "深根藏器时 寸寸抱奇节\n遭时上风云 故可傲冰雪",
+      "顶部距离": '11vh'
     },
     {
       "标题": "咏竹",
       "类型": "七绝",
       "朝代": "宋",
       "作者": "王安石",
-      "正文": "人怜直节生来瘦 \n自许高材老更刚\n曾与蒿藜同雨露 \n终随松柏到冰霜"
+      "正文": "人怜直节生来瘦 \n自许高材老更刚\n曾与蒿藜同雨露 \n终随松柏到冰霜",
+      "顶部距离": '11vh'
     },
     {
       "标题": "咏竹",
       "类型": "七律",
       "朝代": "宋",
       "作者": "徐庭筠",
-      "正文": "不论台阁与山林 爱尔岂惟千亩阴\n未出土时先有节 便凌云去也无心\n葛陂始与龙俱化 嶰谷聊同凤一吟\n月朗风清良夜永 可怜王子独知音"
+      "正文": "不论台阁与山林 爱尔岂惟千亩阴\n未出土时先有节 便凌云去也无心\n葛陂始与龙俱化 嶰谷聊同凤一吟\n月朗风清良夜永 可怜王子独知音",
+      "顶部距离": '11vh'
     },
     {
-      "标题": "水仙子<img src='/static/point.png'/>咏竹",
+      "标题": "水仙子<img src='./static/point.png'/>咏竹",
       "类型": "七律",
       "朝代": "元",
       "作者": "马谦斋",
-      "正文": "贞姿不受雪霜侵 直节亭亭易见心\n渭川风雨清吟枕 花开时有凤寻\n文湖州是个知音\n春日临风醉 秋霄对月吟\n舞闲阶碎影筛金"
+      "正文": "贞姿不受雪霜侵 直节亭亭易见心\n渭川风雨清吟枕 花开时有凤寻\n文湖州是个知音\n春日临风醉 秋霄对月吟\n舞闲阶碎影筛金",
+      "顶部距离": '18vh'
     },
     {
       "标题": "题文与可画竹",
       "类型": "七律",
       "朝代": "元",
       "作者": "柯九思",
-      "正文": "湖州放笔夺造化 \n此事世人那得知\n跫然何处见生气\n仿佛空庭月落时"
+      "正文": "湖州放笔夺造化 \n此事世人那得知\n跫然何处见生气\n仿佛空庭月落时",
+      "顶部距离": '19vh'
     },
     {
       "标题": "题画竹",
       "类型": "七绝",
       "朝代": "元",
       "作者": "萨都剌",
-      "正文": "小雨春池湿凤毛 \n天孙深夜织鲛绡\n何人更立湘江水 \n独倚薰风忆舜韶"
+      "正文": "小雨春池湿凤毛 \n天孙深夜织鲛绡\n何人更立湘江水 \n独倚薰风忆舜韶",
+      "顶部距离": '11vh'
     },
     {
-      "标题": "题画竹<img src='/static/point.png'/>谁谓籊籊竿",
+      "标题": "题画竹<img src='./static/point.png'/>谁谓籊籊竿",
       "类型": "五绝",
       "朝代": "元",
       "作者": "仇远",
-      "正文": "谁谓籊籊竿 乃不如劲草\n北风动地来 直节未易倒"
+      "正文": "谁谓籊籊竿 乃不如劲草\n北风动地来 直节未易倒",
+      "顶部距离": '23vh'
     },
     {
       "标题": "咏竹",
       "类型": "五绝",
       "朝代": "明",
       "作者": "朱元璋",
-      "正文": "雪压枝头低 虽低不着泥\n一朝红日出 依旧与天齐"
+      "正文": "雪压枝头低 虽低不着泥\n一朝红日出 依旧与天齐",
+      "顶部距离": '11vh'
     },
     {
       "标题": "水仙杂竹",
       "类型": "七绝",
       "朝代": "明",
       "作者": "徐渭",
-      "正文": "二月二日涉笔新 \n水仙竹叶两精神\n正如月下骑鸾女 \n何处堪容食肉人"
+      "正文": "二月二日涉笔新 \n水仙竹叶两精神\n正如月下骑鸾女 \n何处堪容食肉人",
+      "顶部距离": '15vh'
     },
     {
       "标题": "画竹",
       "类型": "五律",
       "朝代": "明",
       "作者": "徐渭",
-      "正文": "万物贵取影 写竹更宜然\n秾阴不通鸟 碧浪自翻天\n戛戛俱鸣石 迷迷别有烟\n直须文与可 把笔取神传"
+      "正文": "万物贵取影 写竹更宜然\n秾阴不通鸟 碧浪自翻天\n戛戛俱鸣石 迷迷别有烟\n直须文与可 把笔取神传",
+      "顶部距离": '11vh'
     },
     {
       "标题": "西湖竹枝",
       "类型": "七绝",
       "朝代": "明",
       "作者": "贝琼",
-      "正文": "六月玉泉来看鱼 \n湖头雨过尽芙蕖\n芙蕖花开郎更远 \n玉泉鱼少亦无书"
+      "正文": "六月玉泉来看鱼 \n湖头雨过尽芙蕖\n芙蕖花开郎更远 \n玉泉鱼少亦无书",
+      "顶部距离": '15vh'
     },
     {
       "标题": "竹石",
       "类型": "七绝",
       "朝代": "清",
       "作者": "郑燮",
-      "正文": "咬定青山不放松 \n立根原在破岩中\n千磨万击还坚劲 \n任尔东西南北风"
+      "正文": "咬定青山不放松 \n立根原在破岩中\n千磨万击还坚劲 \n任尔东西南北风",
+      "顶部距离": '11vh'
     },
     {
       "标题": "新竹",
       "类型": "七绝",
       "朝代": "清",
       "作者": "郑燮",
-      "正文": "新竹高于旧竹枝 \n全凭老干为扶持\n明年再有新生者 \n十丈龙孙绕凤池"
+      "正文": "新竹高于旧竹枝 \n全凭老干为扶持\n明年再有新生者 \n十丈龙孙绕凤池",
+      "顶部距离": '11vh'
     },
     {
       "标题": "潍县署中画竹呈年伯包大中丞括",
       "类型": "七绝",
       "朝代": "清",
       "作者": "郑燮",
-      "正文": "衙斋卧听萧萧竹 \n疑是民间疾苦声\n些小吾曹州县吏 \n一枝一叶总关情"
+      "正文": "衙斋卧听萧萧竹 \n疑是民间疾苦声\n些小吾曹州县吏 \n一枝一叶总关情",
+      "顶部距离": '25vh'
     },
     {
       "标题": "上元竹枝词",
       "类型": "七绝",
       "朝代": "清",
       "作者": "符曾",
-      "正文": "桂花香馅裹胡桃 \n江米如珠井水淘\n见说马家滴粉好 \n试灯风里卖元宵"
+      "正文": "桂花香馅裹胡桃 \n江米如珠井水淘\n见说马家滴粉好 \n试灯风里卖元宵",
+      "顶部距离": '16vh'
     }
   ],
   "画作": [
@@ -347,6 +367,9 @@ var configExcel = {
       "标题（展示）": "筼筜清影图",
       "朝代": "元",
       "作者": "吴镇",
+      "音": ['吴', '镇'],
+      "音图": 'wuzhen.png',
+      "注音": "吴镇",
       "馆藏": "台北故宫博物院藏",
       "装裱\/材质\/笔类型": "轴 纸本 墨笔",
       "尺寸": "纵102.6厘米\n横32.7厘米",

src/main.js

@@ -71,9 +71,20 @@ const userAgent = navigator.userAgent
 const isMobile = /Mobi|Android/i.test(userAgent)
 
 // 检测是否为平板设备
-const isTablet = /Tablet|iPad/i.test(userAgent)
+const isTablet = /iPad|Tablet|Kindle|Silk|Galaxy Tab|Nexus 7|Mi Pad|Redmi Pad |MediaPad/i.test(userAgent)
+
+function isIPad(userAgent) {
+  const userAgentLowerCase = userAgent.toLowerCase()
+  return (
+    userAgentLowerCase.includes('IPad') ||
+    (userAgentLowerCase.includes('Macintosh') &&
+      userAgentLowerCase.includes('Mac OS X') &&
+      !userAgentLowerCase.includes('IPhone') &&
+      !userAgentLowerCase.includes('IPod'))
+  )
+}
 
-if (!(isTablet || isMobile)) {
+if (!(isTablet || isMobile || isIPad)) {
   // console.log('isMobile: ', isMobile)
   const appDom = document.getElementById('app')
   appDom.style.maxWidth = '100%'

src/views/HomeView.vue

@@ -7,6 +7,8 @@ import HotspotDetail1 from "@/views/HotspotDetail1.vue"
 import HotspotDetail3 from "@/views/HotspotDetail3.vue"
 import { api as viewerApi } from "v-viewer"
 import Startup from "@/views/StartupView.vue"
+import { useWindowSize } from '@vueuse/core'
+
 
 const store = useStore()
 
@@ -20,6 +22,8 @@ const detailDescLeaf = configText.homepagePaintingDetailDescLeaf
 const router = useRouter()
 
 const { windowSizeInCssForRef, windowSizeWhenDesignForRef } = useSizeAdapt()
+const { width: windowWidth, height: windowHeight } = useWindowSize()
+
 
 const isShowPaintingDesc = ref(false)
 const isShowAuthorDesc = ref(false)
@@ -163,7 +167,7 @@ const backFu = () => {
         v-if="isShowVideoFadeToNextPage"
         ref="videoFadeToNextPageEl"
         class="fade-to-next-page"
-        src="@/assets/videos/fade-from-home-to-more-content.mp4"
+        :src="require(`@/assets/videos/fade-from-home-to-more-content${windowWidth >= 768 ? '-768' :''}.mp4`)"
         playsinline
         webkit-playsinline="true"
         x5-video-player-type="h5"

src/views/PoemList.vue

@@ -52,7 +52,9 @@
                 <span class="age">{{ item1["朝代"] }}</span>
               </div>
             </div>
-            <p>{{ item1["正文"] }}</p>
+            <p :style="{marginTop: item1['顶部距离']? item1['顶部距离'] :''}">
+              {{ item1["正文"] }}
+            </p>
           </div>
         </div>
       </div>

src/views/StartupView.vue

@@ -53,7 +53,7 @@
         v-show="isShowVideo"
         ref="videoEl"
         class="transition-video"
-        src="@/assets/videos/startup.mp4"
+        :src="require(`@/assets/videos/startup${windowWidth >= 768 ? '-768':''}.mp4`)"
         playsinline
         webkit-playsinline="true"
         x5-video-player-type="h5"
@@ -83,6 +83,8 @@ const store = useStore()
 
 const $env = inject('$env')
 
+const innerWidth = ref(window.innerWidth)
+
 const {
   windowSizeInCssForRef,
   windowSizeWhenDesignForRef,