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

api/pagesB/createnewconsultation/createnewconsultation.js

@@ -8,3 +8,12 @@ export function consultationInfo(data) {
 		data: data
 	})
 }
+export function detail(identity) {
+	return request({
+		url: '/applet/signinfo/detail/' + identity,
+		method: 'get',
+		header: {
+			region: uni.getStorageSync('region'),
+		}
+	})
+}

pages/medicalservice/medicalservice.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="app">
 		<view class="address">
-<!-- 			<image src="../../static/pages/address.png" mode=""></image>
+			<!-- 			<image src="../../static/pages/address.png" mode=""></image>
 			<text>
 				{{location?location:''}}
 			</text> -->
@@ -177,9 +177,21 @@
 			},
 			//问诊平台
 			goconsultationplatform() {
-				uni.navigateTo({
-					url: '/pagesB/consultationplatform/consultationplatform',
-				})
+				const value = uni.getStorageSync('openid');
+				const value2 = uni.getStorageSync('patientId');
+				if (value && value2) {
+					uni.navigateTo({
+						url: '/pagesB/consultationplatform/consultationplatform',
+					})
+				} else {
+					this.$refs.uToast.show({
+						title: '您未登录,请先登录',
+						type: 'error',
+						duration: '1000',
+						url: '/pages/login/login'
+					})
+				}
+
 			},
 		},
 		//1.分享给朋友

pagesB/CommodityOrder/CommodityOrder.vue

@@ -35,7 +35,7 @@
 					<view class="detailslist">
 						<image :src="baseurl+item.personPictureUrl" mode=""
 							v-if="item.orderType =='HEALTH_CONSULTATION'&&item.personPictureUrl"></image>
-						<image src="@/static/pagesB/yis.png" mode=""
+						<image src="../../static/headsculpture.png" mode=""
 							v-if="item.orderType =='HEALTH_CONSULTATION'&&!item.personPictureUrl"></image>
 						<image :src="baseurl+item.attributePitureUrl" mode=""
 							v-if="item.orderType !='HEALTH_CONSULTATION'"></image>

pagesB/consultationplatform/consultationplatform.vue

@@ -45,6 +45,7 @@
 				</view>
 			</view>
 		</view>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 
@@ -269,4 +270,4 @@
 			margin: 20rpx auto 0;
 		}
 	}
-</style>
+</style>

pagesB/consulted/consulted.vue

@@ -6,10 +6,7 @@
 			<view class="title" v-if="list.orderStatus=='WAIT_REFUND'"  @tap="goprevious">退款中</view>
 			<view class="title" v-if="list.orderStatus=='CANCEL'"  @tap="goprevious">已取消</view>
 			<view class="title" v-if="list.orderStatus=='WAIT_RECEIVED_GOODS'"  @tap="goprevious">待接单</view>
-			<!-- 	<view class="title" v-if="list.orderStatus=='WAIT_RECEIVED_GOODS'&&list.orderType !='HEALTH_CONSULTATION'">
-				待收货</view> -->
-			<!-- <view class="title" v-if="list.orderStatus=='WAIT_RECEIVED_GOODS'&&list.orderType =='HEALTH_CONSULTATION'">
-				待咨询</view> -->
+		
 			<view class="title" v-if="list.orderStatus=='COMPLETED'"  @tap="goprevious">待评价</view>
 			<view class="title" v-if="list.orderStatus=='RECEIVED_GOODS'"  @tap="goprevious">待服务</view>
 			<view class="title" v-if="list.orderStatus=='EVALUATED'"  @tap="goprevious">已评价</view>

pagesB/createnewconsultation/createnewconsultation.vue

@@ -134,8 +134,10 @@
 	import gkcity from "../../components/m-city/m-city.vue";
 	import baseurl from '@/api/baseurl.js'
 	import {
-		consultationInfo
+		consultationInfo,
+		detail
 	} from '@/api/pagesB/createnewconsultation/createnewconsultation.js'
+	// import consultationplatformVueHtml from '../consultationplatform/consultationplatform.vue.html';
 	export default {
 		components: {
 			"m-city": gkcity
@@ -150,19 +152,19 @@
 				address: '请选择所属地区', //页面所属区域
 				formdata: {
 					address: '请选择所属地区', //页面所属区域
-					patientId: 1,
-					patientName: '李广君',
-					cardNo: '370882199909092123',
-					phone: '17615455437',
+					patientId: '',
+					patientName: '',
+					cardNo: '',
+					phone: '',
 					address: '',
-					doctorId: 1,
+					doctorId: 111,
 					doctorName: '李医生',
 					consultationType: 'IMAGE_TEXT_CONSULTATION',
 					problemDescription: '',
 					situationDescription: '',
 					problemStatement: '',
 					medicalRecord: '',
-					fileUrls: []
+					fileUrls: [],
 				}
 			};
 		},
@@ -172,14 +174,22 @@
 		onShow() {
 			this.areaInfo();
 			let that = this
+			that.formdata = uni.getStorageSync('userinfo')
 			uni.$on('doctordata', function(data) {
 				let item = JSON.parse(data.data)
 				that.formdata.doctorName = item.realname
 				that.formdata.doctorId = item.userNo
 				uni.$off('doctordata')
 			})
+			this.infolist()
+
 		},
 		methods: {
+			infolist() {
+				detail(this.formdata.cardNo).then(res => {
+					console.log(res, '55')
+				})
+			},
 			updata() {
 				if (this.imglistlength > 0) {
 					this.$refs.uUpload.upload()

pagesC/Onlinesigning/Onlinesigning.vue

@@ -141,7 +141,7 @@
 			</view>
 		</view>
 		<u-popup v-model="popupShow" mode="right" @close="closeCrowds" width='50%'>
-			<scroll-view scroll-y="true" style="height: 100vh;padding: 40rpx 10rpx 100rpx">
+			<scroll-view scroll-y="true" style="height: 100%;padding: 40rpx 10rpx 100rpx">
 				<u-checkbox-group @change="crowdscheckboxGroupChange" v-model="query.crowdsName" v-if="showGroup == 1"
 					label-size='20rpx'>
 					<u-checkbox v-model="item.checked" v-for="(item, index) in crowdslist" :key="index"