Skip to content

严立 / mini-shimao

Go to a project
Commit 20488053 by wjw
Options

ww-拉取

parent a4b6d590
Inline Side-by-side
Showing with 67 additions and 53 deletions
pages/mine/appointment/appointment.js
...@@ -7,7 +7,7 @@ Page({ ...@@ -7,7 +7,7 @@ Page({
*/ */
data: { data: {
navItem: [ navItem: [
// {content:'全部',type:'0'}, {content:'主题活动',type:'0'},
{ {
content: '夜间入园预约', content: '夜间入园预约',
type: '1' type: '1'
...@@ -18,8 +18,8 @@ Page({ ...@@ -18,8 +18,8 @@ Page({
}, },
], ],
data: [ // 假数据数组,type=0入园预约,type=1 看房预约 data: [ // 假数据数组,type=0入园预约,type=1 看房预约
// {title:'夜间入园预约',type:'0',time:'6月30日 20:00-24:00',num:3,url:'http://upload.miaomiao-bao.com/36acd202008141719598303.jpg'}, {title:'夜间入园预约',type:'0',time:'6月30日 20:00-24:00',num:3,url:'http://upload.miaomiao-bao.com/36acd202008141719598303.jpg'},
// {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, height: 0,
...@@ -53,7 +53,7 @@ Page({ ...@@ -53,7 +53,7 @@ Page({
this.setData({ this.setData({
height: wx.getSystemInfoSync().windowHeight, //获取屏幕的高度 height: wx.getSystemInfoSync().windowHeight, //获取屏幕的高度
}) })
this.getList(this.data.active) // this.getList(this.data.active)
}, },
// 预约列表/我的预约 // 预约列表/我的预约
......
pages/mine/appointment/appointment.wxml
...@@ -7,14 +7,21 @@ ...@@ -7,14 +7,21 @@
<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="myAppointment-body"> <view class="myAppointment-body">
<view class="myAppointment-item" wx:for="{{data}}" wx:key="index"> <view class="appointment-wrapper">
<image src="{{item.url}}" class="item-img"></image> <view class="appointment-time">8月15日-7月15日 10:00-12:00</view>
<view class="item-content"> <view class="appointment-activity-content row">
<view class="item-title {{item.type == 0 ?'item-num-1' : ''}}">{{item.title}}</view> <view class="appointment-activity-img">
<view class="item-time {{item.type == 1 ?'item-time-1' : ''}}">预约时间 {{item.time}}</view> <image src=""></image>
<view wx:if="{{item.type == 0}}" class="item-num">预约人数 {{item.num}}人</view> </view>
</view> <view class="appointment-activity-info col con-a">
<view class="button" data-item="{{item}}" bindtap="gohotelAccommodation">预约凭证</view> <view class="appointment-activity-title">
<text>日落观光游船体验活动</text>
</view>
<view class="appointment-activity-num">
<text>报名人数 3人</text>
</view>
</view>
</view>
</view> </view>
</view> </view>
</view> </view>
......
pages/mine/appointment/appointment.wxss
...@@ -73,49 +73,54 @@ ...@@ -73,49 +73,54 @@
margin: 0 auto; margin: 0 auto;
margin-top: 64rpx; margin-top: 64rpx;
} }
.appointment-wrapper {
.myAppointment-item { position: relative;
width: 670rpx; width: 670rpx;
height: 360rpx; height: 360rpx;
margin-top: 78rpx;
margin: auto; margin: auto;
margin-bottom: 50rpx; padding: 24rpx 32rpx 0;
background-color: rgb(220, 214, 220); background-color: #FFFFFF;
border-radius: 4px; border-radius: 4rpx;
position: relative;
overflow: hidden;
} }
.item-img { .appointment-time {
width: 100%;
position: absolute; position: absolute;
height: 360rpx; left: 0;
top: -28rpx;
height: 56rpx;
padding: 0 24rpx;
font-size: 26rpx;
color: #fff;
line-height: 56rpx;
font-weight: 600;
background-color: #000;
border-radius: 4rpx;
} }
.item-content { .appointment-activity-img image {
width: 610rpx; width: 140rpx;
height: auto; height: 136rpx;
position: absolute; background-color: #ccc;
bottom: 45rpx;
left: 30rpx;
} }
.item-title { .appointment-activity-info {
font-size: 36rpx; flex: 1;
line-height: 70rpx; margin-left: 32rpx;
} }
.item-time { .appointment-activity-title {
line-height: 48rpx; color: #15191F;
font-size: 28rpx; font-size: 30rpx;
color: rgb(220, 214, 220); font-weight: 600;
line-height: 42rpx;
} }
.item-num { .appointment-activity-num {
font-size: 28rpx; margin-top: 16rpx;
color: rgb(220, 214, 220); color: #959DA9;
line-height: 48rpx; font-size: 26rpx;
} }
/* 入园标题样式 */ /* 入园标题样式 */
.item-num-1 { .item-num-1 {
......
pages/play/service-detail/service-detail.js
...@@ -643,7 +643,6 @@ Page({ ...@@ -643,7 +643,6 @@ Page({
}, },
success: function (response) { success: function (response) {
let funcData = response.data let funcData = response.data
console.log(funcData.serviceEvaluation)
that.setData({ that.setData({
officeServiceText: funcData.serviceEvaluation.toFixed(1), officeServiceText: funcData.serviceEvaluation.toFixed(1),
officeProductText: funcData.productEvaluatio.toFixed(1), officeProductText: funcData.productEvaluatio.toFixed(1),
......
pages/play/service-detail/service-detail.wxml
...@@ -195,22 +195,19 @@ ...@@ -195,22 +195,19 @@
<view class="evaluate" wx:if="{{contentType === 'evaluate'}}"> <view class="evaluate" wx:if="{{contentType === 'evaluate'}}">
<view class="evaluate-option row con-b align-c"> <view class="evaluate-option row con-b align-c">
<view class="evaluate-option-item row align-c"> <view class="evaluate-option-item row align-c">
<image wx:if="{{options.id === 2}}" src="{{imageBase + 'icon/evaluate-2.png'}}"></image> <image src="{{imageBase + 'icon/evaluate-1.png'}}"></image>
<image wx:else src="{{imageBase + 'icon/evaluate-1.png'}}"></image>
<text>服务</text> <text>服务</text>
<text>{{officeServiceText}}</text> <text>{{officeServiceText}}</text>
<text>分</text> <text>分</text>
</view> </view>
<view class="evaluate-option-item row align-c"> <view class="evaluate-option-item row align-c">
<image wx:if="{{options.id === 2}}" src="{{imageBase + 'icon/shop-2.png'}}"></image> <image src="{{imageBase + 'icon/shop-1.png'}}"></image>
<image wx:else src="{{imageBase + 'icon/shop-1.png'}}"></image>
<text>产品</text> <text>产品</text>
<text>{{officeProductText}}</text> <text>{{officeProductText}}</text>
<text>分</text> <text>分</text>
</view> </view>
<view class="evaluate-option-item row align-c"> <view class="evaluate-option-item row align-c">
<image wx:if="{{options.id === 2}}" src="{{imageBase + 'icon/album-2.png'}}"></image> <image src="{{imageBase + 'icon/album-1.png'}}"></image>
<image wx:else src="{{imageBase + 'icon/album-1.png'}}"></image>
<text>环境</text> <text>环境</text>
<text>{{officeEnvironmentalText}}</text> <text>{{officeEnvironmentalText}}</text>
<text>分</text> <text>分</text>
...@@ -392,21 +389,21 @@ ...@@ -392,21 +389,21 @@
<view class="evaluate movie-evaluate" wx:if="{{contentType === 'evaluate'}}"> <view class="evaluate movie-evaluate" wx:if="{{contentType === 'evaluate'}}">
<view class="evaluate-option row con-b align-c"> <view class="evaluate-option row con-b align-c">
<view class="evaluate-option-item row align-c"> <view class="evaluate-option-item row align-c">
<image src="{{imageBase + 'icon/evaluate-1.png'}}"></image> <image src="{{imageBase + 'icon/evaluate-2.png'}}"></image>
<text>服务</text> <text>服务</text>
<text>0.5</text> <text>{{officeServiceText}}</text>
<text>分</text> <text>分</text>
</view> </view>
<view class="evaluate-option-item row align-c"> <view class="evaluate-option-item row align-c">
<image src="{{imageBase + 'icon/shop-1.png'}}"></image> <image src="{{imageBase + 'icon/shop-2.png'}}"></image>
<text>产品</text> <text>产品</text>
<text>0.5</text> <text>{{officeProductText}}</text>
<text>分</text> <text>分</text>
</view> </view>
<view class="evaluate-option-item row align-c"> <view class="evaluate-option-item row align-c">
<image src="{{imageBase + 'icon/album-1.png'}}"></image> <image src="{{imageBase + 'icon/album-2.png'}}"></image>
<text>环境</text> <text>环境</text>
<text>0.5</text> <text>{{officeEnvironmentalText}}</text>
<text>分</text> <text>分</text>
</view> </view>
</view> </view>
......
project.config.json
...@@ -159,6 +159,12 @@ ...@@ -159,6 +159,12 @@
"pathName": "pages/play/activity/activity", "pathName": "pages/play/activity/activity",
"query": "", "query": "",
"scene": null "scene": null
},
{
"id": -1,
"name": "pages/mine/appointment/appointment",
"pathName": "pages/mine/appointment/appointment",
"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