From 2d740b49d4daa0f3b8a96366cf80100e6d927822 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Thu, 24 Oct 2024 15:47:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageLineUp/callRecord.vue           |   5 ++
 pageUser/index/components/men.png   | Bin 0 -> 429 bytes
 pageUser/index/components/user.vue  |  21 +++---
 pageUser/index/components/women.png | Bin 0 -> 425 bytes
 pageUser/index/index.vue            |  95 +++++++++++++++++++++++-----
 5 files changed, 98 insertions(+), 23 deletions(-)
 create mode 100644 pageUser/index/components/men.png
 create mode 100644 pageUser/index/components/women.png

diff --git a/pageLineUp/callRecord.vue b/pageLineUp/callRecord.vue
index 9fb0a14..02f2502 100644
--- a/pageLineUp/callRecord.vue
+++ b/pageLineUp/callRecord.vue
@@ -7,6 +7,11 @@
 				</view>
 				<view>
 					（{{item.note}}）
+					
+					
+					244 900 
+					397 1250
+					
 				</view>
 			</view>
 			<view :class="[item.state==3?'rightTopstyle':'rightTop']">
diff --git a/pageUser/index/components/men.png b/pageUser/index/components/men.png
new file mode 100644
index 0000000000000000000000000000000000000000..82482b3b236d37cb194c7a6815ac70a5a70121a3
GIT binary patch
literal 429
zcmV;e0aE^nP)<h;3K|Lk000e1NJLTq000aC000aK1^@s6R&`wG00001b5ch_0Itp)
z=>Px$XGugsR47xGlFchbVHm}K&%JYvM2sj|iAH3~N2sx|^zjc^iEPMfBzDRMYwT>;
z*sw4Q$wC%3EM{aT3yOtADGC#V`!TQP&WA}hp3PfN=bX-Y&MRc6ZbKCt71o5nFp4I3
zEnF(tv|fz0n=$#!tbn@hw;IDJ+81cc2^78xVwPnN-VBvKNLD!_5cmxaRDhj=`y?c6
zV%Cch6o1$Z2`vAmJkp>s?$@|VD8`N*6ii8D*o*+3X+o<{7;Vt-6~W$piV}}7P%Aus
zLMY;-AyM(~m>(h(r@;&DI&)_Z2}?24qSIV13?117tA*V=1&X&kVWmrF{W?YbS-I|X
zfunv8eFrv4SDXwXXKABHXFl$5`~H(=tJlMH)OJH>Cz=mE*{I?33QOl1xsFO<v0Z2I
z(9WaX(Al$|cs1HqyLGC(!qb<czEqe!b@CS7F4AZHU7Wv6DDl9>tHMm>tQQpb->>lv
X8EKr!A%}2i00000NkvXXu0mjfy(YSt

literal 0
HcmV?d00001

diff --git a/pageUser/index/components/user.vue b/pageUser/index/components/user.vue
index 118c893..26ea516 100644
--- a/pageUser/index/components/user.vue
+++ b/pageUser/index/components/user.vue
@@ -5,19 +5,24 @@
 				<image v-if="data.headImg" :src="data.headImg" class="img"></image>
 				<view class="img" v-else></view>
 			</view>
-			<view class="u-p-l-30 u-flex-1">
+			<view class="u-p-l-30 u-flex-1" style="position: relative;">
 				<view class="u-flex">
 					<view class="color-000 font-bold">{{data.nickName}}</view>
+					<image style="width: 24rpx;height: 24rpx;" v-if="data.sex=='男'" src="./men.png" mode=""></image>
+					<image style="width: 24rpx;height: 24rpx;" v-else src="./women.png" mode=""></image>
 					<view class="color-999 u-m-l-40" @click="remark">备注</view>
 				</view>
-				<view class="u-m-t-6 u-flex u-row-between">
+			<!-- 	<view class="u-m-t-6 u-flex u-row-between">
 					<view class="vip isvip" v-if="data.isVip">会员</view>
 					<view class=" vip noVip" v-else>非会员</view>
 					<view class="color-main" @click="bindMoblie">绑定号码</view>
-				</view>
-				<view class="u-m-t-6 color-666 ">
+				</view> -->
+				<view class="u-m-t-30 color-666 ">
 					{{data.telephone||''}}
 				</view>
+				<view style="position: absolute;right: 0;top: 0;border-radius: 4rpx 4rpx 4rpx 4rpx;background: #EAF4FD;font-weight: 400;font-size: 20rpx;color: #318AFE;">
+					会员等级{{data.isVip}}
+				</view>
 			</view>
 			
 		</view>
@@ -33,7 +38,7 @@
 				</view>
 			</view>
 			<view class="u-flex-1  u-text-center" @tap="toYue">
-				<view class="font-bold color-000 pr-16" >{{data.amount}}</view>
+				<view class="font-bold color-000 pr-16" >{{data.totalScore}}</view>
 				<view class="u-flex u-row-center" >
 					<view class="color-999">积分</view>
 					<view class="u-flex">
@@ -42,7 +47,7 @@
 				</view>
 			</view>
 			<view class="u-flex-1  u-text-center" @tap="toYue">
-				<view class="font-bold color-000 pr-16" >{{data.amount}}</view>
+				<view class="font-bold color-000 pr-16" >{{0}}</view>
 				<view class="u-flex u-row-center" >
 					<view class="color-999">优惠券</view>
 					<view class="u-flex">
@@ -50,7 +55,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="u-flex-1  u-text-center" @tap="toUser">
+			<!-- <view class="u-flex-1  u-text-center" @tap="toUser">
 				<view class="font-bold color-000 pr-16">{{data.totalScore}}</view>
 				<view class="u-flex u-row-center">
 					<view class="color-999">已消费</view>
@@ -58,7 +63,7 @@
 						<uni-icons type="right" color="#999"></uni-icons>
 					</view>
 				</view>
-			</view>
+			</view> -->
 			<!-- <view class="u-flex-1  u-text-center">
 				<view class="font-bold color-000 pr-16">0</view>
 				<view class="u-flex u-row-center">
diff --git a/pageUser/index/components/women.png b/pageUser/index/components/women.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c234943b274d28129d47687b8dd5718f4c43aff
GIT binary patch
literal 425
zcmV;a0apHrP)<h;3K|Lk000e1NJLTq000aC000aK1^@s6R&`wG00001b5ch_0Itp)
z=>Px$V@X6oR47xGk~>QSK@^3*ySs@|vW*srf+#8?zDOYfMGy-`8-Ia~m8Jd^TN~3@
z3szbPb_yoQ3dRQrBKVA`#jYlCvojK-NklBX#mwa}=WynpD}0qs?M8g;MXmKbNM8lk
zXCks5!d;bx$wC>C^5LZp;vr-UB=Ifq^VW`!o{cUf@1?B#uI)6!VD*t@U?$r!;!*Ug
zPjGmHe)OC$-l)8%GD{j(>J_c29@MRiI?Ex=O<3cd_&XPfTU?gnS~`u$NR`lN5t{DB
z-#n>8#z5?|SI74mDW=kSkVw6q&|E+M#&L}>9EXxZWpiGQ5DjB?w-6lNVa@cSU-AT}
zIgFMj%tRah_Bp(jyqYBeYoZGx78FXTr&o-)jV_c3oI7xfpmpZQr_G@lMt=--`Al$d
z{cFMk%ayTW?_)P4%tR}}-WBFp2P*r3e$LmEoG|WaU2w)0@JDbsKB^Mje^=uJf2*N|
T)-D9X00000NkvXXu0mjf%!|66

literal 0
HcmV?d00001

diff --git a/pageUser/index/index.vue b/pageUser/index/index.vue
index d5c355d..b8db41f 100644
--- a/pageUser/index/index.vue
+++ b/pageUser/index/index.vue
@@ -154,6 +154,21 @@
 
 		<my-action-sheet @itemClick="actionSheetClick" ref="moreOperate" :list="moreOperateList"></my-action-sheet>
 	</view>
+	<!-- 增减余额 -->
+	<up-popup :show="datas.show" :round="18" mode="center" @close="close">
+		<view class="zhezhaopop">
+			<view class="">
+				<span></span>
+				<span>增减余额</span>
+				<up-icon @tap="confirm" name="close-circle-fill"></up-icon>
+			</view>
+			<view class="">
+			</view>
+
+			<up-button text="确认" @tap="callTabletakeNumberEvent" type="primary" class="buttomStyle"
+				shape="circle"></up-button>
+		</view>
+	</up-popup>
 </template>
 
 <script setup>
@@ -168,6 +183,9 @@
 	import infoBox from "@/commons/utils/infoBox.js"
 	import * as $Api from '@/http/yskApi/shop-user.js'
 	import API from '../../http/classApi';
+	import {
+		onReachBottom
+	} from '@dcloudio/uni-app';
 	import {
 		hasPermission
 	} from '@/commons/utils/hasPermission.js';
@@ -176,6 +194,16 @@
 	const remarkModel = ref(null)
 	const phoneModel = ref(null)
 	const moreOperate = ref(null)
+	let datas = reactive({
+		show: false,
+		form: {}
+	})
+	let close = () => {
+		datas.form = {}
+	}
+	const confirm = () => {
+		datas.show = false;
+	};
 
 	function toAddUser() {
 		go.to('PAGES_USER_ADD')
@@ -190,28 +218,27 @@
 
 	const goodsStockModel = ref(null)
 
-	const moreOperateList = ['增减余额', '增减积分', '修改信息', ]
+	const moreOperateList = ['增减余额', '修改信息', ]
 
 	function moreOperateClick() {
 		moreOperate.value.open()
 	}
 
+
+	onReachBottom(() => {
+		++page.value
+		getUser()
+	});
+
+
 	function actionSheetClick(i) {
 		if (i == 0) {
 			hasPermission('允许修改会员余额').then(ele => {
 				if (ele) {
-					toUrl('PAGES_SALES_WAREHOUSEENTRY', {
-						consId: actionSheet.activeId,
-						item: JSON.stringify(actionSheet.active)
-					})
+					datas.show = true
 				}
 			})
 		} else if (i == 1) {
-			toUrl('PAGES_SALES_WAREHOUSEENTRY', {
-				consId: actionSheet.activeId,
-				item: JSON.stringify(actionSheet.active)
-			})
-		} else if (i == 2) {
 			hasPermission('允许管理会员信息').then(ele => {
 				if (ele) {
 					toUrl('PAGES_SALES_WAREHOUSEENTRY', {
@@ -332,7 +359,8 @@
 	}
 
 	function searchFunc() {
-		console.log('searchFunc');
+		page.value = 0
+		getUser()
 	}
 
 	let showChecked = ref(false)
@@ -371,17 +399,26 @@
 	function cateClick(cate) {
 		console.log(cate);
 	}
-
+	let page = ref(0)
 	async function getUser() {
 		const {
 			content
-		} = await $Api.queryAllShopUser()
-		pageData.userList = content
+		} = await $Api.queryAllShopUser({
+			isVip: 1,
+			size: 10,
+			page: page.value,
+			name: pageData.search.value
+		})
+		if (page.value == 0) {
+			pageData.userList = content
+		} else {
+			pageData.userList.push(...content)
+
+		}
 	}
 	async function getAllShopInfo() {
 		const res = await $Api.queryAllShopInfo()
 		pageData.allShopInfo = res
-
 	}
 
 	onMounted(() => {
@@ -532,6 +569,34 @@
 		}
 	}
 
+	.zhezhaopop {
+		padding: 34rpx 32rpx;
+		width: 594rpx;
+		height: 668rpx;
+		background: #FFFFFF;
+		border-radius: 18rpx 18rpx 18rpx 18rpx;
+
+		>view:first-child {
+
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+
+			>span:nth-child(2) {
+				font-family: Source Han Sans CN, Source Han Sans CN;
+				font-weight: bold;
+				font-size: 32rpx;
+				color: #333333;
+			}
+		}
+
+		.buttomStyle {
+			margin-top: 48rpx;
+			width: 506rpx;
+			height: 80rpx;
+		}
+	}
+
 	.input-icon {
 		position: relative;
 		z-index: 10;