diff --git a/pages/admin/orderRefund/index.vue b/pages/admin/orderRefund/index.vue index 4374450..ac4815c 100644 --- a/pages/admin/orderRefund/index.vue +++ b/pages/admin/orderRefund/index.vue @@ -134,11 +134,15 @@ }) } } + + let params = { status: that.status, fail_message: that.fail_message } - if(that.orderInfo.refund_type == 2){ + + + if(that.orderInfo.refund_type == 2 && that.status != -1){ if (!that.refundInfo.mer_delivery_user) { return that.$util.Tips({ title: '请填写收货人姓名' diff --git a/pages/short_video/components/douyin-scrollview/douyin-scrollview.nvue b/pages/short_video/components/douyin-scrollview/douyin-scrollview.nvue index a6853c4..b918f45 100644 --- a/pages/short_video/components/douyin-scrollview/douyin-scrollview.nvue +++ b/pages/short_video/components/douyin-scrollview/douyin-scrollview.nvue @@ -21,8 +21,7 @@ - {{222}} - + {{item.count_start}} @@ -39,8 +38,6 @@ {{itemn.create_time}} - - {{444}} {{itemn.count_start}} diff --git a/static/iconfont/demo.css b/static/iconfont/demo.css index 63201ed..a969681 100644 --- a/static/iconfont/demo.css +++ b/static/iconfont/demo.css @@ -16,11 +16,11 @@ -moz-osx-font-smoothing: grayscale; } -.icon-dianzan:before { +.icon-dianzan2:before { content: "\e61f"; } -.icon-dianzan1:before { +.icon-dianzan3:before { content: "\e601"; }