Merge branch 'master' of http://git.huaml.com/zhh/front-end

admin-update/src/views/order/list.vue

@@ -126,12 +126,23 @@
 				</template>
 				<template v-else>
                     <template v-if="scope.row.currentFlow == 1">
-                        <el-button type="text" size="small" @click="noSendShipFn(scope.row)"
-                            >自取</el-button
-                        >
-                        <el-button type="text" size="small" @click="shipDrawFn(scope.row)"
-                            >发货</el-button
-                        >
+
+<el-popover
+  placement="top"
+  width="160"
+  :ref="'popover-' + scope.row.id"
+  >
+  <p>确认送达？</p>
+  <div style="text-align: right; margin: 0">
+    <el-button size="mini" type="text" @click="selfGetCancel(scope.row.id)" >取消</el-button>
+    <el-button type="primary" size="mini" @click="noSendShipFn(scope.row)" >确定</el-button>
+  </div>
+<el-button slot="reference" size="mini" type="primary" plain >自取</el-button>
+</el-popover>
+
+<el-button @click="shipDrawFn(scope.row)" size="mini" type="primary" plain style="margin-left:14px;">发货</el-button>
+
+
                     </template>
                     <template v-else>
                         <el-button type="text" size="small" @click="shipDrawFn(scope.row)"
@@ -204,21 +215,21 @@ export default {
 			this.$store.dispatch('getCategory');
 			this.$store.dispatch('getUsage');
 		},
+		//取消自取
+		selfGetCancel(id) {
+                this.$refs[`popover-` + id].doClose()
+        },
 		// drawer
 		noSendShipFn(item) {
-			this.$confirm('确认不需要发货？', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning'
-			})
-				.then(() => {
-					this.$service.order.freeShipping({ id: item.id }).then(res => {
-						this.$message.success('操作成功！');
-						item.currentFlow = 4;
-                        item.status = '5';
-					});
-				})
-				.catch(() => {});
+
+            this.$refs[`popover-` + item.id].doClose()
+
+            this.$service.order.freeShipping({ id: item.id }).then(res => {
+                this.$message.success('操作成功！');
+                item.currentFlow = 4;
+                item.status = '5';
+            });
+
 		},
 		shipDrawFn(item) {
 			this.optionData = item;