Merge remote-tracking branch 'origin/master'

pages/user/user.vue

@@ -6,7 +6,7 @@
 			<view class="content" :style="{ top: margin + 'px' }">
 				<view class="head" :style="{ marinTop: margin + 'px' }">
 					<view class="avatar">
-						<image :src="`${$imgUrl}myImage/touxiang.png`" :class="!state.data.opId ? 'unlogin' : ''"
+						<image class="avatar-image" :src="`${$imgUrl}myImage/touxiang.png`" :class="!state.data.opId ? 'unlogin' : ''"
 							@click="goLogin">
 						</image>
 
@@ -14,15 +14,14 @@
 							<view class="nickname">登录/注册</view>
 						</view>
 						<view v-else class="name">
-							<view class="nickname">{{state.accountInfoVo.userName || state.accountInfoVo.nickName}}
-							</view>
+							<view class="nickname">{{state.accountInfoVo.userName || state.accountInfoVo.nickName}}</view>
 							<view class="user-id">
 								<view class="phone">{{state.accountInfoVo.mobile}}</view>
-								<view v-if="false"
-									@click="$util.navTo('/subpackage/personal-center/setting/change-phone', true)"
-									class="btn-change">已关联</view>
+								<view @click="changePhone" class="btn-change">
+									<image class="btn-change-image" :src="`${$imgUrl}common/icon-edit.png`"></image>
+								</view>
 							</view>
-							<view v-if="!isSm" class="btn-change-two">已实名认证</view>
+							<text v-if="!isSm" class="btn-change-two">已实名认证</text>
 						</view>
 					</view>
 					<view class="r-setting" @click="$util.navTo('/subpackage/personal-center/setting/setting', true)">
@@ -94,7 +93,7 @@
 								<image :src="`${$imgUrl}myImage/myIcon.png`" class="r-img" mode="widthFix"></image>
 							</view>
 						</view>
-						<view class="list_item">
+						<view class="list_item" @click="noTips">
 							<view class="l-con">
 								<image :src="`${$imgUrl}myImage/afterOrder.png`" class="equity-icon" mode="widthFix">
 								</image>
@@ -274,6 +273,18 @@
 	const goEquity = () => {
 		navTo('/subpackage/service/equityList/equityList')
 	}
+	
+	const changePhone = () => {
+		console.log(111)
+		navTo('/subpackage/personal-center/setting/change-phone', true)
+	}
+	
+	const noTips = () => {
+		uni.showToast({
+			title: '功能开发者，敬请期待',
+			icon: 'none'
+		})
+	}
 </script>
 <style>
 	page {
@@ -336,12 +347,16 @@
 		justify-content: space-between;
 	}
 
-	.head .avatar image {
+	.head .avatar .avatar-image {
 		width: 141rpx;
 		height: 141rpx;
 		/* border-radius: 80rpx; */
 		margin: 0 20rpx 0 30rpx;
 	}
+	.avatar .name{
+		display: flex;
+		flex-direction: column;
+	}
 
 	.head .setting {
 		display: flex;
@@ -388,23 +403,18 @@
 		color: #fff;
 		padding-top: 20rpx;
 		display: flex;
-		align-items: center;
 	}
 
 	.head .btn-change {
-		font-size: 22rpx;
-		height: 40rpx;
-		padding: 0 20rpx;
-		border: 1px solid #fff;
-		color: #fff;
-		box-sizing: border-box;
-		border-radius: 20rpx;
 		margin-left: 16rpx;
-		background: rgba(0, 179, 139, .1);
 	}
-	
+	.btn-change-image{
+		width: 34rpx;
+		height: 34rpx;
+	}
 	.btn-change-two {
 		font-size: 22rpx;
+		width: 206rpx;
 		height: 40rpx;
 		padding: 0 40rpx;
 		border: 1px solid #CCB375;

subpackage/personal-center/setting/change-phone.vue

@@ -76,7 +76,8 @@
 		const options = {
 			type: 2,
 			data: {
-				mobile: state.phone
+				mobile: state.phone,
+				businessType: 3
 			},
 			method: "POST",
 			showLoading: true,

subpackage/personal-center/setting/setting.vue

@@ -42,20 +42,20 @@
 	const titleStyle = { fontSize: '28rpx', color: '#333333' };
 	const basePath = "/subpackage/personal-center/setting/";
 	const list = [
-		{
-			title: '个人信息管理',
-			columns: [
-				{ title: '个人信息更正', path: 'personal-information/corrections', login: true },
-				{ title: '个人信息删除', path: 'information-deletion', login: true },
-				{ title: '权限管理', path: 'permission-management', login: true },
-				// {title:'撤销权限管理',path:'revoke-permission',login:true}, //无 UI
-				{ title: '信息副本导出', path: 'info-export', login: true }, //无 UI
-				{ title: '注销账户', path: 'account-cancellation', login: true },
-				{ title: '车辆信息管理', path: '/subpackage/personal-center/vehicle-information', login: true }, //无 UI
-				{ title: '收货地址管理', path: 'addressManager', login: true }, //有 UI 无界面
-				// {title:'银行卡',path:'bank-card/bank-card',login:true},//有 UI 无界面
-			]
-		},
+		// {
+		// 	title: '个人信息管理',
+		// 	columns: [
+		// 		{ title: '个人信息更正', path: 'personal-information/corrections', login: true },
+		// 		{ title: '个人信息删除', path: 'information-deletion', login: true },
+		// 		{ title: '权限管理', path: 'permission-management', login: true },
+		// 		// {title:'撤销权限管理',path:'revoke-permission',login:true}, //无 UI
+		// 		{ title: '信息副本导出', path: 'info-export', login: true }, //无 UI
+		// 		{ title: '注销账户', path: 'account-cancellation', login: true },
+		// 		{ title: '车辆信息管理', path: '/subpackage/personal-center/vehicle-information', login: true }, //无 UI
+		// 		{ title: '收货地址管理', path: 'addressManager', login: true }, //有 UI 无界面
+		// 		// {title:'银行卡',path:'bank-card/bank-card',login:true},//有 UI 无界面
+		// 	]
+		// },
 		{
 			title: '隐私',
 			columns: [
@@ -108,8 +108,9 @@
 			} else if (item.title == '权限使用说明') {
 				type = "PRIVILEGE_USE"
 			}
-			getInfo(type).then((data) => {
-				console.log("data", data)
+			getInfo(type).then((res) => {
+				let list = res.list || []
+				let data = list && list.length > 0 ? list[list.length - 1] : []
 				if (data.textType == "URL") {
 					previewPdf(envs[process.env.NODE_ENV].baseUrl + data.text)
 				} else {