|  | @@ -337,6 +337,9 @@
 | 
	
		
			
				|  |  |               <el-option key="-2"  label="已退款" value="-2" />
 | 
	
		
			
				|  |  |             </el-select>
 | 
	
		
			
				|  |  |           </el-form-item>
 | 
	
		
			
				|  |  | +         <el-form-item label="详情地址" prop="userAddress"  >
 | 
	
		
			
				|  |  | +          <el-input v-model="editForm.userAddress" placeholder="请输入" />
 | 
	
		
			
				|  |  | +        </el-form-item>
 | 
	
		
			
				|  |  |          <el-form-item label="备注" prop="mark"  >
 | 
	
		
			
				|  |  |            <el-input v-model="editForm.mark" placeholder="请输入备注" />
 | 
	
		
			
				|  |  |          </el-form-item>
 | 
	
	
		
			
				|  | @@ -470,6 +473,7 @@ export default {
 | 
	
		
			
				|  |  |        editForm:{
 | 
	
		
			
				|  |  |          orderType:null,
 | 
	
		
			
				|  |  |          status:null,
 | 
	
		
			
				|  |  | +        userAddress:null,
 | 
	
		
			
				|  |  |          mark:"",
 | 
	
		
			
				|  |  |        },
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -479,7 +483,9 @@ export default {
 | 
	
		
			
				|  |  |          ],
 | 
	
		
			
				|  |  |        },
 | 
	
		
			
				|  |  |        editRules:{
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | +        userAddress: [
 | 
	
		
			
				|  |  | +          { required: true, message: "收货地址不能为空", trigger: "blur" }
 | 
	
		
			
				|  |  | +        ],
 | 
	
		
			
				|  |  |        },
 | 
	
		
			
				|  |  |        orderTypeOptions:[],
 | 
	
		
			
				|  |  |        payTypeOptions:[],
 | 
	
	
		
			
				|  | @@ -687,10 +693,12 @@ export default {
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      editOrder(){
 | 
	
		
			
				|  |  |          this.edit.open=true;
 | 
	
		
			
				|  |  | +        this.editForm.id=this.order.id;
 | 
	
		
			
				|  |  |          this.editForm.mark=this.order.mark
 | 
	
		
			
				|  |  |          this.editForm.orderType=this.order.orderType.toString();
 | 
	
		
			
				|  |  |          this.editForm.status = this.order.status.toString();
 | 
	
		
			
				|  |  | -        this.editForm.id=this.order.id;
 | 
	
		
			
				|  |  | +        this.editForm.userAddress = this.order.userAddress.toString();
 | 
	
		
			
				|  |  | +        
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      //推送管易按钮
 | 
	
		
			
				|  |  |      addErpOrder(){
 |