diff --git a/src/api/xm/core/xmTaskOrder.js b/src/api/xm/core/xmTaskOrder.js
index 6e1e8dbe..dd87cd58 100644
--- a/src/api/xm/core/xmTaskOrder.js
+++ b/src/api/xm/core/xmTaskOrder.js
@@ -9,7 +9,7 @@ let base = config.getCoreBasePath();
 /**
  * 任务相关费用订单表
  *1    默认只开放普通查询，所有查询，只要上传	 分页参数 {pageNum:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉，
- *2 查询、新增、修改的参数格式  params={id:'订单编号 主键',userid:'用户编号',branchId:'公司ID-下单客户对应的企业',ostatus:'订单状态0-初始，1-待确认，2-待付款，3-已付款，4-已完成，5-已取消-未付款前可取消，取消后可删除，6-退单-退单后变为已取消，8已关闭-售后完成后可以关闭订单',ctime:'创建时间',ltime:'更新时间',payType:'支付方式',payStatus:'支付状态0待付款，1已付款',payTime:'支付时间',prepayId:'第三方支付订单编号',finalFee:'最终总费用=origin_fee',othFee:'其它费用',originFee:'原始价格=top_fee+urgent_fee+crm_sup_fee+hot_fee+efunds+share_fee',payAt:'最终付款金额-客户付款后回填',payAuthId:'支付授权码',payOpenid:'支付账户对应的第三方openid,注意，下单根付款不一定是同一个人',payUserid:'付款用户编号',payUsername:'付款用户名称',discount:'折扣率0-199',topFee:'置顶费用',topStime:'置顶开始时间',topEtime:'置顶结束时间',hotFee:'热搜费用',hotStime:'热搜开始时间',hotEtime:'热搜结束时间',top:'是否置顶0否1待付款2已开通3已过期',hot:'是否热搜0否1待付款2已开通3已过期',crmSupFee:'客服包办费用',urgentFee:'加急费用',urgent:'是否加急0否1待付款2已开通3已过期',crmSup:'是否客服包办0否1待付款2已开通3已过期',efunds:'托管金额',estate:'资金托管状况0-无须托管，1-待付款，2-已托管资金，3-已付款给服务商，4-已退款',etoPlatTime:'托管资金付款给平台的时间',etoDevTime:'托管资金支付给服务商的时间',ebackTime:'托管资金退回甲方时间',taskId:'任务编号',topDays:'置顶天数',hotDays:'热搜天数',urgentDays:'加急天数',urgentStime:'加急开始时间',urgentEtime:'加急结束时间',calcStatus:'定时检查日期是否已过期，已过期则取消任务中的置顶、加急、热搜状态计算状态0-无须计算，1-本周期已计算待下周期计算，2-结束',calcTime:'计算时间',oshare:'是否开启分享赚0否1待付款2已开通3已过期',shareFee:'分享赚佣金'}
+ *2 查询、新增、修改的参数格式  params={id:'订单编号 主键',ouserid:'下单用户编号',obranchId:'公司ID-下单客户对应的企业',ostatus:'订单状态0-初始，1-待确认，2-待付款，3-已付款，4-已完成，5-已取消-未付款前可取消，取消后可删除，6-退单-退单后变为已取消，8已关闭-售后完成后可以关闭订单',ctime:'创建时间',ltime:'更新时间',payType:'支付方式',payStatus:'支付状态0待付款，1已付款',payTime:'支付时间',prepayId:'第三方支付订单编号',finalFee:'最终总费用=origin_fee',othFee:'其它费用',originFee:'原始价格=top_fee+urgent_fee+crm_sup_fee+hot_fee+efunds+share_fee',payAt:'最终付款金额-客户付款后回填',payAuthId:'支付授权码',payOpenid:'支付账户对应的第三方openid,注意，下单根付款不一定是同一个人',payUserid:'付款用户编号',payUsername:'付款用户名称',discount:'折扣率0-199',topFee:'置顶费用',topStime:'置顶开始时间',topEtime:'置顶结束时间',hotFee:'热搜费用',hotStime:'热搜开始时间',hotEtime:'热搜结束时间',top:'是否置顶0否1待付款2已开通3已过期',hot:'是否热搜0否1待付款2已开通3已过期',crmSupFee:'客服包办费用',urgentFee:'加急费用',urgent:'是否加急0否1待付款2已开通3已过期',crmSup:'是否客服包办0否1待付款2已开通3已过期',efunds:'托管金额',estate:'资金托管状况0-无须托管，1-待付款，2-已托管资金，3-已付款给服务商，4-已退款',etoPlatTime:'托管资金付款给平台的时间',etoDevTime:'托管资金支付给服务商的时间',ebackTime:'托管资金退回甲方时间',taskId:'任务编号',topDays:'置顶天数',hotDays:'热搜天数',urgentDays:'加急天数',urgentStime:'加急开始时间',urgentEtime:'加急结束时间',calcStatus:'定时检查日期是否已过期，已过期则取消任务中的置顶、加急、热搜状态计算状态0-无须计算，1-本周期已计算待下周期计算，2-结束',calcTime:'计算时间',oshare:'是否开启分享赚0否1待付款2已开通3已过期',shareFee:'分享赚佣金',payId:'付款流水号(内部生成，传给第三方原样传回，如果不正确，不允许更新数据库，防止作弊)',tranId:'第三方付款事务号',remark:'订单备注',name:'订单名称'}
  **/
  
 //普通查询 条件之间and关系  
@@ -30,7 +30,8 @@ export const addXmTaskOrder = params => { return axios.post(`${base}/xm/core/xmT
 //批量修改某些字段
 export const editSomeFieldsXmTaskOrder = params => { return axios.post(`${base}/xm/core/xmTaskOrder/editSomeFields`, params); };
 
-
+//计算任务订单应付金额
+export const calcXmTaskOrder = params => { return axios.get(`${base}/xm/core/xmTaskOrder/calcOrder`, { params: params }); };
 
 /**-------------------------前端mng|add|edit界面公共函数---------------请写在下面----------------------------------------------- */
 //初始化页面上的字典
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index 679ece68..fe18424b 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -210,6 +210,7 @@
 						<el-steps :active="calcTaskStep" align-center simple v-if="editForm.crowd==='1'">
 							<el-step v-for="(item,index) in dicts.bidStep" :title="item.name" :description="item.name" :key="index"></el-step> 
 						</el-steps> 
+						<p v-if="!toPayVisible">
 					 	<el-form-item> 
 							 <el-checkbox v-model="editForm.taskOut" true-label="1" false-label="0" id="taskOut" @change="editXmTaskSomeFields(editForm,'taskOut',$event)">外购</el-checkbox>   
  						 
@@ -217,7 +218,55 @@
 						 
 							<el-checkbox v-model="editForm.toTaskCenter" v-if="editForm.taskOut==='1'" true-label="1" false-label="0" id="toTaskCenter" @change="editXmTaskSomeFields(editForm,'toTaskCenter',$event)">发布到互联网任务大厅</el-checkbox> 
 						</el-form-item>
+						<el-row>
+							<el-col :span="12"> 
+								<el-form-item label="交易模式" prop="tranMode"  v-if="editForm.crowd==='1'"> 
+									<el-select v-model="editForm.tranMode" @change="editXmTaskSomeFields(editForm,'tranMode',$event)">
+										<el-option v-for="(item,index) in dicts['tranMode']" :key="index" :value="item.id" :label="item.name"></el-option>
+									</el-select>
+								</el-form-item> 
+							</el-col>
+							<el-col :span="12"> 
+								<el-form-item label="最低能力等级" prop="capaLvls"  v-if="editForm.crowd==='1'"> 
+									<el-select v-model="editForm.capaLvls" @change="editXmTaskSomeFields(editForm,'capaLvls',$event)">
+										<el-option v-for="(item,index) in dicts['capaLvl']" :key="index" :value="item.id" :label="item.name"></el-option>
+									</el-select>
+								</el-form-item> 
+							</el-col>
+						</el-row>
+						<el-row>
+							<el-col :span="12"> 
+								<el-form-item label="服务保障" prop="supRequires"  v-if="editForm.crowd==='1'"> 
+									<el-select v-model="supRequires" @change="editXmTaskSomeFields(editForm,'supRequires',$event)" multiple>
+										<el-option v-for="(item,index) in dicts['supRequire']" :key="index" :value="item.id" :label="item.name"></el-option>
+									</el-select>
+								</el-form-item> 
+							</el-col>
+							<el-col :span="12"> 
+								<el-form-item label="最低会员等级" prop="interestLvls"  v-if="editForm.crowd==='1'"> 
+									<el-select v-model="editForm.interestLvls" @change="editXmTaskSomeFields(editForm,'interestLvls',$event)">
+										<el-option v-for="(item,index) in dicts['memInterestLvl']" :key="index" :value="item.id" :label="item.name"></el-option>
+									</el-select>
+								</el-form-item> 
+							</el-col>
+							
+						</el-row>
+						<el-row>
+							<el-col :span="12"> 
+								<el-form-item label="地区限制" prop="regionType"  v-if="editForm.crowd==='1'"> 
+									<el-select v-model="editForm.regionType" @change="editXmTaskSomeFields(editForm,'regionType',$event)" >
+										<el-option v-for="(item,index) in dicts['regionType']" :key="index" :value="item.id" :label="item.name"></el-option>
+									</el-select>
+								</el-form-item> 
+							</el-col>
+							<el-col :span="12"> 
+								<el-form-item label="城市名称" prop="cityName"  v-if="editForm.crowd==='1'"> 
+									<el-input v-model="editForm.cityName" placeholder="城市名称" @change="editXmTaskSomeFields(editForm,'cityName',$event)"></el-input>   
 
+								</el-form-item> 
+							</el-col>
+							
+						</el-row>
 						
 						<el-row v-if="editForm.crowd==='1'">
 							<el-col :span="18"> 
@@ -300,61 +349,14 @@
 									</el-col>
 								</el-row>
 							</el-col>
-							<el-col :span="6"> 
+							<el-col :span="6">  
 								<strong> 合计待付款￥:</strong>&nbsp;&nbsp;<font style="font-size:48px;color:red;"> {{needPayAt}}&nbsp;</font>元
 								 <br/>
-								 <el-button class="padding" @click="toPayAt">去付款</el-button>
+								 <el-button class="padding" @click="toPayAt" type="primary">去付款</el-button> 
 							</el-col> 
-						</el-row> 
-						<el-row>
-							<el-col :span="12"> 
-								<el-form-item label="交易模式" prop="tranMode"  v-if="editForm.crowd==='1'"> 
-									<el-select v-model="editForm.tranMode" @change="editXmTaskSomeFields(editForm,'tranMode',$event)">
-										<el-option v-for="(item,index) in dicts['tranMode']" :key="index" :value="item.id" :label="item.name"></el-option>
-									</el-select>
-								</el-form-item> 
-							</el-col>
-							<el-col :span="12"> 
-								<el-form-item label="最低能力等级" prop="capaLvls"  v-if="editForm.crowd==='1'"> 
-									<el-select v-model="editForm.capaLvls" @change="editXmTaskSomeFields(editForm,'capaLvls',$event)">
-										<el-option v-for="(item,index) in dicts['capaLvl']" :key="index" :value="item.id" :label="item.name"></el-option>
-									</el-select>
-								</el-form-item> 
-							</el-col>
-						</el-row>
-						<el-row>
-							<el-col :span="12"> 
-								<el-form-item label="服务保障" prop="supRequires"  v-if="editForm.crowd==='1'"> 
-									<el-select v-model="supRequires" @change="editXmTaskSomeFields(editForm,'supRequires',$event)" multiple>
-										<el-option v-for="(item,index) in dicts['supRequire']" :key="index" :value="item.id" :label="item.name"></el-option>
-									</el-select>
-								</el-form-item> 
-							</el-col>
-							<el-col :span="12"> 
-								<el-form-item label="最低会员等级" prop="interestLvls"  v-if="editForm.crowd==='1'"> 
-									<el-select v-model="editForm.interestLvls" @change="editXmTaskSomeFields(editForm,'interestLvls',$event)">
-										<el-option v-for="(item,index) in dicts['memInterestLvl']" :key="index" :value="item.id" :label="item.name"></el-option>
-									</el-select>
-								</el-form-item> 
-							</el-col>
-							
-						</el-row>
-						<el-row>
-							<el-col :span="12"> 
-								<el-form-item label="地区限制" prop="regionType"  v-if="editForm.crowd==='1'"> 
-									<el-select v-model="editForm.regionType" @change="editXmTaskSomeFields(editForm,'regionType',$event)" >
-										<el-option v-for="(item,index) in dicts['regionType']" :key="index" :value="item.id" :label="item.name"></el-option>
-									</el-select>
-								</el-form-item> 
-							</el-col>
-							<el-col :span="12"> 
-								<el-form-item label="城市名称" prop="cityName"  v-if="editForm.crowd==='1'"> 
-									<el-input v-model="editForm.cityName" placeholder="城市名称" @change="editXmTaskSomeFields(editForm,'cityName',$event)"></el-input>   
-
-								</el-form-item> 
-							</el-col>
-							
-						</el-row>
+						</el-row>  
+						</p>
+						 <to-pay v-else :task-id="editForm.id" :visible="toPayVisible" @cancel="toPayVisible=false"></to-pay>
 					</el-tab-pane>
 					<el-tab-pane label="关注" name="91"> 
 						<xm-my-do-focus v-if="activateTabPaneName=='91'" :biz-id="editForm.id" :pbiz-id="editForm.projectId" :biz-name="editForm.name" focus-type="2"></xm-my-do-focus>
@@ -430,6 +432,7 @@
 	import XmMyDoFocus from '@/views/myWork/my/components/DoFocus';
 	import XmTaskExecuserForTask from '../xmTaskExecuser/XmTaskExecuserForTask.vue';
 	import XmPhaseSelect from "./XmPhaseSelect.vue"; 
+	import ToPay from "../xmTaskOrder/ToPay.vue"; 
 	import { initSysDicts } from '../../../../api/xm/core/xmTask';
 	export default { 
 		name:'xmTaskEdit',
@@ -532,7 +535,8 @@
 				subWorkItemNum:0,
 				activateTabPaneName:'2',
 				selectParentTaskVisible:false, 
-				supRequires:[]
+				supRequires:[],
+				toPayVisible:false,
 				 /**end 在上面加自定义属性**/
 			}//end return
 		},//end data
@@ -876,13 +880,13 @@
 			},
 
 			toPayAt(){
-
+				this.toPayVisible=true;
 			}
 		},//end method
 		components: { 
  			xmSkillMng,
 			skillMng,xmMenuSelect,XmTaskList,XmExecuserMng,XmGroupSelect,XmMenuRichDetail,TagMng,XmSubWorkItem,XmTaskWorkloadRecord,XmMenuEdit,
-			XmRecord,xmQuestionForTask,XmMyDoFocus,XmTaskExecuserForTask,XmPhaseSelect
+			XmRecord,xmQuestionForTask,XmMyDoFocus,XmTaskExecuserForTask,XmPhaseSelect,ToPay
 			//在下面添加其它组件 'xm-task-edit':XmTaskEdit
 		},
 		mounted() { 
diff --git a/src/views/xm/core/xmTaskOrder/ToPay.vue b/src/views/xm/core/xmTaskOrder/ToPay.vue
new file mode 100644
index 00000000..9d83a455
--- /dev/null
+++ b/src/views/xm/core/xmTaskOrder/ToPay.vue
@@ -0,0 +1,283 @@
+<template>
+	<section  class="page-container padding">
+	    <el-row class="page-header">
+			<div class="pay_way">
+			<h2>支付方式</h2>
+			<div class="pay_way_items">
+				<div class="oItem" @click="selectPayWay(item)"  v-for="(item, index) in payWayOptions" :key="index">
+				<img :src="item.icon">
+				<span>{{item.label}}</span>
+				<i v-if="item.isChecked" class="select el-icon-success"></i>
+				</div>
+			</div>
+ 			</div>
+	    </el-row>
+		<el-row class="page-main">  
+			<div class="pay_allAmount">
+			<h2>订单总额</h2>
+			<p class="allAmount">￥<b>{{editForm?editForm.finalFee:''}}</b></p>
+			<el-checkbox v-model="agreementChecked">同意</el-checkbox> <a style="font-size: 14px;color: #409EFF">《服务协议》</a>
+			</div>
+		</el-row>
+
+		<el-row  class="page-bottom bottom-fixed">
+		    <el-button @click.native="handleCancel">取消</el-button>
+            <el-button v-loading="load.edit" type="primary" @click.native="createOrder" :disabled="load.edit==true">提交</el-button>
+		</el-row>
+		<el-dialog
+			title="微信支付"
+			:visible.sync="weixinPayVisible"
+			:show-close="false"
+			@close="closeDialog"
+			width="350px"
+			>
+			<qriously :value="codeUrl" :size="300" /> 
+		</el-dialog>
+	</section>
+</template>
+
+<script>
+	import util from '@/common/js/util';//全局公共库
+	import config from "@/common/config"; //全局公共库import
+ 	import { initDicts, addXmTaskOrder,editXmTaskOrder,editSomeFieldsXmTaskOrder,calcXmTaskOrder} from '@/api/xm/core/xmTaskOrder';
+	import { mapGetters } from 'vuex' 
+	import {aliPay, weixinPay, checkWxPayStatus} from '@/api/mdp/pay/pay'
+
+	import aliPayImg from '@/assets/image/module/alipay.png';
+	import weixinPayImg from '@/assets/image/module/weixin.png';
+	export default {
+	    name:'xmTaskOrderEdit',
+	    components: {
+
+        },
+		computed: {
+		    ...mapGetters([ 'userInfo'  ]),
+
+		},
+		props:['taskId'],
+
+		watch: { 
+	      'visible':function(visible) { 
+	      	if(visible==true){ 
+				this.calcOrder();
+	      	}
+	      } 
+	    },
+		data() {
+			return {
+			    currOpType:'add',//add/edit
+ 				load:{ list: false, edit: false, del: false, add: false },//查询中...
+				dicts:{},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
+				editFormRules: {
+					id: [
+						//{ required: true, message: '订单编号不能为空', trigger: 'blur' }
+					]
+				},
+				editForm: {
+					ouserid:'',obranchId:'',ostatus:'',ctime:'',ltime:'',payType:'',payStatus:'',payTime:'',prepayId:'',id:'',finalFee:'',othFee:'',originFee:'',payAt:'',payAuthId:'',payOpenid:'',payUserid:'',payUsername:'',discount:'',topFee:'',topStime:'',topEtime:'',hotFee:'',hotStime:'',hotEtime:'',top:'',hot:'',crmSupFee:'',urgentFee:'',urgent:'',crmSup:'',efunds:'',estate:'',etoPlatTime:'',etoDevTime:'',ebackTime:'',taskId:'',topDays:'',hotDays:'',urgentDays:'',urgentStime:'',urgentEtime:'',calcStatus:'',calcTime:'',oshare:'',shareFee:'',payId:'',tranId:'',remark:'',name:''
+				},
+                maxTableHeight:300,
+				codeUrl:'', 
+				weixinPayVisible: false,
+				payType:'1',
+				payWayOptions: [
+					{
+					label: '支付宝',
+					val: '2',
+					icon: aliPayImg,
+					isChecked: true
+					},
+					{
+					label: '微信',
+					val: '1',
+					icon: weixinPayImg,
+					isChecked: false
+					}
+				],
+				agreementChecked:false,
+			}//end return
+		},//end data
+		methods: {
+
+		    ...util,
+			
+
+			selectPayWay(item) {
+			this.payType = item.val;
+			this.payWayOptions.forEach(element => {
+				element.isChecked = false;
+				if(item.val == element.val) {
+				element.isChecked = true;
+				}
+			});
+			},
+			// 取消按钮点击 父组件监听@cancel="editFormVisible=false" 监听
+			handleCancel:function(){ 
+				this.$emit('cancel');
+			}, 
+			calcOrder(){
+				var params={taskId:this.taskId,payType:this.payType}
+				calcXmTaskOrder(params).then(res=>{
+					var tips = res.data.tips
+					if(tips.isOk){
+						Object.assign(this.editForm,res.data.data)
+					}else{
+						this.$notify.error(tips.msg);
+					}
+				})
+			},
+			createOrder() { 
+			var params={taskId:this.taskId,payType:this.payType}
+			addXmTaskOrder(params).then(res => {
+				if(res.data.tips.isOk){
+				//获取订单号
+				Object.assign(this.editForm,res.data.data)
+				let orderId = res.data.data.id;
+				if(this.payType == '2') {
+					
+					this.toAliPay(orderId);
+					return;
+				}
+				if(this.payType == '1') {
+					this.toWeixinPay(orderId);
+					return;
+				}
+				}else{
+				this.$notify.error(res.data.tips.msg);
+				}
+			}).catch(err => {
+				this.$notify.error(err.msg);
+			}).finally(() => {
+			})
+			},
+
+			toAliPay(orderId) {
+			let params = { 
+				id: orderId,
+				otype: 1,
+				returnUrl: `${window.location.protocol+"//"+window.location.host}/${process.env.CONTEXT}/${process.env.VERSION}/#/my/order/paySuccess`
+			}
+			aliPay(params).then(res => {
+				if(res.data.tips.isOk) {
+				const div = document.createElement("divform");
+				div.innerHTML = res.data.data.htmlStr;
+				document.body.appendChild(div);
+				document.forms[0].submit();
+				}else {
+				this.$notify.error(res.data.tips.msg);
+				}
+			}).finally(() => {
+				setTimeout(() => {
+				this.load.add = false;
+				}, 2000);
+			})
+			},
+
+			toWeixinPay(orderId) {
+			let params = {
+				id: orderId,
+				otype: 1,
+				returnUrl: ""
+			}
+			weixinPay(params).then(res => {
+				if(res.data.tips.isOk) {
+				this.codeUrl = res.data.data.codeUrl;
+				this.weixinPayVisible = true;
+				this.timer = setInterval(() => {
+					this.queryOrderStatus(orderId)
+				}, 3000)
+				}else {
+				this.$notify.error(res.data.tips.msg);
+				}
+			}).finally(() => {
+				setTimeout(() => {
+				this.load.add = false;
+				}, 2000);
+			})
+			},
+
+			//查询订单支付状态
+			queryOrderStatus(orderId) {
+			console.log("查询订单");
+			checkWxPayStatus({'orderId': orderId, "otype": "1"}).then(res => {
+				if(res.data.tips.isOk) {
+				this.$router.push({path:'/my/order/paySuccess', query:{total_amount: this.data.amount, out_trade_no: orderId}});
+				clearInterval(this.timer);
+				}else {
+				}
+			}).finally(() => {
+				
+			})
+			},
+
+			closeDialog() {
+			clearInterval(this.timer);
+			}
+		},//end method
+		mounted() {
+		    this.$nextTick(() => {  
+				this.calcOrder(); 
+            });
+		}
+	}
+
+</script>
+
+<style lang="scss" scoped>
+
+    .pay_way {
+        margin-top: 50px;
+        h2 {
+            margin-bottom: 20px;
+        }
+        .pay_way_items {
+            display: flex;
+            .oItem {
+                display: flex;
+                flex-direction: row;
+                align-items: center;
+                width: 200px;
+                height: 80px;
+                margin-right: 30px;
+                border: 2px solid #E3E4E6;
+                border-radius: 8px;
+                margin-top: 5px;
+                position: relative;
+                cursor: pointer;
+                img {
+                    width: 50px;
+                    height: 50px;
+                    margin: 13px 18px 13px 40px;
+                }
+                .select {
+                    font-size: 30px;
+                    position: absolute;
+                    right: 5px;
+                    top: 5px;
+                    color: #409EFF;
+                }
+            }
+        }
+
+        .phone  {
+            margin-top: 10px !important;
+            width: 440px;
+        }
+    }
+  
+    .pay_allAmount {
+        margin-top: 30px;
+        h2 {
+            margin-bottom: 20px;
+        }
+        .allAmount {
+            font-size: 22px;
+            font-weight: bold;
+            color: #FA5A55;
+            margin-bottom: 20px;
+            b {
+                font-size: 38px;
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmTaskOrder/XmTaskOrderEdit.vue b/src/views/xm/core/xmTaskOrder/XmTaskOrderEdit.vue
index 18a0e1f5..9a0698ae 100644
--- a/src/views/xm/core/xmTaskOrder/XmTaskOrderEdit.vue
+++ b/src/views/xm/core/xmTaskOrder/XmTaskOrderEdit.vue
@@ -5,11 +5,11 @@
 		<el-row class="page-main" :style="{overflowX:'auto',height:maxTableHeight+'px'}" ref="table">
 		<!--编辑界面 XmTaskOrder 任务相关费用订单表--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editFormRef">
-				<el-form-item label="用户编号" prop="userid">
-					<el-input v-model="editForm.userid" placeholder="用户编号" :maxlength="50" @change="editSomeFields(editForm,'userid',$event)"></el-input>
+				<el-form-item label="下单用户编号" prop="ouserid">
+					<el-input v-model="editForm.ouserid" placeholder="下单用户编号" :maxlength="50" @change="editSomeFields(editForm,'ouserid',$event)"></el-input>
 				</el-form-item> 
-				<el-form-item label="公司ID-下单客户对应的企业" prop="branchId">
-					<el-input v-model="editForm.branchId" placeholder="公司ID-下单客户对应的企业" :maxlength="50" @change="editSomeFields(editForm,'branchId',$event)"></el-input>
+				<el-form-item label="公司ID-下单客户对应的企业" prop="obranchId">
+					<el-input v-model="editForm.obranchId" placeholder="公司ID-下单客户对应的企业" :maxlength="50" @change="editSomeFields(editForm,'obranchId',$event)"></el-input>
 				</el-form-item> 
 				<el-form-item label="订单状态0-初始，1-待确认，2-待付款，3-已付款，4-已完成，5-已取消-未付款前可取消，取消后可删除，6-退单-退单后变为已取消，8已关闭-售后完成后可以关闭订单" prop="ostatus">
 					<el-input v-model="editForm.ostatus" placeholder="订单状态0-初始，1-待确认，2-待付款，3-已付款，4-已完成，5-已取消-未付款前可取消，取消后可删除，6-退单-退单后变为已取消，8已关闭-售后完成后可以关闭订单" :maxlength="1" @change="editSomeFields(editForm,'ostatus',$event)"></el-input>
@@ -72,7 +72,7 @@
 					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.topEtime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
 				</el-form-item> 
 				<el-form-item label="热搜费用" prop="hotFee">
-					<el-input v-model="editForm.hotFee" placeholder="热搜费用" :maxlength="1" @change="editSomeFields(editForm,'hotFee',$event)"></el-input>
+					<el-input v-model="editForm.hotFee" placeholder="热搜费用" :maxlength="20"></el-input>
 				</el-form-item> 
 				<el-form-item label="热搜开始时间" prop="hotStime">
 					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.hotStime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
@@ -87,7 +87,7 @@
 					<el-input v-model="editForm.hot" placeholder="是否热搜0否1待付款2已开通3已过期" :maxlength="1" @change="editSomeFields(editForm,'hot',$event)"></el-input>
 				</el-form-item> 
 				<el-form-item label="客服包办费用" prop="crmSupFee">
-					<el-input v-model="editForm.crmSupFee" placeholder="客服包办费用" :maxlength="1" @change="editSomeFields(editForm,'crmSupFee',$event)"></el-input>
+					<el-input v-model="editForm.crmSupFee" placeholder="客服包办费用" :maxlength="20"></el-input>
 				</el-form-item> 
 				<el-form-item label="加急费用" prop="urgentFee">
 					<el-input v-model="editForm.urgentFee" placeholder="加急费用" :maxlength="20"></el-input>
@@ -143,6 +143,18 @@
 				<el-form-item label="分享赚佣金" prop="shareFee">
 					<el-input v-model="editForm.shareFee" placeholder="分享赚佣金" :maxlength="20"></el-input>
 				</el-form-item> 
+				<el-form-item label="付款流水号(内部生成，传给第三方原样传回，如果不正确，不允许更新数据库，防止作弊)" prop="payId">
+					<el-input v-model="editForm.payId" placeholder="付款流水号(内部生成，传给第三方原样传回，如果不正确，不允许更新数据库，防止作弊)" :maxlength="50" @change="editSomeFields(editForm,'payId',$event)"></el-input>
+				</el-form-item> 
+				<el-form-item label="第三方付款事务号" prop="tranId">
+					<el-input v-model="editForm.tranId" placeholder="第三方付款事务号" :maxlength="50" @change="editSomeFields(editForm,'tranId',$event)"></el-input>
+				</el-form-item> 
+				<el-form-item label="订单备注" prop="remark">
+					<el-input v-model="editForm.remark" placeholder="订单备注" :maxlength="255" @change="editSomeFields(editForm,'remark',$event)"></el-input>
+				</el-form-item> 
+				<el-form-item label="订单名称" prop="name">
+					<el-input v-model="editForm.name" placeholder="订单名称" :maxlength="255" @change="editSomeFields(editForm,'name',$event)"></el-input>
+				</el-form-item> 
 			</el-form>
 		</el-row>
 
@@ -194,7 +206,7 @@
 					]
 				},
 				editForm: {
-					userid:'',branchId:'',ostatus:'',ctime:'',ltime:'',payType:'',payStatus:'',payTime:'',prepayId:'',id:'',finalFee:'',othFee:'',originFee:'',payAt:'',payAuthId:'',payOpenid:'',payUserid:'',payUsername:'',discount:'',topFee:'',topStime:'',topEtime:'',hotFee:'',hotStime:'',hotEtime:'',top:'',hot:'',crmSupFee:'',urgentFee:'',urgent:'',crmSup:'',efunds:'',estate:'',etoPlatTime:'',etoDevTime:'',ebackTime:'',taskId:'',topDays:'',hotDays:'',urgentDays:'',urgentStime:'',urgentEtime:'',calcStatus:'',calcTime:'',oshare:'',shareFee:''
+					ouserid:'',obranchId:'',ostatus:'',ctime:'',ltime:'',payType:'',payStatus:'',payTime:'',prepayId:'',id:'',finalFee:'',othFee:'',originFee:'',payAt:'',payAuthId:'',payOpenid:'',payUserid:'',payUsername:'',discount:'',topFee:'',topStime:'',topEtime:'',hotFee:'',hotStime:'',hotEtime:'',top:'',hot:'',crmSupFee:'',urgentFee:'',urgent:'',crmSup:'',efunds:'',estate:'',etoPlatTime:'',etoDevTime:'',ebackTime:'',taskId:'',topDays:'',hotDays:'',urgentDays:'',urgentStime:'',urgentEtime:'',calcStatus:'',calcTime:'',oshare:'',shareFee:'',payId:'',tranId:'',remark:'',name:''
 				},
                 maxTableHeight:300,
 			}//end return
diff --git a/src/views/xm/core/xmTaskOrder/XmTaskOrderMng.vue b/src/views/xm/core/xmTaskOrder/XmTaskOrderMng.vue
index 7a7e3b15..06df1073 100644
--- a/src/views/xm/core/xmTaskOrder/XmTaskOrderMng.vue
+++ b/src/views/xm/core/xmTaskOrder/XmTaskOrderMng.vue
@@ -20,14 +20,14 @@
 				</el-table-column>
 				-->
 				<el-table-column prop="id" label="订单编号" min-width="120" show-overflow-tooltip  fixed="left"></el-table-column>
-				<el-table-column prop="userid" label="用户编号" min-width="120" show-overflow-tooltip>
+				<el-table-column prop="ouserid" label="下单用户编号" min-width="120" show-overflow-tooltip>
 				    <template slot-scope="scope">
-				        <span> {{scope.row.userid}} </span>
+				        <span> {{scope.row.ouserid}} </span>
                     </template>
 				</el-table-column>
-				<el-table-column prop="branchId" label="公司ID-下单客户对应的企业" min-width="120" show-overflow-tooltip>
+				<el-table-column prop="obranchId" label="公司ID-下单客户对应的企业" min-width="120" show-overflow-tooltip>
 				    <template slot-scope="scope">
-				        <span> {{scope.row.branchId}} </span>
+				        <span> {{scope.row.obranchId}} </span>
                     </template>
 				</el-table-column>
 				<el-table-column prop="ostatus" label="订单状态0-初始，1-待确认，2-待付款，3-已付款，4-已完成，5-已取消-未付款前可取消，取消后可删除，6-退单-退单后变为已取消，8已关闭-售后完成后可以关闭订单" min-width="120" show-overflow-tooltip>
@@ -243,6 +243,26 @@
 				<el-table-column prop="shareFee" label="分享赚佣金" min-width="120" show-overflow-tooltip>
 				    <template slot-scope="scope">
 				        <span> {{scope.row.shareFee}} </span>
+                    </template>
+				</el-table-column>
+				<el-table-column prop="payId" label="付款流水号(内部生成，传给第三方原样传回，如果不正确，不允许更新数据库，防止作弊)" min-width="120" show-overflow-tooltip>
+				    <template slot-scope="scope">
+				        <span> {{scope.row.payId}} </span>
+                    </template>
+				</el-table-column>
+				<el-table-column prop="tranId" label="第三方付款事务号" min-width="120" show-overflow-tooltip>
+				    <template slot-scope="scope">
+				        <span> {{scope.row.tranId}} </span>
+                    </template>
+				</el-table-column>
+				<el-table-column prop="remark" label="订单备注" min-width="120" show-overflow-tooltip>
+				    <template slot-scope="scope">
+				        <span> {{scope.row.remark}} </span>
+                    </template>
+				</el-table-column>
+				<el-table-column prop="name" label="订单名称" min-width="120" show-overflow-tooltip>
+				    <template slot-scope="scope">
+				        <span> {{scope.row.name}} </span>
                     </template>
 				</el-table-column>
 				<el-table-column label="操作" width="180" fixed="right">
@@ -315,12 +335,12 @@ export default {
             },//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
             addFormVisible: false,//新增xmTaskOrder界面是否显示
             addForm: {
-                userid:'',branchId:'',ostatus:'',ctime:'',ltime:'',payType:'',payStatus:'',payTime:'',prepayId:'',id:'',finalFee:'',othFee:'',originFee:'',payAt:'',payAuthId:'',payOpenid:'',payUserid:'',payUsername:'',discount:'',topFee:'',topStime:'',topEtime:'',hotFee:'',hotStime:'',hotEtime:'',top:'',hot:'',crmSupFee:'',urgentFee:'',urgent:'',crmSup:'',efunds:'',estate:'',etoPlatTime:'',etoDevTime:'',ebackTime:'',taskId:'',topDays:'',hotDays:'',urgentDays:'',urgentStime:'',urgentEtime:'',calcStatus:'',calcTime:'',oshare:'',shareFee:''
+                ouserid:'',obranchId:'',ostatus:'',ctime:'',ltime:'',payType:'',payStatus:'',payTime:'',prepayId:'',id:'',finalFee:'',othFee:'',originFee:'',payAt:'',payAuthId:'',payOpenid:'',payUserid:'',payUsername:'',discount:'',topFee:'',topStime:'',topEtime:'',hotFee:'',hotStime:'',hotEtime:'',top:'',hot:'',crmSupFee:'',urgentFee:'',urgent:'',crmSup:'',efunds:'',estate:'',etoPlatTime:'',etoDevTime:'',ebackTime:'',taskId:'',topDays:'',hotDays:'',urgentDays:'',urgentStime:'',urgentEtime:'',calcStatus:'',calcTime:'',oshare:'',shareFee:'',payId:'',tranId:'',remark:'',name:''
             },
 
             editFormVisible: false,//编辑界面是否显示
             editForm: {
-                userid:'',branchId:'',ostatus:'',ctime:'',ltime:'',payType:'',payStatus:'',payTime:'',prepayId:'',id:'',finalFee:'',othFee:'',originFee:'',payAt:'',payAuthId:'',payOpenid:'',payUserid:'',payUsername:'',discount:'',topFee:'',topStime:'',topEtime:'',hotFee:'',hotStime:'',hotEtime:'',top:'',hot:'',crmSupFee:'',urgentFee:'',urgent:'',crmSup:'',efunds:'',estate:'',etoPlatTime:'',etoDevTime:'',ebackTime:'',taskId:'',topDays:'',hotDays:'',urgentDays:'',urgentStime:'',urgentEtime:'',calcStatus:'',calcTime:'',oshare:'',shareFee:''
+                ouserid:'',obranchId:'',ostatus:'',ctime:'',ltime:'',payType:'',payStatus:'',payTime:'',prepayId:'',id:'',finalFee:'',othFee:'',originFee:'',payAt:'',payAuthId:'',payOpenid:'',payUserid:'',payUsername:'',discount:'',topFee:'',topStime:'',topEtime:'',hotFee:'',hotStime:'',hotEtime:'',top:'',hot:'',crmSupFee:'',urgentFee:'',urgent:'',crmSup:'',efunds:'',estate:'',etoPlatTime:'',etoDevTime:'',ebackTime:'',taskId:'',topDays:'',hotDays:'',urgentDays:'',urgentStime:'',urgentEtime:'',calcStatus:'',calcTime:'',oshare:'',shareFee:'',payId:'',tranId:'',remark:'',name:''
             },
             maxTableHeight:300,
         }