yangjun
/
sadjv3_user
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_user

This commit is contained in:
Mr.jiang 2024-07-16 17:20:59 +08:00
parent 831b28b65e 0e2a825b9d
commit 0237af3c38
5 changed files with 48 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
my/hongbao/xinrenhongbao.vue
View File

@ -9,7 +9,7 @@
</view> -->
<t-refresh ref="refresh" v-if="hongbao.length>0" @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType" :tPadding="0">
<template slot="content">
<checkbox-group @change="checkboxChange">
<checkbox-group @change="checkboxChange" >
<view>
<view class="youhui-weiyong youhui-list" v-for="(item,index) in hongbao" :key="index">
<view class="youhui-view-left">
@ -148,6 +148,7 @@
<style scoped>
/deep/.refresh-body{
height: 870px !important;
margin-bottom: 60rpx;
}
.que-btn{
display: inline-block;

63
my/order/payJaZ.vue
View File

@ -17,7 +17,7 @@
</view>
<view class="u-flex-1 margin-left-sm">
<view class="flex head-title-right">
<view class="margin-right-xs text-df u-skeleton-fillet head-title">
<view class="head-title">
{{order.entryName}}
</view>
<view class="zhuangtai">
@ -111,9 +111,9 @@
<view class="jusitify-line">
<view class="line-word">订单编号</view>
<view class="flex align-center" @tap="copy(order.ordersNo)"
style="color: #333;font-size: 26rpx;">
style="color: #333;font-size: 30rpx;">
<view class="">{{order.ordersNo}}</view>
<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx;"></u-icon>
<u-icon name="file-text" style="color: #1db18f;margin-left: 10rpx;"></u-icon>
</view>
</view>
@ -474,7 +474,11 @@
<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
<view class="showBtn-mian" v-if="order.status=='6'">
<view class="showBtn">
<view class="gengduo" @click.stop="gengBtn">更多</view>
<view class="gengduo" @click.stop="gengBtn">
<image style="width: 40rpx; height: 40rpx; margin-left: 3rpx;" src="../../static/mores.png" mode=""></image>
更多
</view>
<view class="showbtn-line">
<u-button
shape="circle" :plain="true"
@click="toggle('center',order)"
@ -502,16 +506,17 @@
充值
</u-button>
</view>
</view>
<view v-if="btnShow==true" class="showBtnClass">
<u-button :custom-style="customStyle2"
shape="circle" :plain="true"
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
class="dingshi">
class="btns">
去投诉
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true"
@click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)"
class="dingshi">
class="btns">
去评价
</u-button>
<u-button shape="circle" :plain="true" @click="goChat"
@ -640,7 +645,7 @@
<view class="popup-content">
<view class="popup-head">
<span>请输入提前结束的原因</span>
<span @click="closePopup(type)">x</span>
<span @click="closePopup(type)"><image style="width: 30rxp; height: 50rpx;" src="../../static/close.png" mode=""></image></span>
</view>
<view class="popup-mian">
<textarea placeholder="请输入提前结束服务原因" @input="textareaInp" class="popup-mian-textarea" name="" id="" cols="30" rows="10"></textarea>
@ -1835,13 +1840,16 @@
}
.showBtnClass{
position: absolute;
background: #f7f7f7;
background: #fff;
display: flex;
flex-direction: column;
width: 100px;
left: 0;
margin-bottom: 50px;
margin-left: 20px;
margin-bottom: 43px;
margin-left: 10px;
border-radius: 20rpx 20rpx 20rpx 0;
box-shadow: 0px 0px 3px 0px #b5b5b5;
padding: 15rpx 5rpx;
}
.dingshi,.btns{
width: 0px !important;
@ -1947,10 +1955,10 @@
border-radius: 14rpx;
}
.xiangmu{
width: 95%;
width: 94%;
height: 263rpx;
background: #FFFFFF;
border-radius: 21rpx;
border-radius:50rpx;
margin: 0px auto 10px auto;
display: flex;
flex-direction: row;
@ -1981,7 +1989,7 @@
flex-direction: row;
justify-content: space-between;
align-items: center;
margin-top: 10px;
margin-top: 20px;
}
.popup-mian-textarea{
width: 525.69rpx;
@ -1996,12 +2004,6 @@
.popup-head span:nth-child(2){
width: 50rpx;
height: 50rpx;
line-height: 19px;
text-align: center;
font-size: 24px;
color: #15AB8D;
border-radius: 50%;
border: 3px solid #15AB8D;
}
.popup-head span:nth-child(1){
font-weight: bold;
@ -2022,17 +2024,23 @@
width: 613rpx;
height: 479rpx;
background: #FFFFFF;
border-radius: 56rpx;
border-radius: 40rpx;
display: flex;
flex-direction: column;
}
/deep/.btns{
background: #019C88 !important;
color: #fff !important;
border: 1rpx solid #e5e5e5 ;
color: #333333 !important;
margin-left: 10rpx !important;
}
/deep/.u-size-default{
margin: 5px 0px 0px 0px;
}
.showbtn-line{
display: flex;
flex-direction: row;
align-items: center;
}
.showBtn-mian{
width: 100%;
display: flex;
@ -2042,9 +2050,13 @@
justify-content: flex-end;
}
.gengduo{
display: flex;
flex-direction:column;
font-weight: 400;
font-size: 25rpx;
color: #7D7D7D;
margin-left: 20rpx;
}
.showBtn-view{
width: 100%;
@ -2076,6 +2088,7 @@
}
.zhuangtai{
color: #029D88;
font-size: 30rpx;
}
.head-title-right{
display: flex;
@ -2090,6 +2103,7 @@
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
font-size: 30rpx;
}
.fei-view-list span,.fei-view-list-z span{
font-weight: bold;
@ -2157,7 +2171,7 @@
}
.list-pay{
width: 100%;
padding: 0px 29rpx;
padding: 0 29rpx 20rpx 29rpx ;
}
.pay-ding-top{
width: 100%;
@ -2202,7 +2216,7 @@
font-size: 25rpx;
}
.money-pay-zhen span:nth-child(2){
font-size: 31.25rpx;
font-size: 32rpx;
font-weight: bold;
}
.money-pay-zhen{
@ -2388,6 +2402,7 @@
justify-content: center;
height: 127rpx;
padding: 0 30rpx;
border-top: 1px solid #f5f5f5;
}
.box {

3
pages/my/indextaociliaoList.vue
View File

@ -18,7 +18,7 @@
</view>
<view class="fenlei">
<z-tabs class="z-tabs-fenlei" :list="tabList" @change="tabChange" @changeClick="changeClick"/>
<z-tabs class="z-tabs-fenlei":list="tabList" @change="tabChange" @changeClick="changeClick"/>
</view>
</view>
<t-refresh ref="refresh" v-if="dataList.length>0" @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType" :tPadding="0">
@ -207,6 +207,7 @@
.shop_label{
display: flex;
flex-wrap: wrap;
margin-top: 8rpx;
}
.shop_label span{
background: #e5e5e5;

BIN
static/mores.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

10
uni_modules/z-tabs/components/z-tabs/z-tabs.vue
View File

@ -629,7 +629,7 @@
width: 750rpx;
/* #endif */
flex-direction: row;
height: 80rpx;
height: 70rpx;
}
.z-tabs-scroll-view-conatiner{
@ -701,8 +701,8 @@
.z-tabs-item-title{
/* font-weight: bold; */
font-size: 34rpx;
color: #019C88;
font-size: 30rpx;
color: #019c88;
}
.z-tabs-item-title-disabled{
@ -725,12 +725,12 @@
bottom: 0;
left: 0;
right: 0;
margin-bottom: 9px;
margin-bottom: 5px;
}
.z-tabs-bottom-dot{
border-radius: 100px;
background: linear-gradient(90deg,rgba(234, 248, 245,0.7),rgba(132, 211, 196,0.7)) !important;
background: linear-gradient(90deg,rgba(234, 248, 245,0.9),rgba(1, 156, 136,0.7)) !important;
}
.z-tabs-left,.z-tabs-right{