Branch_ccc #4

Merged
root merged 7 commits from Branch_ccc into master 2024-10-09 13:58:41 +08:00
9 changed files with 21 additions and 20 deletions
Showing only changes of commit a8aa76b651 - Show all commits

View File

@ -1,7 +1,7 @@
<!-- 个人中心支持装修 --> <!-- 个人中心支持装修 -->
<template> <template>
<s-layout <s-layout
title=" " title="个人中心"
tabbar="/pages/index/user" tabbar="/pages/index/user"
navbar="normal" navbar="normal"
:bgStyle="template.page" :bgStyle="template.page"

View File

@ -218,7 +218,7 @@
line-height: 20px; line-height: 20px;
font-size: 16px; font-size: 16px;
font-weight: 600; font-weight: 600;
border-bottom: 1px solid #dcdcdc; // border-bottom: 1px solid #dcdcdc;
} }
.grid-wrap { .grid-wrap {

View File

@ -27,7 +27,7 @@
import imag1 from '@/static/images/no_take.png' import imag1 from '@/static/images/no_take.png'
import imag2 from '@/static/images/no_comment.png' import imag2 from '@/static/images/no_comment.png'
import imag3 from '@/static/images/order.png' import imag3 from '@/static/images/order.png'
import imag4 from '@/static/images/order.png' import imag4 from '@/static/images/order2.png'
/** /**
* 装修组件 - 订单菜单组 * 装修组件 - 订单菜单组
*/ */
@ -86,7 +86,7 @@
line-height: 20px; line-height: 20px;
font-size: 16px; font-size: 16px;
font-weight: 600; font-weight: 600;
border-bottom: 1px solid #dcdcdc; // border-bottom: 1px solid #dcdcdc;
} }
.ss-order-menu-wrap { .ss-order-menu-wrap {

View File

@ -9,18 +9,9 @@
<view class="value-text ss-line-1">{{ fen2yuan(userWallet.balance) || '0.00' }}</view> <view class="value-text ss-line-1">{{ fen2yuan(userWallet.balance) || '0.00' }}</view>
<view class="unit-text ss-m-l-6"></view> <view class="unit-text ss-m-l-6"></view>
</view> </view>
<view class="menu-title ss-m-t-28">账户余额</view> <view class="menu-title ss-m-t-28">余额</view>
</view>
<view
class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
@tap="sheep.$router.go('/pages/user/wallet/score')"
>
<view class="value-box ss-flex ss-col-bottom">
<view class="value-text">{{ userInfo.point || 0 }}</view>
<view class="unit-text ss-m-l-6"></view>
</view>
<view class="menu-title ss-m-t-28">积分</view>
</view> </view>
<view <view
class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center" class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
@tap=" @tap="
@ -35,7 +26,17 @@
</view> </view>
<view class="menu-title ss-m-t-28">优惠券</view> <view class="menu-title ss-m-t-28">优惠券</view>
</view> </view>
<view <view
class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
@tap="sheep.$router.go('/pages/user/wallet/score')"
>
<view class="value-box ss-flex ss-col-bottom">
<view class="value-text">{{ userInfo.point || 0 }}</view>
<view class="unit-text ss-m-l-6"></view>
</view>
<view class="menu-title ss-m-t-28">积分</view>
</view>
<!-- <view
class="menu-item ss-flex-col ss-row-center ss-col-center menu-wallet" class="menu-item ss-flex-col ss-row-center ss-col-center menu-wallet"
@tap="sheep.$router.go('/pages/user/wallet/money')" @tap="sheep.$router.go('/pages/user/wallet/money')"
> >
@ -45,7 +46,7 @@
mode="aspectFit" mode="aspectFit"
/> />
<view class="menu-title ss-m-t-30">我的钱包</view> <view class="menu-title ss-m-t-30">我的钱包</view>
</view> </view> -->
</view> </view>
</template> </template>
@ -75,7 +76,7 @@
.menu-title { .menu-title {
font-size: 24rpx; font-size: 24rpx;
line-height: 24rpx; line-height: 24rpx;
color: #333333; color: white;
} }
.item-icon { .item-icon {
@ -89,7 +90,7 @@
.value-text { .value-text {
font-size: 28rpx; font-size: 28rpx;
color: #000000; color: white;
line-height: 28rpx; line-height: 28rpx;
vertical-align: text-bottom; vertical-align: text-bottom;
font-family: OPPOSANS; font-family: OPPOSANS;
@ -97,7 +98,7 @@
.unit-text { .unit-text {
font-size: 24rpx; font-size: 24rpx;
color: #343434; color: white;
line-height: 24rpx; line-height: 24rpx;
} }
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 806 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 726 B

After

Width:  |  Height:  |  Size: 606 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 934 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 1004 B

BIN
static/images/order2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 586 B