diff --git a/src/views/mall/order/storeAfterSales/OrderDetail.vue b/src/views/mall/order/storeAfterSales/OrderDetail.vue
index 7364c49..e478d92 100644
--- a/src/views/mall/order/storeAfterSales/OrderDetail.vue
+++ b/src/views/mall/order/storeAfterSales/OrderDetail.vue
@@ -12,6 +12,15 @@
            <span v-if="DetailData.state==1">已审核 </span>
            <span v-if="DetailData.state==2">用户已发货</span>
            <span v-if="DetailData.state==3">退款成功</span>
+<<<<<<< HEAD
+        </el-descriptions-item>
+        <el-descriptions-item label="售后状态">
+           <span v-if="DetailData.salesState==0">正常</span>
+           <span v-if="DetailData.salesState==1">用户取消 </span>
+           <span v-if="DetailData.salesState==2">商家拒绝</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="退款金额">{{ DetailData.refundAmount }}</el-descriptions-item>
+=======
            <span v-if="DetailData.state==4">用户取消</span>
            <span v-if="DetailData.state==5">商家拒绝</span>
         </el-descriptions-item>
@@ -21,6 +30,7 @@
 <!--           <span v-if="DetailData.salesState==2">商家拒绝</span>-->
 <!--        </el-descriptions-item>-->
         <el-descriptions-item label="退款金额">{{ DetailData.refundAmount.toFixed(2) }}</el-descriptions-item>
+>>>>>>> master
         <el-descriptions-item label="申请原因">{{ DetailData.reasons }}</el-descriptions-item>
         <el-descriptions-item label="说明">{{ DetailData.explains }}</el-descriptions-item>
         <el-descriptions-item label="说明图片" v-if="DetailData.explainImg">
diff --git a/src/views/mall/order/storeAfterSales/index.vue b/src/views/mall/order/storeAfterSales/index.vue
index c93bdf9..cc0802b 100644
--- a/src/views/mall/order/storeAfterSales/index.vue
+++ b/src/views/mall/order/storeAfterSales/index.vue
@@ -51,11 +51,15 @@
           </div>
         </template>
       </el-table-column>
+<<<<<<< HEAD
+      <el-table-column label="退款金额" align="center" prop="refundAmount" />
+=======
       <el-table-column label="退款金额" align="center">
         <template #default="scope">
           <span>{{scope.row.refundAmount.toFixed(2)}}</span>
         </template>
       </el-table-column>
+>>>>>>> master
       <el-table-column label="服务类型" align="center">
          <template #default="scope">
            <span v-if="scope.row.serviceType==0">仅退款</span>
diff --git a/src/views/mall/order/storeOrder/OrderSend.vue b/src/views/mall/order/storeOrder/OrderSend.vue
index 16c0d95..fe270a2 100644
--- a/src/views/mall/order/storeOrder/OrderSend.vue
+++ b/src/views/mall/order/storeOrder/OrderSend.vue
@@ -15,7 +15,11 @@
       <el-form-item label="发货类型" prop="deliveryType">
          <el-radio-group v-model="formData.deliveryType" @change="selectDelivery">
           <el-radio label="normal">手动填写</el-radio>
+<<<<<<< HEAD
+          <el-radio label="face">电子面单</el-radio>
+=======
 <!--          <el-radio label="face">电子面单</el-radio>-->
+>>>>>>> master
         </el-radio-group>
       </el-form-item>
       <el-form-item label="快递公司" prop="deliverySn" v-if="isShow">