LL - 正式版2.0.0

pages/commodity/menu-food/menu-food.wxml

@@ -40,8 +40,8 @@
                 <view class="commodity-item row" data-item="{{itemCommodity}}" bind:tap="onCommodityDetail">
                     <view class="item-img">
                         <!-- 暂时屏蔽图片下载 -->
-                        <!-- <image src="{{itemCommodity.cover}}" mode="aspectFill"></image> -->
-                        <image src="" mode="aspectFill"></image>
+                        <image src="{{itemCommodity.cover}}" mode="aspectFill"></image>
+                        <!-- <image src="" mode="aspectFill"></image> -->
                     </view>
                     <view class="item-info">
                         <view class="item-info-title">{{itemCommodity.name}}</view>

pages/commodity/room-appointment/room-appointment.js

@@ -211,7 +211,7 @@ Page({
             success: (response) => {
                 console.log(response)
                 let funcResponse = response
-                if (response.data.code === 500) {
+                if (response.data && response.data.code === 500) {
                     wx.lin.hideToast()
                     wx.lin.showToast({
                         image: '/image/error.png',

pages/mine/home/home.js

@@ -77,6 +77,11 @@ Page({
     },
 
     onShow: function () {
+        this.setData({
+            showMoreOrder: false,
+            showMoreActivity: false,
+        })
+
         this.setData({ appStatus: App.globalData.appStatus })
         this.setUserInfo()
         this.setNavigation()

pages/mine/home/home.wxml

@@ -169,7 +169,7 @@
 
                     <!-- 商品 -->
                     <block wx:if="myOrder.artOrder.orderList.length>0">
-                        <view class="goods-wrapper" wx:for="{{myOrder.artOrder.orderList}}" wx:key="*this" data-item="{{item}}" bindtap="onOrderDetail">
+                        <view class="goods-wrapper" wx:for="{{myOrder.artOrder.orderList}}" wx:key="{{index}}" wx:key="index" data-item="{{item}}" bindtap="onOrderDetail">
                             <view class="goods-logo-wrapper row align-c">
                                 <view class="logo-box">
                                     <image mode="aspectFit" src="{{imageResourcesBase+ item.logo}}"></image>
@@ -178,19 +178,19 @@
                             </view>
                             <view class="goods-content row align-c">
                                 <block wx:if="{{item.smOrderDetails.length>3}}">
-                                    <image src="{{k.imgUrl}}" wx:for="{{item.smOrderDetailsSlice3}}" wx:for-item="k" wx:key="*this">
+                                    <image src="{{k.imgUrl}}" wx:for="{{item.smOrderDetailsSlice3}}" wx:for-item="k" wx:key="{{index}}" wx:key="index">
                                     </image>
                                 </block>
                                 <block wx:else>
-                                    <image src="{{k.imgUrl}}" wx:for="{{item.smOrderDetails}}" wx:for-item="k" wx:key="*this">
+                                    <image src="{{k.imgUrl}}" wx:for="{{item.smOrderDetails}}" wx:for-item="k" wx:key="{{index}}" wx:key="index">
                                     </image>
                                 </block>
 
                                 <text wx:if="{{item.smOrderDetails.length == 1}}">{{item.smOrderDetails[0].name}}</text>
                             </view>
                             <view class="goods-footer row align-c con-b">
-                                <text>有效期{{item.expireTimeEnd}}</text>
-                                <text>共{{item.smOrderDetails.length}}件</text>
+                                <text>{{item.expireTimeEnd === '' ? '' : '有效期' + item.expireTimeEnd}}</text>
+                                <text>共{{item.smOrderDetails.length}}1件</text>
                             </view>
                         </view>
                         <!-- more -->
@@ -246,7 +246,7 @@
             <!-- 预约卡片 -->
             <view class="appointment">
                 <!-- 主题活动 -->
-                <view class="appointment-wrapper" wx:for="{{activityList}}" wx:key="*this" data-item="{{item}}" bindtap="onOrderDetail">
+                <view class="appointment-wrapper" wx:for="{{activityList}}" wx:key="{{index}}" wx:key="index" data-item="{{item}}" bindtap="onOrderDetail">
                     <view class="appointment-time">{{item.activeTime}}</view>
                     <view class="appointment-activity-content row">
                         <view class="appointment-activity-img">

pages/pay/order-input/order-input.wxml

@@ -279,8 +279,7 @@
 <!-- winActivityResult -->
 <view class="entry-complete row con-c align-c" wx:if="{{winActivityResult}}">
     <view class="entry-complete-tip">
-        <image src="./image/tip.png"></image>
-        <l-button l-class="button" plain="{{true}}" bind:lintap="onEntryComplete">我知道了</l-button>
+        <image src="./image/tip.png" bind:tap="onEntryComplete"></image>
     </view>
 </view>
 

pages/pay/order-input/order-input.wxss

@@ -1006,22 +1006,10 @@
 .entry-complete-tip {
     position: relative;
     width: 606rpx;
-    height: 840rpx;
+    height: 974rpx;
 }
 
 .entry-complete-tip image {
     width: 606rpx;
-    height: 840rpx;
-}
-
-.entry-complete .button {
-    position: absolute;
-    bottom: 64rpx;
-    left: 88rpx;
-    width: 432rpx;
-    height: 80rpx;
-    border: 1px #15191f solid;
-    border-radius: 2px;
-    color: #15191f;
-    background: #fefcf9;
+    height: 974rpx;
 }
\ No newline at end of file

pages/play/service-detail/service-detail.wxss

@@ -304,7 +304,7 @@
     margin-right: 24rpx;
     padding-bottom: 32rpx;
     border-radius: 4rpx;
-    background: #F6F5F8;
+    background: #f6f5f8;
 }
 
 .movie-card-item {
@@ -735,12 +735,16 @@
 }
 
 .evaluate-item-info-text text:nth-child(1) {
+    max-width: 340rpx;
     height: 44rpx;
     margin-right: 12rpx;
     font-size: 30rpx;
     font-weight: 400;
     line-height: 44rpx;
     color: #15191f;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
 }
 
 .evaluate-item-info-text text:nth-child(2) {