制作个人中心各界面

mixins/tabbar.js

@@ -20,7 +20,7 @@ export default {
 				{
 					text: '',
 					count: 0,
-					pagePath: '/pages/chat/message',
+					pagePath: '/pages/message/mailMessage',
 					iconPath: '/static/tabbar-icon/message.png',
 					selectedIconPath: '/static/tabbar-icon/messageActive.png'
 				},

pages.json

@@ -177,6 +177,12 @@
 				"navigationBarTitleText": "设置",
 				"navigationBarBackgroundColor": "#ffffff"
 			}
+		}, {
+			"path": "pages/AboutUs/xieyi",
+			"style": {
+				"navigationBarTitleText": "协议内容",
+				"navigationBarBackgroundColor": "#ffffff"
+			}
 		}, {
 			"path": "pages/AboutUs/yhxy",
 			"style": {
@@ -221,7 +227,7 @@
 				"pagePath": "pages/make/index"
 			},
 			{
-				"pagePath": "pages/chat/message",
+				"pagePath": "pages/message/mailMessage",
 				"iconPath": "static/tab/tab_sms.png",
 				"selectedIconPath": "static/tab/tab_sms_sel.png",
 				"text": "消息"

pages/AboutUs/xieyi.scss

@@ -0,0 +1,88 @@
+page {
+	background-color: #ffffff;
+}
+.page {
+	background-color: #ffffff;
+}
+
+.topBody {
+	width:750rpx;
+}
+.list_info {
+	display: flex;
+	flex-direction: column;
+	width: 750rpx;
+	padding: 20rpx 0;
+	
+	.group-header {
+		padding: 20rpx 30rpx;
+		font-size: 28rpx;
+		color: #999;
+		background-color: #f8f8f8;
+	}
+	
+	.item {
+		width: 750rpx;
+		height: 100rpx;
+		padding: 0 30rpx;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		border-bottom: solid 1px #f0f0f0;
+		
+		.item-left {
+			display: flex;
+			align-items: center;
+			
+			.icon {
+				width: 40rpx;
+				height: 40rpx;
+				margin-right: 20rpx;
+			}
+			
+			text {
+				font-size: 28rpx;
+				color: #333;
+			}
+		}
+		
+		.item-right {
+			display: flex;
+			align-items: center;
+			
+			.arrow {
+				width: 36rpx;
+			}
+		}
+	}
+	
+}
+.version-info {
+	position: fixed;
+	width: 100%;
+	text-align: center;
+	font-size: 24rpx;
+	color: #999;
+	position: fixed;
+	bottom: 176rpx;
+}
+.btn_submit {
+	width: 660rpx;
+	height: 96rpx;
+	position: fixed;
+	bottom: 50rpx;
+	left: 45rpx;
+	border: 2rpx solid #f0f0f0;
+	border-radius: 28rpx;
+	font-size: 32rpx;
+	color: #FF2A95;
+	display: flex;
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+	background-color: #fff;
+}
+.blankHeight {
+	height:300rpx;
+}

pages/AboutUs/xieyi.vue

@@ -0,0 +1,122 @@
+<template>
+	<view class="page">
+		<view class="list_info">
+			<!-- 基础设置组 -->
+			<view class="item" v-for="(item,index) in basicSettings" :key="index" @click="goPage(item.path)">
+				<view class="item-left">
+					<image class="icon" :src="item.icon" mode="widthFix"></image>
+					<text>{{item.name}}</text>
+				</view>
+				<view class="item-right">
+					<switch v-if="item.switch == 1" checked color="#FFCC33" style="transform:scale(0.7)" />
+					<image v-else class="arrow" src="../../static/me/arrow_right_gray.png" mode="widthFix"></image>
+				</view>
+			</view>
+
+		</view>
+
+
+		<DialogBox ref="DialogBox"></DialogBox>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {},
+		data() {
+			return {
+				title: '',
+				sel: 1,
+				myinfo: {},
+				version: '',
+				basicSettings: [{
+						'name': '隐私政策',
+						'desc': '',
+						'path': '/pages/AboutUs/yszc',
+						'icon': '../../static/me/security.png'
+					},
+					{
+						'name': '用户协议',
+						'desc': '',
+						'path': '/pages/AboutUs/yhxy',
+						'icon': '../../static/me/profile.png'
+					},
+					{
+						'name': '第三方SDK列表',
+						'desc': '',
+						'path': '',
+						'icon': '../../static/me/profile.png'
+					},
+					{
+						'name': '个人信息收集公示',
+						'desc': '',
+						'path': '',
+						'icon': '../../static/me/profile.png'
+					},
+				],
+			}
+		},
+		onLoad() {
+			this.getAppVersion()
+		},
+		onShow() {
+			this.loadData();
+		},
+		methods: {
+			onBack() {},
+			chkSel() {
+				if (this.sel == 1) {
+					this.sel = 0;
+				} else {
+					this.sel = 1;
+				}
+			},
+			goPage(page) {
+				if (page == 'delete') {
+					this.DelMem();
+				} else if (page == 'yszc') {
+
+					// #ifdef APP-PLUS
+					plus.runtime.openURL('https://e.zhichao.art/web/yszc.php') // plus.runtime.openWeb(href);
+					// #endif
+
+					// #ifdef H5
+					window.open('https://e.zhichao.art/web/yszc.php')
+					// #endif
+				} else if (page == 'kefu') {
+					let that = this;
+					// #ifdef APP-PLUS
+					plus.share.getServices(res => {
+						const wechat = res.find(i => i.id === 'weixin')
+						if (wechat) {
+							wechat.openCustomerServiceChat({
+								corpid: 'wwbc06aa8311b6ac08',
+								// url: 'https://work.weixin.qq.com/kfid/kfc4b0bcb4038d00a50'
+								url: that.myinfo.wxkf
+							}, src => {
+								console.log("success:")
+							}, err => {
+								console.log("error:")
+							})
+						} else {
+							uni.showToast({
+								title: '没有检测到微信，请先安装',
+								icon: "error"
+							});
+						}
+					});
+					// #endif
+
+				} else if (page != '') {
+					uni.navigateTo({
+						url: page,
+					})
+				}
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import 'xieyi.scss';
+</style>

pages/AboutUs/yong.vue

@@ -107,7 +107,7 @@
 		top: 0;
 		width: 100%;
 		height: 100%;
-		background-color: #161616;
+		background-color: #fff;
 	}
 
 	.xy-list {
@@ -125,7 +125,7 @@
 			padding-top: 10rpx;
 
 			.title {
-				color: #fff;
+				color: #333;
 				width: 100%;
 				text-align: center;
 			}
@@ -134,7 +134,7 @@
 				display: flex;
 				align-items: center;
 				padding-left: 20rpx;
-				color: #ffffff;
+				color: #333;
 
 				text {
 					font-size: 26rpx;

pages/login/login.vue

@@ -135,13 +135,13 @@
 			// console.log("hsign", hsign)
 
 
-			let skey = uni.getStorageSync("wapptoken");
-			if (skey != null && skey != "" && skey != undefined) {
-				uni.switchTab({
-					url: "/pages/index/index"
-				});
-				return;
-			}
+			// let skey = uni.getStorageSync("wapptoken");
+			// if (skey != null && skey != "" && skey != undefined) {
+			// 	uni.switchTab({
+			// 		url: "/pages/index/index"
+			// 	});
+			// 	return;
+			// }
 			// let that = this;
 			// uni.getLocation({
 			// 	type: 'wgs84',

pages/my/editInfo.vue

@@ -20,7 +20,7 @@
 				<view class="info_item">
 					<text class="label">简介</text>
 					<view class="content">
-						<input type="text" placeholder="请输入简介" v-model="wechat" maxlength="32" />
+						<input type="text" placeholder="请输入简介" v-model="content" maxlength="32" />
 						<image class="arrow" src="../../static/me/arrow_right_gray.png" mode="widthFix" />
 					</view>
 				</view>
@@ -36,15 +36,17 @@
 				<view class="info_item">
 					<text class="label">生日</text>
 					<view class="content">
-						<input type="text" placeholder="请选择生日" v-model="ziye" maxlength="50" />
+						<picker mode="date" :value="birthday" :end="endDate" @change="onBirthdayChange">
+							<input type="text" placeholder="请选择生日" v-model="birthday" disabled="true" />
+						</picker>
 						<image class="arrow" src="../../static/me/arrow_right_gray.png" mode="widthFix" />
 					</view>
 				</view>
 
-				<view class="info_item" @click="SetXinzuo">
+				<view class="info_item">
 					<text class="label">星座</text>
 					<view class="content">
-						<input type="text" placeholder="请选择" v-model="xinzuo_sel" disabled="true" />
+						<input type="text" :value="xinzuo_sel" disabled="true" />
 						<image class="arrow" src="../../static/me/arrow_right_gray.png" mode="widthFix" />
 					</view>
 				</view>
@@ -106,7 +108,7 @@
 				info: {},
 				showPop: false,
 				nickname: '',
-				wechat: '',
+				content: '',
 				sex: 1,
 				age: 18,
 				height: 160,
@@ -115,17 +117,15 @@
 				ziye: '',
 				qianmin: '',
 
-				xueli_sel: '',
-				xueli: ['初中', '初中', '中专', '高中', '专科', '本科', '研究生', '硕士', '博士'],
 				xinzuo_sel: '',
 				xinzuo: ['水瓶座', '双鱼座', '白羊座', '金牛座', '双子座', '巨蟹座', '狮子座', '处女座', '天秤座', '天蝎座', '射手座', '摩羯座'],
 
-				list_tag: [
-					'篮球', '排球', '足球', '羽毛球', '健身达人', '美食达人'
-				],
+				list_tag: [],
 				sel_tags: [],
 				sexText: '',
-				sexOptions: ['男', '女', '其他']
+				birthday: '',
+				sexOptions: ['男', '女', '其他'],
+				endDate: new Date().toISOString().split('T')[0]
 			}
 		},
 		onLoad() {
@@ -197,32 +197,6 @@
 			sliderChange3(e) {
 				this.weight = e.detail.value;
 			},
-			SetXueli() {
-				let that = this;
-				uni.showActionSheet({
-					itemColor: '#000000',
-					itemList: this.xueli,
-					success: function(res) {
-						that.xueli_sel = that.xueli[res.tapIndex];
-					},
-					fail: function(res) {
-						console.log(res.errMsg);
-					}
-				});
-			},
-			SetXinzuo() {
-				let that = this;
-				uni.showActionSheet({
-					itemColor: '#000000',
-					itemList: this.xinzuo,
-					success: function(res) {
-						that.xinzuo_sel = that.xinzuo[res.tapIndex];
-					},
-					fail: function(res) {
-						console.log(res.errMsg);
-					}
-				});
-			},
 			SetSex() {
 				let that = this;
 				uni.showActionSheet({
@@ -247,21 +221,16 @@
 						'content-type': 'application/json'
 					},
 					success: (res) => {
+						console.log(res.data);
 						this.nickname = res.data.nickname;
 						this.wechat = res.data.wechat;
 						this.sex = res.data.sex;
 						this.sexText = this.sexOptions[res.data.sex - 1] || '';
-						this.age = res.data.age;
-						this.height = res.data.height;
-						this.weight = res.data.weight;
-						this.xueli_sel = res.data.xueli;
-						this.xinzuo_sel = res.data.xinzuo;
-						this.ziye = res.data.ziye;
-						this.qianmin = res.data.qianmin;
+						this.birthday = res.data.birthday;
+						this.xinzuo_sel = this.getConstellation(this.birthday);
 						if (res.data.avator != "") {
 							this.avator = res.data.avator;
 						}
-						console.log(res.data.aihao);
 						if (res.data.aihao) {
 							this.sel_tags = res.data.aihao.split(",");
 						}
@@ -274,12 +243,9 @@
 					uuid: getApp().globalData.uuid,
 					avator: this.avator,
 					nickname: this.nickname,
-					wechat: this.wechat,
+					content: this.content,
 					sex: this.sex,
-					age: this.age,
-					height: this.height,
-					weight: this.weight,
-					xueli: this.xueli_sel,
+					birthday: this.birthday,
 					xinzuo: this.xinzuo_sel,
 					ziye: this.ziye,
 					qianmin: this.qianmin,
@@ -332,6 +298,7 @@
 									console.log('Success11:', uploadFileRes);
 									console.log('Success21:', resdata);
 									if (resdata.success == 'yes') {
+										_self.showRights = false;
 										_self.avator = resdata.url;
 									}
 								},
@@ -365,6 +332,41 @@
 						that.showRights = true;
 						console.log('权限申请失败：', error);
 					});
+			},
+			onBirthdayChange(e) {
+				this.birthday = e.detail.value;
+				this.xinzuo_sel = this.getConstellation(this.birthday);
+			},
+			getConstellation(birthday) {
+				if (!birthday) return '';
+
+				const month = parseInt(birthday.split('-')[1]);
+				const day = parseInt(birthday.split('-')[2]);
+
+				// 星座日期数组
+				const constellationDates = [
+					[1, 20, "水瓶座"],
+					[2, 19, "双鱼座"],
+					[3, 21, "白羊座"],
+					[4, 20, "金牛座"],
+					[5, 21, "双子座"],
+					[6, 22, "巨蟹座"],
+					[7, 23, "狮子座"],
+					[8, 23, "处女座"],
+					[9, 23, "天秤座"],
+					[10, 24, "天蝎座"],
+					[11, 23, "射手座"],
+					[12, 22, "摩羯座"]
+				];
+
+				let constellation = "";
+				if (day < constellationDates[month - 1][1]) {
+					constellation = constellationDates[month - 1][2];
+				} else {
+					constellation = constellationDates[month % 12][2];
+				}
+
+				return constellation;
 			}
 		}
 	}

pages/my/editPass.vue

@@ -3,22 +3,22 @@
 		<view class="list_info">
 			<view class="name">输入原密码：</view>
 			<view class="item">
-				<input type="text" class="input" placeholder="请输入原密码" v-model="password0" maxlength="32" />
+				<input type="password" class="input" placeholder="请输入原密码" v-model="password0" maxlength="32" />
 			</view>
 			<view class="name">请输入新密码：</view>
 			<view class="item">
-				<input type="text" class="input" placeholder="请输入新密码" v-model="password1" maxlength="32" />
+				<input type="password" class="input" placeholder="请输入新密码" v-model="password1" maxlength="32" />
 			</view>
 			<view class="name">请确认新密码：</view>
 			<view class="item">
-				<input type="text" class="input" placeholder="请再次输入新密码" v-model="password2" maxlength="32" />
+				<input type="password" class="input" placeholder="请再次输入新密码" v-model="password2" maxlength="32" />
 			</view>
 
 
 			<view class="blankHeight"></view>
 		</view>
 
-		<view class="btn_submit">确定</view>
+		<view class="btn_submit" @click="submitData">确定</view>
 
 
 		<!-- 提示框 -->
@@ -42,52 +42,42 @@
 
 			}
 		},
-		onLoad() {
-			setTimeout(function() {
-				uni.setNavigationBarColor({
-					frontColor: '#ffffff',
-					backgroundColor: '#00000000',
-					animation: {
-						duration: 400,
-						timingFunc: 'easeIn'
-					}
-				})
-			}, 200);
-		},
+		onLoad() {},
 		onShow() {
 			// this.loadData();
 		},
 		methods: {
 			onBack() {},
 			submitData() {
-				if (this.mobile == "") {
-					uni.showToast({
-						title: "请输入手机号码",
-						icon: 'none'
-					});
-					return;
-				}
-				if (this.password1 == "" || this.password1 != this.password2) {
+				// if (this.mobile == "") {
+				// 	uni.showToast({
+				// 		title: "请输入手机号码",
+				// 		icon: 'none'
+				// 	});
+				// 	return;
+				// }
+				if (this.password0 == "" || this.password1 == "" || this.password1 != this.password2) {
 					uni.showToast({
 						title: "请输入密码并确保两次密码一致",
 						icon: 'none'
 					});
 					return;
 				}
-				if (this.code == "") {
-					uni.showToast({
-						title: "请输入验证码",
-						icon: 'none'
-					});
-					return;
-				}
+				// if (this.code == "") {
+				// 	uni.showToast({
+				// 		title: "请输入验证码",
+				// 		icon: 'none'
+				// 	});
+				// 	return;
+				// }
 				uni.request({
 					url: this.$apiHost + '/Member/editPass',
 					data: {
 						uuid: getApp().globalData.uuid,
-						mobile1: this.mobile1,
-						mobile2: this.mobile2,
-						code: this.code,
+						type: 'password',
+						password0: this.password0,
+						password1: this.password1,
+						// code: this.code,
 					},
 					header: {
 						'content-type': 'application/json'
@@ -99,7 +89,9 @@
 							icon: 'none'
 						});
 						if (res.data.success == "yes") {
-
+							this.password0 = "";
+							this.password1 = "";
+							this.password2 = "";
 						}
 					}
 				});

pages/my/forgetPass.vue

@@ -3,7 +3,8 @@
 		<view class="list_info">
 			<view class="name">手机号码：</view>
 			<view class="item">
-				<input type="text" class="input" placeholder="请输入手机号码" v-model="mobile" maxlength="11" />
+				<input type="text" class="input" placeholder="请输入手机号码" v-model="mobile" maxlength="11"
+					disabled="true" />
 			</view>
 			<view class="name">验证码：</view>
 			<view class="item">
@@ -12,20 +13,17 @@
 			</view>
 			<view class="name">设置新密码：</view>
 			<view class="item">
-				<input type="text" class="input" placeholder="请输入新登录密码" v-model="password1" maxlength="32" />
+				<input type="password" class="input" placeholder="请输入新登录密码" v-model="password1" maxlength="32" />
 			</view>
 			<view class="name">确认新密码：</view>
 			<view class="item">
-				<input type="text" class="input" placeholder="请再次输入新登录密码" v-model="password2" maxlength="32" />
+				<input type="password" class="input" placeholder="请再次输入新登录密码" v-model="password2" maxlength="32" />
 			</view>
 
-
-
-
 			<view class="blankHeight"></view>
 		</view>
 
-		<view class="btn_submit">提交修改</view>
+		<view class="btn_submit" @click="submitData">提交修改</view>
 
 
 		<!-- 提示框 -->
@@ -40,7 +38,7 @@
 			return {
 				title: '',
 				sel: 1,
-				mobile: '',
+				mobile: '188****6699',
 				password1: '',
 				password2: '',
 				code: '',
@@ -48,18 +46,7 @@
 
 			}
 		},
-		onLoad() {
-			setTimeout(function() {
-				uni.setNavigationBarColor({
-					frontColor: '#ffffff',
-					backgroundColor: '#00000000',
-					animation: {
-						duration: 400,
-						timingFunc: 'easeIn'
-					}
-				})
-			}, 200);
-		},
+		onLoad() {},
 		onShow() {
 			// this.loadData();
 		},
@@ -143,8 +130,8 @@
 					url: this.$apiHost + '/Member/editPass',
 					data: {
 						uuid: getApp().globalData.uuid,
-						mobile1: this.mobile1,
-						mobile2: this.mobile2,
+						type: 'forget',
+						password: this.password1,
 						code: this.code,
 					},
 					header: {

pages/my/my.scss

@@ -28,6 +28,39 @@ page {
 		position: absolute;
 	}
 	
+	.top_num {
+		position: absolute;
+		top: 20rpx;
+		right: 30rpx;
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-end;
+		align-items: center;
+		z-index: 10;
+		
+		.num_1, .num_2 {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: center;
+			background: rgba(255, 255, 255, 0.8);
+			border-radius: 30rpx;
+			padding: 10rpx 20rpx;
+			margin-left: 20rpx;
+			
+			text:first-child {
+				font-size: 24rpx;
+				color: #666;
+			}
+			
+			text:last-child {
+				font-size: 32rpx;
+				font-weight: bold;
+				color: #333;
+			}
+		}
+	}
+	
 	.infoBg {
 		display: flex;
 		flex-direction: column;
@@ -36,7 +69,7 @@ page {
 		width: 690rpx;
 		height: 320rpx;
 		margin: 20rpx 30rpx;
-		margin-top: 50rpx;
+		margin-top: 90rpx;
 		background: rgba(255, 255, 255, 0.95);
 		backdrop-filter: blur(10px);
 		border-radius: 24rpx;

pages/my/my.vue

@@ -3,6 +3,16 @@
 		<view class="topBody">
 			<view class="header">
 				<view class="topBg"></view>
+				<view class="top_num">
+					<view class="num_1">
+						<text>M币</text>
+						<text>{{myinfo.num_gmd}}</text>
+					</view>
+					<view class="num_2">
+						<text>彩豆</text>
+						<text>{{myinfo.num_gmd}}</text>
+					</view>
+				</view>
 				<view class="infoBg">
 					<view class="top_row">
 						<view class="left" @click="goPage('/pages/my/editInfo')">
@@ -11,30 +21,36 @@
 						<view class="right" @click="goPage('/pages/my/editInfo')">
 							<view class="nickname">
 								<text>{{myinfo.nickname}}</text>
-								<image src="../../static/icon/man.png" mode="widthFix" />
-								<view class="level">Lv99</view>
+								<image src="../../static/icon/man.png" mode="widthFix" v-if="myinfo.sex_id == 1" />
+								<image src="../../static/icon/man.png" mode="widthFix" v-else-if="myinfo.sex_id == 2" />
+								<view class="level">Lv{{myinfo.my_level}}</view>
 							</view>
 							<view class="tags_list">
-								<uni-tag class="tag" type="primary" :inverted="false" text="标签1" size="mini" />
-								<uni-tag class="tag" type="primary" :inverted="false" text="标签2" size="mini" />
-								<uni-tag class="tag" type="primary" :inverted="false" text="标签3" size="mini" />
+								<block v-for="(item,index) in aihao_tags">
+									<uni-tag class="tag" type="primary" :inverted="false" :text="item" size="mini" />
+								</block>
 							</view>
 						</view>
 					</view>
 
 					<view class="bottom_row">
 						<view class="intro_row">
-							<text class="intro_text">添加简介</text>
-							<image src="../../static/icon/add.png" mode="widthFix" class="add_icon" />
+							<block v-if="myinfo.content == ''">
+								<text class="intro_text">添加简介</text>
+								<image src="../../static/icon/add.png" mode="widthFix" class="add_icon" />
+							</block>
+							<block v-else>
+								<text class="intro_text">{{myinfo.content}}</text>
+							</block>
 						</view>
 						<view class="follow_info">
-							<text class="num">378</text>
+							<text class="num">{{myinfo.num_attention}}</text>
 							<text class="label">关注</text>
 							<text class="separator"></text>
-							<text class="num">29</text>
+							<text class="num">{{myinfo.num_fans}}</text>
 							<text class="label">粉丝</text>
 							<text class="separator"></text>
-							<text class="num">528</text>
+							<text class="num">{{myinfo.num_like}}</text>
 							<text class="label">获赞</text>
 						</view>
 					</view>
@@ -100,6 +116,7 @@
 					num_history: 0,
 					num_collection: 0,
 				},
+				aihao_tags: [],
 				menu_list: [],
 				data_list: [{
 						url: 'https://e.zhichao.art/AI_images/a_1112_10.png',
@@ -159,6 +176,7 @@
 			// this.loadAge();
 			// this.loadData();
 			// this.loadMenu();
+			this.loadInfo();
 		},
 		methods: {
 			onBack() {},
@@ -200,13 +218,13 @@
 					})
 				}
 			},
-			loadData() {
+			loadInfo() {
 				console.log({
 					uuid: getApp().globalData.uuid,
 					skey: getApp().globalData.skey
 				});
 				uni.request({
-					url: this.$apiHost + '/Web/getinfo',
+					url: this.$apiHost + '/User/getinfo',
 					data: {
 						uuid: getApp().globalData.uuid,
 						skey: getApp().globalData.skey
@@ -220,22 +238,14 @@
 						if (res.data.need_login == "yes") {
 							// getApp().globalData.skey = "";
 							// getApp().globalData.uuid = "";
-							uni.removeStorageSync("wapptoken");
-							uni.redirectTo({
-								url: '/pages/login/login'
-							});
-							return;
-						}
-						if (res.data.need_edit == "yes") {
-							uni.navigateTo({
-								url: '/pages/my/step'
-							});
-							return;
+							// uni.removeStorageSync("wapptoken");
+							// uni.redirectTo({
+							// 	url: '/pages/login/login'
+							// });
+							// return;
 						}
-						if (res.data.avator != "") {
-							uni.setStorageSync("my_avator", res.data.avator);
-						} else {
-							uni.setStorageSync("my_avator", "/static/logo.png");
+						if (res.data.aihao) {
+							this.aihao_tags = res.data.aihao.split(",");
 						}
 						this.myinfo = res.data;
 					},
@@ -247,42 +257,6 @@
 					}
 				});
 			},
-			loadMenu() {
-				console.log({
-					uuid: getApp().globalData.uuid,
-					skey: getApp().globalData.skey
-				});
-				uni.request({
-					url: this.$apiHost + '/User/getinfo',
-					data: {
-						uuid: getApp().globalData.uuid,
-						skey: getApp().globalData.skey
-					},
-					header: {
-						"content-type": "application/json",
-						'sign': getApp().globalData.headerSign
-					},
-					success: (res) => {
-						console.log("----:", res.data);
-						if (res.data.need_login == "yes") {
-							// getApp().globalData.skey = "";
-							// getApp().globalData.uuid = "";
-							uni.removeStorageSync("wapptoken");
-							uni.redirectTo({
-								url: '/pages/login/login'
-							});
-							return;
-						}
-						this.menu_list = res.data.list01;
-					},
-					complete: (com) => {
-						// uni.hideLoading();
-					},
-					fail: (e) => {
-						console.log("----e:", e);
-					}
-				});
-			},
 			onLogout() {
 				let that = this;
 				this.$refs['DialogBox'].confirm({
@@ -321,12 +295,20 @@
 					});
 				})
 			},
-			loadAge() {
-				let that = this;
+			switchTab(index) {
+				this.activeTab = index;
+				this.loadData();
+			},
+			loadData() {
+				console.log({
+					uuid: getApp().globalData.uuid,
+					skey: getApp().globalData.skey
+				});
 				uni.request({
-					url: this.$apiHost + '/Member/checkAge',
+					url: this.$apiHost + '/My/getdata',
 					data: {
-						uuid: getApp().globalData.uuid
+						uuid: getApp().globalData.uuid,
+						skey: getApp().globalData.skey
 					},
 					header: {
 						"content-type": "application/json",
@@ -334,15 +316,10 @@
 					},
 					success: (res) => {
 						console.log("----:", res.data);
-						if (res.data.need_xiuxi == "yes") {
-							uni.redirectTo({
-								url: '/pages/AboutUs/xiuxi'
-							});
-							return;
-						}
-						if (res.data.need_show_yong == 'yes') {
-							that.showYong = true;
+						if (res.data.success == 'yes') {
+
 						}
+						// this.myinfo = res.data;
 					},
 					complete: (com) => {
 						// uni.hideLoading();
@@ -352,9 +329,6 @@
 					}
 				});
 			},
-			switchTab(index) {
-				this.activeTab = index;
-			},
 		}
 	}
 </script>

pages/my/myArticle.scss

@@ -1,9 +1,9 @@
 
 page {
-	background-color: #161616;
+	background-color: #fff;
 }
 .page {
-	background-color: #161616;
+	background-color: #fff;
 }
 .topbg {
 }
@@ -12,7 +12,7 @@ page {
 }
 .mainBody {
 	width:750rpx;padding:1rpx 20rpx;display: flex;flex-direction: column;
-	border-bottom: solid 2rpx #393939;
+	border-bottom: solid 2rpx #f0f0f0;
 	.menu {
 		display: flex;flex-direction: row;justify-content: space-between;padding:20rpx 0rpx 0rpx;
 		.item {
@@ -20,12 +20,12 @@ page {
 			color:#999999;
 			.line {
 				width: 36rpx;height: 8rpx;margin-top: 20rpx;
-				background: #161616;
+				background: #959595;
 				border-radius: 4rpx 4rpx 4rpx 4rpx;
 			}
 		}
 		.active {
-			color:#fff;
+			color:#333;
 			.line {
 				width: 36rpx;height: 8rpx;margin-top: 20rpx;
 				background: linear-gradient( 90deg, #FF5869 0%, #F83881 100%);
@@ -35,11 +35,11 @@ page {
 	}
 }
 .list_info {
-	display: flex;flex-direction: column;justify-content: flex-start;align-items: center;color:#fff;
+	display: flex;flex-direction: column;justify-content: flex-start;align-items: center;color:#333;
 	width:750rpx;
 	
 	.item {
-		width: 690rpx;margin: 0rpx 0;color:#fff;font-size: 28rpx;padding:20rpx 0 0rpx;
+		width: 690rpx;margin: 0rpx 0;color:#333;font-size: 28rpx;padding:20rpx 0 0rpx;
 		display: flex;flex-direction: row;justify-content: flex-start;align-items: center;
 		.avator {
 			width:88rpx;
@@ -101,7 +101,7 @@ page {
 		}
 	}
 	.content {
-		width: 690rpx;font-weight: 400;font-size: 28rpx;color: #FFFFFF;text-align: left;font-style: normal;
+		width: 690rpx;font-weight: 400;font-size: 28rpx;color: #333;text-align: left;font-style: normal;
 		text-transform: none;padding:20rpx 0;
 		padding-left:88rpx;
 	}
@@ -117,7 +117,7 @@ page {
 			}
 		}
 		.right {
-			color:#fff;
+			color:#333;
 		}
 	}
 	.desc {
@@ -138,7 +138,7 @@ page {
 		}
 		.img {
 			display: flex;flex-direction: row;justify-content: center;align-items: center;
-			padding:0 0rpx 0 30rpx;font-size: 28rpx;color:#fff;
+			padding:0 0rpx 0 30rpx;font-size: 28rpx;color:#333;
 		}
 	}
 }

pages/my/security.vue

@@ -2,7 +2,7 @@
 	<view class="page">
 		<!-- 基本资料组 -->
 		<view class="group">
-			<view class="item" @click="goPage('/pages/my/profile')">
+			<view class="item" @click="goPage('/pages/my/editInfo')">
 				<text class="title">基本资料</text>
 				<view class="right">
 					<text class="action">去完善</text>
@@ -20,7 +20,7 @@
 					<image class="arrow" src="../../static/me/arrow_right_gray.png" mode="widthFix"></image>
 				</view>
 			</view>
-			<view class="item" @click="goPage('/pages/my/forgetPass')">
+			<view class="item" @click="goPage('/pages/my/editPass')">
 				<text class="title">登录密码</text>
 				<view class="right">
 					<text class="value">未设置</text>
@@ -50,43 +50,43 @@
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			phoneNumber: '', // 用户手机号
-		}
-	},
-	onLoad() {
-		this.loadUserInfo()
-	},
-	methods: {
-		loadUserInfo() {
-			// 这里添加获取用户信息的逻辑
-			// 获取手机号等信息
-		},
-		goPage(url) {
-			uni.navigateTo({
-				url: url
-			})
+	export default {
+		data() {
+			return {
+				phoneNumber: '', // 用户手机号
+			}
 		},
-		bindWechat() {
-			// 微信绑定逻辑
-			uni.showToast({
-				title: '暂未开放',
-				icon: 'none'
-			})
+		onLoad() {
+			this.loadUserInfo()
 		},
-		bindQQ() {
-			// QQ绑定逻辑
-			uni.showToast({
-				title: '暂未开放',
-				icon: 'none'
-			})
+		methods: {
+			loadUserInfo() {
+				// 这里添加获取用户信息的逻辑
+				// 获取手机号等信息
+			},
+			goPage(url) {
+				uni.navigateTo({
+					url: url
+				})
+			},
+			bindWechat() {
+				// 微信绑定逻辑
+				uni.showToast({
+					title: '暂未开放',
+					icon: 'none'
+				})
+			},
+			bindQQ() {
+				// QQ绑定逻辑
+				uni.showToast({
+					title: '暂未开放',
+					icon: 'none'
+				})
+			}
 		}
 	}
-}
 </script>
 
 <style scoped lang="scss">
 	@import 'security.scss';
-</style> 
+</style>

pages/my/setting.vue

@@ -3,7 +3,7 @@
 		<view class="list_info">
 			<!-- 基础设置组 -->
 			<view class="group-header">基础设置</view>
-			<view class="item" v-for="(item,index) in basicSettings" :key="index" @click="goPage(item.path)">
+			<view class="item" v-for="(item,index) in basicSettings" @click="goPage(item.path)">
 				<view class="item-left">
 					<image class="icon" :src="item.icon" mode="widthFix"></image>
 					<text>{{item.name}}</text>
@@ -16,7 +16,7 @@
 
 			<!-- 更多设置组 -->
 			<view class="group-header">更多</view>
-			<view class="item" v-for="(item,index) in moreSettings" :key="index" @click="goPage(item.path)">
+			<view class="item" v-for="(item,index) in moreSettings" @click="goPage(item.path)">
 				<view class="item-left">
 					<image class="icon" :src="item.icon" mode="widthFix"></image>
 					<text>{{item.name}}</text>
@@ -78,7 +78,7 @@
 					{
 						'name': '服务条款',
 						'desc': '',
-						'path': '/pages/AboutUs/yhxy',
+						'path': '/pages/AboutUs/xieyi',
 						'icon': '../../static/me/terms.png'
 					},
 					{