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

api/pagesB/medicine/index.js

@@ -23,10 +23,10 @@ export function selectDepartment(pageNum, pageSize) {
 //人员
 export function selectHospitalPerson(pageNum, pageSize, departmentId,status) {
 	return request({
-		url: `/nurseApp/healthConsultation/selectHospitalPerson?pageNum=${pageNum}&pageSize=${pageSize}&departmentId=${departmentId}&&status=${1}`,
+		url: `/nurseApp/healthConsultation/selectHospitalPerson?pageNum=${pageNum}&pageSize=${pageSize}&departmentId=${departmentId}&status=${2}`,
 		method: 'GET',
 		header: {
 			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
 		},
 	})
-}
+}

pages/homepage/homepage.vue

@@ -59,6 +59,12 @@
 					服务记录
 				</view>
 			</view>
+			<view class="home">
+				<!-- <image src="/static/pageC/health.png" mode=""></image>
+				<view class="name">
+					健康档案
+				</view> -->
+			</view>
 		</view>
 		<view class="contentbottom">
 			<view class="health">
@@ -104,7 +110,7 @@
 			this.openid = uni.getStorageSync('openid');
 			if (uni.getStorageSync('userinfo')) {
 				this.userinfo = uni.getStorageSync('userinfo')
-				this.cityCode = this.userinfo.cityCode;
+				// this.cityCode = this.userinfo.cityCode;
 			}
 			if (this.address == '德州市') {
 				uni.setStorageSync("region", 1)
@@ -167,7 +173,7 @@
 					if (this.region == 3) {
 						this.family()
 					} else {
-						if (this.cityCode == 1 || this.cityCode == 2) {
+						if (this.region == 1 || this.region == 2) {
 							if (this.checkSign == "0") {
 								this.$refs.uToast.show({
 									title: '未签约，请先签约',
@@ -198,7 +204,7 @@
 					if (this.region == 3) {
 						this.family()
 					} else {
-						if (this.cityCode == 1 || this.cityCode == 2) {
+						if (this.region == 1 || this.region == 2) {
 							if (this.checkSign == "0") {
 								this.$refs.uToast.show({
 									title: this.infotitle,
@@ -210,12 +216,8 @@
 									title: this.infotitle,
 									type: 'error',
 								})
-							} else if (this.checkSign == "01") {
+							}
-								this.$refs.uToast.show({
+							else {
-									title: this.infotitle,
-									type: 'error',
-								})
-							} else {
 								uni.navigateTo({
 									url: '/pagesB/Behaviorpoints/Behaviorpoints'
 								})
@@ -277,10 +279,10 @@
 				if (!this.userinfo) {
 					this.gologin();
 				} else {
-					// if (this.region == 3) {
+					if (this.region == 3) {
-					// 	this.family()
+						this.family()
-					// } else {
+					} else {
-					// if (this.cityCode == 1 || this.cityCode == 2) {
+					if (this.region == 1 || this.region == 2) {
 					if (this.checkSign == "0") {
 						this.$refs.uToast.show({
 							title: '未签约，请先签约',
@@ -297,11 +299,10 @@
 							url: "/pagesC/ServiceAppointment/ServiceAppointment"
 						})
 					}
-					// } else {
+					} else {
-					// 	this.family()
+						this.family()
-					// }
+					}
-					// }
+					}
-					// }
 				}
 			},
 			// 服务记录
@@ -312,7 +313,7 @@
 					if (this.region == 3) {
 						this.family()
 					} else {
-						if (this.cityCode == 1 || this.cityCode == 2) {
+						if (this.region == 1 || this.region == 2) {
 							if (this.checkSign == "0") {
 								this.$refs.uToast.show({
 									title: '未签约，请先签约',
@@ -343,7 +344,7 @@
 					if (this.region == 3) {
 						this.family()
 					} else {
-						if (this.cityCode == 1 || this.cityCode == 2) {
+						if (this.region == 1 || this.region == 2) {
 							if (this.checkSign == "0") {
 								this.$refs.uToast.show({
 									title: '未签约，请先签约',
@@ -372,4 +373,5 @@
 
 <style lang="scss">
 	@import "./homepage.scss";
-</style>
+</style>
+

pages/myinformation/myinformation.vue

@@ -305,7 +305,6 @@
 								type: 'success',
 								duration: '1000',
 							})
-
 							this.myInfo()
 						} else {
 							this.$refs.uToast.show({
@@ -532,4 +531,4 @@
 
 <style lang="scss">
 	@import './myinformation.scss'
-</style>
+</style>

pagesB/AddMembers/AddMembers.vue

@@ -99,12 +99,20 @@
 						</view>
 					</u-form-item>
 					<view class="name">
+						所属区域
+						<view class="select" @tap='showPicker'>
+							<text v-if="!addressinfo">请选择所属区域</text>
+							<text v-else class="testitem">{{addressinfo}}</text>
+							<!-- <image src="../../static/huijiantou.png" mode=""></image> -->
+						</view>
+					</view>
+				<!-- 	<view class="name">
 						所在位置
 						<view class="selectdata" @tap='getAddress'>
 							<text v-if="form.locationName ==''">请选择所在位置</text>
 							<text class="testitem">{{form.locationName}}</text>
 						</view>
-					</view>
+					</view> -->
 					<u-form-item prop="phone" :border-bottom="false">
 						<view class="name">
 							手机号
@@ -128,6 +136,11 @@
 			<!-- 出生日期 -->
 			<u-picker mode="time" v-model="timeshow" :params="params" @confirm='timechange' @canel='timeshow=false'>
 			</u-picker>
+			<view class="">
+				<m-city style='z-index: 10076;' :provinceData="list" headTitle="地区选择" ref="cityPicker"
+					@funcValue="getpickerParentValue" pickerSize="4">
+				</m-city>
+			</view>
 		</view>
 
 	</view>
@@ -138,15 +151,22 @@
 	import {
 		registerdata
 	} from '@/api/pages/register/register.js'
+	import gkcity from "@/components/m-city/m-city.vue";
+	import ldSelect from '../../components/ld-select/ld-select.vue';
+	import {
+		getSubordinateRegions,
+	} from '@/api/pagesB/modifyAddress/modifyAddress.js';
 
-	// import {
-	//   bindFamilyUser,
-	//   getDictByType
-	// } from '@/service/api/api.js'
-	// import QQMapWX from '@/utils/qqMap/qqmap-wx-jssdk.js';
 	export default {
+		components: {
+			ldSelect,
+			"m-city": gkcity,
+		},
+
 		data() {
 			return {
+				addresslength: null,
+				addressinfo:'',
 				sexlist: [{
 						name: '男',
 						disabled: false
@@ -188,6 +208,7 @@
 					locationName: '',
 					homeLongitude: '',
 					homeLatitude: '',
+					areaCode:'',
 				},
 				householdRelationship: '',
 				userinfo: {},
@@ -259,6 +280,11 @@
 						disabled: false
 					}
 				],
+				list: [{
+					id: "",
+					localName: "请选择",
+					children: [],
+				}, ],
 				rules: {
 					cardNo: [{
 						//必填
@@ -347,6 +373,7 @@
 
 		onLoad(options) {
 			this.form.openid = uni.getStorageSync('openid')
+			this.areaInfo()
 
 		},
 		onShow() {
@@ -382,6 +409,33 @@
 					}
 				});
 			},
+			// 显示三级地址联动
+			showPicker() {
+				this.$refs.cityPicker.show();
+			},
+			// 三级地址联动回调
+			getpickerParentValue(e) {
+				e = e.filter(ele => ele.localName != '暂不选择')
+				e = e.filter(ele => ele.localName != '暂无需选择')
+				this.addresslength = e
+				this.addressinfo = ''
+				this.form.areaCode = ''
+				if (e && e.length >= 1) {
+					e.forEach(el => {
+						this.addressinfo = this.addressinfo + el.localName
+					})
+					this.form.areaCode = e[e.length - 1].id
+				} else {
+					this.addressinfo = ''
+					this.form.areaCode = ''
+				}
+			},
+			//区街道
+			areaInfo() {
+				getSubordinateRegions().then(res => {
+					this.list = res.data;
+				})
+			},
 			//选择出生日期
 			timechange(e) {
 				this.form.birthDate = e.year + '-' + e.month + '-' + e.day
@@ -410,7 +464,7 @@
 						registerdata(_this.form).then(res => {
 							if (res.code == 500) {
 								_this.$refs.uToast.show({
-									title: res.data.msg,
+									title: res.msg,
 									type: 'error'
 								})
 							} else {

pagesB/confirmation/confirmation.vue

@@ -131,7 +131,7 @@
 		</view>
 		<view class="btns">
 			<view class="btnleft">
-				￥<text>{{formdata.price}}</text>.00
+				￥<text>{{formdata.price}}</text>
 			</view>
 			<view class="btnright" @tap='updata'>
 				保存

pagesB/medicine/medicine.vue

@@ -146,7 +146,7 @@
 			//人员
 			selectHospitalPersonInfo() {
 				this.personpageNum = 1
-				var status='1'
+				var status='2'
 				selectHospitalPerson(this.personpageNum, this.pageSize, this.departmentId,status).then(res => {
 					this.HospitalPersonlist = res.rows
 					this.HospitalPersontotal = res.total