diff --git a/pages/admin/refundDetail/index.vue b/pages/admin/refundDetail/index.vue
index f89abd1..05fe96f 100644
--- a/pages/admin/refundDetail/index.vue
+++ b/pages/admin/refundDetail/index.vue
@@ -5,7 +5,7 @@
审核未通过
待退货
待收货
- 已退款
+ 已退款
{{ orderInfo.user && orderInfo.user.nickname }}
@@ -16,7 +16,8 @@
{{ orderInfo.mer_delivery_address }}
-
+
@@ -26,7 +27,9 @@
-
+
@@ -71,7 +74,7 @@
退款原因：
- {{ orderInfo.refund_message }}
+ {{ getRightText(orderInfo.refund_message) }}
备注信息：
@@ -90,26 +93,25 @@
-
-
- 订单备注
-
-
-
-
-
-
- 确认提交
-
-
-
+
+
+ 订单备注
+
+
+
+
+
+
+ 确认提交
+
+
+
@@ -132,12 +134,15 @@
refundOrderReceive,
setRefundMark
} from "@/api/admin";
- import { isMoney } from '@/utils/validate.js'
- import { HTTP_REQUEST_URL } from '@/config/app';
+ import {
+ isMoney
+ } from '@/utils/validate.js'
+ import {
+ HTTP_REQUEST_URL
+ } from '@/config/app';
export default {
name: "AdminOrder",
- components: {
- },
+ components: {},
props: {},
data: function() {
return {
@@ -155,7 +160,7 @@
payType: "",
types: "",
clickNum: 1,
- goname:'',
+ goname: '',
domain: HTTP_REQUEST_URL,
};
},
@@ -179,19 +184,27 @@
var clipboard = new ClipboardJS('.copy-data');
clipboard.on('success', function(e) {
self.$util.Tips({
- title:'复制成功'
+ title: '复制成功'
})
});
clipboard.on('error', function(e) {
self.$util.Tips({
- title:'复制失败'
+ title: '复制失败'
})
});
});
// #endif
-
+
},
methods: {
+ getRightText(str) {
+ const index = str.indexOf("@");
+ if (index !== -1) {
+ return str.substring(index + 1);
+ } else {
+ return str
+ }
+ },
more: function() {
this.order = !this.order;
},
@@ -203,7 +216,7 @@
this.change = false;
},
// 查看大图
- loookImg(item,index){
+ loookImg(item, index) {
uni.previewImage({
urls: this.orderInfo.pics,
current: this.orderInfo.pics[index]
@@ -216,38 +229,37 @@
urls: list
});
},
- copyText: function (e) {
- // var copy = e.currentTarget.dataset.copy; //data-copy传过来的数值
- let arr = [
- {
- name: "收货人姓名",
- value: this.orderInfo.real_name
- },
- {
- name: "收货人电话",
- value: this.orderInfo.user_phone
- },
- {
- name: "收货人地址",
- value: this.orderInfo.user_address
- }
- ]
- wx.setClipboardData({
- data: `${arr.map(item =>`${item.name}: ${item.value}`).join("\n")}`,
- success: function (res) {
- wx.getClipboardData({
- success: function (res) {
- wx.showToast({
- title: '复制成功'
- })
- }
- })
- }
- })
+ copyText: function(e) {
+ // var copy = e.currentTarget.dataset.copy; //data-copy传过来的数值
+ let arr = [{
+ name: "收货人姓名",
+ value: this.orderInfo.real_name
+ },
+ {
+ name: "收货人电话",
+ value: this.orderInfo.user_phone
+ },
+ {
+ name: "收货人地址",
+ value: this.orderInfo.user_address
+ }
+ ]
+ wx.setClipboardData({
+ data: `${arr.map(item =>`${item.name}: ${item.value}`).join("\n")}`,
+ success: function(res) {
+ wx.getClipboardData({
+ success: function(res) {
+ wx.showToast({
+ title: '复制成功'
+ })
+ }
+ })
+ }
+ })
},
getIndex: function() {
let that = this;
- getRefundOrderDetail(that.mer_id,that.order_id).then(
+ getRefundOrderDetail(that.mer_id, that.order_id).then(
res => {
that.orderInfo = res.data;
},
@@ -269,7 +281,7 @@
content: '为保障权益，请收到货确认无误后，再确认收货',
success: function(res) {
if (res.confirm) {
- refundOrderReceive(that.mer_id,that.orderInfo.refund_order_id).then(res => {
+ refundOrderReceive(that.mer_id, that.orderInfo.refund_order_id).then(res => {
return that.$util.Tips({
title: '操作成功',
icon: 'success'
@@ -286,14 +298,16 @@
})
},
// 提交备注信息
- save(){
+ save() {
let that = this;
if (!that.orderInfo.mer_mark) {
return this.$util.Tips({
title: '请输入备注'
})
}
- setRefundMark(that.mer_id,that.orderInfo.refund_order_id,{ mer_mark: that.orderInfo.mer_mark }).then(
+ setRefundMark(that.mer_id, that.orderInfo.refund_order_id, {
+ mer_mark: that.orderInfo.mer_mark
+ }).then(
res => {
that.change = false;
this.$util.Tips({
@@ -318,7 +332,7 @@
}
});
},
- copyData(id){
+ copyData(id) {
uni.setClipboardData({
data: id,
success: function() {
@@ -348,36 +362,44 @@
background: -webkit-linear-gradient(to right, #2291f8 0%, #1cd1dc 100%);
background: -moz-linear-gradient(to right, #2291f8 0%, #1cd1dc 100%);
}
+
.pos-order-details .header .state {
font-size: 36upx;
color: #fff;
}
+
.pos-order-details .header .data {
margin-left: 35upx;
font-size: 28upx;
}
+
.pos-order-details .header .data .order-num {
font-size: 30upx;
margin-bottom: 8upx;
}
+
.pos-order-details .remarks {
width: 100%;
height: 86upx;
background-color: #fff;
padding: 0 30upx;
}
+
.pos-order-details .remarks .iconfont {
font-size: 40upx;
color: #2a7efb;
}
+
.pos-order-details .remarks input {
width: 630upx;
height: 100%;
font-size: 30upx;
}
+
.pos-order-details .remarks input::placeholder {
color: #666;
}
+
.pos-order-details .orderingUser {
font-size: 26upx;
color: #282828;
@@ -387,17 +409,21 @@
margin-top: 16upx;
border-bottom: 1px solid #f5f5f5;
}
+
.pos-order-details .orderingUser .iconfont {
font-size: 40upx;
color: #2a7efb;
margin-right: 15upx;
}
+
.pos-order-details .address {
margin-top: 0;
}
+
.pos-order-details .pos-order-goods {
margin-top: 17upx;
}
+
.pos-order-details .footer .more {
font-size: 27upx;
color: #aaa;
@@ -408,11 +434,13 @@
margin-right: 25upx;
position: relative;
}
+
.pos-order-details .footer .delivery {
background: linear-gradient(to right, #2291f8 0%, #1cd1dc 100%);
background: -webkit-linear-gradient(to right, #2291f8 0%, #1cd1dc 100%);
background: -moz-linear-gradient(to right, #2291f8 0%, #1cd1dc 100%);
}
+
.pos-order-details .footer .more .order .arrow {
width: 0;
height: 0;
@@ -423,6 +451,7 @@
left: 15upx;
bottom: -18upx;
}
+
.pos-order-details .footer .more .order .arrow:before {
content: '';
width: 0;
@@ -434,6 +463,7 @@
left: -10upx;
bottom: 0;
}
+
.pos-order-details .footer .more .order {
width: 200upx;
background-color: #fff;
@@ -443,68 +473,84 @@
top: -200upx;
z-index: 9;
}
+
.pos-order-details .footer .more .order .item {
height: 77upx;
line-height: 77upx;
}
+
.pos-order-details .footer .more .order .item~.item {
border-top: 1px solid #f5f5f5;
}
+
.pos-order-details .footer .more .moreName {
width: 100%;
height: 100%;
}
+
.order-details .header {
padding: 0 30upx;
height: 150upx;
}
+
.order-details .header.on {
background-color: #666 !important;
}
+
.order-details .header .pictrue {
width: 110upx;
height: 110upx;
}
+
.order-details .header .pictrue image {
width: 100%;
height: 100%;
}
+
.order-details .header .data {
color: rgba(255, 255, 255, 0.8);
font-size: 24upx;
margin-left: 27upx;
}
+
.order-details .header.on .data {
margin-left: 0;
}
+
.order-details .header .data .state {
font-size: 30upx;
font-weight: bold;
color: #fff;
margin-bottom: 7upx;
}
+
.order-details .nav {
background-color: #fff;
font-size: 26upx;
color: #282828;
padding: 25upx 0;
}
+
.order-details .nav .navCon {
padding: 0 40upx;
}
+
.order-details .nav .navCon .on {
font-weight: bold;
color: #e93323;
}
+
.order-details .nav .progress {
padding: 0 65upx;
margin-top: 10upx;
}
+
.order-details .nav .progress .line {
width: 100upx;
height: 2upx;
background-color: #939390;
}
+
.order-details .nav .progress .iconfont {
font-size: 25upx;
color: #939390;
@@ -515,6 +561,7 @@
text-align: center;
margin-right: 0 !important;
}
+
.order-details .address {
font-size: 26upx;
color: #868686;
@@ -522,52 +569,64 @@
padding: 25upx 30upx 30upx 30upx;
position: relative;
}
+
.order-details .address .name {
font-size: 30upx;
color: #282828;
margin-bottom: 0.1rem;
}
+
.order-details .address .name .phone {
margin-left: 40upx;
}
+
.order-details .line {
width: 100%;
height: 3upx;
}
+
.order-details .line image {
width: 100%;
height: 100%;
display: block;
}
+
.order-details .wrapper {
background-color: #fff;
margin-top: 12upx;
padding: 30upx;
}
+
.order-details .wrapper .item {
font-size: 28upx;
color: #282828;
}
+
.order-details .wrapper .item~.item {
margin-top: 20upx;
}
+
.order-details .wrapper .item .conter {
color: #868686;
text-align: right;
}
+
.order-details .wrapper .item .virtual_image {
// text-align: left;
margin-left: 50rpx;
}
- .order-details .wrapper .item .virtual_image .picture{
+
+ .order-details .wrapper .item .virtual_image .picture {
width: 106rpx;
height: 106rpx;
border-radius: 8rpx;
margin-right: 10rpx;
- &:last-child{
+
+ &:last-child {
margin-right: 0;
}
}
+
.order-details .wrapper .item .conter .copy {
font-size: 20rpx;
color: #868686;
@@ -581,7 +640,8 @@
justify-content: center;
border-radius: 16rpx;
}
- .address .copy{
+
+ .address .copy {
font-size: 20rpx;
color: #868686;
border-radius: 3rpx;
@@ -594,17 +654,20 @@
border-radius: 16rpx;
position: absolute;
right: 30rpx;
- top: 20rpx;
+ top: 20rpx;
}
+
.order-details .wrapper .actualPay {
border-top: 1upx solid #eee;
margin-top: 30upx;
padding-top: 30upx;
}
+
.order-details .wrapper .actualPay .money {
font-weight: bold;
font-size: 30upx;
}
+
.order-details .footer {
width: 100%;
height: 100upx;
@@ -615,6 +678,7 @@
padding: 0 30upx;
border-top: 1px solid #eee;
}
+
.order-details .footer .bnt {
width: auto;
height: 60upx;
@@ -626,52 +690,65 @@
font-size: 27upx;
padding: 0 3%;
}
+
.order-details .footer .bnt.cancel {
color: #aaa;
border: 1px solid #ddd;
}
+
.order-details .footer .bnt.default {
color: #444;
border: 1px solid #444;
}
+
.order-details .footer .bnt~.bnt {
margin-left: 18upx;
}
+
.pos-order-goods {
padding: 0 30upx;
background-color: #fff;
}
+
.pos-order-goods .goods {
height: 185upx;
position: relative;
}
+
.pos-order-goods .goods~.goods {
border-top: 1px dashed #e5e5e5;
}
+
.pos-order-goods .goods .picTxt {
width: 515upx;
}
+
.pos-order-goods .goods .picTxt .pictrue {
width: 130upx;
height: 130upx;
}
+
.pos-order-goods .goods .picTxt .pictrue image {
width: 100%;
height: 100%;
border-radius: 6upx;
}
+
.pos-order-goods .goods .picTxt .text {
width: 365upx;
height: 130upx;
}
+
.pos-order-goods .goods .picTxt .text .info {
font-size: 28upx;
color: #282828;
}
+
.pos-order-goods .goods .picTxt .text .attr {
font-size: 24upx;
color: #999;
}
+
.pos-order-goods .goods .money {
width: 164upx;
text-align: right;
@@ -681,48 +758,117 @@
right: 0;
color: #999999;
}
- .pos-order-goods .goods .money .refund_num{
+
+ .pos-order-goods .goods .money .refund_num {
display: inline-block;
margin-left: 10rpx;
}
+
.pos-order-goods .goods .x-money {
color: #FF9600;
}
-.priceChange{position:fixed;width:580upx;background-color:#fff;border-radius:10upx;top:50%;left:50%;margin-left:-290upx;margin-top:-335upx;z-index:666;transition:all 0.3s ease-in-out 0s;transform: scale(0);opacity:0;}
-.priceChange.on{opacity:1;transform: scale(1);}
-.priceChange .priceTitle{background:url("~@/static/images/pricetitle.jpg") no-repeat;background-size:100% 100%;width:100%;height:160upx;border-radius:10upx 10upx 0 0;text-align:center;font-size:40upx;color:#fff;line-height:160upx;position:relative;}
-.priceChange .priceTitle .iconfont{position:absolute;font-size:40upx;right:26upx;top:23upx;width:40upx;height:40upx;line-height:40upx;}
-.priceChange .listChange{padding:0 40upx;}
-.priceChange .listChange textarea{box-sizing: border-box;}
-.priceChange .listChange .item{height:103upx;border-bottom:1px solid #e3e3e3;font-size:32upx;color:#333;}
-.priceChange .modify{font-size:32upx;color:#fff;width:490upx;height:90upx;text-align:center;line-height:90upx;border-radius:45upx;background-color:#2291f8;margin:53upx auto;}
-.priceChange .listChange textarea {
- border: 1px solid #eee;
- width: 100%;
- height: 200upx;
- margin-top: 50upx;
- border-radius: 10upx;
- color: #333;
- padding: 20upx;
-}
-.upload-img{
- display: flex;
- flex-wrap: wrap;
- margin-top: 20rpx;
- .img-item{
+
+ .priceChange {
+ position: fixed;
+ width: 580upx;
+ background-color: #fff;
+ border-radius: 10upx;
+ top: 50%;
+ left: 50%;
+ margin-left: -290upx;
+ margin-top: -335upx;
+ z-index: 666;
+ transition: all 0.3s ease-in-out 0s;
+ transform: scale(0);
+ opacity: 0;
+ }
+
+ .priceChange.on {
+ opacity: 1;
+ transform: scale(1);
+ }
+
+ .priceChange .priceTitle {
+ background: url("~@/static/images/pricetitle.jpg") no-repeat;
+ background-size: 100% 100%;
+ width: 100%;
+ height: 160upx;
+ border-radius: 10upx 10upx 0 0;
+ text-align: center;
+ font-size: 40upx;
+ color: #fff;
+ line-height: 160upx;
position: relative;
- width: 156rpx;
- height: 156rpx;
- margin-right: 23rpx;
+ }
+
+ .priceChange .priceTitle .iconfont {
+ position: absolute;
+ font-size: 40upx;
+ right: 26upx;
+ top: 23upx;
+ width: 40upx;
+ height: 40upx;
+ line-height: 40upx;
+ }
+
+ .priceChange .listChange {
+ padding: 0 40upx;
+ }
+
+ .priceChange .listChange textarea {
+ box-sizing: border-box;
+ }
+
+ .priceChange .listChange .item {
+ height: 103upx;
+ border-bottom: 1px solid #e3e3e3;
+ font-size: 32upx;
+ color: #333;
+ }
+
+ .priceChange .modify {
+ font-size: 32upx;
+ color: #fff;
+ width: 490upx;
+ height: 90upx;
+ text-align: center;
+ line-height: 90upx;
+ border-radius: 45upx;
+ background-color: #2291f8;
+ margin: 53upx auto;
+ }
+
+ .priceChange .listChange textarea {
+ border: 1px solid #eee;
+ width: 100%;
+ height: 200upx;
+ margin-top: 50upx;
+ border-radius: 10upx;
+ color: #333;
+ padding: 20upx;
+ }
+
+ .upload-img {
+ display: flex;
+ flex-wrap: wrap;
margin-top: 20rpx;
- &:nth-child(4n){
- margin-right: 0;
- }
- image{
+
+ .img-item {
+ position: relative;
width: 156rpx;
height: 156rpx;
- border-radius: 8rpx;
+ margin-right: 23rpx;
+ margin-top: 20rpx;
+
+ &:nth-child(4n) {
+ margin-right: 0;
+ }
+
+ image {
+ width: 156rpx;
+ height: 156rpx;
+ border-radius: 8rpx;
+ }
}
}
-}
-
+
\ No newline at end of file