diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index ee5be77..4bbcf3c 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -10,6 +10,10 @@ { "launchtype" : "local" }, + "h5" : + { + "launchtype" : "local" + }, "mp-weixin" : { "launchtype" : "local" diff --git a/main.js b/main.js index 43d2212..86a91d2 100644 --- a/main.js +++ b/main.js @@ -1,22 +1,4 @@ import App from './App' -// import music from '@/utils/music.js' -// // 挂载到vue实例上 -// Vue.prototype.$music = music - -// Vue.prototype.ScanAudio = function(src) { -// var music = null; -// if(music){ -// music.destroy() -// } -// music = uni.createInnerAudioContext(); //创建播放器对象 -// music.src = src; -// console.log("src",src) -// music.play(); //执行播放 -// music.onEnded(() => { -// //播放结束 -// music = null; -// }); -// } // #ifndef VUE3 import Vue from 'vue' diff --git a/manifest.json b/manifest.json index 074b85b..16260b4 100644 --- a/manifest.json +++ b/manifest.json @@ -7,6 +7,7 @@ "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { + "runmode" : "liberate", "usingComponents" : true, "nvueStyleCompiler" : "uni-app", "compilerVersion" : 3, @@ -16,6 +17,9 @@ "autoclose" : true, "delay" : 0 }, + "compatible" : { + "ignoreVersion" : true //true表示忽略版本检查提示框 + }, /* 模块配置 */ "modules" : { "VideoPlayer" : {} @@ -33,10 +37,14 @@ "", "", "", + "", + "", + "", "", "", "", "", + "", "", "", "", @@ -89,7 +97,12 @@ } }, "splashscreen" : { - "androidStyle" : "common" + "androidStyle" : "default", + "android" : { + "hdpi" : "C:/Users/xuhua/Desktop/画屏2/画屏/切图/bg.png", + "xhdpi" : "C:/Users/xuhua/Desktop/画屏2/画屏/切图/bg.png", + "xxhdpi" : "C:/Users/xuhua/Desktop/画屏2/画屏/切图/bg.png" + } } } }, @@ -115,5 +128,14 @@ "uniStatistics" : { "enable" : false }, - "vueVersion" : "2" + "vueVersion" : "2", + "h5" : { + "router" : { + "mode" : "" + }, + "devServer" : { + "port" : "", + "https" : false + } + } } diff --git a/pages/show/show.js b/pages/show/show.js index ac4f59e..6222b68 100644 --- a/pages/show/show.js +++ b/pages/show/show.js @@ -6,7 +6,7 @@ let data = { "relaase_id": "4028e3d47fd34b5d017fd34c08e60003", "relaase_name": "fsfsdf", "bgm_name": "res_01", - "bgm_main": "https://qiniu.aiyxlib.com/yuekan-BGM31.mp3", + "bgm_main": "yuekan-BGM31.mp3", "release_start": "2022-03-30 00:00:00.0", "release_end": "2022-04-24 00:00:00.0", "show_materials": [ @@ -14,10 +14,10 @@ let data = { "release_id": "4028e3d47fd34b5d017fd34c08e60003", "material_name": "bg-index.jpg", "material_type": "0", - "deposit_url": "https://qiniu.aiyxlib.com/yuekan-6-shiguangji%402x.png", - "img_path": "https://qiniu.aiyxlib.com/yuekan-6-shiguangji%402x.png", + "deposit_url": "yuekan-4-content-background@2x.png", + "img_path": "yuekan-4-content-background@2x.png", "device_direction": "1", - "duration": "2", + "duration": "4", "effect": "animate__fadeInTopRight", "bgm_name": "1-1", "bgm_url": '', @@ -27,20 +27,20 @@ let data = { "release_id": "4028e3d47fd34b5d017fd34c08e60003", "material_name": "s-j1.png", "material_type": "0", - "deposit_url": "https://qiniu.aiyxlib.com/yuekan-4-content-background%402x.png", - "img_path": "https://qiniu.aiyxlib.com/yuekan-4-content-background%402x.png", + "deposit_url": "yuekan-6-shiguangji@2x.png", + "img_path": "yuekan-6-shiguangji@2x.png", "device_direction": "1", "duration": "3", "effect": "animate__backInLeft", "bgm_name": '1-2', - "bgm_url": 'https://qiniu.aiyxlib.com/yuekan-BGM20-Chinap.mp3', + "bgm_url": 'yuekan-BGM27.mp3', "ranking": "2" }, { "release_id": "4028e3d47fd34b5d017fd34c08e60003", "material_name": "Atlas跑酷的成功与失败｜2021【Boston Dynamics】.mp4", "material_type": "1", - "deposit_url": "https://qiniu.aiyxlib.com/1608277325000.mp4", + "deposit_url": "1608277325000.mp4", "img_path": "", "device_direction": "1", "duration": "0", @@ -55,15 +55,15 @@ let data = { "relaase_id": "4028e3d47fcfa36c017fd0063c4d001a", "relaase_name": "111", "bgm_name": "res_02", - "bgm_main": "https://qiniu.aiyxlib.com/yuekan-BGM27.mp3", + "bgm_main": "yuekan-BGM31.mp3", "release_start": "2022-03-28 00:00:00.0", "release_end": "2022-03-28 00:00:00.0", "show_materials": [{ "release_id": "4028e3d47fcfa36c017fd0063c4d001a", "material_name": "s-j3.png", "material_type": "0", - "deposit_url": "https://qiniu.aiyxlib.com/bj45_1%402x.png", - "img_path": "https://qiniu.aiyxlib.com/bj45_1%402x.png", + "deposit_url": "bj45_1@2x.png", + "img_path": "bj45_1@2x.png", "device_direction": "1", "duration": "3", "effect": "animate__flip", @@ -75,8 +75,8 @@ let data = { "release_id": "4028e3d47fcfa36c017fd0063c4d001a", "material_name": "s-t3.png", "material_type": "0", - "deposit_url": "https://qiniu.aiyxlib.com/yuekan-1-read.jpg", - "img_path": "https://qiniu.aiyxlib.com/yuekan-1-read.jpg", + "deposit_url": "yuekan-1-read.jpg", + "img_path": "yuekan-1-read.jpg", "device_direction": "1", "duration": "10", "effect": "animate__rotateInUpRight", @@ -88,21 +88,21 @@ let data = { "release_id": "4028e3d47fcfa36c017fd0063c4d001a", "material_name": "s-j1.png", "material_type": "0", - "deposit_url": "https://qiniu.aiyxlib.com/bj_15%402x.png", - "img_path": "https://qiniu.aiyxlib.com/bj_15%402x.png", + "deposit_url": "bj_15@2x.png", + "img_path": "bj_15@2x.png", "device_direction": "1", "duration": "5", "effect": "animate__jackInTheBox", "bgm_name": '2-3', - "bgm_url": 'https://qiniu.aiyxlib.com/yuekan-BGM16.mp3', + "bgm_url": 'yuekan-BGM27.mp3', "ranking": "3" }, { "release_id": "4028e3d47fd34b5d017fd34c08e60003", "material_name": "bg-index.jpg", "material_type": "0", - "deposit_url": "https://qiniu.aiyxlib.com/yuekan-6-shiguangji%402x.png", - "img_path": "https://qiniu.aiyxlib.com/yuekan-6-shiguangji%402x.png", + "deposit_url": "yuekan-6-shiguangji@2x.png", + "img_path": "yuekan-6-shiguangji@2x.png", "device_direction": "1", "duration": "2", "effect": "animate__zoomInDown", @@ -114,8 +114,8 @@ let data = { "release_id": "4028e3d47fd34b5d017fd34c08e60003", "material_name": "s-j1.png", "material_type": "0", - "deposit_url": "https://qiniu.aiyxlib.com/yuekan-4-content-background%402x.png", - "img_path": "https://qiniu.aiyxlib.com/yuekan-4-content-background%402x.png", + "deposit_url": "yuekan-4-content-background@2x.png", + "img_path": "yuekan-4-content-background@2x.png", "device_direction": "1", "duration": "2", "effect": "animate__slideInLeft", @@ -127,7 +127,7 @@ let data = { "release_id": "4028e3d47fcfa36c017fd0063c4d001a", "material_name": "Atlas跑酷的成功与失败｜2021【Boston Dynamics】.mp4", "material_type": "1", - "deposit_url": "https://qiniu.aiyxlib.com/1634285181000.mp4", + "deposit_url": "1608277325000.mp4", "img_path": "", "device_direction": "1", "duration": "0", @@ -140,13 +140,13 @@ let data = { "release_id": "4028e3d47fcfa36c017fd0063c4d001a", "material_name": "s-j1.png", "material_type": "0", - "deposit_url": "https://qiniu.aiyxlib.com/bj_15%402x.png", - "img_path": "https://qiniu.aiyxlib.com/bj_15%402x.png", + "deposit_url": "bj_15@2x.png", + "img_path": "bj_15@2x.png", "device_direction": "1", "duration": "5", "effect": "animate__jackInTheBox", - "bgm_name": '2-3', - "bgm_url": 'https://qiniu.aiyxlib.com/yuekan-BGM16.mp3', + "bgm_name": '2-7', + "bgm_url": 'yuekan-BGM27.mp3', "ranking": "3" } ] @@ -155,29 +155,17 @@ let data = { "relaase_id": "4028e3d47fd34b5d017fd34c08e60003", "relaase_name": "fsfsdf", "bgm_name": "res_03", - "bgm_main": "https://qiniu.aiyxlib.com/yuekan-BGM19.mp3", + "bgm_main": "yuekan-BGM31.mp3", "release_start": "2022-03-30 00:00:00.0", "release_end": "2022-04-24 00:00:00.0", "show_materials": [ - { - "release_id": "4028e3d47fd34b5d017fd34c08e60003", - "material_name": "Atlas跑酷的成功与失败｜2021【Boston Dynamics】.mp4", - "material_type": "1", - "deposit_url": "https://qiniu.aiyxlib.com/1608277325000.mp4", - "img_path": "", - "device_direction": "1", - "duration": "0", - "effect": "false", - "bgm_name": null, - "bgm_url": null, - "ranking": "4" - }, + { "release_id": "4028e3d47fd34b5d017fd34c08e60003", "material_name": "bg-index.jpg", "material_type": "0", - "deposit_url": "https://qiniu.aiyxlib.com/yuekan-6-shiguangji%402x.png", - "img_path": "https://qiniu.aiyxlib.com/yuekan-6-shiguangji%402x.png", + "deposit_url": "yuekan-6-shiguangji@2x.png", + "img_path": "yuekan-6-shiguangji@2x.png", "device_direction": "1", "duration": "6", "effect": "animate__fadeInTopRight", @@ -189,14 +177,27 @@ let data = { "release_id": "4028e3d47fd34b5d017fd34c08e60003", "material_name": "s-j1.png", "material_type": "0", - "deposit_url": "https://qiniu.aiyxlib.com/bj_15%402x.png", - "img_path": "https://qiniu.aiyxlib.com/bj_15%402x.png", + "deposit_url": "bj45_1@2x.png", + "img_path": "bj45_1@2x.png", "device_direction": "1", "duration": "3", "effect": "animate__backInLeft", "bgm_name": '3-2', - "bgm_url": 'https://qiniu.aiyxlib.com/yuekan-BGM20-Chinap.mp3', + "bgm_url": 'yuekan-BGM27.mp3', "ranking": "2" + }, + { + "release_id": "4028e3d47fd34b5d017fd34c08e60003", + "material_name": "Atlas跑酷的成功与失败｜2021【Boston Dynamics】.mp4", + "material_type": "1", + "deposit_url": "1608277325000.mp4", + "img_path": "", + "device_direction": "1", + "duration": "0", + "effect": "false", + "bgm_name": null, + "bgm_url": null, + "ranking": "4" } ] }, diff --git a/pages/show/show.vue b/pages/show/show.vue index ebb130b..51162b6 100644 --- a/pages/show/show.vue +++ b/pages/show/show.vue @@ -1,13 +1,31 @@