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

---
 pageQuota/vipUser/index.vue | 33 ++++++++++++++++++--------
 pages/my/my.vue             | 46 ++++++++++++++++++++++++++-----------
 pagesOrder/order/order.vue  |  7 +++---
 3 files changed, 59 insertions(+), 27 deletions(-)

diff --git a/pageQuota/vipUser/index.vue b/pageQuota/vipUser/index.vue
index 2b845db..702ec73 100644
--- a/pageQuota/vipUser/index.vue
+++ b/pageQuota/vipUser/index.vue
@@ -51,7 +51,6 @@
 								suffixIcon='arrow-down'></up-input>
 						</view>
 					</up-form-item>
-
 					<up-form-item label="" v-if='Role == 1'>
 						<view @click="showPop1 = true" style="width: 100%;">
 							<up-input style="pointer-events: none" v-model="formData.label_name" border="none"
@@ -62,6 +61,15 @@
 								suffixIcon='arrow-down'></up-input>
 						</view>
 					</up-form-item>
+					<up-form-item label="" v-if='Role == 1'>
+						<view style="width: 100%;">
+							<up-input v-model="formData.price" border="none" prefixIcon="rmb-circle" placeholder="请输入金额"
+								:customStyle="{
+									background: '#F3F3F3', padding: '20rpx',
+									'border-radius': '30rpx'
+								}" :placeholderStyle="{ color: '#444444' }" :prefixIconStyle="{ 'margin-right': '40rpx' }"></up-input>
+						</view>
+					</up-form-item>
 					<up-form-item label="">
 						<view style="width: 100%;display: flex;align-items: center;justify-content: space-between;">
 							<view class="">
@@ -71,20 +79,20 @@
 										'border-radius': '30rpx'
 									}" :placeholderStyle="{ color: '#444444' }" :prefixIconStyle="{ 'margin-right': '40rpx' }"></up-input>
 							</view>
-
 							<text class='btn-text' style="color: grey;" v-if='cutDown'>重新获取({{ cutDown }})</text>
 							<text @click="getCode" class='btn-text' v-else> {{ flag ? '获取验证码' : '重新获取' }} </text>
-
 						</view>
 					</up-form-item>
 
+
+					<!-- <view style="font-size: 40rpx;" v-if="Role==1">
+						¥500.00
+					</view> -->
 				</up-form>
 				<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
@@ -289,7 +297,10 @@
 		cutDown.value = 60
 		let timer = setInterval(() => {
 			cutDown.value--
-			if (cutDown.value <= 0) clearInterval(timer)
+			if (cutDown.value <= 0) {
+				cutDown.value = 0;
+				clearInterval(timer);
+			}
 		}, 1000)
 	}
 	// 验证码结束
@@ -311,7 +322,8 @@
 		label_id: "",
 		user_ship: '',
 		code: '',
-		brigade: ""
+		brigade: "",
+		price: "",
 		// store_id: STORE_INFO.id,
 		// mobile: "19130550023",
 		// province: 510000,
@@ -342,6 +354,8 @@
 	const conformRole = (e) => {
 		formData.label_name = e.value[0].label_name
 		formData.label_id = e.value[0].label_id
+		console.log(e)
+
 		showPop1.value = false
 	}
 
@@ -465,7 +479,6 @@
 		if (!formData.real_name) return uni.$u.toast('请填写真实姓名');
 		if (!formData.mobile) return uni.$u.toast('请填写电话号码');
 		if (!formData.code) return uni.$u.toast('请输入短信验证码');
-		if (!formData.label_id) return uni.$u.toast('请选择用户身份');
 		if (!formData.address) return uni.$u.toast('请选择地址');
 		formData.store_id = STORE_INFO.id
 		if (Role.value == 1) {
@@ -473,6 +486,7 @@
 			// formData.user_ship = 1
 			// vipRechargeApi(formData).then(res => {})
 			// return
+			if (!formData.label_id) return uni.$u.toast('请选择用户身份');
 			uni.scanCode({
 				success: function(res) {
 					if (String(res.result.length) != 18) return uni.$u.toast('二维码未扫描完整');
@@ -574,7 +588,6 @@
 	getCount()
 	getLists()
 
-
 	const upadtaStatus = (item) => {
 		updataOrderApi({
 			order_no: item.order_id,
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 190edb4..c9f0a92 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -1,7 +1,7 @@
 <style lang="scss">
 	.rest {
 		display: flex;
-		justify-content: space-between;
+		justify-content: space-around;
 		margin: 20rpx;
 
 		.rest-item {
@@ -20,12 +20,27 @@
 			}
 		}
 	}
+
+	.balance {
+		position: absolute;
+		top: 160rpx;
+		z-index: 999;
+		left: 80rpx;
+		font-size: 50rpx;
+		display: flex;
+		align-items: center;
+		width: 620rpx;
+		justify-content: space-between;
+
+
+	}
 </style>
 <template>
 	<view>
 		<!-- <up-navbar title="我的" :autoBack="true" bgColor="transparent" :fixed="true">
 		</up-navbar> -->
 		<view class="user-info">
+
 			<image class="bg" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e3a7b202404261113002322.webp"
 				mode="widthFix"></image>
 			<view class="u-card">
@@ -42,32 +57,37 @@
 			</view>
 
 		</view>
-
-
-
+		<view class="balance" @click="navgo('/pageQuota/balanceDetail/index?type=2')">
+			<view class="" style="font-size: 28rpx;transform: translateY(10rpx);">
+				余额:
+			</view>
+			<view class="">
+				{{userInfo.now_money||"0.00"}}<text style="font-size: 28rpx;">(元)</text>
+			</view>
+		</view>
 		<view class="rest">
-			<view class="rest-item" @click="navgo('/pageQuota/balanceDetail/index?type=2')">
+			<!-- <view class="rest-item" @click="navgo('/pageQuota/balanceDetail/index?type=2')">
 				<view class="rest-item-num">{{userInfo.now_money||"0.00"}}</view>
 				<view class="rest-item-txt">余额</view>
-			</view>
+			</view> -->
 			<view class="rest-item" @click="navgo('/pageQuota/balanceDetail/index?type=1')">
 				<view class="rest-item-num">{{userInfo.purchase_funds||'0.00'}}</view>
 				<view class="rest-item-txt">采购款</view>
 			</view>
 			<view class="rest-item">
 				<view class="rest-item-num">{{userInfo.return_money||'0.00'}}</view>
-				<!-- <view class="rest-item-num">{{"10000.00"}}</view> -->
 				<view class="rest-item-txt">返还金</view>
 			</view>
 			<!-- <view class="rest-item" @click="navgo('/pageQuota/balanceDetail/index?type=3')"> -->
-			<view class="rest-item">
-				<view class="rest-item-num">{{userInfo.number ||"0.00"}}</view>
-				<view class="rest-item-txt">冻结礼品券</view>
-			</view>
+
 			<!-- <view class="rest-item" @click="navgo('/pageQuota/balanceDetail/index?type=3')"> -->
 			<view class="rest-item">
 				<view class="rest-item-num">{{userInfo.GetNumber ||"0.00"}}</view>
-				<view class="rest-item-txt">可用礼品券</view>
+				<view class="rest-item-txt">礼品券</view>
+			</view>
+			<view class="rest-item">
+				<view class="rest-item-num">{{userInfo.number ||"0.00"}}</view>
+				<view class="rest-item-txt">冻结券</view>
 			</view>
 		</view>
 		<view class="order-info-box">
@@ -222,7 +242,7 @@
 			box-sizing: border-box;
 			padding: 50rpx 0 50rpx 50rpx;
 			position: absolute;
-			top: 50rpx;
+			top: -10rpx;
 			left: 0;
 			z-index: 2;
 			display: flex;
diff --git a/pagesOrder/order/order.vue b/pagesOrder/order/order.vue
index 78f78fe..b9adf37 100644
--- a/pagesOrder/order/order.vue
+++ b/pagesOrder/order/order.vue
@@ -295,15 +295,14 @@
 	const pay_type = ref('3')
 
 	const rePay = async (e) => {
+		payFn(e)
+		return
 		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);
@@ -321,7 +320,7 @@
 	}
 
 
-	const payFn = () => {
+	const payFn = (e) => {
 		rePaymentApi({
 			order_id: e.id,
 			address_id: e.address_id,