Merge branch '1.1.19' into test

# Conflicts:
#	src/views/system/order/index.vue

src/views/system/order/index.vue

@@ -208,8 +208,8 @@
                 <el-table-column prop="refund_status" label="售后状态" width="180" align="center"
                   :formatter="refundStatusFormatter">
                   <template slot-scope="scope">
-                    {{refundStatusFormatter(scope.row.refund_status)}}
-                  {{item.order.after_sale_accomplish_time?timeFormatter(item.order.after_sale_accomplish_time):''}}
+                    {{refundStatusFormatter(scope.row.refund_status)}}<br/>
+                  {{timeFormatter(scope.row.after_sale_accomplish_time)}}
                 </template>
                 </el-table-column>
                 
@@ -226,7 +226,7 @@
                 <el-table-column label="操作" width="120" align="center" fixed="right">
                   <template slot-scope="scope">
                     <el-button type="text" @click="handleInfo(scope.row)">详情</el-button>
-                    <el-button :disabled="Number(scope.row.goods_status)!==0&&(Number(scope.row.status)!=0||Number(scope.row.status)!=5)" type="text"
+                    <el-button :disabled="Number(scope.row.goods_status)!==0||(Number(scope.row.status)!=0&&Number(scope.row.status)!=-1)" type="text"
                       @click="goShipping(scope.row.id,scope.row.goods_order_sn)">去发货</el-button>
                   </template>
                 </el-table-column>
@@ -561,7 +561,7 @@
       },
       /** 表格合并 列单元格 */
       arraySpanMethod({ row, column, rowIndex, columnIndex }) {
-        if (columnIndex > 2 && columnIndex != 7 && columnIndex != 5&& columnIndex != 8) { // 用于设置要合并开始的列号
+        if (columnIndex > 3 && columnIndex != 6 && columnIndex != 8 && columnIndex != 9) { // 用于设置要合并开始的列号
           if (rowIndex === 0) { // 用于设置合并开始的行号
             return {
               rowspan: 100,　　　　　// 合并的行数