确认

ghs/src/views/order/list.vue

@@ -33,7 +33,7 @@
           </el-popconfirm>
         </div>
         <div v-else>
-        <i class="el-icon-success" style="color:green;font-size:17px;"></i>
+          <i class="el-icon-success" style="color:green;font-size:17px;"></i>
         </div>
       </template>
       
@@ -103,10 +103,11 @@
         <el-button @click.stop="allDown(scope.row)" size="small" type="primary" v-if="scope.row.status!=5 && scope.row.status!=1 && scope.row.sameTimeIdsNum>1">全下载</el-button>
         <el-button size="small" v-else>全下载</el-button>
 
-        <el-popconfirm title="确认已发货？" @confirm="confirmSend(scope.row)" v-if="scope.row.status!=5 && scope.row.status==2" style="margin-left:10px;">
+<template v-if="scope.row.status!=5 && scope.row.status==2">
+        <el-popconfirm title="确认已发货？" @confirm="confirmSend(scope.row)" style="margin-left:10px;">
           <el-button size="small" type="primary" slot="reference">发货</el-button>
         </el-popconfirm>
-
+</template>
         <el-button size="small" v-else>发货</el-button>
 
       </template>