Skip to content

严立 / mini-shimao

Go to a project
Commit d897eff5 by 严立
Options

LL - 正式版2.0.0

parent 291f2006
Inline Side-by-side
Showing with 23 additions and 26 deletions
pages/commodity/menu-food/menu-food.wxml
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
<view class="commodity-item row" data-item="{{itemCommodity}}" bind:tap="onCommodityDetail"> <view class="commodity-item row" data-item="{{itemCommodity}}" bind:tap="onCommodityDetail">
<view class="item-img"> <view class="item-img">
<!-- 暂时屏蔽图片下载 --> <!-- 暂时屏蔽图片下载 -->
<!-- <image src="{{itemCommodity.cover}}" mode="aspectFill"></image> --> <image src="{{itemCommodity.cover}}" mode="aspectFill"></image>
<image src="" mode="aspectFill"></image> <!-- <image src="" mode="aspectFill"></image> -->
</view> </view>
<view class="item-info"> <view class="item-info">
<view class="item-info-title">{{itemCommodity.name}}</view> <view class="item-info-title">{{itemCommodity.name}}</view>
......
pages/commodity/room-appointment/room-appointment.js
...@@ -211,7 +211,7 @@ Page({ ...@@ -211,7 +211,7 @@ Page({
success: (response) => { success: (response) => {
console.log(response) console.log(response)
let funcResponse = response let funcResponse = response
if (response.data.code === 500) { if (response.data && response.data.code === 500) {
wx.lin.hideToast() wx.lin.hideToast()
wx.lin.showToast({ wx.lin.showToast({
image: '/image/error.png', image: '/image/error.png',
......
pages/mine/home/home.js
...@@ -77,6 +77,11 @@ Page({ ...@@ -77,6 +77,11 @@ Page({
}, },
onShow: function () { onShow: function () {
this.setData({
showMoreOrder: false,
showMoreActivity: false,
})
this.setData({ appStatus: App.globalData.appStatus }) this.setData({ appStatus: App.globalData.appStatus })
this.setUserInfo() this.setUserInfo()
this.setNavigation() this.setNavigation()
......
pages/mine/home/home.wxml
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
<!-- 商品 --> <!-- 商品 -->
<block wx:if="myOrder.artOrder.orderList.length>0"> <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="goods-logo-wrapper row align-c">
<view class="logo-box"> <view class="logo-box">
<image mode="aspectFit" src="{{imageResourcesBase+ item.logo}}"></image> <image mode="aspectFit" src="{{imageResourcesBase+ item.logo}}"></image>
...@@ -178,19 +178,19 @@ ...@@ -178,19 +178,19 @@
</view> </view>
<view class="goods-content row align-c"> <view class="goods-content row align-c">
<block wx:if="{{item.smOrderDetails.length>3}}"> <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> </image>
</block> </block>
<block wx:else> <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> </image>
</block> </block>
<text wx:if="{{item.smOrderDetails.length == 1}}">{{item.smOrderDetails[0].name}}</text> <text wx:if="{{item.smOrderDetails.length == 1}}">{{item.smOrderDetails[0].name}}</text>
</view> </view>
<view class="goods-footer row align-c con-b"> <view class="goods-footer row align-c con-b">
<text>有效期{{item.expireTimeEnd}}</text> <text>{{item.expireTimeEnd === '' ? '' : '有效期' + item.expireTimeEnd}}</text>
<text>共{{item.smOrderDetails.length}}件</text> <text>共{{item.smOrderDetails.length}}1件</text>
</view> </view>
</view> </view>
<!-- more --> <!-- more -->
...@@ -246,7 +246,7 @@ ...@@ -246,7 +246,7 @@
<!-- 预约卡片 --> <!-- 预约卡片 -->
<view class="appointment"> <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-time">{{item.activeTime}}</view>
<view class="appointment-activity-content row"> <view class="appointment-activity-content row">
<view class="appointment-activity-img"> <view class="appointment-activity-img">
......
pages/pay/order-input/image/tip.png
pages/pay/order-input/image/tip.png

26.8 KB | W: | H:

pages/pay/order-input/image/tip.png

140 KB | W: | H:

pages/pay/order-input/image/tip.png
pages/pay/order-input/image/tip.png
pages/pay/order-input/image/tip.png
pages/pay/order-input/image/tip.png
  • 2-up
  • Swipe
  • Onion skin
pages/pay/order-input/order-input.wxml
...@@ -279,8 +279,7 @@ ...@@ -279,8 +279,7 @@
<!-- winActivityResult --> <!-- winActivityResult -->
<view class="entry-complete row con-c align-c" wx:if="{{winActivityResult}}"> <view class="entry-complete row con-c align-c" wx:if="{{winActivityResult}}">
<view class="entry-complete-tip"> <view class="entry-complete-tip">
<image src="./image/tip.png"></image> <image src="./image/tip.png" bind:tap="onEntryComplete"></image>
<l-button l-class="button" plain="{{true}}" bind:lintap="onEntryComplete">我知道了</l-button>
</view> </view>
</view> </view>
......
pages/pay/order-input/order-input.wxss
...@@ -1006,22 +1006,10 @@ ...@@ -1006,22 +1006,10 @@
.entry-complete-tip { .entry-complete-tip {
position: relative; position: relative;
width: 606rpx; width: 606rpx;
height: 840rpx; height: 974rpx;
} }
.entry-complete-tip image { .entry-complete-tip image {
width: 606rpx; width: 606rpx;
height: 840rpx; height: 974rpx;
}
.entry-complete .button {
position: absolute;
bottom: 64rpx;
left: 88rpx;
width: 432rpx;
height: 80rpx;
border: 1px #15191f solid;
border-radius: 2px;
color: #15191f;
background: #fefcf9;
} }
\ No newline at end of file
pages/play/service-detail/service-detail.wxss
...@@ -304,7 +304,7 @@ ...@@ -304,7 +304,7 @@
margin-right: 24rpx; margin-right: 24rpx;
padding-bottom: 32rpx; padding-bottom: 32rpx;
border-radius: 4rpx; border-radius: 4rpx;
background: #F6F5F8; background: #f6f5f8;
} }
.movie-card-item { .movie-card-item {
...@@ -735,12 +735,16 @@ ...@@ -735,12 +735,16 @@
} }
.evaluate-item-info-text text:nth-child(1) { .evaluate-item-info-text text:nth-child(1) {
max-width: 340rpx;
height: 44rpx; height: 44rpx;
margin-right: 12rpx; margin-right: 12rpx;
font-size: 30rpx; font-size: 30rpx;
font-weight: 400; font-weight: 400;
line-height: 44rpx; line-height: 44rpx;
color: #15191f; color: #15191f;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
} }
.evaluate-item-info-text text:nth-child(2) { .evaluate-item-info-text text:nth-child(2) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment