From ae1aad66a165ee7253bed2127a3b53baa40c2361 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 17 五月 2023 08:35:33 +0800
Subject: [PATCH] 修复错误,增加验证

---
 pages/customer-page/customer-my/customer-my.vue |  260 ++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 193 insertions(+), 67 deletions(-)

diff --git a/pages/customer-page/customer-my/customer-my.vue b/pages/customer-page/customer-my/customer-my.vue
index 04a2b1b..af45c40 100644
--- a/pages/customer-page/customer-my/customer-my.vue
+++ b/pages/customer-page/customer-my/customer-my.vue
@@ -1,39 +1,71 @@
 <template>
 	<view class="customer-my">
-		<view class="huodai">
-			<combined-title title="鎴戠殑璐т唬" @rightText="addHuoDai">
-				<template v-slot:rightText>
-					<text>娣诲姞</text>
-				</template>
-			</combined-title>
-			<view class="huodai-list">
-				<u-swipe-action>
-					<u-cell-group :border="false">
-						<u-swipe-action-item :options="options1" v-for="(item, index) in huoDaiData" :index="index" :name="item.userId" :key="index" @click="deleteHuoDaiClick">
-							<u-cell :title="item.name" value="璇︽儏" @click="toFreightForwarderDetails(item.id)"></u-cell>
-						</u-swipe-action-item>
-					</u-cell-group>
-				</u-swipe-action>
+		<view class="driver-banner"><view class="navgation">鎴戠殑</view></view>
+		<view class="personal-information">
+			<view class="personal-information-block">
+				<view class="block-main">
+					<view class="huodai">
+						<combined-title title="鎴戠殑璐т唬" @rightText="addHuoDai">
+							<template v-slot:rightText>
+								<text>娣诲姞</text>
+							</template>
+						</combined-title>
+						<view class="huodai-list">
+							<u-swipe-action>
+								<u-cell-group :border="false">
+									<u-swipe-action-item
+										:options="options1"
+										v-for="(item, index) in huoDaiData"
+										:index="item.userId"
+										:name="item.userId"
+										:key="index"
+										@click="deleteHuoDaiClick"
+									>
+										<u-cell :title="item.name" value="璇︽儏" @click="toFreightForwarderDetails(item.userId)">
+											<u-icon name="arrow-right" color="#999999" size="30" slot="right-icon"></u-icon>
+										</u-cell>
+									</u-swipe-action-item>
+								</u-cell-group>
+							</u-swipe-action>
+						</view>
+					</view>
+				</view>
 			</view>
-		</view>
-		<view class="fleet-container">
-			<combined-title title="鎴戠殑杞﹂槦" @rightText="addFleet">
-				<template v-slot:rightText>
-					<text>娣诲姞</text>
-				</template>
-			</combined-title>
-			<view class="fleet-list">
-				<u-swipe-action>
-					<u-cell-group :border="false">
-						<u-swipe-action-item :options="options1" v-for="(item, index) in fleetData" :index="index" :name="item.id" :key="index" @click="deleteFleetClick">
-							<u-cell :title="item.name" :value="item.userSijisum + '杈�'" @click="tofleetDetails(item.id)"></u-cell>
-						</u-swipe-action-item>
-					</u-cell-group>
-				</u-swipe-action>
+			<view class="personal-information-block">
+				<view class="block-main">
+					<view class="fleet-container">
+						<combined-title title="鎴戠殑杞﹂槦" @rightText="addFleet">
+							<template v-slot:rightText>
+								<text>娣诲姞</text>
+							</template>
+						</combined-title>
+						<view class="fleet-list">
+							<u-swipe-action>
+								<u-cell-group :border="false">
+									<u-swipe-action-item
+										:options="options1"
+										v-for="(item, index) in fleetData"
+										:index="item.id"
+										:name="item.id"
+										:key="index"
+										@click="deleteFleetClick"
+									>
+										<u-cell :title="item.name" :value="item.userSijisum + '杈�'" @click="tofleetDetails(item.id)">
+											<u-icon name="arrow-right" color="#999999" size="30" slot="right-icon"></u-icon>
+										</u-cell>
+									</u-swipe-action-item>
+								</u-cell-group>
+							</u-swipe-action>
+						</view>
+					</view>
+				</view>
 			</view>
 		</view>
 
-		<view class="logout"><u-button text="閫�鍑虹櫥褰�" type="primary" @click="logout()"></u-button></view>
+		<view class="utils-button">
+			<view class="statistics"><u-button text="鐢ㄦ埛绠$悊" type="primary" @click="userManage" v-if="roleType == 1 && userEntity.isHostUser === '0'"></u-button></view>
+			<view class="logout"><u-button text="閫�鍑虹櫥褰�" type="primary" @click="logout()"></u-button></view>
+		</view>
 
 		<!-- 鏂板缓杞﹂槦寮瑰嚭妗� -->
 		<view class="addNewGroup">
@@ -123,33 +155,49 @@
 			// 閫�鍑烘ā鎬佹
 			logoutShow: false,
 			logoutTitle: '鎻愮ず',
-			logoutContent: '鏄惁纭閫�鍑�'
+			logoutContent: '鏄惁纭閫�鍑�',
+			// 鐢ㄦ埛淇℃伅瀵硅薄
+			userEntity: {}
 		};
+	},
+	computed: {
+		roleType() {
+			return uni.getStorageSync('roleType');
+		}
 	},
 	onShow() {
 		this.init();
 	},
 	methods: {
 		init() {
-			uni.showLoading({
-				title: '鍔犺浇涓�...'
-			});
 			this.getAllHuoDaiByCustomerId();
 			this.getFleet();
-			uni.hideLoading();
+			this.getUserEntity();
+		},
+		// 鑾峰彇鐢ㄦ埛淇℃伅
+		getUserEntity() {
+			this.$reqGet('getUserEntity').then(res => {
+				this.userEntity = res.data;
+			});
 		},
 		// 鑾峰彇璐т唬鍒楄〃
 		getAllHuoDaiByCustomerId() {
+			uni.showLoading({
+				title: '鍔犺浇涓�...'
+			});
 			this.$reqGet('getAllHuoDaiByCustomerId').then(res => {
+				uni.hideLoading();
 				this.huoDaiData = res.data;
-				console.log('璐т唬鍒楄〃', res);
 			});
 		},
 		// 鑾峰彇杞﹂槦鍒楄〃
 		getFleet() {
-			this.$reqGet('getFleet', { customerId }).then(res => {
+			uni.showLoading({
+				title: '鍔犺浇涓�...'
+			});
+			this.$reqGet('getFleet').then(res => {
+				uni.hideLoading();
 				this.fleetData = res.data;
-				console.log('杞﹂槦鍒楄〃', res);
 			});
 		},
 		// 娣诲姞璐т唬
@@ -160,7 +208,6 @@
 		},
 		// 娣诲姞杞﹂槦
 		addFleet() {
-			console.log('娣诲姞杞﹂槦');
 			this.updateGroupShow = true;
 		},
 		addNewFleetPopupClose() {
@@ -175,15 +222,19 @@
 				title: '鍔犺浇涓�...'
 			});
 			// 鏂板缓杞﹂槦
-			this.$reqPost('saveFleet', this.addGroupForm, 'params').then(res => {
-				uni.hideLoading();
-				if (res.code == 0) {
-					this.$u.toast('娣诲姞鎴愬姛');
+			this.$reqPost('saveFleet', this.addGroupForm, 'params')
+				.then(res => {
+					uni.hideLoading();
+					console.log(res, '鏂板缓杞﹂槦');
+					if (res.code == 0) {
+						this.$u.toast('娣诲姞鎴愬姛');
+					} else {
+						this.$u.toast(res.msg ? res.msg : '娣诲姞澶辫触');
+					}
+				})
+				.then(r => {
 					this.getFleet();
-				} else {
-					this.$u.toast(res.data ? res.data : '娣诲姞澶辫触');
-				}
-			});
+				});
 			this.updateGroupShow = false;
 		},
 		// 鍒犻櫎璐т唬
@@ -208,17 +259,18 @@
 			uni.showLoading({
 				title: '鍔犺浇涓�...'
 			});
-			this.$reqPost('deleteHuoDai', { id: this.deleteHuoDaiId }, 'params').then(res => {
-				uni.hideLoading();
-				if (res.code == 0) {
-					if (res.data) {
+			this.$reqPost('deleteHuoDai', { id: this.deleteHuoDaiId }, 'params')
+				.then(res => {
+					uni.hideLoading();
+					if (res.code == 0) {
 						this.$u.toast('鍒犻櫎鎴愬姛');
-						this.getAllHuoDaiByCustomerId();
 					} else {
-						this.$u.toast('鍒犻櫎澶辫触');
+						this.$u.toast(res.msg ? res.msg : '鍒犻櫎澶辫触');
 					}
-				}
-			});
+				})
+				.then(r => {
+					this.getAllHuoDaiByCustomerId();
+				});
 		},
 		// 鍒犻櫎杞﹂槦
 		deleteFleetClick(args) {
@@ -242,19 +294,24 @@
 			uni.showLoading({
 				title: '鍔犺浇涓�...'
 			});
-			this.$reqPost('deleteFleet', { id: this.deleteFleetId }, 'params').then(res => {
-				console.log('鍒犻櫎杞﹂槦', res);
-				if (res.code == 0) {
-					this.$u.toast('鍒犻櫎鎴愬姛');
-				}
-				uni.hideLoading();
-				this.getFleet();
-			});
+			this.$reqPost('deleteFleet', { id: this.deleteFleetId }, 'params')
+				.then(res => {
+					console.log('鍒犻櫎杞﹂槦', res);
+					if (res.code == 0) {
+						this.$u.toast('鍒犻櫎鎴愬姛');
+					} else {
+						this.$u.toast(res.msg ? res.msg : '鍒犻櫎澶辫触');
+					}
+					uni.hideLoading();
+				})
+				.then(() => {
+					this.getFleet();
+				});
 		},
 		// 璐т唬璇︽儏
-		toFreightForwarderDetails(id) {
+		toFreightForwarderDetails(userId) {
 			uni.navigateTo({
-				url: `/pages/customer-page/freight-forwarder-details/freight-forwarder-details`
+				url: `/pages/customer-page/freight-forwarder-details/freight-forwarder-details?userId=${userId}`
 			});
 		},
 		// 杞﹂槦璇︽儏
@@ -271,15 +328,84 @@
 		},
 		logoutCancel() {
 			this.logoutShow = false;
+		},
+		// 璺宠浆鐢ㄦ埛绠$悊椤甸潰
+		userManage() {
+			uni.navigateTo({
+				url: '/pages/customer-page/customer-my/userMange/userMange'
+			});
 		}
 	}
 };
 </script>
 
 <style lang="scss" scoped>
+@mixin flex {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+.utils-button {
+	margin-top: vww(35);
+	.statistics,
+	.logout {
+		margin-top: vww(10);
+		margin-bottom: vww(10);
+		/deep/ .u-button {
+			width: 631rpx;
+			height: 74rpx;
+			border: 2px solid #3b56eb;
+			background-color: #fff;
+			color: #3b56eb;
+			border-radius: 37rpx 37rpx 37rpx 37rpx;
+		}
+	}
+}
+
 ::v-deep.customer-my {
-	width: 94%;
-	margin: 0 auto;
+	width: 100%;
+	margin: vww(90) auto;
+	.driver-banner {
+		width: 100%;
+		height: 430rpx;
+		background: linear-gradient(0deg, #ffffff 0%, #0055fe 100%);
+		background-size: contain;
+		position: fixed;
+		top: 0;
+		.navgation {
+			width: 80rpx;
+			height: 37rpx;
+			font-size: 40rpx;
+			font-weight: normal;
+			color: #ffffff;
+			line-height: 69rpx;
+			margin: vww(60) auto;
+		}
+	}
+	.personal-information {
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		flex-direction: column;
+		position: relative;
+		top: vww(20);
+		&-block {
+			width: 690rpx;
+			min-height: 478rpx;
+			background: #ffffff;
+			box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
+			border-radius: 20rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			margin-top: vww(8);
+			.block-main {
+				width: 636rpx;
+				margin: vww(10) vww(14);
+			}
+		}
+	}
 
 	.huodai {
 		.huodai-list {

--
Gitblit v1.9.1