From 173e7051f1c0a5e167f1447e6d1794526d28ea46 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Wed, 12 Jun 2024 15:26:14 +0800
Subject: [PATCH] add

---
 pageQuota/Balance/index.vue | 20 +++++++++++----
 pages/my/my.vue             | 50 +------------------------------------
 2 files changed, 16 insertions(+), 54 deletions(-)

diff --git a/pageQuota/Balance/index.vue b/pageQuota/Balance/index.vue
index de27058..7dd72d5 100644
--- a/pageQuota/Balance/index.vue
+++ b/pageQuota/Balance/index.vue
@@ -31,7 +31,7 @@
 			</view>
 
 			<view class="detail-card">
-				<view class="" v-for="item in orderLists.reverse()">
+				<view class="" v-for="(item,index) in orderLists" :key='index'>
 					<view class="detail-li">
 						<up-image :show-loading="true"
 							src="https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/b6932202406082138255928.png"
@@ -44,9 +44,9 @@
 						<view class="detail-li-r">
 							<view class="top" style="margin-bottom: 14rpx;">
 								<text>{{item.title}}</text>
-								<text style='font-size: 32rpx;font-weight: bold;' v-if="item.type=='in'">+{{item.amount}}</text>
+								<text style='font-size: 32rpx;font-weight: bold;'
+									v-if="item.type=='in'">+{{item.amount}}</text>
 								<text style='font-size: 32rpx;font-weight: bold;' v-else>-{{item.amount}}</text>
-								
 							</view>
 							<view class="top">
 								<text style='font-size: 24rpx;'>{{item.create_time}}</text>
@@ -71,6 +71,9 @@
 		chargeListApi,
 		capitalCountAPi
 	} from "@/api/user.js"
+	import {
+		onPullDownRefresh
+	} from "@dcloudio/uni-app"
 	import {
 		ref
 	} from "vue"
@@ -79,8 +82,6 @@
 	const mobile = ref('')
 	const order = ref(0)
 	const recharge = ref(0)
-	// https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/b6932202406082138255928.png
-
 	const getUser = () => {
 		userInfoApi().then(res => {
 			now_money.value = res.data.now_money
@@ -110,6 +111,15 @@
 		})
 	}
 
+	onPullDownRefresh(() => {
+		getUser()
+		getLists()
+		getShop()
+		setTimeout(() => {
+			uni.stopPullDownRefresh()
+		}, 2000)
+	})
+
 	getUser()
 	getLists()
 	getShop()
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 24bcd4f..d539d02 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -6,55 +6,15 @@
 			<image class="bg" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e3a7b202404261113002322.webp"
 				mode="widthFix"></image>
 			<view class="u-card">
-				<view style="display: flex;margin-bottom: 44rpx;">
+				<view style="display: flex;">
 					<up-avatar :src="userInfo.avatar" size="56"></up-avatar>
 					<view class="content">
 						<view class="u-phone">{{userInfo.nickname}}</view>
 						<view class="u-id">ID: {{userInfo.id}}</view>
 					</view>
 				</view>
-				<!-- <view class="u-card-level">
-					<view class="u-level-item">
-						<view class="u-level-item-num">{{userInfo.vip_name}}</view>
-						<view class="u-level-item-txt">会员等级</view>
-					</view>
-					<view class="u-level-item">
-						<view class="u-level-item-num">{{userInfo.discount}}</view>
-						<view class="u-level-item-txt">可享折扣</view>
-					</view>
-					<view class="u-level-item">
-						<view class="u-level-item-num">{{userInfo.now_money}}</view>
-						<view class="u-level-item-txt">可用余额</view>
-					</view>
-				</view> -->
 			</view>
 		</view>
-
-		<!-- <view class="member">
-			<view class="member-wrap">
-				<view class="member-left">
-					<up-image width="36rpx" height="36rpx" src="/static/icon/silver.webp"></up-image>
-					<text>初级会员</text>
-					<up-line direction="col" color="#707070" margin="0 10rpx" length="12"></up-line>
-					<view :style="{'font-weight':userInfo.user_ship>0?'bold':'normal'}">
-						{{userInfo.user_ship>0?'享折扣权益':'活动期间下单即享初级会员'}}
-					</view>
-				</view>
-				<view class="member-right" @click="handleBack(userInfo.user_ship)">
-					{{userInfo.user_ship>0?'立即升级':'立即下单'}}
-				</view>
-			</view>
-
-			<view class="member-progress">
-				<view>
-					<text>当前已充值{{userInfo.total_recharge_amount}}，升级还需{{userInfo.next_limit}}</text>
-					<text>{{userInfo.next_level}}</text>
-				</view>
-				<up-line-progress :percentage="(userInfo.total_recharge_amount/userInfo.next_limit).toFixed(2)"
-					activeColor="#A26341" inactiveColor="#fff" height="8rpx"></up-line-progress>
-			</view>
-		</view> -->
-
 		<view class="gift">
 			<view style="font-weight: bold;">
 				供销经营礼包
@@ -64,10 +24,6 @@
 			</view>
 
 		</view>
-
-
-
-
 		<view class="order-info-box">
 			<view class="order-info">
 				<view class="info-head">我的订单</view>
@@ -191,10 +147,7 @@
 		overflow: hidden;
 		position: relative;
 		width: 750rpx;
-		height: 436rpx;
-		/* #ifdef H5 */
 		height: 350rpx;
-		/* #endif */
 
 		.bg {
 			width: 100%;
@@ -221,7 +174,6 @@
 
 				.u-phone {
 					font-size: 32rpx;
-					margin-bottom: 16rpx;
 				}
 
 				.u-id {