From f71924219f9d2e83ebb003d08c276e3a0f4793d5 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Thu, 27 Jun 2024 11:23:39 +0800
Subject: [PATCH] add

---
 pageQuota/vipUser/index.vue  |  5 +++-
 pagesOrder/order/order.vue   | 44 +++++++++++++++++++++++++++++++++++-
 pagesOrder/settle/settle.vue |  5 ----
 3 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/pageQuota/vipUser/index.vue b/pageQuota/vipUser/index.vue
index 6f54c33..2b845db 100644
--- a/pageQuota/vipUser/index.vue
+++ b/pageQuota/vipUser/index.vue
@@ -82,6 +82,9 @@
 				<view class="store-info">
 					报备人:{{ STORE_INFO.name }}
 				</view>
+				<view class="store-info" style="font-size: 40rpx;" v-if="Role==1">
+					¥500.00
+				</view>
 			</view>
 			<view class="submit-btn" @click="submit">
 				<view
@@ -325,7 +328,7 @@
 		// code: ''
 	})
 	const resetFormData = () => {
-		for (ket key in formData) {
+		for (let key in formData) {
 			formData[key] = ''
 		}
 		tabsList.forEach(item => {
diff --git a/pagesOrder/order/order.vue b/pagesOrder/order/order.vue
index c4958dc..78f78fe 100644
--- a/pagesOrder/order/order.vue
+++ b/pagesOrder/order/order.vue
@@ -113,6 +113,8 @@
 			</view>
 		</view>
 	</view>
+	<ZyPasswordboard v-if='passwordBoardVisible' v-model:visible="passwordBoardVisible" v-bind="passwordBoardProps"
+		@close='closeKeyBord' />
 </template>
 
 <script setup>
@@ -127,6 +129,7 @@
 	import good from "./component/good.vue";
 	import orderCanclePopup from "@/components/orderCanclePopup.vue"
 	import modal from "@/components/modal.vue"
+	import ZyPasswordboard from '@/uni_modules/zy-passwordboard/components/zy-passwordboard/zy-passwordboard.vue';
 	import {
 		cancelOrderApi,
 		rePaymentApi,
@@ -134,6 +137,11 @@
 		orderListApi,
 		purchaseAgainApi
 	} from "@/api/order.js"
+	import {
+		userInfoApi
+	} from "@/api/user.js"
+
+
 
 	const tabsActive = ref(0)
 	const changeTab = ({
@@ -284,7 +292,36 @@
 		}
 	}
 
-	const rePay = (e) => {
+	const pay_type = ref('3')
+
+	const rePay = async (e) => {
+		if (!pay_type.value) return uni.$u.toast('请选择支付方式');
+		if (pay_type.value == 3 || pay_type.value == 18) {
+			let res = await userInfoApi()
+			return res.data.pay_password ? passwordBoardVisible.value = true : showModal.value = true
+		}
+
+	}
+
+
+	// 支付密码
+	const password = ref(''); // 支付密码
+	const passwordBoardVisible = ref(false);
+	const passwordBoardProps = {
+		title: '输入支付密码',
+		onComplete(value) {
+			password.value = value
+			passwordBoardVisible.value = false
+			console.log(password.value)
+			// payFn()
+		}
+	};
+	const closeKeyBord = () => {
+		password.value = ''
+	}
+
+
+	const payFn = () => {
 		rePaymentApi({
 			order_id: e.id,
 			address_id: e.address_id,
@@ -317,6 +354,11 @@
 		})
 	}
 
+	const notWxPay = () => {
+		alert("不是微信支付")
+	}
+
+
 	// 订单
 	const where = ref([{
 			page_no: 1,
diff --git a/pagesOrder/settle/settle.vue b/pagesOrder/settle/settle.vue
index d62dc78..d96adc4 100644
--- a/pagesOrder/settle/settle.vue
+++ b/pagesOrder/settle/settle.vue
@@ -379,11 +379,6 @@
 	const passwordBoardProps = {
 		title: '输入支付密码',
 		onComplete(value) {
-			// uni.vibrateShort({
-			// 	success: function() {
-			// 		console.log('success');
-			// 	}
-			// });
 			password.value = value
 			passwordBoardVisible.value = false
 			payFn()