5

api/agreement.js

@@ -0,0 +1,15 @@
+import http from '../common/axios.js'
+
+//获取学员信息
+function userAgreement(data) {
+	let url = '/agreement/'+data
+	return http.get(url,data).then(res => {
+		return res;
+	})
+}
+
+
+
+export default {
+	userAgreement,
+}

api/member.js

@@ -17,7 +17,41 @@ function login(data) {
 }
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//获取学员信息
+function member(data) {
+	let url = '/member/member'
+	return http.get(url,data).then(res => {
+		return res;
+	})
+}
+
+
+
 export default {
 	login,
 	medication_login,
+	member,
 }

pages/common/privacy_agreement.vue

@@ -5,6 +5,7 @@
 </template>
 
 <script>
+	import agreement from '@/api/agreement.js';
 	export default {
 		data() {
 			return {
@@ -20,14 +21,26 @@
 			//初始化拿数据的接口
 			init(type) {
 				if (type == 1) {
-					//用户协议
-					this.text = '用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议'
-						uni.setNavigationBarTitle({
-							title: '用户协议'
-						});
+					//获取用户协议
+					agreement.userAgreement('service').then(res => {
+						if(res.code == 1){
+							this.text = res.data.content
+						}else{
+							this.text = ''
+						}					
+					})
+					uni.setNavigationBarTitle({
+						title: '用户协议'
+					});
 				} else if (type == 2) {
-					//隐私策略
-					this.text = '隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略'
+					//获取隐私策略
+					agreement.userAgreement('privacy').then(res => {
+						if(res.code == 1){
+							this.text = res.data.content
+						}else{
+							this.text = ''
+						}					
+					})
 					uni.setNavigationBarTitle({
 						title: '隐私策略'
 					});

pages/student/my/my.vue

@@ -2,7 +2,7 @@
 <template>
 	<view class="main_box">
 		<view class="navbar_section">
-		  <view class="title">我的</view>
+			<view class="title">我的</view>
 		</view>
 		<view style="background:#29D3B4;">
 			<!--用户信息-->
@@ -10,7 +10,7 @@
 				<view class="box">
 					<view class="left" @click="personal_data">
 						<image class="pic" src="http://www.firstui.cn:4000/vipdoc/img/img_logo.png"></image>
-						<view class="name">包子皮</view>
+						<view class="name">{{member_info.name}}</view>
 					</view>
 					<view class="right" @click="setup">
 						<image src="@/static/images/index/setup.png" style="width: 50rpx;height: 50rpx;"></image>
@@ -85,18 +85,30 @@
 
 <script>
 	import AQTabber from "@/components/AQ/AQTabber.vue"
-	// import user from '@/api/user.js';
+	import member from '@/api/member.js';
 	export default {
 		components: {
 			AQTabber,
 		},
 		data() {
 			return {
-
+				member_info: [],
 			}
 		},
-		onLoad() {},
+		onLoad() {
+			this.member_init();
+		},
 		methods: {
+			//获取学员信息
+			member_init() {
+				member.member().then(res => {
+					if(res.code == 1){
+						this.member_info = res.data
+					}else{
+						this.member_info = []
+					}					
+				})
+			},
 			//打开设置
 			setup(item) {
 				uni.navigateTo({
@@ -104,25 +116,25 @@
 				})
 			},
 			//意见反馈
-			feedback(){
+			feedback() {
 				uni.navigateTo({
 					url: '/pages/common/feedback'
 				})
 			},
 			//课时消耗
-			lesson_consumption(){
+			lesson_consumption() {
 				uni.navigateTo({
 					url: '/pages/student/my/lesson_consumption'
 				})
 			},
 			//我的成员
-			my_members(){
+			my_members() {
 				uni.navigateTo({
 					url: '/pages/student/my/my_members'
 				})
 			},
 			//人人资料
-			personal_data(){
+			personal_data() {
 				uni.navigateTo({
 					url: '/pages/student/my/personal_data'
 				})
@@ -280,6 +292,7 @@
 			padding: 6rpx 24rpx;
 			display: flex;
 			flex-direction: column;
+
 			.item {
 				padding: 35rpx 78rpx;
 				border-top: 1px solid #F2F2F2;