From 8c1858b2c27c4bc66313ff5010d19f23d54a73d4 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Tue, 14 May 2024 15:18:50 +0800
Subject: [PATCH] add

---
 pageQuota/Balance/bindAccout.vue | 20 +++++------
 pageQuota/Balance/index.vue      | 60 +++++++++++++++++---------------
 pageQuota/feedBack/detail.vue    | 47 +++++++++++++------------
 pageQuota/feedBack/index.vue     | 18 +++++-----
 pageQuota/feedBack/list.vue      | 18 ++++++----
 pageQuota/quotation/index.vue    |  4 +--
 6 files changed, 86 insertions(+), 81 deletions(-)

diff --git a/pageQuota/Balance/bindAccout.vue b/pageQuota/Balance/bindAccout.vue
index 402b5ed..29fd38e 100644
--- a/pageQuota/Balance/bindAccout.vue
+++ b/pageQuota/Balance/bindAccout.vue
@@ -81,7 +81,8 @@
 		ref,
 		reactive
 	} from 'vue';
-
+	import useUserStore from '@/store/user';
+	const userStore = useUserStore();
 
 	const showPop = ref(false)
 	const showPop1 = ref(false)
@@ -93,7 +94,6 @@
 	}
 
 	const choseBank = (item) => {
-		console.log(item)
 		form.bank_name = item.name
 		form.bank_id = item.id
 		showPop.value = false
@@ -108,20 +108,21 @@
 
 
 	const form = reactive({
-		"name": "张伟",
+		"name": "赵明军",
 		"bank_id": 1,
 		"bank_name": '中国邮政',
 		"bank_code": "62179967580064578451",
-		"bank_branch": "",
+		"bank_branch": "迎晖路支行",
 		"financial_img": "",
 		"is_own": 0,
-		phone: '1913055023',
+		phone: '19130550023',
 		"id_card": "513701200012105613",
-		"mer_id": 500,
-		user_type: 1
+		"mer_id": userStore?.userInfo?.merchant?.mer_id,
+		supplier_id: userStore?.userInfo?.supplier?.id,
+		user_type: userStore?.userInfo?.merchant?.mer_id ? '1' : '2'
 	})
 
-
+	console.log(userStore?.userInfo)
 
 	const submit = () => {
 		bindCradApi({
@@ -208,9 +209,6 @@
 				border-bottom: 1px solid #F8F9FA;
 			}
 		}
-
-
-
 	}
 
 	.action {
diff --git a/pageQuota/Balance/index.vue b/pageQuota/Balance/index.vue
index 2f7a2b9..c8e63ef 100644
--- a/pageQuota/Balance/index.vue
+++ b/pageQuota/Balance/index.vue
@@ -24,21 +24,16 @@
 			<up-form labelPosition="left" borderBottom :label-style="{fontSize:'30rpx'}" :model="model1" :rules="rules"
 				ref="form1" labelWidth='70'>
 				<up-form-item label="银行卡" prop="userInfo.name" borderBottom ref="item1">
-					<template #right>
-						<view style="display: flex;align-items: center;">
-							<text @click="showPop=true" style="color: #20B128;">选择银行</text> <up-icon color="#20B128"
-								name="arrow-right"></up-icon>
-						</view>
-					</template>
+					<up-input style="border: none;" v-model="form.name" />
 				</up-form-item>
 				<up-form-item label="持卡人" prop="userInfo.name" borderBottom ref="item1">
-					<up-input style="border: none;" v-model="form.name" placeholder="请输入持卡人姓名" />
+					<up-input style="border: none;" v-model="form.name" />
 				</up-form-item>
 				<up-form-item label="银行账户" prop="userInfo.name" borderBottom ref="item1">
-					<up-input style="border: none;" v-model="form.name" placeholder="请输入银行账户" />
+					<up-input style="border: none;" v-model="form.name" />
 				</up-form-item>
 				<up-form-item label="开户网点" prop="userInfo.name" borderBottom ref="item1">
-					<up-input style="border: none;" v-model="form.name" placeholder="请输入开户网点" />
+					<up-input style="border: none;" v-model="form.name" />
 				</up-form-item>
 				<up-form-item label="提现金额" prop="userInfo.name" borderBottom ref="item1">
 					<up-input style="border: none;" v-model="form.name" placeholder="请输入提现金额" />
@@ -52,7 +47,7 @@
 		</view>
 
 
-		<up-empty mode="data" :text='emptyText'
+		<up-empty mode="data" v-else :text='emptyText'
 			icon="https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/89e93202405131146497294.png" />
 		<view class="detail" @click="navgo('/pageQuota/Balance/detail')">
 			明细
@@ -60,25 +55,13 @@
 		<view class="submit-btn">
 			<up-button text="提现" shape="circle" color="#50C758"></up-button>
 		</view>
-
-		<up-popup :show="showPop" :round="10" mode="bottom" @close="showPop=false" @open="showPop=true">
-			<view class="popContent">
-				<view style="text-align: center;font-weight: bold;">请选择银行</view>
-				<up-icon name="close" color="#303133" size="24" @click="showPop=false"
-					style="position: absolute;top: 20rpx;right: 20rpx;"></up-icon>
-				<view class="bank-list">
-					<view class="bank-li" v-for="item in 10">
-						<up-image :show-loading="true" src="https://cdn.uviewui.com/uview/album/1.jpg" width="60rpx"
-							height="60rpx"></up-image>
-						<text style="margin-left: 20rpx;">中国农业银行</text>
-					</view>
-				</view>
-			</view>
-		</up-popup>
 	</view>
 </template>
 
 <script setup>
+	import {
+		bankListApi,
+	} from "@/api/balance.js"
 	import {
 		ref,
 		reactive
@@ -91,11 +74,31 @@
 			url
 		})
 	}
+	const bankList = ref([])
+
+	const getBankList = async () => {
+		let res = await bankListApi()
+		bankList.value = res.data.lists
+	}
+
+	const choseBank = (item) => {
+		form.bank_name = item.name
+		form.bank_id = item.id
+		showPop.value = false
+	}
+
 
 	const form = reactive({
 		name: ""
 	})
 
+
+
+
+
+
+
+
 	// 使用 reactive 创建响应式状态  
 	const state = reactive({
 		showSex: false,
@@ -144,6 +147,8 @@
 			formRef.value.validateField('userInfo.sex');
 		}
 	}
+
+	getBankList()
 </script>
 
 <style lang="scss">
@@ -184,7 +189,7 @@
 		.bank-list {
 			overflow-y: auto;
 			position: relative;
-			height: 40vh;
+			max-height: 40vh;
 
 			.bank-li {
 				display: flex;
@@ -194,9 +199,6 @@
 				border-bottom: 1px solid #F8F9FA;
 			}
 		}
-
-
-
 	}
 
 
diff --git a/pageQuota/feedBack/detail.vue b/pageQuota/feedBack/detail.vue
index 3627103..c58bb44 100644
--- a/pageQuota/feedBack/detail.vue
+++ b/pageQuota/feedBack/detail.vue
@@ -1,32 +1,25 @@
 <template>
 	<view class="content">
 		<view class="card">
-			<!-- <view class="card-li">
-				<text>反馈类型</text>
-				<text style="color: #737373 ;">注册</text>
-			</view>
-			<view class="card-li">
-				<text>问题分类</text>
-				<text style="color: #737373 ;">注册</text>
-			</view> -->
 			<view class="card-li">
 				<text>姓名</text>
-				<text style="color: #737373 ;">注册</text>
+				<text style="color: #737373 ;">{{datas.name}}</text>
 			</view>
 			<view class="card-li">
 				<text>电话邮箱</text>
-				<text style="color: #737373 ;">注册</text>
+				<text style="color: #737373 ;">{{datas.contact}}</text>
 			</view>
 		</view>
 
 
 		<view class="card">
 			<view class="">
-				反馈的具体内容，可能很长
+				<!-- 反馈的具体内容，可能很长 -->
+				{{datas.content}}
 			</view>
-			<view style="margin-top: 20rpx;">
-				<up-image :show-loading="true" src="https://cdn.uviewui.com/uview/album/1.jpg" width="160rpx"
-					height="160rpx" @click="previewImg('https://cdn.uviewui.com/uview/album/1.jpg')"></up-image>
+			<view style="margin-top: 20rpx;display: flex;">
+				<up-image v-for="item in datas.images" :show-loading="true" :src="item" @click="previewImg(item)"
+					width="100rpx" height="100rpx" style="margin-right: 20rpx;"></up-image>
 			</view>
 		</view>
 
@@ -36,20 +29,28 @@
 </template>
 
 <script setup>
+	import {
+		ref
+	} from 'vue';
+	import {
+		onLoad
+	} from "@dcloudio/uni-app"
+
 	const previewImg = (url) => {
 		uni.previewImage({
 			urls: [url],
-			longPressActions: {
-				// itemList: ['发送给朋友', '保存图片', '收藏'],
-				// success: function(data) {
-				// 	console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
-				// },
-				// fail: function(err) {
-				// 	console.log(err.errMsg);
-				// }
-			}
+			longPressActions: {}
 		});
 	}
+
+
+	const datas = ref({})
+
+	onLoad((option) => {
+		console.log(option.item)
+		datas.value = JSON.parse(option.item)
+
+	})
 </script>
 
 <style lang="scss">
diff --git a/pageQuota/feedBack/index.vue b/pageQuota/feedBack/index.vue
index f8ee779..2641f09 100644
--- a/pageQuota/feedBack/index.vue
+++ b/pageQuota/feedBack/index.vue
@@ -64,13 +64,10 @@
 	import {
 		config
 	} from "@/config/app.js"
-
 	import {
 		addFeedBackApi,
 		userfeedbackListApi
 	} from "@/api/feedBack.js"
-
-
 	import useUserStore from '@/store/user';
 	const userStore = useUserStore();
 
@@ -91,6 +88,7 @@
 		name: "",
 		contact: "",
 		uid: userStore.userInfo.id
+		// uid: 2
 
 	})
 
@@ -106,7 +104,7 @@
 
 	// 删除图片
 	const deletePic = (event) => {
-		formData.images.value.splice(event.index, 1);
+		formData.images.splice(event.index, 1);
 	};
 
 	// 新增图片
@@ -124,7 +122,7 @@
 		for (let i = 0; i < lists.length; i++) {
 			const result = await uploadFilePromise(lists[i].url);
 			console.log(result)
-			let item = formData.images[fileListLen];
+			// let item = formData.images[fileListLen];
 			formData.images.splice(fileListLen, 1, {
 				url: result,
 			});
@@ -150,7 +148,6 @@
 		});
 	};
 
-	console.log()
 	const submit = async () => {
 		formData.images = formData.images.map(item => {
 			return item.url
@@ -162,13 +159,14 @@
 
 		uni.showToast({
 			title: '提交成功',
-			duration: 2000
-		});
-		setTimeout(function() {
+			duration: 1500
+		})
+		uni.$u.sleep(1500).then(res => {
 			uni.navigateTo({
 				url: '/pageQuota/feedBack/list'
 			})
-		}, 2000);
+		})
+
 	}
 </script>
 
diff --git a/pageQuota/feedBack/list.vue b/pageQuota/feedBack/list.vue
index 22d0844..dbd64fe 100644
--- a/pageQuota/feedBack/list.vue
+++ b/pageQuota/feedBack/list.vue
@@ -1,13 +1,14 @@
 <template>
 	<view class="content">
-		<view class="li" v-for="itme in 10" @click="goDetail">
+		<view class="li" v-for="item in lists" :key="item.id" @click="goDetail(item)">
 			<view class="lias">
 				<view class="">
 					<view class="">
-						<text style="color: #20B128;">未收到短信</text> 反馈内容
+						<text style="color: #20B128;">{{item.content}}</text>
 					</view>
 					<view style="font-size: 24rpx;margin-top: 10rpx;">
-						2024-05-10 09:24:25
+						<!-- 2024-05-10 09:24:25 -->
+						{{item.create_time}}
 					</view>
 				</view>
 				<up-icon name="arrow-right"></up-icon>
@@ -22,15 +23,20 @@
 	import {
 		userfeedbackListApi
 	} from "@/api/feedBack.js"
+	import {
+		ref
+	} from "vue"
 
+	const lists = ref([])
 	userfeedbackListApi().then(res => {
-		console.log(res)
+		console.log(res.data.lists)
+		lists.value = res.data.lists
 	})
 
 
-	const goDetail = () => {
+	const goDetail = (item) => {
 		uni.navigateTo({
-			url: '/pageQuota/feedBack/detail'
+			url: '/pageQuota/feedBack/detail?item=' + JSON.stringify(item)
 		})
 	}
 </script>
diff --git a/pageQuota/quotation/index.vue b/pageQuota/quotation/index.vue
index da68921..2710350 100644
--- a/pageQuota/quotation/index.vue
+++ b/pageQuota/quotation/index.vue
@@ -145,8 +145,8 @@
 					</up-empty>
 				</up-transition>
 			</view>
-			<view class="detail" @click="navgo('/pageQuota/Balance/detail')">
-				明细
+			<view class="detail" @click="navgo('/pageQuota/Balance/index')">
+				提现
 			</view>
 			<view class="submit-btn" v-if="tabIndex==1">
 				<up-button shape='circle' color='#20B128' @click="submit" text="提交"></up-button>