Merge branch 'test' of https://e.coding.net/g-cphe0354/duanju/new_app into gaohao

App.vue

@@ -1,26 +1,124 @@
 <script>
-export default {
+	import http from '@/http/http.js'
-	onLaunch: function () {
+	export default {
-		console.log('App Launch')
+		onLaunch: function() {
-		const systemInfo = uni.getSystemInfoSync();
+			console.log('App Launch')
-		const isA = systemInfo.platform === 'android'
+			// const systemInfo = uni.getSystemInfoSync();
-		if (isA) {
+			// const isA = systemInfo.platform === 'android'
-			uni.setStorageSync('isAI', true)
+			// if (isA) {
-		} else {
+			// 	uni.setStorageSync('isAI', true)
-			uni.setStorageSync('isAI', false)
+			// } else {
-		}
+			// 	uni.setStorageSync('isAI', false)
+			// }
 
-	},
+		},
-	onShow: function () {
+		onShow: function() {
-		console.log('App Show')
+			// ios是否在审核
-	},
+			http.request({
-	onHide: function () {
+				url: 'app/common/type/919',
-		console.log('App Hide')
+			}).then(res => {
+				if (res.code == 0) {
+					uni.setStorageSync('isExamine', res.data.value)
+				}
+			})
+		},
+		onHide: function() {
+			console.log('App Hide')
+		}
 	}
-}
 </script>
 
 <style lang="scss">
-/*每个页面公共css */
+	/*每个页面公共css */
-@import "uview-plus/index.scss";
+	@import "uview-plus/index.scss";
-</style>
+	
+	ul,
+	li {
+		list-style: none;
+	}
+	
+	.show {
+		display: none !important;
+	}
+	
+	.hidden {
+		display: block !important;
+	}
+	
+	page,
+	view,
+	scroll-view,
+	swiper,
+	swiper-item,
+	match-media,
+	movable-area,
+	movable-view,
+	cover-view,
+	cover-image,
+	icon,
+	text,
+	rich-text,
+	progress,
+	button,
+	checkbox-group,
+	editor,
+	form,
+	input,
+	label,
+	picker,
+	picker-view,
+	radio-group,
+	slider,
+	switch,
+	textarea,
+	navigator,
+	audio,
+	camera,
+	image,
+	video,
+	live-player,
+	live-pusher,
+	map,
+	canvas,
+	web-view {
+		box-sizing: border-box;
+		padding: 0;
+		margin: 0;
+		text-decoration: none;
+		outline: none;
+	
+	}
+	
+	.initStyle {
+		padding: 20rpx;
+		background-color: #2a2a2a;
+		height: 100vh;
+		color: #fff;
+	}
+	
+	.fc {
+		color: #f4f693;
+	}
+	
+	.inputClass {
+		line-height: 80rpx;
+	}
+	
+	.inputClass input {
+		background-color: #fff;
+		height: 80rpx;
+		padding: 10rpx;
+		color: #000;
+	}
+	
+	.result {
+		position: absolute;
+		font-size: 100rpx;
+		left: 50%;
+		top: 800rpx;
+		transform: translateX(-50%);
+	}
+	 
+	
+	
+</style>

http/http.js

@@ -1,17 +1,20 @@
-
 // 导入全局属性
 import {
 	sm4DecryptByResData
 } from '@/utils/encryptUtil.js'
 import infoBox from "@/utils/infoBox.js"
-import { reject } from 'lodash';
+import {
+	reject
+} from 'lodash';
 import config from '@/commons/config.js'
 // 测试服
 let baseUrl = config.baseApiUrl
 const loadingShowTime = 200
-function getHeader(){
+
-	const headerObject={}
+function getHeader() {
-	headerObject["token"] = uni.getStorageSync('token')
+	const headerObject = {}
+	headerObject["token"] = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIyNjkyNSIsImlhdCI6MTczNTg4OTk5NCwiZXhwIjoxNzM2NDk0Nzk0fQ.j-KFEE1FHckmFCO8UA884RBWvpMv8MfEGj7GPGf3kVo6sHeORl043Yle_w7HdTZKPpQqSr2LQLCq_rUxG4qqwA'
+	// headerObject["token"] = uni.getStorageSync('token')
 	return headerObject
 }
 
@@ -61,7 +64,7 @@ function commonsProcess(showLoading, httpReqCallback) {
 		// http响应码不正确
 		if (statusCode != 200 && statusCode != 204 && statusCode != 201) {
 			isShowErrorToast = true
-			data.message=data.message=='Bad credentials'?'用户名或密码错误':data.message
+			data.message = data.message == 'Bad credentials' ? '用户名或密码错误' : data.message
 			infoBox.showToast(data.message || '服务器异常')
 			return Promise.reject(bodyData) // 跳转到catch函数
 		}
@@ -79,15 +82,16 @@ function commonsProcess(showLoading, httpReqCallback) {
 		return Promise.resolve(bodyData)
 
 	}).catch(res => {
-		if(res.status==401){
+		if (res.status == 401) {
-			infoBox.showErrorToast(res.message||'请登录').then(() => {
+			infoBox.showErrorToast(res.message || '请登录').then(() => {
-				uni.redirectTo({url: '/pages/login/index'})
+				uni.redirectTo({
+					url: '/pages/login/index'
+				})
 				reject()
 			})
 		}
-		if(res.status==500){
+		if (res.status == 500) {
-			infoBox.showErrorToast(res.message||'服务器异常').then(() => {
+			infoBox.showErrorToast(res.message || '服务器异常').then(() => {})
-			})
 		}
 		reqFinishFunc(); // 请求完毕的动作
 
@@ -134,17 +138,30 @@ function request(args) {
 	return commonsProcess(showLoading, () => {
 		return uni.request(
 			Object.assign({
-				url: baseUrl + url,
+				url: slash(baseUrl, url),
-				data: params||data,
+				data: params || data,
 				method: method,
-							header: getHeader()
+				header: getHeader()
 			}, extParams)
-			
+
 		)
 	})
 }
-
+// 处理/
-
+function slash(baseUrl, url) {
+	let u = ''
+	if (baseUrl[baseUrl.length - 1] == '/') {
+		u += baseUrl
+	} else {
+		u = u + baseUrl + '/'
+	}
+	if (url[0] == '/') {
+		u = u + url.slice(1)
+	} else {
+		u = u + url
+	}
+	return u
+}
 
 // 上传
 function upload(uri, data, file, showLoading = true, extParams = {}) {
@@ -156,14 +173,14 @@ function upload(uri, data, file, showLoading = true, extParams = {}) {
 				url: baseUrl + uri,
 				formData: data,
 				name: "file",
-				filePath: file.path||file.url,
+				filePath: file.path || file.url,
-								header: getHeader()
+				header: getHeader()
 			}, extParams)
 		).then((httpData) => {
 			// uni.upload 返回bodyData 的是 string类型。 需要解析。 
 			httpData.data = JSON.parse(httpData.data)
 			return Promise.resolve(httpData)
-		}).catch(err=>{
+		}).catch(err => {
 			uni.hideLoading()
 			infoBox.showErrorToast(`上传失败`)
 		})

pages.json

@@ -68,6 +68,13 @@
 		"style": {
 			"navigationBarTitleText": "个人资料"
 		}
+	},
+	{
+		"path" : "pages/index/search/index",
+		"style" : 
+		{
+			"navigationBarTitleText" : ""
+		}
 	}
 	],
 	"globalStyle": {

pages/index/components/contentlist.vue

@@ -0,0 +1,62 @@
+<template>
+	<view class="contentlist">
+		<view class="liststyle" v-for="item in props.list" :key="item.courseId" @tap="seVideo(item)">
+			<image :src="item.titleImg" style="width: 188rpx;height: 247rpx;border-radius:21rpx 21rpx 21rpx 21rpx"
+				mode=""></image>
+			<view style="color: #333333;">
+				{{item.title.slice(0,6)}}
+			</view>
+			<view style="color: #999999;">
+				{{item.courseLabel}}
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		returnIsSafari
+	} from '@/utils/app.js'
+	const props = defineProps({
+		list: {
+			type: Array,
+			default: []
+		},
+	})
+
+	function seVideo(item) {
+		// uni.navigateTo({
+		// 	url: '/me/detail/detail?id=' + item.courseId + '&courseDetailsId=' + item.courseDetailsId +
+		// 		'&tt_album_id=' + item.dyCourseId + '&tt_episode_id=' + item
+		// 		.dyEpisodeId
+		// })
+	}
+</script>
+
+<style scoped lang="scss">
+	.contentlist {
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		flex-wrap: wrap;
+		margin-top: 10rpx;
+		padding: 0 26rpx;
+
+		.liststyle {
+			border-radius: 21rpx 21rpx 21rpx 21rpx;
+			width: 30%;
+			margin-top: 20rpx;
+
+			>view {
+				font-weight: 400;
+				font-size: 25rpx;
+				text-align: left;
+			}
+		}
+
+		.liststyle:last-child {
+			margin-right: auto;
+			margin-left: 6rpx;
+		}
+	}
+</style>

pages/index/index.vue

@@ -1,20 +1,253 @@
 <template>
-	ios
+	<view class="indexStyle">
-	anzhuo
+		<image src="@/static/index/indexbh.png" mode="">
+		</image>
+		<view class="indexStyleTwo">
+			<image src="@/static/logo.png" mode=""></image>
+			<view @tap="moreVideo">
+				<image src="@/static/sosuo.png" style="height: 34rpx;width: 34rpx;" mode=""></image>
+				点击搜索更多好剧
+			</view>
+		</view>
+
+		<template v-if="datas.noticeList.length > 0 ">
+			<view class="gongao">
+				<view class="gongaoicon">
+					公告
+				</view>
+				<swiper :autoplay="true" :vertical="true" :interval="4000" :circular="true" :indicator-dots="false"
+					class="swiperstyle">
+					<swiper-item @tap='goMsg(item.url)' v-for="(item, index) in datas.noticeList" :key="index">
+						<view style="height: 80rpx;line-height: 80rpx;">{{ item.title }}</view>
+					</swiper-item>
+				</swiper>
+			</view>
+		</template>
+	</view>
+	<view class="navTop">
+		<view :style="datas.active == 1 ? 'color:#ff6b7f' : ''" @tap="getrecomVideo('', 1)">
+			最新
+		</view>
+		<view :style="datas.active == 2 ? 'color:#ff6b7f' : ''" @tap="getrecomVideo('1', 2)">
+			排行
+		</view>
+		<view :style="datas.active == 3 ? 'color:#ff6b7f' : ''" @tap="getrecomVideo('2', 3)">
+			最热
+		</view>
+		<view :style="datas.active == 4 ? 'color:#ff6b7f' : ''" @tap="getrecomVideo('1', 4)">
+			剧情
+		</view>
+		<view :style="datas.active == 5 ? 'color:#ff6b7f' : ''" @tap="getrecomVideo('2', 5)">
+			飙升
+		</view>
+	</view>
+	<contentlist :list='datas.list'></contentlist>
+	<!-- 	<u-image v-if="isShowMoneyPay" @click="goMsg('/me/VjgyqAzklr/VjgyqAzklr')" :src="`../../static/red-pack-new.gif`"
+		style="width: 200rpx;height: 200rpx;position: fixed;right: 10rpx;bottom: 180rpx;"></u-image> -->
+	<u-modal :show="datas.ruleShow" v-if="datas.isExamine==0" confirm-text="知道了" @confirm='datas.ruleShow=false'
+		:title="datas.rule_title" :title-style="{ fontWeight: '700' }" confirm-color="rgb(255, 117, 129)">
+		<view class="" style="padding-top: 30rpx;text-align: left;">
+			<scroll-view scroll-y="true" style="max-height: 50vh;">
+				<rich-text style="color:#666" :nodes="datas.rule_content"></rich-text>
+			</scroll-view>
+		</view>
+	</u-modal>
 </template>
 
 <script setup>
-	// import http from '@/http/http.js'
+	import {
-	// http.request({
+		reactive
-	// 	url:'app/common/getAppUseKv'
+	} from 'vue';
-	// }).then(res=>{
+	import {
-	// 	console.log(res);
+		onLoad,
-	// })
+		onReachBottom
+	} from '@dcloudio/uni-app'
+	import contentlist from './components/contentlist.vue'
+	import http from '@/http/http.js'
+	let datas = reactive({
+		noticeList: [], //公告列表
+
+		active: 1, // 最新、最热。。。切换顶部导航栏
+
+		list: [], // 底部短剧内容
+		page: 1, // 首页推荐分页
+
+		ruleShow: false,
+		rule_title: '', // 首页弹窗标题
+		rule_content: '', // 首页弹窗内容
+
+		//ios是否在审核 1是审核
+		isExamine: uni.getStorageSync('isExamine')
+	})
+	onLoad(() => {
+		getMsg()
+		getrecomVideo()
+		getPop()
+	})
+
+	onReachBottom(() => {
+		++datas.page
+		getrecomVideo()
+	})
+
+	// 获取弹窗信息
+	function getPop() {
+		http.request({
+			url: 'app/announcement',
+		}).then(res => {
+			if (res.code == 0) {
+				if (res.data && res.data.state == 1) {
+					datas.ruleShow = true
+					datas.rule_title = res.data.title
+					datas.rule_content = res.data.content
+				}
+			} else {
+				uni.showToast({
+					title: res.msg,
+					duration: 1000,
+					icon: 'none'
+				});
+			}
+		})
+	}
 	// 搜索跳转
-	// uni.navigateTo({
+	function moreVideo() {
-	// 				url: '/pages/index/search/index'
+		uni.navigateTo({
-	// 			});
+			url: '/pages/index/search/index'
+		});
+	}
+	// 公告
+	function getMsg() {
+		http.request({
+			url: 'app/message/selectMessage',
+			data: {
+				page: 1,
+				limit: 5,
+				state: 1
+			}
+		}).then(res => {
+			if (res.code == 0) {
+				datas.noticeList = res.data.list
+			} else {
+				uni.showToast({
+					title: res.msg,
+					duration: 1000,
+					icon: 'none'
+				});
+			}
+		})
+	}
+	//获取推荐视频
+	function getrecomVideo(sort, active = 1) {
+		datas.active = active
+		if (sort) {
+			datas.page = 1
+		}
+		http.request({
+			url: 'app/course/selectCourse',
+			data: {
+				page: datas.page,
+				limit: 12,
+				sort: sort,
+				classifyId: ''
+			}
+		}).then(res => {
+			if (res.code == 0) {
+				if (datas.page == 1) {
+					datas.list = res.data.list
+				} else {
+					datas.list = [...datas.list, ...res.data.list]
+				}
+			} else {
+				uni.showToast({
+					title: res.msg,
+					duration: 1000,
+					icon: 'none'
+				});
+			}
+		})
+	}
 </script>
 
-<style>
+<style lang="scss" scoped>
-</style>
+	.indexStyle {
+		height: 555rpx;
+		position: relative;
+
+		>image {
+			width: 100%;
+			height: 555rpx;
+			position: absolute;
+
+		}
+
+		.indexStyleTwo {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 88rpx 25rpx;
+
+			>image {
+				width: 187rpx;
+				height: 50rpx;
+			}
+
+			>view {
+				z-index: 50;
+				width: 236rpx;
+				line-height: 43rpx;
+				background: rgba(255, 255, 255, 0.29);
+				border-radius: 7rpx 7rpx 7rpx 7rpx;
+				font-weight: 400;
+				font-size: 21rpx;
+				color: rgba(255, 255, 255, 0.85);
+				display: flex;
+				align-items: center;
+			}
+		}
+
+		.gongao {
+			position: absolute;
+			bottom: 75rpx;
+			left: 70rpx;
+			border-radius: 21rpx 21rpx 21rpx 21rpx;
+			width: 611rpx;
+			height: 78rpx;
+			background-color: rgba(255, 255, 255, .65);
+			display: flex;
+			align-items: center;
+			padding: 12rpx;
+			box-sizing: border-box;
+
+			.gongaoicon {
+				color: #ffffff;
+				width: 98rpx;
+				height: 50rpx;
+				line-height: 50rpx;
+				text-align: center;
+				font-size: 25rpx;
+				background-image: url('../../static/index/gonggaobg.png');
+				background-size: 98rpx 50rpx;
+			}
+
+			.swiperstyle {
+				height: 78rpx;
+				width: 80%;
+			}
+		}
+
+	}
+
+	.navTop {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 20rpx;
+
+		>view {
+			background-color: #f0f0f0;
+			margin-left: 20rpx;
+			padding: 6rpx 20rpx
+		}
+	}
+</style>

pages/index/search/index.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>