Skip to content

严立 / mini-shimao

Go to a project
Commit 1bcc5169 by 严立
Options

全局样式整理

parent 38a175ad
Expand all
Inline Side-by-side
Showing with 437 additions and 513 deletions
app.wxss
@import '/wxss/samcss-reset.wxss';
@import '/wxss/samcss-layout.wxss';
@import '/wxss/samcss-theme.wxss';
/* s3组件样式 */
@import '/wxss/reset.wxss';
@import './component/theme/layout.wxss';
@import './component/theme/theme.wxss';
.icon {
width: 32rpx;
height: 32rpx;
page {
display: flex;
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 {
background: linear-gradient(180deg, #FFFFFF 0%, #F3F4F6 20%, #F3F4F6 100%);
......
component/coupon-code/coupon-code.wxml
......@@ -3,14 +3,14 @@
<text class="coupon_code_tip fs26 fw400 c90">{{'请将券码出示给门店核销人员'}}</text>
<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">
<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>
<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>
<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}}">
<text class="fs22 fw700 c31">券码</text>
<text class="fs30 fw700 c01">{{item.couponNumber}}</text>
......
component/m-dialog/m-dialog.wxml
......@@ -6,7 +6,7 @@
<text class="regular">{{title}}</text>
</view>
<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>
</block>
......@@ -21,7 +21,7 @@
<text class="secondary">{{content}}</text>
</view>
<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>
</block>
......@@ -38,7 +38,7 @@
<view class="dialog-operation row cb ac border-base">
<button class="dialog-operation-cancel row cc ac secondary" bindtap="onCancel">{{cancel}}</button>
<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>
</block>
......@@ -58,7 +58,7 @@
<view class="dialog-operation row cb ac border-base">
<button class="dialog-operation-cancel row cc ac secondary" bindtap="onCancel">{{cancel}}</button>
<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>
</block>
......
component/m-dialog/m-dialog.wxss
......@@ -93,4 +93,5 @@
font-size: 30rpx;
font-weight: 400;
line-height: 42rpx;
color: #5DB5DD;
}
\ No newline at end of file
component/theme/theme.wxss
/* 主题 */
.primary { color: #5DB5DD; }
/* 成功 */
.success { color: #67C23A; }
/* 警告 */
.warning { color: #E6A23C; }
/* 危险 */
.danger { color: #F56C6C; }
/* 提示 */
.info { color: #909399; }
/* 常规文本，用于标题，正文 */
.regular { color: #15191F; }
/* 次要文本，用于说明，补充，提示 */
.secondary { color: #959DA9; }
/* 输入提示 */
.placeholder { color: #C2C7CF; }
/* 基础边框 */
.border-base { border-color: #E2E7EF; }
/* 明亮边框 */
.border-light { border-color: #E4E7ED; }
/* 最亮边框 */
.border-lighter { border-color: #EBEEF5; }
\ No newline at end of file
.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; }
/* 背景颜色 */
.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; }
/* 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>
<view class="evaluate">
<view class="evaluate-option row con-b align-c">
<view class="evaluate-option-item row align-c">
<view class="evaluate-option row cb ac">
<view class="evaluate-option-item row ac">
<image src="{{imageBase + 'icon/evaluate-1.png'}}"></image>
<text>服务</text>
<text>{{officeServiceText}}</text>
<text>分</text>
</view>
<view class="evaluate-option-item row align-c">
<view class="evaluate-option-item row ac">
<image src="{{imageBase + 'icon/shop-1.png'}}"></image>
<text>产品</text>
<text>{{officeProductText}}</text>
<text>分</text>
</view>
<view class="evaluate-option-item row align-c">
<view class="evaluate-option-item row ac">
<image src="{{imageBase + 'icon/album-1.png'}}"></image>
<text>环境</text>
<text>{{officeEnvironmentalText}}</text>
......@@ -22,18 +22,18 @@
</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">
<view class="evaluate-item col">
<view class="evaluate-item column">
<view class="row">
<image class="evaluate-item-avatar" src="{{item.userAvatar}}" mode="widthFix"></image>
<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>业主</text>
<text>{{item.date}}</text>
</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">
<image src="{{imageBase + 'icon/star-1.png'}}" data-item="{{item}}"></image>
</block>
......@@ -55,7 +55,7 @@
<image wx:if="{{indexAlbum < 4}}" src="{{itemAlbum}}" data-index="{{indexAlbum}}" data-item="{{item}}" bindtap="onEvaluateAlbum"></image>
</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>
</view>
</view>
......
pages/club/create/create.wxml
......@@ -3,7 +3,7 @@
<view class="container">
<view class="club-enter">
<view class="form-item col">
<view class="form-item column">
<text>俱乐部名称</text>
<m-input
inputId="clubName"
......@@ -14,7 +14,7 @@
</m-input>
<text>{{establishInfo.errorClubName}}</text>
</view>
<view class="form-item col">
<view class="form-item column">
<text>俱乐部简要说明</text>
<m-textarea
inputId="clubDescribe"
......@@ -25,7 +25,7 @@
</m-textarea>
<text>{{establishInfo.errorClubDescribe}}</text>
</view>
<view class="form-item col">
<view class="form-item column">
<text>姓名</text>
<m-input
inputId="userName"
......@@ -36,7 +36,7 @@
</m-input>
<text>{{establishInfo.errorUserName}}</text>
</view>
<view class="form-item col">
<view class="form-item column">
<text>手机号</text>
<m-input
inputId="userPhone"
......
pages/club/enter/enter.wxml
......@@ -2,7 +2,7 @@
<m-nav titleText="申请加入俱乐部" styleIndex="{{1}}"></m-nav>
<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>
<view class="club-info-name column cc ac">
<text class="title overflow_point_1">{{clubInfo.name}}</text>
......@@ -10,7 +10,7 @@
</view>
<view class="club-enter">
<view class="form-item col">
<view class="form-item column">
<text>姓名</text>
<m-input
inputId="name"
......@@ -20,7 +20,7 @@
</m-input>
<text>{{enterInfo.errorName}}</text>
</view>
<view class="form-item col">
<view class="form-item column">
<text>手机号</text>
<m-input
inputId="phone"
......@@ -32,7 +32,7 @@
</m-input>
<text>{{enterInfo.errorPhone}}</text>
</view>
<view class="form-item col">
<view class="form-item column">
<text>备注</text>
<m-input
inputId="remark"
......@@ -44,7 +44,7 @@
</view>
<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>
<m-input
inputId="other"
......
pages/club/home/home.wxml
......@@ -2,7 +2,7 @@
<!-- 创建权限提醒 -->
<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>
<button class="row cc ac" bindtap="onCloseTip">我知道了</button>
......@@ -16,7 +16,7 @@
<!-- 加入权限提醒 -->
<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>
<button class="row cc ac" bindtap="onCloseTip">我知道了</button>
......
pages/club/information/information.wxml
......@@ -11,7 +11,7 @@
<text class="owner-mark" wx:if="{{clubInfo.isOwner}}">业主专享</text>
<view class="club_info_member row cc ac" bindtap="onMemberList">
<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>
......@@ -38,7 +38,7 @@
<text class="tag-blue" wx:if="{{item.tagNames.length}}">{{item.tagNames[0]}}</text>
</view>
<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>
</view>
<view class="card-item-other row cb ac">
......@@ -107,7 +107,7 @@
<!-- 俱乐部加入权限提醒 -->
<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>
<button class="row cc ac" bindtap="onCloseTip">我知道了</button>
......
pages/club/member/member.wxml
......@@ -2,7 +2,7 @@
<m-nav titleText="俱乐部信息"></m-nav>
<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>
<view class="column cc ac">
<text class="club_info_name title fs34 fw700 c01 overflow_point_1">{{clubInfo.name}}</text>
......@@ -12,7 +12,7 @@
</view>
<view class="club_member">
<view class="club-member-title col">
<view class="club-member-title column">
<text>管理员</text>
<text>可添加管理员微信，及时获取活动信息</text>
</view>
......@@ -35,7 +35,7 @@
<!-- 权限提醒 -->
<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>
<button class="row cc ac" bindtap="onPowerInfoClose">我知道了</button>
......@@ -44,7 +44,7 @@
<!-- 管理员微信弹窗 -->
<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>
<image src="{{adminInfo.wx}}" bindlongpress="onSaveAdminWx"></image>
<text>【长按保存二维码】</text>
......
pages/commodity/menu-food/menu-food.wxml
......@@ -31,10 +31,10 @@
<view wx:else class="item-info-content"></view>
</view>
<view class="item-other row con-b">
<view class="item-other row cb">
<!-- 活动价样式 -->
<view wx:if="{{itemCommodity.priceType === 1}}">
<view class="item-price row align-e">
<view class="item-price row ae">
<text>￥</text>
<text>{{itemCommodity.priceDiscountText}}</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>
<view class="container con-s" style="background: {{bgColor}}">
<view class="container" style="background: {{bgColor}}">
<view class="background-img">
<image wx:if="{{banner}}" src="{{resourcesBase + banner}}"></image>
</view>
<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">
<image src="{{item.cover}}"></image>
</view>
......@@ -19,8 +19,8 @@
</view>
<!-- 活动价样式 -->
<view class="project-price-wrapper row align-c" wx:if="{{item.priceType === 1}}">
<view class="item-price-discount row con-c align-c">
<view class="project-price-wrapper row ac" wx:if="{{item.priceType === 1}}">
<view class="item-price-discount row cc ac">
<text>活动价</text>
</view>
<view class="price-special">
......@@ -36,8 +36,8 @@
</view>
<!-- 业主价样式 -->
<view class="project-price-wrapper row align-c" wx:if="{{item.priceType === 2}}">
<view class="item-price-special row con-c align-c">
<view class="project-price-wrapper row ac" wx:if="{{item.priceType === 2}}">
<view class="item-price-special row cc ac">
<text>业主价</text>
</view>
<view class="price-special">
......@@ -53,8 +53,8 @@
</view>
<!-- 普通价样式 -->
<view class="project-price-wrapper row align-c" wx:if="{{item.priceType === 3}}">
<view class="price-special-msg row con-c align-c">
<view class="project-price-wrapper row ac" wx:if="{{item.priceType === 3}}">
<view class="price-special-msg row cc ac">
<text></text>
</view>
<view class="price-special">
......
pages/commodity/project/project.wxml
......@@ -18,7 +18,7 @@
<view class="shop-list">
<!-- 海错图门票 -->
<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>
<text>故宫里的海洋世界—海错图</text>
</view>
......@@ -41,7 +41,7 @@
<text class="commodity-price-value">{{item.priceDiscountText}}</text>
<text class="commodity-price-special">业主价</text>
</view>
<view class="commodity-price-through row con-e align-c">
<view class="commodity-price-through row ce ac">
<text>¥</text>
<text>{{item.priceText}}</text>
</view>
......@@ -54,7 +54,7 @@
<text class="commodity-price-value">{{item.priceSpecialText}}</text>
<text class="commodity-price-special">业主价</text>
</view>
<view class="commodity-price-through row con-e align-c">
<view class="commodity-price-through row ce ac">
<text>¥</text>
<text>{{item.priceText}}</text>
</view>
......@@ -67,14 +67,14 @@
<text class="commodity-price-value">{{item.priceText}}</text>
<text></text>
</view>
<view class="commodity-price-through row con-e align-c">
<view class="commodity-price-through row ce ac">
<text></text>
<text></text>
</view>
</block>
<view class="commodity-price-operation row con-e align-c">
<button class="row con-c align-c">购买门票</button>
<view class="commodity-price-operation row ce ac">
<button class="row cc ac">购买门票</button>
</view>
</view>
</view>
......@@ -84,7 +84,7 @@
<!-- 水养韵苑 -->
<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>
<text>元养水韵SPA</text>
</view>
......@@ -111,7 +111,7 @@
<text class="commodity-price-symbol">/人</text>
<text class="commodity-price-special">业主价</text>
</view>
<view class="commodity-price-through row con-e align-c">
<view class="commodity-price-through row ce ac">
<text>¥</text>
<text>{{item.priceMin}}</text>
<text>-</text>
......@@ -132,7 +132,7 @@
<text class="commodity-price-symbol">/人</text>
<text class="commodity-price-special">业主价</text>
</view>
<view class="commodity-price-through row con-e align-c">
<view class="commodity-price-through row ce ac">
<text>¥</text>
<text>{{item.priceMin}}</text>
<text>-</text>
......@@ -153,14 +153,14 @@
<text class="commodity-price-symbol">/人</text>
<text></text>
</view>
<view class="commodity-price-through row con-e align-c">
<view class="commodity-price-through row ce ac">
<text></text>
<text></text>
</view>
</block>
<view class="commodity-price-operation row con-e align-c">
<button class="row con-c align-c">查看服务</button>
<view class="commodity-price-operation row ce ac">
<button class="row cc ac">查看服务</button>
</view>
</view>
</view>
......@@ -170,7 +170,7 @@
<!-- 儿童营地 -->
<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>
<text>儿童营地</text>
</view>
......@@ -195,7 +195,7 @@
<text class="commodity-price-value">{{item.priceDiscountText}}</text>
<text class="commodity-price-special">业主价</text>
</view>
<view class="commodity-price-through row con-e align-c">
<view class="commodity-price-through row ce ac">
<text>¥</text>
<text>{{item.priceText}}</text>
</view>
......@@ -208,7 +208,7 @@
<text class="commodity-price-value">{{item.priceSpecialText}}</text>
<text class="commodity-price-special">业主价</text>
</view>
<view class="commodity-price-through row con-e align-c">
<view class="commodity-price-through row ce ac">
<text>¥</text>
<text>{{item.priceText}}</text>
</view>
......@@ -221,14 +221,14 @@
<text class="commodity-price-value">{{item.priceText}}</text>
<text></text>
</view>
<view class="commodity-price-through row con-e align-c">
<view class="commodity-price-through row ce ac">
<text></text>
<text></text>
</view>
</block>
<view class="commodity-price-operation row con-e align-c">
<button class="row con-c align-c">暂未开售</button>
<view class="commodity-price-operation row ce ac">
<button class="row cc ac">暂未开售</button>
</view>
</view>
</view>
......@@ -254,7 +254,7 @@
<text class="commodity-price-value">{{item.priceDiscountText}}</text>
<text class="commodity-price-special">业主价</text>
</view>
<view class="commodity-price-through row con-e align-c">
<view class="commodity-price-through row ce ac">
<text>¥</text>
<text>{{item.priceText}}</text>
</view>
......@@ -267,7 +267,7 @@
<text class="commodity-price-value">{{item.priceSpecialText}}</text>
<text class="commodity-price-special">业主价</text>
</view>
<view class="commodity-price-through row con-e align-c">
<view class="commodity-price-through row ce ac">
<text>¥</text>
<text>{{item.priceText}}</text>
</view>
......@@ -280,14 +280,14 @@
<text class="commodity-price-value">{{item.priceText}}</text>
<text></text>
</view>
<view class="commodity-price-through row con-e align-c">
<view class="commodity-price-through row ce ac">
<text></text>
<text></text>
</view>
</block>
<view class="commodity-price-operation row con-e align-c">
<button class="row con-c align-c">暂未开售</button>
<view class="commodity-price-operation row ce ac">
<button class="row cc ac">暂未开售</button>
</view>
</view>
</view>
......
pages/commodity/room-appointment/room-appointment.wxml
<m-toast></m-toast>
<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">
<image src="{{resourcesBase + 'commodity/room-appointment/house-tip.png'}}" bindtap="onAppointmentComplete"></image>
</view>
......@@ -13,49 +13,49 @@
<image class="ornament-wave" src="/image/ornament-2.png" mode="widthFix"></image>
</view>
<view class="form-title row con-s align-c">
<view class="form-title row cs ac">
<text>填写预约信息</text>
</view>
<view class="form">
<!-- 名字输入 -->
<view class="row align-c">
<view class="input-label row con-b align-c">
<view class="row ac">
<view class="input-label row cb ac">
<text>姓</text>
<text>名</text>
</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>
</view>
</view>
<view class="form-error row align-c">
<view class="form-error row ac">
<text hidden="{{errorName ? false : true}}">{{errorName}}</text>
</view>
<!-- 手机输入 -->
<view class="row align-c">
<view class="input-label row con-b align-c">
<view class="row ac">
<view class="input-label row cb ac">
<text>手</text>
<text>机</text>
<text>号</text>
</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>
</view>
</view>
<view class="form-error row align-c">
<view class="form-error row ac">
<text hidden="{{errorPhone ? false : true}}">{{errorPhone}}</text>
</view>
<!-- 预约日期 -->
<view class="row align-c">
<view class="input-label row con-b align-c">
<view class="row ac">
<view class="input-label row cb ac">
<text>看</text>
<text>房</text>
<text>日</text>
<text>期</text>
</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">
<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>
......@@ -65,6 +65,6 @@
</view>
<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>
\ No newline at end of file
pages/commodity/shopping-cart/shopping-cart.wxml
......@@ -3,7 +3,7 @@
<m-nav titleText="购物车"></m-nav>
<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>
<text bindtap="onClearn">清空</text>
</view>
......@@ -12,18 +12,18 @@
<view class="shopping-cart-list">
<block wx:for="{{shoppingCart}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<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>
<image src="{{item.cover}}" mode="aspectFill"></image>
</view>
<view class="list-item-info col">
<view class="list-item-info column">
<view class="list-item-name">
<text>{{item.name}}</text>
</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-main row align-e">
<view class="list-item-price-main row ae">
<text>¥</text>
<text>{{item.priceDiscountText}}</text>
<text class="price-discount">活动价</text>
......@@ -36,7 +36,7 @@
<!-- 业主价样式 -->
<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>{{item.priceSpecialText}}</text>
<text class="price-special">业主价</text>
......@@ -49,7 +49,7 @@
<!-- 普通价样式 -->
<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>{{item.priceText}}</text>
<text></text>
......@@ -60,8 +60,8 @@
</view>
</view>
<view class="list-item-quantity col con-e align-e">
<view class="list-item-quantity-operation row con-b align-c">
<view class="list-item-quantity column ce ae">
<view class="list-item-quantity-operation row cb ac">
<image src="{{imageBase + 'icon/cut-1.png'}}" data-index="{{index}}" bindtap="onQuantityReduce"></image>
<text>{{item.quantity}}</text>
<image hidden="{{item.quantityMax <= item.quantity}}" src="{{imageBase + 'icon/add-1.png'}}" data-index="{{index}}" bindtap="onQuantityAdd"></image>
......@@ -78,14 +78,14 @@
</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>
<text>请在下单3天内取餐，逾期无效</text>
</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>
<text>全选</text>
</view>
......@@ -99,11 +99,11 @@
<text>{{'共' + selectionTotal + '件，优惠 ￥' + amountDiscount}}</text>
</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 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>
<view class="empty-title">
<text>购物车还没有商品哦</text>
......
pages/home/dynamic-detail/dynamic-detail.wxml
<m-nav titleText="动态详情" styleIndex="{{1}}"></m-nav>
<view class="container">
<view class="title row con-s">
<view class="title row cs">
<text>{{notice.title}}</text>
</view>
<view class="date row con-s">
<view class="date row cs">
<text>{{notice.date}}</text>
</view>
<view class="describe">
......
pages/home/dynamic/dynamic.wxml
<m-nav titleText="最新动态"></m-nav>
<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.png"></image>
</view>
......@@ -9,7 +9,7 @@
<view class="notice-list">
<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-title row con-b">
<view class="notice-title row cb">
<text>{{item.title}}</text>
<text>{{item.date}}</text>
</view>
......
pages/home/guide/guide.wxml
......@@ -8,7 +8,7 @@
<block wx:for="{{pointInfo}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view
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}}"
data-index="{{index}}"
catch:tap="onPointInfo"
......@@ -35,6 +35,6 @@
<image src="{{resourcesBase + pointDetail}}"></image>
</view>
<view class="save-map row con-c align-c" bindtap="onSaveMap">
<view class="save-map row cc ac" bindtap="onSaveMap">
<text>保存完整地图</text>
</view>
\ No newline at end of file
pages/home/home/home.wxml
......@@ -28,7 +28,7 @@
</view>
<view class="row cb ac">
<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>
......@@ -46,16 +46,16 @@
</swiper-item>
</block>
</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 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>
<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/title-night.png"></image>
</view>
......@@ -63,7 +63,7 @@
<text>20:00后入园需提前预约，每日限流200人</text>
</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>
</view>
</view>
......@@ -73,9 +73,9 @@
<image src="./image/title-guide.png"></image>
<view class="guide-content">
<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>
<button class="row con-c align-c">进入电子地图</button>
<button class="row cc ac">进入电子地图</button>
</view>
</view>
</view>
......
pages/home/night-appointment/night-appointment.wxml
<m-toast></m-toast>
<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">
<image src="{{resourcesBase + 'home/night-appointment/night-tip.png'}}" bindtap="onAppointmentComplete"></image>
</view>
......@@ -14,87 +14,87 @@
<image class="ornament-wave" src="/image/ornament-2.png" mode="widthFix"></image>
</view>
<view class="form-title row con-s align-c">
<view class="form-title row cs ac">
<text>填写预约信息</text>
</view>
<view class="form">
<!-- 名字输入 -->
<view class="row align-c">
<view class="input-label row con-b align-c">
<view class="row ac">
<view class="input-label row cb ac">
<text>姓</text>
<text>名</text>
</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>
</view>
</view>
<view class="form-error row align-c">
<view class="form-error row ac">
<text hidden="{{errorName ? false : true}}">{{errorName}}</text>
</view>
<!-- 手机输入 -->
<view class="row align-c">
<view class="input-label row con-b align-c">
<view class="row ac">
<view class="input-label row cb ac">
<text>手</text>
<text>机</text>
<text>号</text>
</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>
</view>
</view>
<view class="form-error row align-c">
<view class="form-error row ac">
<text hidden="{{errorPhone ? false : true}}">{{errorPhone}}</text>
</view>
<!-- 预约人数 -->
<view class="row align-c">
<view class="input-label row con-b align-c">
<view class="row ac">
<view class="input-label row cb ac">
<text>预</text>
<text>约</text>
<text>人</text>
<text>数</text>
</view>
<view class="input-wrap row con-b align-c" style="padding: 0">
<button class="row con-c align-c" bindtap="onQuantityCut">
<view class="input-wrap row cb ac" style="padding: 0">
<button class="row cc ac" bindtap="onQuantityCut">
<image src="{{imageBase + 'icon/cut-1.png'}}"></image>
</button>
<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>
</button>
</view>
</view>
<view class="form-error row align-c">
<view class="form-error row ac">
<text hidden="{{errorQuantity ? false : true}}">{{errorQuantity}}</text>
</view>
<!-- 预约日期 -->
<view class="row align-c">
<view class="input-label row con-b align-c">
<view class="row ac">
<view class="input-label row cb ac">
<text>预</text>
<text>约</text>
<text>日</text>
<text>期</text>
</view>
<view class="input-wrap row con-b align-c" style="padding: 0 0 0 24rpx">
<picker class="input-picker row align-c" mode="date" value="{{date}}" start="{{appointmentDate}}" end="{{appointmentEndDate}}" bindchange="onSelectionDate">
<view class="row con-b align-c">
<view class="input-wrap row cb ac" style="padding: 0 0 0 24rpx">
<picker class="input-picker row ac" mode="date" value="{{date}}" start="{{appointmentDate}}" end="{{appointmentEndDate}}" bindchange="onSelectionDate">
<view class="row cb ac">
<text class="grow">{{formDate}}</text>
<image class="input-icon" src="{{imageBase + 'icon/arrow-r-1.png'}}"></image>
</view>
</picker>
</view>
</view>
<view class="quota row con-e align-c" hidden="{{!winQuota}}">
<view class="quota row ce ac" hidden="{{!winQuota}}">
<text>剩余名额：</text>
<text>{{total}}人</text>
</view>
</view>
<view class="appointment-operation">
<button class="{{canSubmit ? 'button' : 'button-disable'}} row con-c align-c" bindtap="onSubmit">确认预约</button>
<button class="button-plain row con-c align-c" bindtap="onServic">电话咨询</button>
<button class="{{canSubmit ? 'button' : 'button-disable'}} row cc ac" bindtap="onSubmit">确认预约</button>
<button class="button-plain row cc ac" bindtap="onServic">电话咨询</button>
</view>
</view>
\ No newline at end of file
pages/login/login.wxml
......@@ -12,12 +12,12 @@
<button class="login-operation-authorization" hidden="{{islogin}}" open-type="getUserInfo" bindgetuserinfo="userInfoHandler">微信授权登录</button>
<view class="login-operation-authorization-complete row cc ac" hidden="{{!islogin}}">
<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>
<button class="login-operation-authorization" hidden="{{isphone}}" open-type="getPhoneNumber" bindgetphonenumber="userPhoneHandler">绑定手机号</button>
<view class="login-operation-authorization-complete row cc ac" hidden="{{!isphone}}">
<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>
\ No newline at end of file
pages/mall/exchange-state/exchange-state.wxml
......@@ -19,7 +19,7 @@
<block wx:if="{{isExpress}}">
<!-- 快递提示 -->
<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>
</view>
......@@ -27,7 +27,7 @@
<view class="address_info">
<text class="fs34 fw700 c01">收货信息</text>
<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}}">
<view class="address_info_detail row ac">
......@@ -47,7 +47,7 @@
</view>
</block>
<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>
......@@ -117,7 +117,7 @@
</view>
<view class="notice row ce ac" wx:if="{{state !== 3 && state !== 4}}" bindtap="onGoodsNotes">
<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>
......@@ -179,18 +179,18 @@
<!-- 二维码弹窗 -->
<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>
<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">
<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>
<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>
<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}}">
<text class="fs22 fw700 c31">券码</text>
<text class="fs30 fw700 c01">{{item.codeNumber}}</text>
......@@ -206,7 +206,7 @@
</swiper-item>
</swiper>
<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>
......
pages/mall/exchange-submit/exchange-submit.wxml
......@@ -31,7 +31,7 @@
</block>
</view>
<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>
</view>
</view>
......@@ -44,7 +44,7 @@
</view>
<view class="address_info_selection row ac" bindtap="onAddressSelection">
<view>
<image class="icon_40" src="{{imageBase + 'icon/location-1.png'}}"></image>
<image class="i40" src="{{imageBase + 'icon/location-1.png'}}"></image>
</view>
<!-- 等待添加地址 -->
<block wx:if="{{!addressSelection.id}}">
......@@ -66,7 +66,7 @@
</view>
</block>
<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>
......@@ -107,7 +107,7 @@
</view>
<view class="goods_tip row ce ac" bindtap="onGoodsNotes">
<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>
......@@ -167,7 +167,7 @@
<!-- 操作 -->
<view class="operation">
<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>
</view>
<view class="operation_next row cb ac">
......
pages/mall/exchange-tip/exchange-tip.wxml
<view class="container column cb 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>
</view>
<view class="cloumn">
......
pages/mall/home/home.wxml
......@@ -10,11 +10,11 @@
<text>我的积分</text>
</view>
<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>
</view>
<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>
</view>
</view>
......
pages/mine/address-list/address-list.wxml
......@@ -17,7 +17,7 @@
<text class="fs26 fw400 c01">{{item.area + item.address}}</text>
</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>
</block>
</view>
......
pages/mine/address-operate/address-operate.wxml
......@@ -42,7 +42,7 @@
<picker class="address_item_picker" mode="region" value="{{addressInfo.area}}" bindchange="onSelectionRegion">
<view class="row ac cb">
<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>
</picker>
</view>
......
pages/mine/appointment-detail/appointment-detail.wxml
......@@ -86,7 +86,7 @@
</image>
</view>
<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-line"></view>
<view class="info-line-point-right"></view>
......@@ -122,7 +122,7 @@
</image>
</view>
<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-line"></view>
<view class="info-line-point-right"></view>
......@@ -165,7 +165,7 @@
</image>
</view>
<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-line"></view>
<view class="info-line-point-right"></view>
......@@ -202,7 +202,7 @@
</image>
</view>
<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-line"></view>
<view class="info-line-point-right"></view>
......@@ -219,11 +219,11 @@
<view class="notice-wrapper row ce ac" bindtap="handleNotice">
<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 class="commodity col">
<view class="commodity column">
<view class="commodity-title">
<text>购买商品</text>
</view>
......@@ -259,7 +259,7 @@
<!-- 订单提示 -->
<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}}">
<text wx:if="{{orderInfo.state === 0 || orderInfo.state === -1}}">待付金额</text>
<text wx:else>实付金额</text>
......@@ -269,7 +269,7 @@
<text>{{orderInfo.payAmount}}</text>
</view>
</view>
<view class="tip-describe col">
<view class="tip-describe column">
<text>{{'订单编号：' + ( orderInfo.number ? orderInfo.number : "")}}</text>
<text>{{'下单时间：' + (orderInfo.submitTime ? orderInfo.submitTime : '')}}</text>
<text wx:if="{{orderInfo.state !== 0 && orderInfo.state !== -1}}">{{'付款时间：' + (orderInfo.payTime ? orderInfo.payTime : '')}}</text>
......
pages/mine/appointment/appointment.wxml
......@@ -19,11 +19,11 @@
<view class="appintment-activity-status-pay">
<text>待付款</text>
</view>
<view class="appointment-activity-content row align-c">
<view class="appointment-activity-content row ac">
<view class="appointment-activity-img">
<image src="{{item.cover}}"></image>
</view>
<view class="appointment-activity-info col con-a">
<view class="appointment-activity-info column ca">
<view class="appointment-activity-title">
<text>{{item.name}}</text>
</view>
......@@ -35,7 +35,7 @@
<text>{{'共' + item.num + '人'}}</text>
</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">
<text>￥</text>
<text>{{item.amount}}</text>
......@@ -52,11 +52,11 @@
<view class="appintment-activity-status">
<text>未开始</text>
</view>
<view class="appointment-activity-content row align-c">
<view class="appointment-activity-content row ac">
<view class="appointment-activity-img">
<image src="{{item.cover}}"></image>
</view>
<view class="appointment-activity-info col con-a">
<view class="appointment-activity-info column ca">
<view class="appointment-activity-title">
<text>{{item.name}}</text>
</view>
......@@ -68,7 +68,7 @@
<text>{{'共' + item.num + '人'}}</text>
</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">
<text>￥</text>
<text>{{item.amount}}</text>
......@@ -84,11 +84,11 @@
<view class="appintment-activity-status">
<text>进行中</text>
</view>
<view class="appointment-activity-content row align-c">
<view class="appointment-activity-content row ac">
<view class="appointment-activity-img">
<image src="{{item.cover}}"></image>
</view>
<view class="appointment-activity-info col con-a">
<view class="appointment-activity-info column ca">
<view class="appointment-activity-title">
<text>{{item.name}}</text>
</view>
......@@ -100,7 +100,7 @@
<text>{{'共' + item.num + '人'}}</text>
</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">
<text>￥</text>
<text>{{item.amount}}</text>
......@@ -116,11 +116,11 @@
<view class="appintment-activity-status">
<text>待评价</text>
</view>
<view class="appointment-activity-content row align-c">
<view class="appointment-activity-content row ac">
<view class="appointment-activity-img">
<image src="{{item.cover}}"></image>
</view>
<view class="appointment-activity-info col con-a">
<view class="appointment-activity-info column ca">
<view class="appointment-activity-title">
<text>{{item.name}}</text>
</view>
......@@ -132,7 +132,7 @@
<text>{{'共' + item.num + '人'}}</text>
</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">
<text>￥</text>
<text>{{item.amount}}</text>
......@@ -150,11 +150,11 @@
<text wx:if="{{item.status === 4}}">已过期</text>
<text wx:if="{{item.status === 6}}">{{item.belongType === 2 ? '已使用' : '已评价'}}</text>
</view>
<view class="appointment-activity-content row align-c">
<view class="appointment-activity-content row ac">
<view class="appointment-activity-img">
<image src="{{item.cover}}"></image>
</view>
<view class="appointment-activity-info col con-a">
<view class="appointment-activity-info column ca">
<view class="appointment-activity-title">
<text>{{item.name}}</text>
</view>
......@@ -166,7 +166,7 @@
<text>{{'共' + item.num + '人'}}</text>
</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">
<text>￥</text>
<text>{{item.amount}}</text>
......@@ -183,11 +183,11 @@
<view class="appintment-activity-status-cancel">
<text>已取消</text>
</view>
<view class="appointment-activity-content row align-c">
<view class="appointment-activity-content row ac">
<view class="appointment-activity-img">
<image src="{{item.cover}}"></image>
</view>
<view class="appointment-activity-info col con-a">
<view class="appointment-activity-info column ca">
<view class="appointment-activity-title">
<text>{{item.name}}</text>
</view>
......@@ -199,7 +199,7 @@
<text>{{'共' + item.num + '人'}}</text>
</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">
<text>￥</text>
<text>{{item.amount}}</text>
......
pages/mine/card/card.wxml
<m-toast></m-toast>
<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-header">
......@@ -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:else class="card-bg month-bg" src="{{imageResourcesBase +'pay/order-input/card-3.png'}}">
</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>
<image src="{{imageBase + 'icon/arrow-r-3.png'}}"></image>
</view>
......@@ -17,8 +17,8 @@
<text>{{passList[0].name}}</text>
</view>
<view class="card-header-info">
<view class="row align-c">
<view class="card-header-info-left row con-b">
<view class="row ac">
<view class="card-header-info-left row cb">
<text>姓</text>
<text>名</text>
</view>
......@@ -31,8 +31,8 @@
<image src="{{imageBase+'icon/eyes_open.png'}}" wx:else></image>
</view>
</view>
<view class="row align-c">
<view class="card-header-info-left row con-b">
<view class="row ac">
<view class="card-header-info-left row cb">
<text>手</text>
<text>机</text>
<text>号</text>
......@@ -42,8 +42,8 @@
<text wx:else>{{passList[0].cellphone}}</text>
</view>
</view>
<view class="row align-c">
<view class="card-header-info-left row con-b align-c">
<view class="row ac">
<view class="card-header-info-left row cb ac">
<text>身</text>
<text>份</text>
<text>证</text>
......@@ -56,8 +56,8 @@
</view>
</view>
</view>
<view class="card-main col align-c">
<view class="code-num-wrapper row align-c con-c">
<view class="card-main column ac">
<view class="code-num-wrapper row ac cc">
<text class="code-num-title">券码：</text>
<text class="code-num">{{passList[0].serialNumber}}</text>
<text class="code-copy" bindtap="setClipboard" data-code="{{passList[0].serialNumber}}">复制</text>
......@@ -68,7 +68,7 @@
<view class="code-use-time">
<text>{{'有效期' + passList[0].expireTime}}</text>
</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>
<image src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view>
......@@ -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:else class="card-bg month-bg" src="{{imageResourcesBase +'pay/order-input/card-3.png'}}">
</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>
<image src="{{imageBase + 'icon/arrow-r-3.png'}}"></image>
</view>
......@@ -98,8 +98,8 @@
<text>{{item.name}}</text>
</view>
<view class="card-header-info">
<view class="row align-c">
<view class="card-header-info-left row con-b">
<view class="row ac">
<view class="card-header-info-left row cb">
<text>姓</text>
<text>名</text>
</view>
......@@ -115,8 +115,8 @@
<image src="{{imageBase+'icon/eyes_open.png'}}" wx:else></image>
</view>
</view>
<view class="row align-c">
<view class="card-header-info-left row con-b">
<view class="row ac">
<view class="card-header-info-left row cb">
<text>手</text>
<text>机</text>
<text>号</text>
......@@ -126,8 +126,8 @@
<text wx:else>{{item.cellphone}}</text>
</view>
</view>
<view class="row align-c">
<view class="card-header-info-left row con-b align-c">
<view class="row ac">
<view class="card-header-info-left row cb ac">
<text>身</text>
<text>份</text>
<text>证</text>
......@@ -140,8 +140,8 @@
</view>
</view>
</view>
<view class="card-main col align-c">
<view class="code-num-wrapper row align-c con-c">
<view class="card-main column ac">
<view class="code-num-wrapper row ac cc">
<text class="code-num-title">券码：</text>
<text class="code-num">{{item.serialNumber}}</text>
<text class="code-copy" bindtap="setClipboard" data-code="{{item.serialNumber}}">复制</text>
......@@ -152,7 +152,7 @@
<view class="code-use-time">
<text>{{'有效期' + item.expireTime}}</text>
</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>
<image src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view>
......
pages/mine/club-manage/club-manage.wxml
......@@ -46,7 +46,7 @@
</view>
<text class="pass_item_info_phone overflow_point_1">{{item.phone}}</text>
</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 class="pass_item_line"></view>
</block>
......@@ -62,7 +62,7 @@
</view>
<text class="pass_item_info_phone overflow_point_1">{{item.phone}}</text>
</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 class="pass_item_line"></view>
</block>
......@@ -100,6 +100,6 @@
</view>
</view>
<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>
\ No newline at end of file
pages/mine/club/club.wxml
......@@ -139,7 +139,7 @@
<!-- 管理员微信弹窗 -->
<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>
<image src="{{adminInfo.wx}}" bindtap="onSaveAdminWx"></image>
<text>【长按保存二维码】</text>
......
pages/mine/home/home.wxml
......@@ -16,7 +16,7 @@
</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">
<text>{{userInfo.name}}</text>
<image src="{{imageBase + 'icon/edit-1.png'}}" bindtap="onEditInfo"></image>
......@@ -27,13 +27,13 @@
</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">
<text>{{integral}}</text>
</view>
<view class="info-integral-title row ce ac">
<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>
......@@ -41,7 +41,7 @@
<view class="list row cc ac">
<view class="status-authentication row cb ac">
<view class="status-symbol col">
<view class="status-symbol column">
<text>业主认证</text>
<text>享受业主尊贵特权，预定消费专属优惠</text>
</view>
......@@ -65,7 +65,7 @@
</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">
<text class="info-owner overflow_point_1">{{userInfo.name}}</text>
<image src="{{imageBase + 'icon/edit-4.png'}}" bindtap="onEditInfo"></image>
......@@ -76,13 +76,13 @@
</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">
<text class="info-owner">{{integral}}</text>
</view>
<view class="info-integral-title row ce ac">
<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>
......@@ -92,11 +92,11 @@
<view class="list">
<!-- 券码核销 -->
<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>{{'所属门店：' + authInfo.officeName}}</text>
</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>
<!-- 我的订单 -->
......@@ -104,7 +104,7 @@
<view class="card-title row cb ac">
<text>我的订单</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>
<!-- 分类 tab -->
......@@ -198,7 +198,7 @@
<!-- 展开更多 -->
<view class="order-more row cc ac" wx:if="{{orderList.length > 1}}" bindtap="onMoreOrder">
<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>
......@@ -207,7 +207,7 @@
<view class="card-title row cb ac">
<text>我的预约</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>
<!-- 分类 tab -->
......@@ -261,13 +261,13 @@
<!-- 展开更多 -->
<view class="order-more row cc ac" wx:if="{{appointmentList.length > 1}}" bindtap="onMoreAppointment">
<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>
<!-- 我的俱乐部 -->
<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">
<text>我的俱乐部</text>
</view>
......@@ -279,7 +279,7 @@
</block>
<!-- 客服中心 -->
<view class="service row con-b ac" bindtap="onService">
<view class="service row cb ac" bindtap="onService">
<text>客服中心</text>
<image class="icon" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view>
......
pages/mine/info/info.wxml
......@@ -49,7 +49,7 @@
</view>
<view class="info_item row cb ac" bindtap="onAddressList">
<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>
......
pages/mine/order/order.wxml
......@@ -4,7 +4,7 @@
<view class="order-category row as" style="{{'height: ' + cssCategoryHeight + 'px;padding-top: ' + cssCategoryTop + 'px;'}}">
<view class="row cb ac">
<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>
<image src="{{imageBase + 'icon/arrow-b-2.png'}}"></image>
</view>
......@@ -17,7 +17,7 @@
<view>
<view class="order-type-row row cb ac">
<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>
</view>
</block>
......@@ -25,7 +25,7 @@
<view class="order-type-row row cb ac">
<block wx:for="{{orderType}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<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">
<text>{{item.name}}</text>
</view>
......@@ -46,7 +46,7 @@
<!-- 订单列表 -->
<view class="container bg-gradient">
<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">
<view class="order-list-item column ac" data-item="{{item}}" bindtap="onOrderDetail">
<view class="order-list-item-title row cb ac">
......@@ -95,12 +95,12 @@
<text class="amount">¥{{item.amount}}</text>
</view>
<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 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 === 0}}" class="again row con-c 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 === 3}}" class="again row con-c 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 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 cc ac" data-item="{{item}}" catchtap="onOrderRemove">删除订单</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 cc ac" data-item="{{item}}" catchtap="onOrderUse">去使用</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 cc ac" data-item="{{item}}" catchtap="onOrderAgain">再次下单</button>
</view>
</view>
</view>
......@@ -116,13 +116,13 @@
</view>
<!-- 二维码弹窗 -->
<view class="code-mask row con-c ac" wx:if="{{winCode}}">
<view class="code column con-c ac">
<view class="code-tip column con-c ac">
<view class="code-mask row cc ac" wx:if="{{winCode}}">
<view class="code column cc ac">
<view class="code-tip column cc ac">
<text>{{'请将券码出示给门店核销人员'}}</text>
<text>{{'请将券码出示给门店核销人员'}}</text>
</view>
<view class="code-info column con-c ac">
<view class="code-info column cc ac">
<view class="code-info-title">
<text>{{'《 阿凡达 》电影票'}}</text>
</view>
......@@ -135,7 +135,7 @@
<text>复制</text>
</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>
</view>
</view>
......
pages/mine/question-more/question-more.wxml
......@@ -13,8 +13,8 @@
<view class="row cb ac">
<text class="fs18 fw400">●</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="icon_32" src="{{imageBase + 'icon/arrow-b-2.png'}}" hidden="{{!item.isShowMore}}"></image>
<image class="i32" src="{{imageBase + 'icon/arrow-r-2.png'}}" hidden="{{item.isShowMore}}"></image>
<image class="i32" src="{{imageBase + 'icon/arrow-b-2.png'}}" hidden="{{!item.isShowMore}}"></image>
</view>
<view class="question_item_content row" hidden="{{!item.isShowMore}}">
<text class="fs30 fw400 c31">{{item.content}}</text>
......@@ -37,8 +37,8 @@
<view class="row cb ac">
<text class="fs18 fw400">●</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="icon_32" src="{{imageBase + 'icon/arrow-b-2.png'}}" hidden="{{!item.isShowMore}}"></image>
<image class="i32" src="{{imageBase + 'icon/arrow-r-2.png'}}" hidden="{{item.isShowMore}}"></image>
<image class="i32" src="{{imageBase + 'icon/arrow-b-2.png'}}" hidden="{{!item.isShowMore}}"></image>
</view>
<view class="question_item_content row" hidden="{{!item.isShowMore}}">
<text class="fs30 fw400 c31">{{item.content}}</text>
......@@ -61,8 +61,8 @@
<view class="row cb ac">
<text class="fs18 fw400">●</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="icon_32" src="{{imageBase + 'icon/arrow-b-2.png'}}" hidden="{{!item.isShowMore}}"></image>
<image class="i32" src="{{imageBase + 'icon/arrow-r-2.png'}}" hidden="{{item.isShowMore}}"></image>
<image class="i32" src="{{imageBase + 'icon/arrow-b-2.png'}}" hidden="{{!item.isShowMore}}"></image>
</view>
<view class="question_item_content row" hidden="{{!item.isShowMore}}">
<text class="fs30 fw400 c31">{{item.content}}</text>
......
pages/mine/question/question.wxml
......@@ -8,7 +8,7 @@
<text class="fs42 fw700 c01">常见问题</text>
<view class="question_more row ac" bindtap="onMoreQuestion">
<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>
......@@ -18,8 +18,8 @@
<view class="row cb ac">
<text class="fs18 fw400">●</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="icon_32" src="{{imageBase + 'icon/arrow-b-2.png'}}" hidden="{{!item.isShowMore}}"></image>
<image class="i32" src="{{imageBase + 'icon/arrow-r-2.png'}}" hidden="{{item.isShowMore}}"></image>
<image class="i32" src="{{imageBase + 'icon/arrow-b-2.png'}}" hidden="{{!item.isShowMore}}"></image>
</view>
<view class="question_item_content row" hidden="{{!item.isShowMore}}">
<text class="fs30 fw400 c31">{{item.content}}</text>
......@@ -30,15 +30,15 @@
<view class="operation row cb ac">
<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>
</view>
<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>
</view>
<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>
</view>
</view>
......@@ -66,7 +66,7 @@
<view class="column cc ac">
<image class="operation_wechat_content" src="{{resourcesBase + 'operation-tip/question-wechat.png'}}"></image>
<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>
\ No newline at end of file
pages/pay/coupon-detail/coupon-detail.wxml
......@@ -4,19 +4,19 @@
<view class="container">
<view class="list-wrapper">
<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-text">{{couponInfo.type}}</view>
</view>
<view class="info-wrapper row con-b">
<view class="info-wrapper row cb">
<view class="info-name">所属门店</view>
<view class="info-text">{{couponInfo.store}}</view>
</view>
<view class="info-wrapper row con-b">
<view class="info-wrapper row cb">
<view class="info-name">券号</view>
<view class="info-text">{{couponInfo.id}}</view>
</view>
<view class="info-wrapper row con-b">
<view class="info-wrapper row cb">
<view class="info-name">有效期</view>
<view class="info-text">{{couponInfo.useTime}}</view>
</view>
......@@ -24,12 +24,12 @@
<view class="list-wrapper">
<view class="title-wrapper">商品详情</view>
<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">
<image mode="aspectFill" src="{{item.cover}}"></image>
</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-price">
<text class="price-symbol">￥</text>
......@@ -41,29 +41,29 @@
</view>
<view class="list-wrapper" wx:for="{{userList}}" wx:key="index">
<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-text">{{item.name}}</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-text">{{item.phone}}</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-text">{{item.idNum}}</view>
</view>
</view>
<view class="list-wrapper" wx:if="{{remarks}}">
<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>
</view>
</view>
<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="confirm-btn" bindtap="submitOperation">确认核销</view>
</view>
......
pages/pay/coupon-input/coupon-input.wxml
......@@ -4,7 +4,7 @@
<view class="container">
<!-- 头像信息 -->
<view class="header column align-c">
<view class="header column ac">
<view class="header-bg">
<image src="{{resourcesBase + 'mine/admin-bgi.png'}}"></image>
</view>
......@@ -13,7 +13,7 @@
</view>
<view class="header-info">
<view class="info-name">{{name}}</view>
<view class="info-text column con-b">
<view class="info-text column cb">
<view class="row">
<text class="info-left">工作身份</text>
<text class="info-right">{{idString}}</text>
......@@ -26,13 +26,13 @@
</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>
<view class="coupon-input-btn" bindtap="handleWriteOff">核销</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">
<image mode="widthFix" src="/image/scan.png"></image>
</view>
......
pages/pay/order-comment/order-comment.wxml
<m-toast></m-toast>
<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-title">
<text>购买商品</text>
</view>
<view class="row align-c">
<view class="row ac">
<block wx:for="{{orderInfo.commodity}}" wx:key="id">
<view class="order-cover">
<image src="{{item.cover}}" mode="aspectFill"></image>
......@@ -15,7 +15,7 @@
<view class="order-name" wx:if="{{orderInfo.commodity.length === 1}}">
<text>{{orderInfo.commodity[0].name}}</text>
</view>
<view class="order-price-wrapper col align-e">
<view class="order-price-wrapper column ae">
<view class="order-price">
<text class="price-symbol">￥</text>
<text>{{orderInfo.amount}}</text>
......@@ -30,7 +30,7 @@
<view class="order-comment-title">
<text>订单评价</text>
</view>
<view class="score-wrapper row align-c">
<view class="score-wrapper row ac">
<view class="score-left">
<text>服务评价</text>
</view>
......@@ -46,7 +46,7 @@
<text>{{scoreServe + '.0星'}}</text>
</view>
</view>
<view class="score-wrapper row align-c">
<view class="score-wrapper row ac">
<view class="score-left">
<text>产品评价</text>
</view>
......@@ -62,7 +62,7 @@
<text>{{scoreProduct + '.0星'}}</text>
</view>
</view>
<view class="score-wrapper row align-c">
<view class="score-wrapper row ac">
<view class="score-left">
<text>环境评价</text>
</view>
......
pages/pay/order-detail/order-detail.wxml
......@@ -86,7 +86,7 @@
</image>
</view>
<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-line"></view>
<view class="info-line-point-right"></view>
......@@ -122,7 +122,7 @@
</image>
</view>
<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-line"></view>
<view class="info-line-point-right"></view>
......@@ -165,7 +165,7 @@
</image>
</view>
<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-line"></view>
<view class="info-line-point-right"></view>
......@@ -202,7 +202,7 @@
</image>
</view>
<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-line"></view>
<view class="info-line-point-right"></view>
......@@ -224,11 +224,11 @@
<view class="notice-wrapper row ce ac" bindtap="handleNotice">
<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 class="commodity col">
<view class="commodity column">
<view class="commodity-title">
<text>购买商品</text>
</view>
......@@ -263,7 +263,7 @@
<!-- 订单提示 -->
<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}}">
<text wx:if="{{orderInfo.state === 0 || orderInfo.state === -1}}">待付金额</text>
<text wx:else>实付金额</text>
......@@ -273,7 +273,7 @@
<text>{{orderInfo.payAmount}}</text>
</view>
</view>
<view class="tip-describe col">
<view class="tip-describe column">
<text>{{'订单编号：' + ( orderInfo.number ? orderInfo.number : "")}}</text>
<text>{{'下单时间：' + (orderInfo.submitTime ? orderInfo.submitTime : '')}}</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 @@
<!-- 年卡月卡 -->
<view class="buy-content-pass" wx:if="{{orderType === 1}}" style="{{cssShadow}}">
<image src="{{resourcesBase + buyContent}}"></image>
<view class="buy-content-pass-content column con-b">
<view class="col">
<view class="buy-content-pass-content column cb">
<view class="column">
<text class="pass-content-title">{{shoppingCartList[0].name}}</text>
<view class="row">
<text class="pass-content-symbol">¥</text>
......@@ -16,7 +16,7 @@
<text class="pass-content-unit">/人</text>
</view>
</view>
<view class="col">
<view class="column">
<view class="row ac">
<text class="pass-content-tip">{{'使用次数　'}}</text>
<text class="pass-content-tip">{{'不限'}}</text>
......@@ -34,7 +34,7 @@
<view class="row cc ac">
<image src="{{resourcesBase + shopInfo.cover}}"></image>
</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>{{'¥' + buyContentAmount}}</text>
</view>
......@@ -43,8 +43,8 @@
<!-- 次票 -->
<view class="buy-content-pass" wx:if="{{orderType === 3}}" style="box-shadow: 0 0 20rpx #f2e0da;">
<image src="{{resourcesBase + buyContent}}"></image>
<view class="buy-content-pass-content column con-b">
<view class="col">
<view class="buy-content-pass-content column cb">
<view class="column">
<text class="pass-content-title">{{shoppingCartList[0].name}}</text>
<view class="row">
<text class="pass-content-symbol">¥</text>
......@@ -52,7 +52,7 @@
<text class="pass-content-unit">/人</text>
</view>
</view>
<view class="col">
<view class="column">
<view class="row ac">
<text class="pass-content-tip">{{'使用次数　'}}</text>
<text class="pass-content-tip">{{'1次'}}</text>
......@@ -105,14 +105,14 @@
<view class="buy-content-activity row ac" wx:if="{{orderType === 6}}">
<!-- <image src="{{resourcesBase + shopInfo.cover}}"></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">
<text>{{buyContentTitle}}</text>
</view>
<view class="time">
<text>{{buyContentTime}}</text>
</view>
<view class="amount row align-e">
<view class="amount row ae">
<text>{{'¥' + buyContentAmount}}</text>
</view>
</view>
......@@ -121,14 +121,14 @@
<!-- 电影 -->
<view class="buy-content-activity row ac" wx:if="{{orderType === 7}}">
<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">
<text>{{buyContentTitle}}</text>
</view>
<view class="time">
<text>{{buyContentTime}}</text>
</view>
<view class="amount row align-e">
<view class="amount row ae">
<text>{{'¥' + buyContentAmount}}</text>
</view>
</view>
......@@ -142,7 +142,7 @@
</view>
<view class="shopping-cart-list">
<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">
<image src="{{item.cover}}"></image>
</view>
......@@ -158,7 +158,7 @@
</view>
</view>
</block>
<view class="shopping-cart-total row con-b ac">
<view class="shopping-cart-total row cb ac">
<text>总计</text>
<view>
<text>￥</text>
......@@ -182,8 +182,8 @@
<view class="entry-label">
<text>报名时间</text>
</view>
<view class="entry-input row con-b ac">
<picker class="row con-b ac" mode="multiSelector" value="{{entryDate}}" range="{{entryDateList}}" bindcolumnchange="onEntryTimeChange" bindchange="onEntryTime">
<view class="entry-input row cb ac">
<picker class="row cb ac" mode="multiSelector" value="{{entryDate}}" range="{{entryDateList}}" bindcolumnchange="onEntryTimeChange" bindchange="onEntryTime">
<text>{{entrySelection}}</text>
</picker>
<image class="input-icon" src="{{imageBase + 'icon/arrow-r-1.png'}}"></image>
......@@ -192,7 +192,7 @@
<view class="entry-label">
<text>报名人数</text>
</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">
<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>
......@@ -203,7 +203,7 @@
<image wx:if="{{quantity === quantityMax || quantityMax === 0}}" class="input-icon" src="{{imageBase + 'icon/add-2.png'}}"></image>
</button>
</view>
<view class="quantity-other row con-b ac">
<view class="quantity-other row cb ac">
<view class="quantity-error">
<text>{{quantityError}}</text>
</view>
......@@ -219,7 +219,7 @@
<view class="quantity-title">
<text>{{quantityTitle}}</text>
</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">
<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>
......@@ -230,7 +230,7 @@
<image wx:if="{{quantity === quantityMax || quantityMax === 0}}" class="input-icon" src="{{imageBase + 'icon/add-2.png'}}"></image>
</button>
</view>
<view class="quantity-other row con-b ac">
<view class="quantity-other row cb ac">
<view class="quantity-error">
<text>{{quantityError}}</text>
</view>
......@@ -359,7 +359,7 @@
<image src="{{imageBase + 'icon/warning-4.png'}}"></image>
<view class="pay-tip-text row cc ac">付款后一经确认不得退款</view>
</view>
<view class="pay-operation row con-b ac">
<view class="pay-operation row cb ac">
<view class="row ac">
<view class="pay-operation-amount-symbol">￥</view>
<view class="pay-operation-amount">{{payAmount}}</view>
......
pages/pay/order-state/order-state.wxml
<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">
<image wx:if="{{payState}}" src="{{imageBase + 'icon/pay-success.png'}}"></image>
<image wx:if="{{!payState}}" src="{{imageBase + 'icon/pay-fail.png'}}"></image>
......@@ -13,7 +13,7 @@
</view>
</view>
<view class="operation">
<button class="operation-home row con-c align-c" bindtap="onHome">返回首页</button>
<button class="operation-detail row con-c align-c" bindtap="onPayDetail">查看订单</button>
<button class="operation-home row cc ac" bindtap="onHome">返回首页</button>
<button class="operation-detail row cc ac" bindtap="onPayDetail">查看订单</button>
</view>
</view>
\ No newline at end of file
pages/play/activity-detail/activity-detail.wxml
......@@ -21,19 +21,19 @@
<view class="detail-title row">
<text>{{info.title}}</text>
</view>
<view class="detail-other col">
<view class="row align-c">
<view class="detail-other column">
<view class="row ac">
<image src="/image/icon/g-time.png"></image>
<text>时间</text>
<text>{{info.date}}</text>
</view>
<view style="height:auto;" class="row align-c">
<view style="height:auto;" class="row ac">
<image src="/image/icon/g-location.png"></image>
<text>地址</text>
<text style="height:auto;">{{info.address}}</text>
<image hidden src="/image/icon/arrow-r-1.png"></image>
</view>
<view class="row align-c">
<view class="row ac">
<image src="/image/icon/g-custom.png"></image>
<text>名额</text>
<text>{{info.quota}}人</text>
......@@ -47,13 +47,13 @@
<view class="contact row">
<!-- 活动价样式 -->
<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>{{info.priceDiscount === 0 ? '' : '￥'}}</text>
<text>{{info.priceDiscount === 0 ? '免费' : info.priceDiscountText}}</text>
<text>{{info.priceDiscount === 0 ? '' : '/人'}}</text>
</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 ? '免费' : info.priceText}}</text>
<text>{{info.price === 0 ? '' : '/人'}}</text>
......@@ -61,13 +61,13 @@
</view>
<!-- 业主价样式 -->
<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>{{info.priceSpecial === 0 ? '' : '￥'}}</text>
<text>{{info.priceSpecial === 0 ? '免费' : info.priceSpecialText}}</text>
<text>{{info.priceSpecial === 0 ? '' : '/人'}}</text>
</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 ? '免费' : info.priceText}}</text>
<text>{{info.price === 0 ? '' : '/人'}}</text>
......@@ -75,13 +75,13 @@
</view>
<!-- 普通价样式 -->
<view class="row" wx:if="{{info.priceType === 3}}">
<view class="item-price row align-c">
<view class="item-price row ac">
<text></text>
<text>{{info.price === 0 ? '' : '￥'}}</text>
<text>{{info.price === 0 ? '免费' : info.priceText}}</text>
<text>{{info.price === 0 ? '' : '/人'}}</text>
</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>
\ No newline at end of file
pages/play/activity/activity.wxml
......@@ -10,38 +10,38 @@
<view class="item-cover" wx:if="{{item.cover !== ''}}">
<image src="{{item.cover}}" mode="aspectFill"></image>
</view>
<view class="item-info col">
<view class="item-title row con-b align-c">
<view class="item-info column">
<view class="item-title row cb ac">
<text>{{item.name}}</text>
<text wx:if="{{item.tagNames[0]}}">{{item.tagNames[0]}}</text>
</view>
<view class="item-date row align-c">
<view class="item-date row ac">
<image src="{{imageBase + 'icon/clock-2.png'}}"></image>
<text>{{item.date}}</text>
</view>
<view class="item-describe">
<text>{{item.describe}}</text>
</view>
<view class="item-operation row con-b align-c">
<view class="row align-c" wx:if="{{item.priceType === 1}}">
<view class="item-operation row cb ac">
<view class="row ac" wx:if="{{item.priceType === 1}}">
<text>活动价</text>
<text class="price-symbol">￥</text>
<text>{{item.priceSpecialText == '0' ? '免费' : item.priceSpecialText}}</text>
<text>{{item.priceText}}</text>
</view>
<view class="row align-c" wx:if="{{item.priceType === 2}}">
<view class="row ac" wx:if="{{item.priceType === 2}}">
<text>业主价</text>
<text class="price-symbol">{{item.priceSpecial == '0' ? '': '￥'}}</text>
<text>{{item.priceSpecial == '0' ? '免费' : item.priceSpecialText}}</text>
<text>{{item.priceText}}</text>
</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 class="price-symbol">{{item.price == '0' ? '': '￥'}}</text>
<text>{{item.price == '0' ? '免费' : item.priceText}}</text>
</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>
......@@ -57,15 +57,15 @@
</view>
<view class="other row" >
<view class="route-list row con-b">
<view class="route-list row cb">
<!-- 左侧列表 -->
<view class="route-list-left">
<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="row con-c align-c">
<view class="row cc ac">
<image src="{{item.cover}}" mode="aspectFill"></image>
</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">
<text>{{'# ' + itemTags}}</text>
</block>
......@@ -80,10 +80,10 @@
<view class="route-list-right">
<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="row con-c align-c">
<view class="row cc ac">
<image src="{{item.cover}}" mode="aspectFill"></image>
</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">
<text>{{'# ' + itemTags}}</text>
</block>
......
pages/play/home/home.wxml
......@@ -39,7 +39,7 @@
<view class="recent_activities_item"></view>
</view>
<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>
<text>近期暂无活动安排</text>
</view>
......@@ -53,7 +53,7 @@
</view>
<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">
<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-cover">
<image mode="aspectFill" src="{{item.cover}}"></image>
......@@ -93,7 +93,7 @@
</swiper>
<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>
<text>暂无影片，请期待后续排片</text>
</view>
......@@ -118,7 +118,7 @@
</block>
</view>
<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>
<text>暂无俱乐部信息</text>
</view>
......@@ -136,7 +136,7 @@
<view class="route-list-left">
<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="row con-c ac">
<view class="row cc ac">
<image src="{{item.cover}}" mode="aspectFill"></image>
</view>
<view class="route-item-tags row ac">
......@@ -154,7 +154,7 @@
<view class="route-list-right">
<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="row con-c ac">
<view class="row cc ac">
<image src="{{item.cover}}" mode="aspectFill"></image>
</view>
<view class="route-item-tags row ac">
......
pages/play/movie-detail/movie-detail.wxml
......@@ -54,17 +54,17 @@
</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>
<text>观影已结束，请期待后续排片</text>
</view>
<!-- 有场次 -->
<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">
<view class="status-item row con-c align-c" data-type="{{index}}" bindtap="onSelectionStatus">
<view class="row con-c align-c {{index === statusActive ? 'status-item-active' : ''}}">
<view class="status-item row cc ac" data-type="{{index}}" bindtap="onSelectionStatus">
<view class="row cc ac {{index === statusActive ? 'status-item-active' : ''}}">
<text>{{item.name}}</text>
</view>
</view>
......@@ -72,7 +72,7 @@
</view>
<!-- 场次列表 -->
<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">
<text>{{item.beginTime}}</text>
</view>
......
pages/play/movie/movie.wxml
<m-toast></m-toast>
<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">
<view class="status-item row con-c align-c" data-type="{{index}}" bindtap="onSelectionTab">
<view class="row con-c align-c {{index === tabActiveIndex ? 'status-item-active' : 'status-item-inactive'}}">
<view class="status-item row cc ac" data-type="{{index}}" bindtap="onSelectionTab">
<view class="row cc ac {{index === tabActiveIndex ? 'status-item-active' : 'status-item-inactive'}}">
<text>{{item.name}}</text>
</view>
</view>
......@@ -16,7 +16,7 @@
<view wx:if="{{tabActiveIndex === 0}}">
<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-time-wrapper row align-c">
<view class="movie-time-wrapper row ac">
<view class="movie-time-start">
<text>{{item.beginTime}}</text>
</view>
......@@ -81,7 +81,7 @@
</view>
</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>
<text>观影已结束，请期待后续排片</text>
</view>
......@@ -157,7 +157,7 @@
</block>
<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>
<text>观影已结束，请期待后续排片</text>
</view>
......
pages/play/point-detail/point-detail.wxml
......@@ -19,7 +19,7 @@
</view>
<view class="describe" style="{{info.background}}">
<view class="describe-occupy row align-c">
<view class="describe-occupy row ac">
<text>{{info.name}}</text>
<image src="/image/icon/share-3.png" bindtap="onShare"></image>
</view>
......@@ -33,12 +33,12 @@
<view class="iphonexr-fill" style="{{info.background}}"></view>
</view>
<view class="container-share row con-c align-c" hidden="{{!showPopup}}">
<view class="col con-c">
<view class="container-share row cc ac" hidden="{{!showPopup}}">
<view class="column cc">
<view class="share-content">
<image src="{{popupImage}}"></image>
</view>
<view class="share-operation row con-b align-c">
<view class="share-operation row cb ac">
<button bindtap="onCancel">取消</button>
<button bindtap="onDownload">下载图片</button>
</view>
......
pages/play/service-sell/service-sell.wxml
......@@ -23,7 +23,7 @@
<view class="service-name">
<text>{{serviceInfo.name}}</text>
</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">
<image src="/image/icon/g-time.png"></image>
</view>
......@@ -34,14 +34,14 @@
<text>{{serviceInfo.time}}</text>
</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">
<image src="/image/icon/g-location.png"></image>
</view>
<view class="time-address-title">
<text>地址</text>
</view>
<view class="time-address row con-b">
<view class="time-address row cb">
<text>{{serviceInfo.address}}</text>
<image class="service-icon" src="imageBase + 'icon/arrow-r-1.png'"></image>
</view>
......@@ -50,7 +50,7 @@
<view class="service-content">
<text>{{serviceInfo.content}}</text>
</view>
<view class="footer-wrapper row align-c">
<view class="footer-wrapper row ac">
<!-- 活动价样式 -->
<block wx:if="{{serviceInfo.priceType === 1}}">
......
pages/play/strategy-detail/strategy-detail.wxml
......@@ -15,7 +15,7 @@
</view>
</view>
<view class="detail column con-c">
<view class="detail column cc">
<view class="detail-title">
<text>{{title}}</text>
</view>
......@@ -31,14 +31,14 @@
<text>文中提及</text>
</view>
<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>
<view class="relation-item-info col">
<view class="relation-item-info column">
<text>{{item.title}}</text>
<text>{{item.time}}</text>
<text>{{item.price}}</text>
</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>
</view>
</view>
......
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