xinyilu/xinelu-applet-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source 
# Conflicts:
#	pagesB/modify/modify.scss
#	pagesB/modify/modify.vue
This commit is contained in:
辉 2023-09-22 11:10:37 +08:00
commit c36e398b05
5 changed files with 125 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pages.json
View File

@ -26,9 +26,16 @@
} }
} }
], ],
"subPackages": [{ "subPackages": [{
"root": "pagesB", "root": "pagesB",
"pages": [{ "pages": [
{
"path": "modify/modify",
"style": {
"navigationBarTitleText": "修改信息",
"enablePullDownRefresh": false
}
}, {
"path": "Behaviorpoints/Behaviorpoints", "path": "Behaviorpoints/Behaviorpoints",
"style": { "style": {
"navigationBarTitleText": "行为积分", "navigationBarTitleText": "行为积分",

138
pagesB/Behaviorpoints/Behaviorpoints.scss
View File

@ -1,54 +1,14 @@
.app { .app {
.bottomitem{ background-color: #F7F5F5;
position: relative; height:100vh;
.Establishingarchives{ padding-top: 30rpx;
font-size: 30rpx; .background{
font-family: Source Han Sans CN; height:100%;
font-weight: 400; background-color: #fff;
color: #333333; width: 95%;
line-height: 38rpx; margin: 0 auto;
padding: 8px 10px 5px 18px;
}
.integraltwo{
position: absolute;
top: 72%;
right: 3%;
color: red;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.integral{
position: absolute;
top: 36%;
right: 3%;
color: #26A888;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.timeone{
font-size: 20rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #333333;
line-height: 38rpx;
padding: 0 10px 10px 18px;
border-bottom: 1px solid #E6E6E6;
}
.PointsRecord {
font-size: 30rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #000000;
line-height: 33rpx;
padding: 8px 10px 10px 15px;
}
}
.content { .content {
margin: 10rpx auto;
position: relative; position: relative;
image { image {
width: 100%; width: 100%;
height: 319rpx; height: 319rpx;
@ -78,21 +38,10 @@
text-align: center; text-align: center;
line-height: 54rpx; line-height: 54rpx;
} }
.number {
font-size: 56rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #FFFFFF;
line-height: 33rpx;
position: absolute;
top: 35%;
left: 40%;
text-overflow: ellipsis;
white-space: nowrap;
}
.name { .name {
width: 119px; width: 90%;
height: 29px; height: 100rpx;
font-size: 30rpx; font-size: 30rpx;
font-family: Source Han Sans CN; font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
@ -101,6 +50,71 @@
top: 10%; top: 10%;
left: 5%; left: 5%;
line-height: 33rpx; line-height: 33rpx;
}
.number {
font-size: 56rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #FFFFFF;
position: absolute;
left: 50%;
top: 25%;
transform: translateX(-50%);
text-overflow: ellipsis;
white-space: nowrap;
}
}
.bottomitem{
position: relative;
background-color: #FFF;
margin: 0 auto;
.Establishingarchives{
font-size: 30rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #333333;
line-height: 38rpx;
padding: 8px 10px 5px 18px;
}
.integraltwo{
position: absolute;
top: 75%;
right: 3%;
color: red;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.integral{
position: absolute;
top: 34%;
right: 3%;
color: #26A888;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.timeone{
font-size: 20rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #333333;
line-height: 38rpx;
padding: 0 10px 10px 18px;
border-bottom: 1px solid #E6E6E6;
}
.PointsRecord {
font-size: 30rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #000000;
line-height: 33rpx;
padding: 10px 10px 10px 15px;
} }
} }
} }
}

69
pagesB/Behaviorpoints/Behaviorpoints.vue
View File

@ -1,42 +1,45 @@
<template> <template>
<view class="app"> <view class="app">
<view class="content"> <view class="background">
<image src="/static/pagesB/Behave.png" mode=""></image> <view class="content">
<view class="name">我的积分 <image src="/static/pagesB/Behave.png" mode=""></image>
</view> <view class="name">我的积分
<view class="number">1000 </view>
</view> <view class="number">1000
<view class="PointsMall"> </view>
积分商城 <view class="PointsMall">
</view> 积分商城
<view class="Exchangerecords"> </view>
兑换记录 <view class="Exchangerecords">
</view> 兑换记录
</view>
</view>
<view class="bottomitem">
<view class="PointsRecord">
积分记录
</view> </view>
<view class="Establishingarchives"> <view class="bottomitem">
建立档案 <view class="PointsRecord">
</view> 积分记录
<view class="integral"> </view>
+200 <view class="Establishingarchives">
</view> 建立档案
<view class="timeone"> </view>
2023-03-09 13:23:12 <view class="integral">
</view> +20000
<view class="Establishingarchives"> </view>
兑换商品 <view class="timeone">
</view> 2023-03-09 13:23:12
<view class="integraltwo"> </view>
-2000 <view class="Establishingarchives">
</view> 兑换商品
<view class="timeone"> </view>
2023-03-09 13:23:12 <view class="integraltwo">
-2000000000
</view>
<view class="timeone">
2023-03-09 13:23:12
</view>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>