[bug]

1、修复扫码时对条码的判断，成功后跳转，失败不跳转
2、修复在暂停接单的一键释放模式中，选中后点完成删除
3、修复分页加载
4、修复查询时多tags的切换
5、统一复核时都用preNo

components/nav-bar/nav-bar.vue

@@ -115,7 +115,7 @@ const handleScanbara = ()=>{
 			console.log('条码内容：' + res.result);
 			const data = JSON.stringify({
 					userId:uni.getStorageSync('userId'),
-					coreId: res.result
+					preNo: parseInt(res.result)
 				})
 			// neo
 			// 调用接口查询这个preNo是否已经被复核，如果已经复核了就不跳
@@ -123,17 +123,22 @@ const handleScanbara = ()=>{
 				token: uni.getStorageSync('token'),
 				data: data
 			})
-			if(res1.code===200){
+			if(res1.code===500){
 				console.log('depoly success>>>')
 				// proxy.$refs.alertDialog.open()
 				console.log('res1',res1)
+				if(res1.msg=='处方已复核，无需重复操作！'){
+					uni.$showMsg(res1.msg, 2000)
+				} else {
+					uni.navigateTo({
+						url:`/pages/review/review?preNo=${res.result}&depolyStatus=2`
+					})
+				}
 			}
 			
 			
 			if(res.result) {
-				uni.navigateTo({
-					url:`/pages/review/review?preNo=${res.result}&depolyStatus=2`
-				})
+				
 			}
 		}
 	});

components/order-card/order-card.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="container" v-if="(props.workStatus=='0' && props.s=='1') || props.c=='1'" @click="handleDetail">
+  <view class="container" v-if="(props.s=='1' || props.c=='1')" @click="handleDetail">
 		<view class="t">
 			<view class="d1"></view>
 			<view class="d2">
@@ -35,7 +35,7 @@
 			<view class="je">处方金额：{{props.v.prescriptionSum}}元</view>
 		</view>
   </view>
-	<view class="container" v-else @click="handleSelect">
+	<view class="container" v-if="props.workStatus=='1' && props.s=='0' &&props.c=='0'" @click="handleSelect">
 		<view class="t">
 			<view class="d1"></view>
 			<view class="d2">
@@ -86,6 +86,11 @@
 import { onMounted, ref,computed } from 'vue'
 
 const props = defineProps({
+	s:{
+		default:'1',
+		type: String
+	},
+	
 	v: {
 		default: function() {
 			return {
@@ -96,10 +101,6 @@ const props = defineProps({
 		},
 		type: Object
 	},
-	s:{
-		default:'1',
-		type: String
-	},
 	workStatus: {
 		default:'0',
 		type: String

manifest.json

@@ -55,7 +55,45 @@
             },
             "splashscreen" : {
                 "iosStyle" : "common",
-                "androidStyle" : "default"
+                "androidStyle" : "default",
+                "android" : {
+                    "xxhdpi" : "/Users/sunwubin/Desktop/中药项目_slices/mipmap-xxxhdpi/编组 2.png",
+                    "xhdpi" : "/Users/sunwubin/Desktop/中药项目_slices/mipmap-xhdpi/编组 2.png",
+                    "hdpi" : "/Users/sunwubin/Desktop/中药项目_slices/mipmap-hdpi/编组 2.png"
+                },
+                "useOriginalMsgbox" : true
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
             }
         },
         "nativePlugins" : {

pages/index/index.vue

@@ -83,7 +83,7 @@
 						@scrolltolower="loadMoreList"
 					>
 						<template v-for="(v,i) in orderList" :key="i">
-							<orderCard v-if="v" :s="s" :v="v" :work-Status="workStatus" :index="i" :c=tabActive class="order-card"
+							<orderCard v-if="v " :s="s" :v="v" :work-Status="workStatus" :c="tabActive" 
 								@emit-select="emitSelect"
 							/>
 						</template>
@@ -148,7 +148,6 @@ const searchPreNo = ref('')
 const searchSex = ref('')
 const searchPreMzZy = ref('')
 const searchStatus = ref('')
-const searchPrescriptionStatus = ref('')
 
 const searchTags = ref([])
 const tags = ref(['全部','门诊','住院','男','女','煎煮','发药'])
@@ -162,8 +161,8 @@ const deployArr = ref([
 ])
 
 const page = ref(1)
-const total = ref(0)
 const pageSize = ref(10)
+const total = ref(0)
 const status = ref('')
 
 const s = ref('1')
@@ -195,7 +194,7 @@ onLoad(async () => {
 		token: token,
 		data:JSON.stringify({
 			currentUserId: parseInt(uni.getStorageSync('userId')) || 0,
-			page: page.value,
+			pageNum: page.value,
 			pageSize: pageSize.value,
 			status: '0'
 		})
@@ -243,14 +242,16 @@ const emitSelect = (v)=>{
 
 const handleSearch = async()=>{
 	
-	
+	console.log('handleSearch searchPreMzZy',searchPreMzZy.value)
+	console.log('handleSearch searchStatus',searchStatus.value)
+	console.log('handleSearch searchSex',searchSex.value)
 	if(tabActive.value ===0) {
 		const params = {
 			token: uni.getStorageSync('token'),
 			data: JSON.stringify({
 				currentUserId: parseInt(uni.getStorageSync('userId')) || 0,
 				name: searchVal.value.trim(),
-				page: page.value,
+				pageNum: page.value,
 				pageSize: pageSize.value,
 				status: tabList.value[tabActive.value].status,
 				
@@ -271,11 +272,11 @@ const handleSearch = async()=>{
 				endTime:  searchTime.value[1] || '',
 				name: searchName.value.trim() || '',
 				preNo: searchPreNo.value || '',
-				department: officeArr.value[officeIndex.value] || '',
+				department: searchDepartment.value || '',
 				prescriptionStatus: searchStatus.value || '',//煎煮发药
 				sex: searchSex.value || '',
 				preMzZy: searchPreMzZy.value || '',//门诊住院
-				page: page.value,
+				pageNum: page.value,
 				pageSize: pageSize.value,
 				status: tabList.value[tabActive.value].status
 			})
@@ -292,7 +293,7 @@ const handleSearch = async()=>{
 	}
 }
 
-const handleRefresh = async()=>{
+const handleRefresh = ()=>{
 	
 	console.log('yijianshifang >orderList>>', orderList.value)
 	// let ids = ''
@@ -303,6 +304,7 @@ const handleRefresh = async()=>{
 		
 	// console.log('yijianshifang >orderList>>666',ids)
 	s.value = '0'
+	console.log('handleRefresh>>ids.value ',ids.value)
 	// ccc.value = '完成'
 	// const params = {
 	// 	token: uni.getStorageSync('token'),
@@ -329,6 +331,9 @@ const handleRefresh = async()=>{
 	// }
 }
 
+
+			
+
 const handleRelease = async()=>{
 	const params = {
 		token: uni.getStorageSync('token'),
@@ -353,6 +358,8 @@ const handleRelease = async()=>{
 			ids.value = []
 		}
 	}
+	s.value = '1'
+	console.log('after handleRelease ids.value', ids.value)
 }
 
 const handleGetOffice = (e)=>{
@@ -360,6 +367,7 @@ const handleGetOffice = (e)=>{
 	console.log('officeIndex', officeIndex)
 	console.log('officeIndex', officeIndex)
 	officeIndex.value = e.detail.value
+	searchDepartment.value = officeArr.value[officeIndex.value]
 }
 
 const handleGetType = (e)=>{
@@ -380,6 +388,18 @@ const handleGetTags = (v)=>{
 		searchTags.value.push(v)
 	} else {
 		searchTags.value.splice(searchTags.value.indexOf(v), 1)
+		if(v=='门诊' || v=='住院'){
+			searchPreMzZy.value = ''
+			console.log('删除了 v searchPreMzZy.value',v,searchPreMzZy.value)
+		}
+		if(v=='男' || v=='女'){
+			searchSex.value = ''
+			console.log('删除了 v searchSex.value',v,searchSex.value)
+		}
+		if(v=='煎煮' || v=='发药'){
+			searchStatus.value = ''
+			console.log('删除了 v searchStatus.value',v,searchStatus.value)
+		}
 	}
 	switch (v) {
 		case '全部':
@@ -392,61 +412,74 @@ const handleGetTags = (v)=>{
 				searchSex.value = ''
 				searchPreMzZy.value = ''
 				searchStatus.value = ''
+				officeIndex.value = 0
 			}
 			break
 		case '门诊':
-			if(searchTags.value.includes(v) && searchTags.value.includes('住院')){
-				searchTags.value.splice(searchTags.value.indexOf('住院'), 1)
-			}
-			if(searchTags.value.includes('全部')){
-				searchTags.value.splice(searchTags.value.indexOf('全部'), 1)
+			if(searchTags.value.includes(v)){
+				if(searchTags.value.includes('住院')){
+					searchTags.value.splice(searchTags.value.indexOf('住院'), 1)
+				}
+				if(searchTags.value.includes('全部')){
+					searchTags.value.splice(searchTags.value.indexOf('全部'), 1)
+				}
+				searchPreMzZy.value = '1'
 			}
-			searchPreMzZy.value = '1'
 			break
 		case '住院':
-			if(searchTags.value.includes(v) && searchTags.value.includes('门诊')){
-				searchTags.value.splice(searchTags.value.indexOf('门诊'), 1)
-			}
-			if(searchTags.value.includes('全部')){
-				searchTags.value.splice(searchTags.value.indexOf('全部'), 1)
+			if(searchTags.value.includes(v)){
+				if(searchTags.value.includes('门诊')){
+					searchTags.value.splice(searchTags.value.indexOf('门诊'), 1)
+				}
+				if(searchTags.value.includes('全部')){
+					searchTags.value.splice(searchTags.value.indexOf('全部'), 1)
+				}
+				searchPreMzZy.value = '2'
 			}
-			searchPreMzZy.value = '2'
 			break
 		case '男':
-			if(searchTags.value.includes(v) && searchTags.value.includes('女')){
-				searchTags.value.splice(searchTags.value.indexOf('女'), 1)
-			}
-			if(searchTags.value.includes('全部')){
-				searchTags.value.splice(searchTags.value.indexOf('全部'), 1)
+			if(searchTags.value.includes(v)){
+				if(searchTags.value.includes('女')){
+					searchTags.value.splice(searchTags.value.indexOf('女'), 1)
+				}
+				if(searchTags.value.includes('全部')){
+					searchTags.value.splice(searchTags.value.indexOf('全部'), 1)
+				}
+				searchSex.value = '男'
 			}
-			searchSex.value = '男'
 			break
 		case '女':
-			if(searchTags.value.includes(v) && searchTags.value.includes('男')){
-				searchTags.value.splice(searchTags.value.indexOf('男'), 1)
-			}
-			if(searchTags.value.includes('全部')){
-				searchTags.value.splice(searchTags.value.indexOf('全部'), 1)
+			if(searchTags.value.includes(v)){
+				if(searchTags.value.includes('男')){
+					searchTags.value.splice(searchTags.value.indexOf('男'), 1)
+				}
+				if(searchTags.value.includes('全部')){
+					searchTags.value.splice(searchTags.value.indexOf('全部'), 1)
+				}
+				searchSex.value = '女'
 			}
-			searchSex.value = '女'
 			break
 		case '煎煮':
-			if(searchTags.value.includes(v) && searchTags.value.includes('发药')){
-				searchTags.value.splice(searchTags.value.indexOf('发药'), 1)
-			}
-			if(searchTags.value.includes('全部')){
-				searchTags.value.splice(searchTags.value.indexOf('全部'), 1)
+			if(searchTags.value.includes(v)){
+				if(searchTags.value.includes('发药')){
+					searchTags.value.splice(searchTags.value.indexOf('发药'), 1)
+				}
+				if(searchTags.value.includes('全部')){
+					searchTags.value.splice(searchTags.value.indexOf('全部'), 1)
+				}
 			}
 			searchStatus.value = '2'
 			break
 		case '发药':
-			if(searchTags.value.includes(v) && searchTags.value.includes('煎煮')){
-				searchTags.value.splice(searchTags.value.indexOf('煎煮'), 1)
-			}
-			if(searchTags.value.includes('全部')){
-				searchTags.value.splice(searchTags.value.indexOf('全部'), 1)
+			if(searchTags.value.includes(v)){
+				if(searchTags.value.includes('煎煮')){
+					searchTags.value.splice(searchTags.value.indexOf('煎煮'), 1)
+				}
+				if(searchTags.value.includes('全部')){
+					searchTags.value.splice(searchTags.value.indexOf('全部'), 1)
+				}
+				searchStatus.value = '3'
 			}
-			searchStatus.value = '3'
 			break
 		default:
 			searchTags.value = ['全部']
@@ -467,7 +500,7 @@ const checkIndex = async(index) => {
 		token: uni.getStorageSync('token'),
 		data:JSON.stringify({
 			currentUserId: parseInt(uni.getStorageSync('userId')),
-			page: page.value,
+			pageNum: page.value,
 			pageSize: pageSize.value,
 			status: tabList.value[tabActive.value].status
 		})
@@ -515,7 +548,7 @@ const loadMoreList =async()=>{
 		data: JSON.stringify({
 			currentUserId: parseInt(uni.getStorageSync('userId')) || 0,
 			name: searchVal.value,
-			page: page.value,
+			pageNum: page.value,
 			pageSize: pageSize.value,
 			status: tabActive.value + ''
 		})
@@ -548,7 +581,7 @@ const loadPreList = async()=>{
 		data: JSON.stringify({
 			currentUserId: parseInt(uni.getStorageSync('userId')) || 0,
 			name: searchVal.value,
-			page: page.value,
+			pageNum: page.value,
 			pageSize: pageSize.value,
 			status: tabList.value[tabActive.value].status
 		})

pages/login/login.vue

@@ -97,7 +97,7 @@ const submit = async ()=> {
 		uni.setStorageSync('token', res.token)
 		uni.setStorageSync('userId', res.userId)
 		// 开启监听 neo
-		uni.$emit('login',{userId:res.userId})
+		// uni.$emit('login',{userId:res.userId})
 		console.log('11')
 		console.log('res.token',res.token)
 		// JSON.stringify(params.data.data)

pages/review/review.vue

@@ -269,7 +269,7 @@ const editForm =ref({
 	userId:uni.getStorageSync('userId'),
 	comments:'',
 	weight:v.value.weight,
-	coreId: v.value.preNo
+	preNo: v.value.preNo
 })
 onMounted(() => {