Merge pull request 'bug_fixed_2025_05_29' (#9) from bug_fixed_2025_05_29 into master

Reviewed-on: kuaileadmin/acupuncture_register_system_uniapp#9

components/doctorImport.vue

@@ -38,7 +38,7 @@ export default {
 				wx.navigateToMiniProgram({
 					appId: data.appid,
 					path: data.path+'?did='+data.param.did,
-					envVersion: 'release', // 打开的小程序版本，有 develop（开发版），trial（体验版），release（正式版）
+					envVersion: 'trial', // 打开的小程序版本，有 develop（开发版），trial（体验版），release（正式版）
 					success(res) {
 						console.log('跳转成功')
 					},

components/visitorAccount.vue

@@ -126,7 +126,6 @@ export default {
 		::v-deep {
 			.uni-collapse-item .error{
 				margin-top: 24rpx;
-				margin-bottom: 24rpx;
 			}
 		}
 	}
@@ -194,6 +193,7 @@ export default {
 		width: 100%;
 		height: auto;
 		overflow: hidden;
+		margin-top: 24rpx;
 
 		.account-item {
 			margin-bottom: 40rpx;

main.js

@@ -212,6 +212,8 @@ function req(url, data={}, method = 'POST', header={}) {
 		}
 	}
 
+	data.did = uni.getStorageSync('doctor_id');
+
 	var getWxH5LoginConfigUri = 'common/wxh5_login'
 	var noNeedLoginFunc = [
 		getWxH5LoginConfigUri,
@@ -278,9 +280,6 @@ function req(url, data={}, method = 'POST', header={}) {
 									const currentPage = pages[pages.length - 1];
 									let pageUrl = '/'+currentPage.route;
 									if(data.xcx_scource == Vue.prototype.USER_SOURCE_WX_H5){
-										// uni.navigateTo({
-										// 	url: '/pages/index/index'
-										// });
 										this.$nav.navToPath('/pages/index/index')
 									}else{
 									}
@@ -325,7 +324,7 @@ function xcx_login(url, eqdata={}, method = 'POST') {
 		wx.login({
 		  success (res) {
 			if (res.code) {
-				var pdata = new Object();
+				var pdata = eqdata;
 				pdata.code = res.code;
 				var doctor_id = uni.getStorageSync('doctor_id');
 				pdata.state = 'user-'+doctor_id;

pages/book_detail/book_detail.vue

@@ -124,7 +124,7 @@
 							uni.showToast({
 								title:"取消预约成功",
 								mask:true,
-								image:that.cssUrl+'gou.svg',
+								image:'/static/images/gou.svg',
 								times:false,
 								duration: 1500,
 								success() {

pages/modify_visitor/modify_visitor.vue

@@ -78,10 +78,13 @@
 				var method = 'POST'
 				if(this.vid){
 					param.id = this.vid
+					param.get_idcard = 1
 					req = 'api/user/update_visitor'
 				}
 
-				this.$http.req(req, param, method, true).then(data=>{
+				this.$http.req(req, param, method).then(data=>{
+					if(data == -1) return
+
 					clearTimeout(addtimer)
 					this.adding = false
 					if(this.vid){
@@ -92,14 +95,20 @@
 				});
 			},
 			getVisitorInfo() {
-				this.visitor_info = JSON.parse(uni.getStorageSync('visitor_info_'+ this.vid))
+				var param = new Object()
-				this.name = this.visitor_info.name
+				param.vid = this.vid
-				this.idcard = this.visitor_info.idcard
+
-				this.phone = this.visitor_info.phone
+				this.$http.req('api/user/get_modify_visitor', param, 'POST').then(data=>{
-				this.nameRule = true
+					if(data == -1) return
-				this.idcardExtRule = true
+					this.name = data.name
-				this.phoneRule = true
+					this.idcard = data.idcard
-				this.checkSubmit()
+					this.phone = data.phone
+					this.nameRule = true
+					this.idcardExtRule = true
+					this.phoneRule = true
+					this.checkSubmit()
+				});
+
 			},
 			nameBlurEvent(value, res){
 				this.name = value

pages/visit_detail/visit_detail.vue

@@ -8,14 +8,14 @@
 			</list-box>
 		</view>
 
-		<view class="bot-con" v-if="hasRecord">
+		<view class="bot-con" v-if="hasRecord && visitorInfo && (visitorInfo.single_items || visitorInfo.treatment_package)">
 			<view class="title PfScMedium">治疗记录</view>
 			<view class="visitor-account">
 				<VisitorAccount :isOpen="visitorAccountOpen" :visitorInfo="visitorInfo" :open="true"/>
 			</view>
 		</view>
 
-		<view class="bot-con">
+		<view class="bot-con" v-if="notice">
 			<view class="title PfScMedium">就诊提醒</view>
 			<view class="content" v-html="notice"></view>
 		</view>
@@ -140,7 +140,7 @@
 					uni.showToast({
 						title:"修改成功",
 						mask:true,
-						image:that.cssUrl+'gou.svg',
+						image:'/static/images/gou.svg',
 						times:false,
 						duration: 1500,
 						success() {
@@ -187,7 +187,7 @@
 							uni.showToast({
 								title:"取消预约成功",
 								mask:true,
-								image:that.cssUrl+'gou.svg',
+								image:'/static/images/gou.svg',
 								times:false,
 								duration: 1500,
 								success() {

pages/visitors_new/visitors_new.vue

@@ -2,11 +2,14 @@
 	<view class='waiting-method-page'>
 		<visitor-list @clickEvent="getVisitorListData" @dataEvent="setVisitorListData" ref="visitors" :add="true"></visitor-list>
 
-		<uni-card v-if="(visitor_id==0 || (visitor_id!=0 && visitor_id==item.id)) && pageShow" v-for="(item,key) in visitor_list" :title="item.name" :extra="'身份证：'+item.idcard_txt"  :class="((visitor_list && item.h_list && item.h_list.length>0)?'':'empty')" margin="0 0 0rpx 0" shadow="none" :border="false" padding="24rpx">
+		<view class="uni-card-wrapper" v-for="(item,key) in visitor_list" @click.stop="modifyVisitor" :data-item="item">
-			<view class="visitor-account">
+			<uni-card  v-if="(visitor_id==0 || (visitor_id!=0 && visitor_id==item.id)) && pageShow"  :title="item.name" :extra="'身份证：'+item.idcard_txt"  :class="((visitor_list && item.h_list && item.h_list.length>0)?'':'empty')" margin="0 0 0rpx 0" shadow="none" :border="false" padding="24rpx">
-				<VisitorAccount @closeEvent="closeCollapse" @getinfo="get_visitor_info" :isOpen="isOpen" :title="item2.hospital+' '+item2.depart" v-for="(item2,key2) in item.h_list" :visitorInfo="visitorInfo" v-if="visitor_list && item.h_list && item.h_list.length>0" :depart_id="item2.depart_id" :visitor_id="item.id" :thumb="cssUrl+'hicon.svg'" :errmsg="(!item2.weeks ? '' : ' '+(item2.weeks<=10?item2.weeks:('超过10')))+'周未看病，请及时复诊'"/>
+				<view class="visitor-account">
-			</view>
+					<VisitorAccount @closeEvent="closeCollapse" @getinfo="get_visitor_info" :isOpen="isOpen" :title="item2.hospital+' '+item2.depart" v-for="(item2,key2) in item.h_list" :visitorInfo="visitorInfo" v-if="visitor_list && item.h_list && item.h_list.length>0" :depart_id="item2.depart_id" :visitor_id="item.id" :thumb="cssUrl+'hicon.svg'" :errmsg="(!item2.weeks ? (item2.days?(item2.days+'天未看病，请及时复诊'):'') : (' '+(item2.weeks<=10?item2.weeks:('超过10')))+'周未看病，请及时复诊')"/>
-		</uni-card>
+				</view>
+			</uni-card>
+		</view>
+
 		<view class="bt btPadding"></view>
 
 	</view>
@@ -32,10 +35,27 @@
 			visitorList,
 			visitorAccount
 		},
-		onReady() {
+		onShow() {
 			this.pageInit()
 		},
 		methods: {
+			modifyVisitor(e) {
+				var visitor = e.currentTarget.dataset.item
+
+				var is_jump = true
+				if(visitor.h_list && visitor.h_list.length > 0) {
+					is_jump = false
+					if(e.detail.y < 291){
+						is_jump = true
+					}
+				}
+				if(!is_jump) return
+				uni.setStorageSync('visitor_info_'+visitor.id, JSON.stringify(visitor))
+				this.$func.toPage("/pages/modify_visitor/modify_visitor?type="+this.type+'&vid='+visitor.id)
+			},
+			stopModifyVisitor(e) {
+				console.log(e)
+			},
 			closeCollapse() {
 				this.isOpen = false
 			},
@@ -78,6 +98,11 @@
 	.visitor-account{
 		margin-top: 28rpx;
 	}
+	.empty {
+		.visitor-account{
+			margin-top: 0rpx;
+		}
+	}
 
 	::v-deep {
 		.uni-card{

pages/waiting_method/waiting_method.vue

@@ -6,6 +6,7 @@
 
 		<user-card v-for="(item, key) in active_visitors" :dataitem="item" @clickEvent="changeType" :index="key"></user-card>
 
+		<view class="pagebt"></view>
 		<view class="submit">
 			<view class="bot primary btn btn2 submitbtn PfScMedium" hover-class="hover" @click="submitWaitType">
 				确认候诊方式
@@ -111,17 +112,21 @@
 		box-sizing: border-box;
 		width: 100%;
 		height: 116rpx;
-		margin-bottom: 20rpx;
 		background: white;
-		display: flex;
 		align-items: center;
 		font-size: 32rpx;
 		color: #000000;
+		margin-bottom: 20rpx;
 	}
 	.title-wrap{
 		width: 100%;
 		height: 100rpx;
 	}
+	.pagebt{
+		height: 20vh;
+		width: 100%;
+	}
+
 	.submit{
 		position: fixed;
 		width: 100%;