6-2-1

pages.json

@@ -266,7 +266,7 @@
 			// #ifdef MP || H5
 			{
 				"path": "wxLogin",
-				"style": {
+				"style": {
 					"navigationBarTitleText": "微信登录",
 					"app-plus": {
 						"titleNView": {
@@ -313,7 +313,24 @@
 				}
 			}
 		]
-	}],
+	},{
+		"root": "pages/eduction",
+		"name": "eduction",
+		"pages": [
+			{
+				"path": "list",
+				"style": {
+					"navigationBarTitleText": "课程列表"
+				}
+			},
+			{
+				"path": "detail",
+				"style": {
+					"navigationBarTitleText": "课程详情"
+				}
+			}
+		]
+	}],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",

pages/eduction/detail.vue

@@ -0,0 +1,357 @@
+<template>
+	<view class="content">
+		<view class="video-wrap">
+			<video :src="could_play?'https://api.myjie.cn/static/viedo/ddd.mp4':''" id="videoId" class="top-video"
+				:enable-progress-gesture="false" poster="https://api.myjie.cn/resource/user/user1/fw1.png"></video>
+			<!-- 视频蒙版 -->
+			<!-- <view class="mask" v-if="!could_play" @click.stop=""></view> -->
+		</view>
+		<view class="nav flex">
+			<view class="nav-item" v-for="(item,index) in navList" @click="navClick(index)"
+				:class="{'action': index == currentIndex}">
+				{{item.title}}
+			</view>
+		</view>
+		<!-- 详情 -->
+		<view class="" v-if="currentIndex == 0">
+			<view class="base-info">
+				<view class="info-tit">
+					深度了解阿强是个大傻逼
+				</view>
+				<view class="info-info flex">
+					<view class="info-item">
+						课程：共10节
+					</view>
+					<view class="hx">
+
+					</view>
+					<view class="info-item">
+						人数：522人学习
+					</view>
+				</view>
+			</view>
+			<view class="jianjie">
+				<view class="jianjie-top flex">
+					<view class="hx">
+
+					</view>
+					<view class="">
+						课程简介
+					</view>
+					<view class="hx">
+
+					</view>
+				</view>
+				<view class="" v-html="content">
+
+				</view>
+			</view>
+			<view class="tjkc">
+				<view class="jianjie-top flex" style="border-bottom: #c8c7cc solid 1px;">
+					<view class="hx">
+
+					</view>
+					<view class="">
+						推荐课程
+					</view>
+					<view class="hx">
+
+					</view>
+				</view>
+				<view class="kc-list">
+					<view class="kc-item flex" v-for="item in 10">
+						<image src="" mode="" class="kc-img"></image>
+						<view class="kc-info">
+							<view class="info-tit clamp">
+								母婴行业必学舞蹈（邓晏老师视频）
+							</view>
+							<view class="info-cate clamp">
+								技术控必练习
+							</view>
+							<view class="info-info flex">
+								<view class="rs">
+									100
+								</view>
+								<view class="visit">
+									555555
+								</view>
+							</view>
+						</view>
+					</view>
+
+				</view>
+			</view>
+		</view>
+		<!-- 课程目录 -->
+		<view class="" v-if="currentIndex == 1">
+			<view class="kc-ml">
+				<view class="ml-item flex">
+					<view class="bs"></view>
+					<view class="">
+						备孕必检查项目介绍【备孕系列课程】/3备孕必检查项目介绍【备孕系列课程】/3
+					</view>
+				</view>
+				<view class="ml-item flex">
+					<view class="bs"></view>
+					<view class="">
+						备孕必检查项目介绍【备孕系列课程】/3
+					</view>
+				</view>
+				<view class="ml-item flex">
+					<view class="bs"></view>
+					<view class="">
+						备孕必检查项目介绍【备孕系列课程】/3
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 全部课程 -->
+		<view class="" v-if="currentIndex == 2">
+			<view class="tjkc">
+				<view class="kc-list">
+					<view class="kc-item flex" v-for="item in 10">
+						<image src="" mode="" class="kc-img"></image>
+						<view class="kc-info">
+							<view class="info-tit clamp">
+								母婴行业必学舞蹈（邓晏老师视频）
+							</view>
+							<view class="info-cate clamp">
+								技术控必练习
+							</view>
+							<view class="info-info flex">
+								<view class="rs">
+									100
+								</view>
+								<view class="visit">
+									555555
+								</view>
+							</view>
+						</view>
+					</view>
+
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				content: '<p>ddddddd</p>',
+				currentIndex: 0,
+				could_play: false,
+				navList: [{
+						title: '详情'
+					}, {
+						title: '课程目录'
+					},
+					{
+						title: '讲师全部课程'
+					}
+				]
+			};
+		},
+		computed: {
+			videoContext() {
+				return uni.createVideoContext('videoId', this)
+			}
+		},
+		onLoad(opt) {
+
+		},
+		onShow() {
+
+		},
+		onReachBottom() {
+
+		},
+		methods: {
+			navClick(index) {
+				this.currentIndex = index
+			}
+		}
+	};
+</script>
+<style lang="scss" scoped>
+	.video-wrap {
+		margin: 20rpx 0;
+		position: relative;
+
+		.top-video {
+			width: 750rpx;
+
+		}
+
+		.mask {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 999;
+			// background-color: red;
+		}
+	}
+
+	.nav {
+		width: 750rpx;
+		height: 88rpx;
+
+		.nav-item {
+			line-height: 88rpx;
+			width: 50%;
+			text-align: center;
+			font-size: 30rpx;
+			font-weight: 500;
+			color: #333333;
+			height: 100%;
+		}
+
+		.action {
+			font-weight: bold;
+			position: relative;
+			color: $base-color;
+		}
+
+		background-color: #fff;
+	}
+
+	.base-info {
+		width: 710rpx;
+		margin: 20rpx auto;
+		background-color: #fff;
+		font-size: 28rpx;
+
+		.info-tit {
+			color: #333;
+			text-align: center;
+			border-bottom: 1px solid #eee;
+			padding: 20rpx;
+		}
+
+		.info-info {
+			color: #666;
+
+			.info-item {
+				flex-grow: 1;
+				text-align: center;
+				padding: 20rpx 0;
+			}
+
+			.hx {
+				width: 1rpx;
+				height: 40rpx;
+				background-color: #eee;
+			}
+		}
+
+	}
+
+	.jianjie {
+		width: 710rpx;
+		margin: 20rpx auto 0;
+		background-color: #fff;
+		padding: 20rpx;
+
+	}
+
+	.jianjie-top {
+		font-size: 36rpx;
+		color: $base-color;
+		justify-content: center;
+		padding: 40rpx 0 20rpx;
+
+		.hx {
+			width: 30rpx;
+			height: 1px;
+			background-color: $base-color;
+			margin: 0 20rpx;
+		}
+	}
+
+	.tjkc {
+		width: 710rpx;
+		background-color: #fff;
+		margin: 20rpx auto;
+	}
+
+	.kc-list {
+		padding: 0 30rpx;
+		border-bottom: #c8c7cc solid 1px;
+
+		.kc-item {
+			border-bottom: #c8c7cc solid 1px;
+			padding: 22rpx 0;
+			justify-content: flex-start;
+
+			.kc-img {
+				flex-shrink: 0;
+				width: 266rpx;
+				height: 164rpx;
+				margin-right: 20rpx;
+				background-color: #eee;
+			}
+
+			.kc-info {
+				height: 164rpx;
+				width: 360rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				align-items: flex-start;
+
+				// background-color: red;
+				.info-tit {
+					width: 100%;
+					font-size: 32rpx;
+					color: #000;
+				}
+
+				.info-cate {
+					width: 100%;
+					color: #ff5a97;
+					font-size: 28rpx;
+				}
+
+				.info-info {
+					width: 360rpx;
+					font-size: 24rpx;
+
+					.rs {
+						color: #8f8f94;
+					}
+
+					.visit {
+						color: $base-color;
+					}
+				}
+			}
+		}
+
+	}
+
+	.kc-ml {
+		padding: 30rpx;
+		width: 710rpx;
+		margin: 20rpx auto;
+		background-color: #fff;
+
+		.ml-item {
+			align-items: flex-start;
+			justify-content: flex-start;
+			margin-bottom: 40rpx;
+
+			.bs {
+
+				flex-shrink: 0;
+				width: 40rpx;
+				height: 40rpx;
+				border-radius: 50%;
+				border: 1px solid #5FB878;
+				margin-right: 20rpx;
+			}
+		}
+
+	}
+</style>

pages/eduction/list.vue

@@ -0,0 +1,174 @@
+<template>
+	<view class="content">
+		<swiper class="top-swiper" autoplay="true" duration="400" interval="5000" @change="swiperChange">
+			<swiper-item v-for="item in imagelist" class="carousel-item" @click="navTo(item.url)">
+				<image class="imageitem" :src="item.img" />
+			</swiper-item>
+		</swiper>
+		<view class="nav flex">
+			<view class="nav-item" v-for="(item,index) in navList" @click="navClick(index)"
+				:class="{'action': index == currentIndex}">
+				{{item.title}}
+			</view>
+		</view>
+		<scroll-view scroll-y="true" :style="{'height':height}" class="scroll-wrap">
+			<view class="kc-item flex" v-for="item in 10">
+				<image src="" mode="" class="kc-img"></image>
+				<view class="kc-info">
+					<view class="info-tit clamp">
+						母婴行业必学舞蹈（邓晏老师视频）
+					</view>
+					<view class="info-cate clamp">
+						技术控必练习
+					</view>
+					<view class="info-info flex">
+						<view class="rs">
+							100
+						</view>
+						<view class="visit">
+							555555
+						</view>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				height: '',
+				currentIndex: 0,
+				navList: [{
+						title: '全部'
+					}, {
+						title: '视频'
+					},
+					{
+						title: '音频'
+					}
+				]
+			};
+		},
+		onLoad(opt) {
+
+		},
+		onShow() {
+
+		},
+		onReady(res) {
+			var that = this;
+			uni.getSystemInfo({
+				success: resu => {
+					const query = uni.createSelectorQuery();
+					query.select('.scroll-wrap').boundingClientRect();
+					query.exec(function(res) {
+						that.height = resu.windowHeight - res[0].top + 'px';
+					});
+				},
+				fail: res => {}
+			});
+		},
+		onReachBottom() {
+
+		},
+		methods: {
+			navClick(index) {
+				this.currentIndex = index
+			}
+		}
+	};
+</script>
+<style lang="scss" scoped>
+	.top-swiper {
+		margin: auto;
+		width: 750rpx;
+		height: 392rpx;
+		padding: 0 $page-row-spacing;
+
+		.carousel-item {
+			border-radius: 20rpx;
+
+			.imageitem {
+				// margin: auto;
+				width:750rpx;
+				height:392rpx;
+			}
+		}
+	}
+
+	.nav {
+		width: 750rpx;
+		height: 88rpx;
+		margin: 20rpx 0;
+		.nav-item {
+			line-height: 88rpx;
+			width: 50%;
+			text-align: center;
+			font-size: 30rpx;
+			font-weight: 500;
+			color: #333333;
+			height: 100%;
+		}
+
+		.action {
+			font-weight: bold;
+			color: $base-color;
+		}
+
+		background-color: #fff;
+	}
+	.scroll-wrap {
+		// background-color: red;
+	}
+	.kc-item {
+		// border-bottom: #c8c7cc solid 1px;
+		padding: 22rpx 0;
+		justify-content: center;
+		background-color: #fff;
+	
+		.kc-img {
+			flex-shrink: 0;
+			width: 266rpx;
+			height: 164rpx;
+			margin-right: 20rpx;
+			background-color: #eee;
+		}
+	
+		.kc-info {
+			height: 164rpx;
+			width: 360rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			align-items: flex-start;
+	
+			// background-color: red;
+			.info-tit {
+				width: 100%;
+				font-size: 32rpx;
+				color: #000;
+			}
+	
+			.info-cate {
+				width: 100%;
+				color: #ff5a97;
+				font-size: 28rpx;
+			}
+	
+			.info-info {
+				width: 360rpx;
+				font-size: 24rpx;
+	
+				.rs {
+					color: #8f8f94;
+				}
+	
+				.visit {
+					color: $base-color;
+				}
+			}
+		}
+	}
+</style>

pages/public/wxLogin.vue

@@ -4,6 +4,7 @@
 		<view class="flex-center">
 			<view class="logo-img-box">
 				<image class="logo-img" src="../../static/image/logo.png" mode="scaleToFill"></image>
+				<!--  -->
 				<button class="userInfo flex-center" type="warn" @tap="loding?'':userInfoData()">
 					<image class="icon margin-r-10" src="../../static/icon/weichat.png" mode="widthFix"></image>
 					<text>微信授权登录</text>
@@ -69,6 +70,14 @@
 		},
 		methods: {
 			...mapMutations('user', ['login', 'setUserInfo', 'logout']),
+			getUserInfos(e) {
+				console.log(e,'到这里');
+				if (e && e.detail) {
+					console.log('获取用户信息成功');
+					console.log(e.detail.userInfo);
+					this.userInfo = e.detail.userInfo;
+				}
+			},
 			changeChecked(check) {
 				this.checked = check;
 			},
@@ -195,7 +204,7 @@
 						// 保存返回用户数据
 						obj.setUserInfo(data);
 						uni.setStorageSync(
-							'jynickname',1
+							'jynickname', 1
 						)
 						if (data.mobile == null || !data.mobile) {
 							obj.MaskShow = true;
@@ -376,4 +385,4 @@
 	}
 
 	/* #endif */
-</style>
+</style>

pages/user/model/shoprz.vue

@@ -9,16 +9,24 @@
 					请上传最近3单工资证明
 				</view>
 				<view class="con_image" v-for="(item,ind) in updata.service_audit_imgs">
-					<image class="img" @click="navCroper(400,400,'audit',ind)"
-						:src="item"></image>
-					<image @click="updata.service_audit_imgs.splice(ind,1)" class="tip" src="../../../static/icon/goodsExit.png" mode="scaleToFill"></image>
+					<image class="img" @click="navCroper(400,400,'audit',ind)" :src="item"></image>
+					<image @click="updata.service_audit_imgs.splice(ind,1)" class="tip"
+						src="../../../static/icon/goodsExit.png" mode="scaleToFill"></image>
 				</view>
 				<view class="con_image">
-					<image class="img" @click="navCroper(400,400,'auditall')"
-						src="../../../static/image/upImg.png"></image>
+					<image class="img" @click="navCroper(400,400,'auditall')" src="../../../static/image/upImg.png">
+					</image>
 				</view>
 			</view>
 		</view>
+		<view class="item-name">
+			企业认证
+		</view>
+		<view class="listBox">
+			<view class="con_box">
+				<input type="text" placeholder="请输入认证企业名称" v-model="store_name">
+			</view>
+		</view>
 		<view class="base-buttom" :class="{ 'bg-gray': loding }" @click="loding ? '' : confirm()">提交</view>
 	</view>
 </template>
@@ -35,11 +43,11 @@
 		data() {
 			return {
 				// 上传数据
-				updata:{
+				updata: {
 					service_audit_imgs: [], //服务图片
 				},
 				loding: false, //是否载入中
-
+				store_name: ''
 			};
 		},
 		onLoad(options) {
@@ -102,10 +110,10 @@
 						events: {
 							uploadSuccess(res) {
 								that.upLoad(res).then((urldata) => {
-									 if (type == 'audit') {
+									if (type == 'audit') {
 										that.updata.service_audit_imgs.splice(ind, 1, urldata.img)
-									}else if (type == 'auditall') {
-										that.updata.service_audit_imgs.push( urldata.img)
+									} else if (type == 'auditall') {
+										that.updata.service_audit_imgs.push(urldata.img)
 									}
 								})
 							}
@@ -179,7 +187,7 @@
 			// 实名认证
 			confirm(e) {
 				const that = this;
-				if (that.updata.service_audit_imgs.length==0) {
+				if (that.updata.service_audit_imgs.length == 0) {
 					uni.showModal({
 						title: '错误',
 						content: '请上传工资截图',
@@ -187,9 +195,18 @@
 					});
 					return
 				}
+				// if(that.store_name == '' ) {
+				// 	uni.showModal({
+				// 		title: '错误',
+				// 		content: '请输入企业名称',
+				// 		showCancel: false,
+				// 	});
+				// 	return 
+				// }
 				that.loding = true;
 				subTypeAudit({
-						service_audit_imgs:that.updata.service_audit_imgs
+						service_audit_imgs: that.updata.service_audit_imgs,
+						store_name: that.store_name
 					})
 					.then((e) => {
 						that.loding = false;
@@ -223,11 +240,13 @@
 
 	.con_box {
 		margin: $page-row-spacing;
-		.tip{
+
+		.tip {
 			color: #999999;
 			font-size: $font-base;
 			margin-bottom: 20rpx;
 		}
+
 		.con_image {
 			width: 150rpx;
 			height: 150rpx;
@@ -330,4 +349,4 @@
 		right: 0rpx;
 		left: 0rpx;
 	}
-</style>
+</style>

pages/user/myteam.vue

@@ -29,15 +29,15 @@
 			<view v-for="(item, index) in list" :key="index" class="order-item flex">
 				<view class="title-box flex_item">
 					<view class="title-avatar">
-						<image :src="item.avatar"></image>
+						<image :src="item.auth_info.avatar || item.avatar"></image>
 					</view>
 					<view class="list_tpl">
 						<view class="title">
-							<view class="title-name clamp">{{ item.nickname }}</view>
+							<view class="title-name clamp">{{item.auth_info.name || item.nickname }}</view>
+						</view>
+						<view class="time">
+							<text>ID:{{ item.uid }}</text>
 						</view>
-						<!-- <view class="time">
-							<text>{{ item.mobile }}</text>
-						</view> -->
 					</view>
 				</view>
 			</view>

pages/user/teamph.vue

@@ -6,10 +6,14 @@
 				{{item.title}}
 			</view>
 		</view>
-		<view class="ph-top">
+		<view class="" style="height: 88rpx;">
+			
+		</view>
+		<empty v-if="navList[currentIndex].list.length == 0"></empty>
+		<!-- 顶部123 -->
+		<view class="ph-top" v-if="navList[currentIndex].list.length > 0">
 			<view class="ph-m"></view>
 			<view class="ph flex">
-
 				<view class="ph-item flex">
 					<view class="item-logo yj-logo">
 						<image :src="navList[currentIndex].list[1].auth_info.avatar || navList[currentIndex].list[1].avatar || ''" mode="" class="avt"></image>
@@ -65,7 +69,7 @@
 			<image src="../../static/icon/yy.png" mode="" class="yy"></image>
 		</view>
 		<scroll-view scroll-y="true" class="grop-list" :style="{'height': max_height}"
-			@scrolltolower="getInviterRanking()">
+			@scrolltolower="getInviterRanking()" v-if="navList[currentIndex].list.length > 0">
 			<view class="grop-item flex" v-for="(item,index) in showList" v-if="index !=0 && index != 1 && index != 2">
 				<view class="item-xh">
 					{{index + 1}}
@@ -101,7 +105,19 @@
 		data() {
 			return {
 				max_height: '',
-				navList: [{
+				navList: [
+					{
+						title: '月排行',
+						time: (new Date(new Date(new Date().getFullYear(), new Date().getMonth(), 1).setHours(0, 0, 0))
+							.getTime() / 1000).toFixed(0),
+						times: ((new Date(new Date().getFullYear(), new Date().getMonth() + 1, 0).setHours(23, 59, 59,
+							59)) / 1000).toFixed(0),
+						list: [],
+						page: 1,
+						limit: 10,
+						loadingType: 'more',
+						loaded: false
+					},{
 					title: '周排行',
 					time: ((new Date().setHours(0, 0, 0) - (new Date().getDay() - 1) * 24 * 60 * 60 * 1000) / 1000)
 						.toFixed(0),
@@ -112,18 +128,8 @@
 					limit: 10,
 					loadingType: 'more',
 					loaded: false
-				}, {
-					title: '月排行',
-					time: (new Date(new Date(new Date().getFullYear(), new Date().getMonth(), 1).setHours(0, 0, 0))
-						.getTime() / 1000).toFixed(0),
-					times: ((new Date(new Date().getFullYear(), new Date().getMonth() + 1, 0).setHours(23, 59, 59,
-						59)) / 1000).toFixed(0),
-					list: [],
-					page: 1,
-					limit: 10,
-					loadingType: 'more',
-					loaded: false
-				}],
+				}
+				],
 				currentIndex: 0,
 			}
 		},
@@ -199,7 +205,10 @@
 	.nav {
 		width: 750rpx;
 		height: 88rpx;
-
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 999;
 		.nav-item {
 			line-height: 88rpx;
 			width: 50%;

pages/userhome/user.vue

@@ -278,25 +278,7 @@
 				getUser({}).then((e) => {
 					this.user = e.data;
 					this.setUserInfo(e.data)
-					let a = uni.getStorageSync(
-						'jynickname'
-					)
-					if (a == 1 && e.data.nickname == '微信用户') {
-						uni.setStorageSync('jynickname', 2)
-						uni.showModal({
-							title: '提示',
-							content: '您的昵称为默认昵称“微信用户”，是否立即修改？',
-							complete(res) {
-								if (res.confirm) {
-									
-									uni.navigateTo({
-										url: '/pages/set/userinfo'
-									})
-					
-								}
-							}
-						})
-					}
+					
 				}).catch((e) => {
 					console.log(e, 'sj');
 				})