Merge branch 'linwenxin_dev' of https://gogs.zfire.top/zfire-front/zfire-newmall-admin into develop

src/views/secondHandMall/activistOrder/details.vue

@@ -61,8 +61,8 @@
                 <div class='info'>
                   <div class='info_title'>卖家信息</div>
                   <div class='info_bottom'>
-                    <div class='info_bottom_lt'>
-                      <el-image v-if="orderDetail.sellUrl" style='width: 40px; height: 40px' :src="orderDetail.sellUrl"></el-image>
+                    <div v-if="orderDetail.sellUrl" class='info_bottom_lt'>
+                      <el-image style='width: 40px; height: 40px' :src="orderDetail.sellUrl"></el-image>
                     </div>
                     <div class='info_bottom_rt'>
                       <div>昵称：{{orderDetail.sellName}}</div>
@@ -76,8 +76,8 @@
                 <div class='info'>
                   <div class='info_title'>买家信息</div>
                   <div class='info_bottom'>
-                    <div class='info_bottom_lt'>
-                      <el-image v-if="orderDetail.wechatUserUrl" style='width: 40px; height: 40px' :src="orderDetail.wechatUserUrl">
+                    <div v-if="orderDetail.wechatUserUrl" class='info_bottom_lt'>
+                      <el-image style='width: 40px; height: 40px' :src="orderDetail.wechatUserUrl">
                       </el-image>
                     </div>
                     <div class='info_bottom_rt'>
@@ -90,12 +90,15 @@
                   </div>
                 </div>
               </el-col>
-              <el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8">
+              <el-col v-if="orderDetail.status=='OVER'" :xs="24" :sm="24" :md="8" :lg="8" :xl="8">
                 <div class='info'>
-                  <div class='info_title'>物流信息</div>
+                  <div class='info_title'>维权信息</div>
                   <div class='info_bottom'>
                     <div class='info_bottom_rt'>
-                      
+                      <div>退款方式：{{({REFUND: "退款", GOODS_REFUND: "退货退款", FAIL: "驳回", GOODS: "退货"})[orderDetail.refundType]}}</div>
+                      <div>退款原因：{{orderDetail.refundNote}}</div>
+                      <div>退款凭证：<el-image v-for="(url,index) in (orderDetail.refundUrl ? orderDetail.refundUrl.split(',') : [])" :preview-src-list="(orderDetail.refundUrl ? orderDetail.refundUrl.split(',') : [])" :key="index" style="width: 60px; height: 60px" :src="url"></el-image>
+                      </div>
                     </div>
                   </div>
                 </div>

src/views/secondHandMall/orderManagement/materialFlow.vue

@@ -59,8 +59,8 @@
                             <el-radio label='NO'>物流</el-radio>
                           </el-radio-group>
                         </div>
-                        <div>快递单号：{{orderDetail.logisticsNo}}</div>
-                        <div>快递公司：{{orderDetail.logisticsName}}</div>
+                        <div v-if="orderDetail.logisticsCode && orderDetail.logisticsNo">快递单号：{{orderDetail.logisticsNo}}</div>
+                        <div v-if="orderDetail.logisticsCode && orderDetail.logisticsNo">快递公司：{{orderDetail.logisticsName}}</div>
                         <el-button v-if="detailsTypeCp==0 && orderDetail.logisticsCode && orderDetail.logisticsNo" type='primary' size='small' @click="lookkuaidi">查看物流
                         </el-button>
                       </div>
@@ -71,8 +71,8 @@
             </div>
           </div>
 
-          <h3>物流信息</h3>
-          <div class="order-detail">
+          <h3 v-if="orderDetail.logisticsCode && orderDetail.logisticsNo">物流信息</h3>
+          <div v-if="orderDetail.logisticsCode && orderDetail.logisticsNo" class="order-detail">
             <el-table :data="expressList" style="width: 100%" border>
               <el-table-column prop="comName" label="物流公司" align="center"></el-table-column>
               <el-table-column prop="areaName" label="地区名称" align="center"></el-table-column>