Skip to content

严立 / mini-shimao

Go to a project
Commit da21f560 by 严立
Options

LL - 代码合并

parents 436852ef 61ac35fc
Inline Side-by-side
Showing with 48 additions and 12 deletions
pages/commodity/project/project.wxss
...@@ -107,6 +107,10 @@ ...@@ -107,6 +107,10 @@
color: #959DA9; color: #959DA9;
} }
.commodity-price {
text-align: right;
}
.commodity-price-symbol { .commodity-price-symbol {
height: 32rpx; height: 32rpx;
font-size: 24rpx; font-size: 24rpx;
......
pages/mine/home/home.wxml
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
</view> </view>
<view wx:if="{{isRegister}}" class="mine-info col"> <view wx:if="{{isRegister}}" class="mine-info col">
<view class="row align-c" style="height:76rpx"> <view class="row align-c" style="height:70rpx">
<text>{{userInfo.name}}</text> <text>{{userInfo.name}}</text>
<image src="./image/inform.png" bindtap="goMyInfo"></image> <image src="./image/inform.png" bindtap="goMyInfo"></image>
</view> </view>
...@@ -37,11 +37,11 @@ ...@@ -37,11 +37,11 @@
<image class="background-image" style="height:512rpx;" <image class="background-image" style="height:512rpx;"
src="http://upload.miaomiao-bao.com/8f046202008201043321555.jpg"></image> src="http://upload.miaomiao-bao.com/8f046202008201043321555.jpg"></image>
<view class="row align-c approve"> <view class="row align-c approve">
<view class="mine-avatar"> <view class="mine-avatar mine-avatar-special">
<l-avatar size="112" src="{{userInfo.avatar}}" /> <image src="{{userInfo.avatar}}"></image>
</view> </view>
<view class="mine-info col"> <view class="mine-info col">
<view class="row align-c" style="height:76rpx"> <view class="row align-c" style="height:60rpx">
<text style="color:#F0DABB;font-weight:500;" class="padding-l-18">{{userInfo.name}}</text> <text style="color:#F0DABB;font-weight:500;" class="padding-l-18">{{userInfo.name}}</text>
<image src="/image/inform-w.png" bindtap="goMyInfo"></image> <image src="/image/inform-w.png" bindtap="goMyInfo"></image>
</view> </view>
......
pages/mine/home/home.wxss
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
line-height: 40rpx; line-height: 40rpx;
border-radius: 4rpx; border-radius: 4rpx;
letter-spacing: 10rpx; letter-spacing: 10rpx;
margin-top: 20rpx; margin-top: 8rpx;
} }
.owner-tag { .owner-tag {
...@@ -47,6 +47,16 @@ ...@@ -47,6 +47,16 @@
.mine-avatar { .mine-avatar {
z-index: 11; z-index: 11;
margin-right: 32rpx; margin-right: 32rpx;
width: 136rpx;
height: 136rpx;
}
.mine-avatar-special {
display: flex;
justify-content: center;
align-items: center;
border-radius: 50%;
background-color: #F0DABB;
} }
.mine-avatar>image { .mine-avatar>image {
...@@ -54,6 +64,9 @@ ...@@ -54,6 +64,9 @@
height: 128rpx; height: 128rpx;
border-radius: 50%; border-radius: 50%;
} }
.mine-info {
padding-top: 12rpx;
}
.mine-info view:nth-child(1) text { .mine-info view:nth-child(1) text {
z-index: 11; z-index: 11;
...@@ -81,11 +94,12 @@ ...@@ -81,11 +94,12 @@
font-size: 54rpx; font-size: 54rpx;
line-height: 76rpx; line-height: 76rpx;
padding-right: 80rpx; padding-right: 80rpx;
font-weight: 600;
} }
.integral-title { .integral-title {
display: flex; display: flex;
height: 80rpx; height: 52rpx;
align-items: center; align-items: center;
font-size: 26rpx; font-size: 26rpx;
line-height: 36rpx; line-height: 36rpx;
......
pages/play/activity/activity.wxml
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
<view class="row con-c align-c"> <view class="row con-c align-c">
<image src="{{item.cover}}" mode="aspectFill"></image> <image src="{{item.cover}}" mode="aspectFill"></image>
</view> </view>
<text class="route-item-title">{{item.title}}</text> <text class="route-item-title">{{item.name}}</text>
<text class="route-item-content">{{item.date}}</text> <text class="route-item-content">{{item.date}}</text>
</view> </view>
</block> </block>
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<text>{{'# ' + itemTags}}</text> <text>{{'# ' + itemTags}}</text>
</block> </block>
</view> </view>
<text class="route-item-title">{{item.title}}</text> <text class="route-item-title">{{item.name}}</text>
<text class="route-item-content">{{item.date}}</text> <text class="route-item-content">{{item.date}}</text>
</view> </view>
</block> </block>
......
pages/play/movie-detail/movie-detail.js
...@@ -93,7 +93,7 @@ Page({ ...@@ -93,7 +93,7 @@ Page({
// console.log(timeList) // console.log(timeList)
timeList.forEach(key => { timeList.forEach(key => {
let tempItem = {} let tempItem = {}
if (key === App.modular.miment().format('YYYY-MM-DD')) { if (key === App.modular.miment().format('YYYY-MM-DD') && movieInfo.today.length > 0) {
tempItem = { tempItem = {
id: 0, id: 0,
name: '今日' + App.modular.miment().format('MM月DD日') name: '今日' + App.modular.miment().format('MM月DD日')
......
pages/play/service-detail/service-detail.js
...@@ -64,6 +64,7 @@ Page({ ...@@ -64,6 +64,7 @@ Page({
detailEvaluate: [], // 评论 detailEvaluate: [], // 评论
evaluateAlbum: [], evaluateAlbum: [],
emptyImg: App.globalData.appResourcesBase + 'play/service/nothing.jpg',
isBlack: false, isBlack: false,
...@@ -648,9 +649,26 @@ Page({ ...@@ -648,9 +649,26 @@ Page({
onBuyCommodity: function (event) { onBuyCommodity: function (event) {
let id = event.currentTarget.dataset.id let id = event.currentTarget.dataset.id
let classifyId = event.currentTarget.dataset.classid let classifyId = event.currentTarget.dataset.classid
wx.navigateTo({
url: '/pages/commodity/menu-food/menu-food?commodityId=' + id + '&sideBarId=' + classifyId console.log(this.data.option)
}) switch (Number(this.data.option.id)) {
case 7:
let funcCommodityInfo = this.data.detailCommodity.filter(v => v.id === id)[0]
funcCommodityInfo.quantity = 1
funcCommodityInfo.quantityMin = 1
funcCommodityInfo.quantityMax = 1
funcCommodityInfo.isActive = true
wx.setStorageSync('shoppingCartBuffer', [funcCommodityInfo])
wx.navigateTo({
url: '/pages/play/service-sell/service-sell'
})
break
default:
wx.navigateTo({
url: '/pages/commodity/menu-food/menu-food?commodityId=' + id + '&sideBarId=' + classifyId
})
}
}, },
// 跳转到能量补给站 // 跳转到能量补给站
onBuySnacks(event) { onBuySnacks(event) {
......
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