Skip to content

严立 / mini-shimao

Go to a project
Commit cfc38586 by 袁伟伦
Options

新的页面

parent 732b40f0
Inline Side-by-side
Showing with 166 additions and 33 deletions
pages/customerService/customerService.wxml
<!--pages/customerService/customerService.wxml--> <!--pages/customerService/customerService.wxml-->
<l-toast></l-toast> <l-toast></l-toast>
<navigation class="navigation" titleText="{{title}}" backIcon="/image/back.png" color="#15191F"></navigation> <navigation class="navigation" titleText="{{title}}" backIcon="/image/back.png" color="#ffffff"></navigation>
<view class="container"> <view class="container">
<image class="banner-img" src="http://upload.miaomiao-bao.com/70161202008161703131621.jpg"></image> <image class="banner-img" src="http://upload.miaomiao-bao.com/70161202008161703131621.jpg"></image>
<view class="customer-body"> <view class="customer-body">
......
pages/home/home.wxss
...@@ -70,6 +70,7 @@ ...@@ -70,6 +70,7 @@
box-shadow: 0 16rpx 48rpx 0 rgba(0, 0, 0, .05); box-shadow: 0 16rpx 48rpx 0 rgba(0, 0, 0, .05);
border-radius: 2px; border-radius: 2px;
overflow: hidden; overflow: hidden;
justify-content: space-between;
} }
.banner-notice text:nth-child(2) { .banner-notice text:nth-child(2) {
...@@ -269,6 +270,7 @@ ...@@ -269,6 +270,7 @@
.notice-bar { .notice-bar {
width: 330rpx !important; width: 330rpx !important;
line-height: 72rpx; line-height: 72rpx;
padding-left: 14rpx;
font-size: 28rpx; font-size: 28rpx;
color: #333 !important; color: #333 !important;
background-color: #ffffff !important; background-color: #ffffff !important;
......
pages/login/login.wxml
<!--pages/login/login.wxml--> <!--pages/login/login.wxml-->
<navigation class="navigation" backIcon="/image/back-w.png" bindback="back"></navigation> <navigation class="navigation" backIcon="/image/back-w.png" bindback="back"></navigation>
<view class="container" > <view class="container" >
<view style="height:{{height}}px;overflow:hidden;">
<image class="bgClass" src="http://upload.miaomiao-bao.com/97b52202008201410189925.png"></image> <image class="bgClass" src="http://upload.miaomiao-bao.com/97b52202008201410189925.png"></image>
<view class="imgContainer"> <view class="imgContainer">
<image class="titleImg" src="http://upload.miaomiao-bao.com/24614202008211016488542.png"></image> <image class="titleImg" src="http://upload.miaomiao-bao.com/24614202008211016488542.png"></image>
<image style="width:356rpx;height:40rpx;margin-bottom:138rpx;" src="./image/The blue island@2x.png"></image> <image style="width:356rpx;height:40rpx;margin-bottom:138rpx;" src="./image/The blue island@2x.png"></image>
<image class="font" src="./image/zq@2x.png" style="width:456rpx"></image> <image class="font" src="./image/zq@2x.png" style="width:456rpx"></image>
<image class="font" src="./image/tszr@2x.png" style="width:456rpx"></image>
<image class="font" src="./image/xhslqj@2x.png" style="width:228rpx"></image> <image class="font" src="./image/xhslqj@2x.png" style="width:228rpx"></image>
<image class="font" src="./image/syrs@2x.png" style="width:228rpx"></image> <image class="font" src="./image/syrs@2x.png" style="width:228rpx"></image>
<view class="btn-contanier">
</view>
<view class="btn-contanier">
<button class="loginBtn" hidden="{{islogin}}" open-type="getUserInfo" bindgetuserinfo="userInfoHandler">微信授权登录</button> <button class="loginBtn" hidden="{{islogin}}" open-type="getUserInfo" bindgetuserinfo="userInfoHandler">微信授权登录</button>
<view class="isloginBtn loginBtn" hidden="{{!islogin}}"> <view style="margin-right:10rpx;">已授权</view> <l-icon name="success" color="rgba(255,255,255,1);" size="28" /></view> <view class="isloginBtn loginBtn" hidden="{{!islogin}}"> <view style="margin-right:10rpx;">已授权</view> <l-icon name="success" color="rgba(255,255,255,1);" size="28" /></view>
<button class="loginBtn" hidden="{{isphone}}" open-type="getPhoneNumber" bindgetphonenumber="userPhoneHandler">绑定手机号</button> <button class="loginBtn" hidden="{{isphone}}" open-type="getPhoneNumber" bindgetphonenumber="userPhoneHandler">绑定手机号</button>
<view class="isloginBtn loginBtn" hidden="{{!isphone}}"><view style="margin-right:10rpx;">已绑定手机号</view><l-icon name="success" color="rgba(255,255,255,1);" size="28"/></view> <view class="isloginBtn loginBtn" hidden="{{!isphone}}"><view style="margin-right:10rpx;">已绑定手机号</view><l-icon name="success" color="rgba(255,255,255,1);" size="28"/></view>
</view> </view>
</view>
</view>
</view> </view>
pages/login/login.wxss
...@@ -32,7 +32,10 @@ ...@@ -32,7 +32,10 @@
} }
.btn-contanier{ .btn-contanier{
width:558rpx; width:558rpx;
margin-top: 176rpx; position: absolute;
bottom: 0;
left: 96rpx;
/* margin-top: 176rpx; */
} }
.loginBtn{ .loginBtn{
width:558rpx; width:558rpx;
......
pages/mine/mine.wxml
...@@ -67,6 +67,7 @@ ...@@ -67,6 +67,7 @@
<view class="my-activities-content">{{item.content}}</view> <view class="my-activities-content">{{item.content}}</view>
</view> </view>
</view> </view>
<view class="my-activities-item"></view>
</view> </view>
<l-list l-content-class="menu-title" title="我的预约" url="../myAppointment/myAppointment"></l-list> <l-list l-content-class="menu-title" title="我的预约" url="../myAppointment/myAppointment"></l-list>
<!-- 我的预约 --> <!-- 我的预约 -->
...@@ -83,6 +84,7 @@ ...@@ -83,6 +84,7 @@
<view class="subscribe" data-item="{{item}}" bindtap="gohotelAccommodation">预约凭证</view> <view class="subscribe" data-item="{{item}}" bindtap="gohotelAccommodation">预约凭证</view>
</view> </view>
</view> </view>
<view class="my-activities-item"></view>
</view> </view>
<l-list l-content-class="menu-title" title="客服中心" url="../customerService/customerService"></l-list> <l-list l-content-class="menu-title" title="客服中心" url="../customerService/customerService"></l-list>
</view> </view>
......
pages/mine/mine.wxss
...@@ -102,6 +102,10 @@ ...@@ -102,6 +102,10 @@
display: inline-block; display: inline-block;
position: relative; position: relative;
} }
.my-activities-item:last-child{
width:40rpx !important;
background-color: white;
}
.my-activities-top{ .my-activities-top{
position: absolute; position: absolute;
top: 0; top: 0;
...@@ -134,6 +138,10 @@ ...@@ -134,6 +138,10 @@
font-size: 26rpx; font-size: 26rpx;
padding-left:50rpx ; padding-left:50rpx ;
line-height: 2; line-height: 2;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
word-break: break-all;
} }
.subscribe{ .subscribe{
width: 150rpx; width: 150rpx;
......
pages/myActivity/myActivity.js
...@@ -21,6 +21,11 @@ Page({ ...@@ -21,6 +21,11 @@ Page({
loading: false, loading: false,
moreData: true, moreData: true,
}, },
goPlay(){
wx.switchTab({
url: '../../pages/play/play',
})
},
chageNav(e){ chageNav(e){
let index = e.currentTarget.dataset.index let index = e.currentTarget.dataset.index
this.setData({ this.setData({
......
pages/myActivity/myActivity.wxml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<!-- 遍历头部导航 --> <!-- 遍历头部导航 -->
<view bindtap="chageNav" data-index="{{index}}" wx:for="{{navItem}}" wx:key="index" class="navItem {{index == active? 'active':''}}">{{item.content}}</view> <view bindtap="chageNav" data-index="{{index}}" wx:for="{{navItem}}" wx:key="index" class="navItem {{index == active? 'active':''}}">{{item.content}}</view>
</view> </view>
<view class="activity-body" style="min-height:{{height}}rpx;"> <view class="activity-body">
<view class="my-activities-item " data-enrollid="{{item.enrollId}}" wx:for="{{data}}" wx:key="index" bindtap="activityDetail"> <view class="my-activities-item " data-enrollid="{{item.enrollId}}" wx:for="{{data}}" wx:key="index" bindtap="activityDetail">
<view class="my-activities-top {{item.type == 2?'timeendColor':''}}"> <view class="my-activities-top {{item.type == 2?'timeendColor':''}}">
{{item.time}} {{item.time}}
...@@ -24,7 +24,14 @@ ...@@ -24,7 +24,14 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="noActive" hidden="{{data.length > 0}}" >
<view class="noActive-title">暂无已报名的活动</view>
<view class="noActive-botton" bindtap="goPlay">发现畅玩活动</view>
</view>
</view> </view>
</view> </view>
......
pages/myActivity/myActivity.wxss
...@@ -4,10 +4,43 @@ ...@@ -4,10 +4,43 @@
} }
.myActivity-container{ .myActivity-container{
width: 750rpx; width: 750rpx;
/* margin-top: 60rpx;
padding-top: 90rpx; */
height: 100%; height: 100%;
} }
.noActive{
width: 750rpx;
position: absolute;
top: 50%;
text-align: center;
height: auto;
}
.noActive-title{
font-size:38rpx;
font-weight:500;
color:rgba(149,157,169,1);
line-height:52rpx;
}
.noActive-rule{
font-size:26rpx;
font-weight:400;
color:rgba(149,157,169,1);
line-height:36rpx;
margin-top: 24rpx;
}
.noActive-botton{
width:308rpx;
height:96rpx;
font-size:26rpx;
text-align: center;
font-weight:400;
line-height: 96rpx;
background:rgba(134,197,225,1);
border-radius:4px;
color:rgba(255,255,255,1);
font-size:30rpx;
margin: 0 auto;
margin-top: 64rpx;
}
.activity-nav{ .activity-nav{
width: 750rpx; width: 750rpx;
padding-top: 150rpx; padding-top: 150rpx;
......
pages/myAppointment/myAppointment.js
...@@ -7,8 +7,8 @@ Page({ ...@@ -7,8 +7,8 @@ Page({
*/ */
data: { data: {
navItem:[ navItem:[
{content:'全部',type:'0'}, // {content:'全部',type:'0'},
{content:'入园预约',type:'1'}, {content:'夜间入园预约',type:'1'},
{content:'看房预约',type:'2'}, {content:'看房预约',type:'2'},
], ],
data:[ // 假数据数组,type=0入园预约,type=1 看房预约 data:[ // 假数据数组,type=0入园预约,type=1 看房预约
...@@ -16,6 +16,7 @@ Page({ ...@@ -16,6 +16,7 @@ Page({
// {title:'看房预约',type:'1',time:'6月30日',num:3,url:' http://upload.miaomiao-bao.com/4c644202008141702599692.jpg'}, // {title:'看房预约',type:'1',time:'6月30日',num:3,url:' http://upload.miaomiao-bao.com/4c644202008141702599692.jpg'},
], ],
active:0, active:0,
height:0,
}, },
// 点击导航切换，默认是全部的 // 点击导航切换，默认是全部的
chageNav(e){ chageNav(e){
...@@ -31,10 +32,20 @@ Page({ ...@@ -31,10 +32,20 @@ Page({
url: '../hotelAccommodation/hotelAccommodation?detail='+JSON.stringify(e.currentTarget.dataset.item), url: '../hotelAccommodation/hotelAccommodation?detail='+JSON.stringify(e.currentTarget.dataset.item),
}) })
}, },
//预约
goAppoint(e){
let type = e.currentTarget.dataset.index;
wx.navigateTo({
url: '/pages/appointment/appointment?type='+type,
})
},
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
this.setData({
height: wx.getSystemInfoSync().windowHeight, //获取屏幕的高度
})
this.getList(this.data.active) this.getList(this.data.active)
}, },
...@@ -91,9 +102,8 @@ Page({ ...@@ -91,9 +102,8 @@ Page({
getList(index) { getList(index) {
let type = '' let type = ''
switch (index) { switch (index) {
case 0: type = ''; break; case 0: type = 0; break;
case 1: type = 0; break; case 1: type = 1 ; break;
case 2: type = 1; break;
} }
let that = this let that = this
app.wxRequest({ app.wxRequest({
......
pages/myAppointment/myAppointment.wxml
<!--pages/myAppointment/myAppointment.wxml--> <!--pages/myAppointment/myAppointment.wxml-->
<navigation class="navigation" titleText="我的预约" backIcon="/image/back.png"></navigation> <navigation class="navigation" titleText="我的预约" backIcon="/image/back.png"></navigation>
<view class="container"> <view class="container all">
<view class="myAppointment-nav"> <view class="myActivity-container" style="min-height:{{height}}px;">
<!-- 遍历头部导航 --> <view class="myAppointment-nav">
<view bindtap="chageNav" data-index="{{index}}" wx:for="{{navItem}}" wx:key="index" class="navItem {{index == active? 'active':''}}">{{item.content}}</view> <!-- 遍历头部导航 -->
</view> <view bindtap="chageNav" data-index="{{index}}" wx:for="{{navItem}}" wx:key="index" class="navItem {{index == active? 'active':''}}">{{item.content}}</view>
<view class="myAppointment-body">
<view class="myAppointment-item" wx:for="{{data}}" wx:key="index">
<image src="{{item.url}}" class="item-img"></image>
<view class="item-content">
<view class="item-title {{item.type == 0 ?'item-num-1' : ''}}">{{item.title}}</view>
<view class="item-time {{item.type == 1 ?'item-time-1' : ''}}">预约时间 {{item.time}}</view>
<view wx:if="{{item.type == 0}}" class="item-num">预约人数 {{item.num}}人</view>
</view> </view>
<view class="button" data-item="{{item}}" bindtap="gohotelAccommodation">预约凭证</view> <view class="myAppointment-body">
<view class="myAppointment-item" wx:for="{{data}}" wx:key="index">
<image src="{{item.url}}" class="item-img"></image>
<view class="item-content">
<view class="item-title {{item.type == 0 ?'item-num-1' : ''}}">{{item.title}}</view>
<view class="item-time {{item.type == 1 ?'item-time-1' : ''}}">预约时间 {{item.time}}</view>
<view wx:if="{{item.type == 0}}" class="item-num">预约人数 {{item.num}}人</view>
</view>
<view class="button" data-item="{{item}}" bindtap="gohotelAccommodation">预约凭证</view>
</view>
</view>
</view>
<view class="noActive" hidden="{{data.length > 0 || active == 1}}" >
<view class="noActive-title">暂无夜间入园预约</view>
<view class="noActive-rule">20:00后入园需要提前预约，每日限流200人</view>
<view class="noActive-botton" data-index="1" bindtap="goAppoint">去预约</view>
</view>
<view class="noActive" hidden="{{data.length > 0 || active == 0}}" >
<view class="noActive-title">暂无看房预约</view>
<view class="noActive-botton" data-index="2" bindtap="goAppoint">去预约</view>
</view> </view>
</view>
</view> </view>
pages/myAppointment/myAppointment.wxss
...@@ -11,6 +11,9 @@ ...@@ -11,6 +11,9 @@
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
} }
.all{
background-color: rgba(243,244,246,1);
}
.navItem{ .navItem{
line-height: 95rpx; line-height: 95rpx;
color: rgb(156, 158, 163); color: rgb(156, 158, 163);
...@@ -21,11 +24,46 @@ ...@@ -21,11 +24,46 @@
} }
.myAppointment-body{ .myAppointment-body{
width: 750rpx; width: 750rpx;
min-height: 1000rpx; /* min-height: 1000rpx; */
height: auto; height: auto;
/* background-color: rgb(245, 244, 249); */ /* background-color: rgb(245, 244, 249); */
padding-top: 50rpx; padding-top: 50rpx;
} }
.noActive{
width: 750rpx;
position: absolute;
top: 50%;
text-align: center;
height: auto;
}
.noActive-title{
font-size:38rpx;
font-weight:500;
color:rgba(149,157,169,1);
line-height:52rpx;
}
.noActive-rule{
font-size:26rpx;
font-weight:400;
color:rgba(149,157,169,1);
line-height:36rpx;
margin-top: 24rpx;
}
.noActive-botton{
width:308rpx;
height:96rpx;
font-size:26rpx;
text-align: center;
font-weight:400;
line-height: 96rpx;
background:rgba(134,197,225,1);
border-radius:4px;
color:rgba(255,255,255,1);
font-size:30rpx;
margin: 0 auto;
margin-top: 64rpx;
}
.myAppointment-item{ .myAppointment-item{
width: 670rpx; width: 670rpx;
height: 360rpx; height: 360rpx;
......
pages/ownerCertification/ownerCertification.wxml
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<view class="audit-item-nav">姓名</view> <view class="audit-item-nav">姓名</view>
<view class="audit-item-content">{{name}}</view> <view class="audit-item-content">{{name}}</view>
</view> </view>
<view> <view style="width:200rpx;">
<view class="audit-item-nav">手机号</view> <view class="audit-item-nav">手机号</view>
<view class="audit-item-content">{{phone}}</view> <view class="audit-item-content">{{phone}}</view>
</view> </view>
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<view class="audit-item-nav">身份证号</view> <view class="audit-item-nav">身份证号</view>
<view class="audit-item-content">{{idCard}}</view> <view class="audit-item-content">{{idCard}}</view>
</view> </view>
<view> <view style="width:200rpx;">
<view class="audit-item-nav">房号</view> <view class="audit-item-nav">房号</view>
<view class="audit-item-content">{{room}}</view> <view class="audit-item-content">{{room}}</view>
</view> </view>
......
project.config.json
...@@ -86,6 +86,20 @@ ...@@ -86,6 +86,20 @@
"id": -1, "id": -1,
"name": "pages/login/login", "name": "pages/login/login",
"pathName": "pages/login/login", "pathName": "pages/login/login",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/myAppointment/myAppointment",
"pathName": "pages/myAppointment/myAppointment",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/customerService/customerService",
"pathName": "pages/customerService/customerService",
"scene": null "scene": null
} }
] ]
......
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 sign in to comment