From b0ceecaa861a5748182824cf937fb103c9bbdc8a Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Fri, 18 Mar 2022 09:07:49 +0800
Subject: [PATCH] +压窗屏
---
pages/home/home.vue | 14 ++++++-
store/lid/myAudio.js | 2
pages.json | 50 ++++++++++++++----------
uview-ui/components/u-full-screen/u-full-screen.vue | 13 +++++-
4 files changed, 52 insertions(+), 27 deletions(-)
diff --git a/pages.json b/pages.json
index 6ccb911..c5f2ab5 100644
--- a/pages.json
+++ b/pages.json
@@ -656,28 +656,36 @@
"enablePullDownRefresh": false
}
+ }, {
+ "path": "pages/grabOrders/taskCount/taskCount",
+ "style": {
+ "navigationBarTitleText": "查任务",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+
+ }, {
+ "path": "pages/grabOrders/personnelCount/personnelCount",
+ "style": {
+ "navigationBarTitleText": "人员统计",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+
+ },
+ {//压窗屏--就是一个普通的页面，去掉头尾和去掉左滑返回的透明页面
+ "path": "uview-ui/components/u-full-screen/u-full-screen",
+ "style": {
+ "navigationStyle": "custom", // 取消本页面的导航栏
+ "app-plus": {
+ "animationType": "fade-in", // 设置fade-in淡入动画，为最合理的动画类型
+ "background": "transparent", // 背景透明
+ "backgroundColor": "rgba(0,0,0,0)", // 背景透明
+ "popGesture": "none" // 关闭IOS屏幕左边滑动关闭当前页面的功能
+ }
+ }
}
- ,{
- "path" : "pages/grabOrders/taskCount/taskCount",
- "style" :
- {
- "navigationBarTitleText": "查任务",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
-
- }
- ,{
- "path" : "pages/grabOrders/personnelCount/personnelCount",
- "style" :
- {
- "navigationBarTitleText": "人员统计",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
-
- }
- ],
+ ],
"globalStyle": { //将组件安装在项目的components目录下，并符合components/组件名称/组件名称.vue目录结构。可以不用引用、注册，直接在页面中使用。
"autoscan": true
},
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 16a9808..fcc4361 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -18,8 +18,8 @@
<!-- <button type="default" class="buts">点击进入</button> -->
</u-popup>
<!-- <u-button @click="">打开</u-button>
- <u-button @click="ccc">打开</u-button>
- <u-button @click="aaa(0)">播放</u-button>
+ <u-button @click="ccc">打开</u-button> -->
+ <!--<u-button @click="aaa(0)">播放</u-button>
<u-button @click="bbb(0)">暂停</u-button>
<u-button @click="ddd(0)">结束</u-button>
<u-button @click="eee(0)">销毁</u-button>
@@ -254,6 +254,16 @@
}
},
methods: {
+ ccc() {
+ let content = `
+ 1. 修复badge组件的size参数无效问题<br>
+ 2. 新增Modal模态框组件<br>
+ 3. 新增压窗屏组件，可以在APP上以弹窗的形式遮盖导航栏和底部tabbar<br>
+ 4. 修复键盘组件在微信小程序上遮罩无效的问题
+ `;
+ this.$u.route("/uview-ui/components/u-full-screen/u-full-screen?content=" + content +
+ "&src=1345678");
+ },
aaa(i) {
let key = i == 1 ? 'keke' : 'song1';
this.$store.commit("controlAudio", {
diff --git a/store/lid/myAudio.js b/store/lid/myAudio.js
index c92e831..feb57ba 100644
--- a/store/lid/myAudio.js
+++ b/store/lid/myAudio.js
@@ -31,7 +31,7 @@
// doit();
}
$play(src) {
- console.log(this.state)
+ // console.log(this.state)
if (this.state == '2') {
//之前有播放 需要先清除
this.Audio.destroy();
diff --git a/uview-ui/components/u-full-screen/u-full-screen.vue b/uview-ui/components/u-full-screen/u-full-screen.vue
index 4f7e7d9..1464118 100644
--- a/uview-ui/components/u-full-screen/u-full-screen.vue
+++ b/uview-ui/components/u-full-screen/u-full-screen.vue
@@ -1,5 +1,6 @@
<template>
- <u-modal v-model="show" :show-cancel-button="true" confirm-text="升级" title="发现新版本" @cancel="cancel" @confirm="confirm">
+ <u-modal v-model="show" :show-cancel-button="true" confirm-text="升级" title="发现新版本" @cancel="cancel"
+ @confirm="confirm">
<view class="u-update-content">
<rich-text :nodes="content"></rich-text>
</view>
@@ -17,7 +18,12 @@
3. 新增压窗屏组件，可以在APP上以弹窗的形式遮盖导航栏和底部tabbar<br>
4. 修复键盘组件在微信小程序上遮罩无效的问题
`,
+ src: '',
}
+ },
+ onLoad(option) {
+ this.content = option.content;
+ this.src = option.src;
},
onReady() {
this.show = true;
@@ -28,6 +34,7 @@
},
confirm() {
this.closeModal();
+ console.log(this.src)
},
closeModal() {
uni.navigateBack();
@@ -38,11 +45,11 @@
<style scoped lang="scss">
@import "../../libs/css/style.components.scss";
-
+
.u-full-content {
background-color: #00C777;
}
-
+
.u-update-content {
font-size: 26rpx;
color: $u-content-color;
--
Gitblit v1.9.3