~fyy/unattended-app.git

			@@ -4,6 +4,37 @@
			<view class="navgation">我的</view>
			</view>
			<view class="personal-information">
			<view class="personal-information-block" v-if="userInfo.isBuyFlag=='1'?true:false">
			<view class="block-main">
			<view class="huodai">
			<combined-title title="我的购买证"
			@rightText="addGouMai">
			<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 BuyCardData"
			:key="item.userId"
			:name="item.productName">
			<u-cell :title="item.productName"
			:value="item.status==0?'待生效':item.status==1?'生效':'废弃'"
			>
			<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 class="personal-information-block">
			<view class="block-main">
			<view class="huodai">
			@@ -78,9 +109,9 @@
			<view class="logout"><u-button text="修改密码"
			type="primary"
			@click="modifyPwd"></u-button></view>
			<view class="logout"><u-button text="重置密码"
			<!-- <view class="logout"><u-button text="重置密码"
			type="primary"
			@click="initPwd"></u-button></view>
			@click="initPwd"></u-button></view> -->
			<view class="logout"><u-button text="退出登录"
			type="primary"
			@click="logout()"></u-button></view>
			@@ -150,30 +181,6 @@
			@confirm="logoutConfirm"
			@cancel="logoutCancel"></u-modal>
			</view>
			<!-- 重置密码弹出框 -->
			<view class="initPwdModal">
			<u-modal :show="initPwdShow"
			title="重置密码"
			showCancelButton
			content="初始密码将变更为123456,是否确认重置"
			@confirm="initPwdConfirm"
			@cancel="initPwdCancel"></u-modal>
			</view>
			<!-- 修改密码弹出框 -->
			<view class="modifyPwdModal">
			<u-modal :show="modifyPwdShow"
			title="修改密码"
			showCancelButton
			@confirm="modifyPwdConfirm"
			@cancel="modifyPwdCancel">
			<view class="modifyPwd">
			<u-input v-model="passwordModified"
			placeholder="请输入修改后的密码"
			border="surround"
			type="password"></u-input>
			</view>
			</u-modal>
			</view>
			</view>
			</template>

			@@ -186,7 +193,9 @@
			},
			data() {
			return {
			userInfo: {},
			huoDaiData: [],
			BuyCardData:[],
			fleetData: [],
			// 新建车队
			addGroupForm: {
			@@ -223,19 +232,28 @@
			return uni.getStorageSync('roleType');
			}
			},
			onShow() {
			this.init();
			},
			methods: {
			init() {
			this.getAllHuoDaiByCustomerId();
			this.getFleet();
			this.getUserEntity();
			},
			// 获取用户信息
			getUserEntity() {
			uni.showLoading({
			title: '加载中...'
			});
			this.$reqGet('getUserEntity').then(res => {
			this.userEntity = res.data;
			this.userInfo = res.data;
			this.getBuyCardList();
			})
			},
			getBuyCardList() {
			uni.showLoading({
			title: '加载中...'
			});
			this.$reqGet('getBuyCardList',{customerId: this.userInfo.customerid}).then(res => {
			uni.hideLoading();
			this.BuyCardData = res.data;
			});
			},
			// 获取货代列表
			@@ -262,6 +280,12 @@
			addHuoDai() {
			uni.navigateTo({
			url: '/pages/customer-page/addTo-freightForwarder-driver/addTo-freightForwarder-driver?role=1' // 1代表的是货代
			});
			},
			// 添加购买证
			addGouMai(){
			uni.navigateTo({
			url: '/pages/customer-page/addTo-freightForwarder-purchasePermit/addTo-freightForwarder-purchasePermit'
			});
			},
			// 添加车队
			@@ -385,50 +409,6 @@
			url: `/pages/customer-page/fleet-management/fleet-management?id=${id}`
			});
			},
			updateInfo() {
			this.$reqPost('updateUser', this.userEntity, 'json').then(res => {
			uni.hideLoading()
			if (res.code == 0) {
			uni.showToast({
			title: '重置成功',
			duration: 2000,
			icon: 'success'
			})
			} else {
			this.$u.toast(res.msg ? res.msg : '修改失败');
			}
			}).catch(err => {
			this.$u.toast('修改失败');
			});
			},
			initPwd() {
			this.initPwdShow = true
			},
			initPwdConfirm() {
			this.initPwdShow = false
			uni.showLoading({
			title: '加载中'
			})
			this.userEntity.password = '123456'
			this.updateInfo()
			},
			initPwdCancel() {
			this.initPwdShow = false
			},
			modifyPwd() {
			this.modifyPwdShow = true
			},
			modifyPwdConfirm() {
			if (this.passwordModified.length === 0) {
			return this.$u.toast('密码不能为空')
			}
			this.modifyPwdShow = false
			this.userEntity.password = this.passwordModified
			this.updateInfo()
			},
			modifyPwdCancel() {
			this.modifyPwdShow = false
			},
			logout() {
			this.logoutShow = true;
			},
			@@ -440,6 +420,13 @@
			logoutCancel() {
			this.logoutShow = false;
			},
			modifyPwd() {
			this.$store.commit('changeisLogin', false)
			this.$store.dispatch('websocketOnClose')
			uni.reLaunch({
			url: `/pages/login/resetPassword/resetPassword?phone=${this.userInfo.phone}&idCard=${this.userInfo.idCard}`
			})
			},
			// 跳转用户管理页面
			userManage() {
			uni.navigateTo({