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

api/baseurl.js

@@ -1,10 +1,12 @@
 // var baseurl = "https://quanyidaojia.xinelu.cn";
-// var baseurl = "http://192.168.16.48:8088";
+var baseurl = "http://192.168.16.48:8088";
 // 蒙
 // var baseurl = "http://8.131.93.145:54088";
 // 郝
 // var baseurl = "http://8.131.93.145:54010";
 
-var baseurl = "http://192.168.16.30:8088";
+// var baseurl = "http://192.168.16.76:8080";
+// var baseurl = "http://192.168.16.212:8088";
+
 
 export default baseurl

api/pagesB/Serviceevaluation/Serviceevaluation.js

@@ -4,7 +4,9 @@ export function getAppletOrderList(parentId,orderStatus,cardNo,region,pageNum,pa
 		url: `/nurseApplet/nursingOrder/getAppletOrderList?parentId=${parentId}&orderStatus=${orderStatus}&cardNo=${cardNo}&region=${region}&pageNum=${pageNum}&pageSize=${pageSize}`,
 		method: 'GET',
 		header: {
-			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token'),
+			region: uni.getStorageSync('region'),
+			
 		},
 		
 	})

api/pagesC/healthtest/index.js

@@ -8,6 +8,8 @@ export function surveylist(data) {
 		data,
 		header: {
 			region: uni.getStorageSync('region'),
+			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+
 		},
 	})
 }

components/protocol/protocol.vue

@@ -12,7 +12,28 @@
 				<h4>乙方：</h4>
 				<h4 class="box-line">{{list.residentName}}</h4>
 			</view>
-			<uni-table border stripe emptyText="暂无更多数据">
+			<u-table width="80%">
+					<u-tr class="u-tr">
+						<u-th class="u-th">姓名</u-th>
+						<u-th class="u-th">性别</u-th>
+						<u-th class="u-th">年龄</u-th>
+						<u-th class="u-th">身份证号</u-th>
+						<u-th class="u-th">现住址</u-th>
+						<u-th class="u-th">选择签约基础服务包</u-th>
+						<u-th class="u-th">选择签约个性服务包</u-th>
+					</u-tr>
+					<u-tr class="u-tr">
+						<u-td class="u-th">{{list.residentName}}</u-td>
+						<u-td class="u-th">{{list.gender === '1' ? '男' : '女'}}</u-td>
+						<u-td class="u-th">{{list.age?list.age:''}}</u-td>
+						<u-td class="u-th">{{list.identity?list.identity:''}}</u-td>
+						<u-td class="u-th">{{list.address?list.address:''}}</u-td>
+						<u-td class="u-th">{{list.phone?list.phone:''}}</u-td>
+						<u-td class="u-th">{{list.BasePackage?list.BasePackage:''}} </u-td>
+						<u-td class="u-th">{{list.PersonalityPack?list.PersonalityPack:''}}</u-td>
+					</u-tr>
+				</u-table>
+			<!-- <uni-table border stripe emptyText="暂无更多数据">
 				<uni-tr>
 					<uni-th>姓名</uni-th>
 					<uni-th>性别</uni-th>
@@ -33,7 +54,7 @@
 					<uni-td>{{list.BasePackage?list.BasePackage:''}} </uni-td>
 					<uni-td>{{list.PersonalityPack?list.PersonalityPack:''}}</uni-td>
 				</uni-tr>
-			</uni-table>
+			</uni-table> -->
 			<view>
 				<p style='padding-top: 30rpx;line-height: 46rpx;'>甲乙双方本着平等、尊重和自愿的原则，签订此协议，接受以下条款的约定</p>
 				<p style='padding: 30rpx 0;line-height: 46rpx;'>甲乙双方共同确定

pages/homepage/homepage.vue

@@ -88,10 +88,7 @@
 		data() {
 			return {
 				patientName: '',
-				userinfo: {
+				userinfo: null,
-					cityCode: "",
-				},
-
 				region: '',
 				checkSign: null,
 				address: '',
@@ -103,9 +100,11 @@
 		},
 		onShow() {
 			this.address = uni.getStorageSync('location')
-			this.userinfo = uni.getStorageSync('userinfo')
 			this.openid = uni.getStorageSync('openid');
+			if (uni.getStorageSync('userinfo')) {
+				this.userinfo = uni.getStorageSync('userinfo')
 				this.cityCode = this.userinfo.cityCode;
+			}
 			if (this.address == '德州市') {
 				uni.setStorageSync("region", 1)
 			} else if (this.address == '东营市') {
@@ -114,12 +113,12 @@
 				uni.setStorageSync("region", 3)
 			}
 			this.region = uni.getStorageSync('region')
-			if (this.userinfo && this.region!="3") {
+			if (this.userinfo && this.region != "3") {
 				this.patientName = this.userinfo.patientName
 				checkSignApply(this.userinfo.cardNo).then(res => {
-					if(res.data){
+					if (res.data) {
-						this.checkSign=res.data.code
+						this.checkSign = res.data.code
-						this.info=res.data.info
+						this.info = res.data.info
 
 					}
 					// if (res.data.code == 0) {
@@ -174,14 +173,14 @@
 						this.family()
 					} else {
 						if (this.cityCode == "1" || this.cityCode == "2") {
-							if (this.checkSign=="0") {
+							if (this.checkSign == "0") {
 								this.$refs.uToast.show({
 									title: '未签约，请先签约',
 									type: 'error',
 									duration: '1000',
 									url: "/pagesC/Onlinesigning/Onlinesigning"
 								})
-							} else if(this.checkSign=="01"){
+							} else if (this.checkSign == "01") {
 								this.$refs.uToast.show({
 									title: this.info,
 									type: 'error',
@@ -189,8 +188,7 @@
 
 								})
 
-							}
+							} else {
-							else {
 								uni.navigateTo({
 									url: "/pagesB/mysigning/mysigning"
 								})
@@ -214,15 +212,14 @@
 						this.family()
 					} else {
 						if (this.cityCode == "1" || this.cityCode == "2") {
-							if (this.checkSign=="0") {
+							if (this.checkSign == "0") {
 								this.$refs.uToast.show({
 									title: this.info,
 									type: 'error',
 									duration: '1000',
 									url: "/pagesC/Onlinesigning/Onlinesigning"
 								})
-							}
+							} else if (this.checkSign == "01") {
-							else if(this.checkSign=="01"){
 								this.$refs.uToast.show({
 									title: this.info,
 									type: 'error',
@@ -230,8 +227,7 @@
 
 								})
 
-							}
+							} else if (this.checkSign == "01") {
-							else if(this.checkSign=="01"){
 								this.$refs.uToast.show({
 									title: this.info,
 									type: 'error',
@@ -239,8 +235,7 @@
 
 								})
 
-							}
+							} else {
-							else {
 								uni.navigateTo({
 									url: '/pagesB/Behaviorpoints/Behaviorpoints'
 								})
@@ -315,15 +310,14 @@
 					// 	this.family()
 					// } else {
 					// if (this.cityCode == "1" || this.cityCode == "2") {
-							if (this.checkSign=="0") {
+					if (this.checkSign == "0") {
 						this.$refs.uToast.show({
 							title: '未签约，请先签约',
 							type: 'error',
 							duration: '1000',
 							url: "/pagesC/Onlinesigning/Onlinesigning"
 						})
-							}
+					} else if (this.checkSign == "01") {
-							else if(this.checkSign=="01"){
 						this.$refs.uToast.show({
 							title: this.info,
 							type: 'error',
@@ -331,8 +325,7 @@
 
 						})
 
-							}
+					} else {
-							else {
 						uni.navigateTo({
 							url: "/pagesC/ServiceAppointment/ServiceAppointment"
 						})
@@ -362,15 +355,14 @@
 						this.family()
 					} else {
 						if (this.cityCode == "1" || this.cityCode == "2") {
-							if (this.checkSign=="0") {
+							if (this.checkSign == "0") {
 								this.$refs.uToast.show({
 									title: '未签约，请先签约',
 									type: 'error',
 									duration: '1000',
 									url: "/pagesC/Onlinesigning/Onlinesigning"
 								})
-							}
+							} else if (this.checkSign == "01") {
-							else if(this.checkSign=="01"){
 								this.$refs.uToast.show({
 									title: this.info,
 									type: 'error',
@@ -378,7 +370,7 @@
 
 								})
 
-							}else{
+							} else {
 								uni.navigateTo({
 									url: "/pagesC/servicerecord/servicerecord"
 								})
@@ -404,15 +396,14 @@
 						this.family()
 					} else {
 						if (this.cityCode == "1" || this.cityCode == "2") {
-							if (this.checkSign=="0") {
+							if (this.checkSign == "0") {
 								this.$refs.uToast.show({
 									title: '未签约，请先签约',
 									type: 'error',
 									duration: '1000',
 									url: "/pagesC/Onlinesigning/Onlinesigning"
 								})
-							}
+							} else if (this.checkSign == "01") {
-							else if(this.checkSign=="01"){
 								this.$refs.uToast.show({
 									title: this.info,
 									type: 'error',
@@ -420,8 +411,7 @@
 
 								})
 
-							}
+							} else {
-							else {
 								uni.navigateTo({
 									url: "/pagesC/Myappointment/Myappointment"
 								})

pages/login/login.vue

@@ -111,34 +111,28 @@
 							type: 'error',
 							duration: '1500',
 						})
-						setTimeout(() => {
-							uni.redirectTo({
-								url: '/pages/register/register',
-							})
-						})
-					} else if (resp.data.code == '1') {
-						getCurrentUser(resp.data.openid, resp.data.cityCode).then(res => {
-							if (res.code == 200) {
-								that.$refs.uToast.show({
-									title: '登录成功',
-									type: 'success',
-									duration: '1500'
-								})
-								uni.setStorageSync('patientId', res.data.id);
-								uni.setStorageSync('userinfo', res.data);
 						if (that.timer) {
 							clearTimeout(that.timer)
 						}
-								that.timer = setTimeout(e => {
+						that.timer = setTimeout(() => {
-									uni.navigateBack({
+							uni.redirectTo({
-										delta: 1
+								url: '/pages/register/register',
+							})
+						}, 1500)
+					} else if (resp.data.code == '1') {
+						getCurrentUser(resp.data.openid, resp.data.cityCode).then(res => {
+							if (res.code == 200) {
+								uni.setStorageSync('patientId', res.data.id);
+								uni.setStorageSync('userinfo', res.data);
+								that.$refs.uToast.show({
+									title: '登录成功',
+									type: 'success',
+									back: 1
 								})
-								}, 500)
 							} else {
 								that.$refs.uToast.show({
 									title: '登录失败',
 									type: 'error',
-									duration: '1500'
 								})
 							}
 						})

pages/myinformation/myinformation.vue

@@ -10,14 +10,11 @@
 			</image>
 			<image :src="baseurl+appPersonallist.headPictureUrl" mode="" class="headsculpture" @tap='updatainfo' v-else>
 			</image>
-			<view class="namesigning">
+			<view class="namesigning" @tap='updatainfo'>
-				<span class="name" v-if="appPersonallist.patientName">
+				<span class="name">
-					{{appPersonallist.patientName}}
+					{{appPersonallist.patientName?appPersonallist.patientName:'点击登录'}}
 				</span>
-				<span class="name" v-else>
+				<span class="" v-show="appPersonallist.patientName">
-					请先登录!
-				</span>
-				<span class="" v-if="appPersonallist.patientName">
 					<span class="signing" v-if="appPersonallist.signNo">
 						已签约
 					</span>
@@ -56,7 +53,8 @@
 					</view>
 				</view>
 				<view class="item" @tap='gocoupon'>
-					<view class="number" v-if="appPersonallist.patientCouponCount==0 ||appPersonallist.patientCouponCount==undefined">
+					<view class="number"
+						v-if="appPersonallist.patientCouponCount==0 ||appPersonallist.patientCouponCount==undefined">
 						0
 					</view>
 					<view class="number" v-else>
@@ -240,22 +238,15 @@
 				showhome: false, //切换
 				familyList: null, //切换列表
 				userinfo: {}, //用户信息
-				valueopenid: '',
 				cityCode: '',
 			};
 		},
 		onShow() {
 			// this.bjimg = baseurl + '/profile/appletPicture/inviteFriendsOne.png'
-			let that = this
 			this.userinfo = uni.getStorageSync('userinfo')
 			this.baseurl = baseurl
-			this.valueopenid = uni.getStorageSync('openid');
 			this.cityCode = uni.getStorageSync('region');
-			if (that.userinfo) {
+			this.myInfo()
-				that.myInfo()
-			} else {
-				that.appPersonallist = null
-			}
 			this.getpersnoal()
 		},
 		methods: {
@@ -281,9 +272,6 @@
 									type: 'success',
 									duration: '1000'
 								})
-								createMobileToken().then(res => {
-									uni.setStorageSync("token", res.data.token)
-								})
 								if (that.timer) {
 									clearTimeout(that.timer)
 								}
@@ -305,21 +293,28 @@
 			},
 			// 获取成员
 			getpersnoal() {
-				getCurrentUser(this.valueopenid).then(res => {
+				const value = uni.getStorageSync('openid');
+				if (value) {
+					getCurrentUser(value).then(res => {
 						this.familyList = res.data
 					})
+				}
 			},
 			// 切换成员
 			changeFamilyInfo(e) {
-				switchResident(this.valueopenid, e.patientCode).then(res => {
+				const value = uni.getStorageSync('openid');
+				if (value) {
+					switchResident(value, e.patientCode).then(res => {
+						uni.setStorageSync('userinfo', res.data);
+						uni.setStorageSync('patientId', res.data.id);
+						this.userinfo = res.data
 						if (res.code == 200) {
 							this.$refs.uToast.show({
 								title: '切换成功',
 								type: 'success',
 								duration: '1000',
 							})
-						uni.setStorageSync('userinfo', res.data);
+
-						uni.setStorageSync('patientId', res.data.id);
 							this.myInfo()
 						} else {
 							this.$refs.uToast.show({
@@ -330,6 +325,7 @@
 						}
 					})
 					this.showhome = false
+				}
 			},
 			removes() {
 				this.appPersonallist = null
@@ -337,7 +333,6 @@
 				uni.removeStorageSync('openid');
 				uni.removeStorageSync('phone');
 				uni.removeStorageSync('userinfo');
-				uni.removeStorageSync('token');
 			},
 			//获取个人信息
 			myInfo() {
@@ -358,7 +353,7 @@
 										.homeLatitude)
 									that.appPersonallist.homeLongitude = Number(that.appPersonallist
 										.homeLongitude)
-								} else if (Response.code == 9999) {} else {
+								} else {
 									that.removes();
 								}
 							})
@@ -371,7 +366,7 @@
 				}
 			},
 			updatainfo() {
-				const value = uni.getStorageSync('openid');
+				const value = uni.getStorageSync('userinfo');
 				const value2 = uni.getStorageSync('patientId');
 				if (value && value2) {
 					uni.navigateTo({
@@ -383,7 +378,7 @@
 			},
 			//护理站服务订单
 			gonursestation() {
-				const value = uni.getStorageSync('openid');
+				const value = uni.getStorageSync('userinfo');
 				const value2 = uni.getStorageSync('patientId');
 				if (value && value2) {
 					uni.navigateTo({
@@ -417,7 +412,7 @@
 			},
 			//优惠券
 			gocoupon() {
-				const value = uni.getStorageSync('openid');
+				const value = uni.getStorageSync('userinfo');
 				const value2 = uni.getStorageSync('patientId');
 				if (value && value2) {
 					uni.navigateTo({
@@ -435,7 +430,7 @@
 			},
 			//全部订单
 			goorder(index, item) {
-				const value = uni.getStorageSync('openid');
+				const value = uni.getStorageSync('userinfo');
 				const value2 = uni.getStorageSync('patientId');
 				if (value && value2) {
 					uni.navigateTo({
@@ -455,7 +450,7 @@
 			},
 			//护理站服务订单
 			gonursestation() {
-				const value = uni.getStorageSync('openid');
+				const value = uni.getStorageSync('userinfo');
 				const value2 = uni.getStorageSync('patientId');
 				if (value && value2) {
 					uni.navigateTo({
@@ -473,15 +468,12 @@
 			},
 			// 切换家庭成员
 			homeshow() {
-				// this.getSetting()
+
-				// this.listquery.bindingCity = uni.getStorageSync('userinfo').bindingCity
-				var patientCode = this.userinfo.patientCode
-				var openid = uni.getStorageSync('openid')
-				// getFamilyList(openid, patientCode).then(res => {
-				// 	this.familyList = res.data
-				// 	console.log(this.familyList, '000')
-				// })
 				this.showhome = true
+				this.getpersnoal()
+				// this.myInfo()
+
+
 			},
 			//管理家庭成员
 			gomanagefamily() {
@@ -520,7 +512,7 @@
 			//积分页面
 			...mapActions(["integralopenPopup"]),
 			gointegral() {
-				const value = uni.getStorageSync('openid');
+				const value = uni.getStorageSync('userinfo');
 				const value2 = uni.getStorageSync('patientId');
 				if (value && value2) {
 					this.integralopenPopup();

pages/register/register.vue

@@ -248,7 +248,7 @@
 				}, {
 					value: '3',
 					label: '高血脂'
-				},],
+				}, ],
 				arealist: [], //区街道list
 				list: [{
 					id: "",
@@ -362,10 +362,7 @@
 				console.log(e, '打印e')
 			},
 			submit() {
-
 				var that = this
-				// console.log(that.query)
-				// console.log(that.query.diseaseList.length,'000')
 				that.query.openid = uni.getStorageSync('openid');
 				that.query.cityCode = uni.getStorageSync('region');
 				if (that.query.sexname == '男') {
@@ -373,37 +370,33 @@
 				} else if (that.query.sexname == '女') {
 					that.query.sex = 'FEMALE';
 				}
-				that.$refs.uForm.validate(valid => {
-					if (valid) {
-
 				if (that.selected == 1) {
 					that.$refs.uToast.show({
 						title: '请审核并同意用户协议',
 						type: 'error'
 					})
+					return
 				} else if (that.query.sex == "") {
 					that.$refs.uToast.show({
 						title: '请选择性别',
 						type: 'error'
 					})
+					return
 				} else if (!that.query.locationName) {
 					that.$refs.uToast.show({
 						title: '请选择所在位置',
 						type: 'error'
 					})
+					return
 				} else if (!that.query.birthDate) {
 					that.$refs.uToast.show({
 						title: '请选择出生日期',
 						type: 'error'
 					})
+					return
 				}
-						 // else if (that.query.diseaseList.length == 0) {
+				that.$refs.uForm.validate(valid => {
-							// that.$refs.uToast.show({
+					if (valid) {
-							// 	title: '请选择基础疾病',
-							// 	type: 'error'
-							// })
-						// }
-						 else {
 						registerdata(that.query).then(res => {
 							if (res.code == 200) {
 								getCurrentUser(that.query.openid, that.query.cityCode).then(res => {
@@ -425,7 +418,6 @@
 							}
 						})
 					}
-					} else {}
 				});
 			},
 			//切换
@@ -574,7 +566,8 @@
 		justify-content: center;
 		align-items: center;
 		background: #fff;
-		::v-deep .select-modal .select-dialog{
+
+		::v-deep .select-modal .select-dialog {
 			height: 370rpx !important;
 
 		}

pagesB/AddMembers/AddMembers.vue

@@ -98,6 +98,13 @@
 							<u-input v-model="form.address" placeholder="请输入居住地址" />
 						</view>
 					</u-form-item>
+					<view class="name">
+						所在位置
+						<view class="selectdata" @tap='getAddress'>
+							<text v-if="form.locationName ==''">请选择所在位置</text>
+							<text class="testitem">{{form.locationName}}</text>
+						</view>
+					</view>
 					<u-form-item prop="phone" :border-bottom="false">
 						<view class="name">
 							手机号
@@ -115,7 +122,8 @@
 			<!-- 民族 -->
 			<u-select v-model="showNation" :list="actions" @confirm="nationSelect"></u-select>
 			<!-- 与户主关系 -->
-			<u-select v-model="showRelationshipWithHouseholder" :list="relationship" @confirm="relationshipSelect"></u-select>
+			<u-select v-model="showRelationshipWithHouseholder" :list="relationship"
+				@confirm="relationshipSelect"></u-select>
 
 			<!-- 出生日期 -->
 			<u-picker mode="time" v-model="timeshow" :params="params" @confirm='timechange' @canel='timeshow=false'>
@@ -176,13 +184,15 @@
 					address: '',
 					phone: '',
 					birthDate: '',
-
 					householdRelationship: '',
+					locationName: '',
+					homeLongitude: '',
+					homeLatitude: '',
 				},
-				householdRelationship:'',
+				householdRelationship: '',
-				userinfo:{},
+				userinfo: {},
 
-				nation:'',
+				nation: '',
 				actions: [{
 						value: '1',
 						label: '汉族'
@@ -358,6 +368,20 @@
 			})
 		},
 		methods: {
+			//获取所在位置
+			getAddress() {
+				var that = this;
+				uni.chooseLocation({
+					success: function(location) {
+						that.form.locationName = location.address
+						that.form.homeLongitude = location.longitude;
+						that.form.homeLatitude = location.latitude;
+					},
+					fail(err) {
+						console.log(err)
+					}
+				});
+			},
 			//选择出生日期
 			timechange(e) {
 				this.form.birthDate = e.year + '-' + e.month + '-' + e.day
@@ -367,7 +391,7 @@
 				const _this = this
 				_this.userinfo = uni.getStorageSync('userinfo');
 				_this.form.openid = uni.getStorageSync('openid');
-				_this.form.cityCode= uni.getStorageSync('region');
+				_this.form.cityCode = uni.getStorageSync('region');
 				console.log(_this.form, '000')
 				if (_this.form.sexname == '男') {
 					_this.form.sex = 'MALE';
@@ -389,7 +413,7 @@
 									title: res.data.msg,
 									type: 'error'
 								})
-							}else{
+							} else {
 								_this.$refs.uToast.show({
 									title: '添加成功',
 									type: 'success'
@@ -472,7 +496,8 @@
 				}
 
 			}
-			.u-form-item{
+
+			.u-form-item {
 				padding: 0 0 !important;
 			}
 
@@ -624,6 +649,51 @@
 
 				}
 
+				// .selectdata{
+
+				// }
+				.selectdata {
+					width: 636rpx;
+					height: 63rpx;
+					background: #F6F6F6;
+					margin: 12rpx auto;
+					border-radius: 5rpx;
+					display: flex;
+					position: relative;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+
+
+					.testitem {
+						font-size: 26rpx;
+						font-family: Source Han Sans CN;
+						font-weight: 400;
+						color: #000000;
+
+
+					}
+
+					text {
+						padding-left: 20rpx;
+						line-height: 63rpx;
+						font-size: 20rpx;
+						font-family: Source Han Sans CN;
+						font-weight: 400;
+						color: #8E8E8E;
+					}
+
+					image {
+						width: 9rpx;
+						height: 17rpx;
+						position: absolute;
+						right: 40rpx;
+						top: 50%;
+						-webkit-transform: translateY(-50%);
+						transform: translateY(-50%);
+					}
+				}
+
 				.select {
 					width: 636rpx;
 					height: 63rpx;
@@ -632,6 +702,7 @@
 					border-radius: 5rpx;
 					display: flex;
 					position: relative;
+
 					.testitem {
 						font-size: 26rpx;
 						font-family: Source Han Sans CN;

pagesB/Applforrefund/Applforrefund.vue

@@ -11,11 +11,11 @@
 			</view>
 			<view class="priceinfo">
 				<span v-if="order.orderType=='DIRECT_BUY'||order.orderType =='HEALTH_CONSULTATION'">退款金额</span>
-				<span v-if="order.orderType=='INTEGRAL_EXCHANGE'">退款积分</span>
+				<span v-if="order.orderType=='INTEGRAL_EXCHANGE'">退款健康豆</span>
 				<view class="priceback" v-if="order.orderType=='DIRECT_BUY'||order.orderType =='HEALTH_CONSULTATION'">
 					￥{{order.totalPrice}}
 				</view>
-				<view class="priceback" v-if="order.orderType=='INTEGRAL_EXCHANGE'">{{order.integralExchangeSill}}积分
+				<view class="priceback" v-if="order.orderType=='INTEGRAL_EXCHANGE'">{{order.integralExchangeSill}}健康豆
 				</view>
 				<!-- <view class="words">
 					已修改，最多{{order.totalPrice}}，含发货邮费 0.00

pagesB/CommodityDetails/CommodityDetails.vue

@@ -461,11 +461,6 @@
 																	.paySign,
 																success: function(
 																	res) {
-																	that.couponId =
-																		null
-																	that.Paidinprice =
-																		null
-																	that.coupon = null
 																	that.goodsDetailsinfo(
 																		that
 																		.goodsInfoId,
@@ -782,6 +777,10 @@
 			this.baseurl = baseurl;
 			this.usershow = false;
 			this.loginFlag = false
+			this.couponId = null
+			this.Paidinprice = null
+			this.coupon = null
+			this.$forceUpdate()
 			const value = uni.getStorageSync('patientId');
 			if (value) {
 				AppIdentification(value).then(res => {

pagesB/CommodityOrder/CommodityOrder.scss

@@ -172,11 +172,10 @@
 					color: #ffffff;
 					width: 170rpx;
 					height: 60rpx;
-					background: #FFFFFF;
+					background: #E1AE3C;					
 					// border: 1px solid #959595;
 					border-radius: 5rpx;
 					font-weight: 400;
-					color: #000000;
 					line-height: 60rpx;
 				}
 

pagesB/CommodityOrder/CommodityOrder.vue

@@ -61,7 +61,7 @@
 									v-if="item.orderType=='INTEGRAL_EXCHANGE'">{{item.integralExchangeSill}}</text>
 								<text class="price" v-if="item.orderType=='INTEGRAL_EXCHANGE'"
 									style='padding-left: 10rpx;'>
-									积分
+									健康豆
 								</text>
 							</view>
 						</view>

pagesB/ExpertlookOrder/ExpertlookOrder.vue

@@ -61,7 +61,7 @@
 									v-if="item.orderType=='INTEGRAL_EXCHANGE'">{{item.integralExchangeSill}}</text>
 								<text class="price" v-if="item.orderType=='INTEGRAL_EXCHANGE'"
 									style='padding-left: 10rpx;'>
-									积分
+									健康豆
 								</text>
 							</view>
 						</view>

pagesB/Serviceevaluation/Serviceevaluation.vue

@@ -96,6 +96,7 @@
 	export default {
 		data() {
 			return {
+				baseurl:'',
 				evaluateshow: false, //家医评价
 				evaluatenurse: false, //护理站评价
 				parentId: '',

pagesB/consultationplatform/consultationplatform.vue

@@ -77,20 +77,12 @@
 		methods: {
 			info() {
 				this.region = uni.getStorageSync('region')
-				console.log(this.region, '859')
 				if (this.region == 3) {
 					this.$refs.uToast.show({
 						title: '当前地区不支持，请重新选择区域',
 						type: 'error',
 						duration: '2000',
-						// url:'/pages/homepage/homepage'
 					})
-					uni.navigateTo({
-						'/pages/homepage/homepage'
-					})
-					// uni.navigateBack({
-					// 	delta: 1
-					// })
 				}
 			},
 			//人员

pagesB/healthybeans/healthybeans.vue

@@ -290,6 +290,18 @@
 								that.updata.phone = res.data[0].receivePhone
 								that.userid = res.data[0].id
 							}
+							let useritem = null
+							uni.$on('updata', function(data) {
+								if (data.useritem) {
+									useritem = JSON.parse(data.useritem)
+									that.updata.receiver = useritem.receiveName
+									that.updata.phone = useritem.receivePhone
+									that.updata.receiveAddress = useritem.areaName + useritem
+										.receiveAddress
+									that.userid = useritem.id
+								}
+								uni.$off('updata')
+							})
 						}
 					}
 				})
@@ -300,17 +312,6 @@
 					duration: '2000',
 				})
 			}
-			let useritem = null
-			uni.$on('updata', function(data) {
-				if (data.useritem) {
-					useritem = JSON.parse(data.useritem)
-					that.updata.receiver = useritem.receiveName
-					that.updata.phone = useritem.receivePhone
-					that.updata.receiveAddress = useritem.areaName + useritem.receiveAddress
-					that.userid = useritem.id
-				}
-				uni.$off('updata')
-			})
 		},
 		methods: {
 			yaoqingshowtrue() {

pagesB/myevaluation/myevaluation.vue

@@ -55,6 +55,7 @@
 			}
 		},
 		onShow() {
+			this.baseurl = baseurl;
 			this.userinfo = uni.getStorageSync('userinfo');
 			this.cardNo = this.userinfo.cardNo;
 			this.parentId = this.userinfo.id;

pagesB/orderDetails/orderDetails.vue

@@ -68,7 +68,7 @@
 					<text class="price"
 						v-if="order.orderType=='DIRECT_BUY'||order.orderType =='HEALTH_CONSULTATION'">￥{{order.totalPrice}}</text>
 					<text class="price"
-						v-if="order.orderType=='INTEGRAL_EXCHANGE'">{{order.integralExchangeSill}}积分</text>
+						v-if="order.orderType=='INTEGRAL_EXCHANGE'">{{order.integralExchangeSill}}健康豆</text>
 				</view>
 			</view>
 		</view>

pagesB/performancedetails/performancedetails.vue

@@ -24,6 +24,7 @@
 		data() {
 			return {
 				itemlist: [],
+				userinfo:{},
 			};
 		},
 		watch: {},
@@ -33,7 +34,10 @@
 			},
 			info() {
 				// getPerformance(uni.getStorageSync('userinfo').cardNo, '1').then(res => {
-				getPerformance('372424194703207523', '1').then(res => {
+				this.cityCode = uni.getStorageSync('region');
+				this.userinfo = uni.getStorageSync('userinfo')
+				var identity=this.userinfo.cardNo
+				getPerformance(identity).then(res => {
 					res.data.forEach(e => {
 						e.check = false
 					})

pagesB/refundType/refundType.vue

@@ -23,7 +23,7 @@
 						<text class="price"
 							v-if="order.orderType=='DIRECT_BUY'||order.orderType =='HEALTH_CONSULTATION'">￥{{order.totalPrice}}</text>
 						<text class="price"
-							v-if="order.orderType=='INTEGRAL_EXCHANGE'">{{order.integralExchangeSill}}积分</text>
+							v-if="order.orderType=='INTEGRAL_EXCHANGE'">{{order.integralExchangeSill}}健康豆</text>
 					</view>
 				</view>
 			</view>

pagesC/Myappointment/Myappointment.vue

@@ -2,7 +2,7 @@
 	<view class="app">
 		<u-tabs :list="tabslist" :is-scroll="false" :current="tabscurrent" @change="tabschange" :show-bar='false'
 			active-color='#26A888'></u-tabs>
-		<u-empty v-if="appointmentlist==0" text="暂无" ></u-empty>
+		<u-empty v-if="appointmentlist==0" text="暂无"></u-empty>
 		<view class="record" v-for="(item,index) in appointmentlist" :key="index" v-else>
 			<view class="top">
 				<span>{{item.formName}}</span>
@@ -68,14 +68,12 @@
 					completed: '',
 				},
 				appointmentlist: [],
-
 			}
 		},
 		onShow() {
-			const value=uni.getStorageSync('userinfo');
+			const value = uni.getStorageSync('userinfo');
-			this.query.identity=value.cardNo
+			this.query.identity = value.cardNo
 			this.info();
-			console.log(this.appointmentlist,'555')
 		},
 		methods: {
 			info() {
@@ -84,15 +82,14 @@
 				})
 			},
 			evaluatetime(item) {
-				console.log(item, 11)
 				cancel(item.bookingNo).then(res => {
-					console.log(res, '56')
 					if (res.code == 200) {
 						this.$refs.uToast.show({
 							title: '取消预约成功',
 							type: 'success',
 							duration: '1500'
 						})
+						this.info();
 					} else if (res.code == 500) {
 						this.$refs.uToast.show({
 							title: res.msg,
@@ -105,7 +102,6 @@
 			//点击tabs
 			tabschange(index) {
 				this.tabscurrent = index
-				console.log(index, '5')
 				if (index == '1') {
 					this.query.completed = '1'
 					this.info();
@@ -117,7 +113,6 @@
 					this.info();
 				}
 			},
-
 		}
 	}
 </script>