mkm
/
shop-applet
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单修改

This commit is contained in:
1154079537 2024-04-29 17:19:12 +08:00
parent ae3a666040
commit 04204cb0fc
2 changed files with 12 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pages/admin/orderList/index.vue
View File

@ -129,6 +129,9 @@
<view>交易完成</view> <view>交易完成</view>
<view style="color: #FFE4BF;" v-if="!!item.refund_order_id && item.refund_status != -1 && item.refund_status != 3">退款中</view> <view style="color: #FFE4BF;" v-if="!!item.refund_order_id && item.refund_status != -1 && item.refund_status != 3">退款中</view>
</text> </text>
<text class="fk_status" v-if="item.refund_mark == 1">
<view>退款成功</view>
</text>
</view> </view>
<view class="pos-order-goods" v-for="(val, key) in item.storeOrder.orderProduct" :key="key" <view class="pos-order-goods" v-for="(val, key) in item.storeOrder.orderProduct" :key="key"
@click="toDetail(item)"> @click="toDetail(item)">
@ -155,7 +158,14 @@
</view> </view>
</view> </view>
<view class="public-total" > <view class="public-total" v-if="item.refund_mark == 1">
共{{ item.total_num }}件商品，
已退款
<span class="money" style="margin-right: 30rpx;">￥{{ item.pay_price }}</span> (邮费
¥{{ item.pay_postage}})
</view>
<view class="public-total" v-else>
共{{ item.total_num }}件商品， 共{{ item.total_num }}件商品，
<span v-if="item.order_status < 1">应</span> <span v-if="item.order_status < 1">应</span>
<span v-else>已</span> <span v-else>已</span>

56
pages/index/index.vue
View File

@ -1663,12 +1663,10 @@
<style lang="scss" scoped> <style lang="scss" scoped>
page { page {
background-color: #f4f7fe; background-color: #f4f7fe;
// background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
} }
/deep/.statistical-page .navs { /deep/.statistical-page .navs {
top: 400rpx !important; top: 400rpx !important;
} }
.userpage { .userpage {
@ -1778,7 +1776,6 @@
.merchantsSettled { .merchantsSettled {
height: 100%; height: 100%;
padding-top: 130rpx; padding-top: 130rpx;
} }
.merchantsSettled .title { .merchantsSettled .title {
@ -1837,7 +1834,6 @@
.merchantsSettled .list .item { .merchantsSettled .list .item {
padding: 30rpx 0 10rpx; padding: 30rpx 0 10rpx;
position: relative; position: relative;
margin: 0 20px; margin: 0 20px;
@ -1972,7 +1968,6 @@
width: 588rpx; width: 588rpx;
margin: 0 auto; margin: 0 auto;
height: 86rpx; height: 86rpx;
border-radius: 25px; border-radius: 25px;
text-align: center; text-align: center;
line-height: 86rpx; line-height: 86rpx;
@ -1989,7 +1984,6 @@
pointer-events: all; pointer-events: all;
} }
.settlementAgreement { .settlementAgreement {
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
@ -2014,7 +2008,6 @@
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
overflow: hidden; overflow: hidden;
.content { .content {
height: 900rpx; height: 900rpx;
overflow-y: scroll; overflow-y: scroll;
@ -2045,19 +2038,14 @@
font-weight: bold; font-weight: bold;
} }
.settlementAgreement .setAgCount .contenta { .settlementAgreement .setAgCount .contenta {
color: #333; color: #333;
font-size: 26rpx; font-size: 26rpx;
line-height: 22px; line-height: 22px;
text-align: justify; text-align: justify;
text-justify: distribute-all-lines; text-justify: distribute-all-lines;
height: 76%; height: 76%;
overflow-y: scroll; overflow-y: scroll;
} }
.setAgCountbtn { .setAgCountbtn {
@ -2079,14 +2067,12 @@
font-family: PingFang SC-Medium, PingFang SC; font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #737373; color: #737373;
} }
.setAgCountbtnb { .setAgCountbtnb {
margin-top: 40rpx; margin-top: 40rpx;
padding-left: 20rpx; padding-left: 20rpx;
padding-right: 20rpx; padding-right: 20rpx;
text-align: center; text-align: center;
line-height: 74rpx; line-height: 74rpx;
background: #cecece; background: #cecece;
@ -2096,7 +2082,6 @@
font-family: PingFang SC-Medium, PingFang SC; font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #fff; color: #fff;
} }
.setAgCountbtnc { .setAgCountbtnc {
@ -2112,7 +2097,6 @@
font-family: PingFang SC-Medium, PingFang SC; font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #fff; color: #fff;
} }
.border { .border {
@ -2131,17 +2115,12 @@
font-weight: bold; font-weight: bold;
font-size: 34rpx; font-size: 34rpx;
} }
} }
.left-content { .left-content {
width: 680rpx; width: 680rpx;
height: 100%; height: 100%;
display: flex; display: flex;
background-color: #ffffff; background-color: #ffffff;
.left-content-left { .left-content-left {
@ -2157,8 +2136,6 @@
} }
.content-top_img { .content-top_img {
width: 96rpx; width: 96rpx;
height: 96rpx; height: 96rpx;
border-radius: 50%; border-radius: 50%;
@ -2170,7 +2147,6 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }
} }
@ -2215,7 +2191,6 @@
font-size: 25rpx; font-size: 25rpx;
} }
} }
} }
.conter-img { .conter-img {
@ -2224,7 +2199,6 @@
margin: 0 auto; margin: 0 auto;
margin-top: 60rpx; margin-top: 60rpx;
image { image {
width: 100%; width: 100%;
height: 100%; height: 100%;
@ -2233,12 +2207,11 @@
} }
.content { .content {
padding-top: 80rpx; padding-top: 100rpx;
.content-top { .content-top {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
.content-tops { .content-tops {
@ -2353,7 +2326,6 @@
padding-top: 46rpx; padding-top: 46rpx;
.content-order { .content-order {
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
@ -2375,7 +2347,6 @@
font-family: SF Pro Display-Semibold, SF Pro Display; font-family: SF Pro Display-Semibold, SF Pro Display;
font-weight: 600; font-weight: 600;
color: #333333; color: #333333;
} }
} }
} }
@ -2401,7 +2372,6 @@
} }
.tools-two { .tools-two {
display: grid; display: grid;
grid-template-columns: repeat(4, 1fr); grid-template-columns: repeat(4, 1fr);
padding: 0 44rpx; padding: 0 44rpx;
@ -2421,7 +2391,6 @@
} }
} }
} }
} }
} }
@ -2442,12 +2411,10 @@
width: 46rpx; width: 46rpx;
height: 5rpx; height: 5rpx;
background: #F84221; background: #F84221;
margin: 0 auto; margin: 0 auto;
} }
} }
.content-list-one { .content-list-one {
padding: 25rpx 25rpx; padding: 25rpx 25rpx;
padding-bottom: 100rpx; padding-bottom: 100rpx;
@ -2464,7 +2431,6 @@
height: 49rpx; height: 49rpx;
line-height: 49rpx; line-height: 49rpx;
.list-one_left-a { .list-one_left-a {
width: 49rpx; width: 49rpx;
height: 49rpx; height: 49rpx;
@ -2479,7 +2445,6 @@
.list-one_left-c { .list-one_left-c {
width: 26rpx; width: 26rpx;
height: 26rpx; height: 26rpx;
margin-top: 5rpx; margin-top: 5rpx;
image { image {
@ -2491,14 +2456,12 @@
.list-one_right { .list-one_right {
display: flex; display: flex;
font-size: 26rpx; font-size: 26rpx;
font-family: PingFang SC-Regular, PingFang SC; font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
align-items: center; align-items: center;
.list-one_right-a { .list-one_right-a {
color: #333333; color: #333333;
} }
@ -2512,24 +2475,18 @@
} }
.list-one_right-b { .list-one_right-b {
color: #F84221; color: #F84221;
} }
} }
} }
.list-two { .list-two {
display: flex; display: flex;
margin-top: 26rpx; margin-top: 26rpx;
.list-two_left { .list-two_left {
width: 175rpx; width: 175rpx;
height: 175rpx; height: 175rpx;
image { image {
width: 100%; width: 100%;
height: 100%; height: 100%;
@ -2568,8 +2525,6 @@
font-weight: 400; font-weight: 400;
color: #F84221; color: #F84221;
margin-top: -10rpx; margin-top: -10rpx;
} }
} }
} }
@ -2589,12 +2544,9 @@
font-family: PingFang SC-Regular, PingFang SC; font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
margin-top: -10rpx; margin-top: -10rpx;
} }
} }
} }
} }
.list-three { .list-three {
@ -2607,7 +2559,6 @@
.title-img { .title-img {
width: 28rpx; width: 28rpx;
height: 28rpx; height: 28rpx;
margin-top: 5rpx; margin-top: 5rpx;
margin-right: 10rpx; margin-right: 10rpx;
@ -2622,11 +2573,9 @@
PingFang SC; PingFang SC;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
} }
} }
.list-four { .list-four {
display: flex; display: flex;
position: absolute; position: absolute;
@ -2643,7 +2592,6 @@
border-radius: 30rpx 30rpx; border-radius: 30rpx 30rpx;
opacity: 1; opacity: 1;
font-size: 26rpx; font-size: 26rpx;
font-family: PingFang SC-Regular, PingFang SC; font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #737373 !important; color: #737373 !important;
@ -2663,9 +2611,7 @@
font-weight: 400; font-weight: 400;
color: #F84221 !important; color: #F84221 !important;
} }
} }
} }
} }
} }