Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel

pages/jiuzhai/jz_Reserve.vue

@@ -766,7 +766,7 @@
 				var ContactName = this.customer.name; //联系人
 				var ContactMobile = this.customer.contactNumber; //联系电话  
 				var CustomerType = this.customer.isMember //4;
-
+				var CustomerCreateBy = this.customer.createBy;
 				var price = 0;
 				if (this.$utils.getretailer()) {
 					price = this.currentPriceInfo.b2BPrice;
@@ -825,6 +825,7 @@
 					CommissionSharePeople: 0,
 					CommissionShareMoney: 0,
 					MiniAppUserId: MiniAppUserId,
+					CreateBy: CustomerCreateBy, //同行联系人创建人
 					DirectCustomerId: 0, //直客Id
 					// #ifdef MP-WEIXIN
 					OrderSource: 5,

pages/user-center/user-center.vue

@@ -45,9 +45,12 @@
 									立即登录
 								</template>
 							</Text>
-							<view style="font-size:12px; margin-top:5px;">
+							<view style="font-size:12px; margin-top:3px;">
 								<template v-if="b2b_user_info&&b2b_user_info.customerName&&b2b_user_info.customerName!=''">
 									{{b2b_user_info.customerName}}
+									<template v-if="b2b_user_info&&b2b_user_info.salesBaseInfo&&b2b_user_info.salesBaseInfo.emName!=''">
+										（销售经理:{{b2b_user_info.salesBaseInfo.emName}})
+									</template>
 								</template>
 								<template v-else>
 									{{b2b_user_info ? b2b_user_info.name : ""}}