Merge remote-tracking branch 'origin/dev' into dev

pagesB/confirmation/confirmation.vue

@@ -184,6 +184,8 @@
 		},
 		data() {
 			return {
+				orderNo:'',
+				patientId:'',
 				buyshow: false,
 				uoloadaction: '', // 非真实地址
 				list: [],
@@ -341,6 +343,8 @@
 					res.data.paymentPrice = res.data.totalPrice
 					res.data.openid = uni.getStorageSync('openid');
 					that.id = res.data.id
+					that.orderNo=res.data.orderNo
+					that.patientId=res.data.patientId
 					appletGoodsOrderPay(res.data).then(response => {
 						if (response.code == 200) {
 							uni.requestPayment({
@@ -351,8 +355,8 @@
 								paySign: response.data.paySign,
 								success: function(res) {
 									pushMeg({
-										orderId: item.goodsOrderId,
+										orderId: that.orderNo,
-										patientId: item.patientId
+										patientId: that.patientId
 									}).then(respp => {
 										that.$refs.uToast.show({
 											title: '支付成功',
@@ -364,7 +368,7 @@
 										}
 										that.timer = setTimeout(e => {
 											uni.redirectTo({
-												url: '/pagesB/paysuccess/paysuccess'
+												url: '/pagesB/ExpertlookOrder/ExpertlookOrder'
 											})
 										}, 1500)
 									})

pagesB/consulted/consulted.scss

@@ -292,6 +292,7 @@
 					top: 52%;
 					left: 5%;
 					margin-left: 5%;
+					margin-bottom: 30rpx;
 				}
 				.advicetwo {
 					letter-spacing: 0.2em;

pagesB/consulted/consulted.vue

@@ -126,14 +126,14 @@
 					{{order.medicalRecord}}
 				</view>
 			</view>
-			<view class="doctordetailstwo">
+			<!-- <view class="doctordetailstwo">
 				<view class="doctorphonetwo">
 					咨询内容
 				</view>
 				<view class="phonetwo advicetwo" v-if="list.healthConsultationContent">
 					·{{list.healthConsultationContent}}
 				</view>
-			</view>
+			</view> -->
 			<view class="amount">
 				<span>订单金额</span><span>￥{{list.totalPrice}}</span>