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-06-29 16:26:05 +08:00
parent e4728390be 40a009bd2b
commit 30bc198fe9
8 changed files with 137 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
my/order/revenueDetails.vue
View File

@ -1,6 +1,10 @@
<template>
<view class="content">
<view class="nav-view">
<image class="nav-img" src="../../static/fanhui.png" mode="" @click="goBack()"></image>
<view class="nav-text">详情</view>
<view class="kong"></view>
</view>
<view class="header"></view>
<view class="mian">
<view class="mian-top">
@ -30,16 +34,21 @@
服务时长： {{(order.ordersMassageList[0].massageType || {}).duration}}分钟
</view>
<view class="mian-money">
<view class="mian-money" style="justify-content: space-between;">
<view class="flex" style="flex-direction: row;align-items: center;">
<view class="mian-money-title">项目价格：</view>
<view class="mian-money-num">
<span class="fuhao">￥</span>
<span class="number">
{{order.massagePrice}}
<span style="font-size: 12px;color: #666;">x{{order.ordersMassageList[0].num}}</span>
</span>
</view>
</view>
<view>
<uni-number-box :disabled="true" :value="order.ordersMassageList[0].num" :width='27' :min="1" @change="changeValue" />
</view>
</view>
</view>
</view>
<view class="mian-top-foot" @tap="bindGps(order.latitude,order.longitude,order.address)">
@ -498,6 +507,7 @@
imgList:[]
}
},
watch: {
formatTimeStamp(newValue, oldValue) {
console.log(newValue);
@ -528,11 +538,11 @@
// // this.loading = false;
// }, 2000)
this.isTrue = e.isTrue
if (this.isTrue) {
uni.setNavigationBarTitle({
title: '订单详情'
})
}
// if (this.isTrue) {
// uni.setNavigationBarTitle({
// title: '订单详情'
// })
// }
this.ordersId = e.ordersId
this.orderIdSend = e.ordersId;
// this.getOrder()
@ -603,6 +613,12 @@
}
},
methods:{
goBack(){//返回上一页
console.log("asdsad")
uni.switchTab({
url:'/pages/order/index'
})
},
refusa(e){//拒绝接单 原因
this.refusalContent=e.detail.value
},
@ -644,7 +660,8 @@
this.$Request.getT("/app/artificer/jishiQueren",{
ordersId:ordersId
}).then(res => {
if (res.code == 0) {
if (res.code == 200) {
that.getOrder()
that.$queue.showToast(res.msg);
} else {
that.$queue.showToast(res.msg);
@ -1416,6 +1433,47 @@
</script>
<style scoped>
.nav-text{
font-weight: 700;
font-size: 16px;
line-height: 30px;
text-align: center;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
font-size: 16px;
opacity: 1;
color: #000;
}
.nav-img,.kong{
width: 25px;
height: 25px;
}
.nav-view{
position: fixed;
left: var(--window-left);
right: var(--window-right);
height: 44px;
height: calc(44px + constant(safe-area-inset-top));
height: calc(44px + env(safe-area-inset-top));
padding: 7px 3px;
padding-top: calc(7px + constant(safe-area-inset-top));
padding-top: calc(7px + env(safe-area-inset-top));
display: -webkit-box;
display: -webkit-flex;
display: flex;
flex-direction: row;
align-items: center;
overflow: hidden;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
justify-content: space-between;
box-sizing: border-box;
z-index: 998;
background-color: #fff;
-webkit-transition-property: all;
transition-property: all;
}
.bj_view {
width: 100rpx;
height: 100rpx;
@ -1929,7 +1987,7 @@
flex-direction: column;
position: absolute;
top: 0;
margin-top: 20px;
margin-top: 85px;
overflow: scroll;
background: #f7f7f7;
padding-bottom:30px;
@ -1939,6 +1997,7 @@
width: 100%;
height: 228rpx;
background: linear-gradient(-36deg, #11957C, #20A98F, #019C88, #029D88);
margin-top: 45px;
}
.nav-btn{
font-size: 25rpx;

2
pages.json
View File

@ -369,7 +369,7 @@
"style": {
"navigationBarTitleText": "详情",
"app-plus": {
"titleNView": true
"titleNView": false
}
}
}, {

1
pages/index/currentPoints.vue
View File

@ -230,7 +230,6 @@
{name:'业绩积分',id:'0'},
{name:'时长积分',id:'1'},
{name:'储值积分',id:'2'},
{name:'充值积分',id:'3'}
],
tapNum:0,
}

24
pages/index/technicianLevel.vue
View File

@ -13,7 +13,7 @@
<span>{{ artificerData.beginTime }}~{{ artificerData.finishTime }}</span>
</view>
<view class="header-right-text">
备注: 本期等级是根据根据技师上个同期的业绩最终计算得出
备注: 本期等级是根据技师上个同期的业绩最终计算得出
</view>
</view>
<view class="header-right-bottom">
@ -38,7 +38,7 @@
<span>最低业绩</span>
</view>
<view class="mian-list-view">
<span>{{ item.durationOnline }} H</span>
<span>{{ item.durationOnline }}h</span>
<span>在线时长</span>
</view>
<view class="mian-list-view">
@ -104,18 +104,18 @@
width: 96.39rpx;
height:74rpx;
text-align: center;
line-height: 48px;
line-height: 43px;
font-weight: bold;
font-size: 23rpx;
color: #FFFFFF;
}
.mian-list-view span:nth-child(1){
font-size: 36rpx;
font-size: 40rpx;
color: #019c88;
font-weight: bold;
}
.mian-list-view span:nth-child(2){
font-size: 22rpx;
font-size: 24rpx;
color: #333;
margin-top: 2px;
}
@ -132,10 +132,10 @@
flex-direction: row;
justify-content: space-between;
align-items: center;
margin-top: 35rpx;
margin-top: 40rpx;
}
.fencheng span{
font-size: 23rpx;
font-size: 25rpx;
}
.fencheng span:nth-child(1){
color: #333333;
@ -220,17 +220,17 @@
color: #FFFFFF;
}
.header-right-top span:nth-child(1){
width: 117rpx;
width: 126rpx;
height: 34rpx;
text-align: center;
line-height: 34rpx;
line-height: 36rpx;
font-size: 24rpx;
color: #843200;
background: linear-gradient(-36deg, #FFE45A, #FFBB46);
border-radius: 15rpx 0rpx 15rpx 0rpx;
}
.header-right-top span:nth-child(2){
font-size: 26rpx;
font-size: 24rpx;
color: #FFF5BC;
margin-left: 5px;
}
@ -239,7 +239,7 @@
display: flex;
flex-direction: row;
align-items: center;
margin-top: 20px;
margin-top: 16px;
}
.header-right{
width: 65%;
@ -250,7 +250,7 @@
.header{
width: 100%;
padding: 13px 23px;
padding: 13px 20px;
height: 263rpx;
display: flex;
flex-direction: row;

22
pages/my/index.vue
View File

@ -2,9 +2,9 @@
<view class="" style="padding-bottom: 30px;">
<view class="headtop">
<view class="headbox">
<view class="u-flex text-white" style="padding-top: 30px;">
<view class="u-flex text-white" style="padding-top: 35px;">
<view class="u-m-r-10">
<image :src="avatar" style="width: 65px;height: 65px;border-radius: 100rpx; border: 2px solid #fff; margin-left: 10px;"
<image :src="avatar" style="width: 60px;height: 60px;border-radius: 100rpx; border: 1px solid #d7f2ee; margin-left: 5px;"
@click="goNav('/pages/my/userinfo')"></image>
</view>
<view class="u-flex-1" v-if="isLogin && userName">
@ -20,7 +20,7 @@
</view>
<view class="flex margin-left-sm margin-top-xs" v-if="XCXIsSelect != '否'"
style="font-size: 20rpx;font-weight: 500;">
style="font-size: 22rpx;">
<view v-if="renzheng == 0" @click.stop="goNav('/my/renzheng/rzType')">
暂未实名认证
</view>
@ -63,8 +63,8 @@
<view class="flex flex-wrap">
<view class="flex align-center justify-between" style="width: 100%;">
<view class="">
<view style="color: #ffffff;font-size: 13px; margin-left: 9px;">账户余额(元)</view>
<view class="margin-top-xs" style="font-size: 32px;color: #ffffff; margin-left: 8px; margin-top: -1px;">
<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;">
<text class="money_text">{{ money ? money : '0' }}</text>
</view>
</view>
@ -113,7 +113,7 @@
</view>
</view>
<view class="margin-top"
style="width: 100%;margin-top: -26px;padding: 30rpx;border-radius: 20px;background-color: #ffffff;">
style="width: 100%;margin-top: -50px;padding: 30rpx;border-radius: 20px;background-color: #ffffff;">
<view class="wode-title">
关于我
</view>
@ -187,7 +187,7 @@
</view>
<view style="width: 100%;margin: 10px 0;" @click="goNav('/package/pages/zysc/index/index')"
v-if="shopSel != '否'">
<image src="../../static/index/fun_banner.png" style="width: 100%;height: 90px; margin-bottom: 5px;"></image>
<image src="../../static/index/fun_banner.png" style="width: 100%;height: 150rpx; margin-bottom: 5px;"></image>
</view>
<view class="wode-title" style="margin-bottom: 26rpx;">
常用功能
@ -775,7 +775,7 @@
border-radius: 20rpx;
color: #fff;
line-height: 80rpx;
margin-top: 50rpx;
margin-top: 46rpx;
}
.jishi-index-title{
width: 100%;
@ -824,20 +824,20 @@
}
.money_text {
font-size: 32px;
font-size: 30px;
font-weight: bold;
color: #fff;
}
.money_text1 {
font-weight: bold;
font-size: 46rpx;
font-size: 32rpx;
color: #fff;
}
.moneybox {
width: 100%;
margin-top: 20px;
margin-top: 10px;
}
.btnyt {

71
pages/order/index.vue
View File

@ -358,10 +358,7 @@
that.longitude = res.longitude
}
});
this.mescroll.resetUpScroll()
this.upCallback({
num: this.num
});
},
onShow() {
let that = this;
@ -380,10 +377,12 @@
this.visitor = 0
this.avatar = '../../static/logo.png'
}
// setTimeout(d => {
// this.mescroll.resetUpScroll()
// }, 1000)
setTimeout(d => {
this.mescroll.resetUpScroll()
}, 1000)
this.upCallback({
num: this.num
});
},
watch: {
isTrue(newValue) {
@ -548,7 +547,8 @@
},
nineState(ordersId){//确认接单
this.$Request.getT("/app/artificer/jishiQueren",{
var that=this;
that.$Request.getT("/app/artificer/jishiQueren",{
ordersId:ordersId
}).then(res => {
if (res.code == 200) {
@ -556,7 +556,7 @@
uni.showToast({
title:'已确认接单'
})
that.upCallback(1)
that.mescroll.resetUpScroll()
} else {
that.$queue.showToast(res.msg);
}
@ -709,31 +709,34 @@
cancel(e) {
console.log(11)
let that = this
uni.showModal({
title: '提示',
content: '如果服务未完成点击完成订单会遭到平台违规处理，请确认服务是否完毕?',
success: function(res) {
if (res.confirm) {
let data = {
ordersId: e.ordersId,
accomplishLongitude: that.longitude,
accomplishLatitude: that.latitude
}
that.$queue.showLoading('提交中...')
that.$Request.post('/app/artificer/accomplishOrders', data).then(res => {
uni.hideLoading();
if (res.code == 0) {
that.mescroll.resetUpScroll()
websocketUtils.uploadAudioEnd(); //关闭音频上传
} else {
that.$queue.showToast(res.msg);
}
uni.navigateTo({
url:'/my/order/revenueDetails?ordersId='+e.ordersId
})
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
// uni.showModal({
// title: '提示',
// content: '如果服务未完成点击完成订单会遭到平台违规处理，请确认服务是否完毕?',
// success: function(res) {
// if (res.confirm) {
// let data = {
// ordersId: e.ordersId,
// accomplishLongitude: that.longitude,
// accomplishLatitude: that.latitude
// }
// that.$queue.showLoading('提交中...')
// that.$Request.post('/app/artificer/accomplishOrders', data).then(res => {
// uni.hideLoading();
// if (res.code == 0) {
// that.mescroll.resetUpScroll()
// websocketUtils.uploadAudioEnd(); //关闭音频上传
// } else {
// that.$queue.showToast(res.msg);
// }
// })
// } else if (res.cancel) {
// console.log('用户点击取消');
// }
// }
// });
},
//时间弹框开关
bindData(index) {

BIN
static/index/order_9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
unpackage/release/apk/__UNI__B37C795__20240628135802.apk Normal file
View File

Binary file not shown.