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

src/views/secondHandMall/activistOrder/details.vue

@@ -8,6 +8,7 @@
               <el-col :span="24">
                 <div class="order-main-title">
                   <span>售后编号：{{ orderDetail.esOrderRefundId }}</span>
+                  <span>订单号：{{ orderDetail.esOrderId }}</span>
                   <span>下单时间：{{ orderDetail.createTime }}</span>
                 </div>
               </el-col>

src/views/secondHandMall/activistOrder/index.vue

@@ -91,6 +91,7 @@
                     <div class="order-item" v-for="order in dataList" :key="order.orderId">
                       <div class="order-top">
                         <span><b>售后编号</b>：{{ order.esOrderRefundId }}</span>
+                        <span><b>订单号</b>：{{ order.esOrderId }}</span>
                         <span><b>下单时间</b>：{{ order.createTime }}</span>
                         <!-- <el-tag>商城销售</el-tag> -->
                         <div class="fr"></div>