Merge branch 'main' of https://git.gpxscs.cn/front/java-mall-app

member/order/detail.vue

@@ -177,8 +177,8 @@
           >
           <view
             :data-on="OrderInfo.order_id"
-            class="order-btn order-btn-zailai"
+            class="order-btn order-btn-quxiao"
-            v-if="OrderInfo.if_buyer_cancel"
+            v-if="OrderInfo.is_deny_return"
             @click="cancelOrder"
           >
             {{ __("取消订单") }}</view
@@ -2858,4 +2858,12 @@ export default {
     margin-left: 6rpx;
   }
 }
+.order-btn-kefu{
+	background-color: #ff4f28;
+	color:white;
+}
+.order-btn-quxiao{
+	background-color: #ff4f28;
+	color:white;
+}
 </style>