Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxingli...

rk

4 天以前 a59ff44b2eaa7020f0529632d9ec064c4dc38e27

 admin/src/components/business/OperaOrderDetail.vue

@@ -28,7 +28,7 @@
            <span class="label">订单类型：</span>
            <span class="value">
              <span v-if="detailInfo.order.type === 0">就地存取</span>
              <span v-else-if="detailInfo.order.type === 1">异地存取</span>
              <span v-else-if="detailInfo.order.type === 1">同城寄送</span>
              <span v-else>-</span>
            </span>
          </div>
@@ -50,9 +50,9 @@
            </span>
          </div>

          <div class="info-item">
          <div class="info-item" v-if="detailInfo.type ===1">
            <span class="label">订单级别：</span>
            <span class="value">{{ detailInfo.order.orderLevel || '-' }}</span>
            <span class="value">{{ detailInfo.isUrgent === 1?'极速达':'标速达' }}</span>
          </div>
          <div class="info-item">
            <span class="label">预计到店时间：</span>
@@ -281,7 +281,7 @@
        <div class="section-header">
          <span class="section-title">物品信息</span>
        </div>
        <el-table :data="detailInfo.detailList" stripe class="goods-table">
        <el-table :data="detailInfo.detailList" stripe class="goods-table"    :header-row-style="headerRowStyle">
          <el-table-column prop="typeName" label="物品名称" min-width="80px"></el-table-column>
          <el-table-column prop="luggageName" label="物品尺寸" min-width="80px"></el-table-column>
          <el-table-column label="单价（元）" min-width="100px">
@@ -292,18 +292,18 @@
          <el-table-column prop="num" label="数量" min-width="60px"></el-table-column>
          <el-table-column label="小计（元）" min-width="100px">
            <template slot-scope="{row}">
              ¥{{ ((row.subtotal ||0) / 100).toFixed(2) }}
              <span class="yellowstate">  ¥{{ ((row.subtotal ||0) / 100).toFixed(2) }}</span>
            </template>
          </el-table-column>
        </el-table>
        <div class="price-summary" v-if="detailInfo.order">
          <span>基础服务费：¥{{ ((detailInfo.order.price||0) / 100).toFixed(2) }}</span>
          <span>物品保费：¥{{ ((detailInfo.order.declaredFee||0) / 100).toFixed(2) }}</span>
          <span>订单总价：¥{{ ((detailInfo.order.totalAmount||0) / 100).toFixed(2) }}</span>
          <span>实际支付：¥{{ ((detailInfo.order.payAmount||0) / 100).toFixed(2) }}</span>
          <span>退款金额：¥{{ ((detailInfo.order.refundAmount ||0)/ 100).toFixed(2) }}</span>
          <span>超时金额：¥{{ ((detailInfo.order.overdueAmount ||0)/ 100).toFixed(2) }}</span>
          <span>异常金额：¥{{ ((detailInfo.order.exceptionAmount ||0)/ 100).toFixed(2) }}</span>
          <span class="price-span">基础服务费：¥{{ ((detailInfo.order.price||0) / 100).toFixed(2) }}</span>
          <span  class="price-span">物品保费：¥{{ ((detailInfo.order.declaredFee||0) / 100).toFixed(2) }}</span>
          <span  class="price-span">订单总价：¥{{ ((detailInfo.order.totalAmount||0) / 100).toFixed(2) }}</span>
          <span  class="price-span">实际支付：¥{{ ((detailInfo.order.payAmount||0) / 100).toFixed(2) }}</span>
          <span class="price-span">退款金额：¥{{ ((detailInfo.order.refundAmount ||0)/ 100).toFixed(2) }}</span>
          <span class="price-span">超时金额：¥{{ ((detailInfo.order.overdueAmount ||0)/ 100).toFixed(2) }}</span>
          <span class="price-span">异常金额：¥{{ ((detailInfo.order.exceptionAmount ||0)/ 100).toFixed(2) }}</span>
        </div>
      </div>
    </div>
@@ -327,6 +327,13 @@
    }
  },
  methods: {
    headerRowStyle({ rowIndex }) {
      return {
        background:   '#007bff' ,
        color : '#333',
        height: '50px'
      }
    },
    open (row) {
      this.title = '订单详情'
      getById(row.id).then(res => {
@@ -409,6 +416,7 @@
}
.goods-table {
  margin-bottom: 15px;
  border: 1px solid #f2f2f2;
}
.price-summary {
  display: flex;
@@ -419,5 +427,9 @@
  border-radius: 4px;
  font-size: 14px;
  color: #606266;

}
.price-span{
  width: 20%;
}
</style>