Skip to content

C
cust-app
Commit 60f662bf authored by liwei's avatar liwei
Browse files
Options

删除了没用的页面，修改了登录页面的路径

parent 7efb3f42
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 901 deletions
pages.json
View file @ 60f662bf
......@@ -126,25 +126,9 @@
},
{
"root": "pageslogin",
"pages": [{
"path": "index/index",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "index/gender",
"style": {
"navigationStyle": "custom"
}
},
"pages": [
{
"path": "index/date",
"style": {
"navigationStyle": "custom"
}
}, {
"path": "index/bootpage",
"path": "index",
"style": {
"navigationStyle": "custom"
}
......
pages/tab/my.vue
View file @ 60f662bf
......@@ -338,7 +338,7 @@ import {setUserProfile} from '../../api/login/index'
//登录
login() {
uni.navigateTo({
url: "/pageslogin/index/index"
url: "/pageslogin/index"
})
},
//完善信息
......
pagesActivity/components/activityDetail.vue
View file @ 60f662bf
......@@ -85,7 +85,7 @@
this.countprice()
} else {
uni.navigateTo({
url: '/pageslogin/index/index'
url: '/pageslogin/index'
})
}
},
......
pageslogin/index/index.vue → pageslogin/index.vue
View file @ 60f662bf
<template>
<view class="home-page-container" @touchmove.stop.prevent="() => {}">
<view class="">
<image class="bgc-imga" src="../../static/images/bg-c.png" mode="widthFix"></image>
<image class="bgc-img" src="../static/images/home-bgc.png" mode="aspectFit"></image>
<!-- <image class="logo-img" src="../static/images/logo.png"></image>-->
<view class="start-btn">
<button open-type="getPhoneNumber" @getphonenumber="getPhoneNumber($event)">开始邂逅</button>
</view>
<image class="bgc-imga" src="../static/images/bg-c.png" mode="widthFix"></image>
<image class="bgc-img" src="static/images/home-bgc.png" mode="aspectFit"></image>
<!-- <image class="logo-img" src="static/images/logo.png"></image>-->
<view class="start-btn">
<button open-type="getPhoneNumber" @getphonenumber="getPhoneNumber($event)">开始邂逅</button>
</view>
</view>
</view>
</template>
......@@ -14,13 +14,12 @@
import {
login,
phoneLogin
} from '../../api/login/index';
} from '../api/login/index';
export default {
data() {
return {
//用户初始化登录 (可能用户类型传参错误)
initLoginError: false,
img: this.$BASE_URL,
tipMsg: '',
token:'',
openId: '',
......
pageslogin/index/bootpage.vue deleted 100644 → 0
View file @ 7efb3f42
<template>
<view class="home-page-container" @touchmove.stop.prevent="() => {}">
<image class="bgc-imga" src="../../static/images/bg-c.png" mode="aspectFill"></image>
<image class="bgc-img" src="../static/images/page.png" mode="aspectFill"></image>
<view class="div">
<view class="start-btning">
每天凌晨12点
</view>
<view class="start-btning">
为你推荐新的好友
</view>
</view>
<view class="start-btn" @click="handleShowTips">
<text>进入「 欧SSS 」</text>
</view>
</view>
</template>
<script>
export default {
data() {
return {
tipsShow: false,
obj:{}
};
},
onLoad(options) {
this.obj = JSON.parse(options.obj)
console.log(this.obj)
console.log( uni.getStorageSync('itemobj'),"===============")
},
methods: {
handleShowTips() {
uni.switchTab({
url: "/pages/tab/index"
})
},
}
}
</script>
<style lang="scss">
.start-btn {
width: 536rpx;
height: 84rpx;
background: linear-gradient(86deg, #C2D2F9 0%, #C5C2F3 100%);
margin: auto;
border-radius: 42rpx 42rpx 42rpx 42rpx;
line-height: 84rpx;
color: rgba(65, 92, 158, 0.89);
font-weight: 400;font-family: 'PingFang SC-Bold, PingFang SC';
font-size: 28rpx;
position: fixed;bottom: 15vh;left: 112rpx;
}
.div {
width: 100%;
height: 154rpx;
position: absolute;
top: 296rpx;
left: 0rpx;
}
.start-btning {
font-size: 48rpx;width: 100%;text-align: center;
font-family: 'SourceHanSerifCN-Heavy';
line-height: 84rpx;color: rgba(45, 49, 50, 0.9);
}
page {
height: 100%;
}
.home-page-container {
position: relative;
text-align: center;
width: 100vw;
height: 100%;
.pop-bgc {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
// z-index: -1;
}
.popup-container {
height: 562rpx;
width: 544rpx;
overflow: hidden;
.div-popo {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
.pop-title {
color: #4A4A4A;
font-weight: 800;
font-size: 40rpx;
margin-top: 78rpx;
}
.tips-content {
width: 448rpx;
margin: auto;
text-align: left;
margin-top: 50rpx;
line-height: 56rpx;
font-size: 28rpx;
.agreement-btn {
display: inline-block;
color: #5B83E8;
text-decoration: underline;
}
}
.btn-c {
display: flex;
margin: auto;
margin-top: 64rpx;
justify-content: space-between;
width: 428rpx;
}
}
.pop-btn {
width: 204rpx;
height: 76rpx;
border-radius: 38rpx;
text-align: center;
line-height: 76rpx;
border: 1rpx solid #446CD2;
color: #5B83E8;
&.agree {
border: none;
background: linear-gradient(86deg, #C2D2F9 0%, #C5C2F3 100%);
}
}
}
.logo-img {
width: 168rpx;
height: 226rpx;
margin-top: 90vw;
}
}
.bgc-img {
position: absolute;
top: -0rpx;
left: 0;
width: 100%;
pointer-events: none;
height: 100%;
}
.bgc-imga {
position: absolute;
top: -100rpx;
left: 0rpx;
width: 100%;
pointer-events: none;
height: 100%;
}
</style>
pageslogin/index/date.vue deleted 100644 → 0
View file @ 7efb3f42
<template>
<view class="container" @touchmove.stop.prevent="() => {}">
<u-navbar leftText=" " title=" " :bgColor="bgColor" :safeAreaInsetTop="true" :placeholder="true">
<view class="u-nav-slot" slot="left" @click="left">
<u-icon name="arrow-left" color="#000000" size="16" :bold="true"></u-icon>
</view>
</u-navbar>
<image class="bg-c" src="../../static/images/bg-c.png"></image>
<view class="sign-up-title-c">
<image class="bg1-l" src="../../static/images/left.png" mode="aspectFill"></image>
<image class="bg2-2" src="../../static/images/right.png" mode="aspectFill"></image>
<view class="sign-up-title-item">
请选择你的生日
</view>
<view class="sign-up-title-tips">
给你推荐年龄适配的Ta
</view>
</view>
<view class="date-c">
<my-select @valChange="handleDateChange" @curTime="curTime" :default-time="`${1997}-${12}-${1}`" mode="time"
class="my-select">
</my-select>
</view>
<view class="bottom">
<view class="to-btn" @click="getLocation">
下一步（2/2）
</view>
<view class="tips">
注册后生日不可修改
</view>
</view>
<ELM ref="elm" :msg="tipMsg"></ELM>
</view>
</template>
<script>
var amapFile = require('@/util/amap-wx.130.js');
import {
AMAPKEY
} from '../../util/api.js';
var amapPlugin = new amapFile.AMapWX({
key: AMAPKEY
});
let util = require('@/util/means.js');
import MySelect from '@/components/dateXZ.vue'
import ELM from '../../components/elm-toast/index.vue';
export default {
components: {
MySelect,
ELM
},
data() {
return {
selectSex: 'man',
bgColor: 'rgba(0, 31, 63, 0)',
isShow: false,
value1: Number(new Date()),
year: 1997,
month: 12,
day: 1,
img: this.$BASE_URL,
obj: {
},
tipMsg: '',
locationerr: false
};
},
onLoad(options) {
this.obj = JSON.parse(options.obj)
console.log(this.obj)
this.getCurrentTime()
},
methods: {
left() {
uni.navigateBack()
},
getCurrentTime() {
var date = new Date(); //当前时间
var year = date.getFullYear() //返回指定日期的年份
var month = this.repair(date.getMonth() + 1); //月
var day = this.repair(date.getDate()); //日
//当前时间
var curTime = year + "-" + month + "-" + day + " " + '00' + ":" + '00' + ":" + '00';
console.log(curTime)
this.obj.birthday = curTime
},
curTime(e) {
console.log(e)
this.obj.birthday = e
},
//补0
repair(i) {
if (i >= 0 && i <= 9) {
return "0" + i;
} else {
return i;
}
},
getLocation() {
console.log("获取位置信息")
if (this.obj.birthday) {
let age = util.mymethod(this.obj.birthday);
if (age < 16) {
this.tipMsg = "年龄小于16周岁";
this.$refs.elm.showDialog();
return;
}
}
let that = this
// 有权限则直接获取
console.log("开始获取位置信息")
amapPlugin.getRegeo({
success: (data) => {
console.log("高德地图获取位置信息成功")
console.log(data)
console.log('当前位置的经度：' + data[0].longitude);
console.log('当前位置的纬度：' + data[0].latitude);
let addresslocation = "";
if (data[0].regeocodeData.addressComponent.city.length == 0) {
addresslocation = data[0].regeocodeData.addressComponent.province;
} else {
addresslocation = data[0].regeocodeData.addressComponent.city;
}
console.log("获取用户位置信息：" + addresslocation)
//修改用户位置
that.obj.city = addresslocation;
that.obj.lon = data[0].longitude;
that.obj.lat = data[0].latitude;
console.log(that.obj)
uni.setStorageSync('itemobj', that.obj);
setTimeout(() => {
uni.navigateTo({
url: "/pageslogin/index/bootpage?obj=" + JSON
.stringify(that.obj)
})
}, 1000)
},
fail: (err) => {
if (this.locationerr == true) {
that.obj.city = "重庆市";
that.obj.lon = "106.55";
that.obj.lat = "29.56";
console.log(that.obj)
uni.setStorageSync('itemobj', that.obj);
setTimeout(() => {
uni.navigateTo({
url: "/pageslogin/index/bootpage?obj=" + JSON
.stringify(that.obj)
})
}, 1000)
} else {
console.log('获取失败引导用户授权', err)
this.locationerr = true;
// #ifdef MP-WEIXIN
uni.authorize({
scope: 'scope.userLocation',
success() {
console.log("用户授权成功")
//点击允许后--就一直会进入成功授权的回调 就可以使用获取的方法了
amapPlugin.getRegeo({
success: function(data) {
console.log("用户授权成功后高德地图获取位置成功")
console.log(data)
console.log('当前位置的经度：' + data[0].longitude);
console.log('当前位置的纬度：' + data[0].latitude);
let addresslocation = "";
if (data[0].regeocodeData.addressComponent.city
.length == 0) {
addresslocation = data[0].regeocodeData
.addressComponent.province;
} else {
addresslocation = data[0].regeocodeData
.addressComponent.city;
}
console.log("获取用户位置信息：" + addresslocation)
//修改用户位置
that.obj.city = addresslocation;
that.obj.lon = data[0].longitude;
that.obj.lat = data[0].latitude;
console.log(that.obj)
uni.setStorageSync('itemobj', that.obj);
setTimeout(() => {
uni.navigateTo({
url: "/pageslogin/index/bootpage?obj=" +
JSON
.stringify(that
.obj)
})
}, 1000)
},
fail: (errorl) => {
console.log('用户授权成功后高德地图获取位置失败', errorl)
this.tipMsg = "手机定位未开启，请开启定位后继续使用！";
this.$refs.elm.showDialog();
}
})
},
fail(error) {
//点击了拒绝授权后--就一直会进入失败回调函数--此时就可以在这里重新拉起授权窗口
console.log('拒绝授权', error)
uni.showModal({
title: '提示',
content: '若点击不授权，将无法使用位置功能',
cancelText: '不授权',
cancelColor: '#999',
confirmText: '授权',
confirmColor: '#f94218',
success(res) {
console.log(res)
if (res.confirm) {
// 选择弹框内授权
uni.openSetting({
success(res) {
console.log(res.authSetting)
}
})
} else if (res.cancel) {
// 选择弹框内 不授权
console.log('用户点击不授权')
}
}
})
}
})
// #endif
// #ifndef MP-WEIXIN
//引导用户
uni.getLocation();
// #endif
}
}
});
/* //修改用户位置
that.obj.city = "重庆市";
that.obj.lon = "106.498771";
that.obj.lat = "29.614222";
console.log(that.obj)
uni.setStorageSync('itemobj', that.obj);
setTimeout(() => {
uni.navigateTo({
url: "/pageslogin/index/bootpage?obj=" + JSON
.stringify(that.obj)
})
}, 1000) */
},
changeSex(val) {
this.selectSex = val
},
handleDateChange(year, month, day) {
this.year = year;
this.month = month;
this.day = day;
}
}
}
</script>
<style lang="scss" scoped>
.bg-c {
width: 100%;
height: 80vh;
position: absolute;
top: 0;
z-index: -1;
}
.sign-up-title-c {
position: relative;
width: 500rpx;
height: 200rpx;
margin: auto;
margin-top: 52rpx;
box-sizing: content-box;
overflow: hidden;
color: #333;
.bg1-l {
position: absolute;
top: 0rpx;
left: 20rpx;
width: 95rpx;
height: 85rpx;
}
.bg2-2 {
position: absolute;
top: 66rpx;
right: 0;
width: 83rpx;
height: 60rpx;
}
.sign-up-title-item {
font-size: 48rpx;
font-family: 'SourceHanSerifCN-Heavy';
text-align: center;
margin-top: 66rpx;
color: rgba(45, 49, 50, 0.9);
}
.sign-up-title-tips {
text-align: center;
font-weight: 400;
margin-top: 24rpx;
color: #666;
font-family: 'PingFang SC-Regular, PingFang SC';
font-size: 24rpx
}
}
.date-c {
margin-top: 160rpx;
.my-select {
margin: auto;
margin-top: 20rpx;
}
.select-date {
width: 150rpx;
height: 60rpx;
line-height: 60rpx;
text-align: center;
border-radius: 30rpx;
color: #415C9E;
font-size: 24rpx;
background: linear-gradient(86deg, #C2D2F9 0%, #C5C2F3 100%);
}
}
.bottom {
position: fixed;
bottom: 15vh;
width: 100%;
}
.to-btn {
width: 536rpx;
height: 84rpx;
background: linear-gradient(86deg, #C2D2F9 0%, #C5C2F3 100%);
border-radius: 42rpx 42rpx 42rpx 42rpx;
text-align: center;
font-family: 'PingFang SC-Bold, PingFang SC';
line-height: 84rpx;
margin: auto;
font-weight: 400;
color: rgba(65, 92, 158, 0.89);
font-size: 28rpx;
}
.tips {
margin: auto;
text-align: center;
margin-top: 30rpx;
font-size: 24rpx;
font-family: 'PingFang SC-Regular, PingFang SC';
font-weight: 400;
color: #B7B7B7;
}
</style>
\ No newline at end of file
pageslogin/index/gender.vue deleted 100644 → 0
View file @ 7efb3f42
<template>
<view @touchmove.stop.prevent="() => {}">
<u-navbar leftText=" " title=" " :bgColor="bgColor" @leftClick="left" :safeAreaInsetTop="true" :placeholder="true">
<view class="u-nav-slot" slot="left" >
<u-icon name="arrow-left" color="#000000" size="16" :bold="true"></u-icon>
</view>
</u-navbar>
<image class="bg-c" src="../../static/images/bg-c.png" mode="aspectFill"></image>
<view class="sign-up-title-c">
<image class="bg1-l" src="../../static/images/left.png" mode="aspectFill"></image>
<image class="bg2-2" src="../../static/images/right.png" mode="aspectFill"></image>
<view class="sign-up-title-item">
请选择你的性别
</view>
<view class="sign-up-title-tips">
给你推荐优质嘉宾
</view>
</view>
<view class="sex-c">
<view :class="['man-btn', { active: selectSex === 'man' }]" @click="changeSex('man')">
<image class="active-b" v-show="selectSex === 'man'" src="../static/images/sign-active-b.png" mode="widthFix">
</image>
<image v-show="selectSex !== 'man'" src="../static/images/man-t.png" mode="widthFix"></image>
<image v-show="selectSex === 'man'" src="../static/images/man-t-active.png" mode="widthFix"></image>
</view>
<view :class="['woman-btn', { active: selectSex === 'woman' }]" @click="changeSex('woman')">
<image class="active-b" v-show="selectSex === 'woman'" src="../static/images/sign-active-b.png"
mode="widthFix"></image>
<image v-show="selectSex !== 'woman'" src="../static/images/woman-t.png" mode="widthFix"></image>
<image v-show="selectSex === 'woman'" src="../static/images/woman-t-active.png" mode="widthFix">
</image>
</view>
</view>
<view class="bottom">
<view class="to-btn" @click="stepToNext">
下一步（1/2）
</view>
<view class="tips">
注册后性别不可修改
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
bgColor: 'rgba(0, 31, 63, 0)',
img: this.$BASE_URL,
selectSex: 'man',
obj: {}
};
},
onLoad() {
},
methods: {
left() {
console.log(1)
uni.navigateBack({
delta:1
})
},
changeSex(val) {
this.selectSex = val
},
stepToNext() {
console.log('jjjj');
var obj = {
gender: this.selectSex == 'man' ? 'MALE' : 'FEMALE'
}
uni.navigateTo({
url: "./date?obj=" + JSON.stringify(obj)
})
}
}
}
</script>
<style lang="scss" scoped>
page {
width: 100%;
height: 100%;
}
.bg-c {
width: 100%;
position: absolute;
top: 0;
height: 100%;
}
.sign-up-title-c {
position: relative;
width: 500rpx;
height: 200rpx;
margin: auto;
margin-top:52rpx;
overflow: hidden;
color: #333;
.bg1-l {
position: absolute;
top: 0;
left: 20rpx;
width: 95rpx;
height: 85rpx;
}
.bg2-2 {
position: absolute;
top: 66rpx;
right: 0;
width: 83rpx;
height: 60rpx;
}
.sign-up-title-item {
font-size: 48rpx;
text-align: center;
color: rgba(45, 49, 50, 0.9);
margin-top: 66rpx;font-family: 'SourceHanSerifCN-Heavy';
}
.sign-up-title-tips {
text-align: center;color:#666;
margin-top: 24rpx; font-family: 'PingFang SC-Regular, PingFang SC';
font-size: 24rpx;
font-weight: 400;
}
}
.sex-c {
width: 524rpx;
margin: auto;
margin-top: 158rpx;
display: flex;
justify-content: space-between;
&>view {
position: relative;
display: flex;
align-items: center;
justify-content: center;
width: 226rpx;
height: 226rpx;
text-align: center;
border-radius: 50%;
background-color: #F3F8FB;
border: 4rpx solid #F3F8FB;
image {
width: 106rpx;
height: 106rpx;
}
&.active {
border: 4rpx solid #5B83E8;
}
.active-b {
width: 48rpx;
position: absolute;
bottom: -24rpx;
left: 50%;
transform: translateX(-50%);
}
}
}
.bottom {
position: fixed;
bottom: 15vh;
width: 100%;
}
.to-btn {
width: 536rpx;
height: 84rpx;
background: linear-gradient(86deg, #C2D2F9 0%, #C5C2F3 100%);
border-radius: 42rpx 42rpx 42rpx 42rpx;
text-align: center;
line-height: 84rpx; font-family: 'PingFang SC-Bold, PingFang SC';
margin: auto;
color: rgba(65, 92, 158, 0.8);
font-weight: 400;
font-size: 28rpx;
}
.tips {
margin: auto;
text-align: center;
margin-top: 30rpx;font-family: 'PingFang SC-Regular, PingFang SC';
font-size: 24rpx;
font-weight: 400;
color: #B7B7B7;
}
</style>
pageslogin/index/noticeList.vue deleted 100644 → 0
View file @ 7efb3f42
<template>
<view class="announcement">
<view v-if="nodata">
<view class="noData">
<view class="nodataImage">
<image class="nodataImageClass" src=""/>
</view>
</view>
</view>
<view v-else>
<view class="card" v-for="item in announcementList" @click="gotopage(item)">
<view class="toptitle">{{item.title}}</view>
<view class="bottom">
<view class="time">{{item.pushTime}}</view>
<view style="display: flex;align-items: center;">
<image class="image" src=""/>
<view class="num" v-if="item.viewNum">{{item.viewNum}}次浏览</view>
<view class="num" v-else>0次浏览</view>
</view>
</view>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
nodata: false,
announcementList: [{
title:'111111',
pushTime:'2021-07-07',
viewNum: 10
}],
}
},
onShow() {
this.getannouncementList()
},
methods: {
getannouncementList() {
},
gotopage(res){
}
}
}
</script>
<style lang="scss" scoped>
.announcement{
padding: 36rpx;
.noData{
.nodataImage{
height: 100vh;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
.nodataImageClass{
width: 200rpx;
height: 200rpx;
}
}
}
.card{
padding: 34rpx;
height: 234rpx;
background: #FFFFFF;
box-shadow: 0px 0px 10px 1px rgba(0,0,0,0.08);
border-radius: 12px 12px 12px 12px;
margin-bottom: 26rpx;
.toptitle{
font-size: 16px;
font-family: Source Han Sans CN-Medium, Source Han Sans CN;
font-weight: 500;
color: #222222;
padding-bottom: 26rpx;
border-bottom: 1px solid #ECECEC;
}
.bottom{
padding-top: 26rpx;
display: flex;
justify-content: space-between;
.time{
font-size: 16px;
font-family: Source Han Sans CN-Regular, Source Han Sans CN;
font-weight: 400;
color: #666666;
}
.image{
width: 36rpx;
height: 36rpx;
margin-right: 16rpx;
}
}
}
}
</style>
pagesme/set/set.vue
View file @ 60f662bf
......@@ -81,10 +81,10 @@
// error
}
uni.switchTab({
url: '/pageslogin/index/index'
url: '/pageslogin/index'
});
/* uni.reLaunch({
url: '/pageslogin/index/index'
url: '/pageslogin/index'
}); */
} else {
this.tipMsg = res.data.msg;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment