Merge branch 'master' into pengyouhao_dev

src/views/mallManagement/order/order_list/index.vue

@@ -111,7 +111,7 @@
                 <el-tab-pane label="待发货" name="DFH"></el-tab-pane>
                 <el-tab-pane label="已发货" name="YFH"></el-tab-pane>
                 <el-tab-pane label="已完成" name="OVER"></el-tab-pane>
-                <el-tab-pane label="已退款" name="CLOSE"></el-tab-pane>
+                <el-tab-pane label="退款/取消" name="CLOSE"></el-tab-pane>
                 <el-tab-pane label="已超时" name="TIMEOUT"></el-tab-pane>
               </el-tabs>
               <el-button v-if="$restrict('batchNote')" class="fl" type="primary" size="small" @click="batchRemark">批量备注</el-button>