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

Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_jishi

This commit is contained in:
yangjun 2024-07-02 15:02:31 +08:00
parent 6e7eb4e1fd 1257212478
commit 93fe109759
7 changed files with 83 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pages/index/game/myOrder.vue
View File

@ -7,12 +7,12 @@
<view class="padding-lr"> <view class="padding-lr">
<view class="margin-right-xs text-df" <view class="margin-right-xs text-df"
style="width: 400rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;"> style="width: 400rpx; overflow: hidden;font-size:30rpx;font-weight: bold; nowrap;text-overflow: ellipsis;">
{{order.title}} {{order.title}}
</view> </view>
<view class="text-xs margin-top-sm" style="color: #26C278;"> <view class="text-xs margin-top-sm" style="color: #333; font-size: 26rpx;">
<!-- ￥<text class="text-df">{{isVip? order.memberMoney :order.money}}/</text>60分钟 --> <!-- ￥<text class="text-df">{{isVip? order.memberMoney :order.money}}/</text>60分钟 -->
￥<text class="text-df">{{order.price}}/</text>{{order.duration}}分钟 ￥<text class="order-text">{{order.price}}/</text>{{order.duration}}分钟
</view> </view>
<!-- <view class="margin-top-xs "> <!-- <view class="margin-top-xs ">
@ -25,16 +25,16 @@
</view> </view>
</view> </view>
<view class="flex align-center padding-tb-sm " style="border-top: 2rpx solid #F5F5F2;"> <view class="qualification">
<view class="flex align-center" style="margin-right: 39upx;"> <view class="qual-center">
<image src="../../../static/images/index/renz1.png" style="width: 32upx;height: 28upx;"></image> <image src="../../../static/images/index/renz1.png" style="width: 32upx;height: 28upx;"></image>
<text class="margin-left-xs">实名认证</text> <text class="margin-left-xs">实名认证</text>
</view> </view>
<view class="flex align-center" style="margin-right: 39upx;"> <view class="qual-center">
<image src="../../../static/images/index/renz2.png" style="width:28upx;height: 33upx;"></image> <image src="../../../static/images/index/renz2.png" style="width:28upx;height: 33upx;"></image>
<text class="margin-left-xs">资质认证</text> <text class="margin-left-xs">资质认证</text>
</view> </view>
<view class="flex align-center"> <view class="qual-center">
<image src="../../../static/images/index/renz3.png" style="width: 28upx;height: 32upx;"></image> <image src="../../../static/images/index/renz3.png" style="width: 28upx;height: 32upx;"></image>
<text class="margin-left-xs">平台担保</text> <text class="margin-left-xs">平台担保</text>
</view> </view>
@ -257,10 +257,32 @@
</script> </script>
<style> <style>
page { page {
background-color: #F7F7F7; background-color: #F7F7F7;
} }
.qualification{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.qual-center{
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
width: 210rpx;
height: 22px;
line-height: 22px;
background-color: rgba(8, 162, 138, 0.1);
border-radius: 8px;
font-weight: 400;
font-size: 11px;
color: #029D88;
margin: 15rpx 0;
}
.bgs { .bgs {
background-color: #FFFFFF; background-color: #FFFFFF;
} }
@ -286,4 +308,8 @@
border-radius: 50%; border-radius: 50%;
margin-right: 10rpx; margin-right: 10rpx;
} }
.order-text{
font-size: 36rpx;
color: #fb672b;
}
</style> </style>

5
pages/index/index.vue
View File

@ -1558,17 +1558,18 @@ page {
border-radius: 15px 15px 0 0; border-radius: 15px 15px 0 0;
padding: 0 30rpx; padding: 0 30rpx;
height: 60rpx; height: 60rpx;
margin-top: 8rpx; margin-top: 12rpx;
justify-content: space-between; justify-content: space-between;
} }
.wztext { .wztext {
width: 80px; width: 200rpx;
overflow: hidden; overflow: hidden;
//text-overflow: ellipsis; //text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.dengjibox { .dengjibox {
position: relative; position: relative;
width: 100%; width: 100%;

2
pages/my/index.vue
View File

@ -7,7 +7,7 @@
<image :src="avatar" class="head-port"" <image :src="avatar" class="head-port""
@click="goNav('/pages/my/userinfo')"></image> @click="goNav('/pages/my/userinfo')"></image>
</view> </view>
<view class="u-flex-1" v-if="isLogin && userName"> <view class="u-flex-1" v-if="isLogin && userName" style="color: #ffffff;">
<view class="u-font-18 "> <view class="u-font-18 ">
<view class="flex align-center" style="margin-bottom: 5px;"> <view class="flex align-center" style="margin-bottom: 5px;">
<view class="margin-left-sm">{{ userName }}</view> <view class="margin-left-sm">{{ userName }}</view>

76
pages/order/index.vue
View File

@ -5,16 +5,16 @@
<!-- 对于mescroll-uni: 则无需设置:sticky="true", 无其他限制和要求 --> <!-- 对于mescroll-uni: 则无需设置:sticky="true", 无其他限制和要求 -->
<!-- sticky吸顶悬浮的菜单, 父元素必须是 mescroll --> <!-- sticky吸顶悬浮的菜单, 父元素必须是 mescroll -->
<view class="sticky-tabs"> <view class="jishi-index">
<view class="ding-view"> <view class="ding-view" style="padding-top: 35px;" >
<view class="u-m-r-10"> <view class="u-m-r-10">
<image :src="avatar" class="head-port" <image :src="avatar" class="head-port"
@click="goNav('/pages/my/userinfo')"></image> @click="goNav('/pages/my/userinfo')"></image>
</view> </view>
<view class="u-flex-1 u-m-l-10 " v-if="isLogin && userName"> <view class="u-flex-1" v-if="isLogin && userName">
<view class="u-font-18 text-bold"> <view class="u-font-18">
<view class="flex align-center" style="justify-content: space-between;"> <view class="flex align-center" style="margin-top: 8rpx;">
<view class="margin-left-sm " style="color: #ffffff;">{{ userName }}</view> <view class="margin-left-sm u-font-18" style="color: #ffffff;">{{ userName }}</view>
<view class="labe zhuangtai" @tap="stateSave"> <view class="labe zhuangtai" @tap="stateSave">
<view v-if="isTrue">已上线</view> <view v-if="isTrue">已上线</view>
<view v-if="!isTrue">已离线</view> <view v-if="!isTrue">已离线</view>
@ -52,23 +52,23 @@
</view> </view>
</view> --> </view> -->
<!-- <me-tabs v-model="tabIndex" nameKey='title' :tabs="tabs" @change="tabChange"></me-tabs> --> <!-- <me-tabs v-model="tabIndex" nameKey='title' :tabs="tabs" @change="tabChange"></me-tabs> -->
</view>
<u-tabs :list="tabs" :is-scroll="true" :current="tabIndex" @change="tabChange" active-color="#000000" <u-tabs :list="tabs" :is-scroll="true" :current="tabIndex" @change="tabChange" active-color="#000000"
inactive-color="#999999" :customStyle="{ 'background-color': '#050505' }" isShowImg textClass=""> inactive-color="#999999" :customStyle="{ 'background-color': '#050505' }" isShowImg textClass="">
</u-tabs> </u-tabs>
</view>
<mescroll-body :sticky="true" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" <mescroll-body :sticky="true" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
style="padding: 0 16px;width: 100%;min-height: 100vh;"> style="padding: 0 16px;width: 100%;min-height: 100vh; background: #f5f5f5;">
<!-- 数据列表 --> <!-- 数据列表 -->
<!-- <view v-if="goods.length > 0" class="margin-sm padding-sm bg radius" v-for="(item,index) in goods" <!-- <view v-if="goods.length > 0" class="margin-sm padding-sm bg radius" v-for="(item,index) in goods"
:key='index' @click="clickItem(item)"> --> :key='index' @click="clickItem(item)"> -->
<view class="bgwhite radius margin-bottom-sm padding-bottom-sm" v-for="(item, index) in goods" :key='index' <view class="bgwhite radius margin-bottom-sm padding-order " v-for="(item, index) in goods" :key='index'
@click="goNav('/my/order/revenueDetails?ordersId=' + item.ordersId)"> @click="goNav('/my/order/revenueDetails?ordersId=' + item.ordersId)">
<view class="flex justify-between padding-sm"> <view class="flex justify-between padding-sm">
<view v-if="item.overTimeOrders == 1" style="color: red;font-size: 26rpx">(订单已超时)</view> <view v-if="item.overTimeOrders == 1" style="color: red;font-size: 26rpx">(订单已超时)</view>
<!-- <view class="text-green" v-if="item.status == 1">待支付</view> --> <!-- <view class="text-green" v-if="item.status == 1">待支付</view> -->
<view class="progress-status" v-if="item.status == 2">待服务</view> <view class="progress-status" v-if="item.status == 2">待服务</view>
<view class="text-green" v-if="item.status == 3">已完成待评价</view> <view class="progress-status" v-if="item.status == 3">已完成待评价</view>
<!-- <view class="text-green" v-if="item.status == 4" style="color: #999999;">已取消</view> --> <!-- <view class="text-green" v-if="item.status == 4" style="color: #999999;">已取消</view> -->
<view class="progress-status" v-if="item.status == 5">已完成</view> <view class="progress-status" v-if="item.status == 5">已完成</view>
<view class="progress-status" v-if="item.status == 6">服务中</view> <view class="progress-status" v-if="item.status == 6">服务中</view>
@ -85,7 +85,7 @@
</view> </view>
</view> </view>
<view class="xian"></view> <view class="xian"></view>
<view class=" u-flex padding-sm"> <view class=" u-flex padding-sm mescroll-downwarp">
<view class="u-m-r-10"> <view class="u-m-r-10">
<u-avatar :src="item.massageImg ? item.massageImg : '../../static/logo.png'" mode="square" <u-avatar :src="item.massageImg ? item.massageImg : '../../static/logo.png'" mode="square"
size="100"> size="100">
@ -96,15 +96,16 @@
<view class="margin-right-xs order-details "> <view class="margin-right-xs order-details ">
{{ item.title }} {{ item.title }}
</view> </view>
</view>
<view class="flex-sub"> <view class="flex-sub">
<text class="text-df">实收:￥</text><text class="text-xl text-bold">{{ item.artificerMoneyTotal <!--<text class="text-df">实收:￥</text>--><text class="text-xl text-bold">￥{{ item.artificerMoneyTotal
}}</text> }}</text>
</view> </view>
<view class="text-cut" style="color: #999;">{{ item.address }}</view>
</view> </view>
<view class="text-cut" style="width:550upx; color: #999;">{{ item.address }}</view>
</view> </view>
</view>
<view class="flex u-p-t-20 justify-between align-center padding-sm"> <view class="flex u-p-t-20 justify-between align-center padding-sm">
<view class="flex text-right" style="width: 100%;flex-direction: column;"> <view class="flex text-right" style="width: 100%;flex-direction: column;">
@ -873,7 +874,6 @@
align-items: center; align-items: center;
} }
.order-status{ .order-status{
width: 90%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
} }
@ -894,8 +894,10 @@
color: #fe9130; color: #fe9130;
} }
.flex-sub{ .flex-sub{
text-align: right; width: 95%;
text-align: left;
font-size: 28rpx; font-size: 28rpx;
margin-top: 8rpx;
} }
.top-title{ .top-title{
width: 95%; width: 95%;
@ -1007,33 +1009,18 @@
.ding-view{ .ding-view{
width: 95%; width: 95%;
height: 290rpx; height: 290rpx;
background: linear-gradient(-90deg, #019C88, #1BB9A5, #029D88);
border-radius: 24rpx;
margin: 10px auto 0px auto;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
padding:30rpx; padding:30rpx;
} }
.content{
width: 100%;
min-height: 100vh;
background-image: url('../../static/index/swim.jpg');
background-repeat: no-repeat;
background-size: 100% 100%;
display: flex;
flex-direction: column;
align-items: center;
padding: 10px 0px;
}
.u-tabs { .u-tabs {
padding: 16px; padding: 16px;
width: 90%; width: 90%;
height: 199rpx; height: 199rpx;
// background: #F7F7F7 !important; // background: #F7F7F7 !important;
border-radius: 21rpx; border-radius: 21rpx;
margin: -70px auto 10px auto; margin: -126px auto 8px auto;
} }
/deep/.u-scroll-view { /deep/.u-scroll-view {
@ -1050,7 +1037,6 @@
/deep/.u-tab-bar { /deep/.u-tab-bar {
display: none !important; display: none !important;
} }
.sticky-tabs { .sticky-tabs {
width: 100%; width: 100%;
z-index: 990; z-index: 990;
@ -1150,4 +1136,26 @@
font-weight: bold; font-weight: bold;
} }
.jishi-index-title{
width: 100%;
text-align: center;
font-weight: bold;
font-size: 33rpx;
color: #FFFFFF;
padding-top: 20px;
}
.jishi-index{
width: 100%;
height: 230px;
padding: 0 20px;
background:url('../../static/index/technician15.png');
background-repeat: no-repeat;
background-size: 100%;
}
.padding-order{
padding: 10rpx 20rpx;
}
.text-cut{
width: 95%;
}
</style> </style>

BIN
static/images/index/renz1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 902 B

After

Width:  |  Height:  |  Size: 680 B

BIN
static/images/index/renz2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 804 B

BIN
static/images/index/renz3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB