Merge branch 'master' of http://git.2weisou.com/liumin/NewZkgj into master

pages/center/consumer/consumerDetail.vue

@@ -44,7 +44,7 @@
 				</view>
 				<view class="content-last">
 					<view class="content-last-con">
-					备注：{{customerInfo.demand.remarks ? customerInfo.demand.remarks : "暂无"}}
+					备注：{{customerInfo.remarks ? customerInfo.remarks : "暂无"}}
 					</view>
 				</view>
 			</view>

pages/mine/reception/consultant.vue

@@ -133,7 +133,8 @@
 				const that = this;
 				this.$u.post("customer/assign", {
 					agentId: that.chosedAgentId,
-					id: that.customerId
+					id: that.customerId,
+					replaceReception:this.replaceReception
 				}).then(res => {
 					uni.showToast({
 						icon: "none",