Skip to content

严立 / mini-shimao

Go to a project
Commit c6171533 by 严立
Options

LL - 服务UI问题修复

parent cff87a0c
Inline Side-by-side
Showing with 66 additions and 33 deletions
pages/commodity/project-detail/project-detail.js
...@@ -166,6 +166,8 @@ Page({ ...@@ -166,6 +166,8 @@ Page({
winLoading: false, winLoading: false,
commodityList: this.data.commodityList.concat(funcCommodityList), commodityList: this.data.commodityList.concat(funcCommodityList),
}) })
console.log(this.data.commodityList)
}, },
}) })
}, },
......
pages/commodity/project-detail/project-detail.wxml
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<view class="project-name"> <view class="project-name">
<text>{{item.name}}</text> <text>{{item.name}}</text>
</view> </view>
<view class="project-msg" wx:if="{{item.msg}}"> <view class="project-msg" wx:if="{{item.describe}}">
<text>{{item.describe}}</text> <text>{{item.describe}}</text>
</view> </view>
......
pages/commodity/project-detail/project-detail.wxss
...@@ -39,10 +39,18 @@ ...@@ -39,10 +39,18 @@
} }
.project-msg { .project-msg {
display: -webkit-box;
width: 606rpx;
margin-top: 16rpx; margin-top: 16rpx;
color: #959DA9; color: #959DA9;
font-size: 26rpx; font-size: 26rpx;
line-height: 36rpx; line-height: 36rpx;
overflow: hidden;
text-overflow: ellipsis;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
} }
.project-price-wrapper { .project-price-wrapper {
......
pages/commodity/project/project.js
...@@ -5,6 +5,8 @@ Page({ ...@@ -5,6 +5,8 @@ Page({
imageBase: App.globalData.appImageBase, imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase, resourcesBase: App.globalData.appResourcesBase,
banner: [], banner: [],
bannerIndex: 0, bannerIndex: 0,
...@@ -105,6 +107,8 @@ Page({ ...@@ -105,6 +107,8 @@ Page({
'id': funcResponse[i].id, // 商品标识 'id': funcResponse[i].id, // 商品标识
'typeId': funcResponse[i].genre, // 商品类型 'typeId': funcResponse[i].genre, // 商品类型
'inventoriesId': funcResponse[i].inventorie[0].inventoriesId, // 仓库标识 'inventoriesId': funcResponse[i].inventorie[0].inventoriesId, // 仓库标识
'dateValid': App.modular.miment().format('YYYY.MM.DD'), // 有效时间
'dateInvalid': funcResponse[i].inventorie[0].cardNam, // 失效时间
'name': funcResponse[i].name, 'name': funcResponse[i].name,
'cover': funcResponse[i].coverImg, // 商品封面 'cover': funcResponse[i].coverImg, // 商品封面
'price': funcResponse[i].inventorie[0].sightseerPrice, // 普通价 'price': funcResponse[i].inventorie[0].sightseerPrice, // 普通价
...@@ -147,6 +151,8 @@ Page({ ...@@ -147,6 +151,8 @@ Page({
'id': funcResponse[i].id, // 商品标识 'id': funcResponse[i].id, // 商品标识
'typeId': funcResponse[i].genre, // 商品分类标识 'typeId': funcResponse[i].genre, // 商品分类标识
'inventoriesId': funcResponse[i].inventoriesId, // 仓库标识 'inventoriesId': funcResponse[i].inventoriesId, // 仓库标识
'dateValid': App.modular.miment().format('YYYY.MM.DD'), // 有效时间
'dateInvalid': App.modular.miment().format('YYYY.MM.DD'), // 失效时间
'name': funcResponse[i].name, 'name': funcResponse[i].name,
'cover': funcResponse[i].coverImg, // 商品封面 'cover': funcResponse[i].coverImg, // 商品封面
'price': funcResponse[i].sightseerPrice, // 普通价 'price': funcResponse[i].sightseerPrice, // 普通价
...@@ -246,6 +252,11 @@ Page({ ...@@ -246,6 +252,11 @@ Page({
* @returns * @returns
*/ */
onBuyService: function () { onBuyService: function () {
App.setShopInfo(7)
let funcShopInfo = wx.getStorageSync('shopInfoBuffer')
funcShopInfo.shopType = 2
wx.setStorageSync('shopInfoBuffer', funcShopInfo)
wx.navigateTo({ wx.navigateTo({
url: '/pages/commodity/project-detail/project-detail' url: '/pages/commodity/project-detail/project-detail'
}) })
......
pages/commodity/project/project.wxss
.navigation {
z-index: 1900;
}
.container { .container {
padding-bottom: 160rpx; padding-bottom: 160rpx;
background: linear-gradient(180deg, #FFFFFF 0%, #F3F4F6 100%, #F3F4F6 100%, #F3F4F6 100%); background: linear-gradient(180deg, #FFFFFF 0%, #F3F4F6 100%, #F3F4F6 100%, #F3F4F6 100%);
......
pages/pay/order-input/order-input.js
...@@ -439,8 +439,6 @@ Page({ ...@@ -439,8 +439,6 @@ Page({
quantityMax: funcDate[0][0].residue < 3 ? funcDate[0][0].residue : 3, quantityMax: funcDate[0][0].residue < 3 ? funcDate[0][0].residue : 3,
quantityMin: 1, quantityMin: 1,
}) })
console.log(this.dat.entryDate)
} }
}) })
}, },
......
pages/pay/order-input/order-input.wxml
...@@ -283,7 +283,7 @@ ...@@ -283,7 +283,7 @@
</view> </view>
<!-- winButtonPay --> <!-- winButtonPay -->
<cover-view class="pay" wx:if="{{winButtonPay && !winNoticeDetail && !winStockTip}}"> <cover-view class="pay" wx:if="{{winButtonPay && !winNoticeDetail && !winStockTip && !winActivityResult}}">
<cover-view class="pay-tip row align-c"> <cover-view class="pay-tip row align-c">
<cover-image src="{{imageBase + 'fail-icon-4.png'}}"></cover-image> <cover-image src="{{imageBase + 'fail-icon-4.png'}}"></cover-image>
<cover-view class="pay-tip-text row con-c align-c">付款后一经确认不得退款</cover-view> <cover-view class="pay-tip-text row con-c align-c">付款后一经确认不得退款</cover-view>
...@@ -311,9 +311,6 @@ ...@@ -311,9 +311,6 @@
</view> </view>
</view> </view>
<!-- 未支付订单超额提示 -->
<!-- 库存不足提示 --> <!-- 库存不足提示 -->
<view class="stock-mask row con-c align-c" wx:if="{{winStockTip}}"> <view class="stock-mask row con-c align-c" wx:if="{{winStockTip}}">
<view class="stock col con-c align-c"> <view class="stock col con-c align-c">
......
pages/play/service-detail/service-detail.js
...@@ -408,7 +408,9 @@ Page({ ...@@ -408,7 +408,9 @@ Page({
data: { data: {
'officeId': this.data.shopInfo.id, 'officeId': this.data.shopInfo.id,
'genre': this.data.shopInfo.shopType, 'genre': this.data.shopInfo.shopType,
'tag': '201' 'tag': '201',
'pageNo': 1,
'pageSize': 10,
}, },
success: (response) => { success: (response) => {
let funcCommodityList = [] let funcCommodityList = []
......
pages/play/service/service.js
...@@ -65,7 +65,7 @@ Page({ ...@@ -65,7 +65,7 @@ Page({
appId: 4, appId: 4,
id: App.globalData.pointInfo[3].id, id: App.globalData.pointInfo[3].id,
name: '原野MOJITO', name: '原野MOJITO',
cover: App.globalData.appResourcesBase + 'play/detail/shop-bg-bg-3-2.png', cover: App.globalData.appResourcesBase + 'play/detail/shop-bg-3-2.png',
logo: App.globalData.appResourcesBase + 'shop/logo-4.png', logo: App.globalData.appResourcesBase + 'shop/logo-4.png',
shopType: '5' shopType: '5'
}] }]
...@@ -77,7 +77,7 @@ Page({ ...@@ -77,7 +77,7 @@ Page({
appId: 2, appId: 2,
id: App.globalData.pointInfo[1].id, id: App.globalData.pointInfo[1].id,
name: '星空影院', name: '星空影院',
cover: App.globalData.appResourcesBase + 'play/detail/shop-bg-bg-4-1.png', cover: App.globalData.appResourcesBase + 'play/detail/shop-bg-4-1.png',
logo: App.globalData.appResourcesBase + 'shop/logo-2.png', logo: App.globalData.appResourcesBase + 'shop/logo-2.png',
shopType: '' shopType: ''
}] }]
......
pages/play/service/service.wxml
...@@ -8,20 +8,6 @@ ...@@ -8,20 +8,6 @@
</view> </view>
<view class="shop"> <view class="shop">
<!-- <block wx:for="{{tabDetail[tabIndex].shop}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="shop-item">
<image src="{{item.cover}}"></image>
<button
class="button row con-c align-c"
style="{{'bottom: ' + item.y + 'rpx;left: ' + item.x + 'rpx;'}}"
data-id="{{item.appId}}"
data-type="{{item.shopType}}"
bindtap="onShopDetail"
>
<text>立即预定</text>
</button>
</view>
</block> -->
<view class="shop-wrapper" wx:if="{{tabIndex === '0'}}"> <view class="shop-wrapper" wx:if="{{tabIndex === '0'}}">
<image class="shop-bg" src="{{tabDetail[0].shop[0].cover}}"></image> <image class="shop-bg" src="{{tabDetail[0].shop[0].cover}}"></image>
<image class="shop-art-cover" src="{{tabDetail[0].shop[0].subCover}}"></image> <image class="shop-art-cover" src="{{tabDetail[0].shop[0].subCover}}"></image>
......
pages/play/service/service.wxss
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
.container { .container {
margin-top: 120rpx; margin-top: 120rpx;
padding-bottom: 20rpx; padding-bottom: 20rpx;
background: linear-gradient(182deg, #FFFFFF 0%, #EBEFF7 100%); background: linear-gradient(182deg, #fff 0%, #ebeff7 100%);
} }
/* 详情 */ /* 详情 */
.detail { .detail {
width: 750rpx; width: 750rpx;
min-height: 500rpx; min-height: 500rpx;
...@@ -22,6 +23,7 @@ ...@@ -22,6 +23,7 @@
} }
/* 商店详情 */ /* 商店详情 */
.shop-item { .shop-item {
position: relative; position: relative;
width: 750rpx; width: 750rpx;
...@@ -40,13 +42,12 @@ ...@@ -40,13 +42,12 @@
position: absolute; position: absolute;
width: 534rpx; width: 534rpx;
height: 96rpx; height: 96rpx;
background: #86C5E1; background: #86c5e1;
border-radius: 2px; border-radius: 2px;
overflow: hidden; overflow: hidden;
font-size: 30rpx; font-size: 30rpx;
font-weight: 500; font-weight: 500;
color: #ffffff; color: #fff;
line-height: 42rpx; line-height: 42rpx;
} }
...@@ -55,10 +56,12 @@ ...@@ -55,10 +56,12 @@
width: 750rpx; width: 750rpx;
height: 1106rpx; height: 1106rpx;
} }
.shop-bg { .shop-bg {
width: 750rpx; width: 750rpx;
height: 436rpx; height: 436rpx;
} }
.shop-art-cover { .shop-art-cover {
position: absolute; position: absolute;
right: 0; right: 0;
...@@ -67,6 +70,7 @@ ...@@ -67,6 +70,7 @@
width: 478rpx; width: 478rpx;
height: 362rpx; height: 362rpx;
} }
.shop-content { .shop-content {
position: absolute; position: absolute;
top: 231rpx; top: 231rpx;
...@@ -75,72 +79,93 @@ ...@@ -75,72 +79,93 @@
height: 716rpx; height: 716rpx;
background-color: #fff; background-color: #fff;
} }
.shop-logo { .shop-logo {
height: 206rpx; height: 206rpx;
} }
.art-logo { .art-logo {
width: 66rpx; width: 66rpx;
height: 122rpx; height: 122rpx;
margin: 42rpx 0 0 66rpx; margin: 42rpx 0 0 66rpx;
} }
.art-logo { .art-logo {
width: 66rpx; width: 66rpx;
height: 122rpx; height: 122rpx;
margin: 42rpx 0 0 66rpx; margin: 42rpx 0 0 66rpx;
} }
.flower-logo { .flower-logo {
width: 124rpx; width: 124rpx;
height: 88rpx; height: 88rpx;
margin: 62rpx 0 0 60rpx; margin: 62rpx 0 0 60rpx;
} }
.spa-logo { .spa-logo {
width: 124rpx; width: 124rpx;
height: 100rpx; height: 100rpx;
margin: 56rpx 0 0 50rpx; margin: 56rpx 0 0 50rpx;
} }
.food-logo { .food-logo {
width: 100rpx; width: 100rpx;
height: 104rpx; height: 104rpx;
margin: 56rpx 0 0 60rpx; margin: 56rpx 0 0 60rpx;
} }
.mojito-logo { .mojito-logo {
width: 182rpx; width: 182rpx;
height: 70rpx; height: 70rpx;
margin: 74rpx 0 0 60rpx; margin: 74rpx 0 0 60rpx;
} }
.movie-logo { .movie-logo {
width: 168rpx; width: 168rpx;
height: 66rpx; height: 66rpx;
margin: 84rpx 0 0 60rpx; margin: 84rpx 0 0 60rpx;
} }
.shop-name text { .shop-name text {
margin: 10rpx 60rpx 0; margin: 10rpx 60rpx 0;
font-size: 38rpx; font-size: 38rpx;
font-weight: 600; font-weight: 600;
color: #15191F; color: #15191f;
line-height: 52rpx; line-height: 52rpx;
} }
.shop-summary { .shop-summary {
display: -webkit-box;
height: 72rpx; height: 72rpx;
margin: 40rpx 60rpx 0; margin: 40rpx 60rpx 0;
font-size: 26rpx; font-size: 26rpx;
color: #959DA9;
line-height: 36rpx; line-height: 36rpx;
color: #959da9;
overflow: hidden;
text-overflow: ellipsis;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
} }
.shop-date { .shop-date {
margin: 80rpx 60rpx 0; margin: 80rpx 60rpx 0;
} }
.shop-date text:nth-child(1) { .shop-date text:nth-child(1) {
font-size: 26rpx; font-size: 26rpx;
color: #959DA9; color: #959da9;
line-height: 36rpx; line-height: 36rpx;
} }
.shop-date text:nth-child(2) { .shop-date text:nth-child(2) {
margin-left: 48rpx; margin-left: 48rpx;
font-size: 26rpx; font-size: 26rpx;
color: #15191F; color: #15191f;
line-height: 36rpx; line-height: 36rpx;
} }
.shop-btn { .shop-btn {
width: 534rpx; width: 534rpx;
height: 96rpx; height: 96rpx;
...@@ -149,6 +174,6 @@ ...@@ -149,6 +174,6 @@
font-size: 30rpx; font-size: 30rpx;
line-height: 96rpx; line-height: 96rpx;
text-align: center; text-align: center;
background: #86C5E1; background: #86c5e1;
border-radius: 4rpx; border-radius: 4rpx;
} }
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