add

components/ThreeItemSwiper.vue

@@ -4,15 +4,7 @@
 			indicator-dots="false" autoplay="false" display-multiple-items="1" :previous-margin="outerMargin"
 			:next-margin="outerMargin" indicator-color="rgba(255, 255, 255, 0.5)" indicator-active-color="#FFEB66">
 			<swiper-item v-for="(item, index) in products" :key="index">
-				<!-- 用容器包裹item，通过padding控制内部间距 -->
 				<view class="item-container">
-					<!-- <view class="swiper-item" :class="{ 'swiper-item-active': index === currentCenterIndex }">
-						<image class="item-image" :src="item.image" mode="aspectFit"></image>
-						<view class="item-text" v-if="index === currentCenterIndex">
-							<view class="text-title">{{ item.title }}</view>
-							<view class="text-desc">{{ item.desc }}</view>
-						</view>
-					</view> -->
 					<view class="swiper-item" :class="{ 'swiper-item-active': index === currentCenterIndex }">
 						<image class="item-image" :src="item.imgUrl" mode="aspectFit"></image>
 						<view class="item-text" v-if="index === currentCenterIndex">
@@ -35,7 +27,7 @@
 		props: {
 			products: {
 				type: Array,
-				default: "",
+				default:() => [],
 			}
 		},
 		data() {
@@ -46,27 +38,11 @@
 				// 		image: "/static/images/zfb.png",
 				// 		title: "二等奖",
 				// 		desc: "纳美科学高浓度小苏打牙膏",
-				// 	},
-				// 	{
-				// 		image: "/static/images/red_bg.png",
-				// 		title: "二等奖",
-				// 		desc: "纳美科学高浓度小苏打牙膏",
-				// 	},
-				// 	{
-				// 		image: "/static/images/share.png",
-				// 		title: "二等奖",
-				// 		desc: "纳美科学高浓度小苏打牙膏",
-				// 	},
-				// 	{
-				// 		image: "/static/images/integral.png",
-				// 		title: "二等奖",
-				// 		desc: "纳美科学高浓度小苏打牙膏",
 				// 	}
 				// ],
 			};
 		},
 		computed: {
-			// 计算中心项索引（解决循环轮播时的索引匹配问题）
 			currentCenterIndex() {
 				if (this.products.length === 0) return 0;
 				return this.activeIndex % this.products.length;
@@ -84,25 +60,19 @@
 	.custom-swiper-wrapper {
 		width: 100%;
 		overflow: hidden;
-		/* padding: 20rpx 0; */
 	}
 
 	.custom-swiper {
 		width: 100%;
 		height: 500rpx;
-		/* 固定高度，避免item被截断 */
 	}
 
-	/* 控制item之间的间距容器 */
 	.item-container {
 		padding: 0 20rpx;
-		/* 左右内边距，控制item之间的间距 */
 	}
 
-	/* 基础item样式 */
 	.swiper-item {
 		width: 100% !important;
-		/* 宽度占满容器，配合padding控制实际宽度 */
 		height: 348rpx;
 		background: #FFFFFF;
 		box-shadow: 0rpx 12rpx 19rpx 2rpx rgba(219, 73, 22, 0.6);
@@ -116,13 +86,10 @@
 		transition: all 0.3s ease;
 	}
 
-	/* 中心项激活样式 */
 	.swiper-item-active {
 		transition: all 0.5s ease;
 		height: 420rpx;
-		/* 中心项高度增加 */
 		z-index: 10;
-		/* 确保中心项在最上层 */
 	}
 
 	.item-image {

node_modules/uview-plus/libs/config/config.js

@@ -2,7 +2,7 @@ const version = '3'
 
 // 开发环境才提示，生产环境不会提示
 if (process.env.NODE_ENV === 'development') {
-	console.log(`\n %c uview-plus V${version} %c https://ijry.github.io/uview-plus/ \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0;', 'color: #3c9cff;background: #ffffff; padding:5px 0;');
+	// console.log(`\n %c uview-plus V${version} %c https://ijry.github.io/uview-plus/ \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0;', 'color: #3c9cff;background: #ffffff; padding:5px 0;');
 }
 
 export default {

pages.json

@@ -31,6 +31,7 @@
 				"navigationBarTextStyle": "black",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom",
+				 "softinputMode": "adjustResize",  // 必须配置这个才能正常获取高度
 				"app-plus": {
 					"bounce": "none"
 				}
@@ -72,54 +73,8 @@
 		// 		}
 		// 	}
 		// }, 
-		
-		{
-			"path": "pages/games/index",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationBarTextStyle": "black",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom",
-				"app-plus": {
-					"bounce": "none"
-				}
-			}
-		},
 
-		{
-			"path": "pages/auth/findpass",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationBarTextStyle": "black",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom",
-				"app-plus": {
-					"bounce": "none"
-				}
-			}
-		}, {
-			"path": "pages/auth/h5WxLogin",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationBarTextStyle": "black",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom",
-				"app-plus": {
-					"bounce": "none"
-				}
-			}
-		}, {
-			"path": "pages/auth/loginIndex",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationBarTextStyle": "black",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom",
-				"app-plus": {
-					"bounce": "none"
-				}
-			}
-		}, {
+		 {
 			"path": "pages/auth/register",
 			"style": {
 				"navigationBarTitleText": "",

pages/auth/findpass.vue

@@ -1,285 +0,0 @@
-<template>
-	<view>
-		 <view class="content">
-			 <view class="pageTop  x-c">
-			    <view class="loginBox">
-					 <view class="login-item">
-						 <view class="input-account">
-							 <input v-model="userName" placeholder="手机号" type="text" />
-						 </view>
-						 <view class="line"></view>
-					 </view> 
-					 
-					 <view class="login-item">
-						 <view class="input-pwd">
-							 <input v-model="password"  placeholder="密码(6-15个字符)" type="password" />
-						 </view>
-						  <view class="line"></view>
-					 </view> 
-					 <view class="login-item">
-						 <view class="input-yzcode x-bc">
-							 <input v-model="yzcode"  placeholder="验证码" type="number" />
-							 <view style="color:#666">获取验证码</view>
-						 </view>
-						  <view class="line"></view>
-					 </view> 
-					 <view class="btns">
-						 <view class="login-btn" @click="login">设置新密码</view>
-					 </view>
-			    </view>
-			 </view>
-		 </view>
-	</view>
-</template>
-
-<script>
-	
-// import { login,getUserInfo } from '@/api/login.js'
-import { loginByApp } from '@/api/login.js'
-
-export default {
-	data() {
-		return {
-			userName:"",
-			password:"",
-			password1:"",
-		    registrationID:"",
-			yzcode:""
-		}
-	},
-	onLoad(option) {
-	    let that=this;
-	    uni.$on('getRegistrationID', function(data) {
-	    	that.registrationID=data;
-	    });   
-		this.$getRegistrationID();
-	},
-	onShow() {
-		
-    },
-	onUnload() {
-		uni.$off('getRegistrationID');
-    },
-    mounted() {
-        
-    },
-    methods: {
-       login(){
-			if (this.$isEmpty(this.userName)) {
-				uni.showToast({
-					title: "请输入帐号",
-					icon: 'none',
-				});
-				return
-			}
-			if (this.$isEmpty(this.password)) {
-				uni.showToast({
-					title: "请输入密码",
-					icon: 'none',
-				});
-				return
-			}
-			var data = {
-				userName:this.userName,
-				password: this.password,
-				jpushId:this.registrationID || uni.getStorageSync("registrationID")
-			};
-			var that=this;
-			uni.showLoading({
-				title:"处理中..."
-			});
-			login(data).then(res => {
-					uni.hideLoading()
-					if(res.code==200){
-						
-						// #ifdef APP-PLUS
-						      //const  jyJPush = uni.requireNativePlugin('JY-JPush');
-							  
-						 // #endif 
-						
-						uni.setStorageSync('AppToken',res.data.token);
-						this.$Router.pushTab({name: 'home'});
-					}
-					else{
-						uni.showToast({title: res.msg,icon: 'none'});
-					}
-				},
-				rej => {}
-			);
-	   
-	   },
-	   goToRegister(){
-		   this.$navTo('./register');
-	   },
-	   goToFindPass(){
-	   	   this.$navTo('./findPass');
-	   },
-	   getRegistrationID(){
-		   // #ifdef APP-PLUS
-		      
-		    // #endif 
-	   }
-    },
-}
-</script>
-
-<style  lang="scss">
-	
- page{
- 	background-color: #ffffff;
- }
- .content{
- 	 display: flex;
- 	 flex-direction: column;
- 	 align-items: center;
- 	 height: calc(100vh);
- 	 width: 100%;
-	 justify-content: space-between;
- }
- .pageTop{
-	 display: flex;
-	 flex-direction: column;
-	 width: 100%;
- }
- 
- .content .head{
- 	text-align: center;
- 	width: 100%;
-	height: 522rpx;
-	// background:url(/static/image/login/top_bg.png) no-repeat 0 center;
-	background-size: cover;
-    box-sizing: border-box;
- }
- 
- .content .head image{
- 	width: 150rpx;
-	height: 150rpx;
- 	border-radius: 10rpx;
- 	box-shadow:0px 0px 20rpx rgba(0,0,0,0.2);
-	
- }
-.title{
- 	color: #141414;
- 	margin:50upx 0upx 30upx 0rpx;
- 	font-size: 38rpx;
-	font-weight: 500;
- }
- .desc{
- 	color: #686866;
- 	padding:0 0 30rpx 0rpx;
- 	font-size: 28rpx;
- }
- 
- .loginBox{
- 	padding:10px 10px 30rpx;
-	width: calc(100% - 20px) ;
-	margin-top: 0rpx;
-	background: #FDFDFD;
-	border-radius: 7rpx;
-	
- }
- 
-
- 
- .line{
-	 height: 0.5rpx;
-	 background-color: #efefef;
-	 margin-top: 10rpx;
- }
- .input-account{
- 	margin-top: 20rpx;
- 	margin-bottom: 0rpx;
- 	border-radius:40rpx;
- 	border:solid 0rpx #efefef;
- 	height: 80rpx;	
- 	width: 100%;
- 	// background:url(/static/account.png) no-repeat 0 center;
- 	background-size: 30rpx 30rpx;
- 	background-position: 30rpx;
- }
- 
- .input-yzcode{
- 	margin-top: 20rpx;
- 	margin-bottom: 0rpx;
- 	border-radius:40rpx;
- 	border:solid 0rpx #efefef;
- 	height: 80rpx;	
- 	width: 100%;
- 	// background:url(/static/image/login/cz_icon.png) no-repeat 0 center;
- 	background-size: 30rpx 30rpx;
- 	background-position: 30rpx;
- }
- 
- .input-pwd{
- 	margin-top: 40rpx;
- 	margin-bottom: 20rpx;
- 	border-radius:40rpx;
- 	border:solid 0rpx #efefef;
- 	height: 80rpx;	
- 	width: 100%;
- 	// background:url(/static/password.png) no-repeat 0 center;
- 	background-size: 30rpx 30rpx;
- 	background-position: 30rpx;
- }
- input{
- 	margin-left: 80rpx;
- 	height: 80rpx;
- 	line-height: 80rpx
- }
- .footer{
- 	color: #686866;
- 	width: 100%;
-	position: fixed;
- 	text-align: center;
- 	bottom: 60upx;
-	font-size: 28rpx;
- }
- .btns{
- 	margin: 60rpx 0rpx;
- }
- .login-btn {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 100%;
-	height: 80rpx;
-	background: linear-gradient(to right, #FF5C03 0%, #FF5C03 100%);
-	background: -moz-linear-gradient(to right, #FF5C03 0%, #FF5C03 100%);
-	box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
-	border-radius: 40rpx;
-	font-size: 30rpx;
-	font-family: PingFang SC;
-	font-weight: 500;
-	color: rgba(255, 255, 255, 1);
- }
- 
- .reg-box {
-	 padding-bottom:20rpx;
-	 margin:0 10px;
-	 .reg-btn{
-	 	 font-size:16px ;
-	 	 color: #FF5C03;
-	 }
- }
- 
- .pageBottom{
-	height: 260rpx;
-	width: 75%;
-	display: flex;
-	flex-direction: column;
- }  
- 
- .tips{
- 	color: #999;	 
-	font-size: 36rpx;
- }  
- .menu{
-	 margin-top: 30rpx;
-	 image{
-	 	width: 78rpx;
-	    height: 78rpx;
-	 }
- }
-  
- 
-</style>

pages/auth/h5WxLogin.vue

@@ -1,203 +0,0 @@
-<template>
-	<view class="content">
-		<view  class="force-login-wrap">
-			<view class="force-login__content y-f">
-				<view class="logo">
-					<view class="logo-img">
-						<image src="/static/logo.png"></image>
-					</view>
-					<view class="title">直播</view>
-				</view>
-				<view class="login-notice">为了提供更优质的服务，请先登录</view>
-				<view class="btns">
-					<view class="author-btn" @click="loginByMp()">微信授权登录</view>
-					
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-const isWechat = () => {
-	return String(navigator.userAgent.toLowerCase().match(/MicroMessenger/i)) === "micromessenger";
-}
-// import {  loginByMp } from '@/api/user'
-import {  loginByWeChat } from '@/api/login'
-export default {
-	data() {
-		return {
-			code:null,
-		}
-	},
-	onLoad(option) {
-		this.getWechatCode();
-		// setTimeout(()=>{
-		// 	this.goToLanch();
-		// },2000);
-	},
-	onUnload() {
-		
-	},
-	mounted() {
-
-	},
-	methods: {
-		loginByMp(){
-			if(this.code==null){
-				return;
-			}
-			uni.showLoading({
-				title:"处理中..."
-			});
-			let that=this;
-			var data={code:this.code}
-			loginByWeChat(data).then(res => {
-					uni.hideLoading();
-					if(res.code==200){
-						uni.setStorageSync('AppToken',res.token);
-						uni.setStorageSync('userInfo',JSON.stringify(res.user));
-						uni.$emit('refreshIM');
-						that.goToLanch();
-					}
-					else{
-						uni.showToast({title: res.msg,icon: 'none'});
-					}
-				},
-				err => {
-				}
-			);
-		},
-		getWechatCode() {
-			if (isWechat) {
-				let appid = "wx9ea36eecd281bcd3"; //微信APPid
-				let code = this.getUrlCode().code; //是否存在code
-				let local = window.location.href;
-				if (code == null || code === "") {
-				  //不存在就打开上面的地址进行授权
-					window.location.href =
-					"https://open.weixin.qq.com/connect/oauth2/authorize?appid=" +
-					appid +
-					"&redirect_uri=" +
-					encodeURIComponent(local) +
-					"&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect";
-				} else {
-					this.code = code;
-				}
-			  }
-		},
-		getUrlCode(){
-			// 截取url中的code方法
-			var url = location.search;
-			var theRequest = new Object();
-			if (url.indexOf("?") != -1) {
-				var str = url.substr(1);
-				var strs = str.split("&");
-			    for (var i = 0; i < strs.length; i++) {
-				     theRequest[strs[i].split("=")[0]] = strs[i].split("=")[1];
-				}
-			}
-			console.log(theRequest);
-			return theRequest;
-		},
-		goToLanch(){
-			let beforLoginUrl=uni.getStorageSync('beforLoginPage');
-			console.log("beforLoginUrl:"+beforLoginUrl);
-			uni.reLaunch({
-				url:beforLoginUrl
-			});
-		}
-		 
-	},
-}
-</script>
-
-<style lang="scss">
-.container {
-	flex: 1;
-	display: flex;
-	flex-direction: column;
-	justify-content: flex-start;
-	position: relative;
-	
-}
-
-.force-login-wrap {
-	width: 100%;
-	height: 100%;
-	overflow: hidden;
-	z-index: 11111;
-	top: 0;
-	
-	.force-login__content {
-		position: absolute;
-		left: 50%;
-		top: 40%;
-		transform: translate(-50%, -50%);
-		.logo{
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			.logo-img{
-				border: 4upx solid #FFFFFF;
-				box-shadow: 0px 5px 15px 2px rgba(0,0,0,0.1);
-				border-radius: 50%;
-				width: 80px;
-				height: 80px;
-				image{
-					border-radius: 50%;
-					width: 100%;
-					height: 100%;
-					overflow: hidden;
-				}
-			}
-			
-			.title{
-				margin-top: 20rpx;
-				font-size: 35rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #000;
-				margin-bottom: 30rpx;
-			}
-		}
-		 
-		.login-notice {
-		  font-size: 28rpx;
-		  font-family: PingFang SC;
-		  font-weight: 400;
-		  color: #000;
-		  line-height: 44rpx;
-		  width: 500rpx;
-		  text-align: center;
-		  margin-bottom: 80rpx;
-		}
-		.btns{
-			position: relative;
-			width: 630rpx;
-			height: 80rpx;
-			.author-btn{	
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				z-index:100;
-				position: absolute;
-				width: 630rpx;
-				height: 80rpx;
-				background: linear-gradient(to right, #FF5C03 0%, #E2C99E 100%);
-				background: -moz-linear-gradient(to right, #FF5C03 0%, #E2C99E 100%);
-				// box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
-				border-radius: 40rpx;
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: rgba(255, 255, 255, 1);
-			}
-		}
-		
-		 
-	}
-}
- 
-</style>

pages/auth/loginIndex.vue

@@ -1,303 +0,0 @@
-<template>
-	<view class="container">
-		<view class="login-title">
-			<view>您好，</view>
-			<view>欢迎来到芳华未来！</view>
-		</view>
-		<!-- <view class="logoimage"><image src="/static/logo.png" mode="aspectFill"></image></view> -->
-		<view class="login-box">
-			<!-- <view class="phone">187****8783</view>
-			<view class="tips">认证服务由中国移动统一认证提供</view> -->
-			<button class="login-btn" style="margin-top: 74rpx;" :loading="btnLoading" :disabled="btnLoading"
-				@click="submit">本机号码一键登录</button>
-			<button class="login-btn other-login-btn" :disabled="btnLoading" @tap="handleOtherLogin">其他方式登录</button>
-		
-			<view class="checkbox">
-				<view class="checkbox-icon" @tap="handleAgree">
-					<image src="/static/imagesradio_default.png" v-show="!agree"></image>
-					<image src="/static/image/radio_choose.png" v-show="agree"></image>
-				</view>
-				<view>我已阅读并同意<text @tap="goToWeb(0)">《用户协议》</text><text @tap="goToWeb(1)">《隐私政策》</text> 并使用本机号码登录</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	// import { navBack } from "../../utils/common";
-	import { navBack } from "@/utils/util";
-import {
-		loginByApp
-	} from "@/api/login.js"
-	export default {
-		data() {
-			return {
-				btnLoading: false,
-				agree: false
-			}
-		},
-		onLoad() {
-			if(!this.$isLogin()) {
-				let pages = getCurrentPages();
-				let url = pages[ pages.length - 3];
-				if(pages.length > 2 &&url&&(url.route=="pages/auth/login" || url.route=="pages/auth/loginIndex"||url.route=="pages/common/launch")) {
-					uni.navigateBack({
-						delta: 2
-					})
-				} else {
-	
-					// #ifdef APP-PLUS
-					this.submit()
-					// #endif
-					// #ifndef APP-PLUS
-					if(String(navigator.userAgent.toLowerCase().match(/MicroMessenger/i)) === "micromessenger"){
-						const pages = getCurrentPages();
-						if(pages.length > 1) {
-							const url = pages[ pages.length - 2];
-							const options = url.options //url中所带的参数
-							//拼接url的参数
-							if(options&&JSON.stringify(options)!='{}') {
-								let allurl = '/'+ url.route + uni.$u.queryParams(options)
-								uni.setStorageSync('beforLoginPage',allurl)
-							} else {
-								uni.setStorageSync('beforLoginPage','/'+url.route);
-							}
-							uni.redirectTo({
-								 url: "/pages/auth/h5WxLogin"
-							});
-						} else {
-							this.submit()
-						}
-					} else {
-						uni.redirectTo({
-							url: "/pages/auth/login"
-						})
-					}
-					// #endif
-				}
-			}
-		},
-		onShow() {
-			if(this.$isLogin()) {
-				uni.reLaunch({
-					url: '../course/index',
-					//url: '../course/video/living-app',
-					animationType: 'none',
-					animationDuration: 2000
-				})
-			}
-		},
-		methods: {
-			goToWeb(index){
-				uni.setStorageSync('url',index==0?"https://userapp.his.cdwjyyh.com/web/userAgreement":"https://userapp.his.cdwjyyh.com/web/privacyPolicy");
-				uni.navigateTo({
-					url:"/pages/index/h5"
-				})
-			},
-			// 同意
-			handleAgree() {
-				this.agree = !this.agree
-			},
-			// login
-			submit() {
-				// if(!this.agree) {
-				// 	this.$refs.popup.open('center')
-				// 	return
-				// }
-				this.$showLoginPage()
-				// uni.preLogin({
-				// 	provider: 'univerify',
-				// 	success() { //预登录成功
-				// 		// 显示一键登录选项
-				// 		uni.showToast({
-				// 			title: "登录成功",
-				// 			icon: "none"
-				// 		})
-				// 		uni.login({
-				// 			provider: 'univerify',
-				// 			univerifyStyle: { // 自定义登录框样式
-				// 				fullScreen: true,
-				// 			},
-				// 			success(res) { // 登录成功 在该回调中请求后端接口，将access_token传给后端
-				// 				console.log(res.authResult); // {openid:'登录授权唯一标识',access_token:'接口返回的 token'} 
-				// 			},
-				// 			fail(res) { // 登录失败
-				// 				console.log(res.errCode)
-				// 				console.log(res.errMsg)
-				// 			}
-				// 		})
-				// 	},
-				// 	fail(res) { // 预登录失败
-				// 		// 跳转到普通登录
-				// 		uni.navigateTo({
-				// 			url: "/pages/login/otherLogin"
-				// 		})
-				// 		// 根据错误信息判断失败原因，如有需要可将错误提交给统计服务器
-				// 		console.log(res.errCode)
-				// 		console.log(res.errMsg)
-				// 	}
-				// })
-			},
-			handleOtherLogin() {
-				uni.redirectTo({
-					url: "/pages/auth/login"
-				})
-			},
-			// 关闭弹窗
-			close(val) {
-				this.$refs.popup.close()
-				if (val == 'agree') {
-					this.agree = true
-					this.submit()
-				}
-			}
-		}
-	}
-</script>
-
-<style>
-	page {
-		background-color: #fff;
-	}
-</style>
-<style scoped lang="scss">
-	@mixin u-flex($flexD, $alignI, $justifyC) {
-		display: flex;
-		flex-direction: $flexD;
-		align-items: $alignI;
-		justify-content: $justifyC;
-	}
-
-	.container {
-		height: 100vh;
-		padding: 0 64rpx;
-		padding-top: calc(var(--status-bar-height) + 88rpx);
-		padding-bottom: calc(var(--window-bottom) + 20rpx);
-		box-sizing: border-box;
-	}
-
-	.popupbox {
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 400;
-		font-size: 30rpx;
-		color: #999999;
-		line-height: 38rpx;
-		background-color: #fff;
-		width: 600rpx;
-		padding: 60rpx 30rpx 10rpx 30rpx;
-		border-radius: 15rpx;
-		box-sizing: border-box;
-
-		text {
-			color:#FF5C03;
-		}
-
-		.popupbox-footer {
-			padding: 30rpx 0;
-			@include u-flex(row, center, center);
-		}
-
-		.popupbox-btn {
-			width: 200rpx;
-			height: 68rpx;
-			background: #fff;
-			font-size: 28rpx;
-			border-radius: 44rpx 44rpx 44rpx 44rpx;
-			text-align: center;
-			line-height: 66rpx;
-			border: 1rpx solid #999;
-			color: #999;
-		}
-
-		.agree-btn {
-			background: linear-gradient(270deg, #FF5C03 0%, #FFAC64 100%);
-			border: none;
-			color: #fff;
-		}
-	}
-
-	.login-title {
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 600;
-		font-size: 56rpx;
-		color: #333333;
-		line-height: 78rpx;
-		padding-top: 40rpx;
-	}
-	.logoimage {
-		@include u-flex(row, center, center);
-		margin-top: 5vh;
-		image {
-			height: 100rpx;
-			width: 100rpx;
-		}
-	}
-	.login-box {
-		margin-top: 20vh;
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 400;
-		font-size: 28rpx;
-		color: #333333;
-		text-align: center;
-
-		.phone {
-			font-weight: 500;
-			font-size: 56rpx;
-		}
-
-		.tips {
-			margin-top: 18rpx;
-			color: #757575;
-		}
-	}
-
-	.checkbox {
-		margin-top: 36rpx;
-		@include u-flex(row, flex-start, flex-start);
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 400;
-		font-size: 26rpx;
-		color: #999999;
-		line-height: 38rpx;
-		text-align: left;
-
-		text {
-			color:#FF5C03;
-		}
-
-		&-icon {
-			flex-shrink: 0;
-			margin-right: 12rpx;
-
-			image {
-				height: 24rpx;
-				width: 24rpx;
-			}
-		}
-		
-	}
-
-	.login-btn {
-		min-width: 622rpx;
-		height: 88rpx;
-		margin-top: 48rpx;
-		line-height: 88rpx;
-		text-align: center;
-		background: linear-gradient(270deg, #FF5C03 0%, #FFAC64 100%);
-		border-radius: 44rpx 44rpx 44rpx 44rpx;
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 600;
-		font-size: 32rpx;
-		color: #FFFFFF !important;
-
-		&::after {
-			border: none;
-		}
-	}
-
-	.other-login-btn {
-		background: #fff;
-		border: 2rpx solid #ECECEC;
-		color: #333333 !important;
-	}
-</style>

pages/games/index.vue

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

pages/home/living.vue

@@ -26,7 +26,7 @@
 
 				</view>
 				<!-- 右边的 -->
-				<view :class=" liveItem.showType==1 ? 'siderow-group' : 'side-group'">
+				<view class="side-group">
 					<view class="side-item">
 						<image class="image" @click="onLike(liveItem)" src="/static/images/like.png">
 						</image>
@@ -35,21 +35,13 @@
 					<!--  -->
 					<view class="side-item">
 						<button open-type="share" class="button">
-							<image class="image" src="/static/images/share.png" mode="widthFix"></image>
+							<image class="image" src="/static/images/wechat.png" mode="widthFix"></image>
 						</button>
 						<view>分享</view>
 					</view>
 				</view>
 
-				<!-- <view class="hongbao-box" v-if="redInfo?.redStatus==1&&isShowRed">
-					<view class="u-flex-y-center">
-						<view class="tip">领红包</view>
-						<view class="item">
-							<image @click="onRed()" src="/static/images/redbag.png" mode="widthFix">
-							</image>
-						</view>
-					</view>
-				</view> -->
+
 				<view class="activity-box">
 					<!-- v-if="redInfo?.redStatus==1&&isShowRed" -->
 					<view class="item-box" @click="onRed()" v-if="isShowRed">
@@ -90,7 +82,7 @@
 							class=" item"></live-player> -->
 						<live-player v-if="liveItem.livingUrl && liveItem.liveType === 1" :id="'myLivePlayer_' + liveId"
 							:src="liveItem.livingUrl" autoplay mode="live" object-fit="contain" :muted="false"
-							orientation="vertical" :enable-play-gesture="true"
+							orientation="vertical" :enable-play-gesture="true" min-cache="1" max-cache="3"
 							@statechange="onLiveStateChange($event, liveItem)" @error="onLiveError($event, liveItem)"
 							class="item"></live-player>
 
@@ -133,26 +125,16 @@
 				</view>
 
 				<!-- 底部聊天区域 -->
-				<view class="pb40  " style="position: fixed;bottom: 120rpx;width: 100%;">
-					<view class="w100  mt20" style="height: 35vh;">
+				<!-- class="pb20" -->
+				<view :style="{position: 'fixed',width: '100%',bottom: chatHeight + 'rpx',zIndex:999}">
+					<view class="w100  mt20" style="height: 30vh;">
 						<scroll-view enable-flex scroll-y="true" class=" p20 scrolly flex-1 column"
-							style="width: calc(100% - 40rpx);height: calc(100% - 40rpx);"
+							style="width: calc(100% - 40rpx);height: calc(100% - 20rpx);"
 							:scroll-into-view="scrollIntoView">
-							<!-- <view>
-								<view class="list justify-start" v-for="(item,talkIndex) in inAndOut" :key="talkIndex"
-									v-show="item.cmd=='announcement'">
-									<view class="talk-list ml16 justify-start">
-										<view class="fs30">
-											<text class='colorf'>
-												{{item.msg}}直播间{{liveItem.messageContent}}</text>
-										</view>
-									</view>
-								</view>
-							</view> -->
 
 							<view class="list justify-start" v-for="(item,talkIndex) in talklist" :key="talkIndex"
 								:id="`list_${talkIndex}`" v-show="item.cmd!='red'&&item.cmd!='out'&&item.cmd!='entry'">
-								<view class="talk-list ml16 justify-start">
+								<view class="talk-list  justify-start">
 									<view class="fs30">
 										<text style="color: #FFDA73;">{{item.nickName}}：</text>
 										<text class='colorf'>{{item.msg}}</text>
@@ -161,7 +143,7 @@
 							</view>
 							<view v-if="showWelcomeMessage" class="welcome-message">
 								<view class="list justify-start" v-show="inAndOut.cmd=='entry'||inAndOut.cmd=='out'">
-									<view class="talk-list ml16 justify-start">
+									<view class="talk-list justify-start">
 										<view class="fs30">
 											<text style="color: #ff89d6;">{{inAndOut.nickName}} </text>
 											<text class='colorf'>
@@ -179,7 +161,8 @@
 							style="background:rgba(57, 57, 57, 1);padding:10rpx 14rpx 10rpx 32rpx;box-sizing:border-box;border-radius:36rpx;">
 							<u-input :placeholder="placeholderText" border="none" customStyle='font-size:24rpx;'
 								v-model="value" shape='circle' color='#fff' placeholderStyle='color:#e7e7e7'
-								class="ml20" @focus="inputFocus" @blur="inputBlur">
+								:adjust-position="false" :scroll-with-animation="false" class="ml20" @focus="inputFocus"
+								@blur="inputBlur">
 							</u-input>
 							<view class="send" @click="sendMsg()">发送</view>
 						</view>
@@ -190,6 +173,7 @@
 						</view>
 					</view>
 				</view>
+
 			</view>
 
 			<view class="goods" v-if="isShowGoods">
@@ -197,9 +181,12 @@
 					<view class="left">
 						<image class="w30 h30 mr8" src="/static/images/signal.png"></image>讲解中
 					</view>
-					<image class="w44 h44 mr10" src="/static/images/close.png" @click="isShowGoods=false">
-					</image>
+					<view class="close-box mr4" @click="isShowGoods=false">
+						<image class="w34 h34 " src="/static/images/close.png">
+						</image>
+					</view>
 				</view>
+
 				<image class="photo" :src="goodsCard?.imgUrl"></image>
 				<view class="item">
 					<view class="price"><text class="red">￥{{goodsCard?.price}} </text><text
@@ -211,27 +198,6 @@
 				</view>
 			</view>
 
-			<!-- <u-popup :show="isShowGoods" @close="!isShowGoods" round='20rpx' mode="center" zIndex='10099'
-				bgColor='#ffffff'>
-				<view class="goods">
-					<view class="top">
-						<view class="left">
-							<image class="w30 h30 mr8" src="/static/images/signal.png"></image>讲解中
-						</view>
-						<image class="w44 h44 mr10" src="/static/images/close.png" @click="isShowGoods=false">
-						</image>
-					</view>
-					<image class="photo" :src="goodsCard?.imgUrl"></image>
-					<view class="item">
-						<view class="price"><text class="red">￥{{goodsCard?.price}} </text><text
-								class="del">￥{{goodsCard?.otPrice}}</text></view>
-						<view class="title oneline-hide">{{goodsCard?.productName}}</view>
-						<view class="button" @click="goShop(goodsCard?.productId,goodsCard?.goodsId)">
-							立即抢购
-						</view>
-					</view>
-				</view>
-			</u-popup> -->
 			<u-popup :show="isShowLotteryPop" @close="!isShowLotteryPop" round='40rpx'>
 				<view class="prize-box" style="border-radius: 40rpx;height: fit-content;">
 					<image class="nav-img " src="/static/images/red_head.png" mode="widthFix"></image>
@@ -243,48 +209,28 @@
 						<view class="column align-center ">
 							<image class="w446 h80" src="/static/images/red_title.png"></image>
 							<view class="fs24 colorf u-flex-y-center mt30 mb30">
-								52人已参与，开奖倒计时
-								<!-- <view class="white-item">{{lotteryTime.hours}}</view>:
-								<view class="white-item">{{lotteryTime.minutes}}</view>:
-								<view class="white-item">{{lotteryTime.seconds}}</view> -->
-								<u-count-down :time="lotteryTime||0" format="DD:HH:mm:ss" autoStart millisecond
-									@change="onChange">
+								开奖倒计时
+
+								<u-count-down :time="lotteryTime" format="HH:mm:ss" autoStart millisecond
+									@change="onChange" :key="lotteryTime">
 									<view class="u-flex-y-center">
 										<view class="white-item">
-											{{ timeData.hours>10?timeData.hours:'0'+timeData.hours}}
+											{{ timeData.hours>=10?timeData.hours:'0'+timeData.hours}}
+										</view>
+										<view class="white-item">
+											{{ timeData.minutes>=10?timeData.minutes:'0'+timeData.minutes }}
+										</view>
+										<view class="white-item">
+											{{ timeData.seconds>=10?timeData.seconds:'0'+timeData.seconds }}
 										</view>
-										<view class="white-item">{{ timeData.minutes }}</view>
-										<view class="white-item">{{ timeData.seconds }}</view>
 									</view>
 								</u-count-down>
 							</view>
 
-
-
-
-							<!-- <view class="item-group">
-								<three-d-swiper :items="swiperItems" :swiperHeight="348" :autoPlay="4000"
-									:indicatorTop="20"></three-d-swiper>
-							</view> -->
 							<view class="item-group">
 								<ThreeItemSwiper :products="lotteryProducts"></ThreeItemSwiper>
 							</view>
-
-							<!-- <view class="item-group">
-								<view class="item center">
-									<image class="w280 h280" src="/static/images/img.png"></image>
-									<view v-show="true" class="title">二等奖</view>
-									<view v-show="true" class="txt">新用户免费领礼品弹窗</view>
-								</view>
-							</view> -->
 							<view class="point-group" v-for="(item,index) in lotteryProducts" :key="index">
-								<!-- <view class="item" v-if="item.length"
-											:class="{ selected: activePointIndex === 0 }" @click="activePointIndex = 0">
-										</view> -->
-								<!-- <view class="item" :class="{ selected: activePointIndex === 1 }"
-											@click="() => { activePointIndex = 1; scrollToCenterItem() }"></view>
-										<view class="item" :class="{ selected: activePointIndex === 2 }"
-											@click="activePointIndex = 2"></view> -->
 							</view>
 							<view class="colorf  fs28">
 								观看直播参与抽奖
@@ -347,18 +293,15 @@
 							<u-avatar :src="item.avatar||$img.logo" size="36"></u-avatar>
 							<text class="ml16 f30">{{item.nickName||"未命名"}}</text>
 						</view>
-						<!-- 	<view class="no-more" v-if="viewNoMoreData && liveViewers.length > 0">
-							<text>没有更多了</text>
-						</view> -->
 					</scroll-view>
 				</view>
 			</u-popup>
 
+
 			<!-- 商品弹窗 -->
 			<u-popup :show="shopping" @close="closeShop" round='20rpx' bgColor='f3f5f9' zIndex='10075'>
 				<view class="shoppop">
 					<view class="shoppop-top">
-						<!-- <u-avatar :src="store.logoUrl" size="36" class="ml16"></u-avatar> -->
 						<view class="search-input u-flex-y-center">
 							<image class="w24 mr16" src="/static/images/search.png" mode="widthFix">
 							</image>
@@ -452,6 +395,9 @@
 		},
 		data() {
 			return {
+				chatHeight: 0,
+				keyboardHeight: 0,
+				// inputHeight: null,
 				videoCurrentTime: 0, // 当前视频播放时间
 				isVideoPlaying: false, // 视频是否正在播放
 				videoProgressKey: '', // 存储进度的key
@@ -460,7 +406,7 @@
 				isShowPrize: false,
 				prizeInfo: [],
 				timeData: {},
-				lotteryTime: 0,
+				lotteryTime: null,
 				lotteryProducts: [],
 				lotteryList: [],
 				talklist: {},
@@ -501,7 +447,6 @@
 				viewPageSize: 10, // 每页数量
 				viewPageNum: 1, // 当前页码
 				viewLoading: false, // 是否正在加载
-				viewNoMoreData: false, // 是否没有更多数据
 				scrollHeight: 0,
 				scrollTimer: null, // 滚动防抖定时器
 
@@ -547,20 +492,16 @@
 
 
 		onLoad(options) {
+
+			this.keyboardListener = uni.onKeyboardHeightChange(res => {
+				console.log('键盘高度', res.height);
+				this.keyboardHeight = res.height * 2;
+			});
 			this.initTime();
-			console.log(options)
 			if (options.liveId) {
 				this.liveId = options.liveId; // 仅当 liveId 变化时更新
 			}
 			this.userinfo = JSON.parse(uni.getStorageSync("userInfo"))
-			if (this.liveId == null) {
-				uni.showToast({
-					title: "未知错误，请联系管理员！",
-					icon: 'none'
-				});
-				return;
-			}
-			console.log(this.liveId)
 			// 初始化直播间列表
 			this.getliving(this.liveId);
 			this.initSocket();
@@ -637,13 +578,14 @@
 
 			// 清除定时器
 			if (this.redTimer) {
-				clearInterval(this.redTimer);
+				clearTimeout(this.redTimer);
 				this.redTimer = null;
 			}
 			if (this.lotteryTimer) {
-				clearInterval(this.lotteryTimer);
+				clearTimeout(this.lotteryTimer);
 				this.lotteryTimer = null;
 			}
+			this.lotteryTime = 0; // 重置时间
 			if (this.welcomeTimer) {
 				clearInterval(this.welcomeTimer);
 				this.welcomeTimer = null;
@@ -698,6 +640,25 @@
 			}
 		},
 		methods: {
+			inputFocus() {
+				this.chatHeight = this.keyboardHeight;
+				this.isFocus = true;
+			},
+			inputBlur() {
+				this.chatHeight = 0;
+				this.isFocus = false
+
+			},
+
+			// resetCountdown() {
+			// 	// 先停止
+			// 	this.$refs.countDownRef && this.$refs.countDownRef.stop();
+
+			// 	// 重新设置时间并启动
+			// 	this.$nextTick(() => {
+			// 		this.$refs.countDownRef && this.$refs.countDownRef.start();
+			// 	});
+			// },
 			// 录播时间点
 			onVideoMetaLoaded(e) {
 				// 设置存储key
@@ -784,9 +745,7 @@
 			onClaim() {
 				let data = {
 					liveId: this.liveId,
-					// integral: this.integral,
 					lotteryId: this.lotteryInfo.lotteryId,
-					// userId: this.userinfo.userId
 				}
 
 				claim(data).then(res => {
@@ -809,10 +768,6 @@
 			},
 			// 点击抽奖图标
 			onLottery() {
-				if (this.lotteryTimer) {
-					clearInterval(this.lotteryTimer);
-					this.lotteryTimer = null;
-				}
 				if (!this.lotteryInfo) return;
 
 				let data = {
@@ -821,11 +776,14 @@
 
 				// 抽奖查询
 				liveLottery(data).then(res => {
-						// this.isShowLottery = false
-						this.isShowLotteryPop = true
 						if (res.code == 200) {
 							this.lotteryList = res.data
 							this.lotteryProducts = res.data.products
+
+							if (res.data.duration) {
+								// this.lotteryTime = res.data.duration * 60 * 1000; // 重新赋值
+								this.isShowLotteryPop = true
+							}
 							// this.startTimeTimer(this.lotteryList, "lottery");
 						} else {
 							uni.showToast({
@@ -860,12 +818,6 @@
 					rej => {}
 				);
 			},
-			inputFocus() {
-				this.isFocus = true
-			},
-			inputBlur() {
-				this.isFocus = false
-			},
 
 			//正在购买
 
@@ -906,52 +858,34 @@
 			getCurrentActivities() {
 				if (!this.liveId) return;
 				currentActivities(this.liveId).then(res => {
-						if (res.code == 200) {
-							// 商品卡片
-							// 红包
-							if (res.red) {
-								this.redInfo = res.red[0];
-							}
-							if (res.lottery) {
-								this.lotteryInfo = res.lottery[0];
-							}
-
-							this.goodsCard = res.goods;
-
-
-
-							// 抽奖
-							this.lotteryTime = this.lotteryInfo?.duration * 60 * 1000
-
-							if (this.goodsCard && this.goodsCard.status == 1) {
-
-								this.isShowGoods = true
-							} else {
-								this.isShowGoods = false
-							}
-
-							if (this.redInfo && this.redInfo.redStatus == 1) {
-
-								this.isShowRed = true
-							} else {
-								this.isShowRed = false
-							}
-							if (this.lotteryInfo && this.lotteryInfo.lotteryStatus == 1) {
-								this.isShowLottery = true
-							} else {
-								this.isShowLottery = false
-							}
-
-
-						} else {
-							uni.showToast({
-								title: res.msg,
-								icon: 'none'
-							});
+					if (res.code === 200) {
+						// 提取数据（默认空数组/对象避免报错）
+						this.redInfo = (res.red || [])[0];
+						this.lotteryInfo = (res.lottery || [])[0];
+						this.goodsCard = res.goods || {};
+
+						// 抽奖时间计算
+						this.lotteryTime = this.lotteryInfo?.duration * 60 * 1000;
+
+						this.isShowGoods = this.goodsCard && this.goodsCard.status == 1;
+						this.isShowRed = this.redInfo && this.redInfo.redStatus == 1;
+						this.isShowLottery = this.lotteryInfo && this.lotteryInfo.lotteryStatus == 1;
+
+						// 处理抽奖定时器
+						clearTimeout(this.lotteryTimer); // 先清除旧定时器
+						if (this.isShowLottery) {
+							this.lotteryTimer = setTimeout(() => {
+								this.isShowLottery = this.isShowLotteryPop = false;
+							}, this.lotteryInfo.duration * 60000);
 						}
-					},
-					rej => {}
-				);
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						});
+					}
+				}, rej => {});
+
 			},
 			// 计算当前时间与 liveItem.startTime 的差值，并更新 totalTime
 			calculateTimeDiff(item, type = "") {
@@ -987,11 +921,11 @@
 				// 防御3：时间解析失败（Invalid Date），兜底显示
 				if (isNaN(time.getTime())) {
 					if (type === "lottery") {
-						this.lotteryTime = {
-							hours: "00",
-							minutes: "00",
-							seconds: "00"
-						};
+						// this.lotteryTime = {
+						// 	hours: "00",
+						// 	minutes: "00",
+						// 	seconds: "00"
+						// };
 					} else {
 						this.$set(this.liveItem, "totalTime", "00:00:00");
 					}
@@ -1374,17 +1308,15 @@
 					this.liveItem = res.data;
 					this.talklist = res.data.talklist;
 
-					// 强制更新视频源（覆盖旧值）
-					if (res.data.liveType === 2) {
-						// 回放视频
-						this.$set(this.liveItem, 'videoUrl', res.data.videoUrl);
-						this.$set(this.liveItem, 'livingUrl', ''); // 清空直播流
-
-
-					} else if (res.data.liveType === 1) {
+					if (res.data.liveType === 1) {
 						// 直播流
 						this.$set(this.liveItem, 'livingUrl', res.data.flvHlsUrl);
 						this.$set(this.liveItem, 'videoUrl', ''); // 清空回放视频
+
+					} else if (res.data.liveType === 2||res.data.liveType === 3) {
+						// 回放视频   2录播 3直播回放
+						this.$set(this.liveItem, 'videoUrl', res.data.videoUrl);
+						this.$set(this.liveItem, 'livingUrl', ''); // 清空直播流
 					} else {
 						// 未开播
 						this.$set(this.liveItem, 'livingUrl', '');
@@ -1443,6 +1375,7 @@
 			},
 			// 点赞
 			async onLike(liveItem) {
+				console.log("dian")
 				if (!liveItem || !this.liveId) return;
 				try {
 					const res = await liveDataLike(this.liveId);
@@ -1540,19 +1473,11 @@
 			},
 			initSocket() {
 
-
-				if (!this.liveId||this.userinfo?.userId ) return;
-
-				// 设置正在连接的直播间ID
-				// this.connectingLiveId = liveId;
-
-				// 生成签名
+				if (!this.liveId) return;
 				const signature = CryptoJS.HmacSHA256(
 					`${this.liveId}${this.userinfo.userId}${this.userType}${this.timestamp}`,
 					this.timestamp.toString()
 				).toString(CryptoJS.enc.Hex);
-
-
 				try {
 					const socketTask = uni.connectSocket({
 						url: `${wsUrl}?userId=${this.userinfo.userId}&liveId=${this.liveId}&userType=${this.userType}&timestamp=${this.timestamp}&signature=${signature}`,
@@ -1600,34 +1525,32 @@
 						});
 					} else if (socketMessage.cmd == 'red') {
 						this.redInfo = JSON.parse(socketMessage.data);
-
-						if (socketMessage.status == 1) {
-							this.isShowRed = true
-							let time = this.redInfo.duration
-							this.redTimer = setInterval(() => {
-								this.isShowRed = false
-							}, time * 60000)
-						} else {
-							this.isShowRed = false
+						this.isShowRed = socketMessage.status === 1;
+						if (this.isShowRed) {
+							const time = this.redInfo.duration * 60000;
+							this.redTimer = setTimeout(() => this.isShowRed = false, time);
 						}
 
 					} else if (socketMessage.cmd == 'goods') {
 						this.goodsCard = JSON.parse(socketMessage.data);
-						if (socketMessage.status == 1) {
-							this.isShowGoods = true
-						} else {
-							this.isShowGoods = false
-						}
+						this.isShowGoods = socketMessage.status == 1;
 
 					} else if (socketMessage.cmd == 'lottery') {
+
 						this.lotteryInfo = JSON.parse(socketMessage.data);
-						if (socketMessage.status == 1) {
-							this.isShowLottery = true
-							let time = this.lotteryInfo.duration
-							this.lotteryTimer = setInterval(() => {
-								this.isShowLottery = false
-							}, time * 60000)
-							this.lotteryTime = time * 60 * 1000
+						this.isShowLottery = socketMessage.status === 1;
+
+						// 清除已有定时器（无论状态是否为1，先清掉旧的）
+						clearTimeout(this.lotteryTimer);
+
+						if (this.isShowLottery) {
+							this.lotteryTime = this.lotteryInfo.duration * 60 * 1000;
+							this.lotteryTimer = setTimeout(() => {
+								this.isShowLottery = false;
+								this.isShowLotteryPop = false;
+							}, this.lotteryTime);
+
+
 							// this.convertMinutesToHoursMinutes(time)
 						} else {
 							this.isShowLottery = false
@@ -1656,6 +1579,7 @@
 						this.prizeInfo = JSON.parse(socketMessage.data);
 						this.isShowPrize = true;
 						this.isShowLottery = false
+						this.isShowLotteryPop = false;
 					} else if (socketMessage.cmd == 'blockUser') {
 						uni.removeStorage({
 							key: 'AppToken',
@@ -1804,7 +1728,7 @@
 	.welcome-message {
 		position: fixed;
 		width: 100%;
-		bottom: 700rpx;
+		bottom: 38vh;
 		left: 50%;
 		transform: translateX(-50%);
 		color: white;
@@ -1942,42 +1866,11 @@
 		}
 
 
-		.siderow-group {
-			position: absolute;
-			top: 65%;
-			right: 30rpx;
-			z-index: 9;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-
-			.side-item {
-				font-weight: 500;
-				font-size: 24rpx;
-				color: #FFFFFF;
-				margin-bottom: 32rpx;
-				text-align: center;
-
-				.button {
-					background-color: transparent;
-					margin: 0;
-					line-height: 1;
-					padding: 0;
-				}
-
-				.image {
-					width: 72rpx;
-					height: 72rpx;
-				}
-			}
-		}
-
 		.side-group {
 			position: absolute;
-			// top: 30%;
 			top: 65%;
 			right: 30rpx;
-			z-index: 9;
+			z-index: 1000;
 			display: flex;
 			flex-direction: column;
 			align-items: center;
@@ -2037,17 +1930,16 @@
 	}
 
 	.input-box {
-		position: fixed;
-		bottom: 20rpx;
-
+		// position: fixed;
+		// bottom: 20rpx;
 	}
 
+
 	.videolist {
 		position: relative;
 		height: 100vh;
 		width: 100%;
 
-
 		.video {
 			height: 100vh;
 			width: 100%;
@@ -2074,8 +1966,6 @@
 				color: #fff;
 				border-radius: 15rpx;
 			}
-
-
 		}
 
 		.video_row {
@@ -2083,10 +1973,7 @@
 			top: 18%;
 			max-height: 500rpx;
 			z-index: 99;
-
-
 		}
-
 	}
 
 	.prize-card {
@@ -2114,7 +2001,6 @@
 			.txt {
 				font-weight: 600;
 			}
-
 		}
 
 		.tip {
@@ -2134,15 +2020,13 @@
 			color: #ffffff;
 			text-align: center;
 		}
-
 	}
 
 	.red-card {
-		width: 504rpx;
+		width: 550rpx;
 		height: 636rpx;
 		position: relative;
 
-
 		image {
 			position: absolute;
 			width: 100%;
@@ -2201,7 +2085,8 @@
 	}
 
 	.integral-box {
-		width: 500rpx;
+		min-width: 400rpx;
+		max-width: 600rpx;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
@@ -2284,8 +2169,16 @@
 				align-items: center;
 				border-radius: 10rpx;
 			}
+
+			.close-box {
+				padding: 4rpx 6rpx 0;
+				border-radius: 4rpx;
+				background-color: rgba(0, 0, 0, 0.5);
+			}
 		}
 
+
+
 		.photo {
 			width: 100%;
 			height: 180rpx;
@@ -2293,6 +2186,8 @@
 			overflow: hidden;
 		}
 
+
+
 		.item {
 			padding: 4rpx;
 

pages_shop/goods.vue

@@ -115,10 +115,9 @@
 			</view>
 		</view>
 		<!-- 购买人数、库存 -->
-		<view class="shop-box" v-if="storeInfo">
+		<!-- <view class="shop-box" v-if="storeInfo">
 			<view class=""
 				style="flex: 1;overflow: hidden; display: flex; justify-content: space-between; align-items: center;">
-				<!-- 店铺图片logo -->
 				<view class="logo">
 				<image :src="storeInfo?.logoUrl || $img.img" mode="aspectFill"></image>
 			</view>
@@ -128,7 +127,7 @@
 				</view>
 			</view>
 			<button class="goShop" @click="navgetTo('/pages_shop/store?liveId='+liveId+ '&storeId=' +storeId)">进店</button>
-		</view>
+		</view> -->
 
 		<!-- 图文详情 -->
 		<!-- <view class="det-box">

pages_shop/order.vue

@@ -36,7 +36,7 @@
 						<view class="order-bottom">
 							<view class="order-money">
 								<text class="title">订单金额：</text>
-								<text class="num">￥<text class="bold">{{item.totalPrice}}</text>.00</text>
+								<text class="num">￥<text class="bold">{{item.totalPrice}}</text></text>
 							</view>
 							<view class="button-group">
 								<view v-if="item.status == 1" @click="cancel(item)" class="button cancel ">取消订单</view>

uni_modules/uview-plus/libs/config/config.js

@@ -2,7 +2,7 @@ const version = '3'
 
 // 开发环境才提示，生产环境不会提示
 if (process.env.NODE_ENV === 'development') {
-	console.log(`\n %c uview-plus V${version} %c https://ijry.github.io/uview-plus/ \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0;', 'color: #3c9cff;background: #ffffff; padding:5px 0;');
+	// console.log(`\n %c uview-plus V${version} %c https://ijry.github.io/uview-plus/ \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0;', 'color: #3c9cff;background: #ffffff; padding:5px 0;');
 }
 
 export default {

unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-plus/libs/config/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sources":["uni_modules/uview-plus/libs/config/config.js"],"sourcesContent":["const version = '3'\n\n// 开发环境才提示，生产环境不会提示\nif (process.env.NODE_ENV === 'development') {\n\tconsole.log(`\\n %c uview-plus V${version} %c https://ijry.github.io/uview-plus/ \\n\\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0;', 'color: #3c9cff;background: #ffffff; padding:5px 0;');\n}\n\nexport default {\n    v: version,\n    version,\n    // 主题名称\n    type: [\n        'primary',\n        'success',\n        'info',\n        'error',\n        'warning'\n    ],\n    // 颜色部分，本来可以通过scss的:export导出供js使用，但是奈何nvue不支持\n    color: {\n        'u-primary': '#2979ff',\n        'u-warning': '#ff9900',\n        'u-success': '#19be6b',\n        'u-error': '#fa3534',\n        'u-info': '#909399',\n        'u-main-color': '#303133',\n        'u-content-color': '#606266',\n        'u-tips-color': '#909399',\n        'u-light-color': '#c0c4cc'\n    },\n\t// 默认单位，可以通过配置为rpx，那么在用于传入组件大小参数为数值时，就默认为rpx\n\tunit: 'px'\n}\n"],"names":["version","config"],"mappings":"6DAAMA,EAAU,4EAIH;AAAA,kBAAqBA,CAAO;AAAA;AAAA,EAA+C,sDAAuD,oDAAoD,EAGnM,MAAeC,EAAA,CACX,EAAGD,EACH,QAAAA,EAEA,KAAM,CACF,UACA,UACA,OACA,QACA,SACJ,EAEA,MAAO,CACH,YAAa,UACb,YAAa,UACb,YAAa,UACb,UAAW,UACX,SAAU,UACV,eAAgB,UAChB,kBAAmB,UACnB,eAAgB,UAChB,gBAAiB,SACrB,EAEH,KAAM,IACP"}
+{"version":3,"file":"config.js","sources":["uni_modules/uview-plus/libs/config/config.js"],"sourcesContent":["const version = '3'\n\n// 开发环境才提示，生产环境不会提示\nif (process.env.NODE_ENV === 'development') {\n\t// console.log(`\\n %c uview-plus V${version} %c https://ijry.github.io/uview-plus/ \\n\\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0;', 'color: #3c9cff;background: #ffffff; padding:5px 0;');\n}\n\nexport default {\n    v: version,\n    version,\n    // 主题名称\n    type: [\n        'primary',\n        'success',\n        'info',\n        'error',\n        'warning'\n    ],\n    // 颜色部分，本来可以通过scss的:export导出供js使用，但是奈何nvue不支持\n    color: {\n        'u-primary': '#2979ff',\n        'u-warning': '#ff9900',\n        'u-success': '#19be6b',\n        'u-error': '#fa3534',\n        'u-info': '#909399',\n        'u-main-color': '#303133',\n        'u-content-color': '#606266',\n        'u-tips-color': '#909399',\n        'u-light-color': '#c0c4cc'\n    },\n\t// 默认单位，可以通过配置为rpx，那么在用于传入组件大小参数为数值时，就默认为rpx\n\tunit: 'px'\n}\n"],"names":["version","config"],"mappings":"aAAA,MAAMA,EAAU,IAODC,EAAA,CACX,EAAGD,EACH,QAAAA,EAEA,KAAM,CACF,UACA,UACA,OACA,QACA,SACJ,EAEA,MAAO,CACH,YAAa,UACb,YAAa,UACb,YAAa,UACb,UAAW,UACX,SAAU,UACV,eAAgB,UAChB,kBAAmB,UACnB,eAAgB,UAChB,gBAAiB,SACrB,EAEH,KAAM,IACP"}

unpackage/dist/dev/mp-weixin/app.js

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("./common/vendor.js"),i=require("./utils/storage.js"),n=require("./store/index.js"),p=require("./core/bootstrap.js"),o=require("./utils/util.js"),g=require("./core/mixins/share.js"),d=require("./core/mixins/app.js"),u={onLaunch:function(e){const r=s.useStore();let a;e.query&&e.query.scene?a=decodeURIComponent(e.query.scene).split("=")[1]:e.query&&e.query.parent_id&&(a=e.query.parent_id),i.storage.set("PARENT_ID",a,30*86400*3),r.commit("M_PARENT_ID",a),this.updateManager()},onShow:function(){s.index.__f__("log","at App.vue:25","App Show")},onLoad(){s.index.__f__("log","at App.vue:29","App Load")},onHide:function(){s.index.__f__("log","at App.vue:32","App Hide")},methods:{updateManager(){const e=s.index.getUpdateManager();e.onCheckForUpdate(r=>{}),e.onUpdateReady(()=>{s.index.showModal({title:"更新提示",content:"新版本已经准备好，即将重启应用",showCancel:!1,success(r){r.confirm&&e.applyUpdate()}})}),e.onUpdateFailed(()=>{s.index.showModal({title:"更新提示",content:"新版本下载失败",showCancel:!1})})}}};function t(){const e=s.createSSRApp(u);return e.use(s.uviewPlus),e.use(n.store),e.config.productionTip=!1,e.config.globalProperties.$img={img:"/static/images/img.png",logo:"/static/images/logo.png"},e.config.globalProperties.$isLogin=o.isLogin,e.config.globalProperties.$isEmpty=o.isEmpty,e.config.globalProperties.$navTo=o.navTo,e.config.globalProperties.$getRegistrationID=o.getRegistrationID,e.config.globalProperties.$parsePhone=o.parsePhone,e.mixin(g.share),e.mixin(d.mixin),{app:e,created:p.Initializer}}t().app.mount("#app");exports.createApp=t;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("./common/vendor.js"),i=require("./utils/storage.js"),n=require("./store/index.js"),p=require("./core/bootstrap.js"),o=require("./utils/util.js"),g=require("./core/mixins/share.js"),d=require("./core/mixins/app.js"),c={onLaunch:function(e){const r=s.useStore();let t;e.query&&e.query.scene?t=decodeURIComponent(e.query.scene).split("=")[1]:e.query&&e.query.parent_id&&(t=e.query.parent_id),i.storage.set("PARENT_ID",t,30*86400*3),r.commit("M_PARENT_ID",t),this.updateManager()},onShow:function(){s.index.__f__("log","at App.vue:25","App Show")},onLoad(){s.index.__f__("log","at App.vue:29","App Load")},onHide:function(){s.index.__f__("log","at App.vue:32","App Hide")},methods:{updateManager(){const e=s.index.getUpdateManager();e.onCheckForUpdate(r=>{}),e.onUpdateReady(()=>{s.index.showModal({title:"更新提示",content:"新版本已经准备好，即将重启应用",showCancel:!1,success(r){r.confirm&&e.applyUpdate()}})}),e.onUpdateFailed(()=>{s.index.showModal({title:"更新提示",content:"新版本下载失败",showCancel:!1})})}}};function a(){const e=s.createSSRApp(c);return e.use(s.uviewPlus),e.use(n.store),e.config.productionTip=!1,e.config.globalProperties.$img={img:"/static/images/img.png",logo:"/static/images/logo.png"},e.config.globalProperties.$isLogin=o.isLogin,e.config.globalProperties.$isEmpty=o.isEmpty,e.config.globalProperties.$navTo=o.navTo,e.config.globalProperties.$getRegistrationID=o.getRegistrationID,e.config.globalProperties.$parsePhone=o.parsePhone,e.mixin(g.share),e.mixin(d.mixin),{app:e,created:p.Initializer}}a().app.mount("#app");exports.createApp=a;
 //# sourceMappingURL=../.sourcemap/mp-weixin/app.js.map

unpackage/dist/dev/mp-weixin/app.json

@@ -4,10 +4,6 @@
     "pages/home/living",
     "pages/user/index",
     "pages/list/index",
-    "pages/games/index",
-    "pages/auth/findpass",
-    "pages/auth/h5WxLogin",
-    "pages/auth/loginIndex",
     "pages/auth/register"
   ],
   "subPackages": [

unpackage/dist/dev/mp-weixin/components/Loading.js

@@ -1,2 +0,0 @@
-"use strict";const e=require("../common/vendor.js"),o={name:"Loading",props:{loaded:Boolean,loading:Boolean}};function a(t,c,n,i,l,_){return e.e({a:n.loading||!n.loaded},n.loading||!n.loaded?e.e({b:n.loading},n.loading?{}:{},{c:!n.loading},n.loading?{}:{}):{})}const d=e._export_sfc(o,[["render",a]]);wx.createComponent(d);
-//# sourceMappingURL=../../.sourcemap/mp-weixin/components/Loading.js.map

unpackage/dist/dev/mp-weixin/components/Loading.json

@@ -1,4 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {}
-}

unpackage/dist/dev/mp-weixin/components/Loading.wxml

@@ -1 +0,0 @@
-<view wx:if="{{a}}" class="Loads acea-row row-center-wrapper" style="margin-top:20rpx"><block wx:if="{{b}}"><view class="iconfont icon-jiazai loading acea-row row-center-wrapper"></view> 正在加载中 </block><block wx:if="{{c}}"> 上拉加载更多 </block></view>

unpackage/dist/dev/mp-weixin/components/ThreeItemSwiper.js

@@ -1,2 +1,2 @@
-"use strict";const e=require("../common/vendor.js"),a={props:{products:{type:Array,default:""}},data(){return{activeIndex:0,outerMargin:"120rpx"}},computed:{currentCenterIndex(){return this.products.length===0?0:this.activeIndex%this.products.length}},methods:{onSwiperChange(u){this.activeIndex=u.detail.current}}};function o(u,p,d,i,c,r){return{a:e.f(d.products,(t,n,h)=>e.e({a:t.imgUrl,b:n===r.currentCenterIndex},n===r.currentCenterIndex?{c:e.t(t.prizeLevel),d:e.t(t.productName)}:{},{e:n===r.currentCenterIndex?1:"",f:n})),b:c.activeIndex,c:e.o((...t)=>r.onSwiperChange&&r.onSwiperChange(...t)),d:c.outerMargin,e:c.outerMargin}}const s=e._export_sfc(a,[["render",o],["__scopeId","data-v-efdfa05e"]]);wx.createComponent(s);
+"use strict";const e=require("../common/vendor.js"),a={props:{products:{type:Array,default:()=>[]}},data(){return{activeIndex:0,outerMargin:"120rpx"}},computed:{currentCenterIndex(){return this.products.length===0?0:this.activeIndex%this.products.length}},methods:{onSwiperChange(u){this.activeIndex=u.detail.current}}};function o(u,p,d,i,c,r){return{a:e.f(d.products,(t,n,h)=>e.e({a:t.imgUrl,b:n===r.currentCenterIndex},n===r.currentCenterIndex?{c:e.t(t.prizeLevel),d:e.t(t.productName)}:{},{e:n===r.currentCenterIndex?1:"",f:n})),b:c.activeIndex,c:e.o((...t)=>r.onSwiperChange&&r.onSwiperChange(...t)),d:c.outerMargin,e:c.outerMargin}}const s=e._export_sfc(a,[["render",o],["__scopeId","data-v-efdfa05e"]]);wx.createComponent(s);
 //# sourceMappingURL=../../.sourcemap/mp-weixin/components/ThreeItemSwiper.js.map

unpackage/dist/dev/mp-weixin/pages/auth/findpass.js

@@ -1,2 +0,0 @@
-"use strict";const e=require("../../common/vendor.js");require("../../api/login.js");const a={data(){return{userName:"",password:"",password1:"",registrationID:"",yzcode:""}},onLoad(s){let o=this;e.index.$on("getRegistrationID",function(n){o.registrationID=n}),this.$getRegistrationID()},onShow(){},onUnload(){e.index.$off("getRegistrationID")},mounted(){},methods:{login(){if(this.$isEmpty(this.userName)){e.index.showToast({title:"请输入帐号",icon:"none"});return}if(this.$isEmpty(this.password)){e.index.showToast({title:"请输入密码",icon:"none"});return}var s={userName:this.userName,password:this.password,jpushId:this.registrationID||e.index.getStorageSync("registrationID")};e.index.showLoading({title:"处理中..."}),login(s).then(o=>{e.index.hideLoading(),o.code==200?(e.index.setStorageSync("AppToken",o.data.token),this.$Router.pushTab({name:"home"})):e.index.showToast({title:o.msg,icon:"none"})},o=>{})},goToRegister(){this.$navTo("./register")},goToFindPass(){this.$navTo("./findPass")},getRegistrationID(){}}};function d(s,o,n,h,i,r){return{a:i.userName,b:e.o(t=>i.userName=t.detail.value),c:i.password,d:e.o(t=>i.password=t.detail.value),e:i.yzcode,f:e.o(t=>i.yzcode=t.detail.value),g:e.o((...t)=>r.login&&r.login(...t))}}const g=e._export_sfc(a,[["render",d]]);wx.createPage(g);
-//# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/auth/findpass.js.map

unpackage/dist/dev/mp-weixin/pages/auth/findpass.json

@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "navigationBarTextStyle": "black",
-  "enablePullDownRefresh": false,
-  "navigationStyle": "custom",
-  "usingComponents": {}
-}

unpackage/dist/dev/mp-weixin/pages/auth/findpass.wxml

@@ -1 +0,0 @@
-<view><view class="content"><view class="pageTop x-c"><view class="loginBox"><view class="login-item"><view class="input-account"><input placeholder="手机号" type="text" value="{{a}}" bindinput="{{b}}"/></view><view class="line"></view></view><view class="login-item"><view class="input-pwd"><input placeholder="密码(6-15个字符)" type="password" value="{{c}}" bindinput="{{d}}"/></view><view class="line"></view></view><view class="login-item"><view class="input-yzcode x-bc"><input placeholder="验证码" type="number" value="{{e}}" bindinput="{{f}}"/><view style="color:#666">获取验证码</view></view><view class="line"></view></view><view class="btns"><view class="login-btn" bindtap="{{g}}">设置新密码</view></view></view></view></view></view>

unpackage/dist/dev/mp-weixin/pages/auth/findpass.wxss

@@ -1 +0,0 @@
-page{background-color:#fff}.content{display:flex;flex-direction:column;align-items:center;height:100vh;width:100%;justify-content:space-between}.pageTop{display:flex;flex-direction:column;width:100%}.content .head{text-align:center;width:100%;height:522rpx;background-size:cover;box-sizing:border-box}.content .head image{width:150rpx;height:150rpx;border-radius:10rpx;box-shadow:0 0 20rpx rgba(0,0,0,.2)}.title{color:#141414;margin:50rpx 0rpx 30rpx;font-size:38rpx;font-weight:500}.desc{color:#686866;padding:0 0 30rpx 0rpx;font-size:28rpx}.loginBox{padding:10px 10px 30rpx;width:calc(100% - 20px);margin-top:0rpx;background:#fdfdfd;border-radius:7rpx}.line{height:.5rpx;background-color:#efefef;margin-top:10rpx}.input-account,.input-yzcode{margin-top:20rpx;margin-bottom:0rpx;border-radius:40rpx;border:solid 0rpx #efefef;height:80rpx;width:100%;background-size:30rpx 30rpx;background-position:30rpx}.input-pwd{margin-top:40rpx;margin-bottom:20rpx;border-radius:40rpx;border:solid 0rpx #efefef;height:80rpx;width:100%;background-size:30rpx 30rpx;background-position:30rpx}input{margin-left:80rpx;height:80rpx;line-height:80rpx}.footer{color:#686866;width:100%;position:fixed;text-align:center;bottom:60rpx;font-size:28rpx}.btns{margin:60rpx 0rpx}.login-btn{display:flex;align-items:center;justify-content:center;width:100%;height:80rpx;background:linear-gradient(to right,#ff5c03,#ff5c03);background:-moz-linear-gradient(to right,#FF5C03 0%,#FF5C03 100%);box-shadow:0 7rpx 6rpx rgba(229,138,0,.22);border-radius:40rpx;font-size:30rpx;font-family:PingFang SC;font-weight:500;color:#fff}.reg-box{padding-bottom:20rpx;margin:0 10px}.reg-box .reg-btn{font-size:16px;color:#ff5c03}.pageBottom{height:260rpx;width:75%;display:flex;flex-direction:column}.tips{color:#999;font-size:36rpx}.menu{margin-top:30rpx}.menu image{width:78rpx;height:78rpx}

unpackage/dist/dev/mp-weixin/pages/auth/h5WxLogin.js

@@ -1,2 +0,0 @@
-"use strict";const e=require("../../common/vendor.js"),c=require("../../api/login.js"),s=require("../../common/assets.js"),d=()=>String(navigator.userAgent.toLowerCase().match(/MicroMessenger/i))==="micromessenger",g={data(){return{code:null}},onLoad(o){this.getWechatCode()},onUnload(){},mounted(){},methods:{loginByMp(){if(this.code==null)return;e.index.showLoading({title:"处理中..."});let o=this;var t={code:this.code};c.loginByWeChat(t).then(n=>{e.index.hideLoading(),n.code==200?(e.index.setStorageSync("AppToken",n.token),e.index.setStorageSync("userInfo",JSON.stringify(n.user)),e.index.$emit("refreshIM"),o.goToLanch()):e.index.showToast({title:n.msg,icon:"none"})},n=>{})},getWechatCode(){if(d){let o="wx9ea36eecd281bcd3",t=this.getUrlCode().code,n=window.location.href;t==null||t===""?window.location.href="https://open.weixin.qq.com/connect/oauth2/authorize?appid="+o+"&redirect_uri="+encodeURIComponent(n)+"&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect":this.code=t}},getUrlCode(){var o=location.search,t=new Object;if(o.indexOf("?")!=-1)for(var n=o.substr(1),r=n.split("&"),i=0;i<r.length;i++)t[r[i].split("=")[0]]=r[i].split("=")[1];return e.index.__f__("log","at pages/auth/h5WxLogin.vue:100",t),t},goToLanch(){let o=e.index.getStorageSync("beforLoginPage");e.index.__f__("log","at pages/auth/h5WxLogin.vue:105","beforLoginUrl:"+o),e.index.reLaunch({url:o})}}};function l(o,t,n,r,i,a){return{a:s._imports_0$3,b:e.o(u=>a.loginByMp())}}const h=e._export_sfc(g,[["render",l]]);wx.createPage(h);
-//# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/auth/h5WxLogin.js.map

unpackage/dist/dev/mp-weixin/pages/auth/h5WxLogin.json

@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "navigationBarTextStyle": "black",
-  "enablePullDownRefresh": false,
-  "navigationStyle": "custom",
-  "usingComponents": {}
-}

unpackage/dist/dev/mp-weixin/pages/auth/h5WxLogin.wxml

@@ -1 +0,0 @@
-<view class="content"><view class="force-login-wrap"><view class="force-login__content y-f"><view class="logo"><view class="logo-img"><image src="{{a}}"></image></view><view class="title">直播</view></view><view class="login-notice">为了提供更优质的服务，请先登录</view><view class="btns"><view class="author-btn" bindtap="{{b}}">微信授权登录</view></view></view></view></view>

unpackage/dist/dev/mp-weixin/pages/auth/h5WxLogin.wxss

@@ -1 +0,0 @@
-.container{flex:1;display:flex;flex-direction:column;justify-content:flex-start;position:relative}.force-login-wrap{width:100%;height:100%;overflow:hidden;z-index:11111;top:0}.force-login-wrap .force-login__content{position:absolute;left:50%;top:40%;transform:translate(-50%,-50%)}.force-login-wrap .force-login__content .logo{display:flex;flex-direction:column;justify-content:center;align-items:center}.force-login-wrap .force-login__content .logo .logo-img{border:4rpx solid #FFFFFF;box-shadow:0 5px 15px 2px rgba(0,0,0,.1);border-radius:50%;width:80px;height:80px}.force-login-wrap .force-login__content .logo .logo-img image{border-radius:50%;width:100%;height:100%;overflow:hidden}.force-login-wrap .force-login__content .logo .title{margin-top:20rpx;font-size:35rpx;font-family:PingFang SC;font-weight:700;color:#000;margin-bottom:30rpx}.force-login-wrap .force-login__content .login-notice{font-size:28rpx;font-family:PingFang SC;font-weight:400;color:#000;line-height:44rpx;width:500rpx;text-align:center;margin-bottom:80rpx}.force-login-wrap .force-login__content .btns{position:relative;width:630rpx;height:80rpx}.force-login-wrap .force-login__content .btns .author-btn{display:flex;justify-content:center;align-items:center;z-index:100;position:absolute;width:630rpx;height:80rpx;background:linear-gradient(to right,#ff5c03,#e2c99e);background:-moz-linear-gradient(to right,#FF5C03 0%,#E2C99E 100%);border-radius:40rpx;font-size:30rpx;font-family:PingFang SC;font-weight:500;color:#fff}

unpackage/dist/dev/mp-weixin/pages/auth/loginIndex.js

@@ -1,2 +0,0 @@
-"use strict";const e=require("../../common/vendor.js");require("../../api/login.js");const g=require("../../common/assets.js"),u={data(){return{btnLoading:!1,agree:!1}},onLoad(){if(!this.$isLogin()){let t=getCurrentPages(),o=t[t.length-3];if(t.length>2&&o&&(o.route=="pages/auth/login"||o.route=="pages/auth/loginIndex"||o.route=="pages/common/launch"))e.index.navigateBack({delta:2});else if(String(navigator.userAgent.toLowerCase().match(/MicroMessenger/i))==="micromessenger"){const s=getCurrentPages();if(s.length>1){const a=s[s.length-2],n=a.options;if(n&&JSON.stringify(n)!="{}"){let r="/"+a.route+e.index.$u.queryParams(n);e.index.setStorageSync("beforLoginPage",r)}else e.index.setStorageSync("beforLoginPage","/"+a.route);e.index.redirectTo({url:"/pages/auth/h5WxLogin"})}else this.submit()}else e.index.redirectTo({url:"/pages/auth/login"})}},onShow(){this.$isLogin()&&e.index.reLaunch({url:"../course/index",animationType:"none",animationDuration:2e3})},methods:{goToWeb(t){e.index.setStorageSync("url",t==0?"https://userapp.his.cdwjyyh.com/web/userAgreement":"https://userapp.his.cdwjyyh.com/web/privacyPolicy"),e.index.navigateTo({url:"/pages/index/h5"})},handleAgree(){this.agree=!this.agree},submit(){this.$showLoginPage()},handleOtherLogin(){e.index.redirectTo({url:"/pages/auth/login"})},close(t){this.$refs.popup.close(),t=="agree"&&(this.agree=!0,this.submit())}}};function h(t,o,s,a,n,r){return{a:n.btnLoading,b:n.btnLoading,c:e.o((...i)=>r.submit&&r.submit(...i)),d:n.btnLoading,e:e.o((...i)=>r.handleOtherLogin&&r.handleOtherLogin(...i)),f:g._imports_0$4,g:!n.agree,h:g._imports_1$4,i:n.agree,j:e.o((...i)=>r.handleAgree&&r.handleAgree(...i)),k:e.o(i=>r.goToWeb(0)),l:e.o(i=>r.goToWeb(1))}}const c=e._export_sfc(u,[["render",h],["__scopeId","data-v-648b5fa7"]]);wx.createPage(c);
-//# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/auth/loginIndex.js.map

unpackage/dist/dev/mp-weixin/pages/auth/loginIndex.json

@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "navigationBarTextStyle": "black",
-  "enablePullDownRefresh": false,
-  "navigationStyle": "custom",
-  "usingComponents": {}
-}

unpackage/dist/dev/mp-weixin/pages/auth/loginIndex.wxml

@@ -1 +0,0 @@
-<view class="container data-v-648b5fa7"><view class="login-title data-v-648b5fa7"><view class="data-v-648b5fa7">您好，</view><view class="data-v-648b5fa7">欢迎来到芳华未来！</view></view><view class="login-box data-v-648b5fa7"><button class="login-btn data-v-648b5fa7" style="margin-top:74rpx" loading="{{a}}" disabled="{{b}}" bindtap="{{c}}">本机号码一键登录</button><button class="login-btn other-login-btn data-v-648b5fa7" disabled="{{d}}" bindtap="{{e}}">其他方式登录</button><view class="checkbox data-v-648b5fa7"><view class="checkbox-icon data-v-648b5fa7" bindtap="{{j}}"><image class="data-v-648b5fa7" src="{{f}}" hidden="{{!g}}"></image><image class="data-v-648b5fa7" src="{{h}}" hidden="{{!i}}"></image></view><view class="data-v-648b5fa7">我已阅读并同意<text class="data-v-648b5fa7" bindtap="{{k}}">《用户协议》</text><text class="data-v-648b5fa7" bindtap="{{l}}">《隐私政策》</text> 并使用本机号码登录</view></view></view></view>

unpackage/dist/dev/mp-weixin/pages/games/index.js

@@ -1,2 +0,0 @@
-"use strict";const e=require("../../common/vendor.js"),r={data(){return{}},methods:{}};function t(c,o,s,a,_,i){return{}}const n=e._export_sfc(r,[["render",t]]);wx.createPage(n);
-//# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/games/index.js.map

unpackage/dist/dev/mp-weixin/pages/games/index.json

@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "navigationBarTextStyle": "black",
-  "enablePullDownRefresh": false,
-  "navigationStyle": "custom",
-  "usingComponents": {}
-}

unpackage/dist/dev/mp-weixin/pages/games/index.wxml

@@ -1 +0,0 @@
-<view></view>

unpackage/dist/dev/mp-weixin/pages/home/living.json

@@ -3,6 +3,7 @@
   "navigationBarTextStyle": "black",
   "enablePullDownRefresh": false,
   "navigationStyle": "custom",
+  "softinputMode": "adjustResize",
   "usingComponents": {
     "three-item-swiper": "../../components/ThreeItemSwiper",
     "u-avatar": "../../uni_modules/uview-plus/components/u-avatar/u-avatar",

unpackage/dist/dev/mp-weixin/pages_shop/storeOrderDelivery.js

@@ -1,2 +1,2 @@
-"use strict";const e=require("../common/vendor.js"),n=require("../common/assets.js"),d={data(){return{statusBarHeight:e.index.getStorageSync("menuInfo").statusBarHeight,orderId:null,deliveryId:null,express:{},expressList:[]}},onLoad(r){this.orderId=r.orderId,this.getExpress()},methods:{getExpress(){var r={orderId:this.orderId};getExpress(r).then(t=>{t.code==200?(this.express=t.express,this.expressList=t.data,this.deliveryId=t.deliveryId):e.index.showToast({icon:"none",title:"请求失败"})})},back(){e.index.navigateBack()},copyOrderSn(r){e.index.setClipboardData({data:r,success:()=>{e.index.showToast({title:"内容已成功复制到剪切板",icon:"none"})}})},callPhone(r){e.index.makePhoneCall({phoneNumber:r})}}};function a(r,t,p,x,s,o){return e.e({a:n._imports_0$12,b:s.statusBarHeight,c:n._imports_1$8,d:e.o((...i)=>o.back&&o.back(...i)),e:e.t(s.deliveryId),f:e.o(i=>o.copyOrderSn(s.deliveryId)),g:e.t(s.express.name),h:s.expressList!=null},s.expressList!=null?e.e({i:s.expressList.Traces!=null},s.expressList.Traces!=null?{j:e.f(s.expressList.Traces,(i,c,u)=>({a:e.t(i.AcceptStation),b:e.t(i.AcceptTime),c})),k:n._imports_2$5,l:n._imports_3$1}:{}):{})}const l=e._export_sfc(d,[["render",a]]);wx.createPage(l);
+"use strict";const e=require("../common/vendor.js"),n=require("../common/assets.js"),d={data(){return{statusBarHeight:e.index.getStorageSync("menuInfo").statusBarHeight,orderId:null,deliveryId:null,express:{},expressList:[]}},onLoad(r){this.orderId=r.orderId,this.getExpress()},methods:{getExpress(){var r={orderId:this.orderId};getExpress(r).then(t=>{t.code==200?(this.express=t.express,this.expressList=t.data,this.deliveryId=t.deliveryId):e.index.showToast({icon:"none",title:"请求失败"})})},back(){e.index.navigateBack()},copyOrderSn(r){e.index.setClipboardData({data:r,success:()=>{e.index.showToast({title:"内容已成功复制到剪切板",icon:"none"})}})},callPhone(r){e.index.makePhoneCall({phoneNumber:r})}}};function a(r,t,p,x,s,o){return e.e({a:n._imports_0$10,b:s.statusBarHeight,c:n._imports_1$7,d:e.o((...i)=>o.back&&o.back(...i)),e:e.t(s.deliveryId),f:e.o(i=>o.copyOrderSn(s.deliveryId)),g:e.t(s.express.name),h:s.expressList!=null},s.expressList!=null?e.e({i:s.expressList.Traces!=null},s.expressList.Traces!=null?{j:e.f(s.expressList.Traces,(i,c,u)=>({a:e.t(i.AcceptStation),b:e.t(i.AcceptTime),c})),k:n._imports_2$5,l:n._imports_3$1}:{}):{})}const l=e._export_sfc(d,[["render",a]]);wx.createPage(l);
 //# sourceMappingURL=../../.sourcemap/mp-weixin/pages_shop/storeOrderDelivery.js.map

unpackage/dist/dev/mp-weixin/pages_shop/success.js

@@ -1,2 +1,2 @@
-"use strict";const e=require("../common/vendor.js"),t=require("../common/assets.js"),i={data(){return{order:null,orderCode:"",ids:[]}},onLoad(r){this.order=JSON.parse(decodeURIComponent(r.order)),this.orderCode=this.order&&this.order.orderCodes?this.order.orderCodes.join(","):this.order.orderCode||"",this.ids=this.order&&this.order.ids?this.order.ids:this.order.id?[this.order.id]:[]},methods:{copyOrderSn(r){e.index.setClipboardData({data:r,success:()=>{e.index.showToast({title:"内容已成功复制到剪切板",icon:"none"})}})},goOrderDetails(r){this.ids&&this.ids.length>1?e.index.navigateTo({url:"/pages_user/user/storeOrder?status="}):e.index.redirectTo({url:"/pages_user/user/storeOrderDetail?id="+this.ids[0]})}}};function n(r,a,h,u,o,s){return{a:t._imports_0$11,b:e.o(d=>s.goOrderDetails(o.order.id)),c:e.f(o.order.orderCodes,(d,_,l)=>({a:e.t(d),b:d})),d:e.o(d=>s.copyOrderSn(o.orderCode)),e:e.t(o.order.createTime)}}const c=e._export_sfc(i,[["render",n]]);wx.createPage(c);
+"use strict";const e=require("../common/vendor.js"),t=require("../common/assets.js"),i={data(){return{order:null,orderCode:"",ids:[]}},onLoad(r){this.order=JSON.parse(decodeURIComponent(r.order)),this.orderCode=this.order&&this.order.orderCodes?this.order.orderCodes.join(","):this.order.orderCode||"",this.ids=this.order&&this.order.ids?this.order.ids:this.order.id?[this.order.id]:[]},methods:{copyOrderSn(r){e.index.setClipboardData({data:r,success:()=>{e.index.showToast({title:"内容已成功复制到剪切板",icon:"none"})}})},goOrderDetails(r){this.ids&&this.ids.length>1?e.index.navigateTo({url:"/pages_user/user/storeOrder?status="}):e.index.redirectTo({url:"/pages_user/user/storeOrderDetail?id="+this.ids[0]})}}};function n(r,a,h,u,o,s){return{a:t._imports_0$9,b:e.o(d=>s.goOrderDetails(o.order.id)),c:e.f(o.order.orderCodes,(d,_,l)=>({a:e.t(d),b:d})),d:e.o(d=>s.copyOrderSn(o.orderCode)),e:e.t(o.order.createTime)}}const c=e._export_sfc(i,[["render",n]]);wx.createPage(c);
 //# sourceMappingURL=../../.sourcemap/mp-weixin/pages_shop/success.js.map

unpackage/dist/dev/mp-weixin/pages_user/address.js

@@ -1,2 +1,2 @@
-"use strict";const e=require("../common/vendor.js"),u=require("../api/order.js"),o=require("../common/assets.js"),h={data(){return{address:[]}},onLoad(){this.getUserAddr(),e.index.$on("refreshAddress",()=>{this.getUserAddr()})},methods:{getUserAddr(){this.userInfo=JSON.parse(e.index.getStorageSync("userInfo")),u.userAddr(this.userInfo.userId).then(s=>{s.code==200?(e.index.__f__("log","at pages_user/address.vue:61","用户收货地址>>>>",s.data),this.address=s.data):e.index.showToast({title:s.msg,icon:"none"})},s=>{})},selectAddress(s){e.index.$emit("updateAddress",s),e.index.navigateBack({delta:1})},editAddress(s){e.index.navigateTo({url:"./addAddress?type=edit&addressId="+s.addressId})},delAddress(s){e.index.showModal({title:"提示",content:"确认删除此地址吗?",showCancel:!0,cancelText:"取消",confirmText:"确定",success:i=>{if(i.confirm){var c={addressId:s.addressId};u.delAddress(c).then(a=>{a.code==200?(e.index.showToast({icon:"success",title:"操作成功"}),this.getUserAddr()):e.index.showToast({icon:"none",title:"请求失败"})},a=>{})}}})},addAdress(){e.index.navigateTo({url:"./addAddress?type=add"})}}};function g(s,i,c,a,n,r){return e.e({a:e.f(n.address,(d,t,_)=>e.e({a:d.isDefault==1},d.isDefault==1?{}:{},{b:e.t(d.province),c:e.t(d.city),d:e.t(d.district),e:e.t(d.detail),f:e.t(d.realName),g:e.t(s.$parsePhone(d.phone)),h:e.o(l=>r.selectAddress(d),t),i:e.o(l=>r.delAddress(d),t),j:e.o(l=>r.editAddress(d),t),k:t})),b:o._imports_0$13,c:o._imports_1$9,d:n.address.length==0},n.address.length==0?{e:o._imports_2$1,f:e.o(d=>s.getAddressList())}:{},{g:e.o((...d)=>r.addAdress&&r.addAdress(...d))})}const A=e._export_sfc(h,[["render",g]]);wx.createPage(A);
+"use strict";const e=require("../common/vendor.js"),u=require("../api/order.js"),o=require("../common/assets.js"),h={data(){return{address:[]}},onLoad(){this.getUserAddr(),e.index.$on("refreshAddress",()=>{this.getUserAddr()})},methods:{getUserAddr(){this.userInfo=JSON.parse(e.index.getStorageSync("userInfo")),u.userAddr(this.userInfo.userId).then(s=>{s.code==200?(e.index.__f__("log","at pages_user/address.vue:61","用户收货地址>>>>",s.data),this.address=s.data):e.index.showToast({title:s.msg,icon:"none"})},s=>{})},selectAddress(s){e.index.$emit("updateAddress",s),e.index.navigateBack({delta:1})},editAddress(s){e.index.navigateTo({url:"./addAddress?type=edit&addressId="+s.addressId})},delAddress(s){e.index.showModal({title:"提示",content:"确认删除此地址吗?",showCancel:!0,cancelText:"取消",confirmText:"确定",success:i=>{if(i.confirm){var c={addressId:s.addressId};u.delAddress(c).then(a=>{a.code==200?(e.index.showToast({icon:"success",title:"操作成功"}),this.getUserAddr()):e.index.showToast({icon:"none",title:"请求失败"})},a=>{})}}})},addAdress(){e.index.navigateTo({url:"./addAddress?type=add"})}}};function g(s,i,c,a,n,r){return e.e({a:e.f(n.address,(d,t,_)=>e.e({a:d.isDefault==1},d.isDefault==1?{}:{},{b:e.t(d.province),c:e.t(d.city),d:e.t(d.district),e:e.t(d.detail),f:e.t(d.realName),g:e.t(s.$parsePhone(d.phone)),h:e.o(l=>r.selectAddress(d),t),i:e.o(l=>r.delAddress(d),t),j:e.o(l=>r.editAddress(d),t),k:t})),b:o._imports_0$11,c:o._imports_1$8,d:n.address.length==0},n.address.length==0?{e:o._imports_2$1,f:e.o(d=>s.getAddressList())}:{},{g:e.o((...d)=>r.addAdress&&r.addAdress(...d))})}const A=e._export_sfc(h,[["render",g]]);wx.createPage(A);
 //# sourceMappingURL=../../.sourcemap/mp-weixin/pages_user/address.js.map

unpackage/dist/dev/mp-weixin/pages_user/integral.json

@@ -1,9 +0,0 @@
-{
-  "navigationBarTitleText": "我的芳华币",
-  "enablePullDownRefresh": false,
-  "navigationBarBackgroundColor": "#ffffff",
-  "navigationBarTextStyle": "black",
-  "usingComponents": {
-    "loading": "../components/Loading"
-  }
-}

unpackage/dist/dev/mp-weixin/pages_user/integralGoodsList.json

@@ -1,11 +0,0 @@
-{
-  "navigationBarTitleText": "芳华币商城",
-  "enablePullDownRefresh": false,
-  "navigationBarBackgroundColor": "#ffffff",
-  "navigationBarTextStyle": "black",
-  "usingComponents": {
-    "u-tabs": "../uni_modules/uview-plus/components/u-tabs/u-tabs",
-    "u-sticky": "../uni_modules/uview-plus/components/u-sticky/u-sticky",
-    "mescroll-body": "../uni_modules/mescroll-uni/components/mescroll-body/mescroll-body"
-  }
-}

unpackage/dist/dev/mp-weixin/pages_user/integralGoodsList.wxml

@@ -1 +0,0 @@
-<view class="content data-v-a55124e7"><view class="cont-box data-v-a55124e7"><u-sticky class="data-v-a55124e7" u-s="{{['d']}}" u-i="a55124e7-0" bind:__l="__l"><view class="top-box data-v-a55124e7"><view class="my-integral data-v-a55124e7"><view class="left data-v-a55124e7"><view class="label data-v-a55124e7">我的芳华币</view><view class="data-v-a55124e7" style="margin-top:30rpx;display:flex;align-items:baseline"><view class="integral data-v-a55124e7">{{a}}</view><view class="integralbtn data-v-a55124e7" bindtap="{{b}}">获取芳华币</view></view></view><view class="btn-box data-v-a55124e7"><view class="btn data-v-a55124e7" bindtap="{{c}}">获得记录</view><view class="btn data-v-a55124e7" bindtap="{{d}}">兑换记录</view></view></view><view wx:if="{{e}}" class="tabs data-v-a55124e7"><u-tabs wx:if="{{g}}" class="data-v-a55124e7" bindchange="{{f}}" u-i="a55124e7-1,a55124e7-0" bind:__l="__l" u-p="{{g}}"></u-tabs></view></view></u-sticky><mescroll-body wx:if="{{m}}" class="r data-v-a55124e7" u-s="{{['d']}}" u-r="mescrollRef" bindinit="{{j}}" binddown="{{k}}" bindup="{{l}}" u-i="a55124e7-2" bind:__l="__l" u-p="{{m}}"><view class="integral-box data-v-a55124e7"><view wx:for="{{h}}" wx:for-item="item" class="item data-v-a55124e7" bindtap="{{item.e}}"><view class="top data-v-a55124e7"><image class="data-v-a55124e7" src="{{item.a}}"></image></view><view class="bottom data-v-a55124e7"><view class="title ellipsis2 data-v-a55124e7">{{item.b}}</view><view class="price-box data-v-a55124e7"><view class="price data-v-a55124e7">{{item.c}}芳华币</view><view class="count data-v-a55124e7">价值:{{item.d}}元</view></view></view></view></view></mescroll-body></view></view>

unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/libs/config/config.js

@@ -1,5 +1,2 @@
-"use strict";const c=require("../../../../common/vendor.js"),o="3";c.index.__f__("log","at uni_modules/uview-plus/libs/config/config.js:5",`
- %c uview-plus V${o} %c https://ijry.github.io/uview-plus/ 
-
-`,"color: #ffffff; background: #3c9cff; padding:5px 0;","color: #3c9cff;background: #ffffff; padding:5px 0;");const f={v:o,version:o,type:["primary","success","info","error","warning"],color:{"u-primary":"#2979ff","u-warning":"#ff9900","u-success":"#19be6b","u-error":"#fa3534","u-info":"#909399","u-main-color":"#303133","u-content-color":"#606266","u-tips-color":"#909399","u-light-color":"#c0c4cc"},unit:"px"};exports.config=f;
+"use strict";const o="3",c={v:o,version:o,type:["primary","success","info","error","warning"],color:{"u-primary":"#2979ff","u-warning":"#ff9900","u-success":"#19be6b","u-error":"#fa3534","u-info":"#909399","u-main-color":"#303133","u-content-color":"#606266","u-tips-color":"#909399","u-light-color":"#c0c4cc"},unit:"px"};exports.config=c;
 //# sourceMappingURL=../../../../../.sourcemap/mp-weixin/uni_modules/uview-plus/libs/config/config.js.map