Merge branch 'bug-rework-2025-0603' of gitea.intra.yunpaper.com:kuaileadmin/acupuncture_register_system_uniapp into bug-rework-2025-0603

pages/modify_visitor/modify_visitor.vue

@@ -134,7 +134,7 @@
 				if(this.vid){
 					uni.removeStorageSync('visitor_info_'+ this.vid)
 				}
-				this.$func.toPage('/pages/visitors/visitors')
+				this.$func.toPage('/pages/visitors_new/visitors_new')
 			},
 			submit(){
 				this.checkSubmit()

pages/visit_detail/visit_detail.vue

@@ -23,8 +23,8 @@
 
 		<view class="fixedBot btPadding">
 			<view class="submit">
-				<view :class="'btn cancel'+(showCancelBook?' btn1':' btn3')" hover-class="hover" @click="reback">返回</view>
-				<view class="btn primary btn1" hover-class="hover" v-if="showCancelBook" @click="cancelBook">取消预约</view>
+				<view :class="'btn cancel'+(showCancelBook ?' btn1': '') +  (bookInfo.status == 2 ?' btn3' : '')" hover-class="hover" @click="reback">返回</view>
+				<view class="btn primary btn1" hover-class="hover" v-if="showCancelBook && bookInfo.status != 2" @click="cancelBook">取消预约</view>
 			</view>
 		</view>
 

pages/visitors/visitors.vue

@@ -210,7 +210,6 @@
 					}
 
 					this.hospital_depart_name = hospital.hospital_name + ' ' + hospital.depart_name
-
 					this.type = hospital.type
 					if(this.type == 2){
 						this.$pop.modelShow('该科室不允许签到', '/pages/index/index')