LL - 代码合并

pages/commodity/project/project.wxss

@@ -107,6 +107,10 @@
     color: #959DA9;
 }
 
+.commodity-price {
+    text-align: right;
+}
+
 .commodity-price-symbol {
     height: 32rpx;
     font-size: 24rpx;

pages/mine/home/home.wxml

@@ -9,7 +9,7 @@
             </view>
 
             <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>
                     <image src="./image/inform.png" bindtap="goMyInfo"></image>
                 </view>
@@ -37,11 +37,11 @@
         <image class="background-image" style="height:512rpx;"
             src="http://upload.miaomiao-bao.com/8f046202008201043321555.jpg"></image>
         <view class="row align-c approve">
-            <view class="mine-avatar">
-                <l-avatar size="112" src="{{userInfo.avatar}}" />
+            <view class="mine-avatar mine-avatar-special">
+                <image src="{{userInfo.avatar}}"></image>
             </view>
             <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>
                     <image src="/image/inform-w.png" bindtap="goMyInfo"></image>
                 </view>

pages/mine/home/home.wxss

@@ -35,7 +35,7 @@
     line-height: 40rpx;
     border-radius: 4rpx;
     letter-spacing: 10rpx;
-    margin-top: 20rpx;
+    margin-top: 8rpx;
 }
 
 .owner-tag {
@@ -47,6 +47,16 @@
 .mine-avatar {
     z-index: 11;
     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 {
@@ -54,6 +64,9 @@
     height: 128rpx;
     border-radius: 50%;
 }
+.mine-info {
+    padding-top: 12rpx;
+}
 
 .mine-info view:nth-child(1) text {
     z-index: 11;
@@ -81,11 +94,12 @@
     font-size: 54rpx;
     line-height: 76rpx;
     padding-right: 80rpx;
+    font-weight: 600;
 }
 
 .integral-title {
     display: flex;
-    height: 80rpx;
+    height: 52rpx;
     align-items: center;
     font-size: 26rpx;
     line-height: 36rpx;

pages/play/activity/activity.wxml

@@ -73,7 +73,7 @@
                             <view class="row con-c align-c">
                                 <image src="{{item.cover}}" mode="aspectFill"></image>
                             </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>
                         </view>
                     </block>
@@ -91,7 +91,7 @@
                                     <text>{{'# ' + itemTags}}</text>
                                 </block>
                             </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>
                         </view>
                     </block>

pages/play/movie-detail/movie-detail.js

@@ -93,7 +93,7 @@ Page({
                 // console.log(timeList)
                 timeList.forEach(key => {
                     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 = {
                             id: 0,
                             name: '今日' + App.modular.miment().format('MM月DD日')

pages/play/service-detail/service-detail.js

@@ -64,6 +64,7 @@ Page({
         detailEvaluate: [],                 // 评论
         evaluateAlbum: [],
 
+        emptyImg: App.globalData.appResourcesBase + 'play/service/nothing.jpg',
 
         isBlack: false,
 
@@ -648,9 +649,26 @@ Page({
     onBuyCommodity: function (event) {
         let id = event.currentTarget.dataset.id
         let classifyId = event.currentTarget.dataset.classid
+        
+        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) {