Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_jishi
This commit is contained in:
commit
f7a2f0dbd4
|
|
@ -14,20 +14,30 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="innerBottom">
|
||||
<view class="innerBottom" style="height: 140px;">
|
||||
<view class="innerBottomOfTop">
|
||||
<view class="innerTimer">
|
||||
{{this.homePageDataNum.fundRange}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="middleTop">
|
||||
<view class="IntegralImport">
|
||||
<!-- <view class="IntegralImport">
|
||||
<view class="totalIntegralNumber">
|
||||
{{this.homePageDataNum.totalRevenue ? this.homePageDataNum.totalRevenue : 0 }}
|
||||
</view>
|
||||
<view class="totalIntegral">
|
||||
本期收益(元)
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="IntegralImport">
|
||||
<view class="IntegralClassify">
|
||||
<view class="" style="margin-top: -12px;font-weight: 700;">
|
||||
{{this.homePageDataNum.totalRevenue ? this.homePageDataNum.totalRevenue : 0 }}
|
||||
</view>
|
||||
<view class="IntegralClassifyInnerBottom">
|
||||
本期收益(元)
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="line"></view>
|
||||
<view class="innerBottomOfBottom">
|
||||
|
|
@ -47,7 +57,7 @@
|
|||
车费收益
|
||||
</view>
|
||||
</view>
|
||||
<view class="IntegralClassify">
|
||||
<!-- <view class="IntegralClassify">
|
||||
<view class="">
|
||||
{{this.homePageDataNum.valueStorageDeduction ? this.homePageDataNum.valueStorageDeduction : 0 }}
|
||||
</view>
|
||||
|
|
@ -62,14 +72,14 @@
|
|||
<view class="IntegralClassifyInnerBottom">
|
||||
渠道扣款
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<uni-datetime-picker type="date" ref="dataPicker" :clear-icon="true" return-type="string"
|
||||
@change="confirmSelectedDate" v-model="selectedDate" @maskClick="maskClick" />
|
||||
</view>
|
||||
<view id="IntegralStatisticsBottom" :style="{height:domNeedHeight == 0? 420 + 'px' : domNeedHeight + 'px'}">
|
||||
<view id="IntegralStatisticsBottom" :style="{height:domNeedHeight == 0? 420 + 'px' : domNeedHeight + 'px',top:0}">
|
||||
<view class="optionsDetail">
|
||||
<!-- 父元素列表 -->
|
||||
<cc-nodata title="暂无数据" v-if="noDataScrollStatus"
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
<view class="storedIntegralTop">
|
||||
<view class="storedIntegralTopOfRight">
|
||||
<view class="">{{item.type == 1 ?"收入":"支出"}}</view>
|
||||
<view class="">{{item.money}}元</view>
|
||||
<view class=""><span v-if="item.type != 1">-</span>{{item.money}}元</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
|
@ -250,7 +250,7 @@
|
|||
}
|
||||
if (res && res.data && res.data.userMoneyDetailsList.records.length > 0) {
|
||||
//有数据时
|
||||
this.currentIncome = res.data?.income + "元";
|
||||
this.currentIncome = res.data.income + "元";
|
||||
for (let i = 0; i < res.data?.userMoneyDetailsList.records.length; i++) {
|
||||
this.fundDetail.push(res.data?.userMoneyDetailsList.records[i]);
|
||||
}
|
||||
|
|
@ -262,6 +262,7 @@
|
|||
this.loadingStatus = "loadmore";
|
||||
}
|
||||
} else {
|
||||
this.currentIncome = "0元";
|
||||
//无数据时
|
||||
if (!isScroll) {
|
||||
//如果isScroll为null时说明不在滚动
|
||||
|
|
|
|||
|
|
@ -2575,7 +2575,7 @@
|
|||
color: #029D88;
|
||||
}
|
||||
.footers-bor{
|
||||
border: 3px solid #029D88;
|
||||
border: 1px solid #029D88;
|
||||
background-color: #fff;
|
||||
color: #029D88;
|
||||
}
|
||||
|
|
@ -2585,14 +2585,15 @@
|
|||
}
|
||||
.footers-btn{
|
||||
width: 204rpx;
|
||||
height: 69rpx;
|
||||
height: 82rpx;
|
||||
text-align: center;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
border-radius: 35rpx;
|
||||
border-radius: 80rpx;
|
||||
font-weight: 400;
|
||||
font-size: 29rpx;
|
||||
margin-right: 8rpx;
|
||||
}
|
||||
.footers{
|
||||
width: 100%;
|
||||
|
|
@ -2651,14 +2652,14 @@
|
|||
}
|
||||
.yiji{
|
||||
width: 100%;
|
||||
height: 72rpx;
|
||||
height: 88rpx;
|
||||
background: linear-gradient(-90deg, #2EC5AC, #08A28A);
|
||||
border-radius: 21rpx;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 0 5px;
|
||||
padding: 0 10px;
|
||||
height: 72rpx;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
|
@ -2676,7 +2677,7 @@
|
|||
align-items: center;
|
||||
}
|
||||
.yingde-title{
|
||||
font-size: 25rpx;
|
||||
font-size: 32rpx;
|
||||
color: #333333;
|
||||
}
|
||||
.yingde{
|
||||
|
|
@ -2686,10 +2687,10 @@
|
|||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 0 5px;
|
||||
height: 73rpx;
|
||||
height: 80rpx;
|
||||
background: #DCF4EF;
|
||||
border-bottom-left-radius: 24rpx;
|
||||
border-bottom-right-radius: 24rpx;
|
||||
border-bottom-left-radius: 16rpx;
|
||||
border-bottom-right-radius: 16rpx;
|
||||
}
|
||||
.mian-content-textarea{
|
||||
width: 100%;
|
||||
|
|
@ -2723,7 +2724,7 @@
|
|||
flex-direction: row;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
height: 40px;
|
||||
height: 50px;
|
||||
border-bottom: 1px solid #e5e5e5;
|
||||
padding: 0px 5px;
|
||||
}
|
||||
|
|
@ -2735,16 +2736,16 @@
|
|||
padding: 5px;
|
||||
}
|
||||
.mian-view-list-text{
|
||||
font-size: 22rpx;
|
||||
font-size: 30rpx;
|
||||
color: #333333;
|
||||
}
|
||||
.mian-content-list-title{
|
||||
font-size: 22rpx;
|
||||
color: #555555;
|
||||
font-size: 30rpx;
|
||||
color: #999;
|
||||
}
|
||||
.mian-view-list-title{
|
||||
font-size: 22rpx;
|
||||
color: #555555;
|
||||
font-size: 30rpx;
|
||||
color: #999;
|
||||
}
|
||||
.mian-view-list:last-child{
|
||||
border: 0px !important;
|
||||
|
|
@ -2756,9 +2757,9 @@
|
|||
flex-direction: row;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
height: 40px;
|
||||
height: 50px;
|
||||
border-bottom: 1px solid #e5e5e5;
|
||||
padding: 0px 5px;
|
||||
padding: 0px 10px;
|
||||
}
|
||||
|
||||
.mian-view{
|
||||
|
|
@ -2768,8 +2769,7 @@
|
|||
background: #fff;
|
||||
border-radius: 24rpx;
|
||||
padding: 10px;
|
||||
margin-top: 20px;
|
||||
}
|
||||
}
|
||||
.mina-title-bor{
|
||||
width: 111rpx;
|
||||
height: 16rpx;
|
||||
|
|
@ -2781,7 +2781,7 @@
|
|||
}
|
||||
.mina-title-text{
|
||||
font-weight: bold;
|
||||
font-size: 28rpx;
|
||||
font-size: 32rpx;
|
||||
color: #333333;
|
||||
}
|
||||
.mina-title{
|
||||
|
|
@ -2792,7 +2792,7 @@
|
|||
position: relative;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
margin-top: 10px;
|
||||
margin:40rpx 0;
|
||||
}
|
||||
.mian-view{
|
||||
width: 100%;
|
||||
|
|
@ -2812,8 +2812,8 @@
|
|||
margin: 15px 0px 20px 0px;
|
||||
}
|
||||
.mian-top-foot-view-img span,.mian-top-foot-view-text{
|
||||
font-size: 25rpx;
|
||||
color: #666666;
|
||||
font-size: 29rpx;
|
||||
color: #333;
|
||||
}
|
||||
.mian-top-foot-view-img image{
|
||||
width: 26.39rpx;
|
||||
|
|
@ -2826,8 +2826,8 @@
|
|||
align-items: center;
|
||||
}
|
||||
.mian-top-foot-view-title{
|
||||
font-size: 25rpx;
|
||||
color: #666666;
|
||||
font-size: 29rpx;
|
||||
color: #999;
|
||||
}
|
||||
.mian-top-foot-view{
|
||||
width: 100%;
|
||||
|
|
@ -2872,7 +2872,7 @@
|
|||
}
|
||||
.mian-title-view{
|
||||
font-weight: bold;
|
||||
font-size: 31rpx;
|
||||
font-size: 32rpx;
|
||||
color: #333333;
|
||||
}
|
||||
.mian-title{
|
||||
|
|
@ -2900,17 +2900,18 @@
|
|||
justify-content: space-between;
|
||||
border-bottom: 1px solid #E5E5E5;
|
||||
padding-bottom: 15px;
|
||||
margin-bottom: 7px;
|
||||
margin-bottom: 15px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
.mian-top{
|
||||
width: 100%;
|
||||
/* height: 331rpx; */
|
||||
padding: 10px;
|
||||
padding: 30rpx;
|
||||
background: #FFFFFF;
|
||||
border-radius: 24rpx;
|
||||
}
|
||||
.mian{
|
||||
width: 95%;
|
||||
width: 92%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
position: absolute;
|
||||
|
|
@ -2923,13 +2924,13 @@
|
|||
}
|
||||
.header{
|
||||
width: 100%;
|
||||
height: 228rpx;
|
||||
height: 300rpx;
|
||||
background: linear-gradient(-36deg, #11957C, #20A98F, #019C88, #029D88);
|
||||
margin-top: 45px;
|
||||
}
|
||||
.nav-btn{
|
||||
font-size: 25rpx;
|
||||
color: #019C88;
|
||||
color: #019c88;
|
||||
line-height: 63rpx;
|
||||
}
|
||||
.nav-title{
|
||||
|
|
|
|||
15
pages.json
15
pages.json
|
|
@ -163,6 +163,21 @@
|
|||
"navigationBarTitleText": "网页"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/hetong/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "我的合同"
|
||||
// "app-plus": {
|
||||
// "titleNView": false
|
||||
// }
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/xingxiangzhao/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "生活照"
|
||||
}
|
||||
},
|
||||
|
||||
{
|
||||
"path": "pages/order/index",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
<template>
|
||||
<view class="content">
|
||||
<empty></empty>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import empty from '@/components/empty.vue'
|
||||
import tRefresh from "@/components/t-refresh/t-refresh.vue"
|
||||
export default {
|
||||
components:{tRefresh,empty},
|
||||
data(){
|
||||
return{
|
||||
|
||||
}
|
||||
},
|
||||
onLoad(e) {
|
||||
},
|
||||
methods:{
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
</style>
|
||||
|
|
@ -29,9 +29,10 @@
|
|||
<view class="view-title">
|
||||
<view class="view-title-left">
|
||||
<span class="view-title-left-shuxian"></span>
|
||||
<span class="view-title-left-text">本期{{orderType=='2'?'已加钟':'已充值'}}订单</span>
|
||||
<span class="view-title-left-text" v-if="orderType == 2">本期{{isSfwc=='1'?'已加钟':'未加钟'}}订单</span>
|
||||
<span class="view-title-left-text" v-if="orderType == 3">本期{{isSfwc=='1'?'已充值':'未充值'}}订单</span>
|
||||
</view>
|
||||
<view class="view-title-right">加钟{{isSfwc}}订单数量: {{listData.length}}</view>
|
||||
<view class="view-title-right">订单数量: {{listData.length}}</view>
|
||||
</view>
|
||||
<!--本期加钟 充值 订单-->
|
||||
<view class="mina-view" v-if="isSfwc=='1'" v-for="item in listData" :key="item.id" @click="goOder(item)">
|
||||
|
|
@ -46,15 +47,15 @@
|
|||
</view>
|
||||
<view class="mian-foot">
|
||||
<view class="mian-foot-img">
|
||||
<image src="../../my/static/bg6.png" mode=""></image>
|
||||
<image :src="item.massageImg?item.massageImg: '../../../static/logo.png'" mode=""></image>
|
||||
</view>
|
||||
<view class="mian-foot-list">
|
||||
<view class="mian-foot-view">
|
||||
<view class="mian-title">{{item.entryName}}</view>
|
||||
<view class="mian-dingwei">
|
||||
<!-- <view class="mian-dingwei">
|
||||
<image src="../../static/index/dangqian2.png" mode=""></image>
|
||||
<span class="shouyi-text">0.8km</span>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
<view class="mian-foot-dan shouyi-text">
|
||||
订单编号 : {{item.ordersNo}}
|
||||
|
|
@ -85,7 +86,7 @@
|
|||
</view>
|
||||
<view class="mian-foot">
|
||||
<view class="mian-foot-img">
|
||||
<image src="../../my/static/bg6.png" mode=""></image>
|
||||
<image :src="item.massageImg?item.massageImg: '../../../static/logo.png'" mode=""></image>
|
||||
</view>
|
||||
<view class="mian-foot-list">
|
||||
<view class="mian-foot-view">
|
||||
|
|
@ -250,7 +251,7 @@
|
|||
},
|
||||
wangqi(){//往期 跳页
|
||||
uni.navigateTo({
|
||||
url:'/pages/index/previousAdditions?type=2'
|
||||
url:'/pages/index/previousAdditions?type='+this.orderType
|
||||
})
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
<template slot="content" >
|
||||
<view class="mian-view" v-for="(item,index) in listData" :key="index" @click="goOder(item)">
|
||||
<view class="mian-head">
|
||||
<view class="mian-head-biao">{{item.status=='3'?'已完成':'待评价'}}</view>
|
||||
<view class="mian-head-biao">{{item.status=='3'?'待评价':'已完成'}}</view>
|
||||
<view class="mian-head-time">
|
||||
<span class="shouyi-text">预约时间: </span>
|
||||
<span>{{item.serveTime}}</span>
|
||||
|
|
@ -28,14 +28,14 @@
|
|||
</view>
|
||||
<view class="mian-foot">
|
||||
<view class="mian-foot-img">
|
||||
<image src="../../my/static/bg6.png" mode=""></image>
|
||||
<image :src="item.massageImg?item.massageImg: '../../../static/logo.png'" mode=""></image>
|
||||
</view>
|
||||
<view class="mian-foot-list">
|
||||
<view class="mian-foot-view">
|
||||
<view class="mian-title">{{item.entryName}}</view>
|
||||
<view class="mian-dingwei">
|
||||
<image src="../../static/index/dangqian2.png" mode=""></image>
|
||||
<span class="shouyi-text">0.8km</span>
|
||||
<span class="shouyi-text">{{item.km}}km</span>
|
||||
</view>
|
||||
</view>
|
||||
<view class="mian-foot-dan shouyi-text">
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
</view>
|
||||
<view class="mian-list" @click="goOder(item)" v-for="(item,index) in yjjfList" :key="index">
|
||||
<view class="mian-list-top">
|
||||
<view class="mian-list-top-biao">已完成</view>
|
||||
<view class="mian-list-top-biao">{{item.status=='3'?'待评价':'已完成'}}</view>
|
||||
<view class="mian-list-top-time">
|
||||
<span>预约时间: </span>
|
||||
<span>{{item.serveTime}}</span>
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
</view>
|
||||
<view class="mian-foot">
|
||||
<view class="mian-foot-img">
|
||||
<image src="../../my/static/bg6.png" mode=""></image>
|
||||
<image :src="item.massageImg?item.massageImg: '../../../static/logo.png'" mode=""></image>
|
||||
</view>
|
||||
<view class="mian-foot-list">
|
||||
<view class="mian-foot-view">
|
||||
|
|
|
|||
|
|
@ -5,8 +5,11 @@
|
|||
:key="index">
|
||||
<image :src="item" style="width: 100%;" mode="widthFix" @click="saveImg(item)"></image>
|
||||
</view>
|
||||
|
||||
<view class="tabbar" style="background: linear-gradient(to right, #019c88, #2dbe93); border-radius: 50rpx;"
|
||||
@click="goNav()" >重新上传</view>
|
||||
</view>
|
||||
<u-empty v-show="!photoList[0]" icon-size="180" text="暂无生活照片" mode="list"></u-empty>
|
||||
<u-empty v-show="photoList.length==0" icon-size="180" text="暂无生活照片" mode="list"></u-empty>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
|
|
@ -25,6 +28,11 @@
|
|||
this.getDet()
|
||||
},
|
||||
methods: {
|
||||
goNav(){
|
||||
uni.navigateTo({
|
||||
url:'/pages/xingxiangzhao/index'
|
||||
})
|
||||
},
|
||||
// 详情
|
||||
getDet() {
|
||||
uni.showLoading({
|
||||
|
|
@ -58,4 +66,16 @@
|
|||
</script>
|
||||
|
||||
<style>
|
||||
|
||||
.tabbar {
|
||||
width: 690upx;
|
||||
height: 86upx;
|
||||
background: #019c88;
|
||||
border-radius: 8upx;
|
||||
margin: 0 auto;
|
||||
text-align: center;
|
||||
line-height: 86upx;
|
||||
color: #FFFFFF;
|
||||
margin-top: 20rpx;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
<template>
|
||||
<view style="padding-bottom: 80upx;">
|
||||
<view style="padding-bottom: 30px;">
|
||||
<view class="jishi-index">
|
||||
<view class=" u-flex padding-lr" style="padding: 30px 30rpx 120px;align-items: center;">
|
||||
<view class=" u-flex padding-lr" style="padding-top: 35px;">
|
||||
<view class="u-m-r-10">
|
||||
<image :src="avatar" style="width: 70px;height: 70px;border-radius: 100rpx; border: 2px solid #fffff;"
|
||||
<image :src="avatar" class="head-port"
|
||||
@click="goNav('/pages/my/userinfo')"></image>
|
||||
</view>
|
||||
<view class="u-flex-1 u-m-l-10 text-white" v-if="isLogin && userName">
|
||||
<view class="u-flex-1 margin-left-sm text-white" 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')">
|
||||
|
|
@ -19,21 +19,7 @@
|
|||
color="#029d88" disabled />
|
||||
</view>
|
||||
</view>
|
||||
<view class="gxbox" @click="goNavs('/my/qiandao/index')">
|
||||
<template v-if="loglataddress">
|
||||
<view class="flex align-center gengxin">
|
||||
更新位置：<text class="wztext">{{ loglataddress }}</text>
|
||||
</view>
|
||||
<view class="flex align-center gengxin" style="margin-top: 5px;">
|
||||
更新时间：<text class="wztext">{{ loglattime }}</text>
|
||||
</view>
|
||||
</template>
|
||||
<template v-else>
|
||||
<view class="flex align-center gengxin" style="justify-content: center;">
|
||||
点击更新位置
|
||||
</view>
|
||||
</template>
|
||||
</view>
|
||||
|
||||
<!-- <view class="flex margin-left-sm " style="font-size: 22rpx;font-weight: 500;"
|
||||
v-if="XCXIsSelect != '否'">
|
||||
<view v-if="renzheng == 0" @click.stop="goNav('/my/renzheng/rzType')">
|
||||
|
|
@ -56,6 +42,21 @@
|
|||
登录
|
||||
</view>
|
||||
</view>
|
||||
<view class="gxbox" @click="goNavs('/my/qiandao/index')">
|
||||
<template v-if="loglataddress">
|
||||
<view class="flex align-center gengxin">
|
||||
位置：<text class="wztext">{{ loglataddress }}</text>
|
||||
</view>
|
||||
<view class="flex align-center gengxin">
|
||||
时间：<text class="wztext">{{ loglattime }}</text>
|
||||
</view>
|
||||
</template>
|
||||
<template v-else>
|
||||
<view class="flex align-center gengxin" style="justify-content: center;">
|
||||
点击更新位置
|
||||
</view>
|
||||
</template>
|
||||
</view>
|
||||
<!-- <view class="box" v-if="XCXIsSelect != '否'">
|
||||
<view class="">
|
||||
￥<text class="text-bold text-xl">{{sumMoney}}</text>
|
||||
|
|
@ -84,10 +85,6 @@
|
|||
<!-- <text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text> -->
|
||||
</view>
|
||||
|
||||
<view class="" style="margin-top: 20px;">
|
||||
<text style="font-size: 24px;">当前业绩：{{ 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>
|
||||
|
||||
|
|
@ -121,6 +118,12 @@
|
|||
</view> -->
|
||||
<view class="flex align-center"
|
||||
style="justify-content: space-evenly;text-align: center;">
|
||||
<view class="">
|
||||
<view style="font-size: 24px;font-weight: bold;">{{ currentWholeIncome ? currentWholeIncome : 0 }}</view>
|
||||
<text style="font-size: 14px; margin-top: 15px;">当前业绩</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 }}
|
||||
|
|
@ -422,29 +425,42 @@
|
|||
<text
|
||||
style="border-radius: 10rpx 10rpx 0 0; background: linear-gradient(90deg, #019C88, #28BA92, #35C495);padding: 15rpx 15rpx 5rpx 15rpx;color: white;">今日服务</text>
|
||||
</view>
|
||||
<view class="pintuan_syrs flex justify-between" v-if="item.status == 6">
|
||||
<view class="pintuan-title" >
|
||||
<image src="../../static/clock.png" class="pintuan-img"></image>
|
||||
<span class="pintuan-text">服务倒计时</span>
|
||||
</view>
|
||||
<!-- <uni-countdown ref="countDownEl" :title="'剩余'" :fontSize="'14'" :showDay="false"
|
||||
:hour="item.endTime.hour" :minute="item.endTime.minute" :second="item.endTime.second"
|
||||
color="#20C675">
|
||||
</uni-countdown> -->
|
||||
<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
|
||||
font-size="30" separator-size="30"></u-count-down>
|
||||
</view>
|
||||
<view class="bgwhite radius margin-top-sm padding-bottom-sm"
|
||||
:style="{ backgroundColor: item.status == 2 ? '#f6fcfa' : '', border: item.status == 2 ? '2px solid rgb(207, 237, 225)' : '' }"
|
||||
v-for="(item, index) in goods" :key='index' @click="goNav('/my/order/revenueDetails?ordersId=' + item.ordersId)">
|
||||
<view class="flex justify-between padding-sm ">
|
||||
<view class="text-green">预约时间：{{ item.serveTime }}</view>
|
||||
<view class="text-green" v-if="item.status == 1">待付款...</view>
|
||||
<view class="text-green" v-if="item.status == 2">待服务</view>
|
||||
<view class="text-green" v-if="item.status == 5">已完成</view>
|
||||
<view class="text-green" v-if="item.status == 6">进行中</view>
|
||||
<view class="text-green" v-if="item.status == 7">已出发</view>
|
||||
<view class="text-green" v-if="item.status == 8">已到达</view>
|
||||
<view class="text-green" v-if="item.status == 3">待评价</view>
|
||||
<view class="text-green" v-if="item.status == 4" style="color: #999999;">已取消</view>
|
||||
<view class="progress-text">预约时间：{{ item.serveTime }}</view>
|
||||
<view class="progress-status" v-if="item.status == 1">待付款...</view>
|
||||
<view class="progress-status" v-if="item.status == 2">待服务</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 == 7">已出发</view>
|
||||
<view class="progress-status" v-if="item.status == 8">已到达</view>
|
||||
<view class="progress-status" v-if="item.status == 3">待评价</view>
|
||||
<view class="progress-status" v-if="item.status == 4" style="color: #999999;">已取消</view>
|
||||
<view v-if="item.overTimeOrders == 1" style="color: red;font-size:26rpx">(订单已超时)</view>
|
||||
<!-- <view class="text-green" v-if="item.state ==1 ||item.state ==2">待完成</view>
|
||||
<view class="text-green" v-if="item.state ==3||item.state ==4">已完成</view> -->
|
||||
|
||||
</view>
|
||||
<view class="xian"></view>
|
||||
<view class="xian" v-if="item.status == 6"></view>
|
||||
|
||||
<view class=" u-flex u-p-t-30 padding-sm">
|
||||
<view class="u-m-r-10">
|
||||
<u-avatar :src="item.massageImg ? item.massageImg : '../../static/logo.png'" mode="square"
|
||||
size="100">
|
||||
size="80">
|
||||
</u-avatar>
|
||||
</view>
|
||||
<view class="u-flex-1 margin-left-xs">
|
||||
|
|
@ -475,18 +491,6 @@
|
|||
@click="cancel(item)">订单完成</u-button> -->
|
||||
</view>
|
||||
</view>
|
||||
<view class="xian" v-if="item.status == 6"></view>
|
||||
<view class="pintuan_syrs flex justify-between" v-if="item.status == 6">
|
||||
<view style="font-size: 28rpx;font-family: PingFang SC;font-weight: bold;color: #2FB57A;">
|
||||
服务倒计时
|
||||
</view>
|
||||
<!-- <uni-countdown ref="countDownEl" :title="'剩余'" :fontSize="'14'" :showDay="false"
|
||||
:hour="item.endTime.hour" :minute="item.endTime.minute" :second="item.endTime.second"
|
||||
color="#20C675">
|
||||
</uni-countdown> -->
|
||||
<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
|
||||
font-size="30" separator-size="30"></u-count-down>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<uni-popup ref="popup" type="center">
|
||||
|
|
@ -692,13 +696,6 @@ export default {
|
|||
});
|
||||
// this.getcity()
|
||||
|
||||
// 理疗师端首页是否弹框 380
|
||||
this.$Request.get('/app/common/type/448').then(res => {
|
||||
console.log('res448--->',res);
|
||||
this.isJsjdsfxywl = res.data.value;
|
||||
});
|
||||
|
||||
|
||||
},
|
||||
onShow() {
|
||||
console.log(this.isLogin);
|
||||
|
|
@ -715,6 +712,10 @@ export default {
|
|||
}
|
||||
});
|
||||
|
||||
// 理疗师端首页是否弹框 380
|
||||
this.$Request.get('/app/common/type/448').then(res => {
|
||||
this.isJsjdsfxywl = res.data.value;
|
||||
});
|
||||
this.$Request.get('/app/common/type/238').then(res => {
|
||||
if (res.code == 0) {
|
||||
// #ifdef MP-WEIXIN
|
||||
|
|
@ -754,7 +755,7 @@ export default {
|
|||
that.time = setInterval(function () {
|
||||
that.getNewOrder()
|
||||
console.log(that.time);
|
||||
}, 1000000)
|
||||
}, 10000)
|
||||
}
|
||||
} else {
|
||||
console.log(this.userId,"false============>");
|
||||
|
|
@ -997,6 +998,7 @@ export default {
|
|||
},
|
||||
stateSave() {
|
||||
let materialPackageCountFlag = this.homeMaterialPackageList.some((item) => item.residue <= item.materialMinimum);
|
||||
console.log(this.isTrue,materialPackageCountFlag,this.isJsjdsfxywl);
|
||||
if (!this.isTrue && materialPackageCountFlag && this.isJsjdsfxywl == '是') {
|
||||
this.$queue.showToast("当前剩余物料包数量不足，请检查");
|
||||
return;
|
||||
|
|
@ -1465,6 +1467,10 @@ export default {
|
|||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@300&display=swap');
|
||||
body {
|
||||
font-family: Helvetica Neue, Helvetica, sans-serif;
|
||||
}
|
||||
.butween-list{
|
||||
width: 96%;
|
||||
margin: 0 auto;
|
||||
|
|
@ -1501,14 +1507,27 @@ export default {
|
|||
.jishi-index{
|
||||
width: 100%;
|
||||
height: 215px;
|
||||
padding: 0 20px;
|
||||
background-image: url('../../static/index/technician15.png');
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100%;
|
||||
}
|
||||
page {
|
||||
background-color: #ffffff;
|
||||
background-color: #f7f7f7;
|
||||
}
|
||||
.progress-text{
|
||||
font-size: 30rpx;
|
||||
color: #666;
|
||||
padding-top: 8rpx;
|
||||
}
|
||||
.progress-status{
|
||||
color: #fff;
|
||||
border-radius:20rpx 8rpx 20rpx 8rpx ;
|
||||
padding: 4rpx 10rpx;
|
||||
background-image: linear-gradient(to bottom, #fe9130, #ff9868);
|
||||
font-size: 28rpx;
|
||||
|
||||
}
|
||||
// .bg {
|
||||
// background-color: #05C25C;
|
||||
// }
|
||||
|
|
@ -1518,25 +1537,29 @@ page {
|
|||
}
|
||||
|
||||
.gxbox {
|
||||
display: flex;
|
||||
font-size: 20rpx;
|
||||
width: 160px;
|
||||
width: 100%;
|
||||
background-color: #008e7c;
|
||||
color: #fff;
|
||||
border-radius: 15px;
|
||||
padding: 10px;
|
||||
border-radius: 15px 15px 0 0;
|
||||
padding: 0 30rpx;
|
||||
height: 60rpx;
|
||||
margin-top: 8rpx;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.wztext {
|
||||
width: 80px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
//text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.dengjibox {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
height: 360rpx;
|
||||
height: 300rpx;
|
||||
background: linear-gradient(-90deg, #019C88, #1BB9A5, #029D88);
|
||||
box-shadow: 0rpx 0rpx 16rpx 0rpx rgba(26,25,26,0.3);
|
||||
border-radius: 20rpx;
|
||||
|
|
@ -1563,7 +1586,7 @@ page {
|
|||
|
||||
.djimg {
|
||||
position: absolute;
|
||||
right: 40px;
|
||||
right: 45px;
|
||||
top: 0;
|
||||
background: url(../../static/images/index/vip.png) no-repeat center;
|
||||
background-size: cover;
|
||||
|
|
@ -1571,7 +1594,7 @@ page {
|
|||
height: 77px;
|
||||
font-size: 22px;
|
||||
text-align: center;
|
||||
line-height: 84px;
|
||||
line-height: 90px;
|
||||
}
|
||||
|
||||
.xianb {
|
||||
|
|
@ -1615,6 +1638,7 @@ page {
|
|||
border: 2px #ededed solid;
|
||||
border-radius: 10px;
|
||||
padding: 30rpx;
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
.tapDsalk {
|
||||
|
|
@ -1662,17 +1686,27 @@ page {
|
|||
width: 100%;
|
||||
height: 1rpx;
|
||||
border: 1rpx solid #f8f8f8;
|
||||
margin-top: 20rpx;
|
||||
margin-bottom: 10rpx;
|
||||
}
|
||||
|
||||
.pintuan_syrs {
|
||||
color: #999999;
|
||||
color: #fff;
|
||||
font-size: 20upx;
|
||||
margin: 20rpx 20rpx 0rpx;
|
||||
display: flex;
|
||||
padding-right: 18upx;
|
||||
background: #5abfb2 ;
|
||||
padding: 10rpx;
|
||||
border-radius: 10rpx;
|
||||
}
|
||||
.pintuan-title{
|
||||
font-size: 30rpx;
|
||||
font-family: Helvetica Neue, Helvetica, sans-serif;
|
||||
color: #fff;
|
||||
}
|
||||
.pintuan-img{
|
||||
width: 40rpx;
|
||||
height: 40rpx;
|
||||
}
|
||||
|
||||
.box {
|
||||
color: #FFFFFF;
|
||||
padding: 40upx 40upx 60upx 40upx;
|
||||
|
|
@ -1759,7 +1793,7 @@ uni-switch::before {
|
|||
// border-radius: 50px !important;
|
||||
// }
|
||||
.radius {
|
||||
border-radius: 15rpx;
|
||||
border-radius: 20rpx;
|
||||
}
|
||||
|
||||
::v-deep .u-mode-center-box {
|
||||
|
|
@ -1873,6 +1907,12 @@ uni-switch::before {
|
|||
.importMaterialPackageInner view:nth-child(1) {
|
||||
width: 75%;
|
||||
}
|
||||
.head-port{
|
||||
width: 110rpx;
|
||||
height: 110rpx;
|
||||
border-radius: 50%;
|
||||
border: 1px #d6f2ee solid;
|
||||
}
|
||||
|
||||
// ::v-deep .uni-scroll-view-content {
|
||||
// margin: 20px;
|
||||
|
|
|
|||
|
|
@ -33,15 +33,16 @@
|
|||
<view class="view-title">
|
||||
<view class="view-title-left">
|
||||
<span class="view-title-left-shuxian"></span>
|
||||
<span class="view-title-left-text">本期{{orderType=='2'?'已加钟':'已充值'}}订单</span>
|
||||
<span class="view-title-left-text" v-if="orderType==2">本期{{isSfwc=='1'?'已加钟':'未加钟'}}订单</span>
|
||||
<span class="view-title-left-text" v-if="orderType==3">本期{{isSfwc=='1'?'已充值':'未充值'}}订单</span>
|
||||
</view>
|
||||
<view class="view-title-right">加钟订单数量: {{listData.length}}</view>
|
||||
<view class="view-title-right">订单数量: {{listData.length}}</view>
|
||||
</view>
|
||||
<!--本期加钟 充值 订单-->
|
||||
<view class="mina-view" v-if="isSfwc=='1'" v-for="item in listData" :key="item.id" @click="goOder(item)">
|
||||
<view class="mian-list">
|
||||
<view class="mian-list-top">
|
||||
<view class="mian-list-top-biao">{{item.status=='3'?'已完成':'待评价'}}</view>
|
||||
<view class="mian-list-top-biao">{{item.status=='3'?'待评价':'已完成'}}</view>
|
||||
<view class="mian-list-top-time">
|
||||
<span>预约时间: </span>
|
||||
<span>{{item.serveTime}}</span>
|
||||
|
|
@ -49,15 +50,15 @@
|
|||
</view>
|
||||
<view class="mian-foot">
|
||||
<view class="mian-foot-img">
|
||||
<image src="../../my/static/bg6.png" mode=""></image>
|
||||
<image :src="item.massageImg?item.massageImg: '../../../static/logo.png'" mode=""></image>
|
||||
</view>
|
||||
<view class="mian-foot-list">
|
||||
<view class="mian-foot-view">
|
||||
<view class="mian-title">{{item.entryName}}</view>
|
||||
<view class="mian-dingwei">
|
||||
<!-- <view class="mian-dingwei">
|
||||
<image src="../../static/index/dangqian2.png" mode=""></image>
|
||||
<span class="shouyi-text">0.8km</span>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
<view class="mian-foot-dan shouyi-text">
|
||||
订单编号 : {{item.ordersNo}}
|
||||
|
|
@ -80,7 +81,7 @@
|
|||
<view class="mina-view" v-if="isSfwc=='0'" v-for="item in listData" :key="item.id" @click="goOder(item)">
|
||||
<view class="mian-list">
|
||||
<view class="mian-list-top">
|
||||
<view class="mian-list-top-biao">{{item.status=='3'?'已完成':'待评价'}}</view>
|
||||
<view class="mian-list-top-biao">{{item.status=='3'?'待评价':'已完成'}}</view>
|
||||
<view class="mian-list-top-time">
|
||||
<span>预约时间: </span>
|
||||
<span>{{item.serveTime}}</span>
|
||||
|
|
@ -88,15 +89,15 @@
|
|||
</view>
|
||||
<view class="mian-foot">
|
||||
<view class="mian-foot-img">
|
||||
<image src="../../my/static/bg6.png" mode=""></image>
|
||||
<image :src="item.massageImg?item.massageImg: '../../../static/logo.png'" mode=""></image>
|
||||
</view>
|
||||
<view class="mian-foot-list">
|
||||
<view class="mian-foot-view">
|
||||
<view class="mian-title">{{item.entryName}}</view>
|
||||
<view class="mian-dingwei">
|
||||
<!-- <view class="mian-dingwei">
|
||||
<image src="../../static/index/dangqian2.png" mode=""></image>
|
||||
<span class="shouyi-text">0.8km</span>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
<view class="mian-foot-dan shouyi-text">
|
||||
订单编号 : {{item.ordersNo}}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
<template slot="content">
|
||||
<view class="mian-view" v-for="(item,index) in listData" :key="index" @click="goOder(item)">
|
||||
<view class="mian-head">
|
||||
<view class="mian-head-biao">{{item.status=='3'?'已完成':'待评价'}}</view>
|
||||
<view class="mian-head-biao">{{item.status=='3'?'待评价':'已完成'}}</view>
|
||||
<view class="mian-head-time">
|
||||
<span class="shouyi-text">预约时间: </span>
|
||||
<span>{{item.serveTime}}</span>
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
</view>
|
||||
<view class="mian-foot">
|
||||
<view class="mian-foot-img">
|
||||
<image src="../../my/static/bg6.png" mode=""></image>
|
||||
<image :src="item.massageImg?item.massageImg: '../../../static/logo.png'" mode=""></image>
|
||||
</view>
|
||||
<view class="mian-foot-list">
|
||||
<view class="mian-foot-view">
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
</view>
|
||||
<view class="mian-list" @click="goOder(item)" v-for="(item,index) in yjjfList" :key="index">
|
||||
<view class="mian-list-top">
|
||||
<view class="mian-list-top-biao">已完成</view>
|
||||
<view class="mian-list-top-biao">{{item.status=='3'?'待评价':'已完成'}}</view>
|
||||
<view class="mian-list-top-time">
|
||||
<span>预约时间: </span>
|
||||
<span>{{item.serveTime}}</span>
|
||||
|
|
@ -44,15 +44,15 @@
|
|||
</view>
|
||||
<view class="mian-foot">
|
||||
<view class="mian-foot-img">
|
||||
<image src="../../my/static/bg6.png" mode=""></image>
|
||||
<image :src="item.massageImg?item.massageImg: '../../../static/logo.png'" mode=""></image>
|
||||
</view>
|
||||
<view class="mian-foot-list">
|
||||
<view class="mian-foot-view">
|
||||
<view class="mian-title">{{item.entryName}}</view>
|
||||
<view class="mian-dingwei">
|
||||
<!-- <view class="mian-dingwei">
|
||||
<image src="../../static/index/dangqian2.png" mode=""></image>
|
||||
<span class="shouyi-text">{{item.km}}km</span>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
<view class="mian-foot-dan shouyi-text">
|
||||
订单编号 : {{item.ordersNo}}
|
||||
|
|
|
|||
|
|
@ -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: 35px;">
|
||||
<view class=" u-flex padding-lr" style="padding-top: 35px;">
|
||||
<view class="u-m-r-10">
|
||||
<image :src="avatar" style="width: 60px;height: 60px;border-radius: 100rpx; border: 1px solid #d7f2ee; margin-left: 5px;"
|
||||
<image :src="avatar" class="head-port""
|
||||
@click="goNav('/pages/my/userinfo')"></image>
|
||||
</view>
|
||||
<view class="u-flex-1" v-if="isLogin && userName">
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view v-else class="text-xl u-p-l-20 text-bold" @click="goLogin('/pages/public/login')">
|
||||
<view v-else class="text-xl text-white u-p-l-20 text-bold" @click="goLogin('/pages/public/login')">
|
||||
登录
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -923,4 +923,10 @@
|
|||
font-weight: bold;
|
||||
margin-left: 10rpx;
|
||||
}
|
||||
.head-port{
|
||||
width: 110rpx;
|
||||
height: 110rpx;
|
||||
border-radius: 50%;
|
||||
border: 1px #d6f2ee solid;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -6,9 +6,9 @@
|
|||
|
||||
<!-- sticky吸顶悬浮的菜单, 父元素必须是 mescroll -->
|
||||
<view class="sticky-tabs">
|
||||
<view class=" u-flex padding ding-view">
|
||||
<view class="ding-view">
|
||||
<view class="u-m-r-10">
|
||||
<image :src="avatar" style="width: 100rpx;height: 100rpx;border-radius: 100rpx;"
|
||||
<image :src="avatar" class="head-port"
|
||||
@click="goNav('/pages/my/userinfo')"></image>
|
||||
</view>
|
||||
<view class="u-flex-1 u-m-l-10 " v-if="isLogin && userName">
|
||||
|
|
@ -67,41 +67,41 @@
|
|||
<view class="flex justify-between padding-sm">
|
||||
<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 == 2">待服务</view>
|
||||
<view class="progress-status" v-if="item.status == 2">待服务</view>
|
||||
<view class="text-green" 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 == 5">已完成</view>
|
||||
<view class="text-green" v-if="item.status == 6">服务中</view>
|
||||
<view class="text-green" v-if="item.status == 7">技师出发</view>
|
||||
<view class="text-green" v-if="item.status == 8">技师到达</view>
|
||||
<view class="text-green" v-if="item.status ==9">确认接单</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 == 7">技师出发</view>
|
||||
<view class="progress-status" v-if="item.status == 8">技师到达</view>
|
||||
<view class="progress-status" v-if="item.status ==9">确认接单</view>
|
||||
<!-- <view class="text-green" v-if="item.state ==1 ||item.state ==2">待完成</view>
|
||||
|
||||
<view class="text-green" v-if="item.state ==3||item.state ==4">已完成</view> -->
|
||||
|
||||
<view class="text-green">预约时间：{{ item.serveTime }}</view>
|
||||
<view style="color: #333;">预约时间：{{ item.serveTime }}</view>
|
||||
<view v-if="item.status == 9&& item.refusalContent" class="judan">
|
||||
拒单审核中...
|
||||
</view>
|
||||
</view>
|
||||
<view class="xian"></view>
|
||||
<view class=" u-flex u-p-t-30 padding-sm">
|
||||
<view class=" u-flex padding-sm">
|
||||
<view class="u-m-r-10">
|
||||
<u-avatar :src="item.massageImg ? item.massageImg : '../../static/logo.png'" mode="square"
|
||||
size="100">
|
||||
</u-avatar>
|
||||
</view>
|
||||
<view class="u-flex-1 margin-left-xs">
|
||||
<view class="u-font-18 text-bold u-line-1 top-title">
|
||||
<view class="margin-right-xs text-df margin-left-xs" style="margin-top: 0rpx;display: inline-block;width: 105px; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
|
||||
<view class="u-font-18 u-line-1 top-title">
|
||||
<view class="margin-right-xs order-details ">
|
||||
{{ item.title }}
|
||||
</view>
|
||||
<view class="flex-sub ">
|
||||
实收：<text class="text-df">￥</text><text class="text-xl text-bold">{{ item.artificerMoneyTotal
|
||||
<view class="flex-sub">
|
||||
<text class="text-df">实收:￥</text><text class="text-xl text-bold">{{ item.artificerMoneyTotal
|
||||
}}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="margin-left-xs text-cut" style="width:550upx">{{ item.address }}</view>
|
||||
<view class="text-cut" style="width:550upx; color: #999;">{{ item.address }}</view>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -114,7 +114,7 @@
|
|||
@click="goNav('/my/order/pay?id=' + item.ordersId + '&isTrue=1')">查看详情</u-button> -->
|
||||
<view class="showBtn">
|
||||
<view class="gengduo" @click.stop="gengBtn(index)">更多</view>
|
||||
<view class="showBtn-view">
|
||||
<view class="order-status showBtn-view">
|
||||
<u-button :custom-style="customStyle" shape="circle" :plain="true"
|
||||
@click="goChat">联系客服</u-button>
|
||||
<u-button :custom-style="customStyle" v-if="item.status == 1||item.status == 7||item.status == 8||item.status == 9" shape="circle" :plain="true"
|
||||
|
|
@ -144,7 +144,7 @@
|
|||
</view>
|
||||
<view class="xian" v-if="item.status == 6"></view>
|
||||
<view class="pintuan_syrs flex justify-between" v-if="item.status == 6">
|
||||
<view style="font-size: 28rpx;font-family: PingFang SC;font-weight: bold;color: #096f4b;">服务倒计时
|
||||
<view style="font-size: 28rpx;font-family: PingFang SC;font-weight: bold;color: #fe9130;">服务倒计时
|
||||
</view>
|
||||
<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
|
||||
font-size="30" separator-size="30"></u-count-down>
|
||||
|
|
@ -242,11 +242,11 @@
|
|||
}, {
|
||||
activityImageProps: {
|
||||
src: '../../static/images/order_02.png',
|
||||
style: 'width: 26px;height: 26px;',
|
||||
style: 'width: 30px;height: 30px;',
|
||||
},
|
||||
noactivityImageProps: {
|
||||
src: '../../static/images/order_022.png',
|
||||
style: 'width: 26px;height: 26px;',
|
||||
style: 'width: 30px;height: 30px;',
|
||||
},
|
||||
activityTitleTextProps: {
|
||||
class: 'activityTitleTextProps',
|
||||
|
|
@ -259,11 +259,11 @@
|
|||
}, {
|
||||
activityImageProps: {
|
||||
src: '../../static/images/order_03.png',
|
||||
style: 'width: 26px;height: 26px;',
|
||||
style: 'width: 30px;height: 30px;',
|
||||
},
|
||||
noactivityImageProps: {
|
||||
src: '../../static/images/order_033.png',
|
||||
style: 'width: 26px;height: 26px;',
|
||||
style: 'width: 30px;height: 30px;',
|
||||
},
|
||||
activityTitleTextProps: {
|
||||
class: 'activityTitleTextProps',
|
||||
|
|
@ -276,11 +276,11 @@
|
|||
}, {
|
||||
activityImageProps: {
|
||||
src: '../../static/images/order_04.png',
|
||||
style: 'width: 26px;height: 26px;',
|
||||
style: 'width: 30px;height: 30px;',
|
||||
},
|
||||
noactivityImageProps: {
|
||||
src: '../../static/images/order_044.png',
|
||||
style: 'width: 26px;height: 26px;',
|
||||
style: 'width: 28px;height: 30px;',
|
||||
},
|
||||
activityTitleTextProps: {
|
||||
class: 'activityTitleTextProps',
|
||||
|
|
@ -872,6 +872,11 @@
|
|||
flex-direction: row;
|
||||
align-items: center;
|
||||
}
|
||||
.order-status{
|
||||
width: 90%;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
}
|
||||
.showBtn{
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
|
@ -885,11 +890,12 @@
|
|||
|
||||
}
|
||||
/deep/.text-xl{
|
||||
font-size: 15px;
|
||||
font-size: 34rpx;
|
||||
color: #fe9130;
|
||||
}
|
||||
.flex-sub{
|
||||
text-align: right;
|
||||
font-size: 13px;
|
||||
font-size: 28rpx;
|
||||
}
|
||||
.top-title{
|
||||
width: 95%;
|
||||
|
|
@ -1004,10 +1010,10 @@
|
|||
background: linear-gradient(-90deg, #019C88, #1BB9A5, #029D88);
|
||||
border-radius: 24rpx;
|
||||
margin: 10px auto 0px auto;
|
||||
align-items: end;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
padding:30rpx;
|
||||
}
|
||||
.content{
|
||||
width: 100%;
|
||||
|
|
@ -1018,7 +1024,7 @@
|
|||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
padding: 30px 0px;
|
||||
padding: 10px 0px;
|
||||
}
|
||||
|
||||
.u-tabs {
|
||||
|
|
@ -1031,7 +1037,7 @@
|
|||
}
|
||||
|
||||
/deep/.u-scroll-view {
|
||||
padding: 10px 16px !important;
|
||||
padding: 10px 0px !important;
|
||||
}
|
||||
|
||||
/deep/.u-tab-item {
|
||||
|
|
@ -1054,7 +1060,7 @@
|
|||
}
|
||||
|
||||
/deep/.activityTitleTextProps {
|
||||
color: #096f4b;
|
||||
color: #019c88;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
|
|
@ -1094,7 +1100,7 @@
|
|||
width: 100%;
|
||||
height: 1rpx;
|
||||
border: 1rpx solid #f8f8f8;
|
||||
margin-top: 20rpx;
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
|
||||
.pintuan_syrs {
|
||||
|
|
@ -1125,4 +1131,23 @@
|
|||
margin-right: 8rpx;
|
||||
}
|
||||
}
|
||||
.head-port{
|
||||
width: 110rpx;
|
||||
height: 110rpx;
|
||||
border-radius: 50%;
|
||||
border: 1px #d6f2ee solid;
|
||||
}
|
||||
/deep/.radius {
|
||||
border-radius: 20rpx;
|
||||
}
|
||||
.progress-status{
|
||||
color: #019c88;
|
||||
font-weight: bold;
|
||||
font-size: 30rpx;
|
||||
}
|
||||
.order-details{
|
||||
font-size: 32rpx;
|
||||
font-weight: bold;
|
||||
|
||||
}
|
||||
</style>
|
||||
|
|
@ -0,0 +1,137 @@
|
|||
<template>
|
||||
<view class="content">
|
||||
<view class="flex" style="overflow: hidden;flex-wrap: wrap;padding-bottom: 10rpx;">
|
||||
<view class="margin-top flex margin-right-sm flex-wrap" v-if="infantImg.length" style="width:100%;">
|
||||
<view class="flex" style="width: 200rpx;height: 200rpx;margin-right: 5rpx;position: relative;"
|
||||
v-for="(image,index) in infantImg" :key="index">
|
||||
<image :src="image" style="width: 100%;height: 100%;"></image>
|
||||
<view
|
||||
style="z-index: 9;position: absolute;top: -15rpx;right: -15rpx;" @click="removeImg(index)">
|
||||
<u-icon name="close-circle-fill" color="#d81e06" size="50rpx"></u-icon>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="margin-top" @click="addImages(3)" v-if="infantImg.length<6" >
|
||||
<view style="width: 200rpx;height: 200rpx;background: #f7f8fa; margin-bottom: 20rpx;"
|
||||
class="flex justify-center align-center">
|
||||
<view>
|
||||
<view class="text-center">
|
||||
<image src="../../static/images/my/add.png" style="width: 80rpx;height: 80rpx;">
|
||||
</image>
|
||||
</view>
|
||||
<view class="text-center add-word">添加图片</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="tabbar" style="background: linear-gradient(to right, #019c88, #2dbe93); border-radius: 50rpx;"
|
||||
@click="submit()" >提交</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import empty from '@/components/empty.vue'
|
||||
import tRefresh from "@/components/t-refresh/t-refresh.vue"
|
||||
import * as websocketUtils from 'utils/websocketUtils.js';
|
||||
export default {
|
||||
components:{tRefresh,empty},
|
||||
data(){
|
||||
return{
|
||||
infantImg: [],
|
||||
form:{},
|
||||
}
|
||||
},
|
||||
onLoad(e) {
|
||||
},
|
||||
methods:{
|
||||
removeImg(index) {
|
||||
this.infantImg.splice(index, 1)
|
||||
},
|
||||
addImages(e) {
|
||||
let that = this
|
||||
let urlName = websocketUtils.getBaseUrl() + '/alioss/upload';
|
||||
if (e == 2) {
|
||||
urlName = websocketUtils.getBaseUrl() + '/alioss/uploadWatermark';
|
||||
}
|
||||
uni.chooseImage({
|
||||
count: 6,
|
||||
sourceType: ['album', 'camera'],
|
||||
success: res => {
|
||||
for (let i = 0; i < res.tempFilePaths.length; i++) {
|
||||
that.$queue.showLoading("上传中...");
|
||||
uni.uploadFile({ // 上传接口
|
||||
//url: websocketUtils.uploadFileUrl(), //真实的接口地址
|
||||
url: urlName,
|
||||
filePath: res.tempFilePaths[i],
|
||||
name: 'file',
|
||||
success: (uploadFileRes) => {
|
||||
if (e == 3) {
|
||||
if (that.infantImg.length <= 5) {
|
||||
that.infantImg.push(JSON.parse(uploadFileRes.data).data)
|
||||
}
|
||||
} else if (e == 2) {
|
||||
if (that.certificateImg.length <= 5) {
|
||||
that.certificateImg.push(JSON.parse(uploadFileRes.data).data)
|
||||
}
|
||||
}
|
||||
uni.hideLoading();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
submit() {
|
||||
this.form.infantImg = this.infantImg
|
||||
this.form.infantImg = this.form.infantImg.toString();
|
||||
if (!this.form.infantImg) {
|
||||
uni.showToast({
|
||||
title: '请上传生活照',
|
||||
icon: 'none',
|
||||
duration: 1000
|
||||
})
|
||||
return;
|
||||
}
|
||||
let data = {
|
||||
artificerId: uni.getStorageSync("artificerId"),
|
||||
lifePhoto: this.form.infantImg,
|
||||
}
|
||||
|
||||
this.$Request.postJson("/app/artificer/updateShz", data).then(res => {
|
||||
if (res.code == 0) {
|
||||
uni.showToast({
|
||||
title: '提交成功！',
|
||||
icon: 'none'
|
||||
})
|
||||
setTimeout(function() {
|
||||
uni.switchTab({
|
||||
url: '/pages/my/index'
|
||||
})
|
||||
}, 1000)
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
icon: 'none'
|
||||
})
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.tabbar {
|
||||
width: 690upx;
|
||||
height: 86upx;
|
||||
background: #019c88;
|
||||
border-radius: 8upx;
|
||||
margin: 0 auto;
|
||||
text-align: center;
|
||||
line-height: 86upx;
|
||||
color: #FFFFFF;
|
||||
margin-top: 20rpx;
|
||||
}
|
||||
</style>
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 4.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 4.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 2.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 4.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 2.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 3.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 2.0 KiB |
Loading…
Reference in New Issue