Skip to content

严立 / mini-shimao

Go to a project
Commit 1bcc5169 by 严立
Options

全局样式整理

parent 38a175ad
Inline Side-by-side
Showing with 501 additions and 577 deletions
app.wxss
@import '/wxss/samcss-reset.wxss'; @import '/wxss/reset.wxss';
@import '/wxss/samcss-layout.wxss';
@import '/wxss/samcss-theme.wxss';
/* s3组件样式 */
@import './component/theme/layout.wxss'; @import './component/theme/layout.wxss';
@import './component/theme/theme.wxss'; @import './component/theme/theme.wxss';
.icon { page {
width: 32rpx; display: flex;
height: 32rpx; flex-direction: column;
min-height: 100vh;
}
.container {
display: flex;
flex-direction: column;
align-items: center;
flex-grow: 1;
}
.grow { flex-grow: 1; }
.background-image {
z-index: -1;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
} }
.icon_32 { width: 32rpx; height: 32rpx; }
.icon_40 { width: 40rpx; height: 40rpx; }
.icon_48 { width: 48rpx; height: 48rpx; }
.icon_80 { width: 80rpx; height: 80rpx; }
.icon_136 { width: 136rpx; height: 136rpx; }
.bg-gradient { .bg-gradient {
background: linear-gradient(180deg, #FFFFFF 0%, #F3F4F6 20%, #F3F4F6 100%); background: linear-gradient(180deg, #FFFFFF 0%, #F3F4F6 20%, #F3F4F6 100%);
......
component/coupon-code/coupon-code.wxml
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
<text class="coupon_code_tip fs26 fw400 c90">{{'请将券码出示给门店核销人员'}}</text> <text class="coupon_code_tip fs26 fw400 c90">{{'请将券码出示给门店核销人员'}}</text>
<swiper class="coupon_code_swiper" current="{{couponCodeSelectionIndex}}" bindchange="eventIndexChange"> <swiper class="coupon_code_swiper" current="{{couponCodeSelectionIndex}}" bindchange="eventIndexChange">
<swiper-item class="coupon_code_item row cc" wx:for="{{couponCodeList}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <swiper-item class="coupon_code_item row cc" wx:for="{{couponCodeList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="coupon_code_info col cc ac"> <view class="coupon_code_info column cc ac">
<!-- 无效券码蒙尘样式 --> <!-- 无效券码蒙尘样式 -->
<view class="coupon_code_mask" wx:if="{{item.couponState === 2}}"></view> <view class="coupon_code_mask" wx:if="{{item.couponState === 2}}"></view>
<image mode="aspectFill" class="coupon_code_seal" wx:if="{{item.couponState === 2}}" src="./image/seal-used.png"></image> <image mode="aspectFill" class="coupon_code_seal" wx:if="{{item.couponState === 2}}" src="./image/seal-used.png"></image>
<text class="fs30 fw400 c01">{{item.couponName}}</text> <text class="fs30 fw400 c01">{{item.couponName}}</text>
<image class="coupon_code_content" src="{{'data:image/png;base64,' + item.couponQrCode}}"></image> <image class="coupon_code_content" src="{{'data:image/png;base64,' + item.couponQrCode}}"></image>
<view class="coupon_code_operation row con-b ac"> <view class="coupon_code_operation row cb ac">
<block wx:if="{{item.couponState === 1}}"> <block wx:if="{{item.couponState === 1}}">
<text class="fs22 fw700 c31">券码</text> <text class="fs22 fw700 c31">券码</text>
<text class="fs30 fw700 c01">{{item.couponNumber}}</text> <text class="fs30 fw700 c01">{{item.couponNumber}}</text>
......
component/m-dialog/m-dialog.wxml
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<text class="regular">{{title}}</text> <text class="regular">{{title}}</text>
</view> </view>
<view class="dialog-operation row cc ac border-base"> <view class="dialog-operation row cc ac border-base">
<button class="dialog-operation-confirm row cc ac primary" bindtap="onConfirm">{{confirm}}</button> <button class="dialog-operation-confirm row cc ac" bindtap="onConfirm">{{confirm}}</button>
</view> </view>
</view> </view>
</block> </block>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<text class="secondary">{{content}}</text> <text class="secondary">{{content}}</text>
</view> </view>
<view class="dialog-operation row cc ac border-base"> <view class="dialog-operation row cc ac border-base">
<button class="dialog-operation-confirm row cc ac primary" bindtap="onConfirm">{{confirm}}</button> <button class="dialog-operation-confirm row cc ac" bindtap="onConfirm">{{confirm}}</button>
</view> </view>
</view> </view>
</block> </block>
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<view class="dialog-operation row cb ac border-base"> <view class="dialog-operation row cb ac border-base">
<button class="dialog-operation-cancel row cc ac secondary" bindtap="onCancel">{{cancel}}</button> <button class="dialog-operation-cancel row cc ac secondary" bindtap="onCancel">{{cancel}}</button>
<view class="dialog-operation-line row cc ac border-base"></view> <view class="dialog-operation-line row cc ac border-base"></view>
<button class="dialog-operation-confirm row cc ac primary" bindtap="onConfirm">{{confirm}}</button> <button class="dialog-operation-confirm row cc ac" bindtap="onConfirm">{{confirm}}</button>
</view> </view>
</view> </view>
</block> </block>
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<view class="dialog-operation row cb ac border-base"> <view class="dialog-operation row cb ac border-base">
<button class="dialog-operation-cancel row cc ac secondary" bindtap="onCancel">{{cancel}}</button> <button class="dialog-operation-cancel row cc ac secondary" bindtap="onCancel">{{cancel}}</button>
<view class="dialog-operation-line row cc ac border-base"></view> <view class="dialog-operation-line row cc ac border-base"></view>
<button class="dialog-operation-confirm row cc ac primary" bindtap="onConfirm">{{confirm}}</button> <button class="dialog-operation-confirm row cc ac" bindtap="onConfirm">{{confirm}}</button>
</view> </view>
</view> </view>
</block> </block>
......
component/m-dialog/m-dialog.wxss
...@@ -93,4 +93,5 @@ ...@@ -93,4 +93,5 @@
font-size: 30rpx; font-size: 30rpx;
font-weight: 400; font-weight: 400;
line-height: 42rpx; line-height: 42rpx;
color: #5DB5DD;
} }
\ No newline at end of file
component/theme/theme.wxss
/* 主题 */ .text_decoration_delete {
.primary { color: #5DB5DD; } text-decoration: line-through;
}
/* 成功 */
.success { color: #67C23A; } /* 字体颜色 */
.c00 { color: #000000; }
/* 警告 */ .c01 { color: #15191F; }
.warning { color: #E6A23C; } .c10 { color: #E66060; }
.c20 { color: #837048; }
/* 危险 */ .c30 { color: #5DB5DD; }
.danger { color: #F56C6C; } .c31 { color: #959DA9; }
.c32 { color: #656E7B; }
/* 提示 */ .c40 { color: #86C5E1; }
.info { color: #909399; } .c90 { color: #FFFFFF; }
/* 常规文本，用于标题，正文 */ /* 背景颜色 */
.regular { color: #15191F; } .cbg00 { background-color: #000000; }
.cbg01 { background-color: #15191F; }
/* 次要文本，用于说明，补充，提示 */ .cbg10 { background-color: #E66060; }
.secondary { color: #959DA9; } .cbg20 { background-color: #837048; }
.cbg30 { background-color: #5DB5DD; }
/* 输入提示 */ .cbg31 { background-color: #959DA9; }
.placeholder { color: #C2C7CF; } .cbg32 { background-color: #656E7B; }
.cbg40 { background-color: #86C5E1; }
/* 基础边框 */ .cbg90 { background-color: #FFFFFF; }
.border-base { border-color: #E2E7EF; }
/* 字体字重 */
/* 明亮边框 */ .fw100 { font-weight: 100; }
.border-light { border-color: #E4E7ED; } .fw200 { font-weight: 200; }
.fw300 { font-weight: 300; }
/* 最亮边框 */ .fw400 { font-weight: 400; }
.border-lighter { border-color: #EBEEF5; } .fw500 { font-weight: 500; }
\ No newline at end of file .fw600 { font-weight: 600; }
.fw700 { font-weight: 700; }
.fw800 { font-weight: 800; }
/* 字体大小 */
.fs18 { font-size: 18rpx; line-height: 26rpx; }
.fs22 { font-size: 22rpx; line-height: 32rpx; }
.fs26 { font-size: 26rpx; line-height: 36rpx; }
.fs30 { font-size: 30rpx; line-height: 40rpx; }
.fs34 { font-size: 34rpx; line-height: 48rpx; }
.fs38 { font-size: 38rpx; line-height: 52rpx; }
.fs42 { font-size: 42rpx; line-height: 58rpx; }
.fs50 { font-size: 50rpx; line-height: 72rpx; }
.fs54 { font-size: 54rpx; line-height: 76rpx; }
/* icon 大小 */
.i32 { width: 32rpx; height: 32rpx; }
.i40 { width: 40rpx; height: 40rpx; }
.i48 { width: 48rpx; height: 48rpx; }
.i136 { width: 136rpx; height: 136rpx; }
\ No newline at end of file
pages/campsite/evaluate/evaluate.wxml
<m-nav titleText="全部评价" scrollHeight="{{navScroll}}"></m-nav> <m-nav titleText="全部评价" scrollHeight="{{navScroll}}"></m-nav>
<view class="evaluate"> <view class="evaluate">
<view class="evaluate-option row con-b align-c"> <view class="evaluate-option row cb ac">
<view class="evaluate-option-item row align-c"> <view class="evaluate-option-item row ac">
<image src="{{imageBase + 'icon/evaluate-1.png'}}"></image> <image 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 ac">
<image src="{{imageBase + 'icon/shop-1.png'}}"></image> <image 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 ac">
<image src="{{imageBase + 'icon/album-1.png'}}"></image> <image src="{{imageBase + 'icon/album-1.png'}}"></image>
<text>环境</text> <text>环境</text>
<text>{{officeEnvironmentalText}}</text> <text>{{officeEnvironmentalText}}</text>
...@@ -22,18 +22,18 @@ ...@@ -22,18 +22,18 @@
</view> </view>
</view> </view>
<view class="evaluate-list col"> <view class="evaluate-list column">
<block wx:for="{{detailEvaluate}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{detailEvaluate}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="evaluate-item col"> <view class="evaluate-item column">
<view class="row"> <view class="row">
<image class="evaluate-item-avatar" src="{{item.userAvatar}}" mode="widthFix"></image> <image class="evaluate-item-avatar" src="{{item.userAvatar}}" mode="widthFix"></image>
<view class="evaluate-item-info"> <view class="evaluate-item-info">
<view class="evaluate-item-info-text row align-c"> <view class="evaluate-item-info-text row ac">
<text>{{item.userName}}</text> <text>{{item.userName}}</text>
<text>业主</text> <text>业主</text>
<text>{{item.date}}</text> <text>{{item.date}}</text>
</view> </view>
<view class="evaluate-item-info-star row align-c"> <view class="evaluate-item-info-star row ac">
<block wx:for="{{item.star}}" wx:for-index="indexStar" wx:for-item="itemStar" wx:key="indexStar"> <block wx:for="{{item.star}}" wx:for-index="indexStar" wx:for-item="itemStar" wx:key="indexStar">
<image src="{{imageBase + 'icon/star-1.png'}}" data-item="{{item}}"></image> <image src="{{imageBase + 'icon/star-1.png'}}" data-item="{{item}}"></image>
</block> </block>
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<image wx:if="{{indexAlbum < 4}}" src="{{itemAlbum}}" data-index="{{indexAlbum}}" data-item="{{item}}" bindtap="onEvaluateAlbum"></image> <image wx:if="{{indexAlbum < 4}}" src="{{itemAlbum}}" data-index="{{indexAlbum}}" data-item="{{item}}" bindtap="onEvaluateAlbum"></image>
</block> </block>
<view wx:if="{{item.userAlbum.length > 4}}" class="evaluate-item-album-more row con-c align-c" data-index="{{3}}" data-item="{{item}}" bindtap="onEvaluateAlbum"> <view wx:if="{{item.userAlbum.length > 4}}" class="evaluate-item-album-more row cc ac" data-index="{{3}}" data-item="{{item}}" bindtap="onEvaluateAlbum">
<text>{{'+' + (item.userAlbum.length - 4)}}</text> <text>{{'+' + (item.userAlbum.length - 4)}}</text>
</view> </view>
</view> </view>
......
pages/club/create/create.wxml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<view class="container"> <view class="container">
<view class="club-enter"> <view class="club-enter">
<view class="form-item col"> <view class="form-item column">
<text>俱乐部名称</text> <text>俱乐部名称</text>
<m-input <m-input
inputId="clubName" inputId="clubName"
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</m-input> </m-input>
<text>{{establishInfo.errorClubName}}</text> <text>{{establishInfo.errorClubName}}</text>
</view> </view>
<view class="form-item col"> <view class="form-item column">
<text>俱乐部简要说明</text> <text>俱乐部简要说明</text>
<m-textarea <m-textarea
inputId="clubDescribe" inputId="clubDescribe"
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</m-textarea> </m-textarea>
<text>{{establishInfo.errorClubDescribe}}</text> <text>{{establishInfo.errorClubDescribe}}</text>
</view> </view>
<view class="form-item col"> <view class="form-item column">
<text>姓名</text> <text>姓名</text>
<m-input <m-input
inputId="userName" inputId="userName"
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</m-input> </m-input>
<text>{{establishInfo.errorUserName}}</text> <text>{{establishInfo.errorUserName}}</text>
</view> </view>
<view class="form-item col"> <view class="form-item column">
<text>手机号</text> <text>手机号</text>
<m-input <m-input
inputId="userPhone" inputId="userPhone"
......
pages/club/enter/enter.wxml
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<m-nav titleText="申请加入俱乐部" styleIndex="{{1}}"></m-nav> <m-nav titleText="申请加入俱乐部" styleIndex="{{1}}"></m-nav>
<view class="container"> <view class="container">
<view class="club-info col cc ac"> <view class="club-info column cc ac">
<image class="club-info-logo" src="{{clubInfo.logo}}"></image> <image class="club-info-logo" src="{{clubInfo.logo}}"></image>
<view class="club-info-name column cc ac"> <view class="club-info-name column cc ac">
<text class="title overflow_point_1">{{clubInfo.name}}</text> <text class="title overflow_point_1">{{clubInfo.name}}</text>
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</view> </view>
<view class="club-enter"> <view class="club-enter">
<view class="form-item col"> <view class="form-item column">
<text>姓名</text> <text>姓名</text>
<m-input <m-input
inputId="name" inputId="name"
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</m-input> </m-input>
<text>{{enterInfo.errorName}}</text> <text>{{enterInfo.errorName}}</text>
</view> </view>
<view class="form-item col"> <view class="form-item column">
<text>手机号</text> <text>手机号</text>
<m-input <m-input
inputId="phone" inputId="phone"
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</m-input> </m-input>
<text>{{enterInfo.errorPhone}}</text> <text>{{enterInfo.errorPhone}}</text>
</view> </view>
<view class="form-item col"> <view class="form-item column">
<text>备注</text> <text>备注</text>
<m-input <m-input
inputId="remark" inputId="remark"
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</view> </view>
<block wx:for="{{enterInfoCustom}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{enterInfoCustom}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="form-item col"> <view class="form-item column">
<text>{{item.label}}</text> <text>{{item.label}}</text>
<m-input <m-input
inputId="other" inputId="other"
......
pages/club/home/home.wxml
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!-- 创建权限提醒 --> <!-- 创建权限提醒 -->
<view class="member-power row cc ac" wx:if="{{winPowerInfoEstablish}}"> <view class="member-power row cc ac" wx:if="{{winPowerInfoEstablish}}">
<view class="member-power-info col cc ac"> <view class="member-power-info column cc ac">
<text>权限提醒</text> <text>权限提醒</text>
<text>仅业主可创建俱乐部，如果您是业主，可前往【我的】页面进行业主认证。</text> <text>仅业主可创建俱乐部，如果您是业主，可前往【我的】页面进行业主认证。</text>
<button class="row cc ac" bindtap="onCloseTip">我知道了</button> <button class="row cc ac" bindtap="onCloseTip">我知道了</button>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<!-- 加入权限提醒 --> <!-- 加入权限提醒 -->
<view class="member-power row cc ac" wx:if="{{winPowerInfoEnter}}"> <view class="member-power row cc ac" wx:if="{{winPowerInfoEnter}}">
<view class="member-power-info col cc ac"> <view class="member-power-info column cc ac">
<text>权限提醒</text> <text>权限提醒</text>
<text>该俱乐部为业主专享，仅面向业主。如果您不是业主，可前往【我的】页面进行业主认证。</text> <text>该俱乐部为业主专享，仅面向业主。如果您不是业主，可前往【我的】页面进行业主认证。</text>
<button class="row cc ac" bindtap="onCloseTip">我知道了</button> <button class="row cc ac" bindtap="onCloseTip">我知道了</button>
......
pages/club/information/information.wxml
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<text class="owner-mark" wx:if="{{clubInfo.isOwner}}">业主专享</text> <text class="owner-mark" wx:if="{{clubInfo.isOwner}}">业主专享</text>
<view class="club_info_member row cc ac" bindtap="onMemberList"> <view class="club_info_member row cc ac" bindtap="onMemberList">
<text>{{clubInfo.member + ' 成员'}}</text> <text>{{clubInfo.member + ' 成员'}}</text>
<image class="icon_32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image class="i32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
</view> </view>
</view> </view>
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<text class="tag-blue" wx:if="{{item.tagNames.length}}">{{item.tagNames[0]}}</text> <text class="tag-blue" wx:if="{{item.tagNames.length}}">{{item.tagNames[0]}}</text>
</view> </view>
<view class="card-item-info-time row ac"> <view class="card-item-info-time row ac">
<image class="icon_32" src="{{imageBase + 'icon/clock-2.png'}}"></image> <image class="i32" src="{{imageBase + 'icon/clock-2.png'}}"></image>
<text>{{item.date}}</text> <text>{{item.date}}</text>
</view> </view>
<view class="card-item-other row cb ac"> <view class="card-item-other row cb ac">
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
<!-- 俱乐部加入权限提醒 --> <!-- 俱乐部加入权限提醒 -->
<view class="member-power row cc ac" wx:if="{{winPowerInfoEnter}}"> <view class="member-power row cc ac" wx:if="{{winPowerInfoEnter}}">
<view class="member-power-info col cc ac"> <view class="member-power-info column cc ac">
<text>权限提醒</text> <text>权限提醒</text>
<text>该俱乐部为业主专享，仅面向业主。如果您是业主，可前往【我的】页面进行业主认证。</text> <text>该俱乐部为业主专享，仅面向业主。如果您是业主，可前往【我的】页面进行业主认证。</text>
<button class="row cc ac" bindtap="onCloseTip">我知道了</button> <button class="row cc ac" bindtap="onCloseTip">我知道了</button>
......
pages/club/member/member.wxml
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<m-nav titleText="俱乐部信息"></m-nav> <m-nav titleText="俱乐部信息"></m-nav>
<view class="container"> <view class="container">
<view class="club-info col cc ac"> <view class="club-info column cc ac">
<image class="club-info-logo" src="{{clubInfo.logo}}"></image> <image class="club-info-logo" src="{{clubInfo.logo}}"></image>
<view class="column cc ac"> <view class="column cc ac">
<text class="club_info_name title fs34 fw700 c01 overflow_point_1">{{clubInfo.name}}</text> <text class="club_info_name title fs34 fw700 c01 overflow_point_1">{{clubInfo.name}}</text>
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</view> </view>
<view class="club_member"> <view class="club_member">
<view class="club-member-title col"> <view class="club-member-title column">
<text>管理员</text> <text>管理员</text>
<text>可添加管理员微信，及时获取活动信息</text> <text>可添加管理员微信，及时获取活动信息</text>
</view> </view>
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<!-- 权限提醒 --> <!-- 权限提醒 -->
<view class="member-power row cc ac" hidden="{{!winPowerInfo}}"> <view class="member-power row cc ac" hidden="{{!winPowerInfo}}">
<view class="member-power-info col cc ac"> <view class="member-power-info column cc ac">
<text>权限提醒</text> <text>权限提醒</text>
<text>仅俱乐部会员或俱乐部申请者可查看管理员微信信息。您可在提交加入俱乐部申请后点击查看。</text> <text>仅俱乐部会员或俱乐部申请者可查看管理员微信信息。您可在提交加入俱乐部申请后点击查看。</text>
<button class="row cc ac" bindtap="onPowerInfoClose">我知道了</button> <button class="row cc ac" bindtap="onPowerInfoClose">我知道了</button>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<!-- 管理员微信弹窗 --> <!-- 管理员微信弹窗 -->
<view class="member-admin row cc ac" hidden="{{!winAdminInfo}}"> <view class="member-admin row cc ac" hidden="{{!winAdminInfo}}">
<view class="member_admin_info col cb ac"> <view class="member_admin_info column cb ac">
<text>管理员微信</text> <text>管理员微信</text>
<image src="{{adminInfo.wx}}" bindlongpress="onSaveAdminWx"></image> <image src="{{adminInfo.wx}}" bindlongpress="onSaveAdminWx"></image>
<text>【长按保存二维码】</text> <text>【长按保存二维码】</text>
......
pages/commodity/home/home.wxml
...@@ -18,20 +18,20 @@ ...@@ -18,20 +18,20 @@
<view class="shop-name"> <view class="shop-name">
<image src="{{resourcesBase + 'commodity/home/shop-title-1.png'}}"></image> <image src="{{resourcesBase + 'commodity/home/shop-title-1.png'}}"></image>
</view> </view>
<view class="shop-title col"> <view class="shop-title column">
<text>这里有来自大自然的馈赠</text> <text>这里有来自大自然的馈赠</text>
<text>用心烹饪的美食</text> <text>用心烹饪的美食</text>
</view> </view>
<swiper indicator-dots="true"> <swiper indicator-dots="true">
<!-- 原味舒食 --> <!-- 原味舒食 -->
<swiper-item> <swiper-item>
<view class="shop-banner row con-c"> <view class="shop-banner row cc">
<image src="{{resourcesBase + 'commodity/home/shop-1.png'}}"></image> <image src="{{resourcesBase + 'commodity/home/shop-1.png'}}"></image>
<button class="row con-c align-c" data-id="{{6}}" bindtap="onBuyFood"></button> <button class="row cc ac" data-id="{{6}}" bindtap="onBuyFood"></button>
</view> </view>
<view class="shop-menu"> <view class="shop-menu">
<block wx:for="{{shopRecommendA}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{shopRecommendA}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="shop-menu-item col con-c align-c" data-id="{{6}}" data-item="{{item}}" bindtap="onBuyRecommendFood"> <view class="shop-menu-item column cc ac" data-id="{{6}}" data-item="{{item}}" bindtap="onBuyRecommendFood">
<image src="{{item.cover}}"></image> <image src="{{item.cover}}"></image>
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
...@@ -41,13 +41,13 @@ ...@@ -41,13 +41,13 @@
<!-- 原野mojito --> <!-- 原野mojito -->
<swiper-item> <swiper-item>
<view class="shop-banner row con-c"> <view class="shop-banner row cc">
<image src="{{resourcesBase + 'commodity/home/shop-2.png'}}"></image> <image src="{{resourcesBase + 'commodity/home/shop-2.png'}}"></image>
<button class="row con-c align-c" data-id="{{4}}" bindtap="onBuyFood"></button> <button class="row cc ac" data-id="{{4}}" bindtap="onBuyFood"></button>
</view> </view>
<view class="shop-menu"> <view class="shop-menu">
<block wx:for="{{shopRecommendB}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{shopRecommendB}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="shop-menu-item col con-c align-c" data-id="{{4}}" data-item="{{item}}" bindtap="onBuyRecommendFood"> <view class="shop-menu-item column cc ac" data-id="{{4}}" data-item="{{item}}" bindtap="onBuyRecommendFood">
<image src="{{item.cover}}"></image> <image src="{{item.cover}}"></image>
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
...@@ -58,45 +58,45 @@ ...@@ -58,45 +58,45 @@
</view> </view>
<!-- 项目服务 --> <!-- 项目服务 -->
<view class="services col align-c"> <view class="services column ac">
<view class="services-title col"> <view class="services-title column">
<text>您可以用最优惠的价格</text> <text>您可以用最优惠的价格</text>
<text>享受超级服务</text> <text>享受超级服务</text>
</view> </view>
<view class="services-banner" bindtap="onBuyAll"> <view class="services-banner" bindtap="onBuyAll">
<image src="{{resourcesBase + 'commodity/home/services-title.png'}}"></image> <image src="{{resourcesBase + 'commodity/home/services-title.png'}}"></image>
</view> </view>
<view class="services-list col align-c"> <view class="services-list column ac">
<!-- 精灵鸟理想国 --> <!-- 精灵鸟理想国 -->
<view class="services-list-item col align-c" data-id="{{3}}" bindtap="onBuyMembership"> <view class="services-list-item column ac" data-id="{{3}}" bindtap="onBuyMembership">
<image src="{{banner[0]}}"></image> <image src="{{banner[0]}}"></image>
</view> </view>
<!-- 故宫海洋世界 --> <!-- 故宫海洋世界 -->
<view class="services-list-item col align-c" data-id="{{1}}" bindtap="onBuyPassCheck"> <view class="services-list-item column ac" data-id="{{1}}" bindtap="onBuyPassCheck">
<image src="{{banner[1]}}"></image> <image src="{{banner[1]}}"></image>
</view> </view>
<!-- 元养水韵 --> <!-- 元养水韵 -->
<view class="services-list-item col align-c" data-id="{{7}}" bindtap="onBuyService"> <view class="services-list-item column ac" data-id="{{7}}" bindtap="onBuyService">
<image src="{{banner[2]}}"></image> <image src="{{banner[2]}}"></image>
</view> </view>
</view> </view>
</view> </view>
<!-- 能量补给站 --> <!-- 能量补给站 -->
<view class="reception col align-c"> <view class="reception column ac">
<view class="reception-title col"> <view class="reception-title column">
<text>尽情玩耍</text> <text>尽情玩耍</text>
<text>随时为你补充能量</text> <text>随时为你补充能量</text>
</view> </view>
<view class="reception-banner"> <view class="reception-banner">
<image src="{{resourcesBase + 'commodity/home/reception-title.png'}}"></image> <image src="{{resourcesBase + 'commodity/home/reception-title.png'}}"></image>
</view> </view>
<view class="reception-list col align-c"> <view class="reception-list column ac">
<view class="reception-list-item col align-c" data-id="{{3}}" bindtap="onBuySupply"> <view class="reception-list-item column ac" data-id="{{3}}" bindtap="onBuySupply">
<image src="{{banner[3]}}"></image> <image src="{{banner[3]}}"></image>
<text>儿童营地接待区</text> <text>儿童营地接待区</text>
</view> </view>
<view class="reception-list-item col align-c" data-id="{{5}}" bindtap="onBuySupply"> <view class="reception-list-item column ac" data-id="{{5}}" bindtap="onBuySupply">
<image src="{{banner[4]}}"></image> <image src="{{banner[4]}}"></image>
<text>拾光花坊</text> <text>拾光花坊</text>
</view> </view>
...@@ -108,20 +108,20 @@ ...@@ -108,20 +108,20 @@
<view class="shop-name"> <view class="shop-name">
<image src="{{resourcesBase + 'commodity/home/shop-title-2.png'}}"></image> <image src="{{resourcesBase + 'commodity/home/shop-title-2.png'}}"></image>
</view> </view>
<view class="shop-title col"> <view class="shop-title column">
<text>可以为家人、朋友</text> <text>可以为家人、朋友</text>
<text>准备一份精心的礼物</text> <text>准备一份精心的礼物</text>
</view> </view>
<swiper indicator-dots="true"> <swiper indicator-dots="true">
<!-- 儿童营地文创店 --> <!-- 儿童营地文创店 -->
<swiper-item> <swiper-item>
<view class="shop-banner row con-c"> <view class="shop-banner row cc">
<image src="{{resourcesBase + 'commodity/home/shop-4.png'}}"></image> <image src="{{resourcesBase + 'commodity/home/shop-4.png'}}"></image>
<button class="row con-c align-c" data-id="{{3}}" bindtap="onBuyOriginality"></button> <button class="row cc ac" data-id="{{3}}" bindtap="onBuyOriginality"></button>
</view> </view>
<view class="shop-menu"> <view class="shop-menu">
<block wx:for="{{shopRecommendD}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{shopRecommendD}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="shop-menu-item col con-c align-c" data-id="{{3}}" data-item="{{item}}" bindtap="onBuyRecommendOriginality"> <view class="shop-menu-item column cc ac" data-id="{{3}}" data-item="{{item}}" bindtap="onBuyRecommendOriginality">
<image src="{{item.cover}}"></image> <image src="{{item.cover}}"></image>
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
...@@ -131,16 +131,16 @@ ...@@ -131,16 +131,16 @@
<!-- 海错图文创店 --> <!-- 海错图文创店 -->
<swiper-item> <swiper-item>
<view class="shop-banner row con-c"> <view class="shop-banner row cc">
<image src="{{resourcesBase + 'commodity/home/shop-3-0930.png'}}"></image> <image src="{{resourcesBase + 'commodity/home/shop-3-0930.png'}}"></image>
<!-- 临时屏蔽购买 --> <!-- 临时屏蔽购买 -->
<!-- <button class="row con-c align-c" data-id="{{1}}" bindtap="onBuyOriginality"></button> --> <!-- <button class="row cc ac" data-id="{{1}}" bindtap="onBuyOriginality"></button> -->
</view> </view>
<view class="shop-menu"> <view class="shop-menu">
<block wx:for="{{shopRecommendC}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{shopRecommendC}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<!-- 临时屏蔽购买 --> <!-- 临时屏蔽购买 -->
<view class="shop-menu-item col con-c align-c"> <view class="shop-menu-item column cc ac">
<!-- <view class="shop-menu-item col con-c align-c" data-id="{{1}}" data-item="{{item}}" bindtap="onBuyRecommendOriginality"> --> <!-- <view class="shop-menu-item column cc ac" data-id="{{1}}" data-item="{{item}}" bindtap="onBuyRecommendOriginality"> -->
<image src="{{item.cover}}"></image> <image src="{{item.cover}}"></image>
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
...@@ -152,20 +152,20 @@ ...@@ -152,20 +152,20 @@
<!-- 商店 --> <!-- 商店 -->
<view class="shop"> <view class="shop">
<view class="shop-title col"> <view class="shop-title column">
<text>累计消费</text> <text>累计消费</text>
<text>兑换特色产品</text> <text>兑换特色产品</text>
</view> </view>
<swiper indicator-dots="false"> <swiper indicator-dots="false">
<!-- 积分商城 --> <!-- 积分商城 -->
<swiper-item> <swiper-item>
<view class="shop-banner row con-c"> <view class="shop-banner row cc">
<image src="{{resourcesBase + 'bgi/bgi-01.png'}}"></image> <image src="{{resourcesBase + 'bgi/bgi-01.png'}}"></image>
<button class="row con-c align-c" bindtap="onMall"></button> <button class="row cc ac" bindtap="onMall"></button>
</view> </view>
<view class="shop-menu"> <view class="shop-menu">
<block wx:for="{{integralMallGoods}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{integralMallGoods}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="shop-menu-item col con-c align-c" data-item="{{item}}" bindtap="onMallGoodsDetail"> <view class="shop-menu-item column cc ac" data-item="{{item}}" bindtap="onMallGoodsDetail">
<image src="{{item.cover}}"></image> <image src="{{item.cover}}"></image>
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
</block> </block>
<view class="room-appointment"> <view class="room-appointment">
<view class="shop-title col"> <view class="shop-title column">
<text>滨海温泉院墅</text> <text>滨海温泉院墅</text>
<text>足不出户即可享受滨海温泉</text> <text>足不出户即可享受滨海温泉</text>
</view> </view>
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
</view> </view>
<view class="after-sales"> <view class="after-sales">
<view class="shop-title col"> <view class="shop-title column">
<text>碧海文化，真挚银湖</text> <text>碧海文化，真挚银湖</text>
<text>为您创造健康休闲的度假生活方式</text> <text>为您创造健康休闲的度假生活方式</text>
</view> </view>
......
pages/commodity/menu-food/menu-food.wxml
...@@ -31,10 +31,10 @@ ...@@ -31,10 +31,10 @@
<view wx:else class="item-info-content"></view> <view wx:else class="item-info-content"></view>
</view> </view>
<view class="item-other row con-b"> <view class="item-other row cb">
<!-- 活动价样式 --> <!-- 活动价样式 -->
<view wx:if="{{itemCommodity.priceType === 1}}"> <view wx:if="{{itemCommodity.priceType === 1}}">
<view class="item-price row align-e"> <view class="item-price row ae">
<text>￥</text> <text>￥</text>
<text>{{itemCommodity.priceDiscountText}}</text> <text>{{itemCommodity.priceDiscountText}}</text>
<text class="item-price-discount">活动价</text> <text class="item-price-discount">活动价</text>
......
pages/commodity/project-detail/project-detail.wxml
<m-nav titleText="{{navTitle}}" scrollHeight="{{navScroll}}" styleIndex="{{2}}" isOccupy="{{false}}"></m-nav> <m-nav titleText="{{navTitle}}" scrollHeight="{{navScroll}}" styleIndex="{{2}}" isOccupy="{{false}}"></m-nav>
<view class="container con-s" style="background: {{bgColor}}"> <view class="container" style="background: {{bgColor}}">
<view class="background-img"> <view class="background-img">
<image wx:if="{{banner}}" src="{{resourcesBase + banner}}"></image> <image wx:if="{{banner}}" src="{{resourcesBase + banner}}"></image>
</view> </view>
<block wx:for="{{commodityList}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{commodityList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="project-wrapper col" data-item="{{item}}" bindtap="onBuy"> <view class="project-wrapper column" data-item="{{item}}" bindtap="onBuy">
<view class="project-cover"> <view class="project-cover">
<image src="{{item.cover}}"></image> <image src="{{item.cover}}"></image>
</view> </view>
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
</view> </view>
<!-- 活动价样式 --> <!-- 活动价样式 -->
<view class="project-price-wrapper row align-c" wx:if="{{item.priceType === 1}}"> <view class="project-price-wrapper row ac" wx:if="{{item.priceType === 1}}">
<view class="item-price-discount row con-c align-c"> <view class="item-price-discount row cc ac">
<text>活动价</text> <text>活动价</text>
</view> </view>
<view class="price-special"> <view class="price-special">
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
</view> </view>
<!-- 业主价样式 --> <!-- 业主价样式 -->
<view class="project-price-wrapper row align-c" wx:if="{{item.priceType === 2}}"> <view class="project-price-wrapper row ac" wx:if="{{item.priceType === 2}}">
<view class="item-price-special row con-c align-c"> <view class="item-price-special row cc ac">
<text>业主价</text> <text>业主价</text>
</view> </view>
<view class="price-special"> <view class="price-special">
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
</view> </view>
<!-- 普通价样式 --> <!-- 普通价样式 -->
<view class="project-price-wrapper row align-c" wx:if="{{item.priceType === 3}}"> <view class="project-price-wrapper row ac" wx:if="{{item.priceType === 3}}">
<view class="price-special-msg row con-c align-c"> <view class="price-special-msg row cc ac">
<text></text> <text></text>
</view> </view>
<view class="price-special"> <view class="price-special">
......
pages/commodity/project/project.wxml
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<view class="shop-list"> <view class="shop-list">
<!-- 海错图门票 --> <!-- 海错图门票 -->
<view class="shop-item"> <view class="shop-item">
<view class="shop-name row align-c"> <view class="shop-name row ac">
<image mode="heightFix" src="{{resourcesBase + 'shop/logo-1.png'}}"></image> <image mode="heightFix" src="{{resourcesBase + 'shop/logo-1.png'}}"></image>
<text>故宫里的海洋世界—海错图</text> <text>故宫里的海洋世界—海错图</text>
</view> </view>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<text class="commodity-price-value">{{item.priceDiscountText}}</text> <text class="commodity-price-value">{{item.priceDiscountText}}</text>
<text class="commodity-price-special">业主价</text> <text class="commodity-price-special">业主价</text>
</view> </view>
<view class="commodity-price-through row con-e align-c"> <view class="commodity-price-through row ce ac">
<text>¥</text> <text>¥</text>
<text>{{item.priceText}}</text> <text>{{item.priceText}}</text>
</view> </view>
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<text class="commodity-price-value">{{item.priceSpecialText}}</text> <text class="commodity-price-value">{{item.priceSpecialText}}</text>
<text class="commodity-price-special">业主价</text> <text class="commodity-price-special">业主价</text>
</view> </view>
<view class="commodity-price-through row con-e align-c"> <view class="commodity-price-through row ce ac">
<text>¥</text> <text>¥</text>
<text>{{item.priceText}}</text> <text>{{item.priceText}}</text>
</view> </view>
...@@ -67,14 +67,14 @@ ...@@ -67,14 +67,14 @@
<text class="commodity-price-value">{{item.priceText}}</text> <text class="commodity-price-value">{{item.priceText}}</text>
<text></text> <text></text>
</view> </view>
<view class="commodity-price-through row con-e align-c"> <view class="commodity-price-through row ce ac">
<text></text> <text></text>
<text></text> <text></text>
</view> </view>
</block> </block>
<view class="commodity-price-operation row con-e align-c"> <view class="commodity-price-operation row ce ac">
<button class="row con-c align-c">购买门票</button> <button class="row cc ac">购买门票</button>
</view> </view>
</view> </view>
</view> </view>
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<!-- 水养韵苑 --> <!-- 水养韵苑 -->
<view class="shop-item"> <view class="shop-item">
<view class="shop-name row align-c"> <view class="shop-name row ac">
<image mode="heightFix" src="{{resourcesBase + 'shop/logo-7.png'}}"></image> <image mode="heightFix" src="{{resourcesBase + 'shop/logo-7.png'}}"></image>
<text>元养水韵SPA</text> <text>元养水韵SPA</text>
</view> </view>
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
<text class="commodity-price-symbol">/人</text> <text class="commodity-price-symbol">/人</text>
<text class="commodity-price-special">业主价</text> <text class="commodity-price-special">业主价</text>
</view> </view>
<view class="commodity-price-through row con-e align-c"> <view class="commodity-price-through row ce ac">
<text>¥</text> <text>¥</text>
<text>{{item.priceMin}}</text> <text>{{item.priceMin}}</text>
<text>-</text> <text>-</text>
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
<text class="commodity-price-symbol">/人</text> <text class="commodity-price-symbol">/人</text>
<text class="commodity-price-special">业主价</text> <text class="commodity-price-special">业主价</text>
</view> </view>
<view class="commodity-price-through row con-e align-c"> <view class="commodity-price-through row ce ac">
<text>¥</text> <text>¥</text>
<text>{{item.priceMin}}</text> <text>{{item.priceMin}}</text>
<text>-</text> <text>-</text>
...@@ -153,14 +153,14 @@ ...@@ -153,14 +153,14 @@
<text class="commodity-price-symbol">/人</text> <text class="commodity-price-symbol">/人</text>
<text></text> <text></text>
</view> </view>
<view class="commodity-price-through row con-e align-c"> <view class="commodity-price-through row ce ac">
<text></text> <text></text>
<text></text> <text></text>
</view> </view>
</block> </block>
<view class="commodity-price-operation row con-e align-c"> <view class="commodity-price-operation row ce ac">
<button class="row con-c align-c">查看服务</button> <button class="row cc ac">查看服务</button>
</view> </view>
</view> </view>
</view> </view>
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
<!-- 儿童营地 --> <!-- 儿童营地 -->
<view class="shop-item"> <view class="shop-item">
<view class="shop-name row align-c"> <view class="shop-name row ac">
<image mode="heightFix" src="{{resourcesBase + 'shop/logo-3.png'}}"></image> <image mode="heightFix" src="{{resourcesBase + 'shop/logo-3.png'}}"></image>
<text>儿童营地</text> <text>儿童营地</text>
</view> </view>
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
<text class="commodity-price-value">{{item.priceDiscountText}}</text> <text class="commodity-price-value">{{item.priceDiscountText}}</text>
<text class="commodity-price-special">业主价</text> <text class="commodity-price-special">业主价</text>
</view> </view>
<view class="commodity-price-through row con-e align-c"> <view class="commodity-price-through row ce ac">
<text>¥</text> <text>¥</text>
<text>{{item.priceText}}</text> <text>{{item.priceText}}</text>
</view> </view>
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
<text class="commodity-price-value">{{item.priceSpecialText}}</text> <text class="commodity-price-value">{{item.priceSpecialText}}</text>
<text class="commodity-price-special">业主价</text> <text class="commodity-price-special">业主价</text>
</view> </view>
<view class="commodity-price-through row con-e align-c"> <view class="commodity-price-through row ce ac">
<text>¥</text> <text>¥</text>
<text>{{item.priceText}}</text> <text>{{item.priceText}}</text>
</view> </view>
...@@ -221,14 +221,14 @@ ...@@ -221,14 +221,14 @@
<text class="commodity-price-value">{{item.priceText}}</text> <text class="commodity-price-value">{{item.priceText}}</text>
<text></text> <text></text>
</view> </view>
<view class="commodity-price-through row con-e align-c"> <view class="commodity-price-through row ce ac">
<text></text> <text></text>
<text></text> <text></text>
</view> </view>
</block> </block>
<view class="commodity-price-operation row con-e align-c"> <view class="commodity-price-operation row ce ac">
<button class="row con-c align-c">暂未开售</button> <button class="row cc ac">暂未开售</button>
</view> </view>
</view> </view>
</view> </view>
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
<text class="commodity-price-value">{{item.priceDiscountText}}</text> <text class="commodity-price-value">{{item.priceDiscountText}}</text>
<text class="commodity-price-special">业主价</text> <text class="commodity-price-special">业主价</text>
</view> </view>
<view class="commodity-price-through row con-e align-c"> <view class="commodity-price-through row ce ac">
<text>¥</text> <text>¥</text>
<text>{{item.priceText}}</text> <text>{{item.priceText}}</text>
</view> </view>
...@@ -267,7 +267,7 @@ ...@@ -267,7 +267,7 @@
<text class="commodity-price-value">{{item.priceSpecialText}}</text> <text class="commodity-price-value">{{item.priceSpecialText}}</text>
<text class="commodity-price-special">业主价</text> <text class="commodity-price-special">业主价</text>
</view> </view>
<view class="commodity-price-through row con-e align-c"> <view class="commodity-price-through row ce ac">
<text>¥</text> <text>¥</text>
<text>{{item.priceText}}</text> <text>{{item.priceText}}</text>
</view> </view>
...@@ -280,14 +280,14 @@ ...@@ -280,14 +280,14 @@
<text class="commodity-price-value">{{item.priceText}}</text> <text class="commodity-price-value">{{item.priceText}}</text>
<text></text> <text></text>
</view> </view>
<view class="commodity-price-through row con-e align-c"> <view class="commodity-price-through row ce ac">
<text></text> <text></text>
<text></text> <text></text>
</view> </view>
</block> </block>
<view class="commodity-price-operation row con-e align-c"> <view class="commodity-price-operation row ce ac">
<button class="row con-c align-c">暂未开售</button> <button class="row cc ac">暂未开售</button>
</view> </view>
</view> </view>
</view> </view>
......
pages/commodity/room-appointment/room-appointment.wxml
<m-toast></m-toast> <m-toast></m-toast>
<m-nav titleText="看房预约" styleIndex="{{2}}" isOccupy="{{false}}"></m-nav> <m-nav titleText="看房预约" styleIndex="{{2}}" isOccupy="{{false}}"></m-nav>
<view class="appointment-complete row con-c align-c" wx:if="{{appointmentComplete}}"> <view class="appointment-complete row cc ac" wx:if="{{appointmentComplete}}">
<view class="appointment-complete-tip"> <view class="appointment-complete-tip">
<image src="{{resourcesBase + 'commodity/room-appointment/house-tip.png'}}" bindtap="onAppointmentComplete"></image> <image src="{{resourcesBase + 'commodity/room-appointment/house-tip.png'}}" bindtap="onAppointmentComplete"></image>
</view> </view>
...@@ -13,49 +13,49 @@ ...@@ -13,49 +13,49 @@
<image class="ornament-wave" src="/image/ornament-2.png" mode="widthFix"></image> <image class="ornament-wave" src="/image/ornament-2.png" mode="widthFix"></image>
</view> </view>
<view class="form-title row con-s align-c"> <view class="form-title row cs ac">
<text>填写预约信息</text> <text>填写预约信息</text>
</view> </view>
<view class="form"> <view class="form">
<!-- 名字输入 --> <!-- 名字输入 -->
<view class="row align-c"> <view class="row ac">
<view class="input-label row con-b align-c"> <view class="input-label row cb ac">
<text>姓</text> <text>姓</text>
<text>名</text> <text>名</text>
</view> </view>
<view class="input-wrap row align-c"> <view class="input-wrap row ac">
<input maxlength="16" class="text" placeholder-class="input-tip" placeholder="请输入名字" data-type="name" bindblur="onInputBlur"></input> <input maxlength="16" class="text" placeholder-class="input-tip" placeholder="请输入名字" data-type="name" bindblur="onInputBlur"></input>
</view> </view>
</view> </view>
<view class="form-error row align-c"> <view class="form-error row ac">
<text hidden="{{errorName ? false : true}}">{{errorName}}</text> <text hidden="{{errorName ? false : true}}">{{errorName}}</text>
</view> </view>
<!-- 手机输入 --> <!-- 手机输入 -->
<view class="row align-c"> <view class="row ac">
<view class="input-label row con-b align-c"> <view class="input-label row cb ac">
<text>手</text> <text>手</text>
<text>机</text> <text>机</text>
<text>号</text> <text>号</text>
</view> </view>
<view class="input-wrap row align-c"> <view class="input-wrap row ac">
<input maxlength="11" type="number" class="text" placeholder-class="input-tip" placeholder="请输入手机号" data-type="phone" bindblur="onInputBlur"></input> <input maxlength="11" type="number" class="text" placeholder-class="input-tip" placeholder="请输入手机号" data-type="phone" bindblur="onInputBlur"></input>
</view> </view>
</view> </view>
<view class="form-error row align-c"> <view class="form-error row ac">
<text hidden="{{errorPhone ? false : true}}">{{errorPhone}}</text> <text hidden="{{errorPhone ? false : true}}">{{errorPhone}}</text>
</view> </view>
<!-- 预约日期 --> <!-- 预约日期 -->
<view class="row align-c"> <view class="row ac">
<view class="input-label row con-b align-c"> <view class="input-label row cb ac">
<text>看</text> <text>看</text>
<text>房</text> <text>房</text>
<text>日</text> <text>日</text>
<text>期</text> <text>期</text>
</view> </view>
<view class="input-wrap row align-c" style="padding: 0 0 0 24rpx"> <view class="input-wrap row ac" style="padding: 0 0 0 24rpx">
<picker class="input-picker" mode="date" value="{{date}}" start="{{appointmentDate}}" bindchange="onSelectionDate"> <picker class="input-picker" mode="date" value="{{date}}" start="{{appointmentDate}}" bindchange="onSelectionDate">
<view class="picker text" style="display: inline-block;width:400rpx">{{formDate}}</view> <view class="picker text" style="display: inline-block;width:400rpx">{{formDate}}</view>
<image class="input-icon" style="float: right;" src="{{imageBase + 'icon/arrow-r-1.png'}}"></image> <image class="input-icon" style="float: right;" src="{{imageBase + 'icon/arrow-r-1.png'}}"></image>
...@@ -65,6 +65,6 @@ ...@@ -65,6 +65,6 @@
</view> </view>
<view class="appointment-operation"> <view class="appointment-operation">
<button class="{{canSubmit ? 'button' : 'button-disable'}} row con-c align-c" bindtap="onSubmit">确认预约</button> <button class="{{canSubmit ? 'button' : 'button-disable'}} row cc ac" bindtap="onSubmit">确认预约</button>
</view> </view>
</view> </view>
\ No newline at end of file
pages/commodity/shopping-cart/shopping-cart.wxml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<m-nav titleText="购物车"></m-nav> <m-nav titleText="购物车"></m-nav>
<view class="container" wx:if="{{shoppingCart.length > 0}}"> <view class="container" wx:if="{{shoppingCart.length > 0}}">
<view class="shop-info row con-b align-c"> <view class="shop-info row cb ac">
<image wx:if="{{shopLogo}}" src="{{resourcesBase + shopLogo}}" mode="widthFix"></image> <image wx:if="{{shopLogo}}" src="{{resourcesBase + shopLogo}}" mode="widthFix"></image>
<text bindtap="onClearn">清空</text> <text bindtap="onClearn">清空</text>
</view> </view>
...@@ -12,18 +12,18 @@ ...@@ -12,18 +12,18 @@
<view class="shopping-cart-list"> <view class="shopping-cart-list">
<block wx:for="{{shoppingCart}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{shoppingCart}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="list-item row"> <view class="list-item row">
<view class="list-item-cover row align-c"> <view class="list-item-cover row ac">
<m-checkbox index="{{index}}" selection="{{item.isActive}}" bindchange="onChangeActive"></m-checkbox> <m-checkbox index="{{index}}" selection="{{item.isActive}}" bindchange="onChangeActive"></m-checkbox>
<image src="{{item.cover}}" mode="aspectFill"></image> <image src="{{item.cover}}" mode="aspectFill"></image>
</view> </view>
<view class="list-item-info col"> <view class="list-item-info column">
<view class="list-item-name"> <view class="list-item-name">
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
<view class="list-item-other row con-b"> <view class="list-item-other row cb">
<!-- 活动价样式 --> <!-- 活动价样式 -->
<view class="list-item-price" wx:if="{{item.priceType === 1}}"> <view class="list-item-price" wx:if="{{item.priceType === 1}}">
<view class="list-item-price-main row align-e"> <view class="list-item-price-main row ae">
<text>¥</text> <text>¥</text>
<text>{{item.priceDiscountText}}</text> <text>{{item.priceDiscountText}}</text>
<text class="price-discount">活动价</text> <text class="price-discount">活动价</text>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<!-- 业主价样式 --> <!-- 业主价样式 -->
<view class="list-item-price" wx:if="{{item.priceType === 2}}"> <view class="list-item-price" wx:if="{{item.priceType === 2}}">
<view class="list-item-price-main row align-e"> <view class="list-item-price-main row ae">
<text>¥</text> <text>¥</text>
<text>{{item.priceSpecialText}}</text> <text>{{item.priceSpecialText}}</text>
<text class="price-special">业主价</text> <text class="price-special">业主价</text>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<!-- 普通价样式 --> <!-- 普通价样式 -->
<view class="list-item-price" wx:if="{{item.priceType === 3}}"> <view class="list-item-price" wx:if="{{item.priceType === 3}}">
<view class="list-item-price-main row align-e"> <view class="list-item-price-main row ae">
<text>¥</text> <text>¥</text>
<text>{{item.priceText}}</text> <text>{{item.priceText}}</text>
<text></text> <text></text>
...@@ -60,8 +60,8 @@ ...@@ -60,8 +60,8 @@
</view> </view>
</view> </view>
<view class="list-item-quantity col con-e align-e"> <view class="list-item-quantity column ce ae">
<view class="list-item-quantity-operation row con-b align-c"> <view class="list-item-quantity-operation row cb ac">
<image src="{{imageBase + 'icon/cut-1.png'}}" data-index="{{index}}" bindtap="onQuantityReduce"></image> <image src="{{imageBase + 'icon/cut-1.png'}}" data-index="{{index}}" bindtap="onQuantityReduce"></image>
<text>{{item.quantity}}</text> <text>{{item.quantity}}</text>
<image hidden="{{item.quantityMax <= item.quantity}}" src="{{imageBase + 'icon/add-1.png'}}" data-index="{{index}}" bindtap="onQuantityAdd"></image> <image hidden="{{item.quantityMax <= item.quantity}}" src="{{imageBase + 'icon/add-1.png'}}" data-index="{{index}}" bindtap="onQuantityAdd"></image>
...@@ -78,14 +78,14 @@ ...@@ -78,14 +78,14 @@
</view> </view>
<!-- 只有在食品购物车才出现 --> <!-- 只有在食品购物车才出现 -->
<view class="pay-tip row align-c" wx:if="{{shopInfo.shopType === 5}}"> <view class="pay-tip row ac" wx:if="{{shopInfo.shopType === 5}}">
<image src="{{imageBase + 'icon/warning-4.png'}}"></image> <image src="{{imageBase + 'icon/warning-4.png'}}"></image>
<text>请在下单3天内取餐，逾期无效</text> <text>请在下单3天内取餐，逾期无效</text>
</view> </view>
<view class="pay row con-c align-c"> <view class="pay row cc ac">
<!-- 选择计数 --> <!-- 选择计数 -->
<view class="pay-selection row con-c align-c"> <view class="pay-selection row cc ac">
<m-checkbox selection="{{allSelectionIsActive}}" bindchange="onSelectionAll"></m-checkbox> <m-checkbox selection="{{allSelectionIsActive}}" bindchange="onSelectionAll"></m-checkbox>
<text>全选</text> <text>全选</text>
</view> </view>
...@@ -99,11 +99,11 @@ ...@@ -99,11 +99,11 @@
<text>{{'共' + selectionTotal + '件，优惠 ￥' + amountDiscount}}</text> <text>{{'共' + selectionTotal + '件，优惠 ￥' + amountDiscount}}</text>
</view> </view>
</view> </view>
<view class="order-pay-wrap row con-c align-c" bindtap="onPaySubmit">结算</view> <view class="order-pay-wrap row cc ac" bindtap="onPaySubmit">结算</view>
</view> </view>
</view> </view>
<view class="empty col con-c align-c" wx:else> <view class="empty column cc ac" wx:else>
<image src="{{imageBase + 'icon/cart-4.png'}}"></image> <image src="{{imageBase + 'icon/cart-4.png'}}"></image>
<view class="empty-title"> <view class="empty-title">
<text>购物车还没有商品哦</text> <text>购物车还没有商品哦</text>
......
pages/home/dynamic-detail/dynamic-detail.wxml
<m-nav titleText="动态详情" styleIndex="{{1}}"></m-nav> <m-nav titleText="动态详情" styleIndex="{{1}}"></m-nav>
<view class="container"> <view class="container">
<view class="title row con-s"> <view class="title row cs">
<text>{{notice.title}}</text> <text>{{notice.title}}</text>
</view> </view>
<view class="date row con-s"> <view class="date row cs">
<text>{{notice.date}}</text> <text>{{notice.date}}</text>
</view> </view>
<view class="describe"> <view class="describe">
......
pages/home/dynamic/dynamic.wxml
<m-nav titleText="最新动态"></m-nav> <m-nav titleText="最新动态"></m-nav>
<view class="container"> <view class="container">
<view class="title row con-b align-e"> <view class="title row cb ae">
<image src="./image/title-auxiliary.png"></image> <image src="./image/title-auxiliary.png"></image>
<image src="./image/title.png"></image> <image src="./image/title.png"></image>
</view> </view>
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<view class="notice-list"> <view class="notice-list">
<block wx:for="{{notice}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{notice}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="notice-item" data-id="{{item.id}}" bindtap="onNoticeDetail"> <view class="notice-item" data-id="{{item.id}}" bindtap="onNoticeDetail">
<view class="notice-title row con-b"> <view class="notice-title row cb">
<text>{{item.title}}</text> <text>{{item.title}}</text>
<text>{{item.date}}</text> <text>{{item.date}}</text>
</view> </view>
......
pages/home/guide/guide.wxml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<block wx:for="{{pointInfo}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{pointInfo}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view <view
id="{{'selection-' + item.id}}" id="{{'selection-' + item.id}}"
class="point-info row align-c {{item.isActive ? 'button-active' : 'button-inactive'}}" class="point-info row ac {{item.isActive ? 'button-active' : 'button-inactive'}}"
style="{{item.css}}" style="{{item.css}}"
data-index="{{index}}" data-index="{{index}}"
catch:tap="onPointInfo" catch:tap="onPointInfo"
...@@ -35,6 +35,6 @@ ...@@ -35,6 +35,6 @@
<image src="{{resourcesBase + pointDetail}}"></image> <image src="{{resourcesBase + pointDetail}}"></image>
</view> </view>
<view class="save-map row con-c align-c" bindtap="onSaveMap"> <view class="save-map row cc ac" bindtap="onSaveMap">
<text>保存完整地图</text> <text>保存完整地图</text>
</view> </view>
\ No newline at end of file
pages/home/home/home.wxml
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</view> </view>
<view class="row cb ac"> <view class="row cb ac">
<text class="sign-in-content">消费积分 业主特权</text> <text class="sign-in-content">消费积分 业主特权</text>
<image class="icon_32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image class="i32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
</view> </view>
...@@ -46,16 +46,16 @@ ...@@ -46,16 +46,16 @@
</swiper-item> </swiper-item>
</block> </block>
</swiper> </swiper>
<image class="icon_32" src="{{imageBase + 'icon/arrow-r-2.png'}}" bindtap="onNoticeList"></image> <image class="i32" src="{{imageBase + 'icon/arrow-r-2.png'}}" bindtap="onNoticeList"></image>
</view> </view>
</view> </view>
<view class="detail"> <view class="detail">
<!-- 预约公告 --> <!-- 预约公告 -->
<view class="night row con-b" bindtap="onAppointmentInto"> <view class="night row cb" bindtap="onAppointmentInto">
<image src="{{resourcesBase + 'home/into.png'}}" mode="aspectFit"></image> <image src="{{resourcesBase + 'home/into.png'}}" mode="aspectFit"></image>
<view class="night-content"> <view class="night-content">
<view class="night-info-title row align-c"> <view class="night-info-title row ac">
<image src="./image/night.png"></image> <image src="./image/night.png"></image>
<image src="./image/title-night.png"></image> <image src="./image/title-night.png"></image>
</view> </view>
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<text>20:00后入园需提前预约，每日限流200人</text> <text>20:00后入园需提前预约，每日限流200人</text>
</view> </view>
</view> </view>
<view class="night-info-more row align-c"> <view class="night-info-more row ac">
<image src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
</view> </view>
...@@ -73,9 +73,9 @@ ...@@ -73,9 +73,9 @@
<image src="./image/title-guide.png"></image> <image src="./image/title-guide.png"></image>
<view class="guide-content"> <view class="guide-content">
<image class="background-image" src="{{resourcesBase + 'home/guide.png'}}" mode="aspectFit"></image> <image class="background-image" src="{{resourcesBase + 'home/guide.png'}}" mode="aspectFit"></image>
<view class="operation col"> <view class="operation column">
<image src="./image/explore.png"></image> <image src="./image/explore.png"></image>
<button class="row con-c align-c">进入电子地图</button> <button class="row cc ac">进入电子地图</button>
</view> </view>
</view> </view>
</view> </view>
......
pages/home/night-appointment/night-appointment.wxml
<m-toast></m-toast> <m-toast></m-toast>
<m-nav titleText="夜间入园预约" scrollHeight="{{navScroll}}" styleIndex="{{2}}" isOccupy="{{false}}"></m-nav> <m-nav titleText="夜间入园预约" scrollHeight="{{navScroll}}" styleIndex="{{2}}" isOccupy="{{false}}"></m-nav>
<view class="appointment-complete row con-c align-c" wx:if="{{appointmentComplete}}"> <view class="appointment-complete row cc ac" wx:if="{{appointmentComplete}}">
<view class="appointment-complete-tip"> <view class="appointment-complete-tip">
<image src="{{resourcesBase + 'home/night-appointment/night-tip.png'}}" bindtap="onAppointmentComplete"></image> <image src="{{resourcesBase + 'home/night-appointment/night-tip.png'}}" bindtap="onAppointmentComplete"></image>
</view> </view>
...@@ -14,87 +14,87 @@ ...@@ -14,87 +14,87 @@
<image class="ornament-wave" src="/image/ornament-2.png" mode="widthFix"></image> <image class="ornament-wave" src="/image/ornament-2.png" mode="widthFix"></image>
</view> </view>
<view class="form-title row con-s align-c"> <view class="form-title row cs ac">
<text>填写预约信息</text> <text>填写预约信息</text>
</view> </view>
<view class="form"> <view class="form">
<!-- 名字输入 --> <!-- 名字输入 -->
<view class="row align-c"> <view class="row ac">
<view class="input-label row con-b align-c"> <view class="input-label row cb ac">
<text>姓</text> <text>姓</text>
<text>名</text> <text>名</text>
</view> </view>
<view class="input-wrap row align-c"> <view class="input-wrap row ac">
<input maxlength="16" class="text" placeholder-class="input-tip" placeholder="请输入名字" data-type="name" bindblur="onInputBlur"></input> <input maxlength="16" class="text" placeholder-class="input-tip" placeholder="请输入名字" data-type="name" bindblur="onInputBlur"></input>
</view> </view>
</view> </view>
<view class="form-error row align-c"> <view class="form-error row ac">
<text hidden="{{errorName ? false : true}}">{{errorName}}</text> <text hidden="{{errorName ? false : true}}">{{errorName}}</text>
</view> </view>
<!-- 手机输入 --> <!-- 手机输入 -->
<view class="row align-c"> <view class="row ac">
<view class="input-label row con-b align-c"> <view class="input-label row cb ac">
<text>手</text> <text>手</text>
<text>机</text> <text>机</text>
<text>号</text> <text>号</text>
</view> </view>
<view class="input-wrap row align-c"> <view class="input-wrap row ac">
<input maxlength="11" type="number" class="text" placeholder-class="input-tip" placeholder="请输入手机号" data-type="phone" bindblur="onInputBlur"></input> <input maxlength="11" type="number" class="text" placeholder-class="input-tip" placeholder="请输入手机号" data-type="phone" bindblur="onInputBlur"></input>
</view> </view>
</view> </view>
<view class="form-error row align-c"> <view class="form-error row ac">
<text hidden="{{errorPhone ? false : true}}">{{errorPhone}}</text> <text hidden="{{errorPhone ? false : true}}">{{errorPhone}}</text>
</view> </view>
<!-- 预约人数 --> <!-- 预约人数 -->
<view class="row align-c"> <view class="row ac">
<view class="input-label row con-b align-c"> <view class="input-label row cb ac">
<text>预</text> <text>预</text>
<text>约</text> <text>约</text>
<text>人</text> <text>人</text>
<text>数</text> <text>数</text>
</view> </view>
<view class="input-wrap row con-b align-c" style="padding: 0"> <view class="input-wrap row cb ac" style="padding: 0">
<button class="row con-c align-c" bindtap="onQuantityCut"> <button class="row cc ac" bindtap="onQuantityCut">
<image src="{{imageBase + 'icon/cut-1.png'}}"></image> <image src="{{imageBase + 'icon/cut-1.png'}}"></image>
</button> </button>
<text style="{{formQuantity === 0 ? 'color: #C2C7CF' : 'color: #15191F'}}">{{formQuantity}}</text> <text style="{{formQuantity === 0 ? 'color: #C2C7CF' : 'color: #15191F'}}">{{formQuantity}}</text>
<button class="row con-c align-c" bindtap="onQuantityAdd"> <button class="row cc ac" bindtap="onQuantityAdd">
<image src="{{imageBase + 'icon/add-1.png'}}"></image> <image src="{{imageBase + 'icon/add-1.png'}}"></image>
</button> </button>
</view> </view>
</view> </view>
<view class="form-error row align-c"> <view class="form-error row ac">
<text hidden="{{errorQuantity ? false : true}}">{{errorQuantity}}</text> <text hidden="{{errorQuantity ? false : true}}">{{errorQuantity}}</text>
</view> </view>
<!-- 预约日期 --> <!-- 预约日期 -->
<view class="row align-c"> <view class="row ac">
<view class="input-label row con-b align-c"> <view class="input-label row cb ac">
<text>预</text> <text>预</text>
<text>约</text> <text>约</text>
<text>日</text> <text>日</text>
<text>期</text> <text>期</text>
</view> </view>
<view class="input-wrap row con-b align-c" style="padding: 0 0 0 24rpx"> <view class="input-wrap row cb ac" style="padding: 0 0 0 24rpx">
<picker class="input-picker row align-c" mode="date" value="{{date}}" start="{{appointmentDate}}" end="{{appointmentEndDate}}" bindchange="onSelectionDate"> <picker class="input-picker row ac" mode="date" value="{{date}}" start="{{appointmentDate}}" end="{{appointmentEndDate}}" bindchange="onSelectionDate">
<view class="row con-b align-c"> <view class="row cb ac">
<text class="grow">{{formDate}}</text> <text class="grow">{{formDate}}</text>
<image class="input-icon" src="{{imageBase + 'icon/arrow-r-1.png'}}"></image> <image class="input-icon" src="{{imageBase + 'icon/arrow-r-1.png'}}"></image>
</view> </view>
</picker> </picker>
</view> </view>
</view> </view>
<view class="quota row con-e align-c" hidden="{{!winQuota}}"> <view class="quota row ce ac" hidden="{{!winQuota}}">
<text>剩余名额：</text> <text>剩余名额：</text>
<text>{{total}}人</text> <text>{{total}}人</text>
</view> </view>
</view> </view>
<view class="appointment-operation"> <view class="appointment-operation">
<button class="{{canSubmit ? 'button' : 'button-disable'}} row con-c align-c" bindtap="onSubmit">确认预约</button> <button class="{{canSubmit ? 'button' : 'button-disable'}} row cc ac" bindtap="onSubmit">确认预约</button>
<button class="button-plain row con-c align-c" bindtap="onServic">电话咨询</button> <button class="button-plain row cc ac" bindtap="onServic">电话咨询</button>
</view> </view>
</view> </view>
\ No newline at end of file
pages/login/login.wxml
...@@ -12,12 +12,12 @@ ...@@ -12,12 +12,12 @@
<button class="login-operation-authorization" hidden="{{islogin}}" open-type="getUserInfo" bindgetuserinfo="userInfoHandler">微信授权登录</button> <button class="login-operation-authorization" hidden="{{islogin}}" open-type="getUserInfo" bindgetuserinfo="userInfoHandler">微信授权登录</button>
<view class="login-operation-authorization-complete row cc ac" hidden="{{!islogin}}"> <view class="login-operation-authorization-complete row cc ac" hidden="{{!islogin}}">
<text class="fs30 fw400">已授权</text> <text class="fs30 fw400">已授权</text>
<image class="icon_32" src="../../image/icon/tick-3.png"></image> <image class="i32" src="../../image/icon/tick-3.png"></image>
</view> </view>
<button class="login-operation-authorization" hidden="{{isphone}}" open-type="getPhoneNumber" bindgetphonenumber="userPhoneHandler">绑定手机号</button> <button class="login-operation-authorization" hidden="{{isphone}}" open-type="getPhoneNumber" bindgetphonenumber="userPhoneHandler">绑定手机号</button>
<view class="login-operation-authorization-complete row cc ac" hidden="{{!isphone}}"> <view class="login-operation-authorization-complete row cc ac" hidden="{{!isphone}}">
<text class="fs30 fw400">已绑定手机号</text> <text class="fs30 fw400">已绑定手机号</text>
<image class="icon_32" src="../../image/icon/tick-3.png"></image> <image class="i32" src="../../image/icon/tick-3.png"></image>
</view> </view>
</view> </view>
</view> </view>
\ No newline at end of file
pages/mall/exchange-state/exchange-state.wxml
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<block wx:if="{{isExpress}}"> <block wx:if="{{isExpress}}">
<!-- 快递提示 --> <!-- 快递提示 -->
<view class="express_tip row ac" wx:if="{{state !== 3}}"> <view class="express_tip row ac" wx:if="{{state !== 3}}">
<image class="icon_32" src="{{imageBase + 'icon/warning-4.png'}}"></image> <image class="i32" src="{{imageBase + 'icon/warning-4.png'}}"></image>
<text class="fs22 fw400 c20">快递运费自理，顺丰到付，12-23元不等</text> <text class="fs22 fw400 c20">快递运费自理，顺丰到付，12-23元不等</text>
</view> </view>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<view class="address_info"> <view class="address_info">
<text class="fs34 fw700 c01">收货信息</text> <text class="fs34 fw700 c01">收货信息</text>
<view class="address_info_selection row ac" bindtap="onAddressSelection"> <view class="address_info_selection row ac" bindtap="onAddressSelection">
<image class="icon_40" src="{{imageBase + 'icon/location-1.png'}}"></image> <image class="i40" src="{{imageBase + 'icon/location-1.png'}}"></image>
<!-- 等待添加地址 --> <!-- 等待添加地址 -->
<block wx:if="{{!addressSelection.id}}"> <block wx:if="{{!addressSelection.id}}">
<view class="address_info_detail row ac"> <view class="address_info_detail row ac">
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</view> </view>
</block> </block>
<view> <view>
<image class="icon_32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image class="i32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
</view> </view>
</view> </view>
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
</view> </view>
<view class="notice row ce ac" wx:if="{{state !== 3 && state !== 4}}" bindtap="onGoodsNotes"> <view class="notice row ce ac" wx:if="{{state !== 3 && state !== 4}}" bindtap="onGoodsNotes">
<text class="fs30 fw400 c31">使用须知</text> <text class="fs30 fw400 c31">使用须知</text>
<image class="icon_32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image class="i32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
</view> </view>
...@@ -179,18 +179,18 @@ ...@@ -179,18 +179,18 @@
<!-- 二维码弹窗 --> <!-- 二维码弹窗 -->
<view class="dialog_coupon_code row cc ac" wx:if="{{winCouponCode}}"> <view class="dialog_coupon_code row cc ac" wx:if="{{winCouponCode}}">
<view class="dialog_coupon_code_wrap col cc ac"> <view class="dialog_coupon_code_wrap column cc ac">
<text class="fs26 fw400 c90">{{'请将券码出示给门店核销人员'}}</text> <text class="fs26 fw400 c90">{{'请将券码出示给门店核销人员'}}</text>
<swiper class="dialog_coupon_code_swiper" current="{{couponCodeSelectionIndex}}"> <swiper class="dialog_coupon_code_swiper" current="{{couponCodeSelectionIndex}}">
<swiper-item class="dialog_coupon_code_item row cc" wx:for="{{couponCodeList}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <swiper-item class="dialog_coupon_code_item row cc" wx:for="{{couponCodeList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="dialog_coupon_code_info col cc ac"> <view class="dialog_coupon_code_info column cc ac">
<!-- 无效券码蒙尘样式 --> <!-- 无效券码蒙尘样式 -->
<view class="dialog_coupon_code_mask" wx:if="{{item.state === 2}}"></view> <view class="dialog_coupon_code_mask" wx:if="{{item.state === 2}}"></view>
<image mode="aspectFill" class="dialog_coupon_code_seal" wx:if="{{item.state === 2}}" src="./image/seal-used.png"></image> <image mode="aspectFill" class="dialog_coupon_code_seal" wx:if="{{item.state === 2}}" src="./image/seal-used.png"></image>
<text class="fs30 fw400 c01">{{item.name}}</text> <text class="fs30 fw400 c01">{{item.name}}</text>
<image class="dialog_coupon_code_content" src="{{'data:image/png;base64,' + item.codeBase64}}"></image> <image class="dialog_coupon_code_content" src="{{'data:image/png;base64,' + item.codeBase64}}"></image>
<view class="dialog_coupon_code_operation row con-b ac"> <view class="dialog_coupon_code_operation row cb ac">
<block wx:if="{{item.state === 1}}"> <block wx:if="{{item.state === 1}}">
<text class="fs22 fw700 c31">券码</text> <text class="fs22 fw700 c31">券码</text>
<text class="fs30 fw700 c01">{{item.codeNumber}}</text> <text class="fs30 fw700 c01">{{item.codeNumber}}</text>
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
</swiper-item> </swiper-item>
</swiper> </swiper>
<view class="dialog_coupon_code_close row cc ac" bindtap="onCouponCodeClose"> <view class="dialog_coupon_code_close row cc ac" bindtap="onCouponCodeClose">
<image class="icon_48" src="{{imageBase + 'icon/close-1.png'}}"></image> <image class="i48" src="{{imageBase + 'icon/close-1.png'}}"></image>
</view> </view>
</view> </view>
</view> </view>
......
pages/mall/exchange-submit/exchange-submit.wxml
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</block> </block>
</view> </view>
<view class="option_tip row ac" wx:if="{{isExpress}}"> <view class="option_tip row ac" wx:if="{{isExpress}}">
<image class="icon_32" src="{{imageBase + 'icon/warning-4.png'}}"></image> <image class="i32" src="{{imageBase + 'icon/warning-4.png'}}"></image>
<text>快递运费自理，顺丰到付，12-23元不等</text> <text>快递运费自理，顺丰到付，12-23元不等</text>
</view> </view>
</view> </view>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</view> </view>
<view class="address_info_selection row ac" bindtap="onAddressSelection"> <view class="address_info_selection row ac" bindtap="onAddressSelection">
<view> <view>
<image class="icon_40" src="{{imageBase + 'icon/location-1.png'}}"></image> <image class="i40" src="{{imageBase + 'icon/location-1.png'}}"></image>
</view> </view>
<!-- 等待添加地址 --> <!-- 等待添加地址 -->
<block wx:if="{{!addressSelection.id}}"> <block wx:if="{{!addressSelection.id}}">
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
</view> </view>
</block> </block>
<view> <view>
<image class="icon_32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image class="i32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
</view> </view>
</view> </view>
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
</view> </view>
<view class="goods_tip row ce ac" bindtap="onGoodsNotes"> <view class="goods_tip row ce ac" bindtap="onGoodsNotes">
<text>兑换须知</text> <text>兑换须知</text>
<image class="icon_32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image class="i32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
</view> </view>
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
<!-- 操作 --> <!-- 操作 -->
<view class="operation"> <view class="operation">
<view class="operation_tip row ac"> <view class="operation_tip row ac">
<image class="icon_32" src="{{imageBase + 'icon/warning-4.png'}}"></image> <image class="i32" src="{{imageBase + 'icon/warning-4.png'}}"></image>
<text>兑换后一经确认不得取消</text> <text>兑换后一经确认不得取消</text>
</view> </view>
<view class="operation_next row cb ac"> <view class="operation_next row cb ac">
......
pages/mall/exchange-tip/exchange-tip.wxml
<view class="container column cb ac"> <view class="container column cb ac">
<view class="tip column cc ac"> <view class="tip column cc ac">
<image class="icon_136" src="{{imageBase + 'icon/tick-main.png'}}"></image> <image class="i136" src="{{imageBase + 'icon/tick-main.png'}}"></image>
<text class="tip_state">兑换成功</text> <text class="tip_state">兑换成功</text>
</view> </view>
<view class="cloumn"> <view class="cloumn">
......
pages/mall/home/home.wxml
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
<text>我的积分</text> <text>我的积分</text>
</view> </view>
<view class="integral_record column cc ac" bindtap="onExchangeRecord"> <view class="integral_record column cc ac" bindtap="onExchangeRecord">
<image class="icon_48" src="{{imageBase + 'icon/exchange-3.png'}}"></image> <image class="i48" src="{{imageBase + 'icon/exchange-3.png'}}"></image>
<text>兑换记录</text> <text>兑换记录</text>
</view> </view>
<view class="integral_detail column cc ac" bindtap="onIntegralDetail"> <view class="integral_detail column cc ac" bindtap="onIntegralDetail">
<image class="icon_48" src="{{imageBase + 'icon/list-3.png'}}"></image> <image class="i48" src="{{imageBase + 'icon/list-3.png'}}"></image>
<text>积分明细</text> <text>积分明细</text>
</view> </view>
</view> </view>
......
pages/mine/address-list/address-list.wxml
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<text class="fs26 fw400 c01">{{item.area + item.address}}</text> <text class="fs26 fw400 c01">{{item.area + item.address}}</text>
</view> </view>
</view> </view>
<image class="icon_32" src="{{imageBase + 'icon/edit-1.png'}}" data-item="{{item}}" catchtap="onAddressEdit"></image> <image class="i32" src="{{imageBase + 'icon/edit-1.png'}}" data-item="{{item}}" catchtap="onAddressEdit"></image>
</view> </view>
</block> </block>
</view> </view>
......
pages/mine/address-operate/address-operate.wxml
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<picker class="address_item_picker" mode="region" value="{{addressInfo.area}}" bindchange="onSelectionRegion"> <picker class="address_item_picker" mode="region" value="{{addressInfo.area}}" bindchange="onSelectionRegion">
<view class="row ac cb"> <view class="row ac cb">
<view>{{addressInfo.area[0] + addressInfo.area[1] + addressInfo.area[2]}}</view> <view>{{addressInfo.area[0] + addressInfo.area[1] + addressInfo.area[2]}}</view>
<image class="icon_32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image class="i32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
</picker> </picker>
</view> </view>
......
pages/mine/appointment-detail/appointment-detail.wxml
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
</image> </image>
</view> </view>
<block wx:if="{{orderInfo.state === 2}}"> <block wx:if="{{orderInfo.state === 2}}">
<view class="info-line row con-b ac"> <view class="info-line row cb ac">
<view class="info-line-point-left"></view> <view class="info-line-point-left"></view>
<view class="info-line-line"></view> <view class="info-line-line"></view>
<view class="info-line-point-right"></view> <view class="info-line-point-right"></view>
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
</image> </image>
</view> </view>
<block wx:if="{{orderInfo.state === 2}}"> <block wx:if="{{orderInfo.state === 2}}">
<view class="info-line row con-b ac"> <view class="info-line row cb ac">
<view class="info-line-point-left"></view> <view class="info-line-point-left"></view>
<view class="info-line-line"></view> <view class="info-line-line"></view>
<view class="info-line-point-right"></view> <view class="info-line-point-right"></view>
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
</image> </image>
</view> </view>
<block wx:if="{{orderInfo.state===2}}"> <block wx:if="{{orderInfo.state===2}}">
<view class="info-line row con-b ac"> <view class="info-line row cb ac">
<view class="info-line-point-left"></view> <view class="info-line-point-left"></view>
<view class="info-line-line"></view> <view class="info-line-line"></view>
<view class="info-line-point-right"></view> <view class="info-line-point-right"></view>
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
</image> </image>
</view> </view>
<block wx:if="{{orderInfo.state === 2}}"> <block wx:if="{{orderInfo.state === 2}}">
<view class="info-line row con-b ac"> <view class="info-line row cb ac">
<view class="info-line-point-left"></view> <view class="info-line-point-left"></view>
<view class="info-line-line"></view> <view class="info-line-line"></view>
<view class="info-line-point-right"></view> <view class="info-line-point-right"></view>
...@@ -219,11 +219,11 @@ ...@@ -219,11 +219,11 @@
<view class="notice-wrapper row ce ac" bindtap="handleNotice"> <view class="notice-wrapper row ce ac" bindtap="handleNotice">
<view class="notice">活动须知</view> <view class="notice">活动须知</view>
<image class="icon_32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image class="i32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
<!-- 商品信息 --> <!-- 商品信息 -->
<view class="commodity col"> <view class="commodity column">
<view class="commodity-title"> <view class="commodity-title">
<text>购买商品</text> <text>购买商品</text>
</view> </view>
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
<!-- 订单提示 --> <!-- 订单提示 -->
<view class="tip"> <view class="tip">
<view class="tip-pay row con-b ac"> <view class="tip-pay row cb ac">
<view class="tip-pay-title" wx:if="{{orderInfo.payAmount !== undefined}}"> <view class="tip-pay-title" wx:if="{{orderInfo.payAmount !== undefined}}">
<text wx:if="{{orderInfo.state === 0 || orderInfo.state === -1}}">待付金额</text> <text wx:if="{{orderInfo.state === 0 || orderInfo.state === -1}}">待付金额</text>
<text wx:else>实付金额</text> <text wx:else>实付金额</text>
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
<text>{{orderInfo.payAmount}}</text> <text>{{orderInfo.payAmount}}</text>
</view> </view>
</view> </view>
<view class="tip-describe col"> <view class="tip-describe column">
<text>{{'订单编号：' + ( orderInfo.number ? orderInfo.number : "")}}</text> <text>{{'订单编号：' + ( orderInfo.number ? orderInfo.number : "")}}</text>
<text>{{'下单时间：' + (orderInfo.submitTime ? orderInfo.submitTime : '')}}</text> <text>{{'下单时间：' + (orderInfo.submitTime ? orderInfo.submitTime : '')}}</text>
<text wx:if="{{orderInfo.state !== 0 && orderInfo.state !== -1}}">{{'付款时间：' + (orderInfo.payTime ? orderInfo.payTime : '')}}</text> <text wx:if="{{orderInfo.state !== 0 && orderInfo.state !== -1}}">{{'付款时间：' + (orderInfo.payTime ? orderInfo.payTime : '')}}</text>
......
pages/mine/appointment/appointment.wxml
...@@ -19,11 +19,11 @@ ...@@ -19,11 +19,11 @@
<view class="appintment-activity-status-pay"> <view class="appintment-activity-status-pay">
<text>待付款</text> <text>待付款</text>
</view> </view>
<view class="appointment-activity-content row align-c"> <view class="appointment-activity-content row ac">
<view class="appointment-activity-img"> <view class="appointment-activity-img">
<image src="{{item.cover}}"></image> <image src="{{item.cover}}"></image>
</view> </view>
<view class="appointment-activity-info col con-a"> <view class="appointment-activity-info column ca">
<view class="appointment-activity-title"> <view class="appointment-activity-title">
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<text>{{'共' + item.num + '人'}}</text> <text>{{'共' + item.num + '人'}}</text>
</view> </view>
</view> </view>
<view class="appointment-activity-footer row con-b align-c"> <view class="appointment-activity-footer row cb ac">
<view class="appointment-activity-price"> <view class="appointment-activity-price">
<text>￥</text> <text>￥</text>
<text>{{item.amount}}</text> <text>{{item.amount}}</text>
...@@ -52,11 +52,11 @@ ...@@ -52,11 +52,11 @@
<view class="appintment-activity-status"> <view class="appintment-activity-status">
<text>未开始</text> <text>未开始</text>
</view> </view>
<view class="appointment-activity-content row align-c"> <view class="appointment-activity-content row ac">
<view class="appointment-activity-img"> <view class="appointment-activity-img">
<image src="{{item.cover}}"></image> <image src="{{item.cover}}"></image>
</view> </view>
<view class="appointment-activity-info col con-a"> <view class="appointment-activity-info column ca">
<view class="appointment-activity-title"> <view class="appointment-activity-title">
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<text>{{'共' + item.num + '人'}}</text> <text>{{'共' + item.num + '人'}}</text>
</view> </view>
</view> </view>
<view class="appointment-activity-footer row con-b align-c"> <view class="appointment-activity-footer row cb ac">
<view class="appointment-activity-price"> <view class="appointment-activity-price">
<text>￥</text> <text>￥</text>
<text>{{item.amount}}</text> <text>{{item.amount}}</text>
...@@ -84,11 +84,11 @@ ...@@ -84,11 +84,11 @@
<view class="appintment-activity-status"> <view class="appintment-activity-status">
<text>进行中</text> <text>进行中</text>
</view> </view>
<view class="appointment-activity-content row align-c"> <view class="appointment-activity-content row ac">
<view class="appointment-activity-img"> <view class="appointment-activity-img">
<image src="{{item.cover}}"></image> <image src="{{item.cover}}"></image>
</view> </view>
<view class="appointment-activity-info col con-a"> <view class="appointment-activity-info column ca">
<view class="appointment-activity-title"> <view class="appointment-activity-title">
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
<text>{{'共' + item.num + '人'}}</text> <text>{{'共' + item.num + '人'}}</text>
</view> </view>
</view> </view>
<view class="appointment-activity-footer row con-b align-c"> <view class="appointment-activity-footer row cb ac">
<view class="appointment-activity-price"> <view class="appointment-activity-price">
<text>￥</text> <text>￥</text>
<text>{{item.amount}}</text> <text>{{item.amount}}</text>
...@@ -116,11 +116,11 @@ ...@@ -116,11 +116,11 @@
<view class="appintment-activity-status"> <view class="appintment-activity-status">
<text>待评价</text> <text>待评价</text>
</view> </view>
<view class="appointment-activity-content row align-c"> <view class="appointment-activity-content row ac">
<view class="appointment-activity-img"> <view class="appointment-activity-img">
<image src="{{item.cover}}"></image> <image src="{{item.cover}}"></image>
</view> </view>
<view class="appointment-activity-info col con-a"> <view class="appointment-activity-info column ca">
<view class="appointment-activity-title"> <view class="appointment-activity-title">
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
<text>{{'共' + item.num + '人'}}</text> <text>{{'共' + item.num + '人'}}</text>
</view> </view>
</view> </view>
<view class="appointment-activity-footer row con-b align-c"> <view class="appointment-activity-footer row cb ac">
<view class="appointment-activity-price"> <view class="appointment-activity-price">
<text>￥</text> <text>￥</text>
<text>{{item.amount}}</text> <text>{{item.amount}}</text>
...@@ -150,11 +150,11 @@ ...@@ -150,11 +150,11 @@
<text wx:if="{{item.status === 4}}">已过期</text> <text wx:if="{{item.status === 4}}">已过期</text>
<text wx:if="{{item.status === 6}}">{{item.belongType === 2 ? '已使用' : '已评价'}}</text> <text wx:if="{{item.status === 6}}">{{item.belongType === 2 ? '已使用' : '已评价'}}</text>
</view> </view>
<view class="appointment-activity-content row align-c"> <view class="appointment-activity-content row ac">
<view class="appointment-activity-img"> <view class="appointment-activity-img">
<image src="{{item.cover}}"></image> <image src="{{item.cover}}"></image>
</view> </view>
<view class="appointment-activity-info col con-a"> <view class="appointment-activity-info column ca">
<view class="appointment-activity-title"> <view class="appointment-activity-title">
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
<text>{{'共' + item.num + '人'}}</text> <text>{{'共' + item.num + '人'}}</text>
</view> </view>
</view> </view>
<view class="appointment-activity-footer row con-b align-c"> <view class="appointment-activity-footer row cb ac">
<view class="appointment-activity-price"> <view class="appointment-activity-price">
<text>￥</text> <text>￥</text>
<text>{{item.amount}}</text> <text>{{item.amount}}</text>
...@@ -183,11 +183,11 @@ ...@@ -183,11 +183,11 @@
<view class="appintment-activity-status-cancel"> <view class="appintment-activity-status-cancel">
<text>已取消</text> <text>已取消</text>
</view> </view>
<view class="appointment-activity-content row align-c"> <view class="appointment-activity-content row ac">
<view class="appointment-activity-img"> <view class="appointment-activity-img">
<image src="{{item.cover}}"></image> <image src="{{item.cover}}"></image>
</view> </view>
<view class="appointment-activity-info col con-a"> <view class="appointment-activity-info column ca">
<view class="appointment-activity-title"> <view class="appointment-activity-title">
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
<text>{{'共' + item.num + '人'}}</text> <text>{{'共' + item.num + '人'}}</text>
</view> </view>
</view> </view>
<view class="appointment-activity-footer row con-b align-c"> <view class="appointment-activity-footer row cb ac">
<view class="appointment-activity-price"> <view class="appointment-activity-price">
<text>￥</text> <text>￥</text>
<text>{{item.amount}}</text> <text>{{item.amount}}</text>
......
pages/mine/card/card.wxml
<m-toast></m-toast> <m-toast></m-toast>
<m-nav titleText="我的年卡/月卡" scrollHeight="{{navScroll}}"></m-nav> <m-nav titleText="我的年卡/月卡" scrollHeight="{{navScroll}}"></m-nav>
<view class="container con-s" style="padding-top: {{paddingTop + 'px'}}"> <view class="container cs" style="padding-top: {{paddingTop + 'px'}}">
<!-- 单张卡 --> <!-- 单张卡 -->
<view class="card-wrapper" wx:if="{{passList.length == 1}}"> <view class="card-wrapper" wx:if="{{passList.length == 1}}">
<view class="card-header"> <view class="card-header">
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<image wx:elif="{{passList[0].cardType==2}}" class="card-bg year-bg" src="{{imageResourcesBase +'mine/card/month-bg.png'}}"></image> <image wx:elif="{{passList[0].cardType==2}}" class="card-bg year-bg" src="{{imageResourcesBase +'mine/card/month-bg.png'}}"></image>
<image wx:else class="card-bg month-bg" src="{{imageResourcesBase +'pay/order-input/card-3.png'}}"> <image wx:else class="card-bg month-bg" src="{{imageResourcesBase +'pay/order-input/card-3.png'}}">
</image> </image>
<view class="use-notice row align-c" data-item="{{passList[0]}}" bindtap="onNotice"> <view class="use-notice row ac" data-item="{{passList[0]}}" bindtap="onNotice">
<text>使用须知</text> <text>使用须知</text>
<image src="{{imageBase + 'icon/arrow-r-3.png'}}"></image> <image src="{{imageBase + 'icon/arrow-r-3.png'}}"></image>
</view> </view>
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
<text>{{passList[0].name}}</text> <text>{{passList[0].name}}</text>
</view> </view>
<view class="card-header-info"> <view class="card-header-info">
<view class="row align-c"> <view class="row ac">
<view class="card-header-info-left row con-b"> <view class="card-header-info-left row cb">
<text>姓</text> <text>姓</text>
<text>名</text> <text>名</text>
</view> </view>
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
<image src="{{imageBase+'icon/eyes_open.png'}}" wx:else></image> <image src="{{imageBase+'icon/eyes_open.png'}}" wx:else></image>
</view> </view>
</view> </view>
<view class="row align-c"> <view class="row ac">
<view class="card-header-info-left row con-b"> <view class="card-header-info-left row cb">
<text>手</text> <text>手</text>
<text>机</text> <text>机</text>
<text>号</text> <text>号</text>
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
<text wx:else>{{passList[0].cellphone}}</text> <text wx:else>{{passList[0].cellphone}}</text>
</view> </view>
</view> </view>
<view class="row align-c"> <view class="row ac">
<view class="card-header-info-left row con-b align-c"> <view class="card-header-info-left row cb ac">
<text>身</text> <text>身</text>
<text>份</text> <text>份</text>
<text>证</text> <text>证</text>
...@@ -56,8 +56,8 @@ ...@@ -56,8 +56,8 @@
</view> </view>
</view> </view>
</view> </view>
<view class="card-main col align-c"> <view class="card-main column ac">
<view class="code-num-wrapper row align-c con-c"> <view class="code-num-wrapper row ac cc">
<text class="code-num-title">券码：</text> <text class="code-num-title">券码：</text>
<text class="code-num">{{passList[0].serialNumber}}</text> <text class="code-num">{{passList[0].serialNumber}}</text>
<text class="code-copy" bindtap="setClipboard" data-code="{{passList[0].serialNumber}}">复制</text> <text class="code-copy" bindtap="setClipboard" data-code="{{passList[0].serialNumber}}">复制</text>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<view class="code-use-time"> <view class="code-use-time">
<text>{{'有效期' + passList[0].expireTime}}</text> <text>{{'有效期' + passList[0].expireTime}}</text>
</view> </view>
<view class="look-order row align-c con-c" bindtap="onOrderDetail" data-id="{{passList[0].orderId}}"> <view class="look-order row ac cc" bindtap="onOrderDetail" data-id="{{passList[0].orderId}}">
<text>查看订单</text> <text>查看订单</text>
<image src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<image wx:elif="{{item.cardType==2}}" class="card-bg year-bg" src="{{imageResourcesBase +'mine/card/month-bg.png'}}"></image> <image wx:elif="{{item.cardType==2}}" class="card-bg year-bg" src="{{imageResourcesBase +'mine/card/month-bg.png'}}"></image>
<image wx:else class="card-bg month-bg" src="{{imageResourcesBase +'pay/order-input/card-3.png'}}"> <image wx:else class="card-bg month-bg" src="{{imageResourcesBase +'pay/order-input/card-3.png'}}">
</image> </image>
<view class="use-notice row align-c" data-item="{{item}}" bindtap="onNotice"> <view class="use-notice row ac" data-item="{{item}}" bindtap="onNotice">
<text>使用须知</text> <text>使用须知</text>
<image src="{{imageBase + 'icon/arrow-r-3.png'}}"></image> <image src="{{imageBase + 'icon/arrow-r-3.png'}}"></image>
</view> </view>
...@@ -98,8 +98,8 @@ ...@@ -98,8 +98,8 @@
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
<view class="card-header-info"> <view class="card-header-info">
<view class="row align-c"> <view class="row ac">
<view class="card-header-info-left row con-b"> <view class="card-header-info-left row cb">
<text>姓</text> <text>姓</text>
<text>名</text> <text>名</text>
</view> </view>
...@@ -115,8 +115,8 @@ ...@@ -115,8 +115,8 @@
<image src="{{imageBase+'icon/eyes_open.png'}}" wx:else></image> <image src="{{imageBase+'icon/eyes_open.png'}}" wx:else></image>
</view> </view>
</view> </view>
<view class="row align-c"> <view class="row ac">
<view class="card-header-info-left row con-b"> <view class="card-header-info-left row cb">
<text>手</text> <text>手</text>
<text>机</text> <text>机</text>
<text>号</text> <text>号</text>
...@@ -126,8 +126,8 @@ ...@@ -126,8 +126,8 @@
<text wx:else>{{item.cellphone}}</text> <text wx:else>{{item.cellphone}}</text>
</view> </view>
</view> </view>
<view class="row align-c"> <view class="row ac">
<view class="card-header-info-left row con-b align-c"> <view class="card-header-info-left row cb ac">
<text>身</text> <text>身</text>
<text>份</text> <text>份</text>
<text>证</text> <text>证</text>
...@@ -140,8 +140,8 @@ ...@@ -140,8 +140,8 @@
</view> </view>
</view> </view>
</view> </view>
<view class="card-main col align-c"> <view class="card-main column ac">
<view class="code-num-wrapper row align-c con-c"> <view class="code-num-wrapper row ac cc">
<text class="code-num-title">券码：</text> <text class="code-num-title">券码：</text>
<text class="code-num">{{item.serialNumber}}</text> <text class="code-num">{{item.serialNumber}}</text>
<text class="code-copy" bindtap="setClipboard" data-code="{{item.serialNumber}}">复制</text> <text class="code-copy" bindtap="setClipboard" data-code="{{item.serialNumber}}">复制</text>
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
<view class="code-use-time"> <view class="code-use-time">
<text>{{'有效期' + item.expireTime}}</text> <text>{{'有效期' + item.expireTime}}</text>
</view> </view>
<view class="look-order row align-c con-c" bindtap="onOrderDetail" data-id="{{item.orderId}}"> <view class="look-order row ac cc" bindtap="onOrderDetail" data-id="{{item.orderId}}">
<text>查看订单</text> <text>查看订单</text>
<image src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
......
pages/mine/club-manage/club-manage.wxml
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</view> </view>
<text class="pass_item_info_phone overflow_point_1">{{item.phone}}</text> <text class="pass_item_info_phone overflow_point_1">{{item.phone}}</text>
</view> </view>
<image class="icon_40" src="{{imageBase + 'icon/warning-5.png'}}" data-item="{{item}}" bindtap="onMemberInfo"></image> <image class="i40" src="{{imageBase + 'icon/warning-5.png'}}" data-item="{{item}}" bindtap="onMemberInfo"></image>
</view> </view>
<view class="pass_item_line"></view> <view class="pass_item_line"></view>
</block> </block>
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</view> </view>
<text class="pass_item_info_phone overflow_point_1">{{item.phone}}</text> <text class="pass_item_info_phone overflow_point_1">{{item.phone}}</text>
</view> </view>
<image class="icon_40" src="{{imageBase + 'icon/warning-5.png'}}" data-item="{{item}}" bindtap="onMemberInfo"></image> <image class="i40" src="{{imageBase + 'icon/warning-5.png'}}" data-item="{{item}}" bindtap="onMemberInfo"></image>
</view> </view>
<view class="pass_item_line"></view> <view class="pass_item_line"></view>
</block> </block>
...@@ -100,6 +100,6 @@ ...@@ -100,6 +100,6 @@
</view> </view>
</view> </view>
<view class="win_member_close row cc ac"> <view class="win_member_close row cc ac">
<image class="icon_48" src="{{imageBase + 'icon/close-1.png'}}" bindtap="onMemberInfoClose"></image> <image class="i48" src="{{imageBase + 'icon/close-1.png'}}" bindtap="onMemberInfoClose"></image>
</view> </view>
</view> </view>
\ No newline at end of file
pages/mine/club/club.wxml
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
<!-- 管理员微信弹窗 --> <!-- 管理员微信弹窗 -->
<view class="member-admin row cc ac" hidden="{{!winAdminInfo}}"> <view class="member-admin row cc ac" hidden="{{!winAdminInfo}}">
<view class="member_admin_info col cc ac"> <view class="member_admin_info column cc ac">
<text>管理员微信</text> <text>管理员微信</text>
<image src="{{adminInfo.wx}}" bindtap="onSaveAdminWx"></image> <image src="{{adminInfo.wx}}" bindtap="onSaveAdminWx"></image>
<text>【长按保存二维码】</text> <text>【长按保存二维码】</text>
......
pages/mine/home/home.wxml
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</view> </view>
<!-- 登录状态 --> <!-- 登录状态 -->
<view wx:if="{{userInfo.isSignIn}}" class="info-edit col cc"> <view wx:if="{{userInfo.isSignIn}}" class="info-edit column cc">
<view class="info-name row ac"> <view class="info-name row ac">
<text>{{userInfo.name}}</text> <text>{{userInfo.name}}</text>
<image src="{{imageBase + 'icon/edit-1.png'}}" bindtap="onEditInfo"></image> <image src="{{imageBase + 'icon/edit-1.png'}}" bindtap="onEditInfo"></image>
...@@ -27,13 +27,13 @@ ...@@ -27,13 +27,13 @@
</view> </view>
<!-- 我的积分 --> <!-- 我的积分 -->
<view class="info-integral col cb" data-integral="{{integral}}" bindtap="onIntegralDetail"> <view class="info-integral column cb" data-integral="{{integral}}" bindtap="onIntegralDetail">
<view class="info-integral-quantity row ce ac"> <view class="info-integral-quantity row ce ac">
<text>{{integral}}</text> <text>{{integral}}</text>
</view> </view>
<view class="info-integral-title row ce ac"> <view class="info-integral-title row ce ac">
<text>我的积分</text> <text>我的积分</text>
<image class="icon_32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image class="i32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
</view> </view>
</view> </view>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<view class="list row cc ac"> <view class="list row cc ac">
<view class="status-authentication row cb ac"> <view class="status-authentication row cb ac">
<view class="status-symbol col"> <view class="status-symbol column">
<text>业主认证</text> <text>业主认证</text>
<text>享受业主尊贵特权，预定消费专属优惠</text> <text>享受业主尊贵特权，预定消费专属优惠</text>
</view> </view>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</view> </view>
<!-- 登录状态 --> <!-- 登录状态 -->
<view wx:if="{{userInfo.isSignIn}}" class="info-edit col cc"> <view wx:if="{{userInfo.isSignIn}}" class="info-edit column cc">
<view class="info-name row ac"> <view class="info-name row ac">
<text class="info-owner overflow_point_1">{{userInfo.name}}</text> <text class="info-owner overflow_point_1">{{userInfo.name}}</text>
<image src="{{imageBase + 'icon/edit-4.png'}}" bindtap="onEditInfo"></image> <image src="{{imageBase + 'icon/edit-4.png'}}" bindtap="onEditInfo"></image>
...@@ -76,13 +76,13 @@ ...@@ -76,13 +76,13 @@
</view> </view>
<!-- 我的积分 --> <!-- 我的积分 -->
<view class="info-integral col cb" data-integral="{{integral}}" bindtap="onIntegralDetail"> <view class="info-integral column cb" data-integral="{{integral}}" bindtap="onIntegralDetail">
<view class="info-integral-quantity row ce ac"> <view class="info-integral-quantity row ce ac">
<text class="info-owner">{{integral}}</text> <text class="info-owner">{{integral}}</text>
</view> </view>
<view class="info-integral-title row ce ac"> <view class="info-integral-title row ce ac">
<text class="info-owner">我的积分</text> <text class="info-owner">我的积分</text>
<image class="icon_32" src="{{imageBase + 'icon/arrow-r-4.png'}}"></image> <image class="i32" src="{{imageBase + 'icon/arrow-r-4.png'}}"></image>
</view> </view>
</view> </view>
</view> </view>
...@@ -92,11 +92,11 @@ ...@@ -92,11 +92,11 @@
<view class="list"> <view class="list">
<!-- 券码核销 --> <!-- 券码核销 -->
<view class="coupon-permissions row ac" bindtap="goCouponInput" wx:if="{{isCouponPermissions}}"> <view class="coupon-permissions row ac" bindtap="goCouponInput" wx:if="{{isCouponPermissions}}">
<view class="coupon-permissions-info col"> <view class="coupon-permissions-info column">
<text>券码核销</text> <text>券码核销</text>
<text>{{'所属门店：' + authInfo.officeName}}</text> <text>{{'所属门店：' + authInfo.officeName}}</text>
</view> </view>
<image class="icon_32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image class="i32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
<!-- 我的订单 --> <!-- 我的订单 -->
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
<view class="card-title row cb ac"> <view class="card-title row cb ac">
<text>我的订单</text> <text>我的订单</text>
<text bindtap="onOrderList">查看全部</text> <text bindtap="onOrderList">查看全部</text>
<image class="icon_32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image class="i32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
<!-- 分类 tab --> <!-- 分类 tab -->
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
<!-- 展开更多 --> <!-- 展开更多 -->
<view class="order-more row cc ac" wx:if="{{orderList.length > 1}}" bindtap="onMoreOrder"> <view class="order-more row cc ac" wx:if="{{orderList.length > 1}}" bindtap="onMoreOrder">
<text>{{isMoreOrder ? '收起' : '展开更多'}}</text> <text>{{isMoreOrder ? '收起' : '展开更多'}}</text>
<image class="icon_32" src="{{isMoreOrder ? imageBase + 'icon/arrow-t-2.png' : imageBase + 'icon/arrow-b-2.png'}}"></image> <image class="i32" src="{{isMoreOrder ? imageBase + 'icon/arrow-t-2.png' : imageBase + 'icon/arrow-b-2.png'}}"></image>
</view> </view>
</view> </view>
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
<view class="card-title row cb ac"> <view class="card-title row cb ac">
<text>我的预约</text> <text>我的预约</text>
<text data-type="active" bindtap="onAppointmentList">查看全部</text> <text data-type="active" bindtap="onAppointmentList">查看全部</text>
<image class="icon_32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image class="i32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
<!-- 分类 tab --> <!-- 分类 tab -->
...@@ -261,13 +261,13 @@ ...@@ -261,13 +261,13 @@
<!-- 展开更多 --> <!-- 展开更多 -->
<view class="order-more row cc ac" wx:if="{{appointmentList.length > 1}}" bindtap="onMoreAppointment"> <view class="order-more row cc ac" wx:if="{{appointmentList.length > 1}}" bindtap="onMoreAppointment">
<text>{{isMoreAppointment ? '收起' : '展开更多'}}</text> <text>{{isMoreAppointment ? '收起' : '展开更多'}}</text>
<image class="icon_32" src="{{isMoreAppointment ? imageBase + 'icon/arrow-t-2.png' : imageBase + 'icon/arrow-b-2.png'}}"></image> <image class="i32" src="{{isMoreAppointment ? imageBase + 'icon/arrow-t-2.png' : imageBase + 'icon/arrow-b-2.png'}}"></image>
</view> </view>
</view> </view>
<!-- 我的俱乐部 --> <!-- 我的俱乐部 -->
<block wx:if="{{appStatus}}"> <block wx:if="{{appStatus}}">
<view class="club row con-b ac" bindtap="onToClub"> <view class="club row cb ac" bindtap="onToClub">
<view class="club_enter"> <view class="club_enter">
<text>我的俱乐部</text> <text>我的俱乐部</text>
</view> </view>
...@@ -279,7 +279,7 @@ ...@@ -279,7 +279,7 @@
</block> </block>
<!-- 客服中心 --> <!-- 客服中心 -->
<view class="service row con-b ac" bindtap="onService"> <view class="service row cb ac" bindtap="onService">
<text>客服中心</text> <text>客服中心</text>
<image class="icon" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image class="icon" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
......
pages/mine/info/info.wxml
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</view> </view>
<view class="info_item row cb ac" bindtap="onAddressList"> <view class="info_item row cb ac" bindtap="onAddressList">
<text>收货地址</text> <text>收货地址</text>
<image class="icon_32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image class="i32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
</view> </view>
</view> </view>
......
pages/mine/order/order.wxml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<view class="order-category row as" style="{{'height: ' + cssCategoryHeight + 'px;padding-top: ' + cssCategoryTop + 'px;'}}"> <view class="order-category row as" style="{{'height: ' + cssCategoryHeight + 'px;padding-top: ' + cssCategoryTop + 'px;'}}">
<view class="row cb ac"> <view class="row cb ac">
<image src="{{imageBase + 'icon/arrow-l-1.png'}}" bindtap="onNavigationBack"></image> <image src="{{imageBase + 'icon/arrow-l-1.png'}}" bindtap="onNavigationBack"></image>
<view class="order-type row con-c ac" bindtap="onOrderType"> <view class="order-type row cc ac" bindtap="onOrderType">
<text>{{orderTypeTitle}}</text> <text>{{orderTypeTitle}}</text>
<image src="{{imageBase + 'icon/arrow-b-2.png'}}"></image> <image src="{{imageBase + 'icon/arrow-b-2.png'}}"></image>
</view> </view>
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<view> <view>
<view class="order-type-row row cb ac"> <view class="order-type-row row cb ac">
<block wx:for="{{orderType}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{orderType}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view wx:if="{{index < 3}}" class="order-type-item row con-c ac {{orderTypeActive === index ? 'order-type-item-active' : ''}}" data-item="{{item}}" data-index="{{index}}" bindtap="onOrderTypeSelection"> <view wx:if="{{index < 3}}" class="order-type-item row cc ac {{orderTypeActive === index ? 'order-type-item-active' : ''}}" data-item="{{item}}" data-index="{{index}}" bindtap="onOrderTypeSelection">
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
</block> </block>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<view class="order-type-row row cb ac"> <view class="order-type-row row cb ac">
<block wx:for="{{orderType}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{orderType}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view wx:if="{{3 <= index && index < 6}}" <view wx:if="{{3 <= index && index < 6}}"
class="order-type-item row con-c ac {{orderTypeActive === index ? 'order-type-item-active' : ''}}" class="order-type-item row cc ac {{orderTypeActive === index ? 'order-type-item-active' : ''}}"
data-item="{{item}}" data-index="{{index}}" bindtap="onOrderTypeSelection"> data-item="{{item}}" data-index="{{index}}" bindtap="onOrderTypeSelection">
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<!-- 订单列表 --> <!-- 订单列表 -->
<view class="container bg-gradient"> <view class="container bg-gradient">
<block wx:if="{{orderList.length > 0}}"> <block wx:if="{{orderList.length > 0}}">
<view class="order-list column con-c ac"> <view class="order-list column cc ac">
<block wx:for="{{orderList}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{orderList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="order-list-item column ac" data-item="{{item}}" bindtap="onOrderDetail"> <view class="order-list-item column ac" data-item="{{item}}" bindtap="onOrderDetail">
<view class="order-list-item-title row cb ac"> <view class="order-list-item-title row cb ac">
...@@ -95,12 +95,12 @@ ...@@ -95,12 +95,12 @@
<text class="amount">¥{{item.amount}}</text> <text class="amount">¥{{item.amount}}</text>
</view> </view>
<view class="row ac"> <view class="row ac">
<button wx:if="{{item.status === 0}}" class="delete row con-c ac" data-index="{{index}}" data-item="{{item}}" catchtap="onOrderCancel" disabled="{{isDoing}}">取消订单</button> <button wx:if="{{item.status === 0}}" class="delete row cc ac" data-index="{{index}}" data-item="{{item}}" catchtap="onOrderCancel" disabled="{{isDoing}}">取消订单</button>
<button disabled="{{isDoing}}" wx:if="{{item.status === -1 || item.status === 4 || item.status === 6}}" class="delete row con-c ac" data-item="{{item}}" catchtap="onOrderRemove">删除订单</button> <button disabled="{{isDoing}}" wx:if="{{item.status === -1 || item.status === 4 || item.status === 6}}" class="delete row cc ac" data-item="{{item}}" catchtap="onOrderRemove">删除订单</button>
<button disabled="{{isDoing}}" wx:if="{{item.status === 0}}" class="again row con-c ac" data-item="{{item}}" catchtap="onOrderPay">去支付</button> <button disabled="{{isDoing}}" wx:if="{{item.status === 0}}" class="again row cc ac" data-item="{{item}}" catchtap="onOrderPay">去支付</button>
<button disabled="{{isDoing}}" wx:if="{{item.status === 2}}" class="again row con-c ac" data-item="{{item}}" catchtap="onOrderUse">去使用</button> <button disabled="{{isDoing}}" wx:if="{{item.status === 2}}" class="again row cc ac" data-item="{{item}}" catchtap="onOrderUse">去使用</button>
<button disabled="{{isDoing}}" wx:if="{{item.status === 3}}" class="again row con-c ac" data-item="{{item}}" catchtap="onOrderEvaluate">去评价</button> <button disabled="{{isDoing}}" wx:if="{{item.status === 3}}" class="again row cc ac" data-item="{{item}}" catchtap="onOrderEvaluate">去评价</button>
<button disabled="{{isDoing}}" wx:if="{{item.status === -1}}" class="again row con-c ac" data-item="{{item}}" catchtap="onOrderAgain">再次下单</button> <button disabled="{{isDoing}}" wx:if="{{item.status === -1}}" class="again row cc ac" data-item="{{item}}" catchtap="onOrderAgain">再次下单</button>
</view> </view>
</view> </view>
</view> </view>
...@@ -116,13 +116,13 @@ ...@@ -116,13 +116,13 @@
</view> </view>
<!-- 二维码弹窗 --> <!-- 二维码弹窗 -->
<view class="code-mask row con-c ac" wx:if="{{winCode}}"> <view class="code-mask row cc ac" wx:if="{{winCode}}">
<view class="code column con-c ac"> <view class="code column cc ac">
<view class="code-tip column con-c ac"> <view class="code-tip column cc ac">
<text>{{'请将券码出示给门店核销人员'}}</text> <text>{{'请将券码出示给门店核销人员'}}</text>
<text>{{'请将券码出示给门店核销人员'}}</text> <text>{{'请将券码出示给门店核销人员'}}</text>
</view> </view>
<view class="code-info column con-c ac"> <view class="code-info column cc ac">
<view class="code-info-title"> <view class="code-info-title">
<text>{{'《 阿凡达 》电影票'}}</text> <text>{{'《 阿凡达 》电影票'}}</text>
</view> </view>
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
<text>复制</text> <text>复制</text>
</view> </view>
</view> </view>
<view class="code-close row con-c ac" bindtap="onCodeClose"> <view class="code-close row cc ac" bindtap="onCodeClose">
<image src="{{imageBase + 'icon/close-1.png'}}"></image> <image src="{{imageBase + 'icon/close-1.png'}}"></image>
</view> </view>
</view> </view>
......
pages/mine/question-more/question-more.wxml
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
<view class="row cb ac"> <view class="row cb ac">
<text class="fs18 fw400">●</text> <text class="fs18 fw400">●</text>
<text class="question_item_title">{{item.title}}</text> <text class="question_item_title">{{item.title}}</text>
<image class="icon_32" src="{{imageBase + 'icon/arrow-r-2.png'}}" hidden="{{item.isShowMore}}"></image> <image class="i32" src="{{imageBase + 'icon/arrow-r-2.png'}}" hidden="{{item.isShowMore}}"></image>
<image class="icon_32" src="{{imageBase + 'icon/arrow-b-2.png'}}" hidden="{{!item.isShowMore}}"></image> <image class="i32" src="{{imageBase + 'icon/arrow-b-2.png'}}" hidden="{{!item.isShowMore}}"></image>
</view> </view>
<view class="question_item_content row" hidden="{{!item.isShowMore}}"> <view class="question_item_content row" hidden="{{!item.isShowMore}}">
<text class="fs30 fw400 c31">{{item.content}}</text> <text class="fs30 fw400 c31">{{item.content}}</text>
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
<view class="row cb ac"> <view class="row cb ac">
<text class="fs18 fw400">●</text> <text class="fs18 fw400">●</text>
<text class="question_item_title">{{item.title}}</text> <text class="question_item_title">{{item.title}}</text>
<image class="icon_32" src="{{imageBase + 'icon/arrow-r-2.png'}}" hidden="{{item.isShowMore}}"></image> <image class="i32" src="{{imageBase + 'icon/arrow-r-2.png'}}" hidden="{{item.isShowMore}}"></image>
<image class="icon_32" src="{{imageBase + 'icon/arrow-b-2.png'}}" hidden="{{!item.isShowMore}}"></image> <image class="i32" src="{{imageBase + 'icon/arrow-b-2.png'}}" hidden="{{!item.isShowMore}}"></image>
</view> </view>
<view class="question_item_content row" hidden="{{!item.isShowMore}}"> <view class="question_item_content row" hidden="{{!item.isShowMore}}">
<text class="fs30 fw400 c31">{{item.content}}</text> <text class="fs30 fw400 c31">{{item.content}}</text>
...@@ -61,8 +61,8 @@ ...@@ -61,8 +61,8 @@
<view class="row cb ac"> <view class="row cb ac">
<text class="fs18 fw400">●</text> <text class="fs18 fw400">●</text>
<text class="question_item_title">{{item.title}}</text> <text class="question_item_title">{{item.title}}</text>
<image class="icon_32" src="{{imageBase + 'icon/arrow-r-2.png'}}" hidden="{{item.isShowMore}}"></image> <image class="i32" src="{{imageBase + 'icon/arrow-r-2.png'}}" hidden="{{item.isShowMore}}"></image>
<image class="icon_32" src="{{imageBase + 'icon/arrow-b-2.png'}}" hidden="{{!item.isShowMore}}"></image> <image class="i32" src="{{imageBase + 'icon/arrow-b-2.png'}}" hidden="{{!item.isShowMore}}"></image>
</view> </view>
<view class="question_item_content row" hidden="{{!item.isShowMore}}"> <view class="question_item_content row" hidden="{{!item.isShowMore}}">
<text class="fs30 fw400 c31">{{item.content}}</text> <text class="fs30 fw400 c31">{{item.content}}</text>
......
pages/mine/question/question.wxml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<text class="fs42 fw700 c01">常见问题</text> <text class="fs42 fw700 c01">常见问题</text>
<view class="question_more row ac" bindtap="onMoreQuestion"> <view class="question_more row ac" bindtap="onMoreQuestion">
<text class="fs26 fw400 c01">更多问题</text> <text class="fs26 fw400 c01">更多问题</text>
<image class="icon_32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image class="i32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
</view> </view>
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
<view class="row cb ac"> <view class="row cb ac">
<text class="fs18 fw400">●</text> <text class="fs18 fw400">●</text>
<text class="question_item_title">{{item.title}}</text> <text class="question_item_title">{{item.title}}</text>
<image class="icon_32" src="{{imageBase + 'icon/arrow-r-2.png'}}" hidden="{{item.isShowMore}}"></image> <image class="i32" src="{{imageBase + 'icon/arrow-r-2.png'}}" hidden="{{item.isShowMore}}"></image>
<image class="icon_32" src="{{imageBase + 'icon/arrow-b-2.png'}}" hidden="{{!item.isShowMore}}"></image> <image class="i32" src="{{imageBase + 'icon/arrow-b-2.png'}}" hidden="{{!item.isShowMore}}"></image>
</view> </view>
<view class="question_item_content row" hidden="{{!item.isShowMore}}"> <view class="question_item_content row" hidden="{{!item.isShowMore}}">
<text class="fs30 fw400 c31">{{item.content}}</text> <text class="fs30 fw400 c31">{{item.content}}</text>
...@@ -30,15 +30,15 @@ ...@@ -30,15 +30,15 @@
<view class="operation row cb ac"> <view class="operation row cb ac">
<view class="column cc ac" bindtap="onCallCustomerService"> <view class="column cc ac" bindtap="onCallCustomerService">
<image class="icon_48" src="{{imageBase + 'icon/service-1.png'}}"></image> <image class="i48" src="{{imageBase + 'icon/service-1.png'}}"></image>
<text class="fs22 fw400 c31">客服热线</text> <text class="fs22 fw400 c31">客服热线</text>
</view> </view>
<view class="column cc ac" bindtap="onCustomerServiceWeChat"> <view class="column cc ac" bindtap="onCustomerServiceWeChat">
<image class="icon_48" src="{{imageBase + 'icon/wechat-1.png'}}"></image> <image class="i48" src="{{imageBase + 'icon/wechat-1.png'}}"></image>
<text class="fs22 fw400 c31">客服微信</text> <text class="fs22 fw400 c31">客服微信</text>
</view> </view>
<view class="column cc ac" bindtap="onFeedback"> <view class="column cc ac" bindtap="onFeedback">
<image class="icon_48" src="{{imageBase + 'icon/letter-1.png'}}"></image> <image class="i48" src="{{imageBase + 'icon/letter-1.png'}}"></image>
<text class="fs22 fw400 c31">填写反馈</text> <text class="fs22 fw400 c31">填写反馈</text>
</view> </view>
</view> </view>
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<view class="column cc ac"> <view class="column cc ac">
<image class="operation_wechat_content" src="{{resourcesBase + 'operation-tip/question-wechat.png'}}"></image> <image class="operation_wechat_content" src="{{resourcesBase + 'operation-tip/question-wechat.png'}}"></image>
<view class="operation_wechat_close row cc ac"> <view class="operation_wechat_close row cc ac">
<image class="icon_48" src="{{imageBase + 'icon/close-1.png'}}" bindtap="onOperationWechatClose"></image> <image class="i48" src="{{imageBase + 'icon/close-1.png'}}" bindtap="onOperationWechatClose"></image>
</view> </view>
</view> </view>
</view> </view>
\ No newline at end of file
pages/pay/coupon-detail/coupon-detail.wxml
...@@ -4,19 +4,19 @@ ...@@ -4,19 +4,19 @@
<view class="container"> <view class="container">
<view class="list-wrapper"> <view class="list-wrapper">
<view class="title-wrapper">兑换券信息</view> <view class="title-wrapper">兑换券信息</view>
<view class="info-wrapper row con-b"> <view class="info-wrapper row cb">
<view class="info-name">商品类型</view> <view class="info-name">商品类型</view>
<view class="info-text">{{couponInfo.type}}</view> <view class="info-text">{{couponInfo.type}}</view>
</view> </view>
<view class="info-wrapper row con-b"> <view class="info-wrapper row cb">
<view class="info-name">所属门店</view> <view class="info-name">所属门店</view>
<view class="info-text">{{couponInfo.store}}</view> <view class="info-text">{{couponInfo.store}}</view>
</view> </view>
<view class="info-wrapper row con-b"> <view class="info-wrapper row cb">
<view class="info-name">券号</view> <view class="info-name">券号</view>
<view class="info-text">{{couponInfo.id}}</view> <view class="info-text">{{couponInfo.id}}</view>
</view> </view>
<view class="info-wrapper row con-b"> <view class="info-wrapper row cb">
<view class="info-name">有效期</view> <view class="info-name">有效期</view>
<view class="info-text">{{couponInfo.useTime}}</view> <view class="info-text">{{couponInfo.useTime}}</view>
</view> </view>
...@@ -24,12 +24,12 @@ ...@@ -24,12 +24,12 @@
<view class="list-wrapper"> <view class="list-wrapper">
<view class="title-wrapper">商品详情</view> <view class="title-wrapper">商品详情</view>
<view class="goods-list"> <view class="goods-list">
<view class="goods-item row align-c" wx:for="{{goodsList}}" wx:key="id"> <view class="goods-item row ac" wx:for="{{goodsList}}" wx:key="id">
<view class="goods-img"> <view class="goods-img">
<image mode="aspectFill" src="{{item.cover}}"></image> <image mode="aspectFill" src="{{item.cover}}"></image>
</view> </view>
<view class="goods-name">{{item.name}}</view> <view class="goods-name">{{item.name}}</view>
<view class="goods-price-num col"> <view class="goods-price-num column">
<view class="goods-num">{{'共'+item.quantity + '件'}}</view> <view class="goods-num">{{'共'+item.quantity + '件'}}</view>
<view class="goods-price"> <view class="goods-price">
<text class="price-symbol">￥</text> <text class="price-symbol">￥</text>
...@@ -41,29 +41,29 @@ ...@@ -41,29 +41,29 @@
</view> </view>
<view class="list-wrapper" wx:for="{{userList}}" wx:key="index"> <view class="list-wrapper" wx:for="{{userList}}" wx:key="index">
<view class="title-wrapper">订单详情</view> <view class="title-wrapper">订单详情</view>
<view class="info-wrapper row con-b"> <view class="info-wrapper row cb">
<view class="info-name">姓名</view> <view class="info-name">姓名</view>
<view class="info-text">{{item.name}}</view> <view class="info-text">{{item.name}}</view>
</view> </view>
<view class="info-wrapper row con-b" wx:if="{{item.phone}}"> <view class="info-wrapper row cb" wx:if="{{item.phone}}">
<view class="info-name">手机</view> <view class="info-name">手机</view>
<view class="info-text">{{item.phone}}</view> <view class="info-text">{{item.phone}}</view>
</view> </view>
<view class="info-wrapper row con-b" wx:if="{{item.idNum}}"> <view class="info-wrapper row cb" wx:if="{{item.idNum}}">
<view class="info-name">身份证</view> <view class="info-name">身份证</view>
<view class="info-text">{{item.idNum}}</view> <view class="info-text">{{item.idNum}}</view>
</view> </view>
</view> </view>
<view class="list-wrapper" wx:if="{{remarks}}"> <view class="list-wrapper" wx:if="{{remarks}}">
<view class="title-wrapper">备注</view> <view class="title-wrapper">备注</view>
<view class="info-wrapper row con-b"> <view class="info-wrapper row cb">
<view class="info-name">{{remarks}}</view> <view class="info-name">{{remarks}}</view>
</view> </view>
</view> </view>
</view> </view>
<view class="footer-wrapper"> <view class="footer-wrapper">
<view class="footer-btn row con-b align-e"> <view class="footer-btn row cb ae">
<view class="cancel-btn" bindtap="cancelOperation">取消核销</view> <view class="cancel-btn" bindtap="cancelOperation">取消核销</view>
<view class="confirm-btn" bindtap="submitOperation">确认核销</view> <view class="confirm-btn" bindtap="submitOperation">确认核销</view>
</view> </view>
......
pages/pay/coupon-input/coupon-input.wxml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<view class="container"> <view class="container">
<!-- 头像信息 --> <!-- 头像信息 -->
<view class="header column align-c"> <view class="header column ac">
<view class="header-bg"> <view class="header-bg">
<image src="{{resourcesBase + 'mine/admin-bgi.png'}}"></image> <image src="{{resourcesBase + 'mine/admin-bgi.png'}}"></image>
</view> </view>
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</view> </view>
<view class="header-info"> <view class="header-info">
<view class="info-name">{{name}}</view> <view class="info-name">{{name}}</view>
<view class="info-text column con-b"> <view class="info-text column cb">
<view class="row"> <view class="row">
<text class="info-left">工作身份</text> <text class="info-left">工作身份</text>
<text class="info-right">{{idString}}</text> <text class="info-right">{{idString}}</text>
...@@ -26,13 +26,13 @@ ...@@ -26,13 +26,13 @@
</view> </view>
</view> </view>
<!-- 核销输入框 --> <!-- 核销输入框 -->
<view class="coupon-input-wrapper row con-b"> <view class="coupon-input-wrapper row cb">
<input placeholder="请输入券码" placeholder-style="color: #C2C7CF" bindinput="bindCouponInput" value="{{couponCode}}"></input> <input placeholder="请输入券码" placeholder-style="color: #C2C7CF" bindinput="bindCouponInput" value="{{couponCode}}"></input>
<view class="coupon-input-btn" bindtap="handleWriteOff">核销</view> <view class="coupon-input-btn" bindtap="handleWriteOff">核销</view>
</view> </view>
<!-- 扫码核销 --> <!-- 扫码核销 -->
<view class="coupon-scan-wrapper row con-c align-c" bindtap="handleScanCode"> <view class="coupon-scan-wrapper row cc ac" bindtap="handleScanCode">
<view class="scan-icon"> <view class="scan-icon">
<image mode="widthFix" src="/image/scan.png"></image> <image mode="widthFix" src="/image/scan.png"></image>
</view> </view>
......
pages/pay/order-comment/order-comment.wxml
<m-toast></m-toast> <m-toast></m-toast>
<m-nav titleText="订单评价" scrollHeight="{{navScroll}}" styleIndex="{{1}}"></m-nav> <m-nav titleText="订单评价" scrollHeight="{{navScroll}}" styleIndex="{{1}}"></m-nav>
<view class="container con-s"> <view class="container cs">
<view class="order-wrapper"> <view class="order-wrapper">
<view class="order-title"> <view class="order-title">
<text>购买商品</text> <text>购买商品</text>
</view> </view>
<view class="row align-c"> <view class="row ac">
<block wx:for="{{orderInfo.commodity}}" wx:key="id"> <block wx:for="{{orderInfo.commodity}}" wx:key="id">
<view class="order-cover"> <view class="order-cover">
<image src="{{item.cover}}" mode="aspectFill"></image> <image src="{{item.cover}}" mode="aspectFill"></image>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<view class="order-name" wx:if="{{orderInfo.commodity.length === 1}}"> <view class="order-name" wx:if="{{orderInfo.commodity.length === 1}}">
<text>{{orderInfo.commodity[0].name}}</text> <text>{{orderInfo.commodity[0].name}}</text>
</view> </view>
<view class="order-price-wrapper col align-e"> <view class="order-price-wrapper column ae">
<view class="order-price"> <view class="order-price">
<text class="price-symbol">￥</text> <text class="price-symbol">￥</text>
<text>{{orderInfo.amount}}</text> <text>{{orderInfo.amount}}</text>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<view class="order-comment-title"> <view class="order-comment-title">
<text>订单评价</text> <text>订单评价</text>
</view> </view>
<view class="score-wrapper row align-c"> <view class="score-wrapper row ac">
<view class="score-left"> <view class="score-left">
<text>服务评价</text> <text>服务评价</text>
</view> </view>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<text>{{scoreServe + '.0星'}}</text> <text>{{scoreServe + '.0星'}}</text>
</view> </view>
</view> </view>
<view class="score-wrapper row align-c"> <view class="score-wrapper row ac">
<view class="score-left"> <view class="score-left">
<text>产品评价</text> <text>产品评价</text>
</view> </view>
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<text>{{scoreProduct + '.0星'}}</text> <text>{{scoreProduct + '.0星'}}</text>
</view> </view>
</view> </view>
<view class="score-wrapper row align-c"> <view class="score-wrapper row ac">
<view class="score-left"> <view class="score-left">
<text>环境评价</text> <text>环境评价</text>
</view> </view>
......
pages/pay/order-detail/order-detail.wxml
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
</image> </image>
</view> </view>
<block wx:if="{{orderInfo.state === 2}}"> <block wx:if="{{orderInfo.state === 2}}">
<view class="info-line row con-b ac"> <view class="info-line row cb ac">
<view class="info-line-point-left"></view> <view class="info-line-point-left"></view>
<view class="info-line-line"></view> <view class="info-line-line"></view>
<view class="info-line-point-right"></view> <view class="info-line-point-right"></view>
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
</image> </image>
</view> </view>
<block wx:if="{{orderInfo.state === 2}}"> <block wx:if="{{orderInfo.state === 2}}">
<view class="info-line row con-b ac"> <view class="info-line row cb ac">
<view class="info-line-point-left"></view> <view class="info-line-point-left"></view>
<view class="info-line-line"></view> <view class="info-line-line"></view>
<view class="info-line-point-right"></view> <view class="info-line-point-right"></view>
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
</image> </image>
</view> </view>
<block wx:if="{{orderInfo.state === 2}}"> <block wx:if="{{orderInfo.state === 2}}">
<view class="info-line row con-b ac"> <view class="info-line row cb ac">
<view class="info-line-point-left"></view> <view class="info-line-point-left"></view>
<view class="info-line-line"></view> <view class="info-line-line"></view>
<view class="info-line-point-right"></view> <view class="info-line-point-right"></view>
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
</image> </image>
</view> </view>
<block wx:if="{{orderInfo.state === 2}}"> <block wx:if="{{orderInfo.state === 2}}">
<view class="info-line row con-b ac"> <view class="info-line row cb ac">
<view class="info-line-point-left"></view> <view class="info-line-point-left"></view>
<view class="info-line-line"></view> <view class="info-line-line"></view>
<view class="info-line-point-right"></view> <view class="info-line-point-right"></view>
...@@ -224,11 +224,11 @@ ...@@ -224,11 +224,11 @@
<view class="notice-wrapper row ce ac" bindtap="handleNotice"> <view class="notice-wrapper row ce ac" bindtap="handleNotice">
<view class="notice">使用须知</view> <view class="notice">使用须知</view>
<image class="icon_32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image class="i32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
<!-- 商品信息 --> <!-- 商品信息 -->
<view class="commodity col"> <view class="commodity column">
<view class="commodity-title"> <view class="commodity-title">
<text>购买商品</text> <text>购买商品</text>
</view> </view>
...@@ -263,7 +263,7 @@ ...@@ -263,7 +263,7 @@
<!-- 订单提示 --> <!-- 订单提示 -->
<view class="tip"> <view class="tip">
<view class="tip-pay row con-b ac"> <view class="tip-pay row cb ac">
<view class="tip-pay-title" wx:if="{{orderInfo.payAmount !== undefined}}"> <view class="tip-pay-title" wx:if="{{orderInfo.payAmount !== undefined}}">
<text wx:if="{{orderInfo.state === 0 || orderInfo.state === -1}}">待付金额</text> <text wx:if="{{orderInfo.state === 0 || orderInfo.state === -1}}">待付金额</text>
<text wx:else>实付金额</text> <text wx:else>实付金额</text>
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
<text>{{orderInfo.payAmount}}</text> <text>{{orderInfo.payAmount}}</text>
</view> </view>
</view> </view>
<view class="tip-describe col"> <view class="tip-describe column">
<text>{{'订单编号：' + ( orderInfo.number ? orderInfo.number : "")}}</text> <text>{{'订单编号：' + ( orderInfo.number ? orderInfo.number : "")}}</text>
<text>{{'下单时间：' + (orderInfo.submitTime ? orderInfo.submitTime : '')}}</text> <text>{{'下单时间：' + (orderInfo.submitTime ? orderInfo.submitTime : '')}}</text>
<text wx:if="{{orderInfo.state !== 0 && orderInfo.state !== -1}}">{{'付款时间：' + (orderInfo.payTime ? orderInfo.payTime : '')}}</text> <text wx:if="{{orderInfo.state !== 0 && orderInfo.state !== -1}}">{{'付款时间：' + (orderInfo.payTime ? orderInfo.payTime : '')}}</text>
......
pages/pay/order-input/order-input.wxml
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<!-- 年卡月卡 --> <!-- 年卡月卡 -->
<view class="buy-content-pass" wx:if="{{orderType === 1}}" style="{{cssShadow}}"> <view class="buy-content-pass" wx:if="{{orderType === 1}}" style="{{cssShadow}}">
<image src="{{resourcesBase + buyContent}}"></image> <image src="{{resourcesBase + buyContent}}"></image>
<view class="buy-content-pass-content column con-b"> <view class="buy-content-pass-content column cb">
<view class="col"> <view class="column">
<text class="pass-content-title">{{shoppingCartList[0].name}}</text> <text class="pass-content-title">{{shoppingCartList[0].name}}</text>
<view class="row"> <view class="row">
<text class="pass-content-symbol">¥</text> <text class="pass-content-symbol">¥</text>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<text class="pass-content-unit">/人</text> <text class="pass-content-unit">/人</text>
</view> </view>
</view> </view>
<view class="col"> <view class="column">
<view class="row ac"> <view class="row ac">
<text class="pass-content-tip">{{'使用次数　'}}</text> <text class="pass-content-tip">{{'使用次数　'}}</text>
<text class="pass-content-tip">{{'不限'}}</text> <text class="pass-content-tip">{{'不限'}}</text>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<view class="row cc ac"> <view class="row cc ac">
<image src="{{resourcesBase + shopInfo.cover}}"></image> <image src="{{resourcesBase + shopInfo.cover}}"></image>
</view> </view>
<view class="buy-content-service-info column con-b"> <view class="buy-content-service-info column cb">
<text class="row ac">{{buyContentTitle}}</text> <text class="row ac">{{buyContentTitle}}</text>
<text>{{'¥' + buyContentAmount}}</text> <text>{{'¥' + buyContentAmount}}</text>
</view> </view>
...@@ -43,8 +43,8 @@ ...@@ -43,8 +43,8 @@
<!-- 次票 --> <!-- 次票 -->
<view class="buy-content-pass" wx:if="{{orderType === 3}}" style="box-shadow: 0 0 20rpx #f2e0da;"> <view class="buy-content-pass" wx:if="{{orderType === 3}}" style="box-shadow: 0 0 20rpx #f2e0da;">
<image src="{{resourcesBase + buyContent}}"></image> <image src="{{resourcesBase + buyContent}}"></image>
<view class="buy-content-pass-content column con-b"> <view class="buy-content-pass-content column cb">
<view class="col"> <view class="column">
<text class="pass-content-title">{{shoppingCartList[0].name}}</text> <text class="pass-content-title">{{shoppingCartList[0].name}}</text>
<view class="row"> <view class="row">
<text class="pass-content-symbol">¥</text> <text class="pass-content-symbol">¥</text>
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<text class="pass-content-unit">/人</text> <text class="pass-content-unit">/人</text>
</view> </view>
</view> </view>
<view class="col"> <view class="column">
<view class="row ac"> <view class="row ac">
<text class="pass-content-tip">{{'使用次数　'}}</text> <text class="pass-content-tip">{{'使用次数　'}}</text>
<text class="pass-content-tip">{{'1次'}}</text> <text class="pass-content-tip">{{'1次'}}</text>
...@@ -105,14 +105,14 @@ ...@@ -105,14 +105,14 @@
<view class="buy-content-activity row ac" wx:if="{{orderType === 6}}"> <view class="buy-content-activity row ac" wx:if="{{orderType === 6}}">
<!-- <image src="{{resourcesBase + shopInfo.cover}}"></image> --> <!-- <image src="{{resourcesBase + shopInfo.cover}}"></image> -->
<image src="{{buyContentCover}}"></image> <image src="{{buyContentCover}}"></image>
<view class="buy-content-activity-info column con-b"> <view class="buy-content-activity-info column cb">
<view class="title row ac"> <view class="title row ac">
<text>{{buyContentTitle}}</text> <text>{{buyContentTitle}}</text>
</view> </view>
<view class="time"> <view class="time">
<text>{{buyContentTime}}</text> <text>{{buyContentTime}}</text>
</view> </view>
<view class="amount row align-e"> <view class="amount row ae">
<text>{{'¥' + buyContentAmount}}</text> <text>{{'¥' + buyContentAmount}}</text>
</view> </view>
</view> </view>
...@@ -121,14 +121,14 @@ ...@@ -121,14 +121,14 @@
<!-- 电影 --> <!-- 电影 -->
<view class="buy-content-activity row ac" wx:if="{{orderType === 7}}"> <view class="buy-content-activity row ac" wx:if="{{orderType === 7}}">
<image src="{{shoppingCartList[0].cover}}"></image> <image src="{{shoppingCartList[0].cover}}"></image>
<view class="buy-content-activity-info column con-b"> <view class="buy-content-activity-info column cb">
<view class="title row ac"> <view class="title row ac">
<text>{{buyContentTitle}}</text> <text>{{buyContentTitle}}</text>
</view> </view>
<view class="time"> <view class="time">
<text>{{buyContentTime}}</text> <text>{{buyContentTime}}</text>
</view> </view>
<view class="amount row align-e"> <view class="amount row ae">
<text>{{'¥' + buyContentAmount}}</text> <text>{{'¥' + buyContentAmount}}</text>
</view> </view>
</view> </view>
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
</view> </view>
<view class="shopping-cart-list"> <view class="shopping-cart-list">
<block wx:for="{{shoppingCartList}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{shoppingCartList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view wx:if="{{item.isActive}}" class="shopping-cart-item row con-b ac" data-item="{{item}}"> <view wx:if="{{item.isActive}}" class="shopping-cart-item row cb ac" data-item="{{item}}">
<view class="shopping-cart-item-cover"> <view class="shopping-cart-item-cover">
<image src="{{item.cover}}"></image> <image src="{{item.cover}}"></image>
</view> </view>
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
</view> </view>
</view> </view>
</block> </block>
<view class="shopping-cart-total row con-b ac"> <view class="shopping-cart-total row cb ac">
<text>总计</text> <text>总计</text>
<view> <view>
<text>￥</text> <text>￥</text>
...@@ -182,8 +182,8 @@ ...@@ -182,8 +182,8 @@
<view class="entry-label"> <view class="entry-label">
<text>报名时间</text> <text>报名时间</text>
</view> </view>
<view class="entry-input row con-b ac"> <view class="entry-input row cb ac">
<picker class="row con-b ac" mode="multiSelector" value="{{entryDate}}" range="{{entryDateList}}" bindcolumnchange="onEntryTimeChange" bindchange="onEntryTime"> <picker class="row cb ac" mode="multiSelector" value="{{entryDate}}" range="{{entryDateList}}" bindcolumnchange="onEntryTimeChange" bindchange="onEntryTime">
<text>{{entrySelection}}</text> <text>{{entrySelection}}</text>
</picker> </picker>
<image class="input-icon" src="{{imageBase + 'icon/arrow-r-1.png'}}"></image> <image class="input-icon" src="{{imageBase + 'icon/arrow-r-1.png'}}"></image>
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
<view class="entry-label"> <view class="entry-label">
<text>报名人数</text> <text>报名人数</text>
</view> </view>
<view class="entry-input row con-b ac"> <view class="entry-input row cb ac">
<button class="input-button input-cut" special="{{true}}" bind:tap="onQuantityCut"> <button class="input-button input-cut" special="{{true}}" bind:tap="onQuantityCut">
<image wx:if="{{1 < quantity}}" class="input-icon" src="{{imageBase + 'icon/cut-1.png'}}"></image> <image wx:if="{{1 < quantity}}" class="input-icon" src="{{imageBase + 'icon/cut-1.png'}}"></image>
<image wx:if="{{1 === quantity}}" class="input-icon" src="{{imageBase + 'icon/cut-2.png'}}"></image> <image wx:if="{{1 === quantity}}" class="input-icon" src="{{imageBase + 'icon/cut-2.png'}}"></image>
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
<image wx:if="{{quantity === quantityMax || quantityMax === 0}}" class="input-icon" src="{{imageBase + 'icon/add-2.png'}}"></image> <image wx:if="{{quantity === quantityMax || quantityMax === 0}}" class="input-icon" src="{{imageBase + 'icon/add-2.png'}}"></image>
</button> </button>
</view> </view>
<view class="quantity-other row con-b ac"> <view class="quantity-other row cb ac">
<view class="quantity-error"> <view class="quantity-error">
<text>{{quantityError}}</text> <text>{{quantityError}}</text>
</view> </view>
...@@ -219,7 +219,7 @@ ...@@ -219,7 +219,7 @@
<view class="quantity-title"> <view class="quantity-title">
<text>{{quantityTitle}}</text> <text>{{quantityTitle}}</text>
</view> </view>
<view class="quantity-input row con-b ac"> <view class="quantity-input row cb ac">
<button class="input-button input-cut" special="{{true}}" bind:tap="onQuantityCut"> <button class="input-button input-cut" special="{{true}}" bind:tap="onQuantityCut">
<image wx:if="{{1 < quantity}}" class="input-icon" src="{{imageBase + 'icon/cut-1.png'}}"></image> <image wx:if="{{1 < quantity}}" class="input-icon" src="{{imageBase + 'icon/cut-1.png'}}"></image>
<image wx:if="{{1 === quantity}}" class="input-icon" src="{{imageBase + 'icon/cut-2.png'}}"></image> <image wx:if="{{1 === quantity}}" class="input-icon" src="{{imageBase + 'icon/cut-2.png'}}"></image>
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
<image wx:if="{{quantity === quantityMax || quantityMax === 0}}" class="input-icon" src="{{imageBase + 'icon/add-2.png'}}"></image> <image wx:if="{{quantity === quantityMax || quantityMax === 0}}" class="input-icon" src="{{imageBase + 'icon/add-2.png'}}"></image>
</button> </button>
</view> </view>
<view class="quantity-other row con-b ac"> <view class="quantity-other row cb ac">
<view class="quantity-error"> <view class="quantity-error">
<text>{{quantityError}}</text> <text>{{quantityError}}</text>
</view> </view>
...@@ -359,7 +359,7 @@ ...@@ -359,7 +359,7 @@
<image src="{{imageBase + 'icon/warning-4.png'}}"></image> <image src="{{imageBase + 'icon/warning-4.png'}}"></image>
<view class="pay-tip-text row cc ac">付款后一经确认不得退款</view> <view class="pay-tip-text row cc ac">付款后一经确认不得退款</view>
</view> </view>
<view class="pay-operation row con-b ac"> <view class="pay-operation row cb ac">
<view class="row ac"> <view class="row ac">
<view class="pay-operation-amount-symbol">￥</view> <view class="pay-operation-amount-symbol">￥</view>
<view class="pay-operation-amount">{{payAmount}}</view> <view class="pay-operation-amount">{{payAmount}}</view>
......
pages/pay/order-state/order-state.wxml
<view class="container pay-result"> <view class="container pay-result">
<view class="pay-result-content col con-c align-c"> <view class="pay-result-content column cc ac">
<view class="content-state-icon"> <view class="content-state-icon">
<image wx:if="{{payState}}" src="{{imageBase + 'icon/pay-success.png'}}"></image> <image wx:if="{{payState}}" src="{{imageBase + 'icon/pay-success.png'}}"></image>
<image wx:if="{{!payState}}" src="{{imageBase + 'icon/pay-fail.png'}}"></image> <image wx:if="{{!payState}}" src="{{imageBase + 'icon/pay-fail.png'}}"></image>
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</view> </view>
</view> </view>
<view class="operation"> <view class="operation">
<button class="operation-home row con-c align-c" bindtap="onHome">返回首页</button> <button class="operation-home row cc ac" bindtap="onHome">返回首页</button>
<button class="operation-detail row con-c align-c" bindtap="onPayDetail">查看订单</button> <button class="operation-detail row cc ac" bindtap="onPayDetail">查看订单</button>
</view> </view>
</view> </view>
\ No newline at end of file
pages/play/activity-detail/activity-detail.wxml
...@@ -21,19 +21,19 @@ ...@@ -21,19 +21,19 @@
<view class="detail-title row"> <view class="detail-title row">
<text>{{info.title}}</text> <text>{{info.title}}</text>
</view> </view>
<view class="detail-other col"> <view class="detail-other column">
<view class="row align-c"> <view class="row ac">
<image src="/image/icon/g-time.png"></image> <image src="/image/icon/g-time.png"></image>
<text>时间</text> <text>时间</text>
<text>{{info.date}}</text> <text>{{info.date}}</text>
</view> </view>
<view style="height:auto;" class="row align-c"> <view style="height:auto;" class="row ac">
<image src="/image/icon/g-location.png"></image> <image src="/image/icon/g-location.png"></image>
<text>地址</text> <text>地址</text>
<text style="height:auto;">{{info.address}}</text> <text style="height:auto;">{{info.address}}</text>
<image hidden src="/image/icon/arrow-r-1.png"></image> <image hidden src="/image/icon/arrow-r-1.png"></image>
</view> </view>
<view class="row align-c"> <view class="row ac">
<image src="/image/icon/g-custom.png"></image> <image src="/image/icon/g-custom.png"></image>
<text>名额</text> <text>名额</text>
<text>{{info.quota}}人</text> <text>{{info.quota}}人</text>
...@@ -47,13 +47,13 @@ ...@@ -47,13 +47,13 @@
<view class="contact row"> <view class="contact row">
<!-- 活动价样式 --> <!-- 活动价样式 -->
<view wx:if="{{info.priceType === 1}}"> <view wx:if="{{info.priceType === 1}}">
<view class="info-price row align-c"> <view class="info-price row ac">
<text class="item-price-discount">活动价</text> <text class="item-price-discount">活动价</text>
<text>{{info.priceDiscount === 0 ? '' : '￥'}}</text> <text>{{info.priceDiscount === 0 ? '' : '￥'}}</text>
<text>{{info.priceDiscount === 0 ? '免费' : info.priceDiscountText}}</text> <text>{{info.priceDiscount === 0 ? '免费' : info.priceDiscountText}}</text>
<text>{{info.priceDiscount === 0 ? '' : '/人'}}</text> <text>{{info.priceDiscount === 0 ? '' : '/人'}}</text>
</view> </view>
<view class="item-info-old-price row align-c"> <view class="item-info-old-price row ac">
<text>{{info.price === 0 ? '' : '￥'}}</text> <text>{{info.price === 0 ? '' : '￥'}}</text>
<text>{{info.price === 0 ? '免费' : info.priceText}}</text> <text>{{info.price === 0 ? '免费' : info.priceText}}</text>
<text>{{info.price === 0 ? '' : '/人'}}</text> <text>{{info.price === 0 ? '' : '/人'}}</text>
...@@ -61,13 +61,13 @@ ...@@ -61,13 +61,13 @@
</view> </view>
<!-- 业主价样式 --> <!-- 业主价样式 -->
<view class="row" wx:if="{{info.priceType === 2}}"> <view class="row" wx:if="{{info.priceType === 2}}">
<view class="item-price row align-c"> <view class="item-price row ac">
<text class="item-price-special">业主价</text> <text class="item-price-special">业主价</text>
<text>{{info.priceSpecial === 0 ? '' : '￥'}}</text> <text>{{info.priceSpecial === 0 ? '' : '￥'}}</text>
<text>{{info.priceSpecial === 0 ? '免费' : info.priceSpecialText}}</text> <text>{{info.priceSpecial === 0 ? '免费' : info.priceSpecialText}}</text>
<text>{{info.priceSpecial === 0 ? '' : '/人'}}</text> <text>{{info.priceSpecial === 0 ? '' : '/人'}}</text>
</view> </view>
<view class="item-info-old-price row align-c"> <view class="item-info-old-price row ac">
<text>{{info.price === 0 ? '' : '￥'}}</text> <text>{{info.price === 0 ? '' : '￥'}}</text>
<text>{{info.price === 0 ? '免费' : info.priceText}}</text> <text>{{info.price === 0 ? '免费' : info.priceText}}</text>
<text>{{info.price === 0 ? '' : '/人'}}</text> <text>{{info.price === 0 ? '' : '/人'}}</text>
...@@ -75,13 +75,13 @@ ...@@ -75,13 +75,13 @@
</view> </view>
<!-- 普通价样式 --> <!-- 普通价样式 -->
<view class="row" wx:if="{{info.priceType === 3}}"> <view class="row" wx:if="{{info.priceType === 3}}">
<view class="item-price row align-c"> <view class="item-price row ac">
<text></text> <text></text>
<text>{{info.price === 0 ? '' : '￥'}}</text> <text>{{info.price === 0 ? '' : '￥'}}</text>
<text>{{info.price === 0 ? '免费' : info.priceText}}</text> <text>{{info.price === 0 ? '免费' : info.priceText}}</text>
<text>{{info.price === 0 ? '' : '/人'}}</text> <text>{{info.price === 0 ? '' : '/人'}}</text>
</view> </view>
</view> </view>
<button class="{{isSubmit ? 'button' : 'button-disable'}} row con-c align-c" size="long" bindtap="onReport">{{stateText}}</button> <button class="{{isSubmit ? 'button' : 'button-disable'}} row cc ac" size="long" bindtap="onReport">{{stateText}}</button>
</view> </view>
</view> </view>
\ No newline at end of file
pages/play/activity/activity.wxml
...@@ -10,38 +10,38 @@ ...@@ -10,38 +10,38 @@
<view class="item-cover" wx:if="{{item.cover !== ''}}"> <view class="item-cover" wx:if="{{item.cover !== ''}}">
<image src="{{item.cover}}" mode="aspectFill"></image> <image src="{{item.cover}}" mode="aspectFill"></image>
</view> </view>
<view class="item-info col"> <view class="item-info column">
<view class="item-title row con-b align-c"> <view class="item-title row cb ac">
<text>{{item.name}}</text> <text>{{item.name}}</text>
<text wx:if="{{item.tagNames[0]}}">{{item.tagNames[0]}}</text> <text wx:if="{{item.tagNames[0]}}">{{item.tagNames[0]}}</text>
</view> </view>
<view class="item-date row align-c"> <view class="item-date row ac">
<image src="{{imageBase + 'icon/clock-2.png'}}"></image> <image src="{{imageBase + 'icon/clock-2.png'}}"></image>
<text>{{item.date}}</text> <text>{{item.date}}</text>
</view> </view>
<view class="item-describe"> <view class="item-describe">
<text>{{item.describe}}</text> <text>{{item.describe}}</text>
</view> </view>
<view class="item-operation row con-b align-c"> <view class="item-operation row cb ac">
<view class="row align-c" wx:if="{{item.priceType === 1}}"> <view class="row ac" wx:if="{{item.priceType === 1}}">
<text>活动价</text> <text>活动价</text>
<text class="price-symbol">￥</text> <text class="price-symbol">￥</text>
<text>{{item.priceSpecialText == '0' ? '免费' : item.priceSpecialText}}</text> <text>{{item.priceSpecialText == '0' ? '免费' : item.priceSpecialText}}</text>
<text>{{item.priceText}}</text> <text>{{item.priceText}}</text>
</view> </view>
<view class="row align-c" wx:if="{{item.priceType === 2}}"> <view class="row ac" wx:if="{{item.priceType === 2}}">
<text>业主价</text> <text>业主价</text>
<text class="price-symbol">{{item.priceSpecial == '0' ? '': '￥'}}</text> <text class="price-symbol">{{item.priceSpecial == '0' ? '': '￥'}}</text>
<text>{{item.priceSpecial == '0' ? '免费' : item.priceSpecialText}}</text> <text>{{item.priceSpecial == '0' ? '免费' : item.priceSpecialText}}</text>
<text>{{item.priceText}}</text> <text>{{item.priceText}}</text>
</view> </view>
<view class="row align-c" wx:if="{{item.priceType === 3}}"> <view class="row ac" wx:if="{{item.priceType === 3}}">
<text style="display: none"></text> <text style="display: none"></text>
<text class="price-symbol">{{item.price == '0' ? '': '￥'}}</text> <text class="price-symbol">{{item.price == '0' ? '': '￥'}}</text>
<text>{{item.price == '0' ? '免费' : item.priceText}}</text> <text>{{item.price == '0' ? '免费' : item.priceText}}</text>
</view> </view>
<view> <view>
<button class="row con-c align-c" catchtap="onReport" data-item="{{item}}">报名</button> <button class="row cc ac" catchtap="onReport" data-item="{{item}}">报名</button>
</view> </view>
</view> </view>
</view> </view>
...@@ -57,15 +57,15 @@ ...@@ -57,15 +57,15 @@
</view> </view>
<view class="other row" > <view class="other row" >
<view class="route-list row con-b"> <view class="route-list row cb">
<!-- 左侧列表 --> <!-- 左侧列表 -->
<view class="route-list-left"> <view class="route-list-left">
<block wx:for="{{selectedOther}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{selectedOther}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="route-item" wx:if="{{index % 2 === 0}}" data-id="{{item.id}}" data-index="{{index}}" bindtap="onActivityExpire"> <view class="route-item" wx:if="{{index % 2 === 0}}" data-id="{{item.id}}" data-index="{{index}}" bindtap="onActivityExpire">
<view class="row con-c align-c"> <view class="row cc ac">
<image src="{{item.cover}}" mode="aspectFill"></image> <image src="{{item.cover}}" mode="aspectFill"></image>
</view> </view>
<view class="route-item-tags row align-c"> <view class="route-item-tags row ac">
<block wx:for="{{item.tags}}" wx:for-index="indexTags" wx:for-item="itemTags" wx:key="indexTags"> <block wx:for="{{item.tags}}" wx:for-index="indexTags" wx:for-item="itemTags" wx:key="indexTags">
<text>{{'# ' + itemTags}}</text> <text>{{'# ' + itemTags}}</text>
</block> </block>
...@@ -80,10 +80,10 @@ ...@@ -80,10 +80,10 @@
<view class="route-list-right"> <view class="route-list-right">
<block wx:for="{{selectedOther}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{selectedOther}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="route-item" wx:if="{{index % 2 === 1}}" data-id="{{item.id}}" data-index="{{index}}" bindtap="onActivityExpire"> <view class="route-item" wx:if="{{index % 2 === 1}}" data-id="{{item.id}}" data-index="{{index}}" bindtap="onActivityExpire">
<view class="row con-c align-c"> <view class="row cc ac">
<image src="{{item.cover}}" mode="aspectFill"></image> <image src="{{item.cover}}" mode="aspectFill"></image>
</view> </view>
<view class="route-item-tags row align-c"> <view class="route-item-tags row ac">
<block wx:for="{{item.tags}}" wx:for-index="indexTags" wx:for-item="itemTags" wx:key="indexTags"> <block wx:for="{{item.tags}}" wx:for-index="indexTags" wx:for-item="itemTags" wx:key="indexTags">
<text>{{'# ' + itemTags}}</text> <text>{{'# ' + itemTags}}</text>
</block> </block>
......
pages/play/home/home.wxml
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<view class="recent_activities_item"></view> <view class="recent_activities_item"></view>
</view> </view>
<block wx:if="{{recentActivitiesList.length === 0}}"> <block wx:if="{{recentActivitiesList.length === 0}}">
<view class="item-nothing col con-c ac"> <view class="item-nothing column cc ac">
<image class="nothing-activity" src="{{imageBase + 'icon/fireworks-2.png'}}"></image> <image class="nothing-activity" src="{{imageBase + 'icon/fireworks-2.png'}}"></image>
<text>近期暂无活动安排</text> <text>近期暂无活动安排</text>
</view> </view>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</view> </view>
<swiper class="movie-swiper" next-margin="38rpx" bindchange="swiperMovieChange" wx:if="{{movieList.length > 0}}"> <swiper class="movie-swiper" next-margin="38rpx" bindchange="swiperMovieChange" wx:if="{{movieList.length > 0}}">
<block wx:for="{{movieList}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{movieList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<swiper-item class="movie-item col con-e"> <swiper-item class="movie-item column ce">
<view class="movie-wrapper {{swiperMovieCurrent === index ? 'movie-item-left' : '' }} {{swiperMovieCurrent === movieList.length - 1 ? 'movie-item-center' : ''}}" bindtap="onMovieDetail" data-id="{{item.name}}"> <view class="movie-wrapper {{swiperMovieCurrent === index ? 'movie-item-left' : '' }} {{swiperMovieCurrent === movieList.length - 1 ? 'movie-item-center' : ''}}" bindtap="onMovieDetail" data-id="{{item.name}}">
<view class="movie-cover"> <view class="movie-cover">
<image mode="aspectFill" src="{{item.cover}}"></image> <image mode="aspectFill" src="{{item.cover}}"></image>
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
</swiper> </swiper>
<block wx:if="{{movieList.length === 0}}"> <block wx:if="{{movieList.length === 0}}">
<view class="item-nothing col con-c ac"> <view class="item-nothing column cc ac">
<image class="nothing-movie" src="{{resourcesBase + 'play/nothing-movie.png'}}"></image> <image class="nothing-movie" src="{{resourcesBase + 'play/nothing-movie.png'}}"></image>
<text>暂无影片，请期待后续排片</text> <text>暂无影片，请期待后续排片</text>
</view> </view>
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
</block> </block>
</view> </view>
<block wx:if="{{clubList.length === 0}}"> <block wx:if="{{clubList.length === 0}}">
<view class="item-nothing col con-c ac"> <view class="item-nothing column cc ac">
<image class="nothing-activity" src="{{imageBase + 'icon/fireworks-2.png'}}"></image> <image class="nothing-activity" src="{{imageBase + 'icon/fireworks-2.png'}}"></image>
<text>暂无俱乐部信息</text> <text>暂无俱乐部信息</text>
</view> </view>
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
<view class="route-list-left"> <view class="route-list-left">
<block wx:for="{{touristRouteList}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{touristRouteList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="route-item" wx:if="{{index % 2 === 0}}" data-item="{{item}}" bindtap="onTouristRouteDetail"> <view class="route-item" wx:if="{{index % 2 === 0}}" data-item="{{item}}" bindtap="onTouristRouteDetail">
<view class="row con-c ac"> <view class="row cc ac">
<image src="{{item.cover}}" mode="aspectFill"></image> <image src="{{item.cover}}" mode="aspectFill"></image>
</view> </view>
<view class="route-item-tags row ac"> <view class="route-item-tags row ac">
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
<view class="route-list-right"> <view class="route-list-right">
<block wx:for="{{touristRouteList}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{touristRouteList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="route-item" wx:if="{{index % 2 === 1}}" data-item="{{item}}" bindtap="onTouristRouteDetail"> <view class="route-item" wx:if="{{index % 2 === 1}}" data-item="{{item}}" bindtap="onTouristRouteDetail">
<view class="row con-c ac"> <view class="row cc ac">
<image src="{{item.cover}}" mode="aspectFill"></image> <image src="{{item.cover}}" mode="aspectFill"></image>
</view> </view>
<view class="route-item-tags row ac"> <view class="route-item-tags row ac">
......
pages/play/movie-detail/movie-detail.wxml
...@@ -54,17 +54,17 @@ ...@@ -54,17 +54,17 @@
</view> </view>
</view> </view>
<!-- 无场次 --> <!-- 无场次 -->
<view class="show-end col align-c" wx:if="{{statusList.length === 0}}"> <view class="show-end column ac" wx:if="{{statusList.length === 0}}">
<image src="/image/no-movie.png"></image> <image src="/image/no-movie.png"></image>
<text>观影已结束，请期待后续排片</text> <text>观影已结束，请期待后续排片</text>
</view> </view>
<!-- 有场次 --> <!-- 有场次 -->
<view wx:else> <view wx:else>
<!-- 场次日期选择 --> <!-- 场次日期选择 -->
<view class="status row align-c"> <view class="status row ac">
<block wx:for="{{statusList}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{statusList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="status-item row con-c align-c" data-type="{{index}}" bindtap="onSelectionStatus"> <view class="status-item row cc ac" data-type="{{index}}" bindtap="onSelectionStatus">
<view class="row con-c align-c {{index === statusActive ? 'status-item-active' : ''}}"> <view class="row cc ac {{index === statusActive ? 'status-item-active' : ''}}">
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
</view> </view>
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
</view> </view>
<!-- 场次列表 --> <!-- 场次列表 -->
<block wx:for="{{showList[statusActive]}}" wx:key="id"> <block wx:for="{{showList[statusActive]}}" wx:key="id">
<view class="show-wrapper row align-c"> <view class="show-wrapper row ac">
<view class="show-time-start"> <view class="show-time-start">
<text>{{item.beginTime}}</text> <text>{{item.beginTime}}</text>
</view> </view>
......
pages/play/movie/movie.wxml
<m-toast></m-toast> <m-toast></m-toast>
<m-nav titleText="所有影片" scrollHeight="{{navScroll}}" styleIndex="{{7}}"></m-nav> <m-nav titleText="所有影片" scrollHeight="{{navScroll}}" styleIndex="{{7}}"></m-nav>
<view class="status row align-c"> <view class="status row ac">
<block wx:for="{{tabList}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{tabList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="status-item row con-c align-c" data-type="{{index}}" bindtap="onSelectionTab"> <view class="status-item row cc ac" data-type="{{index}}" bindtap="onSelectionTab">
<view class="row con-c align-c {{index === tabActiveIndex ? 'status-item-active' : 'status-item-inactive'}}"> <view class="row cc ac {{index === tabActiveIndex ? 'status-item-active' : 'status-item-inactive'}}">
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
</view> </view>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<view wx:if="{{tabActiveIndex === 0}}"> <view wx:if="{{tabActiveIndex === 0}}">
<block wx:for="{{movieToday}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{movieToday}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="movie-wrapper row" data-item="{{item}}" bindtap="onMovieDetail"> <view class="movie-wrapper row" data-item="{{item}}" bindtap="onMovieDetail">
<view class="movie-time-wrapper row align-c"> <view class="movie-time-wrapper row ac">
<view class="movie-time-start"> <view class="movie-time-start">
<text>{{item.beginTime}}</text> <text>{{item.beginTime}}</text>
</view> </view>
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
</view> </view>
</block> </block>
<view class="show-end col align-c" wx:if="{{movieToday.length === 0}}"> <view class="show-end column ac" wx:if="{{movieToday.length === 0}}">
<image src="{{resourcesBase + 'play/no-movie.png'}}"></image> <image src="{{resourcesBase + 'play/no-movie.png'}}"></image>
<text>观影已结束，请期待后续排片</text> <text>观影已结束，请期待后续排片</text>
</view> </view>
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
</block> </block>
<block wx:if="{{movieAll.movieWeek.list.length === 0}}"> <block wx:if="{{movieAll.movieWeek.list.length === 0}}">
<view class="show-end col align-c"> <view class="show-end column ac">
<image src="{{resourcesBase + 'play/no-movie.png'}}"></image> <image src="{{resourcesBase + 'play/no-movie.png'}}"></image>
<text>观影已结束，请期待后续排片</text> <text>观影已结束，请期待后续排片</text>
</view> </view>
......
pages/play/point-detail/point-detail.wxml
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</view> </view>
<view class="describe" style="{{info.background}}"> <view class="describe" style="{{info.background}}">
<view class="describe-occupy row align-c"> <view class="describe-occupy row ac">
<text>{{info.name}}</text> <text>{{info.name}}</text>
<image src="/image/icon/share-3.png" bindtap="onShare"></image> <image src="/image/icon/share-3.png" bindtap="onShare"></image>
</view> </view>
...@@ -33,12 +33,12 @@ ...@@ -33,12 +33,12 @@
<view class="iphonexr-fill" style="{{info.background}}"></view> <view class="iphonexr-fill" style="{{info.background}}"></view>
</view> </view>
<view class="container-share row con-c align-c" hidden="{{!showPopup}}"> <view class="container-share row cc ac" hidden="{{!showPopup}}">
<view class="col con-c"> <view class="column cc">
<view class="share-content"> <view class="share-content">
<image src="{{popupImage}}"></image> <image src="{{popupImage}}"></image>
</view> </view>
<view class="share-operation row con-b align-c"> <view class="share-operation row cb ac">
<button bindtap="onCancel">取消</button> <button bindtap="onCancel">取消</button>
<button bindtap="onDownload">下载图片</button> <button bindtap="onDownload">下载图片</button>
</view> </view>
......
pages/play/service-detail/service-detail.wxml
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
<image src="{{imageBase + 'icon/location-2.png'}}" bind:tap="onLocation"></image> <image src="{{imageBase + 'icon/location-2.png'}}" bind:tap="onLocation"></image>
</view> </view>
<!-- 分享弹出图片 --> <!-- 分享弹出图片 -->
<view class="container-share row con-c ac" hidden="{{!showPopup}}"> <view class="container-share row cc ac" hidden="{{!showPopup}}">
<view class="col con-c"> <view class="column cc">
<view class="share-content"> <view class="share-content">
<image src="{{shareImage}}"></image> <image src="{{shareImage}}"></image>
</view> </view>
...@@ -46,13 +46,13 @@ ...@@ -46,13 +46,13 @@
<!-- 近期活动 --> <!-- 近期活动 -->
<view class="commodity-card" wx:if="{{winActivity}}"> <view class="commodity-card" wx:if="{{winActivity}}">
<view class="commodity-card-title row cb align-e"> <view class="commodity-card-title row cb ae">
<text>近期活动</text> <text>近期活动</text>
<text bindtap="onActivityAll">查看全部</text> <text bindtap="onActivityAll">查看全部</text>
</view> </view>
<view class="commodity-card-list row"> <view class="commodity-card-list row">
<block wx:for="{{detailActivity}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{detailActivity}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="commodity-card-item col" bindtap="onActivityDetail" data-id="{{item.id}}"> <view class="commodity-card-item column" bindtap="onActivityDetail" data-id="{{item.id}}">
<image mode="aspectFill" src="{{item.cover}}"></image> <image mode="aspectFill" src="{{item.cover}}"></image>
<view class="commodity-card-item-title row ac"> <view class="commodity-card-item-title row ac">
<text>{{item.title}}</text> <text>{{item.title}}</text>
...@@ -83,14 +83,14 @@ ...@@ -83,14 +83,14 @@
<text class="price-valid">{{item.price == '0' ? '免费' : item.priceText}}</text> <text class="price-valid">{{item.price == '0' ? '免费' : item.priceText}}</text>
</view> </view>
<view> <view>
<button class="row con-c ac">报名</button> <button class="row cc ac">报名</button>
</view> </view>
</view> </view>
</view> </view>
</block> </block>
<view class="commodity-card-item col" wx:if="{{detailActivity.length !== 0}}"></view> <view class="commodity-card-item column" wx:if="{{detailActivity.length !== 0}}"></view>
<block wx:if="{{detailActivity.length === 0}}"> <block wx:if="{{detailActivity.length === 0}}">
<view class="commodity-card-item-nothing col con-c ac"> <view class="commodity-card-item-nothing column cc ac">
<image class="nothing-activity" src="{{imageBase + 'icon/fireworks-2.png'}}"></image> <image class="nothing-activity" src="{{imageBase + 'icon/fireworks-2.png'}}"></image>
<text>近期暂无活动安排</text> <text>近期暂无活动安排</text>
</view> </view>
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
<!-- 商品 --> <!-- 商品 -->
<view class="commodity-card" wx:if="{{winCommodity}}"> <view class="commodity-card" wx:if="{{winCommodity}}">
<view class="commodity-card-title row cb align-e"> <view class="commodity-card-title row cb ae">
<text>{{commodityTitle}}</text> <text>{{commodityTitle}}</text>
<text wx:if="{{!winHidden}}" bindtap="onCommodityAll">查看全部</text> <text wx:if="{{!winHidden}}" bindtap="onCommodityAll">查看全部</text>
<view wx:if="{{winHidden}}" class="row ac"> <view wx:if="{{winHidden}}" class="row ac">
...@@ -111,8 +111,8 @@ ...@@ -111,8 +111,8 @@
<view class="commodity-card-list row"> <view class="commodity-card-list row">
<block wx:for="{{detailCommodity}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{detailCommodity}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="commodity-card-item col"> <view class="commodity-card-item column">
<view class="commodity-card-item-cover row con-c ac"> <view class="commodity-card-item-cover row cc ac">
<image mode="aspectFill" src="{{item.cover}}"></image> <image mode="aspectFill" src="{{item.cover}}"></image>
</view> </view>
<view class="commodity-card-item-title row cb ac"> <view class="commodity-card-item-title row cb ac">
...@@ -145,19 +145,19 @@ ...@@ -145,19 +145,19 @@
<text class="price-valid">{{item.priceText == '0' ? '免费' : item.priceText}}</text> <text class="price-valid">{{item.priceText == '0' ? '免费' : item.priceText}}</text>
</view> </view>
<view> <view>
<button class="row con-c ac" data-id="{{item.id}}" data-classid="{{item.classifyId}}" bindtap="onBuyCommodity">购买</button> <button class="row cc ac" data-id="{{item.id}}" data-classid="{{item.classifyId}}" bindtap="onBuyCommodity">购买</button>
</view> </view>
</view> </view>
</block> </block>
</view> </view>
</block> </block>
<view class="commodity-card-item col"></view> <view class="commodity-card-item column"></view>
</view> </view>
</view> </view>
</view> </view>
<!-- 能量补给站 --> <!-- 能量补给站 -->
<view class="commodity-menu col" wx:if="{{winCommodityMenu}}"> <view class="commodity-menu column" wx:if="{{winCommodityMenu}}">
<view class="commodity-menu-title row cb align-e"> <view class="commodity-menu-title row cb ae">
<text>{{commodityTitle}}</text> <text>{{commodityTitle}}</text>
</view> </view>
<image src="{{resourcesBase + 'play/service/service-flower.png'}}" bindtap="onBuySnacks" data-id="{{5}}"></image> <image src="{{resourcesBase + 'play/service/service-flower.png'}}" bindtap="onBuySnacks" data-id="{{5}}"></image>
...@@ -203,9 +203,9 @@ ...@@ -203,9 +203,9 @@
</view> </view>
</view> </view>
<view class="evaluate-list col"> <view class="evaluate-list column">
<block wx:for="{{detailEvaluate}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{detailEvaluate}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="evaluate-item col"> <view class="evaluate-item column">
<view class="row"> <view class="row">
<image class="evaluate-item-avatar" src="{{item.userAvatar}}" mode="widthFix"></image> <image class="evaluate-item-avatar" src="{{item.userAvatar}}" mode="widthFix"></image>
<view class="evaluate-item-info"> <view class="evaluate-item-info">
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
<image wx:if="{{indexAlbum < 4}}" src="{{itemAlbum}}" data-index="{{indexAlbum}}" data-item="{{item}}" bindtap="onEvaluateAlbum"></image> <image wx:if="{{indexAlbum < 4}}" src="{{itemAlbum}}" data-index="{{indexAlbum}}" data-item="{{item}}" bindtap="onEvaluateAlbum"></image>
</block> </block>
<view wx:if="{{item.userAlbum.length > 4}}" class="evaluate-item-album-more row con-c ac" data-index="{{3}}" data-item="{{item}}" bindtap="onEvaluateAlbum"> <view wx:if="{{item.userAlbum.length > 4}}" class="evaluate-item-album-more row cc ac" data-index="{{3}}" data-item="{{item}}" bindtap="onEvaluateAlbum">
<text>{{'+' + (item.userAlbum.length - 4)}}</text> <text>{{'+' + (item.userAlbum.length - 4)}}</text>
</view> </view>
</view> </view>
...@@ -247,14 +247,14 @@ ...@@ -247,14 +247,14 @@
<!-- 操作 --> <!-- 操作 -->
<view class="operation" wx:if="{{option.id === '1'}}"> <view class="operation" wx:if="{{option.id === '1'}}">
<button class="button row con-c ac" bindtap="onContact">购买门票</button> <button class="button row cc ac" bindtap="onContact">购买门票</button>
</view> </view>
<view class="operation" wx:if="{{option.id === '4' || option.id === '6'}}"> <view class="operation" wx:if="{{option.id === '4' || option.id === '6'}}">
<button class="button row con-c ac" bindtap="onBuyFood">立即点餐</button> <button class="button row cc ac" bindtap="onBuyFood">立即点餐</button>
</view> </view>
<!-- 侧边返回顶部 --> <!-- 侧边返回顶部 -->
<view class="appointment-side col cb ac" hidden="{{winSide}}"> <view class="appointment-side column cb ac" hidden="{{winSide}}">
<button class="appointment-side-top" bindtap="onBackTop"> <button class="appointment-side-top" bindtap="onBackTop">
<image src="{{imageBase + 'top.png'}}"></image> <image src="{{imageBase + 'top.png'}}"></image>
</button> </button>
...@@ -287,8 +287,8 @@ ...@@ -287,8 +287,8 @@
<image src="{{imageBase + 'icon/location-3.png'}}" bind:tap="onLocation"></image> <image src="{{imageBase + 'icon/location-3.png'}}" bind:tap="onLocation"></image>
</view> </view>
<!-- 分享弹出图片 --> <!-- 分享弹出图片 -->
<view class="container-share row con-c ac" hidden="{{!showPopup}}"> <view class="container-share row cc ac" hidden="{{!showPopup}}">
<view class="col con-c"> <view class="column cc">
<view class="share-content"> <view class="share-content">
<image src="{{shareImage}}"></image> <image src="{{shareImage}}"></image>
</view> </view>
...@@ -312,13 +312,13 @@ ...@@ -312,13 +312,13 @@
<!-- 热映影片 --> <!-- 热映影片 -->
<view class="commodity-movie-card"> <view class="commodity-movie-card">
<view class="movie-card-title row cb align-e"> <view class="movie-card-title row cb ae">
<text>热映影片</text> <text>热映影片</text>
<text bindtap="onMovieAll">查看全部</text> <text bindtap="onMovieAll">查看全部</text>
</view> </view>
<view class="commodity-card-list row"> <view class="commodity-card-list row">
<block wx:for="{{detailCommodity}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{detailCommodity}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="movie-card-item col" data-id="{{item.name}}" bindtap="onBuy"> <view class="movie-card-item column" data-id="{{item.name}}" bindtap="onBuy">
<image mode="aspectFill" src="{{item.cover}}"></image> <image mode="aspectFill" src="{{item.cover}}"></image>
<view class="movie-card-item-title row ac"> <view class="movie-card-item-title row ac">
<text>{{item.movieName}}</text> <text>{{item.movieName}}</text>
...@@ -347,14 +347,14 @@ ...@@ -347,14 +347,14 @@
<text>{{item.priceText == 0 ? '免费' : '￥' + item.price}}</text> <text>{{item.priceText == 0 ? '免费' : '￥' + item.price}}</text>
</view> </view>
<view> <view>
<button class="row con-c ac">报名观影</button> <button class="row cc ac">报名观影</button>
</view> </view>
</view> </view>
</view> </view>
</block> </block>
<view class="movie-card-last-item col" wx:if="{{detailCommodity.length > 2}}"></view> <view class="movie-card-last-item column" wx:if="{{detailCommodity.length > 2}}"></view>
<block wx:if="{{detailCommodity.length === 0}}"> <block wx:if="{{detailCommodity.length === 0}}">
<view class="commodity-card-item-nothing col con-c ac"> <view class="commodity-card-item-nothing column cc ac">
<image class="nothing-movie" src="{{resourcesBase + 'play/no-movie-2.png'}}"></image> <image class="nothing-movie" src="{{resourcesBase + 'play/no-movie-2.png'}}"></image>
<text>暂无影片，请期待后续排片</text> <text>暂无影片，请期待后续排片</text>
</view> </view>
...@@ -403,9 +403,9 @@ ...@@ -403,9 +403,9 @@
</view> </view>
</view> </view>
<view class="evaluate-list col"> <view class="evaluate-list column">
<block wx:for="{{detailEvaluate}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{detailEvaluate}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="evaluate-item col" style="border-bottom: 1px solid #3A3A40"> <view class="evaluate-item column" style="border-bottom: 1px solid #3A3A40">
<view class="row"> <view class="row">
<image class="evaluate-item-avatar" src="{{item.userAvatar}}" mode="widthFix"></image> <image class="evaluate-item-avatar" src="{{item.userAvatar}}" mode="widthFix"></image>
<view class="evaluate-item-info"> <view class="evaluate-item-info">
...@@ -443,7 +443,7 @@ ...@@ -443,7 +443,7 @@
<image wx:if="{{indexAlbum < 4}}" src="{{itemAlbum}}" data-index="{{indexAlbum}}" data-item="{{item}}" bindtap="onEvaluateAlbum"></image> <image wx:if="{{indexAlbum < 4}}" src="{{itemAlbum}}" data-index="{{indexAlbum}}" data-item="{{item}}" bindtap="onEvaluateAlbum"></image>
</block> </block>
<view wx:if="{{item.userAlbum.length > 4}}" class="evaluate-item-album-more row con-c ac" data-index="{{3}}" data-item="{{item}}" bindtap="onEvaluateAlbum"> <view wx:if="{{item.userAlbum.length > 4}}" class="evaluate-item-album-more row cc ac" data-index="{{3}}" data-item="{{item}}" bindtap="onEvaluateAlbum">
<text>{{'+' + (item.userAlbum.length - 4)}}</text> <text>{{'+' + (item.userAlbum.length - 4)}}</text>
</view> </view>
</view> </view>
...@@ -453,7 +453,7 @@ ...@@ -453,7 +453,7 @@
</view> </view>
<!-- 侧边返回顶部 --> <!-- 侧边返回顶部 -->
<view class="appointment-side col cb ac" hidden="{{winSide}}"> <view class="appointment-side column cb ac" hidden="{{winSide}}">
<button class="appointment-side-top" bindtap="onBackTop"> <button class="appointment-side-top" bindtap="onBackTop">
<image src="{{imageBase + 'top.png'}}"></image> <image src="{{imageBase + 'top.png'}}"></image>
</button> </button>
...@@ -464,7 +464,7 @@ ...@@ -464,7 +464,7 @@
<view class="full-screen-album" wx:if="{{winEvaluateAlbum}}" bindtap="onHiddenEvaluateAlbum"> <view class="full-screen-album" wx:if="{{winEvaluateAlbum}}" bindtap="onHiddenEvaluateAlbum">
<swiper circular current="{{evaluateAlbumActive}}" class="full-screen-album-swiper" duration="500"> <swiper circular current="{{evaluateAlbumActive}}" class="full-screen-album-swiper" duration="500">
<block wx:for="{{evaluateAlbum}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{evaluateAlbum}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<swiper-item class="album-item row con-c ac"> <swiper-item class="album-item row cc ac">
<image class="album-image" src="{{item}}" mode="aspectFit"></image> <image class="album-image" src="{{item}}" mode="aspectFit"></image>
</swiper-item> </swiper-item>
</block> </block>
......
pages/play/service-sell/service-sell.wxml
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<view class="service-name"> <view class="service-name">
<text>{{serviceInfo.name}}</text> <text>{{serviceInfo.name}}</text>
</view> </view>
<view class="time-address-wrapper row align-c" wx:if="{{serviceInfo.time}}"> <view class="time-address-wrapper row ac" wx:if="{{serviceInfo.time}}">
<view class="service-icon"> <view class="service-icon">
<image src="/image/icon/g-time.png"></image> <image src="/image/icon/g-time.png"></image>
</view> </view>
...@@ -34,14 +34,14 @@ ...@@ -34,14 +34,14 @@
<text>{{serviceInfo.time}}</text> <text>{{serviceInfo.time}}</text>
</view> </view>
</view> </view>
<view class="time-address-wrapper row align-c" bindtap="onLocation"> <view class="time-address-wrapper row ac" bindtap="onLocation">
<view class="service-icon"> <view class="service-icon">
<image src="/image/icon/g-location.png"></image> <image src="/image/icon/g-location.png"></image>
</view> </view>
<view class="time-address-title"> <view class="time-address-title">
<text>地址</text> <text>地址</text>
</view> </view>
<view class="time-address row con-b"> <view class="time-address row cb">
<text>{{serviceInfo.address}}</text> <text>{{serviceInfo.address}}</text>
<image class="service-icon" src="imageBase + 'icon/arrow-r-1.png'"></image> <image class="service-icon" src="imageBase + 'icon/arrow-r-1.png'"></image>
</view> </view>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<view class="service-content"> <view class="service-content">
<text>{{serviceInfo.content}}</text> <text>{{serviceInfo.content}}</text>
</view> </view>
<view class="footer-wrapper row align-c"> <view class="footer-wrapper row ac">
<!-- 活动价样式 --> <!-- 活动价样式 -->
<block wx:if="{{serviceInfo.priceType === 1}}"> <block wx:if="{{serviceInfo.priceType === 1}}">
......
pages/play/strategy-detail/strategy-detail.wxml
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</view> </view>
</view> </view>
<view class="detail column con-c"> <view class="detail column cc">
<view class="detail-title"> <view class="detail-title">
<text>{{title}}</text> <text>{{title}}</text>
</view> </view>
...@@ -31,14 +31,14 @@ ...@@ -31,14 +31,14 @@
<text>文中提及</text> <text>文中提及</text>
</view> </view>
<block wx:for="{{relation}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{relation}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="relation-item row con-b align-c" data-id="{{item.id}}" bindtap="onRelation"> <view class="relation-item row cb ac" data-id="{{item.id}}" bindtap="onRelation">
<image mode="widthFix" src="{{item.cover}}"></image> <image mode="widthFix" src="{{item.cover}}"></image>
<view class="relation-item-info col"> <view class="relation-item-info column">
<text>{{item.title}}</text> <text>{{item.title}}</text>
<text>{{item.time}}</text> <text>{{item.time}}</text>
<text>{{item.price}}</text> <text>{{item.price}}</text>
</view> </view>
<view class="relation-item-more row align-c"> <view class="relation-item-more row ac">
<image src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
</view> </view>
......
wxss/samcss-reset.wxss → wxss/reset.wxss
/* SAMCSS-base */
page, page,
view, view,
text, text,
......
wxss/samcss-layout.wxss deleted 100644 → 0
/* SAMCSS-layout */
page {
display: flex;
flex-direction: column;
min-height: 100vh;
}
.container {
display: flex;
flex-direction: column;
align-items: center;
flex-grow: 1;
}
.row {
display: flex;
flex-direction: row;
}
.col {
display: flex;
flex-direction: column;
}
.con-s {
justify-content: flex-start;
}
.con-c {
justify-content: center;
}
.con-e {
justify-content: flex-end;
}
.con-b {
justify-content: space-between;
}
.con-a {
justify-content: space-around;
}
.align-s { align-items: flex-start; }
.align-c {
align-items: center;
}
.align-e { align-items: flex-end; }
.grow { flex-grow: 1; }
.background-image {
z-index: -1;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
}
\ No newline at end of file
wxss/samcss-theme.wxss deleted 100644 → 0
.text_decoration_delete {
text-decoration: line-through;
}
.c00 { color: #000000; }
.c01 { color: #15191F; }
.c10 { color: #E66060; }
.c20 { color: #837048; }
.c30 { color: #5DB5DD; }
.c31 { color: #959DA9; }
.c32 { color: #656E7B; }
.c40 { color: #86C5E1; }
.c90 { color: #FFFFFF; }
.cb00 { border-color: #000000; }
.cb01 { border-color: #15191F; }
.cb10 { border-color: #E66060; }
.cb20 { border-color: #837048; }
.cb30 { border-color: #5DB5DD; }
.cb31 { border-color: #959DA9; }
.cb32 { border-color: #656E7B; }
.cb40 { border-color: #86C5E1; }
.cb90 { border-color: #FFFFFF; }
.cbg00 { background-color: #000000; }
.cbg01 { background-color: #15191F; }
.cbg10 { background-color: #E66060; }
.cbg20 { background-color: #837048; }
.cbg30 { background-color: #5DB5DD; }
.cbg31 { background-color: #959DA9; }
.cbg32 { background-color: #656E7B; }
.cbg40 { background-color: #86C5E1; }
.cbg90 { background-color: #FFFFFF; }
.fw100 { font-weight: 100; }
.fw200 { font-weight: 200; }
.fw300 { font-weight: 300; }
.fw400 { font-weight: 400; }
.fw500 { font-weight: 500; }
.fw600 { font-weight: 600; }
.fw700 { font-weight: 700; }
.fw800 { font-weight: 800; }
.fs18 { font-size: 18rpx; line-height: 26rpx; }
.fs22 { font-size: 22rpx; line-height: 32rpx; }
.fs26 { font-size: 26rpx; line-height: 36rpx; }
.fs30 { font-size: 30rpx; line-height: 40rpx; }
.fs34 { font-size: 34rpx; line-height: 48rpx; }
.fs38 { font-size: 38rpx; line-height: 52rpx; }
.fs42 { font-size: 42rpx; line-height: 58rpx; }
.fs50 { font-size: 50rpx; line-height: 72rpx; }
.fs54 { font-size: 54rpx; line-height: 76rpx; }
\ No newline at end of file
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