LL - ui 修复

b8006dfd · 严立 · 2cf686cc · b8006dfd · b8006dfd · b8006dfd
Commit b8006dfd authored Nov 17, 2020 by 严立
Showing with 99 additions and 52 deletions
app.wxss
component/m-input/m-input.wxss
pages/club/create/create.wxss
pages/club/enter/enter.wxss
pages/club/home/home.wxss
pages/club/member/member.wxss
pages/mall/home/home.js
pages/mall/home/home.wxml
pages/mall/home/home.wxss
pages/mine/appointment/appointment.js
pages/mine/club/club.js
pages/mine/club/club.wxss
pages/mine/home/home.wxml
pages/mine/home/home.wxss
pages/play/home/home.wxss
pages/play/service-detail/service-detail.js
pages/play/service-detail/service-detail.wxss
wxss/samcss-reset.wxss
--- a/app.wxss
+++ b/app.wxss
@@ -37,7 +37,7 @@
    height: 32rpx;
    padding: 0 12rpx;
    background: linear-gradient(180deg, #3F4357 0%, #252532 100%);
-    border-radius: 4px;
+    border-radius: 2px;
    font-size: 18rpx;
    font-weight: 500;
@@ -50,7 +50,7 @@
    height: 32rpx;
    padding: 0 12rpx;
    background: #FAEDEA;
-    border-radius: 4px;
+    border-radius: 2px;
    font-size: 18rpx;
    font-weight: 500;

--- a/component/m-input/m-input.wxss
+++ b/component/m-input/m-input.wxss
@@ -22,5 +22,5 @@
 }
 .m-input-input-placeholder {
+    color: #C2C7CF;
 }
\ No newline at end of file
--- a/pages/club/create/create.wxss
+++ b/pages/club/create/create.wxss
@@ -114,7 +114,7 @@
 .club-enter-tip > image {
    width: 32rpx;
    height: 32rpx;
-    margin-right: 8rpx;
+    margin: 4rpx 8rpx 0 0;
 }
 .club-enter-tip > text {

--- a/pages/club/enter/enter.wxss
+++ b/pages/club/enter/enter.wxss
@@ -7,6 +7,7 @@
 .club-info-logo {
    width: 128rpx;
    height: 128rpx;
+    border-radius: 2px;
    background: #999;
 }

--- a/pages/club/home/home.wxss
+++ b/pages/club/home/home.wxss
@@ -109,6 +109,7 @@
    width: 168rpx;
    height: 168rpx;
    margin-right: 28rpx;
+    border-radius: 2px;
    background: #999999;
 }

--- a/pages/club/member/member.wxss
+++ b/pages/club/member/member.wxss
@@ -117,6 +117,7 @@
 .club-info-logo {
    width: 128rpx;
    height: 128rpx;
+    border-radius: 2px;
    background: #999;
 }

--- a/pages/mall/home/home.js
+++ b/pages/mall/home/home.js
@@ -175,7 +175,7 @@ Page({
                funcList.push(funcItem)
            }
            this.setData({
-                goodsAllList: this.data.goodsAllList.concat(funcList)
+                goodsAllList: funcList
            })
        }).catch((response) => {})
    },
@@ -238,7 +238,6 @@ Page({
     */
    onTabChangeCommodity: function (funcEvent) {
        this.setData({
-            goodsAllList: [],
            tabGoodsIndex: funcEvent.detail.index
        })
        this.queryAllGoods()
@@ -252,7 +251,6 @@ Page({
     */
    onTabChangePrice: function (funcEvent) {
        this.setData({
-            goodsAllList: [],
            tabPriceIndex: funcEvent.detail.index
        })
        this.queryAllGoods()

--- a/pages/mall/home/home.wxml
+++ b/pages/mall/home/home.wxml
@@ -34,8 +34,8 @@
                                <image src="{{item.cover}}" mode="aspectFill"></image>
                                <text class="recommend_item_info_name overflow_point_1">{{item.name}}</text>
                                <view class="recommend_item_info_price row ac">
-                                    <text>{{item.price}}</text>
+                                    <text class="font_bold_26">{{item.price}}</text>
-                                    <text>积分</text>
+                                    <text class="font_normal_22 color_regular">积分</text>
                                </view>
                            </view>
                        </view>
@@ -57,8 +57,8 @@
                                <image src="{{item.cover}}" mode="aspectFill"></image>
                                <text class="recommend_item_info_name overflow_point_1">{{item.name}}</text>
                                <view class="recommend_item_info_price row ac">
-                                    <text>{{item.price}}</text>
+                                    <text class="font_bold_26">{{item.price}}</text>
-                                    <text>积分</text>
+                                    <text class="font_normal_22 color_regular">积分</text>
                                </view>
                            </view>
                        </view>
@@ -98,11 +98,11 @@
                                <text>{{item.name}}</text>
                            </view>
                            <view class="routine_item_info_price row ac">
-                                <text>{{item.price}}</text>
+                                <text class="font_bold_30">{{item.price}}</text>
-                                <text>积分</text>
+                                <text class="font_normal_26 color_regular">积分</text>
                            </view>
                            <view class="routine_item_info_exchange row ac">
-                                <text>{{'已兑换' + item.exchangeQuantity + '件'}}</text>
+                                <text>{{'已兑' + item.exchangeQuantity + '件'}}</text>
                            </view>
                        </view>
                    </view>

--- a/pages/mall/home/home.wxss
+++ b/pages/mall/home/home.wxss
@@ -104,7 +104,7 @@
 .recommend_item_info_name {
    max-width: 208rpx;
    height: 44rpx;
-    margin: 20rpx 0 0 0;
+    margin: 22rpx 0 0 0;
    font-size: 26rpx;
    font-weight: 800;
    line-height: 44rpx;    
@@ -112,24 +112,16 @@
 }
 .recommend_item_info_price {
-    margin: 4rpx 0 0 0;
+    margin: 6rpx 0 0 0;
 }
 .recommend_item_info_price > text:nth-child(1) {
-    height: 44rpx;
    margin: 0 4rpx 0 0;
-    font-size: 26rpx;
-    font-weight: 500;
-    line-height: 44rpx;    
    color: #EF4E4E;
 }
 .recommend_item_info_price > text:nth-child(2) {
-    height: 44rpx;
+    line-height: 20rpx;
-    font-size: 22rpx;
-    font-weight: 400;
-    line-height: 44rpx;   
-    color: #15191F; 
 }
 /* 所有商品 */
@@ -178,7 +170,7 @@
    border-bottom: 4rpx rgba(0, 0, 0, 0) solid;
    font-size: 26rpx;
-    font-weight: 800;
+    font-weight: 500;
    line-height: 36rpx;    
    color: #656E7B;
 }
@@ -217,6 +209,7 @@
    padding: 0 32rpx;
    border: 1px solid #D4D9E2;
    border-radius: 4px;
+    font-weight: 500;
    color: #656E7B;
 }
@@ -235,16 +228,16 @@
 .routine_item {
    display: inline-block;
    width: 324rpx;
-    height: 554rpx;
+    height: 558rpx;
    border-radius: 4px;    
-    margin: 0 22rpx 24rpx 0;
+    margin: 0 22rpx 16rpx 0;
    background: #FFFFFF;
    overflow: hidden;
 }
 .routine_item:nth-child(2n) {
-    margin: 0 0 24rpx 0;
+    margin: 0 0 16rpx 0;
 }
 .routine_item_info > image {
@@ -256,34 +249,28 @@
 .routine_item_info_name {
    width: 276rpx;
    height: 72rpx;
-    margin: 32rpx 24rpx 0 24rpx;
+    margin: 32rpx 24rpx 16rpx 24rpx;
+    overflow: hidden;
 }
 .routine_item_info_name > text {
+    line-height: 36rpx;
    font-size: 26rpx;
    font-weight: 800;
    color: #15191F;
 }
 .routine_item_info_price {
-    margin: 4rpx 24rpx 0 24rpx;
+    margin: 0 24rpx;
 }
 .routine_item_info_price > text:nth-child(1) {
-    height: 44rpx;
    margin: 0 4rpx 0 0;
-    font-size: 26rpx;
-    font-weight: 500;
-    line-height: 44rpx;    
    color: #EF4E4E;
 }
 .routine_item_info_price > text:nth-child(2) {
-    height: 44rpx;
+    line-height: 26rpx;
-    font-size: 22rpx;
-    font-weight: 400;
-    line-height: 44rpx;   
-    color: #15191F; 
 }
 .routine_item_info_exchange {

--- a/pages/mine/appointment/appointment.js
+++ b/pages/mine/appointment/appointment.js
@@ -97,7 +97,7 @@ Page({
        App.request({
            url: 'v1/activity/getMyActivityList',
            params: {
-                'type': '',
+                'type': '1,2',
                'activeState': '',
                'pageSize': this.data.pageSize,
                'pageNo': this.data.pageNo,

--- a/pages/mine/club/club.js
+++ b/pages/mine/club/club.js
@@ -59,7 +59,7 @@ Page({
                    'member': funcData[i].memberNum,
                    'memberId': funcData[i].memberId,
                    'state': Number(funcData[i].state),
-                    'date': funcData[i].date,
+                    'date': App.modular.miment(funcData[i].date + ' 00:00:00').format('YYYY.MM.DD'),
                    'adminWx': funcData[i].creatorImg,
                    'remark': funcData[i].remarks,
                    'isOwner': Number(funcData[i].owner) === 0 ? false : true
@@ -98,7 +98,7 @@ Page({
                    'memberId': funcData[i].memberId,
                    'examine': Number(funcData[i].count),
                    'state': Number(funcData[i].state),
-                    'date': funcData[i].date,
+                    'date': App.modular.miment(funcData[i].date + ' 00:00:00').format('YYYY.MM.DD'),
                    'remark': funcData[i].remarks,
                    'isOwner': Number(funcData[i].owner) === 0 ? false : true
                }

--- a/pages/mine/club/club.wxss
+++ b/pages/mine/club/club.wxss
@@ -41,6 +41,7 @@
    width: 140rpx;
    height: 140rpx;
    margin: 0 32rpx 0 0;
+    border-radius: 2px;
    background: #999999;
 }
@@ -98,6 +99,7 @@
    height: 56rpx;
    border-radius: 4px;
    border: 1px solid #C2C7CF;
+    background: #FFFFFF;
    font-size: 22rpx;
    font-weight: 500;

--- a/pages/mine/home/home.wxml
+++ b/pages/mine/home/home.wxml
@@ -17,7 +17,7 @@
                <!-- 登录状态 -->
                <view wx:if="{{userInfo.isSignIn}}" class="info-edit col cc">
-                    <view class="info-name row align-c">
+                    <view class="info-name row ac">
                        <text>{{userInfo.name}}</text>
                        <image src="{{imageBase + 'icon/edit-1.png'}}" bindtap="onEditInfo"></image>
                    </view>
@@ -66,8 +66,8 @@
                <!-- 登录状态 -->
                <view wx:if="{{userInfo.isSignIn}}" class="info-edit col cc">
-                    <view class="info-name row align-c">
+                    <view class="info-name row ac">
-                        <text class="info-owner">{{userInfo.name}}</text>
+                        <text class="info-owner overflow_point_1">{{userInfo.name}}</text>
                        <image src="{{imageBase + 'icon/edit-4.png'}}" bindtap="onEditInfo"></image>
                    </view>
                    <view class="info-status-owner row ac">
@@ -91,7 +91,7 @@
    <view class="list">
        <!-- 券码核销 -->
-        <view class="coupon-permissions row align-c" bindtap="goCouponInput" wx:if="{{isCouponPermissions}}">
+        <view class="coupon-permissions row ac" bindtap="goCouponInput" wx:if="{{isCouponPermissions}}">
            <view class="coupon-permissions-info col">
                <text>券码核销</text>
                <text>{{'所属门店：' + authInfo.officeName}}</text>
@@ -266,7 +266,7 @@
        </view>
        <!-- 我的俱乐部 -->
-        <view class="club row con-b align-c" bindtap="onToClub">
+        <view class="club row con-b ac" bindtap="onToClub">
            <view class="club_enter">
                <text>我的俱乐部</text>
            </view>
@@ -277,7 +277,7 @@
        </view>
        <!-- 客服中心 -->
-        <view class="service row con-b align-c" bindtap="onService">
+        <view class="service row con-b ac" bindtap="onService">
            <text>客服中心</text>
            <image class="icon" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
        </view>

--- a/pages/mine/home/home.wxss
+++ b/pages/mine/home/home.wxss
@@ -55,6 +55,11 @@
    color: #15191F;
 }
+.info-name > text {
+    max-width: 260rpx;
+    white-space: nowrap;
+}
 .info-name > image {
    width: 40rpx;
    height: 40rpx;

--- a/pages/play/home/home.wxss
+++ b/pages/play/home/home.wxss
@@ -327,6 +327,7 @@
 /* 游客攻略 */
 .route {
    width: 750rpx;
+    margin: 50rpx 0 0 0;
    padding: 0 40rpx 100rpx 40rpx;
    background: linear-gradient(180deg, #FFFFFF 0%, #F2F2F2 100%);
 }

--- a/pages/play/service-detail/service-detail.js
+++ b/pages/play/service-detail/service-detail.js
@@ -48,6 +48,8 @@ Page({
        cssDetail: '', // 详情底部边距
+        activityTypeTag: [],
        winActivity: false, // 近期活动
        winCommodity: false, // 商品列表
@@ -62,7 +64,7 @@ Page({
            option: options,
        })
-        this.queryDetail(Number(options.id))
+        this.setActivityTypeTag()
        // 根据商店查询相关订制内容
        switch (Number(options.id)) {
            case 1:
@@ -134,6 +136,34 @@ Page({
    },
    /**
+     *  设置电影类型标签
+     *  @function
+     *  @param {object} - funcEvent
+     *  @returns
+     */
+    setActivityTypeTag: function () {
+        App.request({
+            url: 'v1/common/getSmTags',
+            params: {
+                'types': 2
+            }
+        }).then((response) => {
+            let funcData = response.data
+            let funcList = []
+            for (let i = 0, l = funcData.length; i < l; i++) {
+                funcList.push({
+                    'text': funcData[i].name,
+                    'value': funcData[i].tagId,
+                })
+            }
+            this.setData({ 
+                activityTypeTag: funcList,
+            })
+            this.queryDetail(Number(this.data.options.id))
+        })
+    },
+    /**
     *  获取商店信息，缓存商店信息
     *  @function
     *  @param {string} - funcToken
@@ -382,7 +412,7 @@ Page({
                        'priceSpecial': funcResponse[i].ownerPrice, // 业主价
                        'priceSpecialText': App.modular.utils.formatAmount(funcResponse[i].ownerPrice), // 业主价文本格式
                        'tagIds': funcResponse[i].tagIds,
-                        'tagNames': funcResponse[i].tagNames,
+                        'tagNames': this.ignoreActivityTypeTag([]),
                        'date': funcResponse[i].activeDate + ' ' + funcResponse[i].activeTime, // 活动时间
                        'priceType': 1,
                    }
@@ -924,4 +954,19 @@ Page({
            winEvaluateAlbum: false
        })
    },
+    /**
+     *  过滤活动标签
+     *  @function
+     *  @param {array} - funcIgnoreTag
+     *  @returns
+     */
+    ignoreActivityTypeTag: function (funcIgnoreTag) {
+        let funcRemainTag = []
+        let funcActivityTypeTag = this.data.activityTypeTag
+        for (let i = 0, l = funcActivityTypeTag.length; i < l; i++) {
+            if (!funcIgnoreTag.includes(funcActivityTypeTag[i].value)) funcRemainTag.push(funcActivityTypeTag[i].text)
+        }
+        return funcRemainTag
+    },
 })
\ No newline at end of file
--- a/pages/play/service-detail/service-detail.wxss
+++ b/pages/play/service-detail/service-detail.wxss
@@ -347,7 +347,7 @@
    text-align: center;
    font-size: 18rpx;
    font-weight: 500;
-    line-height: 32rpx;
+    line-height: 26rpx;
    color: #86c5e1;
 }

--- a/wxss/samcss-reset.wxss
+++ b/wxss/samcss-reset.wxss
@@ -15,6 +15,10 @@ textarea {
    box-sizing: border-box !important;
 }
+button {
+    background: rgba(0, 0, 0, 0);
+}
 button::after {
    border: none;
 }