From 1f5af9d92b4a29911dfbe41aab421c36e6d0af4c Mon Sep 17 00:00:00 2001
From: Gdpao <1341331954@qq.com>
Date: Tue, 4 Aug 2020 14:36:35 +0800
Subject: [PATCH] gdpaoup
---
components/index/video-item/index.vue | 5 +-
components/remaining/remaining.vue | 68 +++++++++-----------------
manifest.json | 30 ++++++++++++
pageA/login/login.vue | 1 -
pageA/register/register.vue | 52 ++++++++++++--------
pageB/photo/index.vue | 2 +-
pages/index/index.vue | 3 +-
static/app/icon/144x144.png | Bin 0 -> 3152 bytes
static/app/icon/192x192.png | Bin 0 -> 3681 bytes
static/app/icon/72x72.png | Bin 0 -> 2212 bytes
static/app/icon/96x96.png | Bin 0 -> 2577 bytes
static/app/start/1080x1882.png | Bin 0 -> 26659 bytes
static/app/start/480x762.png | Bin 0 -> 11854 bytes
static/app/start/720x1242.png | Bin 0 -> 17707 bytes
14 files changed, 93 insertions(+), 68 deletions(-)
create mode 100644 static/app/icon/144x144.png
create mode 100644 static/app/icon/192x192.png
create mode 100644 static/app/icon/72x72.png
create mode 100644 static/app/icon/96x96.png
create mode 100644 static/app/start/1080x1882.png
create mode 100644 static/app/start/480x762.png
create mode 100644 static/app/start/720x1242.png
diff --git a/components/index/video-item/index.vue b/components/index/video-item/index.vue
index 3b0ff88..689e1c8 100644
--- a/components/index/video-item/index.vue
+++ b/components/index/video-item/index.vue
@@ -206,7 +206,10 @@ export default {
console.log(res)
if(res.errCode == 0) {
this.$emit("getArticlelist");
- }
+ // this.$u.toast(res.message);
+ } else {
+ // this.$u.toast(res.message);
+ }
})
},
articleCollect() {
diff --git a/components/remaining/remaining.vue b/components/remaining/remaining.vue
index 9d26b3f..90389cf 100644
--- a/components/remaining/remaining.vue
+++ b/components/remaining/remaining.vue
@@ -4,8 +4,9 @@
-
+ abc
@@ -17,10 +18,11 @@
-
+
+ 立即体验
@@ -54,7 +56,6 @@
protocol: false,
heightOut: '',
imgurl: [],
- loop: 'true',
vide0_url: '',
agreement: { // 用户协议内容
document_title: "",
@@ -67,28 +68,15 @@
src: '',
inputValue: '',
controls: false,
- autoplayes: true,
list: [],
- danmuList: [{
- text: '第 1s 出现的弹幕',
- color: '#ff0000',
- time: 1
- },
- {
- text: '第 3s 出现的弹幕',
- color: '#ff00ff',
- time: 3
- }
- ],
background: ['color1', 'color2', 'color3'],
indicatorDots: true,
- autoplay: true,
interval: 2000,
duration: 500
};
},
onReady: function(res) {
- this.videoContext = uni.createVideoContext('myVideo')
+ this.videoContext = uni.createVideoContext('myVideo');
},
methods: {
apiwelcome() {
@@ -110,7 +98,6 @@
let vide0_url = res.data.start_page[0].launch_path
this.list = data_image;
this.vide0_url = vide0_url;
- console.log(this.list)
})
},
// 3秒倒计时
@@ -120,7 +107,7 @@
if (this.remaining <= 0) {
clearInterval(this.timer);
console.log("完了")
- this.type = !this.type
+ this.type = !this.type;
this.banner = !this.banner;
}
}, 1000);
@@ -152,7 +139,7 @@
key: 'launchFlag',
data: true,
success: function() {
- console.log('error时存储launchFlag');
+ console.log('点击存储launchFlag');
}
});
uni.navigateTo({
@@ -161,7 +148,8 @@
},
// 视频引入
bindInputBlur: function(e) {
- this.inputValue = e.target.value
+ this.inputValue = e.target.value;
+ console.log(e.target.value);
},
bindButtonTap: function() {
var that = this
@@ -192,18 +180,6 @@
}
return '#' + rgb.join('')
},
- changeIndicatorDots(e) {
- this.indicatorDots = !this.indicatorDots
- },
- changeAutoplay(e) {
- this.autoplay = !this.autoplay
- },
- intervalChange(e) {
- this.interval = e.target.value
- },
- durationChange(e) {
- this.duration = e.target.value
- },
refreshToken_function(){
this.$u.api.refreshToken({}).then((res) => {
console.log(res)
@@ -215,10 +191,10 @@
}
},
mounted() {
- this.refreshToken_function()
+ this.refreshToken_function();
// 3秒倒计时调用
- this.remaining_time()
- this.apiwelcome()
+ this.remaining_time();
+ this.apiwelcome();
}
}
@@ -228,7 +204,7 @@
// height: 400rpx;
}
.welcome_jumpes {
- z-index: 10;
+ z-index: 10000;
position: absolute;
top: 80rpx;
right: 60rpx;
@@ -243,17 +219,21 @@
}
#myVideo {
- position: absolute;
- left: 0;
- right: 0;
- bottom: 0;
- top: 0;
- margin: auto;
+ width: 100%;
+ .time {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 10rpx;
+ height: 10rpx;
+ color: #fff;
+ font-size: 30rpx;
+ }
}
uni-video {
width: 100%;
- height: auto;
+ height: 100%;
}
.uni-video-container {
diff --git a/manifest.json b/manifest.json
index 53b03e8..75f9fef 100644
--- a/manifest.json
+++ b/manifest.json
@@ -97,6 +97,36 @@
"UniversalLinks" : "https://demo.dcloud.net.cn/ulink/"
}
}
+ },
+ "splashscreen" : {
+ "androidStyle" : "default",
+ "android" : {
+ "hdpi" : "static/app/start/480x762.png",
+ "xhdpi" : "static/app/start/720x1242.png",
+ "xxhdpi" : "static/app/start/1080x1882.png"
+ },
+ "iosStyle" : "storyboard"
+ },
+ "icons" : {
+ "android" : {
+ "hdpi" : "static/app/icon/72x72.png",
+ "xhdpi" : "static/app/icon/96x96.png",
+ "xxhdpi" : "static/app/icon/144x144.png",
+ "xxxhdpi" : "static/app/icon/192x192.png"
+ },
+ "ios" : {
+ "appstore" : "static/app/icon/192x192.png",
+ "iphone" : {
+ "app@2x" : "static/app/icon/144x144.png",
+ "app@3x" : "static/app/icon/192x192.png",
+ "spotlight@2x" : "static/app/icon/96x96.png",
+ "spotlight@3x" : "static/app/icon/144x144.png",
+ "settings@2x" : "static/app/icon/72x72.png",
+ "settings@3x" : "static/app/icon/96x96.png",
+ "notification@2x" : "static/app/icon/72x72.png",
+ "notification@3x" : "static/app/icon/72x72.png"
+ }
+ }
}
}
},
diff --git a/pageA/login/login.vue b/pageA/login/login.vue
index a234f09..5a10a1f 100644
--- a/pageA/login/login.vue
+++ b/pageA/login/login.vue
@@ -180,7 +180,6 @@
})
return false
} else {
- console.log(123)
me.loginIn(res.data.token); //存储一个字符传值
// 缓存用户的信息
uni.setStorageSync('user_info',res.data);
diff --git a/pageA/register/register.vue b/pageA/register/register.vue
index 55c9fc4..a9c3b49 100644
--- a/pageA/register/register.vue
+++ b/pageA/register/register.vue
@@ -8,11 +8,11 @@
手机注册
-
+
-
+
@@ -24,17 +24,18 @@
{{item.text}}
+ shape="circle" size="30" active-color="#19BE6B" >
- 其他方式登录
+
- {{login}}
+ {{login}}
+ 已有账号，立即登录
@@ -56,7 +57,10 @@