yangjun
/
sadjv3_jishi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

This commit is contained in:
Mr.jiang 2024-07-25 09:28:48 +08:00
parent 66968f8db0 c0e27caf25
commit 469e5db2ba
10 changed files with 1519 additions and 1275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2371
my/order/revenueDetails.vue
View File

File diff suppressed because it is too large Load Diff

172
pages/index/index.vue
View File

@ -2,20 +2,20 @@
<!-- 技师实际收益公式：实付金额=（项目金额*会员比例-优惠卷）*分成比例*余额支付比例+车费 -->
<view style="padding-bottom: 17px;">
<view class="jishi-index">
<view class=" u-flex padding-lr justify-between" style="padding-top: 30px;">
<view class="u-m-r-10 back-img"
<view class="u-flex justify-between avatar-section">
<view class="back-img"
:style="{'background-image':
technicianType=='3'?'url(../../static/grade1.png)':
technicianType=='3'?'url(../../static/grade1.gif)':
technicianType=='4'?'url(../../static/grade2.png)':
technicianType=='5'?'url(../../static/grade3.png)':''
}">
<image :src="avatar" class="head-port"
@click="goNav('/pages/my/userinfo')"></image>
</view>
<view style="position: relative;" class="u-flex-1 margin-left-sm text-white" v-if="isLogin && userName">
<view style="position: relative;" class="u-flex-1 margin-left-sm" v-if="isLogin && userName">
<view class="flex align-center justify-between">
<view class="">
<view class="u-font-18 text-white" @click="goNav('/pages/my/user')">
<view class="u-font-18 avatar-section-text" @click="goNav('/pages/my/user')">
欢迎，{{ userName }}
</view>
<view class="labe margin-top-xs" @tap="stateSave" v-if="XCXIsSelect != '否'">
@ -85,69 +85,70 @@
<view>访客人数</view>
</view>
</view> -->
</view>
<view style="margin-top: -156px;padding: 30rpx;">
<view class="dengjibox">
<view class="djtit">当前等级</view>
<view class="djimg" @click="level">{{ currentGrade ? currentGrade : "A0" }}</view>
<view class="" style="margin-top: 20px;">
<!-- <text style="font-size: 30px;font-weight: bold;">当前业绩：{{ currentWholeIncome ? currentWholeIncome : 0 }}</text> -->
<!-- <text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text> -->
</view>
<!-- <u-line-progress active-color="#46a396" :show-percent="false" :height="38" inactive-color="#098f7a"
:percent="lineProgressData" :striped-active="true"></u-line-progress>
<view v-if="!maxStatus && longUpgradeDescriptionSet.differenceOutstandingAchievement" class="dengji-text">
还差{{ longUpgradeDescriptionSet.differenceOutstandingAchievement }}业绩;{{ longUpgradeDescriptionSet.differenceIntegral }}积分;可以升级{{ longUpgradeDescriptionSet.differenceGrade }}<u-icon
style="padding-left: 2px;" size="30" color="#ffffff" name="question-circle-fill"
@click="clickIcon" index="0"></u-icon>
</view>
<view v-if="maxStatus" class=" dengji-text">
您已达到最高等级
</view>
<view>
<u-popup v-model="showIconPopup" mode="center" border-radius="14" width="90%" height="240rpx"
closeable>
<view class="import" style="padding: 0px 10px;">
<view class="innerPopup">
<view class="" style="font-size: 18px;font-weight: bold;">
当前{{ currentGrade }}等级，距离{{ longUpgradeDescriptionSet.differenceGrade }}等级还需:
</view>
<view class="innerOfPopup">
<view class="firstInnerOfPopup">
{{ longUpgradeDescriptionSet.differenceOutstandingAchievement }}业绩&nbsp;&nbsp;{{ longUpgradeDescriptionSet.differenceIntegral }}积分&nbsp;&nbsp;{{ longUpgradeDescriptionSet.differenceClockRate }}加钟率
<view >
<view class="dengjibox">
<view class="djtit">当前等级</view>
<view class="djimg" @click="level">{{ currentGrade ? currentGrade : "A0" }}</view>
<view class="" style="margin-top: 20px;">
<!-- <text style="font-size: 30px;font-weight: bold;">当前业绩：{{ currentWholeIncome ? currentWholeIncome : 0 }}</text> -->
<!-- <text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text> -->
</view>
<!-- <u-line-progress active-color="#46a396" :show-percent="false" :height="38" inactive-color="#098f7a"
:percent="lineProgressData" :striped-active="true"></u-line-progress>
<view v-if="!maxStatus && longUpgradeDescriptionSet.differenceOutstandingAchievement" class="dengji-text">
还差{{ longUpgradeDescriptionSet.differenceOutstandingAchievement }}业绩;{{ longUpgradeDescriptionSet.differenceIntegral }}积分;可以升级{{ longUpgradeDescriptionSet.differenceGrade }}<u-icon
style="padding-left: 2px;" size="30" color="#ffffff" name="question-circle-fill"
@click="clickIcon" index="0"></u-icon>
</view>
<view v-if="maxStatus" class=" dengji-text">
您已达到最高等级
</view>
<view>
<u-popup v-model="showIconPopup" mode="center" border-radius="14" width="90%" height="240rpx"
closeable>
<view class="import" style="padding: 0px 10px;">
<view class="innerPopup">
<view class="" style="font-size: 18px;font-weight: bold;">
当前{{ currentGrade }}等级，距离{{ longUpgradeDescriptionSet.differenceGrade }}等级还需:
</view>
<view class="firstInnerOfPopup">
{{ longUpgradeDescriptionSet.differenceDurationOnline }}小时在线时长&nbsp;&nbsp;
<view class="innerOfPopup">
<view class="firstInnerOfPopup">
{{ longUpgradeDescriptionSet.differenceOutstandingAchievement }}业绩&nbsp;&nbsp;{{ longUpgradeDescriptionSet.differenceIntegral }}积分&nbsp;&nbsp;{{ longUpgradeDescriptionSet.differenceClockRate }}加钟率
</view>
<view class="firstInnerOfPopup">
{{ longUpgradeDescriptionSet.differenceDurationOnline }}小时在线时长&nbsp;&nbsp;
</view>
</view>
</view>
</view>
</u-popup>
</view> -->
<view class="flex align-center"
style="justify-content: space-evenly;text-align: center;">
<view class="" @click="handleYeji">
<view class="money_text1">{{ currentWholeIncome ? currentWholeIncome : 0 }}</view>
<text class="money_text2">当前业绩</text>
<!-- <text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text> -->
</view>
</u-popup>
</view> -->
<view class="flex align-center"
style="justify-content: space-evenly;text-align: center;">
<view class="" @click="handleYeji">
<view style="font-size: 24px;font-weight: bold;">{{ currentWholeIncome ? currentWholeIncome : 0 }}</view>
<text style="font-size: 14px; ">当前业绩</text>
<!-- <text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text> -->
</view>
<view class="shuxian"></view>
<view class="" @click="dangqian">
<view class="" style="font-size: 24px;font-weight: bold;">
{{ currentRealIncome ? currentRealIncome : 0 }}
<view class="shuxian"></view>
<view class="" @click="dangqian">
<view class="money_text1">
{{ currentRealIncome ? currentRealIncome : 0 }}
</view>
<view class="money_text2">当期项目收益(元)</view>
</view>
<view class="" style="font-size: 14px;">当期项目收益(元)</view>
</view>
<view class="shuxian"></view>
<view class="" @tap="goNav('/pages/index/currentPoints')">
<view class="" style="font-size: 24px;font-weight: bold;">{{ currentIntegral ? currentIntegral : 0 }}
<view class="shuxian"></view>
<view class="" @tap="goNav('/pages/index/currentPoints')">
<view class="money_text1">{{ currentIntegral ? currentIntegral : 0 }}
</view>
<view class="money_text2" >当期积分</view>
</view>
<view class="" style="font-size: 14px;" >当期积分</view>
</view>
</view>
</view>
</view>
<view class="csda">
<view class="flex align-center" style="font-size: 16px;font-weight: bold;color: #fff;margin-top: 8px; margin-left: 15rpx;">
物料记录
@ -1567,8 +1568,6 @@ export default {
.back-img{
background-repeat: no-repeat;
background-size: 100%;
width: 84px;
height: 84px;
border-radius: 50%;
display: flex;
align-items: center;
@ -1579,9 +1578,10 @@ export default {
width: 61px;
height: 30px;
line-height: 30px;
border: 1px solid #fff;
color: #fff;
font-size: 12px;
background-image: linear-gradient(-48deg, #ffcb51,#ffc24a,#fe7416);
border: 1px solid #ffbf49;
color: #ffffb2;
font-size: 28rpx;
text-align: center;
position: absolute;
top: 0;
@ -1669,15 +1669,16 @@ page {
.gxbox {
display: flex;
font-size: 20rpx;
width: 100%;
background-color: #019c88;
font-size: 24rpx;
width: 96%;
margin: 0 auto;
color: #fff;
border-radius: 15px 15px 0 0;
padding: 0 30rpx;
height: 60rpx;
margin-top: 2rpx;
justify-content: space-between;
background: linear-gradient(-48deg,rgba(104, 206, 190, 0.35),rgba(50, 191, 173, 0.7));
}
.wztext {
@ -1686,15 +1687,13 @@ page {
//text-overflow: ellipsis;
white-space: nowrap;
}
.dengjibox {
position: relative;
width: 100%;
height: 276rpx;
background: linear-gradient(-45deg, #88d7c9, #1BB9A5, #88d7c9);
//box-shadow: 0rpx 0rpx 16rpx 0rpx rgba(26,25,26,0.3);
border-radius: 20rpx 20rpx 0 0;
border-radius: 20rpx;
padding: 30rpx;
color: #ffffff;
display: flex;
@ -1723,10 +1722,10 @@ page {
background: url(../../static/images/index/vip.png) no-repeat center;
background-size: cover;
width: 220rpx;
height: 77px;
height: 85px;
font-size: 22px;
text-align: center;
line-height: 90px;
line-height:100px;
}
.xianb {
@ -1770,10 +1769,9 @@ page {
border: 2px #ededed solid;
border-radius: 10px;
padding: 30rpx;
background: #fff;
text-align:center;
background: #fff;
}
.tapDsalk {
width: 31%;
border: 2px #ededed solid;
@ -1782,7 +1780,6 @@ page {
border: 2px solid rgb(207, 237, 225);
background-color: rgb(246, 252, 250);
}
.sda {
height: 36px;
line-height: 30px;
@ -1799,8 +1796,8 @@ page {
}
.online-tag {
color: #ffffff;
font-size: 29rpx;
color: #019c88;
font-size: 26rpx;
}
.img-avatar {
@ -2051,10 +2048,9 @@ uni-switch::before {
width: 75%;
}
.head-port{
width: 55px;
height: 55px;
width:64px;
height:64px;
border-radius: 50%;
margin-bottom: 5px;
}
.title-font{
@ -2073,5 +2069,19 @@ uni-switch::before {
.padding-sm{
padding: 11px 11px 0px 11px;
}
.avatar-section{
padding:50rpx 0 30rpx 0;
}
.avatar-section-text{
font-size: 32rpx;
color: #019c88;
font-weight: bold;
}
.money_text1{
font-size:46rpx;
font-weight: bold;
}
.money_text2{
font-size:26rpx;
}
</style>

122
pages/my/index.vue
View File

@ -2,8 +2,8 @@
<view class="" style="padding-bottom: 17px;">
<view class="headtop">
<view class="headbox">
<view class=" u-flex padding-lr justify-between" style="padding-top: 30px;">
<view class="u-m-r-10 back-img"
<view class=" u-flex justify-between avatar-section">
<view class="back-img"
:style="{'background-image':
technicianType=='3'?'url(../../static/grade1.png)':
technicianType=='4'?'url(../../static/grade2.png)':
@ -12,10 +12,10 @@
<image :src="avatar" class="head-port"
@click="goNav('/pages/my/userinfo')"></image>
</view>
<view class="u-flex-1" v-if="isLogin && userName" style="color: #ffffff;">
<view class="u-font-18 ">
<view class="flex align-center" style="margin-bottom: 5px;">
<view class="margin-left-sm">{{ userName }}</view>
<view class="u-flex-1" v-if="isLogin && userName">
<view class="u-font-18">
<view class="flex align-center">
<view class="margin-left-sm avatar-section-text">{{ userName }}</view>
<view class="flex align-center" style="font-size: 14px;">
<image src="../../static/images/my/start.png"
style="width: 13px;height: 12px;margin: 0 6rpx 0 20rpx;"></image>
@ -26,16 +26,16 @@
<view class="flex margin-left-sm margin-top-xs" v-if="XCXIsSelect != '否'"
style="font-size: 22rpx;">
<view v-if="renzheng == 0" @click.stop="goNav('/my/renzheng/rzType')">
<view class="online-tag" v-if="renzheng == 0" @click.stop="goNav('/my/renzheng/rzType')">
暂未实名认证
</view>
<view v-if="renzheng == 1" @click.stop="goNav('/my/renzheng/index')">
<view class="online-tag" v-if="renzheng == 1" @click.stop="goNav('/my/renzheng/index')">
审核中
</view>
<view v-if="renzheng == 2" @click.stop="goNav('/my/renzheng/index')">
<view class="online-tag" v-if="renzheng == 2" @click.stop="goNav('/my/renzheng/index')">
已实名认证
</view>
<view v-if="renzheng == 3" @click.stop="goNav('/my/renzheng/index')">
<view class="online-tag" v-if="renzheng == 3" @click.stop="goNav('/my/renzheng/index')">
已拒绝
</view>
</view>
@ -64,46 +64,46 @@
</view>
</view> -->
<view class="moneybox" v-if="XCXIsSelect != '否'">
<view class="">
<view class="dengjibox">
<view class="flex flex-wrap">
<view class="flex align-center justify-between" style="width: 100%;">
<view class="flex align-center justify-between money-bk" style="width: 100%;">
<view class="">
<view style="color: #ffffff;font-size: 12px; margin-left: 9px;">账户余额(元)</view>
<view class="margin-top-xs" style="font-size: 32px;color: #ffffff; margin-left: 8px; margin-top: 1px;">
<view class="djtit">账户余额(元)</view>
<view class="margin-top-xs money-name">
<text class="money_text">{{ money ? money : '0' }}</text>
</view>
</view>
<view class="btnyt" @click="goQian()">立即提现</view>
</view>
<view class="flex align-center justify-between" style="width: 100%;">
<view class="flex align-center justify-between" style="width: 100%; margin-top:40rpx;">
<view class="" style="text-align: center;width: 23%;"
@click="goNav('/my/wallet/myshouyidetail?fundType=1')">
<view class="margin-top-xs wode-view">
<view class="margin-top-xs ">
<text class="money_text1">{{ dailyEarnings ? dailyEarnings : '0' }}</text>
</view>
<view style="color: #fff;font-size: 26rpx;margin-top: 5px;">当日收益</view>
<view class="money_text2">当日收益</view>
</view>
<view class="" style="text-align: center;width: 23%;"
@click="goNav('/my/wallet/myshouyidetail?fundType=2')">
<view class="margin-top-xs wode-view">
<view class="margin-top-xs">
<text class="money_text1">{{ earnings ? earnings : '0' }}</text>
</view>
<view style="color: #fff;font-size: 26rpx;margin-top: 5px;">当期收益</view>
<view class="money_text2">当期收益</view>
</view>
<view class="" style="text-align: center;width: 23%;"
@click="goNav('/my/wallet/myshouyidetail?fundType=3')">
<view class="margin-top-xs wode-view">
<view class="margin-top-xs">
<text
class="money_text1">{{ currentMonthsIncome ? currentMonthsIncome : '0' }}</text>
</view>
<view style="color: #fff;font-size: 26rpx;margin-top: 5px;">当月收益</view>
<view class="money_text2">当月收益</view>
</view>
<view class="" style="text-align: center;width: 23%;">
<view class="margin-top-xs wode-view">
<text class="money_text1" style="font-size: 24rpx;">
<view class="margin-top-xs">
<text class="money_text3" style="font-size: 24rpx;">
{{ currentEndDate ?currentEndDate : "暂无数据" }}</text>
</view>
<view style="color: #fff;font-size: 26rpx;margin-top: 5px;">当期结束日</view>
<view class="money_text2">当期结束日</view>
</view>
</view>
</view>
@ -199,6 +199,7 @@
常用功能
</view>
<view class="flex margin-top" style="width: 100%;flex-wrap: wrap;justify-content: end;">
<!-- <view class="box">
<image src="../../static/images/my/yjian.png"></image>
<view class="box_text">我的项目</view>
@ -861,13 +862,10 @@
color:#019c88;
font-size: 26rpx;
padding: 8rpx 20rpx;
}
.back-img{
background-repeat: no-repeat;
background-size: 100%;
width: 84px;
height: 84px;
border-radius: 50%;
display: flex;
align-items: center;
@ -883,7 +881,6 @@
.wode-view{
width: 150rpx;
height: 80rpx;
background: #007B6A;
border-radius: 20rpx;
color: #fff;
line-height: 80rpx;
@ -907,10 +904,11 @@
.headbox {
width: 100%;
padding: 0 40rpx;
height: 315px;
height: 320px;
padding: 0 20px;
background-image: url('../../static/index/technician15.png');
background-size: cover;
background-repeat: no-repeat;
background-size: 100%;
}
.xyf {
@ -941,27 +939,32 @@
color: #fff;
}
.money_text1 {
.money_text1{
font-size:46rpx;
font-weight: bold;
font-size: 32rpx;
color: #fff;
}
.money_text2{
font-size:24rpx;
}
.money_text3{
font-size:30rpx;
font-weight: bold;
line-height: 56rpx;
}
.moneybox {
width: 100%;
margin-top: 10px;
}
.btnyt {
background-color: #ffffff;
width: 240rpx;
background-image: linear-gradient(-48deg, #d5fff8,#eefffc,#c7f9f0);
border: 1px solid #c7f9f0;
color: #ffffb2;
width: 200rpx;
height: 70rpx;
line-height: 70rpx;
text-align: center;
color: #333333;
color: #019c88;
font-size: 28rpx;
border-radius: 40rpx;
color: #333333;
}
.xflist {
@ -1027,9 +1030,40 @@
margin-left: 10rpx;
}
.head-port{
width: 55px;
height: 55px;
width:64px;
height:64px;
border-radius: 50%;
margin-bottom: 5px;
}
.avatar-section{
padding:50rpx 0 30rpx 0;
}
.avatar-section-text{
font-size: 32rpx;
color: #019c88;
font-weight: bold;
}
.online-tag {
color: #019c88;
font-size: 26rpx;
}
.dengjibox {
position: relative;
width: 100%;
height: 300rpx;
background: linear-gradient(-45deg, #83e5d4, #25bca8, #3acdb9);
//box-shadow: 0rpx 0rpx 16rpx 0rpx rgba(26,25,26,0.3);
border-radius: 20rpx;
color: #ffffff;
display: flex;
flex-direction: column;
justify-content: space-between;
}
.money-name{
font-size: 40rpx;
}
.money-bk{
background: linear-gradient(-45deg, #83e5d4, #4fd3c2, #3acdb9);
border-radius: 20rpx 20rpx 0 0;
padding: 16rpx 20rpx;
}
</style>

104
pages/order/index.vue
View File

@ -6,37 +6,41 @@
<!-- sticky吸顶悬浮的菜单, 父元素必须是 mescroll -->
<view class="jishi-index">
<view class=" u-flex padding-lr justify-between" style="padding-top: 30px;">
<view class="u-m-r-10 back-img"
<view class=" u-flex justify-between avatar-section">
<!--<view class="back-img"
:style="{'background-image':
technicianType=='3'?'url(../../static/grade1.png)':
technicianType=='4'?'url(../../static/grade2.png)':
technicianType=='5'?'url(../../static/grade3.png)':''
technicianType=='5'?'url(../../static/grade3.gif)':''
}">
<image :src="avatar" class="head-port"
@click="goNav('/pages/my/userinfo')"></image>
</view>-->
<view class="back-img">
<image :src="avatar" class="head-port" @click="goNav('/pages/my/userinfo')"></image>
<image class="popop-kuang" src="../../static/grade3.gif"></image>
</view>
<view class="u-flex-1 " v-if="isLogin && userName">
<view class="u-flex-1" v-if="isLogin && userName">
<view class="u-font-18">
<view class="flex align-center" style="margin-top: 35rpx;">
<view class="margin-left-sm u-font-18" style="color: #ffffff;">{{ userName }}</view>
<view class="flex align-center">
<view class="margin-left-sm avatar-section-text">{{ userName }}</view>
<view class="labe zhuangtai" @tap="stateSave">
<view v-if="isTrue">已上线</view>
<view v-if="!isTrue">已离线</view>
</view>
</view>
<view class="flex margin-left-sm margin-top-xs"
style="font-size: 22rpx;font-weight: 500;color: #ffffff;">
<view v-if="renzheng == 0" @click.stop="goNav('/my/renzheng/index?classify=' + 1)">
<view class="flex margin-left-sm margin-top-xs">
<view class="online-tag" v-if="renzheng == 0" @click.stop="goNav('/my/renzheng/index?classify=' + 1)">
暂未实名认证
</view>
<view v-if="renzheng == 1" @click.stop="goNav('/my/renzheng/index?classify=' + 1)">
<view class="online-tag" v-if="renzheng == 1" @click.stop="goNav('/my/renzheng/index?classify=' + 1)">
实名审核中
</view>
<view v-if="renzheng == 2">
<view class="online-tag" v-if="renzheng == 2">
已实名认证
</view>
<view v-if="renzheng == 3" @click.stop="goNav('/my/renzheng/index?classify=' + 1)">
<view class="online-tag" v-if="renzheng == 3" @click.stop="goNav('/my/renzheng/index?classify=' + 1)">
实名已拒绝
</view>
</view>
@ -127,7 +131,7 @@
【{{ item.ordersNo }}】
</view>
</view>
<view class="flex u-p-t-20 justify-between align-center padding-sm">
<view class="flex u-p-t-20 u-p-b-20 justify-between align-center padding-sm">
<view class="flex text-right" style="width: 100%;flex-direction: column;">
<!-- <u-button v-if="item.status == 1" :custom-style="customStyle" shape="circle" :plain="true"
@ -318,15 +322,15 @@
border: "8rpx",
width: '180rpx',
height: '54rpx',
margin: "0 0 0 20rpx"
margin: "0 16rpx 0 0rpx"
},
customStyle1: {
color: '#096f4b',
border: '2rpx solid #096f4b',
color: '#019c88',
border: '2rpx solid #019c88',
border: "8rpx",
width: '180rpx',
height: '54rpx',
margin: "0 0 0 20rpx"
margin: " 0 16rpx 0 0rpx"
},
latitude: '',
longitude: '',
@ -885,16 +889,7 @@
font-size: 26rpx;
padding: 8rpx 20rpx;
}
.back-img{
background-repeat: no-repeat;
background-size: 100%;
width: 84px;
height: 84px;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
}
/deep/.u-scroll-box{
margin-top: 26rpx;
}
@ -909,7 +904,7 @@
.showBtn-view{
display: flex;
flex-direction: row;
align-items: center;
justify-content: flex-start;
}
.order-status{
display: flex;
@ -1022,7 +1017,6 @@
.popup-img{
width: 55rpx;
height: 55rpx;
position: absolute;
right:22rpx;
}
.popup-head{
@ -1034,7 +1028,7 @@
align-items: center;
justify-content: space-between;
padding: 0 15px;
position: relative;
position:relative;
}
.popup-content{
width: 100%;
@ -1066,7 +1060,7 @@
height: 220rpx;
// background: #F7F7F7 !important;
border-radius: 21rpx 21rpx 0 0;
margin: -113px auto 8px auto;
margin: -180px auto 8px auto;
position: relative;
}
@ -1140,7 +1134,7 @@
font-size: 20upx;
display: flex;
padding-right: 18upx;
background: #5abfb2 ;
background-image: linear-gradient(to right,#30c1ad, #1bb9a5);
padding: 10rpx;
border-radius: 10rpx;
}
@ -1178,10 +1172,9 @@
}
}
.head-port{
width: 55px;
height: 55px;
width:64px;
height:64px;
border-radius: 50%;
margin-bottom: 5px;
}
/deep/.radius {
border-radius: 20rpx;
@ -1200,7 +1193,7 @@
border-radius:20rpx 8rpx 20rpx 8rpx ;
padding: 4rpx 10rpx;
background-image: linear-gradient(to bottom, #fe9130, #ff9868);
font-size: 30rpx;
font-size: 26rpx;
}
.progress-status-chaoshi{
@ -1229,9 +1222,9 @@
}
.jishi-index{
width: 100%;
height: 230px;
height: 286px;
padding: 0 20px;
background:url('../../static/index/technician15.png');
background-image: url('../../static/index/technician15.png');
background-repeat: no-repeat;
background-size: 100%;
}
@ -1263,7 +1256,7 @@
font-weight: bold;
}
.title-font{
font-size: 30rpx;
font-size: 28rpx;
color: #666666;
}
.title-font2{
@ -1278,4 +1271,37 @@
.padding-sm{
padding: 11px 11px 0px 11px;
}
.avatar-section{
padding:30rpx 0 50rpx 0;
position: relative;
}
.back-img{
padding: 15rpx;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
position: relative;
}
.popop-kuang{
width: 150rpx;
height: 150rpx;
position: absolute;
}
.avatar-section-text{
font-size: 32rpx;
color: #019c88;
font-weight: bold;
}
.money_text1{
font-size:46rpx;
font-weight: bold;
}
.money_text2{
font-size:26rpx;
}
.online-tag {
color: #019c88;
font-size: 26rpx;
}
</style>

25
pages/video/index.vue
View File

@ -2,13 +2,14 @@
<view>
<view class="page-head">
<view class="page-head-hd">
<view class="page-head-btn" @click="fanhui">
<!--<view class="page-head-btn" @click="fanhui">
<i class="btn-icon"></i>
</view>-->
<view class="service-head-top-left">
<image class="service-back" src="../../static/fanhui.png"></image>
<image class="page-head-img" src="../../static/videoimg.png"></image>
</view>
<view class="page-head-mian">
<view class="page-head__title">
视频
</view>
<view class="page-head-ft">
<view class="page-head-xuan" @click="xuanzhe">
选择
@ -457,4 +458,20 @@
transition-property: all;
color: rgb(0, 0, 0);
}
.service-back{
width: 20px;
height: 36rpx;
margin-right:5px;
margin-left: 10rpx;
}
.service-head-top-left{
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.page-head-img{
width: 120rpx;
height: 40rpx;
}
</style>

BIN
static/grade1.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 84 KiB

BIN
static/grade2.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 57 KiB

BIN
static/grade3.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 36 KiB

BIN
static/index/technician15.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 80 KiB

After

Width:  |  Height:  |  Size: 313 KiB

BIN
static/videoimg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB