Commit cbe43c25 by wjw

ww--我的页面修改

parent 4034dfe5
...@@ -241,7 +241,6 @@ App({ ...@@ -241,7 +241,6 @@ App({
break break
} }
funcUserInfo.userType = 0
wx.setStorageSync('userInfo', funcUserInfo) wx.setStorageSync('userInfo', funcUserInfo)
// 如果用户身份有更新,则自动跳转到首页 // 如果用户身份有更新,则自动跳转到首页
......
...@@ -20,7 +20,6 @@ Page({ ...@@ -20,7 +20,6 @@ Page({
scroll: '400rpx', scroll: '400rpx',
}, },
navigationScroll: 0, navigationScroll: 0,
isCheckPermission: false, isCheckPermission: false,
imageBase: App.globalData.appImageBase, imageBase: App.globalData.appImageBase,
imageResourcesBase: App.globalData.appResourcesBase, imageResourcesBase: App.globalData.appResourcesBase,
...@@ -331,11 +330,16 @@ Page({ ...@@ -331,11 +330,16 @@ Page({
funcStatusText = '审核失败' funcStatusText = '审核失败'
break break
} }
let navigationColor = '#ffffff'
if (funcUserInfo.userType === 0) {
navigationColor = '#000000'
}
this.setData({ this.setData({
type: funcUserInfo.userType, type: funcUserInfo.userType,
statusText: funcStatusText, statusText: funcStatusText,
isRegister: true, isRegister: true,
userInfo: funcUserInfo userInfo: funcUserInfo,
'navigationStyle.normal.color': navigationColor
}) })
App.login({ App.login({
timeout: 0, timeout: 0,
...@@ -579,7 +583,7 @@ Page({ ...@@ -579,7 +583,7 @@ Page({
}, },
onPageScroll: function (event) { onPageScroll: function (event) {
console.log(this.scrollLock) // console.log(this.scrollLock)
// 优化滚动事件触发频率 // 优化滚动事件触发频率
if (this.scrollLock) return if (this.scrollLock) return
...@@ -589,7 +593,7 @@ Page({ ...@@ -589,7 +593,7 @@ Page({
navigationScroll: event.scrollTop navigationScroll: event.scrollTop
}) })
console.log(this.data.navigationScroll) // console.log(this.data.navigationScroll)
// 恢复滚动事件 // 恢复滚动事件
this.scrollTimer = setTimeout(() => { this.scrollTimer = setTimeout(() => {
......
<navigation class="navigation" titleText="我的" scrollStyle="{{navigationStyle}}" scrollHeight="{{navigationScroll}}"></navigation> <navigation class="navigation" titleText="我的" color="{{navigationColor}}" scrollStyle="{{navigationStyle}}" scrollHeight="{{navigationScroll}}"></navigation>
<view class="container"> <view class="container con-s">
<view class="mine" wx:if="{{type !== 1}}"> <view class="mine" style="height: 416rpx" wx:if="{{type !== 1}}">
<image class="background-image" src="./image/mine.png"></image> <image class="background-image" src="{{imageResourcesBase + 'mine/home/visitor-bg.png'}}"></image>
<view class="row align-c"> <view class="row align-c">
<view class="mine-avatar" bindtap="checkRegister"> <view class="mine-avatar" bindtap="checkRegister">
<image src="{{userInfo.avatar ? userInfo.avatar : './image/avatar.png'}}"></image> <image src="{{userInfo.avatar ? userInfo.avatar : './image/avatar.png'}}"></image>
...@@ -33,10 +33,9 @@ ...@@ -33,10 +33,9 @@
</view> </view>
</view> </view>
<view class="mine" style="height:512rpx" wx:if="{{type == 1}}"> <view class="mine" style="height:416rpx" wx:if="{{type == 1}}">
<image class="background-image" style="height:512rpx;" <image class="background-image" src="{{imageResourcesBase + 'mine/home/ownerBg.png'}}"></image>
src="http://upload.miaomiao-bao.com/8f046202008201043321555.jpg"></image> <view class="row align-c">
<view class="row align-c approve">
<view class="mine-avatar mine-avatar-special"> <view class="mine-avatar mine-avatar-special">
<image src="{{userInfo.avatar}}"></image> <image src="{{userInfo.avatar}}"></image>
</view> </view>
...@@ -60,276 +59,277 @@ ...@@ -60,276 +59,277 @@
</view> </view>
</view> </view>
<view class="coupon row align-c" bindtap="goCouponInput" wx:if="{{isCheckPermission}}"> <view class="col align-c">
<view class="cpopon-info col"> <view class="coupon row align-c" bindtap="goCouponInput" wx:if="{{isCheckPermission}}">
<text>券码核销</text> <view class="cpopon-info col">
<text>所属门店:{{authInfo.officeName}}</text> <text>券码核销</text>
</view> <text>所属门店:{{authInfo.officeName}}</text>
<view class=""> </view>
<image src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <view class="">
<image src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view>
</view> </view>
</view>
<view class="status row con-b align-c" wx:if="{{type !== 1}}"> <view class="status row con-b align-c" wx:if="{{type !== 1}}">
<view class="status-symbol col"> <view class="status-symbol col">
<text>业主认证</text> <text>业主认证</text>
<text>享受业主尊贵特权,预定消费专属优惠</text> <text>享受业主尊贵特权,预定消费专属优惠</text>
</view> </view>
<view class="status-operation row con-c align-c" bindtap="goApprove"> <view class="status-operation row con-c align-c" bindtap="goApprove">
<image wx:if="{{statusText == '审核失败'}}" src="/image/fail-icon.png"></image> <image wx:if="{{statusText == '审核失败'}}" src="/image/fail-icon.png"></image>
<image wx:if="{{statusText == '审核中'}}" src="/image/sh-icon.png"></image> <image wx:if="{{statusText == '审核中'}}" src="/image/sh-icon.png"></image>
<text>{{statusText}}</text> <text>{{statusText}}</text>
</view>
</view> </view>
</view>
<view class="menu"> <view class="menu">
<!-- 订单 --> <!-- 订单 -->
<view class="order-activity"> <view class="order-activity">
<view class="order-activity-title-wrapper row con-b align-c"> <view class="order-activity-title-wrapper row con-b align-c">
<view class="order-activity-title row align-c"> <view class="order-activity-title row align-c">
<text>我的订单</text> <text>我的订单</text>
</view>
<view class="order-activity-all row align-c" bindtap="onOrder">
<text>查看全部</text>
<image class="all-order-icon" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view>
</view>
<!-- 订单分类icno -->
<view class="order-activity-icon-list row con-b">
<view class="order-activity-icon-wrapper col align-c" data-type="3" bindtap="goOrderByclass">
<view class="order-activity-icon row con-c align-c">
<image src="{{imageResourcesBase+'mine/home/or_ticket.png'}}"></image>
<view class="order-activity-badge {{ goodTypeCountData['3'] > 9 ? 'badge-widen' : ''}}"
wx:if="{{goodTypeCountData['3'] > 0}}">
{{goodTypeCountData['3'] > 99 ? '···' : goodTypeCountData['3']}}</view>
</view>
<text>门票</text>
</view>
<view class="order-activity-icon-wrapper col align-c" data-type="5" bindtap="goOrderByclass">
<view class="order-activity-icon row con-c align-c">
<image src="{{imageResourcesBase+'mine/home/or_food.png'}}"></image>
<view class="order-activity-badge {{ goodTypeCountData['5'] > 9 ? 'badge-widen' : ''}}"
wx:if="{{goodTypeCountData['5'] > 0}}">
{{goodTypeCountData['5'] > 99 ? '···' : goodTypeCountData['5']}}</view>
</view> </view>
<text>餐饮</text> <view class="order-activity-all row align-c" bindtap="onOrder">
</view> <text>查看全部</text>
<view class="order-activity-icon-wrapper col align-c" data-type="-2" bindtap="goOrderByclass"> <image class="all-order-icon" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
<view class="order-activity-icon row con-c align-c">
<image src="{{imageResourcesBase+'mine/home/or_movice.png'}}"></image>
<view class="order-activity-badge {{ goodTypeCountData['-2'] > 9 ? 'badge-widen' : ''}}"
wx:if="{{goodTypeCountData['-2'] > 0}}">
{{goodTypeCountData['-2'] > 99 ? '···' : goodTypeCountData['-2']}}</view>
</view> </view>
<text>影票</text>
</view> </view>
<view class="order-activity-icon-wrapper col align-c" data-type="2" bindtap="goOrderByclass"> <!-- 订单分类icno -->
<view class="order-activity-icon row con-c align-c"> <view class="order-activity-icon-list row con-b">
<image src="{{imageResourcesBase+'mine/home/or_spa.png'}}"></image> <view class="order-activity-icon-wrapper col align-c" data-type="3" bindtap="goOrderByclass">
<view class="order-activity-badge {{ goodTypeCountData['2'] > 9 ? 'badge-widen' : ''}}" <view class="order-activity-icon row con-c align-c">
wx:if="{{goodTypeCountData['2'] > 0}}"> <image src="{{imageResourcesBase+'mine/home/or_ticket.png'}}"></image>
{{goodTypeCountData['2'] > 99 ? '···' : goodTypeCountData['2']}}</view> <view class="order-activity-badge {{ goodTypeCountData['3'] > 9 ? 'badge-widen' : ''}}"
</view> wx:if="{{goodTypeCountData['3'] > 0}}">
<text>SPA</text> {{goodTypeCountData['3'] > 99 ? '···' : goodTypeCountData['3']}}</view>
</view>
<view class="order-activity-icon-wrapper col align-c" data-type="4" bindtap="goOrderByclass">
<view class="order-activity-icon row con-c align-c">
<image src="{{imageResourcesBase+'mine/home/or_art.png'}}"></image>
<view class="order-activity-badge {{ goodTypeCountData['4'] > 9 ? 'badge-widen' : ''}}"
wx:if="{{goodTypeCountData['4'] > 0}}">
{{goodTypeCountData['4'] > 99 ? '···' : goodTypeCountData['4']}}</view>
</view>
<text>文创</text>
</view>
</view>
<view class="more-wrapper" wx:if="{{myOrder}}}">
<!-- 订单卡片 -->
<!-- 年卡 -->
<view class="pass-wrapper" wx:if="{{myOrder.passOrder&&myOrder.passOrder.length>0}}"
bindtap="handleToCard">
<image wx:if="{{ myOrder.passOrder[0].cardType==1}}" class="card-bg year-bg"
src="{{imageResourcesBase +'pay/order-input/card-1.png'}}"></image>
<image wx:elif="{{myOrder.passOrder[0].cardType==2}}" class="card-bg month-bg"
src="{{imageResourcesBase +'pay/order-input/card-2.png'}}"></image>
<image wx:else class="card-bg month-bg" src="{{imageResourcesBase +'pay/order-input/card-3.png'}}">
</image>
<view class="pass-bg-one" wx:if="{{myOrder.passOrder.length > 1}}"></view>
<view class="pass-bg-two" wx:if="{{myOrder.passOrder.length > 1}}"></view>
<view class="pass-logo-wrapper row align-c">
<view class="logo-box">
<image mode="aspectFit" src="{{imageResourcesBase+ myOrder.passOrder[0].logo}}"></image>
</view> </view>
<text>门票</text>
<text>{{myOrder.passOrder[0].officeName}}</text>
</view> </view>
<view class="pass-title"> <view class="order-activity-icon-wrapper col align-c" data-type="5" bindtap="goOrderByclass">
<text>{{myOrder.passOrder[0].name}}</text> <view class="order-activity-icon row con-c align-c">
<image src="{{imageResourcesBase+'mine/home/or_food.png'}}"></image>
<view class="order-activity-badge {{ goodTypeCountData['5'] > 9 ? 'badge-widen' : ''}}"
wx:if="{{goodTypeCountData['5'] > 0}}">
{{goodTypeCountData['5'] > 99 ? '···' : goodTypeCountData['5']}}</view>
</view>
<text>餐饮</text>
</view> </view>
<view class="pass-time"> <view class="order-activity-icon-wrapper col align-c" data-type="-2" bindtap="goOrderByclass">
<text>有效期至{{myOrder.passOrder[0].expireTime}}</text> <view class="order-activity-icon row con-c align-c">
<image src="{{imageResourcesBase+'mine/home/or_movice.png'}}"></image>
<view class="order-activity-badge {{ goodTypeCountData['-2'] > 9 ? 'badge-widen' : ''}}"
wx:if="{{goodTypeCountData['-2'] > 0}}">
{{goodTypeCountData['-2'] > 99 ? '···' : goodTypeCountData['-2']}}</view>
</view>
<text>影票</text>
</view> </view>
<view class="pass-name"> <view class="order-activity-icon-wrapper col align-c" data-type="2" bindtap="goOrderByclass">
<text>{{myOrder.passOrder[0].personName}}</text> <view class="order-activity-icon row con-c align-c">
<image src="{{imageResourcesBase+'mine/home/or_spa.png'}}"></image>
<view class="order-activity-badge {{ goodTypeCountData['2'] > 9 ? 'badge-widen' : ''}}"
wx:if="{{goodTypeCountData['2'] > 0}}">
{{goodTypeCountData['2'] > 99 ? '···' : goodTypeCountData['2']}}</view>
</view>
<text>SPA</text>
</view> </view>
<view class="pass-idNum"> <view class="order-activity-icon-wrapper col align-c" data-type="4" bindtap="goOrderByclass">
<text>{{myOrder.passOrder[0].identityCard}}</text> <view class="order-activity-icon row con-c align-c">
<image src="{{imageResourcesBase+'mine/home/or_art.png'}}"></image>
<view class="order-activity-badge {{ goodTypeCountData['4'] > 9 ? 'badge-widen' : ''}}"
wx:if="{{goodTypeCountData['4'] > 0}}">
{{goodTypeCountData['4'] > 99 ? '···' : goodTypeCountData['4']}}</view>
</view>
<text>文创</text>
</view> </view>
</view> </view>
<view class="more-wrapper" wx:if="{{myOrder}}}">
<!-- 商品 --> <!-- 订单卡片 -->
<block wx:if="myOrder.artOrder.orderList.length>0"> <!-- 年卡 -->
<view class="goods-wrapper" wx:for="{{myOrder.artOrder.orderList}}" wx:key="*this" <view class="pass-wrapper" wx:if="{{myOrder.passOrder&&myOrder.passOrder.length>0}}"
data-item="{{item}}" bindtap="onOrderDetail"> bindtap="handleToCard">
<view class="goods-logo-wrapper row align-c"> <image wx:if="{{ myOrder.passOrder[0].cardType==1}}" class="card-bg year-bg"
src="{{imageResourcesBase +'pay/order-input/card-1.png'}}"></image>
<image wx:elif="{{myOrder.passOrder[0].cardType==2}}" class="card-bg month-bg"
src="{{imageResourcesBase +'pay/order-input/card-2.png'}}"></image>
<image wx:else class="card-bg month-bg" src="{{imageResourcesBase +'pay/order-input/card-3.png'}}">
</image>
<view class="pass-bg-one" wx:if="{{myOrder.passOrder.length > 1}}"></view>
<view class="pass-bg-two" wx:if="{{myOrder.passOrder.length > 1}}"></view>
<view class="pass-logo-wrapper row align-c">
<view class="logo-box"> <view class="logo-box">
<image mode="aspectFit" src="{{imageResourcesBase+ item.logo}}"></image> <image mode="aspectFit" src="{{imageResourcesBase+ myOrder.passOrder[0].logo}}"></image>
</view> </view>
<text>{{item.officeName}}</text>
</view>
<view class="goods-content row align-c">
<block wx:if="{{item.smOrderDetails.length>3}}">
<image src="{{k.imgUrl}}" wx:for="{{item.smOrderDetailsSlice3}}" wx:for-item="k"
wx:key="*this">
</image>
</block>
<block wx:else>
<image src="{{k.imgUrl}}" wx:for="{{item.smOrderDetails}}" wx:for-item="k"
wx:key="*this">
</image>
</block>
<text wx:if="{{item.smOrderDetails.length == 1}}">{{item.smOrderDetails[0].name}}</text> <text>{{myOrder.passOrder[0].officeName}}</text>
</view> </view>
<view class="goods-footer row align-c con-b"> <view class="pass-title">
<text>有效期{{item.expireTimeEnd}}</text> <text>{{myOrder.passOrder[0].name}}</text>
<text>共{{item.smOrderDetails.length}}件</text> </view>
<view class="pass-time">
<text>有效期至{{myOrder.passOrder[0].expireTime}}</text>
</view>
<view class="pass-name">
<text>{{myOrder.passOrder[0].personName}}</text>
</view>
<view class="pass-idNum">
<text>{{myOrder.passOrder[0].identityCard}}</text>
</view> </view>
</view> </view>
<!-- more -->
<view class="more row align-c con-c" bindtap="onShowMoreOrder" wx:if="{{!isLoadingOrder&&orderListBackup.length>1}}"> <!-- 商品 -->
<text wx:if="{{!showMoreOrder}}">展开更多</text> <block wx:if="myOrder.artOrder.orderList.length>0">
<text wx:else>收起</text> <view class="goods-wrapper" wx:for="{{myOrder.artOrder.orderList}}" wx:key="*this"
<image wx:if="{{!showMoreOrder}}" src="{{imageBase + 'icon/arrow-b-2.png'}}"></image> data-item="{{item}}" bindtap="onOrderDetail">
<image wx:else src="{{imageBase + 'up.png'}}"></image> <view class="goods-logo-wrapper row align-c">
</view> <view class="logo-box">
</block> <image mode="aspectFit" src="{{imageResourcesBase+ item.logo}}"></image>
</view> </view>
</view> <text>{{item.officeName}}</text>
<!-- 预约 --> </view>
<view class="order-activity"> <view class="goods-content row align-c">
<view class="order-activity-title-wrapper row con-b align-c"> <block wx:if="{{item.smOrderDetails.length>3}}">
<view class="order-activity-title row align-c"> <image src="{{k.imgUrl}}" wx:for="{{item.smOrderDetailsSlice3}}" wx:for-item="k"
<text>我的预约</text> wx:key="*this">
</view> </image>
<view class="order-activity-all row align-c" bindtap="onAppointment"> </block>
<text>查看全部</text> <block wx:else>
<image class="all-order-icon" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image src="{{k.imgUrl}}" wx:for="{{item.smOrderDetails}}" wx:for-item="k"
wx:key="*this">
</image>
</block>
<text wx:if="{{item.smOrderDetails.length == 1}}">{{item.smOrderDetails[0].name}}</text>
</view>
<view class="goods-footer row align-c con-b">
<text>有效期{{item.expireTimeEnd}}</text>
<text>共{{item.smOrderDetails.length}}件</text>
</view>
</view>
<!-- more -->
<view class="more row align-c con-c" bindtap="onShowMoreOrder" wx:if="{{!isLoadingOrder&&orderListBackup.length>1}}">
<text wx:if="{{!showMoreOrder}}">展开更多</text>
<text wx:else>收起</text>
<image wx:if="{{!showMoreOrder}}" src="{{imageBase + 'icon/arrow-b-2.png'}}"></image>
<image wx:else src="{{imageBase + 'up.png'}}"></image>
</view>
</block>
</view> </view>
</view> </view>
<!-- 预约分类icno --> <!-- 预约 -->
<view class="order-activity-icon-list row con-b"> <view class="order-activity">
<view class="order-activity-icon-wrapper col align-c" data-type='0' bindtap="goAppointment"> <view class="order-activity-title-wrapper row con-b align-c">
<view class="order-activity-icon row con-c align-c"> <view class="order-activity-title row align-c">
<image src="{{imageResourcesBase+'mine/home/yy_theme.png'}}"></image> <text>我的预约</text>
<view class="order-activity-badge {{ enrollSubscribeData.active > 9 ? 'badge-widen' : ''}}"
wx:if="{{enrollSubscribeData.active}}">
{{enrollSubscribeData.active}}</view>
</view> </view>
<text>主题活动</text> <view class="order-activity-all row align-c" bindtap="onAppointment">
</view> <text>查看全部</text>
<view class="order-activity-icon-wrapper col align-c" data-type='1' bindtap="goAppointment"> <image class="all-order-icon" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
<view class="order-activity-icon row con-c align-c">
<image src="{{imageResourcesBase+'mine/home/yy_night.png'}}"></image>
<view class="order-activity-badge {{ enrollSubscribeData.garden > 9 ? 'badge-widen' : ''}}"
wx:if="{{enrollSubscribeData.garden}}">
{{enrollSubscribeData.garden}}</view>
</view> </view>
<text>夜间入园预约</text>
</view> </view>
<view class="order-activity-icon-wrapper col align-c" data-type='2' bindtap="goAppointment"> <!-- 预约分类icno -->
<view class="order-activity-icon row con-c align-c"> <view class="order-activity-icon-list row con-b">
<image src="{{imageResourcesBase+'mine/home/yy_house.png'}}"></image> <view class="order-activity-icon-wrapper col align-c" data-type='0' bindtap="goAppointment">
<view class="order-activity-badge {{ enrollSubscribeData.scanHouse > 9 ? 'badge-widen' : ''}}" <view class="order-activity-icon row con-c align-c">
wx:if="{{enrollSubscribeData.scanHouse}}"> <image src="{{imageResourcesBase+'mine/home/yy_theme.png'}}"></image>
{{enrollSubscribeData.scanHouse}}</view> <view class="order-activity-badge {{ enrollSubscribeData.active > 9 ? 'badge-widen' : ''}}"
wx:if="{{enrollSubscribeData.active}}">
{{enrollSubscribeData.active}}</view>
</view>
<text>主题活动</text>
</view> </view>
<text>看房预约</text> <view class="order-activity-icon-wrapper col align-c" data-type='1' bindtap="goAppointment">
</view> <view class="order-activity-icon row con-c align-c">
</view> <image src="{{imageResourcesBase+'mine/home/yy_night.png'}}"></image>
<!-- 预约卡片 --> <view class="order-activity-badge {{ enrollSubscribeData.garden > 9 ? 'badge-widen' : ''}}"
<view class="appointment"> wx:if="{{enrollSubscribeData.garden}}">
<!-- 主题活动 --> {{enrollSubscribeData.garden}}</view>
<view class="appointment-wrapper" wx:for="{{activityList}}" wx:key="*this" data-item="{{item}}"
bindtap="onOrderDetail">
<view class="appointment-time">{{item.activeTime}}</view>
<view class="appointment-activity-content row">
<view class="appointment-activity-img">
<image src="{{item.cover}}"></image>
</view> </view>
<view class="appointment-activity-info col con-a"> <text>夜间入园预约</text>
<view class="appointment-activity-title"> </view>
<text>{{item.name}}</text> <view class="order-activity-icon-wrapper col align-c" data-type='2' bindtap="goAppointment">
<view class="order-activity-icon row con-c align-c">
<image src="{{imageResourcesBase+'mine/home/yy_house.png'}}"></image>
<view class="order-activity-badge {{ enrollSubscribeData.scanHouse > 9 ? 'badge-widen' : ''}}"
wx:if="{{enrollSubscribeData.scanHouse}}">
{{enrollSubscribeData.scanHouse}}</view>
</view>
<text>看房预约</text>
</view>
</view>
<!-- 预约卡片 -->
<view class="appointment">
<!-- 主题活动 -->
<view class="appointment-wrapper" wx:for="{{activityList}}" wx:key="*this" data-item="{{item}}"
bindtap="onOrderDetail">
<view class="appointment-time">{{item.activeTime}}</view>
<view class="appointment-activity-content row">
<view class="appointment-activity-img">
<image src="{{item.cover}}"></image>
</view> </view>
<view class="appointment-activity-num"> <view class="appointment-activity-info col con-a">
<text>报名人数 {{item.number}}人</text> <view class="appointment-activity-title">
<text>{{item.name}}</text>
</view>
<view class="appointment-activity-num">
<text>报名人数 {{item.number}}人</text>
</view>
</view> </view>
</view> </view>
</view> </view>
</view>
<!-- 夜间入园预约 --> <!-- 夜间入园预约 -->
<!-- <view class="appointment-wrapper"> <!-- <view class="appointment-wrapper">
<view class="appointment-time"> <view class="appointment-time">
<text>7月15日 10:00-12:00</text> <text>7月15日 10:00-12:00</text>
</view> </view>
<view class="appointment-activity-content row align-c con-b"> <view class="appointment-activity-content row align-c con-b">
<view class="appointment-content col con-b"> <view class="appointment-content col con-b">
<view class="appointment-activity-title"> <view class="appointment-activity-title">
<text>夜间入园预约</text> <text>夜间入园预约</text>
</view>
<view class="appointment-activity-num">
<text>预约人数 3人</text>
</view>
</view> </view>
<view class="appointment-activity-num"> <view class="border-right"></view>
<text>预约人数 3人</text> <view class="appointment-subscribe" data-item="{{item}}" bindtap="gohotelAccommodation">预约凭证
</view> </view>
</view> </view>
<view class="border-right"></view> </view> -->
<view class="appointment-subscribe" data-item="{{item}}" bindtap="gohotelAccommodation">预约凭证 <!-- 看房预约 -->
<!-- <view class="appointment-wrapper">
<view class="appointment-time">
<text>7月15日 10:00-12:00</text>
</view> </view>
</view> <view class="appointment-activity-content row align-c con-b">
</view> --> <view class="appointment-content col con-c">
<!-- 看房预约 --> <view class="appointment-activity-title">
<!-- <view class="appointment-wrapper"> <text>看房预约</text>
<view class="appointment-time"> </view>
<text>7月15日 10:00-12:00</text> </view>
</view> <view class="border-right"></view>
<view class="appointment-activity-content row align-c con-b"> <view class="appointment-subscribe" data-item="{{item}}" bindtap="gohotelAccommodation">预约凭证
<view class="appointment-content col con-c">
<view class="appointment-activity-title">
<text>看房预约</text>
</view> </view>
</view> </view>
<view class="border-right"></view> </view> -->
<view class="appointment-subscribe" data-item="{{item}}" bindtap="gohotelAccommodation">预约凭证 </view>
</view> <!-- more -->
</view> <view class="more row align-c con-c" bindtap="onShowMoreActivity" wx:if="{{activityListBackup.length>2}}">
</view> --> <text wx:if="{{!showMoreActivity}}">展开更多</text>
<text wx:else>收起</text>
<image wx:if="{{!showMoreActivity}}" src="{{imageBase + 'icon/arrow-b-2.png'}}"></image>
<image wx:else src="{{imageBase + 'up.png'}}"></image>
</view>
</view> </view>
<!-- more --> <!-- 客服中心 -->
<view class="more row align-c con-c" bindtap="onShowMoreActivity" wx:if="{{activityListBackup.length>2}}"> <view class="service row con-b align-c" bindtap="goQuestion">
<text wx:if="{{!showMoreActivity}}">展开更多</text> <text>客服中心</text>
<text wx:else>收起</text> <image src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
<image wx:if="{{!showMoreActivity}}" src="{{imageBase + 'icon/arrow-b-2.png'}}"></image>
<image wx:else src="{{imageBase + 'up.png'}}"></image>
</view> </view>
</view> </view>
<!-- 客服中心 -->
<view class="service row con-b align-c" bindtap="goQuestion">
<text>客服中心</text>
<image src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view>
</view> </view>
</view> </view>
......
.container { .container {
background: linear-gradient(180deg, #fff 10%, #F3F4F6 20%);
min-height: 100vh; min-height: 100vh;
/* background: #F3F4F6 */ background: #F3F4F6
} }
.navigation { .navigation {
...@@ -324,10 +323,6 @@ ...@@ -324,10 +323,6 @@
height: 30rpx; height: 30rpx;
} }
.approve {
padding-top: 100rpx;
}
.approve-icon { .approve-icon {
width: 168rpx; width: 168rpx;
height: 103rpx; height: 103rpx;
......
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