LL - UI 问题

c5299ab4 · 严立 · 9ae9ed54 · c5299ab4 · c5299ab4 · c5299ab4
Commit c5299ab4 authored Sep 28, 2020 by 严立
Showing with 87 additions and 48 deletions
image/icon/cart-4.png
pages/commodity/menu-food/menu-food.wxml
pages/commodity/room-appointment/room-appointment.js
pages/commodity/shopping-cart/shopping-cart.js
pages/commodity/shopping-cart/shopping-cart.wxml
pages/commodity/shopping-cart/shopping-cart.wxss
pages/mine/accumulate/accumulate.js
pages/mine/accumulate/accumulate.wxml
pages/mine/accumulate/accumulate.wxss
pages/mine/home/home.wxss
pages/mine/info/info.js
pages/mine/info/info.wxml
pages/pay/order-detail/order-detail.wxml
pages/pay/order-input/order-input.js
pages/play/home/home.js
pages/play/home/home.wxss
pages/play/service-detail/service-detail.js
pages/play/service-detail/service-detail.wxml
pages/play/service-detail/service-detail.wxss
--- a/image/icon/cart-4.png
+++ b/image/icon/cart-4.png
--- a/pages/commodity/menu-food/menu-food.wxml
+++ b/pages/commodity/menu-food/menu-food.wxml
@@ -112,7 +112,7 @@
 <l-popup l-class="popup-mask" show="{{winCommodityDetail}}" content-align="center" locked="{{true}}">
    <view class="popup-wrap">
        <view id="banner" class="banner">
-            <swiper autoplay circular indicator-dots indicator-active-color="#fff" indicator-color="rgba(255, 255, 255, .4)" class="banner-swiper" interval="5000" duration="500">
+            <swiper autoplay circular indicator-dots="{{commodityDetail.banner.length > 1 ? true : false}}" indicator-active-color="#fff" indicator-color="rgba(255, 255, 255, .4)" class="banner-swiper" interval="5000" duration="500">
                <block wx:for="{{commodityDetail.banner}}" wx:for-index="index" wx:for-item="item" wx:key="index">
                    <swiper-item class="banner-swiper-item">
                        <image class="banner-swiper-image" src="{{item}}"></image>

--- a/pages/commodity/room-appointment/room-appointment.js
+++ b/pages/commodity/room-appointment/room-appointment.js
@@ -208,16 +208,27 @@ Page({
                name: this.data.formName,
                type: 1,
            },
-            success: (res) => {
+            success: (response) => {
+                console.log(response)
+                let funcResponse = response.data
+                if (funcResponse.code === 500) {
+                    wx.lin.hideToast()
+                    wx.lin.showToast({
+                        image: '/image/error.png',
+                        title: funcResponse.msg,
+                    })
+                    return
+                }
                this.setData({
                    appointmentComplete: true,
                })
                wx.lin.hideToast()
            },
-            fail: (err) => {
+            fail: (response) => {
                wx.lin.showToast({
                    image: '/image/error.png',
-                    title: err.msg,
+                    title: response.msg,
                })
            }
        })

--- a/pages/commodity/shopping-cart/shopping-cart.js
+++ b/pages/commodity/shopping-cart/shopping-cart.js
@@ -19,8 +19,7 @@ Page({
        winToast: false,
+        sideBarTopPadding: 0,
        allChecked: false,
        isFoodCart: true,
@@ -80,7 +79,8 @@ Page({
    onLoad: function () {
        this.setShopInfo()
        this.setData({
-            shoppingCart: wx.getStorageSync('shoppingCartBuffer')
+            shoppingCart: wx.getStorageSync('shoppingCartBuffer'),
+            sideBarTopPadding: wx.getStorageSync('navigationStatusHeight') + wx.getStorageSync('navigationCapsuleHeight')
        })
        this.selectionTotal()

--- a/pages/commodity/shopping-cart/shopping-cart.wxml
+++ b/pages/commodity/shopping-cart/shopping-cart.wxml
@@ -2,7 +2,7 @@
 <l-toast show="{{winToast}}" icon="error" title="请选购商品后结算"></l-toast>
-<view class="container" wx:if="{{shoppingCart.length > 0}}">
+<view class="container" wx:if="{{shoppingCart.length > 0}}" style="{{'margin-top: ' + sideBarTopPadding + 'px;'}}">
    <view class="shop-info row con-b align-c">
        <image wx:if="{{shopLogo}}" src="{{resourcesBase + shopLogo}}" mode="widthFix"></image>
        <text bindtap="onClearn">清空</text>

--- a/pages/commodity/shopping-cart/shopping-cart.wxss
+++ b/pages/commodity/shopping-cart/shopping-cart.wxss
@@ -6,10 +6,6 @@
    width: 750rpx;
 }
-.container {
-    margin-top: 130rpx;
-}
 .shop-info {
    width: 750rpx;
    height: 110rpx;
@@ -317,7 +313,7 @@
 }
 .empty > image {
-    width: 176rpx;
+    width: 190rpx;
    height: 176rpx;
 }

--- a/pages/mine/accumulate/accumulate.js
+++ b/pages/mine/accumulate/accumulate.js
@@ -24,17 +24,31 @@ Page({
        accumulateList: [],
        selectedList: [],
        integral: '0',
-        type: ''
+        type: '',
+        accumulateListHeight: 0,
    },
-    onLoad: function (options) {
+    onLoad: function(options) {
        let integral = options.integral
        this.setData({
            integral: integral
        })
+        this.setAccumulateListHeight()
        this.getAccumulate()
    },
+    setAccumulateListHeight: function () {
+        let funcWindowHeight = wx.getSystemInfoSync().windowHeight
+        let funcAccumulateListHeight = funcWindowHeight - 410 * wx.getStorageSync('unitProportion')
+        this.setData({
+            accumulateListHeight: funcAccumulateListHeight
+        })
+        console.log(funcAccumulateListHeight)
+    },
    // 获取积分列表
-    getAccumulate: function () {
+    getAccumulate: function() {
        wx.showLoading({
            title: '加载中',
        })
@@ -59,14 +73,14 @@ Page({
        })
    },
    // 显示菜单
-    onShowMenu: function () {
+    onShowMenu: function() {
        this.setData({
            showMenu: true
        })
    },
    // 隐藏菜单
-    onHideMenu: function () {
+    onHideMenu: function() {
        this.setData({
            showMenu: false
        })
@@ -77,7 +91,7 @@ Page({
     *  @param type 0全部 1获取 2已使用
     *  @returns
     */
-    onTabMenu: function (event) {
+    onTabMenu: function(event) {
        let {
            index,
            type

--- a/pages/mine/accumulate/accumulate.wxml
+++ b/pages/mine/accumulate/accumulate.wxml
@@ -30,7 +30,7 @@
    </view>
    <!-- 有积分 -->
-    <view class="accumulate-wrapper col align-c" wx:else>
+    <view class="accumulate-wrapper col align-c" wx:else style="{{'max-height:' + accumulateListHeight + 'px;'}}">
        <block wx:for="{{accumulateList}}" wx:key="index">
            <view class="accumulate row con-b align-c">
                <view class="accumulate-left col con-b">

--- a/pages/mine/accumulate/accumulate.wxss
+++ b/pages/mine/accumulate/accumulate.wxss
@@ -104,6 +104,7 @@ page {
    padding: 12rpx 0 14rpx;
    background-color: #fff;
    border-radius: 4rpx;
+    overflow-y: scroll;
 }
 .accumulate {

--- a/pages/mine/home/home.wxss
+++ b/pages/mine/home/home.wxss
--- a/pages/mine/info/info.js
+++ b/pages/mine/info/info.js
@@ -25,7 +25,7 @@ Page({
    onLoad: function (options) {
        let funcUserInfo = wx.getStorageSync('userInfo')
        funcUserInfo.phone = this.phoneEncryption(funcUserInfo.phone)
-        if (!funcUserInfo.birthday) funcUserInfo.birthday = birthdayLimit
+        if (funcUserInfo.sex !== '') this.data.sexActive = funcUserInfo.sex - 1
        this.setData({
            userInfo: funcUserInfo

--- a/pages/mine/info/info.wxml
+++ b/pages/mine/info/info.wxml
@@ -15,22 +15,24 @@
        </l-list>
        <l-list is-hover="{{false}}" l-content-class="menu-title" title="性别" is-link="{{false}}">
            <picker slot="right-section" class="input-picker" mode="selector" value="{{sexActive}}" range-key="{{'name'}}" range="{{sexList}}" bindchange="onSelectionGender">
-                <view class="picker">{{sexList[sexActive].name}}</view>
+                <view wx:if="{{sexActive === 0}}" class="picker" style="color: #959DA9;">请选择性别</view>
+                <view wx:if="{{sexActive !== 0}}" class="picker">{{sexList[sexActive].name}}</view>
            </picker>
        </l-list>
        <l-list is-hover="{{false}}" l-content-class="menu-title" title="生日" is-link="{{false}}">
            <picker slot="right-section" class="input-picker" mode="date" value="{{userInfo.birthday}}" end="{{birthdayLimit}}" bindchange="onSelectionDate">
-                <view class="picker">{{userInfo.birthday}}</view>
+                <view wx:if="{{userInfo.birthday === ''}}" class="picker" style="color: #959DA9;">请选择生日</view>
+                <view wx:if="{{userInfo.birthday !== ''}}" class="picker">{{userInfo.birthday}}</view>
            </picker>
        </l-list>
        <l-list is-hover="{{false}}" l-content-class="menu-title" title="地址" is-link="{{false}}">
            <view slot="right-section">
-                <input maxlength="30" style="text-align:right;" placeholder="请填写地址" placeholder-class="phone" value="{{userInfo.address}}" data-type="address" bindblur="onInputBlur" />
+                <input maxlength="30" style="text-align:right;" placeholder-style="color: #959DA9;" placeholder="请填写地址" value="{{userInfo.address}}" data-type="address" bindblur="onInputBlur" />
            </view>
        </l-list>
        <l-list is-hover="{{false}}" l-content-class="menu-title" title="手机号" is-link="{{false}}">
            <view slot="right-section">
-                <view class="phone">{{userInfo.phone}}</view>
+                <view class="phone" style="color: #959DA9;">{{userInfo.phone}}</view>
            </view>
        </l-list>
    </view>

--- 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"
+<navigation class="navigation" titleText="订单详情" color="#000000" background="#FFFFFF" backIcon="/image/back.png" bind:navBack="navBack"></navigation>
-	bind:navBack="navBack"></navigation>
 <view class="container padding-bottom-166">
    <!-- 订单状态 -->
@@ -250,8 +249,7 @@
                    </view>
                    <view class="commodity-item-operation" wx:if="{{item.codeId}}">
                        <!-- 状态(0已过期1带使用2已使用) -->
-						<button wx:if="{{item.state==1}}" class="row con-c align-c" data-item="{{item}}"
+                        <button wx:if="{{item.state==1}}" class="row con-c align-c" data-item="{{item}}" bindtap="onCouponCode">查看券码</button>
-							bindtap="onCouponCode">查看券码</button>
                        <button wx:if="{{item.state==0}}" disabled class="row con-c align-c btn-disabled">已过期</button>
                        <button wx:if="{{item.state==2}}" disabled class="row con-c align-c btn-disabled">已使用</button>
                    </view>
@@ -275,10 +273,8 @@
        <view class="tip-describe col">
            <text>{{'订单编号：' +( orderInfo.tipOrderNo?orderInfo.tipOrderNo:"")}}</text>
            <text>{{'下单时间：' + (orderInfo.tipTimeSubmit?orderInfo.tipTimeSubmit:'')}}</text>
-			<text
+            <text wx:if="{{orderInfo.state !== 0 && orderInfo.state !== -1}}">{{'付款时间：' + (orderInfo.tipTimePay?orderInfo.tipTimePay:'')}}</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>
@@ -301,8 +297,7 @@
                    <view class="code-num-wrapper row align-c con-a">
                        <view class="code-num-title {{item.status==2 ? 'code-used' : ''}}">券码{{index+1}}:</view>
                        <view class="code-num {{item.status==2 ? 'code-used' : ''}}">{{item.serialNumber}}</view>
-						<view class="num-copy" wx:if="{{item.status!=2}}" bindtap="setClipboard" data-code="{{item.serialNumber}}"
+                        <view class="num-copy" wx:if="{{item.status!=2}}" bindtap="setClipboard" data-code="{{item.serialNumber}}" data-index="{{index}}">复制</view>
-							data-index="{{index}}">复制</view>
                    </view>
                    <view class="code-used-seal" wx:if="{{item.status==2}}">
                        <image mode="widthFix" src="{{resourcesBase+'mine/server/codeUsed.png'}}"></image>
@@ -352,8 +347,7 @@
    <view class="delete-btn" bindtap="onDelOrCancelOrder" data-type='0' wx:if="{{orderInfo.state===0}}">取消订单</view>
    <view class="order-btn" bindtap="onOrderPay" wx:if="{{orderInfo.state===0}}">去支付</view>
    <view class="order-btn" bindtap="onOrderEvaluate" wx:if="{{orderInfo.state===3}}">去评价</view>
-	<view class="delete-btn" bindtap="onDelOrCancelOrder" data-type='1'
+    <view class="delete-btn" bindtap="onDelOrCancelOrder" data-type='1' wx:if="{{orderInfo.state===4||orderInfo.state===-1||orderInfo.state===6}}">删除订单</view>
-		wx:if="{{orderInfo.state===4||orderInfo.state===-1||orderInfo.state===6}}">删除订单</view>
    <view class="order-btn" bindtap="onOrderAgain" wx:if="{{orderInfo.state===-1}}">再次下单</view>
 </view>
@@ -370,7 +364,6 @@
 </l-popup>
 <!-- 成功提示 -->
-<l-toast l-image-class="toast-image" l-class="toast-bg" show="{{winToast}}" image="/image/success.png"
+<l-toast l-image-class="toast-image" l-class="toast-bg" show="{{winToast}}" image="/image/success.png" title="{{winToastText}}" duration="2000"></l-toast>
-	title="{{winToastText}}" duration="2000"></l-toast>
 <!-- 确认框 -->
 <l-dialog />
\ No newline at end of file
--- a/pages/pay/order-input/order-input.js
+++ b/pages/pay/order-input/order-input.js
@@ -539,9 +539,16 @@ Page({
     *  @returns
     */
    onEntryComplete: function () {
+        // 一般活动跳转到我的预约，观影跳转到订单列表
+        if (logicData.option.type === 7) {
+            wx.reLaunch({
+                url: '/pages/mine/order/order?fromPage=pay'
+            })
+        } else {
            wx.reLaunch({
                url: '/pages/mine/appointment/appointment?fromPage=pay'
            })
+        }
    },
    /**

--- a/pages/play/home/home.js
+++ b/pages/play/home/home.js
@@ -44,6 +44,12 @@ Page({
        this.setData({ appStatus: App.globalData.appStatus })
        this.queryActivity()
        this.queryMovie()
+        this.setData({
+            pageNo: 1,
+            pageSize: 10,
+            touristRouteList: [],
+        })
        this.routeList()
    },

--- a/pages/play/home/home.wxss
+++ b/pages/play/home/home.wxss
@@ -292,7 +292,7 @@
    background: #15191F;
    white-space: nowrap;
-    font-size: 18rpx;
+    font-size: 18.6rpx;
    font-weight: 500;
    line-height: 32rpx;
    color: #FFFFFF;

--- a/pages/play/service-detail/service-detail.js
+++ b/pages/play/service-detail/service-detail.js
@@ -81,6 +81,8 @@ Page({
        officeEnvironmental: 0,
        officeEnvironmentalText: '5.0',     // 门店环境评分
+        cssDetail: '',                      // 详情底部边距
        winActivity: false,                 // 近期活动
        winCommodity: false,                // 商品列表
@@ -96,6 +98,7 @@ Page({
        })
        this.queryDetail(Number(options.id))
+        console.log(Number(options.id))
        // 根据商店查询相关订制内容
        switch (Number(options.id)) {
@@ -104,6 +107,7 @@ Page({
                this.queryActivity()
                this.setData({
                    commodityTitle: '文创商品',
+                    cssDetail: 'padding-bottom: 160rpx;',
                    winHidden: true
                })
                break
@@ -111,7 +115,8 @@ Page({
            case 2:
                this.queryMovie()
                this.setData({
-                    navigationStyle: this.data.navigationStyleBlack
+                    navigationStyle: this.data.navigationStyleBlack,
+                    cssDetail: 'padding-bottom: 0;',
                })
                break
@@ -119,6 +124,7 @@ Page({
                this.queryActivity()
                this.setData({
                    commodityTitle: '拾光花坊',
+                    cssDetail: 'padding-bottom: 0;',
                    winCommodityMenu: true
                })
                break
@@ -126,6 +132,7 @@ Page({
            case 4:
                this.setData({
                    commodityTitle: '原野MOJITO',
+                    cssDetail: 'padding-bottom: 160rpx;',
                })
                break
@@ -133,6 +140,7 @@ Page({
                this.queryActivity()
                this.setData({
                    commodityTitle: '能量补给站',
+                    cssDetail: 'padding-bottom: 0;',
                    winCommodityMenu: true
                })
                break
@@ -140,6 +148,7 @@ Page({
            case 6:
                this.setData({
                    commodityTitle: '原味舒食',
+                    cssDetail: 'padding-bottom: 160rpx;',
                })
                break
@@ -147,12 +156,15 @@ Page({
                this.queryCommodity()
                this.setData({
                    commodityTitle: 'SPA服务',
+                    cssDetail: 'padding-bottom: 0;',
                })
                break
            default:
                this.queryCommodity()
        }
+        console.log(this.data.cssDetail)
        this.getOfficeAppraise()
        this.getAppraise()
    },

--- a/pages/play/service-detail/service-detail.wxml
+++ b/pages/play/service-detail/service-detail.wxml
@@ -179,7 +179,7 @@
    </view>
    <!-- 简介 -->
-    <view class="detail" wx:if="{{contentType === 'detail'}}">
+    <view class="detail" wx:if="{{contentType === 'detail'}}" style="{{cssDetail}}">
        <block wx:for="{{info.describe}}" wx:for-index="index" wx:for-item="item" wx:key="index">
            <image src="{{item}}" mode="widthFix"></image>
        </block>
@@ -387,7 +387,7 @@
    </view>
    <!-- 简介 -->
-    <view class="detail" wx:if="{{contentType === 'detail'}}">
+    <view class="detail" wx:if="{{contentType === 'detail'}}" style="{{cssDetail}}">
        <block wx:for="{{info.describe}}" wx:for-index="index" wx:for-item="item" wx:key="index">
            <image src="{{item}}" mode="widthFix"></image>
        </block>
@@ -455,11 +455,6 @@
        </view>
    </view>
-    <!-- 操作 -->
-    <!-- <view class="operation">
-        <button class="button row con-c align-c" bindtap="onContact">电话预约</button>
-    </view> -->
    <!-- 侧边返回顶部 -->
    <view class="appointment-side col con-b align-c" hidden="{{winSide}}">
        <button class="appointment-side-top" bindtap="onBackTop">

--- a/pages/play/service-detail/service-detail.wxss
+++ b/pages/play/service-detail/service-detail.wxss
@@ -304,6 +304,7 @@
    margin-right: 24rpx;
    padding-bottom: 32rpx;
    border-radius: 4rpx;
+    background: #F6F5F8;
 }
 .movie-card-item {