ww--UI修改

e02b54a0 · wjw · af169284 · e02b54a0 · e02b54a0 · e02b54a0
Commit e02b54a0 authored Oct 12, 2020 by wjw
Showing with 160 additions and 86 deletions
component/picker/picker.wxss
image/icon/eyes_close.png
image/icon/eyes_open.png
pages/commodity/menu-art/menu-art.wxss
pages/commodity/menu-food/menu-food.wxss
pages/commodity/menu-snacks/menu-snacks.wxss
pages/commodity/project/project.wxss
pages/commodity/room-appointment/room-appointment.wxml
pages/commodity/room-appointment/room-appointment.wxss
pages/commodity/shopping-cart/shopping-cart.wxss
pages/home/night-appointment/night-appointment.wxml
pages/home/night-appointment/night-appointment.wxss
pages/mine/accumulate/accumulate.wxss
pages/mine/appointment-detail/appointment-detail.wxml
pages/mine/appointment-detail/appointment-detail.wxss
pages/mine/appointment-ticket/appointment-ticket.js
pages/mine/appointment-ticket/appointment-ticket.wxml
pages/mine/appointment/appointment.wxss
pages/mine/home/home.js
pages/mine/home/home.wxml
--- a/component/picker/picker.wxss
+++ b/component/picker/picker.wxss
@@ -56,7 +56,7 @@
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
-	border-bottom: 1px solid #eeeeee;
+	border-bottom: 1rpx solid #eeeeee;
 }
 .picker-header view {
 	height: 100%;

--- a/image/icon/eyes_close.png
+++ b/image/icon/eyes_close.png
--- a/image/icon/eyes_open.png
+++ b/image/icon/eyes_open.png
--- a/pages/commodity/menu-art/menu-art.wxss
+++ b/pages/commodity/menu-art/menu-art.wxss
@@ -246,7 +246,7 @@ page {
 .popup-footer-wrapper {
    margin: 0 40rpx;
    padding: 40rpx 0;
-    border-top: 1px solid #e2e7ef;
+    border-top: 1rpx solid #e2e7ef;
 }
 .popup-price-row {

--- a/pages/commodity/menu-food/menu-food.wxss
+++ b/pages/commodity/menu-food/menu-food.wxss
@@ -261,7 +261,7 @@ page {
 .popup-footer-wrapper {
    margin: 0 40rpx;
    padding: 40rpx 0;
-    border-top: 1px solid #e2e7ef;
+    border-top: 1rpx solid #e2e7ef;
 }
 .popup-price-row {

--- a/pages/commodity/menu-snacks/menu-snacks.wxss
+++ b/pages/commodity/menu-snacks/menu-snacks.wxss
@@ -246,7 +246,7 @@ page {
 .popup-footer-wrapper {
    margin: 0 40rpx;
    padding: 40rpx 0;
-    border-top: 1px solid #e2e7ef;
+    border-top: 1rpx solid #e2e7ef;
 }
 .popup-price-row {

--- a/pages/commodity/project/project.wxss
+++ b/pages/commodity/project/project.wxss
@@ -61,7 +61,7 @@
 .commodity-item {
    padding-bottom: 50rpx;
    margin-top: 50rpx;
-    border-bottom: 0.5px #E2E7EF solid;
+    border-bottom: 1rpx #E2E7EF solid;
 }
 .commodity-item:last-child {

--- a/pages/commodity/room-appointment/room-appointment.wxml
+++ b/pages/commodity/room-appointment/room-appointment.wxml
@@ -4,8 +4,8 @@
 <view class="appointment-complete row con-c align-c" wx:if="{{appointmentComplete}}">
    <view class="appointment-complete-tip">
-        <image src="{{resourcesBase + 'commodity/room-appointment/tip.png'}}"></image>
+        <image src="{{resourcesBase + 'commodity/room-appointment/house-tip.png'}}" bindtap="onAppointmentComplete"></image>
-        <l-button l-class="button" plain="{{true}}" bind:lintap="onAppointmentComplete">我知道了</l-button>
+        <!-- <l-button l-class="button" plain="{{true}}" bind:lintap="onAppointmentComplete">我知道了</l-button> -->
    </view>
 </view>

--- a/pages/commodity/room-appointment/room-appointment.wxss
+++ b/pages/commodity/room-appointment/room-appointment.wxss
@@ -34,7 +34,7 @@
    left: 88rpx;
    width: 432rpx;
    height: 80rpx;
-    border: 1px #15191f solid;
+    border: 1rpx #15191f solid;
    border-radius: 2px;
    color: #15191f;
    background: #fefcf9;
@@ -85,7 +85,7 @@
    height: 80rpx;
    margin-top: 32rpx;
    padding: 0 24rpx;
-    border: 1px #DBDFE5 solid;
+    border: 1rpx #DBDFE5 solid;
    border-radius: 2px;
 }
@@ -167,7 +167,7 @@
    height: 96rpx;
    margin-bottom: 40rpx;
    background: #FFFFFF;
-    border:1px solid #86C5E1;
+    border:1rpx solid #86C5E1;
    border-radius: 2px;
    font-size: 30rpx;
@@ -181,7 +181,7 @@
    height: 96rpx;
    margin-bottom: 40rpx;
    background: #C8E1EC;
-    border: 1px solid #C8E1EC;
+    border: 1rpx solid #C8E1EC;
    border-radius: 2px;
    font-size: 30rpx;

--- a/pages/commodity/shopping-cart/shopping-cart.wxss
+++ b/pages/commodity/shopping-cart/shopping-cart.wxss
@@ -138,7 +138,7 @@
    width: 168rpx;
    height: 48rpx;
    padding: 0 14rpx;
-    border: 1px solid #DBDFE5;
+    border: 1rpx solid #DBDFE5;
    border-radius: 4rpx;
 }
@@ -150,7 +150,7 @@
 .list-item-quantity-operation text {
    width: 54rpx;
    height: 24rpx;
-    border: 1px #DBDFE5 solid;
+    border: 1rpx #DBDFE5 solid;
    border-style: none solid none solid;
    text-align: center;
@@ -209,7 +209,7 @@
    width: 750rpx;
    height: 200rpx;
    padding: 0 40rpx 0rpx 36rpx;
-    border-top: 1px solid #E2E7EF;
+    border-top: 1rpx solid #E2E7EF;
    background: #FFFFFF;
 }
@@ -277,7 +277,7 @@
    font-weight: 600;
    color: #15191f;
    text-align: center;
-    border-bottom: 1px solid #e2e7ef;
+    border-bottom: 1rpx solid #e2e7ef;
 }
 .popup-list {

--- a/pages/home/night-appointment/night-appointment.wxml
+++ b/pages/home/night-appointment/night-appointment.wxml
@@ -4,7 +4,7 @@
 <view class="appointment-complete row con-c align-c" wx:if="{{appointmentComplete}}">
    <view class="appointment-complete-tip">
-        <image src="{{resourcesBase + 'home/night-appointment/tip.png'}}" bindtap="onAppointmentComplete"></image>
+        <image src="{{resourcesBase + 'home/night-appointment/night-tip.png'}}" bindtap="onAppointmentComplete"></image>
    </view>
 </view>

--- a/pages/home/night-appointment/night-appointment.wxss
+++ b/pages/home/night-appointment/night-appointment.wxss
@@ -34,7 +34,7 @@
    left: 88rpx;
    width: 432rpx;
    height: 80rpx;
-    border: 1px #15191f solid;
+    border: 1rpx #15191f solid;
    border-radius: 2px;
    color: #15191f;
    background: #fefcf9;
@@ -85,7 +85,7 @@
    height: 80rpx;
    margin-top: 32rpx;
    padding: 20rpx 24rpx;
-    border: 1px #DBDFE5 solid;
+    border: 1rpx #DBDFE5 solid;
    border-radius: 2px;
 }
@@ -190,7 +190,7 @@
    height: 96rpx;
    margin-bottom: 40rpx;
    background: #FFFFFF;
-    border:1px solid #86C5E1;
+    border: 1rpx solid #86C5E1;
    border-radius: 2px;
    font-size: 30rpx;
@@ -204,7 +204,7 @@
    height: 96rpx;
    margin-bottom: 40rpx;
    background: #C8E1EC;
-    border: 1px solid #C8E1EC;
+    border: 1rpx solid #C8E1EC;
    border-radius: 2px;
    font-size: 30rpx;

--- a/pages/mine/accumulate/accumulate.wxss
+++ b/pages/mine/accumulate/accumulate.wxss
@@ -112,7 +112,7 @@ page {
    height: 120rpx;
    min-height: 120rpx;
    padding: 20rpx 0 18rpx;
-    border-bottom: 1px solid #E2E7EF;
+    border-bottom: 1rpx solid #E2E7EF;
 }
 .accumulate:last-child {

--- a/pages/mine/appointment-detail/appointment-detail.wxml
+++ b/pages/mine/appointment-detail/appointment-detail.wxml
@@ -281,7 +281,7 @@
 </view>
 <!-- 多张 扫码弹窗 -->
-<l-popup show="{{showCodePopup}}" l-class="l-popup-bg">
+<l-popup show="{{showCodePopup}}" l-class="l-popup-bg" animation="{{false}}">
    <view class="scan-code-wrapper col align-c">
        <view class="code-header" wx:if="{{orderInfo.commodityType === 5}}">{{codeList.length}}件餐品可用</view>
        <view class="code-header" wx:if="{{orderInfo.commodityType === 4}}">{{codeList.length}}件商品可用</view>

--- a/pages/mine/appointment-detail/appointment-detail.wxss
+++ b/pages/mine/appointment-detail/appointment-detail.wxss
@@ -194,7 +194,7 @@
 .commodity-item {
    width: 606rpx;
    height: 184rpx;
-    border-bottom: 1px #e2e7ef solid;
+    border-bottom: 0.5px #e2e7ef solid;
 }
 .commodity-item>image {
@@ -424,7 +424,7 @@
    width: 100%;
    padding: 48rpx 32rpx 46rpx;
    background: #F5F6F8;
-    border-bottom: 1px dashed #e2e7ef;
+    border-bottom: 0.5px dashed #e2e7ef;
 }
 .ticket-left {
@@ -697,7 +697,7 @@
 .goods-item {
    margin-bottom: 22rpx;
    padding-bottom: 22rpx;
-    border-bottom: 1px solid #e2e7ef;
+    border-bottom: 0.5px solid #e2e7ef;
 }
 .goods-item:last-child {
@@ -804,7 +804,7 @@
    width: 100%;
    background: #FFFFFF;
    padding: 32rpx 20rpx;
-    border-top: 1px solid #e2e7ef;
+    border-top: 0.5px solid #e2e7ef;
 }
 .delete-btn, .order-btn {

--- a/pages/mine/appointment-ticket/appointment-ticket.js
+++ b/pages/mine/appointment-ticket/appointment-ticket.js
 const App = getApp()
+let logicData = {
+    pageScrollLock: false,
+    pageScrollTimer: 0,
+}
 Page({
    /**
     * 页面的初始数据
@@ -13,7 +19,23 @@ Page({
        time: '',
        tickerInfo: {},
        isDoing: false,
-        isShowCancel: false
+        isShowCancel: false,
+        // 导航栏相关属性
+        navigationStyle: {
+            normal: {
+                backIcon: '/image/back-w.png',
+                color: '#FFFFFF',
+                background: 'rgba(255, 255, 255, 0)'
+            },
+            change: {
+                backIcon: '/image/back.png',
+                color: '#000000',
+                background: 'rgba(255, 255, 255, 1)'
+            },
+            scroll: '100rpx',
+        },
+        navigationScroll: 0,
    },
    showHotline() {
@@ -130,5 +152,20 @@ Page({
            isShowCancel
        })
    },
+    // 滚动屏幕
+    onPageScroll: function (funcEvent) {
+        // 优化滚动事件触发频率
+        if (logicData.pageScrollLock) return
+        logicData.pageScrollLock = true
+        this.setData({
+            navigationScroll: funcEvent.scrollTop
+        })
+        // 恢复滚动事件
+        logicData.pageScrollTimer = setTimeout(function () {
+            logicData.pageScrollLock = false
+            clearTimeout(logicData.pageScrollTimer)
+        }, 10)
+    },
 })
\ No newline at end of file
--- a/pages/mine/appointment-ticket/appointment-ticket.wxml
+++ b/pages/mine/appointment-ticket/appointment-ticket.wxml
-<navigation class="navigation" titleText="预约凭证" color="#FFFFFF" backIcon="/image/back-w.png">
+<navigation class="navigation" titleText="预约凭证" scrollStyle="{{navigationStyle}}" scrollHeight="{{navigationScroll}}">
 </navigation>
 <view>
    <image class="Img" wx:if="{{type == 0}}" src="http://upload.miaomiao-bao.com/f6dfe202008192103225871.jpg"></image>

--- a/pages/mine/appointment/appointment.wxss
+++ b/pages/mine/appointment/appointment.wxss
@@ -4,7 +4,7 @@
    width: 750rpx;
    padding-top: 150rpx;
    /* height: 95rpx; */
-    border-bottom: 1px solid rgb(238, 238, 238);
+    border-bottom: 1rpx solid rgb(238, 238, 238);
    background: -webkit-linear-gradient(rgb(255, 255, 255), rgb(249, 249, 251)); /* Safari 5.1 - 6.0 */
    background: -o-linear-gradient(rgb(255, 255, 255), rgb(249, 249, 251)); /* Opera 11.1 - 12.0 */
    background: -moz-linear-gradient(rgb(255, 255, 255), rgb(249, 249, 251)); /* Firefox 3.6 - 15 */
@@ -241,7 +241,7 @@
    text-align: center;
    line-height: 56rpx;
    border-radius: 4rpx;
-    border: 1px solid #C2C7CF;
+    border: 1rpx solid #C2C7CF;
 }
 .cancel-overtime {
    position: absolute;

--- a/pages/mine/home/home.js
+++ b/pages/mine/home/home.js
@@ -201,6 +201,7 @@ Page({
                        item.smOrderDetailsSlice3 = item.smOrderDetails.slice(0, 3)
                    }
                    item.expireTimeEnd = item.expireTime.length>30?item.expireTime.substr(19):item.expireTime
+                    item.expireTimeEnd = item.expireTimeEnd.replace(/-/g, '.')
                    return item
                })

--- a/pages/mine/home/home.wxml
+++ b/pages/mine/home/home.wxml
@@ -113,7 +113,7 @@
                    </view>
                    <view class="order-activity-icon-wrapper col align-c" data-type="-2" bindtap="goOrderByclass">
                        <view class="order-activity-icon row con-c align-c">
-                            <image src="{{imageResourcesBase+'mine/home/or_movice.png'}}"></image>
+                            <image src="{{imageResourcesBase+'mine/home/or_movie.png'}}"></image>
                            <view class="order-activity-badge {{ goodTypeCountData['-2'] > 9 ? 'badge-widen' : ''}}" wx:if="{{goodTypeCountData['-2'] > 0}}">
                                {{goodTypeCountData['-2'] > 99 ? '···' : goodTypeCountData['-2']}}</view>
                        </view>

--- a/pages/mine/order/order.wxss
+++ b/pages/mine/order/order.wxss
@@ -29,7 +29,7 @@ page {
    width: 200rpx;
    height: 64rpx;
    border-radius: 32rpx;
-    border: 1px solid #e2e7ef;
+    border: 1rpx solid #e2e7ef;
 }
 .order-type text {
@@ -99,7 +99,7 @@ page {
    width: 750rpx;
    height: 112rpx;
    padding: 0 34rpx 1rpx 64rpx;
-    border-bottom: 1px #e2e7ef solid;
+    border-bottom: 1rpx #e2e7ef solid;
 }
 .status-item {
@@ -196,7 +196,7 @@ page {
    width: 120rpx;
    height: 56rpx;
    border-radius: 4rpx;
-    border: 1px solid #c2c7cf;
+    border: 1rpx solid #c2c7cf;
    font-size: 22rpx;
    font-weight: 500;
    line-height: 32rpx;

--- a/pages/mine/question-more/question-more.wxss
+++ b/pages/mine/question-more/question-more.wxss
@@ -35,7 +35,7 @@
 .content-item {
    width: 100%;
    height: auto;
-    border-bottom: 1px solid rgb(247, 246, 247);
+    border-bottom: 1rpx solid rgb(247, 246, 247);
 }
 .circle {

--- a/pages/mine/question/question.wxss
+++ b/pages/mine/question/question.wxss
@@ -12,7 +12,7 @@
    display: flex;
    align-items: center;
    justify-content: space-around;
-    border-top: 1px solid rgb(244, 242, 244);
+    border-top: 1rpx solid rgb(244, 242, 244);
    background-color: white;
 }
@@ -200,7 +200,7 @@
 .content-item {
    width: 100%;
    height: auto;
-    border-bottom: 1px solid rgb(247, 246, 247);
+    border-bottom: 1rpx solid rgb(247, 246, 247);
 }
 /* .circle{

--- a/pages/pay/coupon-detail/coupon-detail.wxss
+++ b/pages/pay/coupon-detail/coupon-detail.wxss
@@ -23,7 +23,7 @@
    color: #15191F;
    font-size: 30rpx;
    line-height: 96rpx;
-    border-bottom: 1px solid #E2E7EF;
+    border-bottom: 1rpx solid #E2E7EF;
 }
 .info-wrapper:last-child {
    border-bottom: none;
@@ -79,7 +79,7 @@
    height: 128rpx;
    padding: 0 40rpx;
    background-color: #fff;
-    border-top: 1px solid #E2E7EF;
+    border-top: 1rpx solid #E2E7EF;
 }
 .cancel-btn, .confirm-btn {
    width: 318rpx;
@@ -93,7 +93,7 @@
 .cancel-btn {
    color: #656E7B;
    background-color: #fff;
-    border: 1px solid #C2C7CF;
+    border: 1rpx solid #C2C7CF;
 }
 .confirm-btn {
    color: #fff;

--- a/pages/pay/coupon-input/coupon-input.wxss
+++ b/pages/pay/coupon-input/coupon-input.wxss
@@ -47,7 +47,7 @@
    padding: 0 22rpx 0 24rpx;
    font-size: 30rpx;
    line-height: 80rpx;
-    border: 1px solid #DBDFE5;
+    border: 1rpx solid #DBDFE5;
    border-radius: 4rpx;
 }
 .coupon-input-btn {

--- a/pages/pay/order-comment/order-comment.wxss
+++ b/pages/pay/order-comment/order-comment.wxss
@@ -163,7 +163,7 @@
    height: 194rpx;
    padding: 30rpx 40rpx 0;
    background-color: #fff;
-    border-top: 1px solid #e2e7ef;
+    border-top: 1rpx solid #e2e7ef;
    z-index: 100;
 }

--- a/pages/pay/order-detail/order-detail.js
+++ b/pages/pay/order-detail/order-detail.js
@@ -25,8 +25,8 @@ Page({
        sealSrc: '',
        shopConfig: App.globalData.shopId,
-        shopAppId: ""
+        shopAppId: "",
+        marginTop: 0,
    },
@@ -39,6 +39,7 @@ Page({
            shopAppId: options.shopAppId,
            fromPage: options.fromPage === 'order' ? 'order' : '',
            isFromUse: options.showCode === 'true' ? true : false,
+            marginTop: wx.getStorageSync('navigationStatusHeight') + wx.getStorageSync('navigationCapsuleHeight')
        })
        this.queryOrderDetail()
    },
@@ -259,7 +260,7 @@ Page({
                    'officeName': funcResponse.officeName,
                    'wxRequest': funcResponse.wxRequest,
                    'businessTime': funcResponse.businessTime, //营业时间
-                    'expireTime': funcResponse.expireTime, //订单有效期
+                    'expireTime': funcResponse.expireTime.replace(/-/g, '.').replace('~', '-'), //订单有效期
                    'particulars': funcResponse.particulars
                }

--- a/pages/pay/order-detail/order-detail.wxml
+++ b/pages/pay/order-detail/order-detail.wxml
 <navigation class="navigation" titleText="订单详情" color="#000000" background="#FFFFFF" backIcon="/image/back.png" bind:navBack="navBack"></navigation>
-<view class="container padding-bottom-166">
+<view class="container padding-bottom-166" style="margin-top: {{marginTop + 'px'}}">
    <!-- 订单状态 -->
    <view class="state row con-c">
        <view class="state-content col con-c" wx:if="{{orderInfo.state === 0}}">
@@ -25,7 +25,7 @@
                <text>订单已过期</text>
            </view>
            <view class="state-content-tip row">
-                <text>有效期 {{orderInfo.expireTime}}</text>
+                <text>{{'有效期' + orderInfo.expireTime}}</text>
            </view>
        </view>
        <view class="state-content state-content-invalid col con-c" wx:if="{{orderInfo.state === -1}}">
@@ -90,9 +90,9 @@
                    <image class="seal-long" src="{{resourcesBase+orderInfo.shopInfo.printUse}}"></image>
                </view>
                <view class="info-code col con-c align-c">
-                    <text>{{orderInfo.commodity.length}}件商品可用</text>
+                    <text>{{orderInfo.commodity.length}} 件商品可用</text>
                    <button bindtap="onFastScan" class="row con-c align-c">一键扫码</button>
-                    <text>{{orderInfo.expireTime}}</text>
+                    <text>{{'有效期' + orderInfo.expireTime}}</text>
                </view>
            </block>
        </block>
@@ -126,8 +126,8 @@
                    <image class="seal-long" src="{{resourcesBase+orderInfo.shopInfo.printUse}}"></image>
                </view>
                <view class="info-code col con-c align-c">
-                    <text wx:if="{{orderInfo.commodityType === 5}}">{{'1件餐品可用'}}</text>
+                    <text wx:if="{{orderInfo.commodityType === 5}}">{{'1 件餐品可用'}}</text>
-                    <text wx:if="{{orderInfo.commodityType === 4}}">{{'1件商品可用'}}</text>
+                    <text wx:if="{{orderInfo.commodityType === 4}}">{{'1 件商品可用'}}</text>
                    <text wx:if="{{orderInfo.commodityType === 3}}">{{orderInfo.commodity.length}}张门票可用</text>
                    <button bindtap="onFastScan" class="row con-c align-c">一键扫码</button>
                    <text>{{orderInfo.expireTime}}</text>
@@ -215,7 +215,7 @@
    </view>
    <view wx:if="{{orderInfo.commodityType === 5}}" class="buy-content-art-tip row align-c">
-        <image src="{{imageBase + 'fail-icon-4.png'}}"></image>
+        <image src="{{imageBase + 'fail-glod.png'}}"></image>
        <text>请在下单3天内取餐，逾期失效</text>
    </view>
@@ -239,7 +239,7 @@
            <block wx:for="{{orderInfo.commodity}}" wx:for-index="index" wx:for-item="item" wx:key="index">
                <view class="commodity-item row align-c">
                    <image src="{{item.cover}}"></image>
-                    <view class="commodity-item-info col">
+                    <view class="commodity-item-info col con-a">
                        <view>
                            <text>{{item.name}}</text>
                        </view>
@@ -275,7 +275,7 @@
            <text>{{'订单编号：' +( orderInfo.tipOrderNo?orderInfo.tipOrderNo:"")}}</text>
            <text>{{'下单时间：' + (orderInfo.tipTimeSubmit?orderInfo.tipTimeSubmit:'')}}</text>
            <text wx:if="{{orderInfo.state !== 0 && orderInfo.state !== -1}}">{{'付款时间：' + (orderInfo.tipTimePay?orderInfo.tipTimePay:'')}}</text>
-            <text wx:if="{{orderInfo.state !== 0 && orderInfo.state !== -1&&orderInfo.tipIntegral}}">{{'获得积分：' + (orderInfo.tipIntegral?orderInfo.tipIntegral:'')}}</text>
+            <text wx:if="{{orderInfo.state !== 0 && orderInfo.state !== -1&&orderInfo.tipIntegral}}">{{'获得积分：' + (orderInfo.tipIntegral?orderInfo.tipIntegral:'') + '分'}}</text>
        </view>
    </view>

--- a/pages/pay/order-detail/order-detail.wxss
+++ b/pages/pay/order-detail/order-detail.wxss
@@ -5,7 +5,7 @@
 }
 .container {
-    margin-top: 160rpx;
+    /* margin-top: 160rpx; */
 }
 .state-content {
@@ -71,6 +71,10 @@
    margin-top: 16rpx;
 }
+.info-content-item:nth-child(3) {
+    margin-top: 48rpx;
+}
 .info-content-item-label {
    width: 104rpx;
    height: 36rpx;
@@ -88,7 +92,7 @@
    min-height: 52rpx;
    word-wrap: break-word;
    font-size: 38rpx;
-    font-weight: 500;
+    font-weight: 600;
    line-height: 52rpx;
    color: #15191f;
 }
@@ -148,7 +152,7 @@
 .info-code text:nth-child(1) {
    height: 48rpx;
    font-size: 34rpx;
-    font-weight: 500;
+    font-weight: 600;
    line-height: 48rpx;
    color: #15191f;
 }
@@ -183,7 +187,7 @@
 .commodity-title {
    height: 48rpx;
    font-size: 34rpx;
-    font-weight: 500;
+    font-weight: 600;
    line-height: 48rpx;
    color: #15191f;
 }
@@ -191,7 +195,7 @@
 .commodity-list {
    width: 670rpx;
    margin-top: 40rpx;
-    padding: 40rpx 32rpx 0 32rpx;
+    padding: 32rpx 32rpx 0 32rpx;
    border-radius: 4rpx;
    background: #F5F6F8;
 }
@@ -202,10 +206,16 @@
    margin-right: 16rpx;
 }
+.commodity-shop-info>text {
+    font-size: 26rpx;
+    font-weight: 600;
+    color: #15191F;
+}
 .commodity-item {
    width: 606rpx;
    height: 184rpx;
-    border-bottom: 1px #e2e7ef solid;
+    border-bottom: 1rpx #e2e7ef solid;
 }
 .commodity-item>image {
@@ -216,9 +226,32 @@
 .commodity-item-info {
    width: 290rpx;
+    height: 136rpx;
    margin-right: 32rpx;
 }
+.commodity-item-info>view:nth-child(1) {
+    font-size: 26rpx;
+    color: #15191F;
+    font-weight: 600;
+    line-height: 36rpx;
+}
+.commodity-item-info>view:nth-child(2) text:nth-child(1) {
+    margin-right: 4rpx;
+    font-size: 22rpx;
+    color: #15191F;
+    font-weight: 600;
+    line-height: 32rpx;
+}
+.commodity-item-info>view:nth-child(2) text:nth-child(2) {
+    font-size: 26rpx;
+    color: #15191F;
+    font-weight: 600;
+    line-height: 32rpx;
+}
 .commodity-item-operation>button {
    width: 120rpx;
    height: 56rpx;
@@ -259,6 +292,7 @@
 .tip-pay-amount text:nth-child(1) {
    height: 58rpx;
+    margin-right: 8rpx;
    font-size: 34rpx;
    font-weight: 500;
    line-height: 48rpx;
@@ -435,7 +469,7 @@
    width: 100%;
    padding: 48rpx 32rpx 46rpx;
    background: #F5F6F8;
-    border-bottom: 1px dashed #e2e7ef;
+    border-bottom: 1rpx dashed #e2e7ef;
 }
 .ticket-left {
@@ -708,7 +742,7 @@
 .goods-item {
    margin-bottom: 22rpx;
    padding-bottom: 22rpx;
-    border-bottom: 1px solid #e2e7ef;
+    border-bottom: 1rpx solid #e2e7ef;
 }
 .goods-item:last-child {
@@ -815,7 +849,7 @@
    width: 100%;
    background: #FFFFFF;
    padding: 32rpx 20rpx;
-    border-top: 1px solid #e2e7ef;
+    border-top: 1rpx solid #e2e7ef;
 }
 .delete-btn, .order-btn {
@@ -849,7 +883,7 @@ image {
    height: 80rpx;
    line-height: 80rpx;
    text-align: center;
-    margin-right: 20rpx;
+    margin-right: 16rpx;
 }
 .logo-box image {

--- a/pages/pay/order-input/image/tip.png
+++ b/pages/pay/order-input/image/tip.png
--- a/pages/pay/order-input/order-input.wxml
+++ b/pages/pay/order-input/order-input.wxml
@@ -299,7 +299,7 @@
 <!-- winActivityResult -->
 <view class="entry-complete row con-c align-c" wx:if="{{winActivityResult}}">
    <view class="entry-complete-tip">
-        <image src="./image/tip.png" bind:tap="onEntryComplete"></image>
+        <image src="{{resourcesBase + 'commodity/room-appointment/activity-tip.png'}}" bind:tap="onEntryComplete"></image>
    </view>
 </view>

--- a/pages/pay/order-input/order-input.wxss
+++ b/pages/pay/order-input/order-input.wxss
@@ -311,7 +311,7 @@
    height: 188rpx;
    margin: 0 32rpx;
    padding: 24rpx 0;
-    border-bottom: 1px #E2E7EF solid;
+    border-bottom: 1rpx #E2E7EF solid;
 }
 .shopping-cart-item-cover image {
@@ -437,7 +437,7 @@
    height: 80rpx;
    margin-top: 16rpx;
    border-radius: 4rpx;
-    border: 1px solid #DBDFE5;
+    border: 1rpx solid #DBDFE5;
 }
 .entry-input picker {
@@ -473,7 +473,7 @@
    height: 80rpx;
    margin-top: 40rpx;
    border-radius: 4rpx;
-    border: 1px solid #DBDFE5;
+    border: 1rpx solid #DBDFE5;
 }
 .input-button {
@@ -486,11 +486,11 @@
 }
 .input-cut {
-    border-right: 1px #E9EBEF solid;
+    border-right: 1rpx #E9EBEF solid;
 }
 .input-add {
-    border-left: 1px #E9EBEF solid;
+    border-left: 1rpx #E9EBEF solid;
 }
 .input-icon {
@@ -569,7 +569,7 @@
    margin: 16rpx 0 8rpx 0;
    padding: 0 24rpx;
    border-radius: 4rpx;
-    border: 1px solid #DBDFE5;
+    border: 1rpx solid #DBDFE5;
    font-size: 30rpx;
    font-weight: 400;
@@ -705,7 +705,7 @@
    width: 100%;
    margin-top: 40rpx;
    padding: 30rpx 0 68rpx 0;
-    border: 1px #E2E7EF solid;
+    border: 1rpx #E2E7EF solid;
    background: #FFFFFF;
 }
@@ -847,7 +847,7 @@
 }
 .artFood-goods-item {
    padding: 20rpx 0 24rpx;
-    border-bottom: 1px solid #E2E7EF;
+    border-bottom: 1rpx solid #E2E7EF;
 }
 .artFood-goods-name {
    flex: 1;
@@ -992,7 +992,7 @@
 .stock-tip {
    width: 526rpx;
    padding-bottom: 58rpx;
-    border-bottom: 1px #E2E7EF solid;
+    border-bottom: 1rpx #E2E7EF solid;
 }
 .stock-tip text {

--- a/pages/play/activity/activity.wxss
+++ b/pages/play/activity/activity.wxss
@@ -16,7 +16,7 @@
 .status {
    width: 750rpx;
    padding: 0 40rpx;
-    border-bottom: 1px #e2e7ef solid;
+    border-bottom: 1rpx #e2e7ef solid;
    overflow-x: scroll;
    flex-wrap: nowrap;
    background-color: #fff;
@@ -112,7 +112,7 @@
    width: 96rpx;
    height: 32rpx;
    border-radius: 4rpx;
-    border: 1px solid #86c5e1;
+    border: 1rpx solid #86c5e1;
    background: rgba(134, 197, 225, 0.1);
    text-align: center;
    font-size: 18rpx;

--- a/pages/play/movie-detail/movie-detail.wxss
+++ b/pages/play/movie-detail/movie-detail.wxss
@@ -114,7 +114,7 @@ page {
    width: 750rpx;
    margin-top: 48rpx;
    padding: 0 40rpx;
-    border-bottom: 1px #3A3A40 solid;
+    border-bottom: 1rpx #3A3A40 solid;
    overflow: scroll;
    flex-wrap: nowrap;
 }

--- a/pages/play/movie/movie.wxss
+++ b/pages/play/movie/movie.wxss
@@ -31,7 +31,7 @@ page {
    width: 750rpx;
    height: 72rpx;
    background-color: #1C1C25;
-    border-bottom: 1px #3A3A40 solid;
+    border-bottom: 1rpx #3A3A40 solid;
 }
 .status-item {
    flex: 1;
@@ -143,7 +143,7 @@ page {
    font-size: 22rpx;
    text-align: center;
    line-height: 32rpx;
-    border: 1px solid #86C5E1;
+    border: 1rpx solid #86C5E1;
    border-radius: 4rpx;
 }
 .movie-free {

--- a/pages/play/service-detail/service-detail.wxss
+++ b/pages/play/service-detail/service-detail.wxss
@@ -62,7 +62,7 @@
 }
 .other-black {
-    border-bottom: 1px #3a3a40 solid;
+    border-bottom: 1rpx #3a3a40 solid;
 }
 .other-black view text:nth-child(3) {
@@ -361,7 +361,7 @@
    width: 96rpx;
    height: 32rpx;
    border-radius: 4rpx;
-    border: 1px solid #86c5e1;
+    border: 1rpx solid #86c5e1;
    background: #eaf0f5;
    text-align: center;
    font-size: 18rpx;
@@ -607,7 +607,7 @@
    height: 64rpx;
    margin-top: 80rpx;
    padding: 0 40rpx;
-    border-bottom: 1px #e2e7ef solid;
+    border-bottom: 1rpx #e2e7ef solid;
 }
 .selection-content-item {
@@ -833,7 +833,7 @@
    flex-direction: row;
    justify-content: flex-start;
    padding: 32rpx 0 48rpx 0;
-    border-bottom: 1px #e2e7ef solid;
+    border-bottom: 1rpx #e2e7ef solid;
 }
 .evaluate-item-album:last-child {

--- a/pages/play/service-sell/service-sell.wxss
+++ b/pages/play/service-sell/service-sell.wxss
@@ -40,7 +40,7 @@
    width: 670rpx;
    margin-top: 50rpx;
    padding-bottom: 36rpx;
-    border-bottom: 1px solid #e2e7ef;
+    border-bottom: 1rpx solid #e2e7ef;
 }
 .service-name {
@@ -88,7 +88,7 @@
    height: 196rpx;
    padding: 32rpx 40rpx 68rpx;
    background-color: #fff;
-    border-top: 1px solid #e2e7ef;
+    border-top: 1rpx solid #e2e7ef;
 }
 /* 价格样式 */

--- a/pages/play/strategy-detail/strategy-detail.wxss
+++ b/pages/play/strategy-detail/strategy-detail.wxss
@@ -69,7 +69,7 @@ rich-text {
 .relation-title {
    margin: 0 40rpx 90rpx 40rpx;
    padding-top: 64rpx;
-    border-top: 1px #E2E7EF solid;
+    border-top: 1rpx #E2E7EF solid;
 }
 .relation-title text {
    width: 120rpx;