From a8d02fe0e7f37cbe62450940d2a43b682f79d737 Mon Sep 17 00:00:00 2001
From: wwl <web_2021@163.com>
Date: Wed, 20 Dec 2023 18:12:31 +0800
Subject: [PATCH] update

---
 src/pages/form/index.vue           | 26 +++++++++++++++++++++++---
 src/pages/index/personal/index.vue |  4 ++--
 src/pages/other/edit-userinfo.vue  |  2 +-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/pages/form/index.vue b/src/pages/form/index.vue
index 515da98..56808e7 100755
--- a/src/pages/form/index.vue
+++ b/src/pages/form/index.vue
@@ -1,5 +1,13 @@
 <template>
 	<view>
+		<u-notify
+			:ref="el => uNotify = el"
+			message="支付成功！"
+			type="success"
+			bgColor="#EF8CA6"
+      :show="true"
+			safeAreaInsetTop
+		/>
 		<view
 			class="px-24rpx pt-20rpx pb-30rpx bg-[f2f2f2] min-h-[calc(100vh-230rpx)]"
 		>
@@ -462,6 +470,7 @@ const formItems = [
 	// 	show: true
 	// }
 ]
+const uNotify = ref(null)
 const formRef = ref(null)
 const dateAndSelectFormList = ref()
 const formList = ref()
@@ -558,10 +567,11 @@ const orderPay = async () => {
 			paySign: sign,
 			success: function (res) {
 				// 在这里处理支付成功的回调
-				console.log(res)
+				// console.log(res)
 				$toast('支付成功!', {
 					icon: 'success',
-					duration: 2 * 1000
+          mask: true,
+					duration: 3 * 1000
 				})
 				getOrderInfo()
 			},
@@ -571,7 +581,7 @@ const orderPay = async () => {
 				getOrderInfo()
 				if (err.errMsg === 'requestPayment:fail cancel') {
 					$toast('支付取消！', {
-						type: 'error',
+						icon: 'error',
 						duration: 2 * 1000
 					})
 				}
@@ -581,6 +591,16 @@ const orderPay = async () => {
 }
 
 const onSubmit = () => {
+	// uNotify.value?.show({
+	// 	top: 10,
+	// 	type: 'success',
+	// 	color: '#fff',
+	// 	bgColor: '#FF8CA6',
+	// 	message: '支付成功! 等待系统分配陪诊师中...',
+	// 	duration: 1000 * 3,
+	// 	fontSize: 20,
+	// 	safeAreaInsetTop: true
+	// })
 	formRef.value.validate().then(async () => {
 		if ([4, 5].includes(curType.value)) {
 			if (fileList.value.length)
diff --git a/src/pages/index/personal/index.vue b/src/pages/index/personal/index.vue
index 0b816e2..8eedafe 100755
--- a/src/pages/index/personal/index.vue
+++ b/src/pages/index/personal/index.vue
@@ -24,7 +24,7 @@
 				<view v-else claas="text-34rpx text-primary">登录</view>
 			</view>
 		</view>
-		<view class="flex items-center pl-16rpx my-40rpx">
+		<view class="flex items-center pl-16rpx my-40rpx" v-if="userInfo.roleName ==='common'">
 			<view class="flex flex-1 flex-col">
 				<text class="text-34rpx">{{ orderTodayIncome.count || 0 }}</text>
 				<text class="text-28rpx text-#999">累计接单</text>
@@ -44,7 +44,7 @@
 				立即提现
 			</view>
 		</view>
-		<view class="relative">
+		<view class="relative mt-40rpx">
 			<view
 				v-for="(item, index) of menuList"
 				:key="index"
diff --git a/src/pages/other/edit-userinfo.vue b/src/pages/other/edit-userinfo.vue
index 1c8874a..21cfebc 100755
--- a/src/pages/other/edit-userinfo.vue
+++ b/src/pages/other/edit-userinfo.vue
@@ -79,7 +79,7 @@ const instance = getCurrentInstance()
 const { $api, $store, $Router, $u,$toast } = instance.proxy
 const show = ref(false)
 const columns = ref([['男', '女']])
-const userInfo = ref($store.user.userInfo)
+const userInfo = ref(...$store.user.userInfo)
 const isEdit = ref($Router.query?.edit || false)
 
 const hadleConfirm = ({ indexs: [index] }) => {