Merge branch '1.1.18' into test

src/views/system/order/components/orderDetail.vue

@@ -48,6 +48,15 @@
                 {{ goodsStatusFormatter(scope.row.goods_status) }}
               </template>
             </el-table-column>
+            <el-table-column prop="dispatch_price" width="120" label="发货类型" align="center">
+              <template slot-scope="scope">
+                <div v-if="scope.row.sendTime==0">-</div>
+                <div v-else>
+                  <span v-if="scope.row.type==1">快递</span>
+                  <span v-if="scope.row.type==2">自行配送</span>
+                </div>
+              </template>
+            </el-table-column>
             <el-table-column label="快递公司" prop="express_company_name" align="center">
               <template slot-scope="scope">
                 {{ scope.row.express_company_name ? scope.row.express_company_name : '—' }}