1.优化头像裁剪功能
2.修复标题字体大小不一的问题 3.优化提现页面UI 4.优化参与者列表页面UI 5.售后订单列表新增已拒绝状态查询 6.售后订单详情新增拒绝状态 7.修复发布不能换行的问题 8.优化详情页面展示不能换行的问题 9.优化底部菜单UI 10.优化系统消息详情页面UI
This commit is contained in:
parent
d7fdf23901
commit
5fa6499716
@ -136,7 +136,6 @@
|
||||
<text>驳回原因</text>
|
||||
<text style="color: #323232;">{{ info.reason }}</text>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
<view class="third-center" v-if="info.auth_status == 1">
|
||||
@ -258,7 +257,7 @@
|
||||
<view>
|
||||
<view class="textarea_mph" style="margin-top: 30rpx;">
|
||||
<u--textarea maxlength="400" placeholder-class="bttops" v-model="reject_reason"
|
||||
placeholder="请输入您经营热爱的户外运动"></u--textarea>
|
||||
placeholder="请输入驳回原因"></u--textarea>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -549,7 +548,7 @@ export default {
|
||||
.third {
|
||||
width: 100%;
|
||||
background: #ffffff;
|
||||
margin-top: 20rpx;
|
||||
margin-top: 30rpx;
|
||||
border-radius: 44rpx;
|
||||
|
||||
.third-top {
|
||||
|
@ -42,8 +42,8 @@
|
||||
<view
|
||||
style="text-align: center;color: #323232;padding: 0rpx 10rpx;">{{
|
||||
detail.refund_info.title }}</view>
|
||||
<image src="/static/detail/zidong.png" mode=""
|
||||
style="width: 20rpx;height: 20rpx;margin-right: 0;"></image>
|
||||
<!-- <image src="/static/detail/zidong.png" mode=""
|
||||
style="width: 20rpx;height: 20rpx;margin-right: 0;"></image> -->
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
@ -43,8 +43,8 @@
|
||||
style="width: 28rpx;height: 28rpx;margin-right: 0;"></image>
|
||||
<view style="text-align: center;color: #323232;padding: 0rpx 10rpx;">{{
|
||||
detail.refund_info.title }}</view>
|
||||
<image src="/static/detail/zidong.png" mode=""
|
||||
style="width: 20rpx;height: 20rpx;margin-right: 0;"></image>
|
||||
<!-- <image src="/static/detail/zidong.png" mode=""
|
||||
style="width: 20rpx;height: 20rpx;margin-right: 0;"></image> -->
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
@ -34,11 +34,11 @@
|
||||
</view>
|
||||
<view v-for="item in mysignList"
|
||||
style="background: linear-gradient( 180deg, rgba(232,255,197,0.89) 0%, #FFFFFF 31%);border-radius: 18rpx;margin-top: 30rpx;padding-bottom: 20rpx;">
|
||||
<view style="font-size: 26rpx;color: #3D3D3D;padding: 30rpx;font-weight: 600;">订单编号:{{item.order_no}}
|
||||
<view style="font-size: 32rpx;color: #3D3D3D;padding: 30rpx;font-weight: 600;">订单编号:{{item.order_no}}
|
||||
</view>
|
||||
<view style="width: 100%;height: 1rpx;background-color: #EEEEEE;margin: 10rpx 0;"></view>
|
||||
<view style="width: 100%;height: 1rpx;background-color: #f8f8f8;margin: 10rpx 0;"></view>
|
||||
<view v-for="(v,i) in item.ordercode">
|
||||
<view style="display: flex;align-items: center;justify-content: space-between;padding:10rpx 30rpx;">
|
||||
<view style="display: flex;align-items: center;justify-content: space-between;padding:20rpx 30rpx;">
|
||||
<view>
|
||||
<view style="font-size: 28rpx;color: #323232;">{{v.name}}</view>
|
||||
<view style="color: #9C9C9C;font-size: 24rpx;margin-top: 20rpx;">身份证 {{v.idnum}}</view>
|
||||
@ -49,7 +49,7 @@
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="i<item.ordercode.length-1"
|
||||
style="width: 100%;height: 1rpx;background-color: #EEEEEE;margin: 10rpx 0;"></view>
|
||||
style="width: 93%;height: 1rpx;background-color: #f8f8f8;margin: 0rpx auto;margin-top:10rpx;"></view>
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="mysignList.length==0" style="text-align: center;margin: 0 auto;padding-top: 300rpx;">
|
||||
|
@ -2,7 +2,7 @@
|
||||
<view class="box flex justify-center align-items flex-column">
|
||||
<view class="con-center flex flex-column justify-center align-items">
|
||||
<view class="tabs">
|
||||
<u-tabs :activeStyle="{
|
||||
<u-tabs :activeStyle="{
|
||||
color: '#303133',
|
||||
fontWeight: 'bold',fontSize: '32rpx'}" :inactiveStyle="{
|
||||
color: '#606266'
|
||||
@ -26,14 +26,16 @@
|
||||
<span :class="['span_s', { active: server_status == 3 }]" @click="toAfter(3)">待售后</span>
|
||||
<span :class="['span_s', { active: server_status == 6 }]" style="margin-left: 20rpx;"
|
||||
@click="toAfter(6)">已售后</span>
|
||||
<span :class="['span_s', { active: server_status == -1 }]" style="margin-left: 20rpx;"
|
||||
@click="toAfter(-1)">已拒绝</span>
|
||||
</view>
|
||||
|
||||
|
||||
<view :class="['hot', 'flex', 'flex-column', status == 0 || status == -2 ? 'wsh_hot' : '']">
|
||||
<view class="content flex align-items flex-column">
|
||||
<view class="flex flex-column w-100 bbb" style="position: relative;"
|
||||
v-for="(item, index) in hotList" :key="index" >
|
||||
<view v-if="status != -2" @click.stop="detail(item.id)">
|
||||
v-for="(item, index) in hotList" :key="index">
|
||||
<view v-if="status != -2" @click.stop="detail(item.id)">
|
||||
<image v-if="item.auth_status == 0" src="/static/my/daishenhe.png"
|
||||
style="width: 134rpx; height: 106rpx;position: absolute;right: 0;"></image>
|
||||
<image v-if="item.auth_status == 2" src="/static/my/wtg.png"
|
||||
@ -42,8 +44,10 @@
|
||||
<view class="right flex flex-column" style="align-items: self-start;">
|
||||
|
||||
<span class="title white-space" style="padding-left: 30rpx;">{{ item.title }}</span>
|
||||
<span class="first-image flex align-items" style="margin-top: 20rpx; width: 100%;padding-left: 30rpx;">
|
||||
<image :src="item.user.avatar" style="width: 36rpx; height: 36rpx;border-radius: 50%;"></image>
|
||||
<span class="first-image flex align-items"
|
||||
style="margin-top: 20rpx; width: 100%;padding-left: 30rpx;">
|
||||
<image :src="item.user.avatar"
|
||||
style="width: 36rpx; height: 36rpx;border-radius: 50%;"></image>
|
||||
<span style="color: #9c9c9c; margin-left: 10rpx;">{{
|
||||
item.user.nickname
|
||||
}}</span>
|
||||
@ -58,22 +62,23 @@
|
||||
<span class="time_tex" v-if="item.status == 2">{{
|
||||
"报名中"
|
||||
}}</span>
|
||||
<span v-if="item.status == 2" style="margin: 0 20rpx">{{ dateWeeks(item.sign_start_time) }}</span>
|
||||
<span v-if="item.status != 2" style="margin: 0 20rpx 0 0">{{ dateWeeks(item.sign_start_time) }}
|
||||
</span><span
|
||||
style="width: 1rpx;height: 22rpx;background: #323232;"></span>
|
||||
<span class="white-space"
|
||||
style="margin-left: 20rpx; width: 260rpx">{{
|
||||
<span v-if="item.status == 2"
|
||||
style="margin: 0 20rpx">{{ dateWeeks(item.sign_start_time) }}</span>
|
||||
<span v-if="item.status != 2"
|
||||
style="margin: 0 20rpx 0 0">{{ dateWeeks(item.sign_start_time) }}
|
||||
</span><span style="width: 1rpx;height: 22rpx;background: #323232;"></span>
|
||||
<span class="white-space" style="margin-left: 20rpx; width: 260rpx">{{
|
||||
item.address_detail }}</span>
|
||||
|
||||
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="flex align-items justify-center" style="gap: 16rpx;width: 100%;margin-top: 20rpx;margin-bottom: 32rpx;">
|
||||
|
||||
<view class="flex align-items justify-center"
|
||||
style="gap: 16rpx;width: 100%;margin-top: 20rpx;margin-bottom: 32rpx;">
|
||||
|
||||
<view class="imgs_con_div" v-for="(items_img, index) in item.images.slice(0, 3)"
|
||||
:key="index">
|
||||
<image class="imgs_con" :src="items_img"></image>
|
||||
<image class="imgs_con" :src="items_img"></image>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -89,8 +94,8 @@
|
||||
<u-avatar-group :urls="item.join_info.users" keyName="avatar" size="30" maxCount="1"
|
||||
gap="0.4"></u-avatar-group>
|
||||
<image src="/static/index/dian.png" style="
|
||||
width: 58rpx;
|
||||
height: 58rpx;
|
||||
width: 60rpx;
|
||||
height: 60rpx;
|
||||
margin-left: -20rpx;
|
||||
"></image>
|
||||
<view style="margin-left: 20rpx;vertical-align: middle;font-size: 24rpx;">
|
||||
@ -112,7 +117,8 @@
|
||||
</view>
|
||||
<view v-if="status == -2" @click.stop="detail(item.activity_id)">
|
||||
<view class="flex" style="margin-top: 30rpx">
|
||||
<view class="right flex flex-column" style="align-items: self-start;padding-left: 15px;">
|
||||
<view class="right flex flex-column"
|
||||
style="align-items: self-start;padding-left: 15px;">
|
||||
<view class="flex flex-column">
|
||||
<view class="time flex align-items white-space">
|
||||
<span style="color: #9C9C9C;">活动时间:{{ dateWeeks(item.detail.sign_start_time)
|
||||
@ -138,8 +144,11 @@
|
||||
<text v-if="server_status==6"
|
||||
style="color: #FF4810;font-weight: 600;">¥{{ item.real_refundprice }}</text>
|
||||
</view>
|
||||
<view v-if="item.before_status==-3" style="font-size: 26rpx;color: #9C9C9C;">数量:{{ item.num }}</view>
|
||||
<view v-if="item.before_status!=-3" style="font-size: 26rpx;color: #9C9C9C;">数量:{{ item.auth_num }}</view>
|
||||
<view v-if="item.before_status==-3"
|
||||
style="font-size: 26rpx;color: #9C9C9C;">数量:{{ item.num }}</view>
|
||||
<view v-if="item.before_status!=-3"
|
||||
style="font-size: 26rpx;color: #9C9C9C;">数量:{{ item.auth_num }}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -148,14 +157,13 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex align-items"
|
||||
style="justify-content:space-between;padding: 30rpx">
|
||||
<view class="flex align-items" style="justify-content:space-between;padding: 30rpx">
|
||||
<view style="font-size: 28rpx;color: #323232;">
|
||||
<view v-if="item.auth_status == 1">
|
||||
已同意退款
|
||||
已同意退款
|
||||
</view>
|
||||
<view v-if="item.auth_status == 2">
|
||||
已驳回
|
||||
已驳回
|
||||
</view>
|
||||
</view>
|
||||
<view
|
||||
@ -344,13 +352,25 @@
|
||||
},
|
||||
// 获取售后订单
|
||||
getAfterList() {
|
||||
var auth_status='';
|
||||
var server_status=this.server_status;
|
||||
var status='4,5,6'
|
||||
//-1为拒绝退款
|
||||
if(this.server_status== -1){
|
||||
auth_status='2';
|
||||
server_status='6';
|
||||
status="4,5,6,7";
|
||||
}else{
|
||||
|
||||
}
|
||||
uni.$u.http
|
||||
.get("/api/school.newworker.activity.order/order_list", {
|
||||
params: {
|
||||
page: this.page,
|
||||
limit: 20,
|
||||
server_status: this.server_status,
|
||||
status: '4,5,6',
|
||||
server_status: server_status,
|
||||
status: status,
|
||||
auth_status:auth_status,
|
||||
},
|
||||
})
|
||||
.then((res) => {
|
||||
@ -381,9 +401,9 @@
|
||||
val = '1,2,3,4,5';
|
||||
auth_status = this.auth_status;
|
||||
} else {
|
||||
if(val == '-1'){
|
||||
if (val == '-1') {
|
||||
auth_status = '0,1,2';
|
||||
}else{
|
||||
} else {
|
||||
auth_status = '1';
|
||||
}
|
||||
}
|
||||
@ -627,7 +647,7 @@
|
||||
},
|
||||
selectheader(index) {
|
||||
console.log(index);
|
||||
var status=index.status;
|
||||
var status = index.status;
|
||||
this.selected = status;
|
||||
this.page = 1;
|
||||
this.hotList = [];
|
||||
@ -676,11 +696,12 @@
|
||||
.shenhe {
|
||||
width: 94%;
|
||||
position: fixed;
|
||||
top: 75rpx;
|
||||
top: 85rpx;
|
||||
//background: #f7f7f7;
|
||||
background: #f7f7f7;
|
||||
z-index: 100;
|
||||
padding: 30rpx 0rpx;
|
||||
|
||||
.span_s {
|
||||
width: 134rpx;
|
||||
height: 60rpx;
|
||||
@ -753,6 +774,7 @@
|
||||
|
||||
.rightBox {
|
||||
width: 50%;
|
||||
|
||||
.line-row {
|
||||
width: 382rpx;
|
||||
height: 1rpx;
|
||||
|
@ -41,7 +41,7 @@
|
||||
<view>
|
||||
<image src="/static/center/address.png" mode="" class="icon-size"></image>
|
||||
</view>
|
||||
<view class="white-space" style="font-size: 26rpx;color: #222222;">{{detail.address}}{{detail.address_detail}}</view>
|
||||
<view class="white-space" style="font-size: 26rpx;color: #222222;font-weight: 400;">{{detail.address}}{{detail.address_detail}}</view>
|
||||
</view>
|
||||
<image src="/static/detail/daohang.png" class="icon-size" style="width: 50rpx; height: 50rpx;"></image>
|
||||
</view>
|
||||
@ -77,6 +77,38 @@
|
||||
<span style="color: #323232;">{{ formattime(detailAny.paytime)}}</span>
|
||||
</view>
|
||||
</view>
|
||||
<view class="third flex flex-column" style="justify-content: flex-start;" >
|
||||
<view class="third-center" v-if="detailAny.auth_status == 2">
|
||||
<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;">
|
||||
<text>是否同意退款</text>
|
||||
<text style="color: #FF4810;">否</text>
|
||||
</view>
|
||||
<view class="flex w-100 space-between hui align-items" style="margin-top: 40rpx;">
|
||||
<text>驳回原因</text>
|
||||
<text style="color: #323232;">{{ detailAny.reason }}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="third-center" v-if="detailAny.auth_status == 1">
|
||||
<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;">
|
||||
<text>是否同意退款</text>
|
||||
<text style="color: #323232;">是</text>
|
||||
</view>
|
||||
<view class="flex w-100 space-between hui align-items" style="margin-top: 40rpx;">
|
||||
<text>退款数量</text>
|
||||
<text v-if="detailAny.before_status!=-3" style="color: #323232;">{{ detailAny.auth_num }}</text>
|
||||
<text v-if="detailAny.before_status==-3" style="color: #323232;">{{ detailAny.num }}</text>
|
||||
</view>
|
||||
<view class="flex w-100 space-between hui align-items" style="margin-top: 40rpx;">
|
||||
<text>退款金额</text>
|
||||
<text v-if="detailAny.server_status == 3" style="color: #FF4810;font-weight: 600;">¥{{
|
||||
detailAny.first_refundprice }}</text>
|
||||
<text v-if="detailAny.server_status == 6" style="color: #FF4810;font-weight: 600;">¥{{
|
||||
detailAny.total_refundprice}}</text>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
@ -393,7 +425,7 @@
|
||||
width: 440rpx;
|
||||
height: 39rpx;
|
||||
font-family: PingFang SC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-weight: 600;
|
||||
font-size: 28rpx;
|
||||
color: #323232;
|
||||
// margin-left: 16rpx;
|
||||
@ -453,7 +485,7 @@
|
||||
.third {
|
||||
width: 100%;
|
||||
background: #ffffff;
|
||||
margin-top:20rpx;
|
||||
margin-top:30rpx;
|
||||
border-radius: 44rpx;
|
||||
.third-center {
|
||||
padding: 30rpx;
|
||||
|
@ -1,14 +1,12 @@
|
||||
<template>
|
||||
<view class="box">
|
||||
<view style="height: 1px;background-color: #eeeeee;width: 100%;"></view>
|
||||
<view class=" flex justify-center ">
|
||||
|
||||
<view class=" flex">
|
||||
<view class="center">
|
||||
<span class="title">{{detail.title}}</span>
|
||||
<view style="margin-top: 15rpx;">
|
||||
<!-- <u-parse :content="detail.desc" :selectable="true"></u-parse> -->
|
||||
<rich-text :nodes="detail.desc" selectable user-select></rich-text>
|
||||
<view style="margin:16rpx 0;">{{detail.createtime_text}}</view>
|
||||
<rich-text :nodes="detail.desc" selectable user-select style="font-weight: 400;font-size: 26rpx;"></rich-text>
|
||||
<view style="margin:16rpx 0;color: #9c9c9c;">{{detail.createtime_text}}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -94,7 +92,6 @@
|
||||
}
|
||||
|
||||
.center {
|
||||
width: 640rpx;
|
||||
border-radius: 20rpx 20rpx 20rpx 20rpx;
|
||||
padding:50rpx 30rpx 30rpx 30rpx;
|
||||
font-family: PingFang SC, PingFang SC;
|
||||
@ -106,9 +103,8 @@
|
||||
.title {
|
||||
font-family: PingFang SC, PingFang SC;
|
||||
font-weight: 800;
|
||||
font-size: 34rpx;
|
||||
font-size: 36rpx;
|
||||
color: #343434;
|
||||
margin: 7rpx 0 42rpx 0;
|
||||
}
|
||||
}
|
||||
</style>
|
@ -405,7 +405,7 @@
|
||||
.text {
|
||||
margin-top: 20rpx;
|
||||
font-family: PingFang SC, PingFang SC;
|
||||
font-weight: 500;
|
||||
font-weight: 400;
|
||||
font-size: 26rpx;
|
||||
color: #3D3D3D;
|
||||
margin-bottom: 40rpx;
|
||||
|
@ -1639,7 +1639,7 @@ uni.hideShareMenu();
|
||||
background: #FFFFFF;
|
||||
// box-shadow: 0rpx -6rpx 12rpx 0rpx rgba(111, 190, 255, 0.1);
|
||||
border-radius: 0rpx 0rpx 0rpx 0rpx;
|
||||
bottom: 162rpx;
|
||||
bottom: 148rpx;
|
||||
position: fixed;
|
||||
z-index: 10;
|
||||
|
||||
|
@ -119,7 +119,7 @@
|
||||
maxCount="5" gap="0.4"></u-avatar-group>
|
||||
<image src="/static/index/dian.png"
|
||||
:class="item.join_info.users.length > 0 ? '' : 'smalld'"
|
||||
style="width: 58rpx;height: 58rpx;margin-left:-20rpx;z-index: 1;"></image>
|
||||
style="width: 60rpx;height: 60rpx;margin-left:-20rpx;z-index: 1;"></image>
|
||||
</span>
|
||||
<view class="number flex align-items">
|
||||
{{ Number(item.join_info.people_number) + "人已上车" }}
|
||||
|
@ -125,10 +125,10 @@
|
||||
<view class="flex align-items toptext">
|
||||
<span class="flex align-items">
|
||||
<u-avatar-group :urls="item.join_info.users" keyName="avatar" size="30"
|
||||
maxCount="5" gap="0.4"></u-avatar-group>
|
||||
maxCount="4" gap="0.4"></u-avatar-group>
|
||||
<image :class="item.join_info.users.length > 0 ? '' : 'smalld'"
|
||||
src="/static/index/dian.png"
|
||||
style="width: 58rpx;height: 58rpx;margin-left:-20rpx;z-index: 1;"></image>
|
||||
style="width: 60rpx;height: 60rpx;margin-left:-20rpx;z-index: 1;"></image>
|
||||
</span>
|
||||
<view class="number flex align-items">
|
||||
{{ Number(item.join_info.people_number) + "人已上车" }}
|
||||
|
Loading…
x
Reference in New Issue
Block a user