提交

pages/oldmanindex/account.vue

@@ -164,16 +164,19 @@
 
 			console.log("data", data)
 
-			if (data.nuFailType == "ORG_PAYMENT_DISABLED") {
+			if (data.nuFailType ) {
 				uni.showToast({
-					title: '机构已经关闭微信支付功能',
-					icon: 'none'
+					title: data.msg,
+					icon: 'none',
+					duration:4000
 				});
 				setTimeout(() => {
-					uni.reLaunch({
-						url: '/pages/oldmanindex/index'
-					})
-				}, 1000)
+					// uni.reLaunch({
+					// 	url: '/pages/oldmanindex/index'
+					// })
+					uni.navigateBack({delta:2})
+				}, 4000)
+				return
 			} else if (data.nuFailType == "NU_HAS_BEEN_BOUND") {
 				uni.showToast({
 					title: '护理单元已被其他用户绑定',
@@ -200,6 +203,7 @@
 			if (data.appId || data.timeStamp || data.package || data.paySign) {
 				await callWeixinPay(data);
 			} else {
+				console.log(data)
 				// 如果后端使用另一种返回结构，请按实际字段判断
 				uni.showToast({
 					title: '支付信息获取失败',
@@ -208,6 +212,16 @@
 				console.error('支付返回:', data);
 			}
 		} catch (err) {
+			uni.request({
+				url: payurl.value+'/api/nuInfo/cancelBind',
+				method: 'POST',
+				header: {
+					'Content-Type': 'application/json'
+				},
+				data: {
+					nuId:item.value.nuId
+				} 
+			});
 			uni.hideLoading();
 			console.error('请求失败:', err);
 			uni.showToast({
@@ -313,6 +327,16 @@
 				});
 			} catch (e) {
 				console.error('uni.requestPayment 调用异常', e);
+				uni.request({
+					url: payurl.value+'/api/nuInfo/cancelBind',
+					method: 'POST',
+					header: {
+						'Content-Type': 'application/json'
+					},
+					data: {
+						nuId:item.value.nuId
+					} 
+				});
 				uni.showToast({
 					title: '支付调用失败',
 					icon: 'none'

pages/oldmanindex/input.vue

@@ -67,7 +67,10 @@
 	import {
 		getOrgNuId
 	} from './api.js'
-
+	 onShow(()=>{
+		uuid.value = '';
+		item.value = {};
+	})
 	const uuid = ref("");
 
 	const goBack = () => {

pages/supplierindex/index.vue

@@ -9,13 +9,15 @@
 		<view class="index-up">
 			<image class="index-up-img" src="https://www.focusnu.com/media/directive/index/indexgif.gif" mode="widthFix"
 				lazy-load="false" />
+				<!-- <div v-for="(v,i) in ['-1','1','2','3','4','5']"  @click="item.suppliersStatus=v"
+				 style=" top: -300rpx;float: left;width: 50rpx;position: relative;z-index: 888;">{{v}}</div> -->
 		</view>
 		<model :show="show" @close="show=false" :content="content" />
-		<swiper style="width: 100%;position: fixed;bottom: 0;left: 0;" :duration="150" :style="{minHeight: `100vh`}"
+		<!-- <swiper style="width: 100%;position: fixed;bottom: 0;left: 0;" :duration="150" :style="{minHeight: `100vh`}"
 			:current="which" @change="swiperchange">
 
 			<view v-for="(item,index) in menuArray" :key="index">
-				<swiper-item>
+				<swiper-item> -->
 					<view style="height: 10vh;" v-if="item.suppliersStatus !='2'&&item.suppliersStatus !='4'&&item.suppliersStatus !='5'"> </view>
 					<view class="white-content-father">
 						<view class="chuo-ball" @click="loadingData"
@@ -126,14 +128,14 @@
 										<image class="right-button-img"
 											:src="`https://www.focusnu.com/media/directive/index/addstaff/jineng.png`" />
 										<view class="">
-											敬请期待
+											供应商信息
 										</view>
 									</view>
 									<view class="right-button-one">
 										<image class="right-button-img"
 											:src="`https://www.focusnu.com/media/directive/index/addstaff/yuangong.png`" />
 										<view class="">
-											敬请期待
+											信息变更
 										</view>
 									</view>
 								</view>
@@ -167,7 +169,7 @@
 					</view>
 
 					<view class="white-content" style="margin: 0 auto;margin-top: 0rpx;height: 740rpx;"
-						v-if="item.applyStatus==`-1`">
+						v-if="item.suppliersStatus==`-1`">
 						<view style="display: flex;width: 100%;margin-top: 30rpx;align-items: center;">
 							<view class="blue-shu"></view>
 							<view class="blue-font">
@@ -190,11 +192,11 @@
 
 						</view>
 					</view> -->
-				</swiper-item>
+				<!-- </swiper-item>
 			</view>
-		</swiper>
+		</swiper> -->
 
-		<view
+		<!-- <view
 			style="z-index:9;position: fixed;bottom: 150rpx; width: 100%;display: flex;align-items: center;flex-direction: column;margin-top: -25rpx;height: 100rpx;">
 			<view class="jia-box">
 				<view v-for="(item,index) in menuArray" :key="index" @click="changecard(index)">
@@ -208,7 +210,7 @@
 			<view style="font-size: 32rpx;margin-top: 50rpx;">
 				{{menuArray[which]?.departName}}
 			</view>
-		</view>
+		</view> -->
 		<downMenu :itemTarget="0" />
 		<u-popup v-model="popupshow" mode="bottom" border-radius="40">
 			<view class="popop-father">
@@ -268,7 +270,7 @@
 		})
 	}
 
-	const buttonArray = ref(["供应商", "敬请期待", "敬请期待"])
+	const buttonArray = ref(["供应商", "物料信息", "敬请期待"])
 	const statusarray = ["loading", "success", "fail"]
 	const which = ref(0);
 
@@ -428,15 +430,17 @@
 
 	onUnmounted(() => {})
 	const menuArray = ref([])
+	const item = ref([])
 	const loadingData = () => {
 		getSuppliersOrgInfo().then(res => {
-			menuArray.value = []
-			res.result.records.forEach((element) => {
-				menuArray.value.push(element)
-			})
-			menuArray.value.push({
-				applyStatus: `-1`
-			})
+			item.value = res.result.records[0]
+			// menuArray.value = []
+			// res.result.records.forEach((element) => {
+			// 	menuArray.value.push(element)
+			// })
+			// menuArray.value.push({
+			// 	applyStatus: `-1`
+			// })
 		})
 		// getMessageList().then(res => {
 		// 	console.log("special", res)