全局样式调整

38a175ad · 严立 · 70336ca8 · 38a175ad · 38a175ad · 70336ca8
Commit 38a175ad authored Dec 10, 2020 by 严立
Showing with 206 additions and 218 deletions
app.wxss
component/coupon-code/coupon-code.wxml
component/theme/reset.wxss
pages/club/create/create.wxml
pages/club/information/information.wxml
pages/club/member/member.wxml
pages/commodity/project-detail/project-detail.js
pages/login/login.wxml
pages/mall/exchange-record/exchange-record.wxml
pages/mall/exchange-state/exchange-state.wxml
pages/mall/exchange-submit/exchange-submit.wxml
pages/mall/goods/goods.wxml
pages/mall/home/home.wxml
pages/mine/accumulate/accumulate.wxml
pages/mine/address-list/address-list.wxml
pages/mine/address-operate/address-operate.wxml
pages/mine/appointment-detail/appointment-detail.wxml
pages/mine/club-manage/club-manage.wxml
pages/mine/club/club.wxml
pages/mine/question-more/question-more.wxml
--- a/app.wxss
+++ b/app.wxss
@@ -3,7 +3,6 @@
 @import '/wxss/samcss-theme.wxss';
 /* s3组件样式 */
-@import './component/theme/reset.wxss';
 @import './component/theme/layout.wxss';
 @import './component/theme/theme.wxss';

--- a/component/coupon-code/coupon-code.wxml
+++ b/component/coupon-code/coupon-code.wxml
 <view class="coupon_code_container column cc ac" hidden="{{!viewCouponCode}}">
-    <text class="font_normal_30 color_submit">{{usableCouponCodeTotal + '商品可用'}}</text>
+    <text class="fs30 fw400 c90">{{usableCouponCodeTotal + '商品可用'}}</text>
-    <text class="coupon_code_tip font_normal_26 color_submit">{{'请将券码出示给门店核销人员'}}</text>
+    <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">
@@ -8,27 +8,27 @@
                <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="font_normal_30 color_regular">{{item.couponName}}</text>
+                <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">
                    <block wx:if="{{item.couponState === 1}}">
-                        <text class="font_bold_26 color_secondary">券码</text>
+                        <text class="fs22 fw700 c31">券码</text>
-                        <text class="font_bold_30 color_regular">{{item.couponNumber}}</text>
+                        <text class="fs30 fw700 c01">{{item.couponNumber}}</text>
-                        <text class="font_bold_26 color_primary" bindtap="onCouponCodeCopy">复制</text>
+                        <text class="fs22 fw700 c30" bindtap="onCouponCodeCopy">复制</text>
                    </block>
                    <block wx:if="{{item.couponState === 2}}">
-                        <text class="font_bold_26 color_secondary">券码</text>
+                        <text class="fs22 fw700 c31">券码</text>
-                        <text class="font_bold_30 color_secondary text_decoration_delete" wx:if="{{item.couponState === 2}}">{{item.couponNumber}}</text>
+                        <text class="fs30 fw700 c31 text_decoration_delete" wx:if="{{item.couponState === 2}}">{{item.couponNumber}}</text>
-                        <text class="font_bold_26 color_primary" space="nbsp">　　</text>
+                        <text class="fs22 fw700 c30" space="nbsp">　　</text>
                    </block>
                </view>
            </view>
        </swiper-item>
    </swiper>
    <view class="coupon_code_indicator row ac">
-        <text class="font_normal_34 color_submit">{{couponCodeActiveIndex}}</text>
+        <text class="fs34 fw400 c90">{{couponCodeActiveIndex}}</text>
-        <text class="font_normal_26 color_secondary" space="nbsp"> / </text>
+        <text class="fs26 fw400 c31" space="nbsp"> / </text>
-        <text class="coupon_code_indicator_child3 font_normal_26 color_secondary">{{couponCodeList.length}}</text>
+        <text class="coupon_code_indicator_child3 fs26 fw400 c31">{{couponCodeList.length}}</text>
    </view>
    <image class="coupon_code_close" src="./image/close.png" bindtap="onCouponCodeClose"></image>
 </view>
\ No newline at end of file
--- a/component/theme/reset.wxss
+++ b/component/theme/reset.wxss
-view,
-text,
-input,
-image,
-canvas,
-button,
-picker,
-picker-view,
-scroll-view,
-textarea {
-    margin: 0;
-    padding: 0;
-    box-sizing: border-box;
-}
-button::after {
-    border: none;
-}
\ No newline at end of file
--- a/pages/club/create/create.wxml
+++ b/pages/club/create/create.wxml
@@ -56,6 +56,6 @@
    </view>
    <view class="operation row cc ac">
-        <button class="row cc ac font_bold_30 color_submit" bindtap="onEstablish">提交申请</button>
+        <button class="row cc ac fs30 fw700 c90" bindtap="onEstablish">提交申请</button>
    </view>
 </view>
\ No newline at end of file
--- a/pages/club/information/information.wxml
+++ b/pages/club/information/information.wxml
@@ -47,14 +47,14 @@
                                <block wx:if="{{item.priceType === 1}}">
                                    <text class="discount-mark">活动价</text>
                                    <text>{{item.priceDiscountText === '0.00' ? '免费' : '¥ ' + item.priceDiscountText}}</text>
-                                    <text class="text-delete">{{item.priceText === '0.00' ? '免费' : '￥' + item.priceText}}</text>
+                                    <text class="text_decoration_delete">{{item.priceText === '0.00' ? '免费' : '￥' + item.priceText}}</text>
                                </block>
                                <!-- 业主价 -->
                                <block wx:if="{{item.priceType === 2}}">
                                    <text class="owner-mark">业主价</text>
                                    <text>{{item.priceSpecialText === '0.00' ? '免费' : '￥' + item.priceSpecialText}}</text>
-                                    <text class="text-delete">{{item.priceText === '0.00' ? '免费' : '￥' + item.priceText}}</text>
+                                    <text class="text_decoration_delete">{{item.priceText === '0.00' ? '免费' : '￥' + item.priceText}}</text>
                                </block>
                                <!-- 普通价 -->

--- a/pages/club/member/member.wxml
+++ b/pages/club/member/member.wxml
@@ -5,9 +5,9 @@
    <view class="club-info col cc ac">
        <image class="club-info-logo" src="{{clubInfo.logo}}"></image>    
        <view class="column cc ac">
-            <text class="club_info_name title font_bold_34 color_regular overflow_point_1">{{clubInfo.name}}</text>
+            <text class="club_info_name title fs34 fw700 c01 overflow_point_1">{{clubInfo.name}}</text>
            <text class="club_info_type owner-mark" wx:if="{{clubInfo.isOwner}}">业主专享</text>
-            <text class="club_info_member font_normal_22 color_secondary">{{clubInfo.member + ' 成员'}}</text>
+            <text class="club_info_member fs22 fw400 c31">{{clubInfo.member + ' 成员'}}</text>
        </view>
    </view>

--- a/pages/commodity/project-detail/project-detail.js
+++ b/pages/commodity/project-detail/project-detail.js
@@ -317,7 +317,7 @@ Page({
    onBuy: function (event) {
        // 测试
        // 正式环境临时隐藏儿童营地
-        if (this.data.shopInfo.appId === 3) return
+        // if (this.data.shopInfo.appId === 3) return
        if (this.data.shopInfo.appId === 7) {
            this.onCommodityDetail(event)

--- a/pages/login/login.wxml
+++ b/pages/login/login.wxml
@@ -11,12 +11,12 @@
    <view class="login-operation">
        <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="font_normal_30">已授权</text>
+            <text class="fs30 fw400">已授权</text>
            <image class="icon_32" 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="font_normal_30">已绑定手机号</text>
+            <text class="fs30 fw400">已绑定手机号</text>
            <image class="icon_32" src="../../image/icon/tick-3.png"></image>
        </view>
    </view>

--- a/pages/mall/exchange-record/exchange-record.wxml
+++ b/pages/mall/exchange-record/exchange-record.wxml
@@ -8,19 +8,19 @@
            <!-- 待发货 -->
            <view class="record_item column" wx:if="{{item.state === 1}}" data-item="{{item}}" bindtap="onRecordDetail">
                <view class="row cb ac">
-                    <text class="font_normal_26 color_secondary">{{'下单时间：' + item.timeCreate}}</text>
+                    <text class="fs26 fw400 c31">{{'下单时间：' + item.timeCreate}}</text>
-                    <text class="font_normal_26 color_warning">待发货</text>
+                    <text class="fs26 fw400 c10">待发货</text>
                </view>
                <view class="record_item_info row ac">
                    <view class="record_item_info_cover">
                        <image src="{{item.cover}}"></image>
                    </view>
                    <view class="record_item_info_name row ac">
-                        <text class="font_bold_30 color_regular">{{item.name}}</text>
+                        <text class="fs30 fw700 c01">{{item.name}}</text>
                    </view>
                    <view class="record_item_info_price column ce ae">
-                        <text class="font_bold_30 color_regular">{{item.price + ' 积分'}}</text>
+                        <text class="fs30 fw700 c01">{{item.price + ' 积分'}}</text>
-                        <text class="font_normal_26 color_secondary">{{'x' + item.quantity}}</text>
+                        <text class="fs26 fw400 c31">{{'x' + item.quantity}}</text>
                    </view>
                </view>
                <view class="record_item_operation row ce ac">
@@ -31,19 +31,19 @@
            <!-- 邮寄独有 - 待收货 -->
            <view class="record_item column" wx:if="{{item.state === 5}}" data-item="{{item}}" bindtap="onRecordDetail">
                <view class="row cb ac">
-                    <text class="font_normal_26 color_secondary">{{'下单时间：' + item.timeCreate}}</text>
+                    <text class="fs26 fw400 c31">{{'下单时间：' + item.timeCreate}}</text>
-                    <text class="font_normal_26 color_warning">已发货</text>
+                    <text class="fs26 fw400 c10">已发货</text>
                </view>
                <view class="record_item_info row ac">
                    <view class="record_item_info_cover">
                        <image src="{{item.cover}}"></image>
                    </view>
                    <view class="record_item_info_name row ac">
-                        <text class="font_bold_30 color_regular">{{item.name}}</text>
+                        <text class="fs30 fw700 c01">{{item.name}}</text>
                    </view>
                    <view class="record_item_info_price column ce ae">
-                        <text class="font_bold_30 color_regular">{{item.price + ' 积分'}}</text>
+                        <text class="fs30 fw700 c01">{{item.price + ' 积分'}}</text>
-                        <text class="font_normal_26 color_secondary">{{'x' + item.quantity}}</text>
+                        <text class="fs26 fw400 c31">{{'x' + item.quantity}}</text>
                    </view>
                </view>
                <view class="record_item_operation row ce ac">
@@ -54,19 +54,19 @@
            <!-- 自取独有 - 待使用 -->
            <view class="record_item column" wx:if="{{item.state === 2}}" data-item="{{item}}" bindtap="onRecordDetail">
                <view class="row cb ac">
-                    <text class="font_normal_26 color_secondary">{{'下单时间：' + item.timeCreate}}</text>
+                    <text class="fs26 fw400 c31">{{'下单时间：' + item.timeCreate}}</text>
-                    <text class="font_normal_26 color_warning">待使用</text>
+                    <text class="fs26 fw400 c10">待使用</text>
                </view>
                <view class="record_item_info row ac">
                    <view class="record_item_info_cover">
                        <image src="{{item.cover}}"></image>
                    </view>
                    <view class="record_item_info_name row ac">
-                        <text class="font_bold_30 color_regular">{{item.name}}</text>
+                        <text class="fs30 fw700 c01">{{item.name}}</text>
                    </view>
                    <view class="record_item_info_price column ce ae">
-                        <text class="font_bold_30 color_regular">{{item.price + ' 积分'}}</text>
+                        <text class="fs30 fw700 c01">{{item.price + ' 积分'}}</text>
-                        <text class="font_normal_26 color_secondary">{{'x' + item.quantity}}</text>
+                        <text class="fs26 fw400 c31">{{'x' + item.quantity}}</text>
                    </view>
                </view>
                <view class="record_item_operation row ce ac">
@@ -77,19 +77,19 @@
            <!-- 已完成 -->
            <view class="record_item column" wx:if="{{item.state === 3}}" data-item="{{item}}" bindtap="onRecordDetail">
                <view class="row cb ac">
-                    <text class="font_normal_26 color_secondary">{{'下单时间：' + item.timeCreate}}</text>
+                    <text class="fs26 fw400 c31">{{'下单时间：' + item.timeCreate}}</text>
-                    <text class="font_normal_26 color_secondary">已完成</text>
+                    <text class="fs26 fw400 c31">已完成</text>
                </view>
                <view class="record_item_info row ac">
                    <view class="record_item_info_cover">
                        <image src="{{item.cover}}"></image>
                    </view>
                    <view class="record_item_info_name row ac">
-                        <text class="font_bold_30 color_regular">{{item.name}}</text>
+                        <text class="fs30 fw700 c01">{{item.name}}</text>
                    </view>
                    <view class="record_item_info_price column ce ae">
-                        <text class="font_bold_30 color_regular">{{item.price + ' 积分'}}</text>
+                        <text class="fs30 fw700 c01">{{item.price + ' 积分'}}</text>
-                        <text class="font_normal_26 color_secondary">{{'x' + item.quantity}}</text>
+                        <text class="fs26 fw400 c31">{{'x' + item.quantity}}</text>
                    </view>
                </view>
                <view class="record_item_operation row ce ac">
@@ -100,19 +100,19 @@
            <!-- 已过期 -->
            <view class="record_item column" wx:if="{{item.state === 4}}" data-item="{{item}}" bindtap="onRecordDetail">
                <view class="row cb ac">
-                    <text class="font_normal_26 color_secondary">{{'下单时间：' + item.timeCreate}}</text>
+                    <text class="fs26 fw400 c31">{{'下单时间：' + item.timeCreate}}</text>
-                    <text class="font_normal_26 color_secondary">已过期</text>
+                    <text class="fs26 fw400 c31">已过期</text>
                </view>
                <view class="record_item_info row ac">
                    <view class="record_item_info_cover">
                        <image src="{{item.cover}}"></image>
                    </view>
                    <view class="record_item_info_name row ac">
-                        <text class="font_bold_30 color_regular">{{item.name}}</text>
+                        <text class="fs30 fw700 c01">{{item.name}}</text>
                    </view>
                    <view class="record_item_info_price column ce ae">
-                        <text class="font_bold_30 color_regular">{{item.price + ' 积分'}}</text>
+                        <text class="fs30 fw700 c01">{{item.price + ' 积分'}}</text>
-                        <text class="font_normal_26 color_secondary">{{'x' + item.quantity}}</text>
+                        <text class="fs26 fw400 c31">{{'x' + item.quantity}}</text>
                    </view>
                </view>
                <view class="record_item_operation row ce ac">
@@ -124,8 +124,8 @@
    <view class="record_list_nothing row cc ac" wx:if="{{recordList.length === 0}}">
        <view class="column cc ac">
-            <text class="font_bold_38 color_secondary">暂无兑换记录</text>
+            <text class="fs38 fw700 c31">暂无兑换记录</text>
-            <button class="record_list_nothing_mall row cc ac font_normal_30 color_submit" bindtap="onMallHome">去逛逛</button>
+            <button class="record_list_nothing_mall row cc ac fs30 fw400 c90" bindtap="onMallHome">去逛逛</button>
        </view>
    </view>
 </view>
\ No newline at end of file
--- a/pages/mall/exchange-state/exchange-state.wxml
+++ b/pages/mall/exchange-state/exchange-state.wxml
@@ -5,13 +5,13 @@
 <view class="container" wx:if="{{isViewDataReady}}">
    <!-- 订单状态 -->
    <view class="state column cc" style="{{stateCss}}" wx:if="{{(isExpress && state !== 2) || state === 3 || state === 4}}">
-        <text class="font_bold_54 color_regular">{{stateTitle}}</text>
+        <text class="fs54 fw700 c01">{{stateTitle}}</text>
        <view class="state_tip row ac" wx:if="{{state === 4}}">
-            <text class="font_normal_26 color_regular">{{'有效期：' + otherInfo.timeExpire}}</text>
+            <text class="fs26 fw400 c01">{{'有效期：' + otherInfo.timeExpire}}</text>
        </view>
        <view class="state_tip row ac" wx:if="{{state === 5}}">
-            <text class="font_normal_26 color_regular">{{'物流单号：' + otherInfo.expressNumber}}</text>
+            <text class="fs26 fw400 c01">{{'物流单号：' + otherInfo.expressNumber}}</text>
-            <text class="font_bolder_26 color_regular" space="nbsp" bindtap="onCopyExpressNumber"> 复制</text>
+            <text class="fs26 fw900 c01" space="nbsp" bindtap="onCopyExpressNumber"> 复制</text>
        </view>
    </view>
@@ -20,12 +20,12 @@
        <!-- 快递提示 -->
        <view class="express_tip row ac" wx:if="{{state !== 3}}">
            <image class="icon_32" src="{{imageBase + 'icon/warning-4.png'}}"></image>
-            <text class="font_normal_22 color_tip">快递运费自理，顺丰到付，12-23元不等</text>
+            <text class="fs22 fw400 c20">快递运费自理，顺丰到付，12-23元不等</text>
        </view>
        <!-- 收货信息 -->
        <view class="address_info">
-            <text class="font_bold_34 color_regular">收货信息</text>
+            <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>
                <!-- 等待添加地址 -->
@@ -54,7 +54,7 @@
        <!-- 兑换商品 - 寄送样式 -->
        <view class="goods">
-            <text class="font_bold_34 color_regular">兑换商品</text>
+            <text class="fs34 fw700 c01">兑换商品</text>
            <view class="goods_list">
                <block wx:for="{{goodsInfo}}" wx:for-index="index" wx:for-item="item" wx:key="index">
                    <view class="goods_item row ac">
@@ -62,15 +62,15 @@
                            <image src="{{item.cover}}"></image>
                        </view>
                        <view class="goods_item_info column">
-                            <text class="font_bold_26 color_regular">{{item.name}}</text>
+                            <text class="fs22 fw700 c01">{{item.name}}</text>
                        </view>
                        <view class="column ae">
                            <view class="row ce ac">
-                                <text class="font_normal_26 color_warning">{{item.price}}</text>
+                                <text class="fs26 fw400 c10">{{item.price}}</text>
-                                <text class="font_normal_26 color_regular" space="nbsp"> 积分</text>
+                                <text class="fs26 fw400 c01" space="nbsp"> 积分</text>
                            </view>
                            <view class="row">
-                                <text class="font_normal_26 color_secondary">{{'x' + item.quantity}}</text>
+                                <text class="fs26 fw400 c31">{{'x' + item.quantity}}</text>
                            </view>
                        </view>
                    </view>
@@ -86,44 +86,44 @@
            <image class="coupon_seal" src="{{resourcesBase + couponInfo.shopSeal}}"></image>
            <view class="coupon_info column">
                <view class="coupon_info_shop row ac">
-                    <text class="font_normal_26 color_secondary">使用门店</text>
+                    <text class="fs26 fw400 c31">使用门店</text>
-                    <text class="font_bold_38 color_regular">{{couponInfo.shopName}}</text>
+                    <text class="fs38 fw700 c01">{{couponInfo.shopName}}</text>
                </view>
                <view class="coupon_info_date row ac">
                    <text></text>
-                    <text class="font_normal_30 color_regular">{{couponInfo.shopTime}}</text>
+                    <text class="fs30 fw400 c01">{{couponInfo.shopTime}}</text>
                </view>
                <view class="coupon_info_name row ac">
-                    <text class="font_normal_26 color_secondary">订单信息</text>
+                    <text class="fs26 fw400 c31">订单信息</text>
-                    <text class="font_normal_26 color_regular">{{couponInfo.userName}}</text>
+                    <text class="fs26 fw400 c01">{{couponInfo.userName}}</text>
                </view>
                <view class="coupon_info_phone row ac">
                    <text></text>
-                    <text class="font_normal_26 color_regular">{{couponInfo.userPhone}}</text>
+                    <text class="fs26 fw400 c01">{{couponInfo.userPhone}}</text>
                </view>
            </view>
            <view class="coupon_code" wx:if="{{state !== 3 && state !== 4}}">
                <view class="coupon_code_point_left"></view>
                <view class="coupon_code_point_right"></view>
                <view class="coupon_code_name row cc ac">
-                    <text class="font_bold_34 color_regular">{{goodsInfo.length + '张兑换券可用'}}</text>
+                    <text class="fs34 fw700 c01">{{goodsInfo.length + '张兑换券可用'}}</text>
                </view>
                <view class="coupon_code_scan">
-                    <button class="row cc ac font_normal_30 color_submit" bindtap="onCouponCodeScan">一键扫码</button>
+                    <button class="row cc ac fs30 fw400 c90" bindtap="onCouponCodeScan">一键扫码</button>
                </view>
                <view class="coupon_code_date row cc ac">
-                    <text class="font_normal_26 color_secondary">{{'有效期' + otherInfo.timeExpire}}</text>
+                    <text class="fs26 fw400 c31">{{'有效期' + otherInfo.timeExpire}}</text>
                </view>
            </view>
            <view class="notice row ce ac"  wx:if="{{state !== 3 && state !== 4}}" bindtap="onGoodsNotes">
-                <text class="font_normal_30 color_secondary">使用须知</text>
+                <text class="fs30 fw400 c31">使用须知</text>
                <image class="icon_32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
            </view>
        </view>
        <!-- 兑换商品 - 自取样式 -->
        <view class="goods">
-            <text class="font_bold_34 color_regular">兑换商品</text>
+            <text class="fs34 fw700 c01">兑换商品</text>
            <view class="goods_list">
                <block wx:for="{{goodsInfo}}" wx:for-index="index" wx:for-item="item" wx:key="index">
                    <view class="goods_item row ac">
@@ -131,16 +131,16 @@
                            <image src="{{item.cover}}"></image>
                        </view>
                        <view class="goods_item_info column">
-                            <text class="font_bold_26 color_regular">{{item.name}}</text>
+                            <text class="fs22 fw700 c01">{{item.name}}</text>
                            <view class="row ac">
-                                <text class="font_normal_26 color_warning">{{item.price}}</text>
+                                <text class="fs26 fw400 c10">{{item.price}}</text>
-                                <text class="font_normal_26 color_regular" space="nbsp"> 积分</text>
+                                <text class="fs26 fw400 c01" space="nbsp"> 积分</text>
                            </view>
                        </view>
                        <view class="row">
-                            <button class="goods_item_operation_code font_bold_22 color_submit row cc ac" wx:if="{{item.state === 1}}" data-item="{{item}}" catchtap="onCouponCodeScan">查看券码</button>
+                            <button class="goods_item_operation_code fs22 fw700 c90 row cc ac" wx:if="{{item.state === 1}}" data-item="{{item}}" catchtap="onCouponCodeScan">查看券码</button>
-                            <button class="goods_item_operation_used font_bold_22 color_submit row cc ac" wx:if="{{item.state === 2}}" data-item="{{item}}" catchtap="onCouponCodeScan">已使用</button>
+                            <button class="goods_item_operation_used fs22 fw700 c90 row cc ac" wx:if="{{item.state === 2}}" data-item="{{item}}" catchtap="onCouponCodeScan">已使用</button>
-                            <button class="goods_item_operation_used font_bold_22 color_submit row cc ac" wx:if="{{item.state === 4}}" data-item="{{item}}" catchtap="onCouponCodeScan">已过期</button>
+                            <button class="goods_item_operation_used fs22 fw700 c90 row cc ac" wx:if="{{item.state === 4}}" data-item="{{item}}" catchtap="onCouponCodeScan">已过期</button>
                        </view>
                    </view>
                </block>
@@ -150,37 +150,37 @@
    <!-- 兑换积分 -->
    <view class="integral row cb ac">
-        <text class="font_bold_34 color_regular">兑换积分</text>
+        <text class="fs34 fw700 c01">兑换积分</text>
        <view class="row ac">
-            <text class="font_normal_42 color_warning">{{integralTotal}}</text>
+            <text class="fs42 fw400 c10">{{integralTotal}}</text>
-            <text class="font_bold_38 color_regular" space="nbsp"> 积分</text>
+            <text class="fs38 fw700 c01" space="nbsp"> 积分</text>
        </view>
    </view>
    <!-- 其他信息 -->
    <view class="other column">
-        <text class="font_normal_22 color_secondary">{{'订单编号: ' + otherInfo.orderNumber}}</text>
+        <text class="fs22 fw400 c31">{{'订单编号: ' + otherInfo.orderNumber}}</text>
-        <text class="font_normal_22 color_secondary">{{'下单时间: ' + otherInfo.timeCreate}}</text>
+        <text class="fs22 fw400 c31">{{'下单时间: ' + otherInfo.timeCreate}}</text>
        <block wx:if="{{isExpress && (state === 2 || state === 3 || state === 5)}}">
-            <text class="font_normal_22 color_secondary">{{'发货时间：' + otherInfo.timeExpress}}</text>
+            <text class="fs22 fw400 c31">{{'发货时间：' + otherInfo.timeExpress}}</text>
            <view class="row">
-                <text class="font_normal_22 color_secondary">{{'物流单号：' + otherInfo.expressNumber}}</text>
+                <text class="fs22 fw400 c31">{{'物流单号：' + otherInfo.expressNumber}}</text>
-                <text class="font_normal_22 color_primary" space="nbsp" bindtap="onCopyExpressNumber"> 复制</text>
+                <text class="fs22 fw400 c30" space="nbsp" bindtap="onCopyExpressNumber"> 复制</text>
            </view>
        </block>
    </view>
    <!-- 操作按钮 -->
    <view class="operation row ce ac" wx:if="{{state !== 1 && state !== 2}}">
-        <button class="operation_cancel row cc ac font_normal_30 color_cancel" wx:if="{{state === 3 || state === 4}}" bindtap="onDelete">删除订单</button>
+        <button class="operation_cancel row cc ac fs30 fw400 c32" wx:if="{{state === 3 || state === 4}}" bindtap="onDelete">删除订单</button>
-        <button class="operation_submit row cc ac font_normal_30 color_submit" wx:if="{{state === 5}}" bindtap="onConfirm">确认收货</button>
+        <button class="operation_submit row cc ac fs30 fw400 c90" wx:if="{{state === 5}}" bindtap="onConfirm">确认收货</button>
    </view>
 </view>
 <!-- 二维码弹窗 -->
 <view class="dialog_coupon_code row cc ac" wx:if="{{winCouponCode}}">
    <view class="dialog_coupon_code_wrap col cc ac">
-        <text class="font_normal_26 color_submit">{{'请将券码出示给门店核销人员'}}</text>
+        <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">
@@ -188,18 +188,18 @@
                    <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="font_normal_30 color_regular">{{item.name}}</text>
+                    <text class="fs30 fw400 c01">{{item.name}}</text>
                    <image class="dialog_coupon_code_content" src="{{'data:image/png;base64,' + item.codeBase64}}"></image>
                    <view class="dialog_coupon_code_operation row con-b ac">
                        <block wx:if="{{item.state === 1}}">
-                            <text class="font_bold_26 color_secondary">券码</text>
+                            <text class="fs22 fw700 c31">券码</text>
-                            <text class="font_bold_30 color_regular">{{item.codeNumber}}</text>
+                            <text class="fs30 fw700 c01">{{item.codeNumber}}</text>
-                            <text class="font_bold_26 color_primary" bindtap="onCouponCodeCopy">复制</text>
+                            <text class="fs22 fw700 c30" bindtap="onCouponCodeCopy">复制</text>
                        </block>
                        <block wx:if="{{item.state === 2}}">
-                            <text class="font_bold_26 color_secondary">券码</text>
+                            <text class="fs22 fw700 c31">券码</text>
-                            <text class="font_bold_30 color_secondary text_decoration_delete" wx:if="{{item.state === 2}}">{{item.codeNumber}}</text>
+                            <text class="fs30 fw700 c31 text_decoration_delete" wx:if="{{item.state === 2}}">{{item.codeNumber}}</text>
-                            <text class="font_bold_26 color_primary" space="nbsp">　　</text>
+                            <text class="fs22 fw700 c30" space="nbsp">　　</text>
                        </block>
                    </view>
                </view>
@@ -213,7 +213,7 @@
 <m-popup isShow="{{winPopup}}">
    <view class="popup_container column" slot="content">
-        <text class="popup_title font_bold_42 color_regular">使用须知</text>
+        <text class="popup_title fs42 fw700 c01">使用须知</text>
        <view class="popup_content">
            <rich-text nodes="{{goodsNotes}}"></rich-text>
        </view>

--- a/pages/mall/exchange-submit/exchange-submit.wxml
+++ b/pages/mall/exchange-submit/exchange-submit.wxml
@@ -184,7 +184,7 @@
 <m-popup isShow="{{winPopup}}">
    <view class="popup_container column" slot="content">
-        <text class="popup_title font_bold_42 color_regular">兑换须知</text>
+        <text class="popup_title fs42 fw700 c01">兑换须知</text>
        <view class="popup_content">
            <rich-text nodes="{{goodsInfo.notice}}"></rich-text>
        </view>

--- a/pages/mall/goods/goods.wxml
+++ b/pages/mall/goods/goods.wxml
@@ -30,7 +30,7 @@
                <text class="goods_info_price">{{goodsInfo.price}}</text>
                <text class="goods_info_unit">积分</text>
            </view>
-            <text class="font_normal_26 color_secondary" wx:if="{{goodsInfo.isExpress}}">不含运费</text>
+            <text class="fs26 fw400 c31" wx:if="{{goodsInfo.isExpress}}">不含运费</text>
        </view>
        <view class="operation">
            <button class="row cc ac" bindtap="onExchange">去兑换</button>

--- a/pages/mall/home/home.wxml
+++ b/pages/mall/home/home.wxml
@@ -34,8 +34,8 @@
                                <image src="{{item.cover}}" mode="aspectFill"></image>
                                <text class="recommend_item_info_name overflow_point_1">{{item.name}}</text>
                                <view class="recommend_item_info_price row ac">
-                                    <text class="font_bold_26">{{item.price}}</text>
+                                    <text class="fs22 fw700">{{item.price}}</text>
-                                    <text class="font_normal_22 color_regular">积分</text>
+                                    <text class="fs22 fw400 c01">积分</text>
                                </view>
                            </view>
                        </view>
@@ -57,8 +57,8 @@
                                <image src="{{item.cover}}" mode="aspectFill"></image>
                                <text class="recommend_item_info_name overflow_point_1">{{item.name}}</text>
                                <view class="recommend_item_info_price row ac">
-                                    <text class="font_bold_26">{{item.price}}</text>
+                                    <text class="fs22 fw700">{{item.price}}</text>
-                                    <text class="font_normal_22 color_regular">积分</text>
+                                    <text class="fs22 fw400 c01">积分</text>
                                </view>
                            </view>
                        </view>
@@ -98,8 +98,8 @@
                                <text>{{item.name}}</text>
                            </view>
                            <view class="routine_item_info_price row ac">
-                                <text class="font_bold_30">{{item.price}}</text>
+                                <text class="fs30 fw700">{{item.price}}</text>
-                                <text class="font_normal_26 color_regular">积分</text>
+                                <text class="fs26 fw400 c01">积分</text>
                            </view>
                            <view class="routine_item_info_exchange row ac">
                                <text>{{'已兑' + item.exchangeQuantity + '件'}}</text>
@@ -109,7 +109,7 @@
                </block>
            </view>
            <view class="routine_list_nothing row cc ac" wx:if="{{recommendList['0'].length === 0 && recommendList['1'].length === 0 || goodsAllList.length === 0}}">
-                <text class="font_bold_38 color_secondary">暂无商品</text>
+                <text class="fs38 fw700 c31">暂无商品</text>
            </view>
        </view>
    </view>

--- a/pages/mine/accumulate/accumulate.wxml
+++ b/pages/mine/accumulate/accumulate.wxml
@@ -34,7 +34,7 @@
                            <text>{{item.recordDate}}</text>
                        </view>
                    </view>
-                    <view class="accumulate-right font_normal_30 {{item.isExchange ? 'color_regular' : 'color_warning'}}">
+                    <view class="accumulate-right fs30 fw400 {{item.isExchange ? 'c01' : 'c10'}}">
                        <text>{{item.isExchange ? '- ' + item.integral : '+ ' + item.integral}}</text>
                    </view>
                </view>

--- a/pages/mine/address-list/address-list.wxml
+++ b/pages/mine/address-list/address-list.wxml
@@ -7,14 +7,14 @@
            <view class="address_item row ac cb" data-item="{{item}}" bindtap="onSetCurrentAddress">
                <view class="address_item_info">
                    <view class="row ac">
-                        <text class="address_item_info_name font_bold_30 color_regular">{{item.name}}</text>
+                        <text class="address_item_info_name fs30 fw700 c01">{{item.name}}</text>
-                        <text class="address_item_info_phone font_normal_26 color_secondary">{{item.phone}}</text>
+                        <text class="address_item_info_phone fs26 fw400 c31">{{item.phone}}</text>
                        <view class="address_item_info_tag row cc ac" wx:if="{{item.isDefault}}">
-                            <text class="font_bold_18 color_submit">默认</text>
+                            <text class="fs18 fw700 c90">默认</text>
                        </view>
                    </view>
                    <view class="address_item_info_address">
-                        <text class="font_normal_26 color_regular">{{item.area + item.address}}</text>
+                        <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>

--- a/pages/mine/address-operate/address-operate.wxml
+++ b/pages/mine/address-operate/address-operate.wxml
@@ -74,6 +74,6 @@
        </view>
    </view>
-    <button class="address_info_save row cc ac font_bold_30 color_submit" bindtap="onSaveAddress">保存</button>
+    <button class="address_info_save row cc ac fs30 fw700 c90" bindtap="onSaveAddress">保存</button>
-    <button wx:if="{{addressInfo.id}}" class="address_info_delete row cc ac font_bold_30 color_warning" bindtap="onDeleteAddress">删除收货地址</button>
+    <button wx:if="{{addressInfo.id}}" class="address_info_delete row cc ac fs30 fw700 c10" bindtap="onDeleteAddress">删除收货地址</button>
 </view>
\ No newline at end of file
--- a/pages/mine/appointment-detail/appointment-detail.wxml
+++ b/pages/mine/appointment-detail/appointment-detail.wxml
@@ -294,7 +294,7 @@
 <!-- 活动须知 -->
 <m-popup isShow="{{winInstructions}}">
    <view class="popup_container column" slot="content">
-        <text class="popup_title font_bold_42 color_regular">活动须知</text>
+        <text class="popup_title fs42 fw700 c01">活动须知</text>
        <view class="popup_content">
            <rich-text nodes="{{orderInfo.instructions}}"></rich-text>
        </view>

--- a/pages/mine/club-manage/club-manage.wxml
+++ b/pages/mine/club-manage/club-manage.wxml
@@ -78,24 +78,24 @@
        <text class="win_member_info_phone">{{memberInfo.phone}}</text>
        <view class="win_member_info_other column">
            <view class="row">
-                <text class="font_normal_30 color_secondary">微信昵称</text>
+                <text class="fs30 fw400 c31">微信昵称</text>
-                <text class="overflow_point_2 font_normal_30 color_regular">{{memberInfo.nickname}}</text>
+                <text class="overflow_point_2 fs30 fw400 c01">{{memberInfo.nickname}}</text>
            </view>
            <view class="row">
-                <text class="font_normal_30 color_secondary">备注</text>
+                <text class="fs30 fw400 c31">备注</text>
-                <text class="overflow_point_2 font_normal_30 color_regular">{{memberInfo.remarks}}</text>
+                <text class="overflow_point_2 fs30 fw400 c01">{{memberInfo.remarks}}</text>
            </view>
            <view class="row">
-                <text class="font_normal_30 color_secondary">加入时间</text>
+                <text class="fs30 fw400 c31">加入时间</text>
-                <text class="overflow_point_2 font_normal_30 color_regular">{{memberInfo.date}}</text>
+                <text class="overflow_point_2 fs30 fw400 c01">{{memberInfo.date}}</text>
            </view>
            <view class="row" wx:if="{{memberInfo.state === 2}}">
-                <text class="font_normal_30 color_secondary">拒绝原因</text>
+                <text class="fs30 fw400 c31">拒绝原因</text>
-                <text class="overflow_point_2 font_normal_30 color_regular">{{memberInfo.refuse}}</text>
+                <text class="overflow_point_2 fs30 fw400 c01">{{memberInfo.refuse}}</text>
            </view>
            <view class="row">
-                <text class="font_normal_30 color_secondary">审核人</text>
+                <text class="fs30 fw400 c31">审核人</text>
-                <text class="overflow_point_2 font_normal_30 color_regular">{{memberInfo.auditor}}</text>
+                <text class="overflow_point_2 fs30 fw400 c01">{{memberInfo.auditor}}</text>
            </view>
        </view>
    </view>

--- a/pages/mine/club/club.wxml
+++ b/pages/mine/club/club.wxml
@@ -12,7 +12,7 @@
        <view slot="{{'segmentItem' + index}}">
            <text>{{item.text}}</text>
            <view class="segment_item_quantity row cc ac" wx:if="{{segmentItem[index].quantity > 0}}">
-                <text class="font_normal_22 color_submit">{{segmentItem[index].quantity}}</text>
+                <text class="fs22 fw400 c90">{{segmentItem[index].quantity}}</text>
            </view>
        </view>
    </block>
@@ -149,10 +149,10 @@
 <view class="dialog_container row cc ac" hidden="{{!winExamineTip}}">
    <view class="dialog_examine_tip column ac">
-        <text class="font_bold_50 color_regular">审核说明</text>
+        <text class="fs50 fw700 c01">审核说明</text>
        <view class="dialog_examine_tip_content row">
-            <text class="font_normal_30 color_cancel">{{examineTipContent}}</text>
+            <text class="fs30 fw400 c32">{{examineTipContent}}</text>
        </view>
-        <button class="dialog_examine_operation row cc ac font_bold_30 color_regular" bindtap="onDialogClose">我知道了</button>
+        <button class="dialog_examine_operation row cc ac fs30 fw700 c01" bindtap="onDialogClose">我知道了</button>
    </view>
 </view>
\ No newline at end of file
--- a/pages/mine/question-more/question-more.wxml
+++ b/pages/mine/question-more/question-more.wxml
@@ -5,19 +5,19 @@
            <view class="question_class_title_icon row cc ac">
                <image src="./image/bag.png"></image>
            </view>
-            <text class="font_bold_42 color_regular">入住问题</text>
+            <text class="fs42 fw700 c01">入住问题</text>
        </view>
        <view class="question_list">
            <block wx:for="{{accommodationQuestionList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
                <view class="question_item column" data-index="{{index}}" bindtap="onShowMoreAccommodation">
                    <view class="row cb ac">
-                        <text class="font_normal_18">●</text>
+                        <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>
                    </view>
                    <view class="question_item_content row" hidden="{{!item.isShowMore}}">
-                        <text class="font_normal_30 color_secondary">{{item.content}}</text>
+                        <text class="fs30 fw400 c31">{{item.content}}</text>
                    </view>
                </view>
            </block>
@@ -29,19 +29,19 @@
            <view class="question_class_title_icon row cc ac">
                <image src="./image/ticket.png"></image>
            </view>
-            <text class="font_bold_42 color_regular">门票问题</text>
+            <text class="fs42 fw700 c01">门票问题</text>
        </view>
        <view class="question_list">
            <block wx:for="{{ticketQuestionList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
                <view class="question_item column" data-index="{{index}}" bindtap="onShowMoreTicket">
                    <view class="row cb ac">
-                        <text class="font_normal_18">●</text>
+                        <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>
                    </view>
                    <view class="question_item_content row" hidden="{{!item.isShowMore}}">
-                        <text class="font_normal_30 color_secondary">{{item.content}}</text>
+                        <text class="fs30 fw400 c31">{{item.content}}</text>
                    </view>
                </view>
            </block>
@@ -53,19 +53,19 @@
            <view class="question_class_title_icon row cc ac">
                <image src="./image/service.png"></image>
            </view>
-            <text class="font_bold_42 color_regular">服务问题</text>
+            <text class="fs42 fw700 c01">服务问题</text>
        </view>
        <view class="question_list">
            <block wx:for="{{serviceQuestionList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
                <view class="question_item column" data-index="{{index}}" bindtap="onShowMoreService">
                    <view class="row cb ac">
-                        <text class="font_normal_18">●</text>
+                        <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>
                    </view>
                    <view class="question_item_content row" hidden="{{!item.isShowMore}}">
-                        <text class="font_normal_30 color_secondary">{{item.content}}</text>
+                        <text class="fs30 fw400 c31">{{item.content}}</text>
                    </view>
                </view>
            </block>

--- a/pages/mine/question/question.wxml
+++ b/pages/mine/question/question.wxml
@@ -5,9 +5,9 @@
    <image class="banner-img" src="{{resourcesBase + 'bgi/bgi-80.jpg'}}"></image>
    <view class="question_title row cb ac">
-        <text class="font_bold_42 color_regular">常见问题</text>
+        <text class="fs42 fw700 c01">常见问题</text>
        <view class="question_more row ac" bindtap="onMoreQuestion">
-            <text class="font_normal_26 color_regular">更多问题</text>
+            <text class="fs26 fw400 c01">更多问题</text>
            <image class="icon_32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
        </view>
    </view>
@@ -16,13 +16,13 @@
        <block wx:for="{{questionList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
            <view class="question_item column" data-index="{{index}}" bindtap="onShowMore">
                <view class="row cb ac">
-                    <text class="font_normal_18">●</text>
+                    <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>
                </view>
                <view class="question_item_content row" hidden="{{!item.isShowMore}}">
-                    <text class="font_normal_30 color_secondary">{{item.content}}</text>
+                    <text class="fs30 fw400 c31">{{item.content}}</text>
                </view>
            </view>
        </block>
@@ -31,15 +31,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>
-            <text class="font_normal_22 color_secondary">客服热线</text>
+            <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>
-            <text class="font_normal_22 color_secondary">客服微信</text>
+            <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>
-            <text class="font_normal_22 color_secondary">填写反馈</text>
+            <text class="fs22 fw400 c31">填写反馈</text>
        </view>
    </view>
 </view>
@@ -57,7 +57,7 @@
        >
        </m-textarea>
        <button class="feedback_submit row cc ac" bindtap="onFeedbackSubmit">
-            <text class="font_normal_30 color_submit">提交反馈</text>
+            <text class="fs30 fw400 c90">提交反馈</text>
        </button>
    </view>
 </view>

--- a/pages/pay/order-detail/order-detail.wxml
+++ b/pages/pay/order-detail/order-detail.wxml
@@ -297,7 +297,7 @@
 <m-popup isShow="{{winInstructions}}">
    <view class="popup_container column" slot="content">
-        <text class="popup_title font_bold_42 color_regular">使用须知</text>
+        <text class="popup_title fs42 fw700 c01">使用须知</text>
        <view class="popup_content">
            <rich-text nodes="{{orderInfo.instructions}}"></rich-text>
        </view>

--- a/pages/pay/order-input/order-input.wxml
+++ b/pages/pay/order-input/order-input.wxml
@@ -376,7 +376,7 @@
 <!-- 购买须知详情 -->
 <m-popup isShow="{{winNoticeDetail}}">
    <view class="popup_container column" slot="content">
-        <text class="popup_title font_bold_42 color_regular">购买须知</text>
+        <text class="popup_title fs42 fw700 c01">购买须知</text>
        <view class="popup_content">
            <rich-text nodes="{{noticeDetail}}"></rich-text>
        </view>

--- a/pages/play/home/home.wxml
+++ b/pages/play/home/home.wxml
@@ -28,10 +28,10 @@
                <view class="recent_activities_item_wrap">
                    <image class="recent_activities_item_cover" mode="aspectFill" src="{{item.banner}}"></image>
                    <view class="recent_activities_item_name row ac">
-                        <text class="font_bold_42 color_regular overflow_point_2">{{item.name}}</text>
+                        <text class="fs42 fw700 c01 overflow_point_2">{{item.name}}</text>
                    </view>
                    <view class="recent_activities_item_date row ac">
-                        <text class="recent_activities_item_time font_normal_30 color_cancel">{{item.timeDate + item.timePeriod}}</text>
+                        <text class="recent_activities_item_time fs30 fw400 c32">{{item.timeDate + item.timePeriod}}</text>
                    </view>
                </view>
            </view>
@@ -49,7 +49,7 @@
    <view class="hot_movie">
        <view class="hot_movie_title row cb ac">
            <image src="./image/title-movie.png"></image>
-            <text class="font_normal_26 color_secondary" bindtap="onAllMovie">查看全部</text>
+            <text class="fs26 fw400 c31" bindtap="onAllMovie">查看全部</text>
        </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">

--- a/pages/play/home/home.wxss
+++ b/pages/play/home/home.wxss
@@ -147,9 +147,14 @@
 /* 热映影片 */
 .hot_movie {
+    width: 750rpx;
    margin: 90rpx 0 0 0;
 }
+.hot_movie_title {
+    padding: 0 40rpx;
+}
 .hot_movie_title > image {
    width: 184rpx;
    height: 44rpx;

--- a/pages/play/movie/movie.wxml
+++ b/pages/play/movie/movie.wxml
@@ -94,7 +94,7 @@
                <view class="hitmovie_special_line"></view>
                <view class="hitmovie_special_title_wrap row cb ac">
                    <image class="hitmovie_special_title_ornament" src="./image/star-01.png"></image>
-                    <text class="hitmovie_special_title font_bold_22">{{item.title}}</text>
+                    <text class="hitmovie_special_title fs22 fw700">{{item.title}}</text>
                    <image class="hitmovie_special_title_ornament" src="./image/star-03.png"></image>
                </view>
                <view class="hitmovie_special_line"></view>

--- a/utils/rule/rule-key.js
+++ b/utils/rule/rule-key.js
@@ -94,9 +94,9 @@ let Output = {
    'identity': function (value) {
        let funMessage = ''
        if (value !== '') {
-            let funRegExp = new RegExp('^1(3([0-35-9]\d|4[1-8])|4[14-9]\d|5([0125689]\d|7[1-79])|66\d|7[2-35-8]\d|8\d{2}|9[13589]\d)\d{7}$', 'g')
+            let funcRegExp = new RegExp('^[1-9][0-9]{5}(18|19|20)[0-9]{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)[0-9]{3}[0-9Xx]$', 'g')
-            let funcRegExp = funRegExp.test(value)
+            let funcRegExpResult = funcRegExp.test(value)
-            if (!funcRegExp) {
+            if (!funcRegExpResult) {
                funMessage = '请输入正确的身份证号码'
            }
        } else {

--- a/wxss/samcss-theme.wxss
+++ b/wxss/samcss-theme.wxss
@@ -2,53 +2,51 @@
    text-decoration: line-through;
 }
-.color_primary { color: #5DB5DD; }              /* 主题颜色 */
+.c00 { color: #000000; }
-.color_regular { color: #15191F; }              /* 常规颜色 */
+.c01 { color: #15191F; }
-.color_secondary { color: #959DA9; }            /* 提示颜色 */
+.c10 { color: #E66060; }
-.bgcolor_secondary { background-color: #959DA9; }
+.c20 { color: #837048; }
-.color_warning { color: #E66060; }              /* 警告颜色 */
+.c30 { color: #5DB5DD; }
-.color_tip { color: #837048; }                  /* 提示颜色 */
+.c31 { color: #959DA9; }
-.color_cancel { color: #656E7B; }               /* 取消颜色 */
+.c32 { color: #656E7B; }
-.color_submit { color: #FFFFFF; }               /* 确定颜色 */
+.c40 { color: #86C5E1; }
-.bgcolor_submit { background-color: #FFFFFF; }
+.c90 { color: #FFFFFF; }
-.color_able { color: #86C5E1;}                  /* 可用颜色 */
-.bgcolor_able { background-color: #86C5E1; }
-.color_disable { color: #86C5E1 }               /* 禁用颜色 */
-.bgcolor_disable { background-color: #86C5E1; }
-/* 常规 */
+.cb00 { border-color: #000000; }
-.font_normal_18 { font-size: 18rpx; font-weight: 400; line-height: 26rpx; }
+.cb01 { border-color: #15191F; }
-.font_normal_22 { font-size: 22rpx; font-weight: 400; line-height: 32rpx; }
+.cb10 { border-color: #E66060; }
-.font_normal_26 { font-size: 26rpx; font-weight: 400; line-height: 36rpx; }
+.cb20 { border-color: #837048; }
-.font_normal_30 { font-size: 30rpx; font-weight: 400; line-height: 40rpx; }
+.cb30 { border-color: #5DB5DD; }
-.font_normal_34 { font-size: 34rpx; font-weight: 400; line-height: 48rpx; }
+.cb31 { border-color: #959DA9; }
-.font_normal_38 { font-size: 38rpx; font-weight: 400; line-height: 52rpx; }
+.cb32 { border-color: #656E7B; }
-.font_normal_42 { font-size: 42rpx; font-weight: 400; line-height: 58rpx; }
+.cb40 { border-color: #86C5E1; }
-.font_normal_50 { font-size: 50rpx; font-weight: 400; line-height: 72rpx; }
+.cb90 { border-color: #FFFFFF; }
-.font_normal_54 { font-size: 54rpx; font-weight: 400; line-height: 76rpx; }
-/* 粗体 */
+.cbg00 { background-color: #000000; }
-.font_bold_18 { font-size: 18rpx; font-weight: 700; line-height: 26rpx; }
+.cbg01 { background-color: #15191F; }
-.font_bold_22 { font-size: 22rpx; font-weight: 700; line-height: 32rpx; }
+.cbg10 { background-color: #E66060; }
-.font_bold_26 { font-size: 26rpx; font-weight: 700; line-height: 36rpx; }
+.cbg20 { background-color: #837048; }
-.font_bold_30 { font-size: 30rpx; font-weight: 700; line-height: 40rpx; }
+.cbg30 { background-color: #5DB5DD; }
-.font_bold_34 { font-size: 34rpx; font-weight: 700; line-height: 40rpx; }
+.cbg31 { background-color: #959DA9; }
-.font_bold_38 { font-size: 38rpx; font-weight: 700; line-height: 52rpx; }
+.cbg32 { background-color: #656E7B; }
-.font_bold_42 { font-size: 42rpx; font-weight: 700; line-height: 58rpx; }
+.cbg40 { background-color: #86C5E1; }
-.font_bold_50 { font-size: 50rpx; font-weight: 700; line-height: 72rpx; }
+.cbg90 { background-color: #FFFFFF; }
-.font_bold_54 { font-size: 54rpx; font-weight: 700; line-height: 76rpx; }
-/* 更粗 */
+.fw100 { font-weight: 100; }
-.font_bolder_18 { font-size: 18rpx; font-weight: 900; line-height: 26rpx; }
+.fw200 { font-weight: 200; }
-.font_bolder_22 { font-size: 22rpx; font-weight: 900; line-height: 32rpx; }
+.fw300 { font-weight: 300; }
-.font_bolder_26 { font-size: 26rpx; font-weight: 900; line-height: 36rpx; }
+.fw400 { font-weight: 400; }
-.font_bolder_30 { font-size: 30rpx; font-weight: 900; line-height: 40rpx; }
+.fw500 { font-weight: 500; }
-.font_bolder_34 { font-size: 30rpx; font-weight: 900; line-height: 40rpx; }
+.fw600 { font-weight: 600; }
-.font_bolder_38 { font-size: 38rpx; font-weight: 900; line-height: 52rpx; }
+.fw700 { font-weight: 700; }
-.font_bolder_42 { font-size: 42rpx; font-weight: 900; line-height: 58rpx; }
+.fw800 { font-weight: 800; }
-.font_bolder_50 { font-size: 50rpx; font-weight: 900; line-height: 72rpx; }
-.font_bolder_54 { font-size: 54rpx; font-weight: 900; line-height: 76rpx; }
-.text-delete {
+.fs18 { font-size: 18rpx; line-height: 26rpx; }
-    text-decoration: line-through;
+.fs22 { font-size: 22rpx; line-height: 32rpx; }
-}
+.fs26 { font-size: 26rpx; line-height: 36rpx; }
\ No newline at end of file
+.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