Merge pull request 'zmr' (#7) from zmr into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/7
This commit is contained in:
zhaomingrui 2020-06-02 15:35:36 +08:00
commit 640948442b
7 changed files with 419 additions and 37 deletions

View File

@ -0,0 +1,179 @@
<template>
<view>
<image v-if="type" class="welcome_images" src="../../static/pageA/welcome_img.jpg" mode="aspectFill"></image>
<view v-if="type" class="welcome_jumpes" @click="leap_over" >跳过{{remaining}}</view>
<view v-if="banner" class="welcome_jumpes" @click="leap_overto" >跳过</view>
<!-- 轮播图 -->
<view class="uni-padding-wrap" v-if="banner" >
<view class="page-section swiper">
<view class="page-section-spacing">
<swiper class="swiper" :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval" :duration="duration">
<swiper-item v-for="(item,index) in imgurl" :key="index">
<view class="swiper-item uni-bg-red">
<image :src="item" mode="aspectFill"></image>
</view>
</swiper-item>
</swiper>
</view>
</view>
</view>
<!-- 用户协议弹窗 -->
<view class="welcome_backes" v-if="protocol">
<view class="content">
<view class="title">用户协议</view>
<text class="protocol_content">
感谢您对德铭阳光在线的信任! 请注意在您使用本软件过程中我们会按照德铭阳光在线隐私保护声明权限声明 收集使用和共享您的个人信息请认真阅读并充分理解特别提示: 1为向您提供交易相关基本功能我们会收集使用必要的信息; 2基于您的授权我们可能会获取您的位置等信息您有权拒绝或取消授权; 3我们会采取业界先进的安全措施保护您的信息安全; 4未经您同意我们不会从第三方处获取共享或向其提供您的信息; 5您可以查询更正删除您的个人信息我们也提供账户注销的渠道
</text>
<view class="to_agree" @click="to_agree">我同意</view>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
remaining : 3,
type:true,
banner : false,
protocol : false,
heightes:'',
imgurl: ['../../static/pageA/welcome_banner.jpg', '../../static/pageA/welcome_img2.jpg', '../../static/pageA/welcome_img3.jpg'],
indicatorDots: true,
autoplay: true,
interval: 3000,
duration: 500
};
},
onLoad() {
},
methods: {
// 3
remaining_time(){
this.timer=setInterval(() => {
this.remaining--;
if(this.remaining <= 0){
clearInterval(this.timer);
// console.log("")
this.type = !this.type
this.banner = !this.banner;
}
},1000);
},
leap_over(){
this.type = !this.type
this.banner = !this.banner;
},
leap_overto(){
this.protocol = true
},
getSystemInfo(){
//
uni.getSystemInfo({
success: function (res) {
this.heightes = res.windowHeight;
console.log( this.heightes)
}
});
},
//
to_agree(){
uni.navigateTo({
url: '/pageA/login/login'
});
}
},
mounted(){
// 3
this.remaining_time()
//
this.getSystemInfo()
}
}
</script>
<style lang="scss" scoped>
.welcome_jumpes{
width: 90rpx;
height: 35rpx;
opacity:0.5;
border-radius:18rpx;
position: absolute;
right: 37rpx;
top: 34rpx;
font-size:20rpx;
text-align: center;
line-height: 35rpx;
color: #fff;
background: #C4CAC6;
z-index: 10;
}
.welcome_images {
width: 100%;
position: fixed;
height: 100%
}
uni-swiper,uni-view,uni-image{
width: 100%;
position: fixed;
height: 100%
}
uni-image{
width: 100%;
}
//
uni-swiper .uni-swiper-dot-active{
background-color: #fff!important;
}
.welcome_backes{
width: 100%;
position: fixed;
height: 100%;
background:#999999;
.content{
width:558rpx;
height:730rpx;
background:rgba(255,255,255,1);
position: absolute;
left: 0;
right: 0;
bottom: 0;
top: 0;
margin: auto;
.title{
width:558rpx;
text-align: center;
height:29rpx;
font-size:30rpx;
font-weight:bold;
color:rgba(51,51,51,1);
line-height:29rpx;
margin: 30rpx 0 24rpx 0;
}
.protocol_content{
width:494rpx;
height:528rpx;
font-size:24rpx;
font-weight:400;
color:rgba(51,51,51,1);
display: block;
text-align: left;
margin: 80rpx auto 33rpx;
letter-spacing: 1rpx;
text-align: justify;
line-height: 36rpx;
}
.to_agree{
width:558rpx;
font-size:30rpx;
font-weight:bold;
color:rgba(255,121,16,1);
text-align: center;
padding-top: 27rpx;
border-top: #D8D8D8 solid 1px;
}
}
}
</style>

View File

@ -1,8 +1,196 @@
<template>
<!-- login页面 -->
<view>
<view class="login">
<image class="images" src="../../static/pageA/loginbackground.png"></image>
<view class="backes"></view>
<view class="content">
<view class="title">手机登录</view>
<view class="labales">
<text>手机号</text>
<input type="tel" placeholder="" />
</view>
<view class="labales">
<text>请输入验证码</text>
<input type="tel" placeholder="" />
<text class="identifying">获取验证码</text>
</view>
<!-- 服务协议 -->
<view class="pact">
<view></view>
<text>我已详细阅读并同意</text>
<text class="pact_text">用户协议</text>
<text class="pact_text">隐私协议</text>
<text class="pact_text">使用协议</text>
<u-checkbox-group @change="checkboxGroupChange">
<u-checkbox @change="checkboxChange" v-model="item.checked" v-for="(item, index) in list" :key="index" :name="item.name" shape="circle" icon-size='16' active-color="#19BE6B"></u-checkbox>
</u-checkbox-group>
</view>
</view>
<!-- 注册 -->
<view class="more_Login">
<text>新用户点击注册</text>
<text class="other">其他方式登录</text>
</view>
<!-- denglu -->
<u-button >{{login}}</u-button>
</view>
</view>
</template>
<script>
export default {
data() {
return {
list: [{
checked: false,
disabled: false
}],
value: '',
login:'登录',
};
},
methods: {
// checkbox
checkboxChange(e) {
//console.log(e);
},
// checkboxcheckbox-group
checkboxGroupChange(e) {
// console.log(e);
}
}
};
</script>
<style>
<style lang="scss" scoped>
.login {
// background: url(../../static/pageA/loginbackground.png) no-repeat!important;
.images {
position: fixed;
width: 100%;
height: 100%;
top: 0;
left: 0;
z-index: -1;
}
.backes {
background: rgba(0, 0, 0, 0.4);
position: fixed;
width: 100%;
height: 100%;
z-index: -1;
}
text {
z-index: 9;
color: #fff;
}
.more_Login {
overflow: hidden;
zoom: 1;
width: 630rpx;
margin: 0 auto;
}
.more_Login text {
display: inline-block;
width: 50%;
float: left;
font-size: 30rpx;
color: rgba(255, 255, 255, 1);
line-height: 36px;
margin: 97rpx 0;
}
.more_Login .other {
text-align: right;
}
}
.title {
font-size: 36rpx;
font-weight: bold;
margin-bottom: 150rpx;
color: #fff;
}
.content {
width: 630rpx;
z-index: 99999;
margin: 0 auto;
padding-top: 130rpx;
.labales text {
font-size: 30rpx;
}
.labales {
border-bottom: 1px #fff solid;
margin-bottom: 90rpx;
}
.labales {
position: relative;
}
.identifying {
position: absolute;
right: 0;
top: 0;
bottom: 0;
margin: auto;
font-size: 30rpx;
font-weight: 500;
color: rgba(255, 120, 15, 1);
line-height: 36px;
}
}
.pact text {
font-size: 22rpx;
font-weight: 400;
color: rgba(255, 255, 255, 1);
line-height: 36px;
}
.pact_text {
font-size: 22px;
font-weight: 400;
color: rgba(129, 188, 253, 1) !important;
line-height: 36px;
}
//
.pact{
position: relative;
padding-left: 40rpx;
}
.u-checkbox-group{
position: absolute;
left: 0;
top: 0;
bottom: 0;
margin: auto;
}
.u-checkbox__icon--square{
border-radius: 50rpx!important;
width: 22rpx;
height: 22rpx;
}
.u-btn{
width:628rpx;
height:98rpx;
background:rgba(255,120,15,1)!important;
border-radius:49rpx;
margin: 0 auto;
font-size:36rpx;
color:rgba(255,255,255,1)!important;
line-height:36px;
border: 1px #ff780f solid;
outline: none;
border-color: rgba(255,120,15,1)!important;
}
</style>

View File

@ -1,12 +1,12 @@
<template>
<view class="welcome">
<image class="welcome_images" src="../../static/pageA/welcome_img.jpg" mode="aspectFill"></image>
<!-- 倒计时跳过 -->
<remaining></remaining>
</view>
</template>
<script>
import remaining from '@/components/remaining/remaining';
export default {
data() {
return {
@ -17,14 +17,30 @@
},
methods: {
}
},
mounted(){
},
components:{}
}
</script>
<style>
.welcome {}
.welcome_jumpes{
width: 90rpx;
height: 35rpx;
opacity:0.5;
border-radius:18rpx;
position: absolute;
right: 37rpx;
top: 34rpx;
font-size:20rpx;
text-align: center;
line-height: 35rpx;
color: #fff;
background: #C4CAC6;
}
.welcome_images {
width: 100%;
position: fixed;

View File

@ -1,43 +1,42 @@
{
"easycom": {
"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
},
"pages": [ //pageshttps://uniapp.dcloud.io/collocation/pages
{
"path": "pageA/welcome/welcome",
"style": {
"navigationBarTitleText": "uni-app"
}
},
{
"path": "pageA/welcome/welcome",
"style": {
"navigationBarTitleText": "",
"navigationStyle": "custom",
"app-plus": {
"titleNView": false,
"animationType": "slide-in-bottom"
}
}
},
{
"path": "pageA/login/login",
"style": {
"navigationBarTitleText": "",
"navigationStyle": "custom",
"app-plus": {
"titleNView": false,
"animationType": "slide-in-bottom"
}
}
},
{
"path": "pages/index/index",
"style": {
"navigationStyle": "custom"
"navigationBarTitleText": "uni-app"
}
}
],
"subPackages": [
{
"root": "pageE",
"pages": [
{
"path": "mine/MineIndex",
"style": {
"navigationBarTitleText": "我的",
"app-plus": {
"titleSize": "36px",
"titleColor": "#333333",
"titleNView": {
"autoBackButton": false,
"backgroundColor": "#FFFFFF"
}
}
}
}
]
}
],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app",
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8"
}
}
}

View File

@ -167,7 +167,6 @@ import zhiboItem from "@/components/index/zhibo-item/index"
import indexad from "@/components/index/ad/index"
import darenItem from "@/components/index/daren-item/index"
export default {
name:"index",
data(){

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 MiB

View File

@ -1,4 +1,5 @@
@import 'node_modules/uview-ui/theme.scss';
@import "uview-ui/index.scss";
/**
* 这里是uni-app内置的常用样式变量
*