shish пре 6 година
родитељ
комит
0aec497bc5

+ 3 - 2
admin-update/src/views/order/components/sel-order.vue

@@ -110,7 +110,7 @@
   placement="top"
   placement="top"
   width="160"
   width="160"
   v-model="confirmSendVisit">
   v-model="confirmSendVisit">
-  <p>确认送达?</p>
+  <p>确认送达?</p>
   <div style="text-align: right; margin: 0">
   <div style="text-align: right; margin: 0">
     <el-button size="mini" type="text" @click="confirmSendVisit = false">取消</el-button>
     <el-button size="mini" type="text" @click="confirmSendVisit = false">取消</el-button>
     <el-button type="primary" size="mini" @click="orderReachFn">确定</el-button>
     <el-button type="primary" size="mini" @click="orderReachFn">确定</el-button>
@@ -669,7 +669,8 @@ export default {
 			this.$service.single.orderReach({ id: this.orderData.id, option: 1 }).then(res => {
 			this.$service.single.orderReach({ id: this.orderData.id, option: 1 }).then(res => {
 				this.$message.success('已确认!');
 				this.$message.success('已确认!');
 				this.getDet();
 				this.getDet();
-				confirmSendVisit=false;
+				this.confirmSendVisit=false;
+				this.orderData.status=5;
 			});
 			});
 		},
 		},
 		// 订单分类
 		// 订单分类

+ 3 - 2
admin-update/src/views/order/list.vue

@@ -132,7 +132,7 @@
   width="160"
   width="160"
   :ref="'popover-' + scope.row.id"
   :ref="'popover-' + scope.row.id"
   >
   >
-  <p>确认送达?</p>
+  <p>确认已自取?</p>
   <div style="text-align: right; margin: 0">
   <div style="text-align: right; margin: 0">
     <el-button size="mini" type="text" @click="selfGetCancel(scope.row.id)" >取消</el-button>
     <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>
     <el-button type="primary" size="mini" @click="noSendShipFn(scope.row)" >确定</el-button>
@@ -423,6 +423,7 @@ export default {
 	}
 	}
 	.el-step__icon-inner{
 	.el-step__icon-inner{
 	    font-size:1px;
 	    font-size:1px;
+	    display:none;
 	}
 	}
 	.el-step__icon {
 	.el-step__icon {
 		width: 10px;
 		width: 10px;
@@ -432,7 +433,7 @@ export default {
 		height: 1px;
 		height: 1px;
 		left: 16px;
 		left: 16px;
 		right: -16px;
 		right: -16px;
-		top: 11px;
+		top: 9px;
 	}
 	}
 
 
 }
 }