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

pages/myinformation/myinformation.vue

@@ -5,17 +5,20 @@
 				我的
 			</view> -->
 			<image src="../../static/pages/userbanner.png" mode="" class="userbanner"></image>
-			<image :src="baseurl+appPersonallist.headPictureUrl" mode="" class="headsculpture" @tap='updatainfo'>
+			<image src="/static/myinformation.png" mode="" class="headsculpture" @tap='updatainfo'
+				v-if="!appPersonallist.headPictureUrl">
+			</image>
+			<image :src="baseurl+appPersonallist.headPictureUrl" mode="" class="headsculpture" @tap='updatainfo' v-else>
 			</image>
 			<view class="namesigning">
-				<span class="name">
+				<span class="name" v-if="appPersonallist.patientName">
 					{{appPersonallist.patientName}}
 				</span>
 				<view class="signing">
 					未签约
 				</view>
 			</view>
-			<view class="phone">
+			<view class="phone" v-if="appPersonallist.phone">
 				{{appPersonallist.phone}}
 			</view>
 			<view class="switch btn">
@@ -374,17 +377,17 @@
 				}
 			},
 			//修改信息
-			updatainfo() {
+			// updatainfo() {
-				const value = uni.getStorageSync('openid');
+			// 	const value = uni.getStorageSync('openid');
-				const value2 = uni.getStorageSync('patientId');
+			// 	const value2 = uni.getStorageSync('patientId');
-				if (value && value2) {
+			// 	if (value && value2) {
-					uni.navigateTo({
+			// 		uni.navigateTo({
-						url: `/pagesB/modify/modify`
+			// 			url: `/pagesB/modify/modify`
-					})
+			// 		})
-				} else {
+			// 	} else {
-					this.gologin();
+			// 		this.gologin();
-				}
+			// 	}
-			},
+			// },
 			// 专家咨询订单
 			expertOrder() {
 				uni.navigateTo({

pagesB/modify/modify.vue

@@ -206,6 +206,7 @@
 							that.appPersonallist.sex = '女';
 						}
 						that.appPersonallist = Response.data
+						that.value2=Response.data.diseaseList.map(String)
 						Number(that.appPersonallist.homeLatitude) > 0 ? that.appPersonallist.homeLatitude = Number(
 							that.appPersonallist.homeLatitude) : that.appPersonallist.homeLatitude = null
 						Number(that.appPersonallist.homeLongitude) > 0 ? that.appPersonallist.homeLongitude =
@@ -229,7 +230,6 @@
 		methods: {
 			confirm(e) {
 				this.appPersonallist.diseaseList = e.map(Number)
-				console.log(e)
 			},
 			// 下拉框多选
 			selectChange(val) {