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

App.vue

@@ -1,3 +1,4 @@
+
 <script>
 	import config from '@/common/config.js'
 	export default {

pages/index/index.vue

@@ -1,5 +1,6 @@
 <template>
 	<view style="padding-bottom: 20rpx;">
+		
 		<!-- 自定义导航栏（带搜索） -->
 		<!-- #ifdef H5 -->
 		<u-navbar :background="background" height="60" :is-back="false" :title="title" :border-bottom="false">
@@ -177,6 +178,12 @@
 				:existTabBar="true" @btnClick="btnClick" /> -->
 			<u-image @click="goMsg('/me/choujiang/choujiang')" :src="`../../static/images/draw/draw.gif`"
 				style="width: 150rpx;height: 150rpx;position: fixed;right: 30rpx;bottom: 180rpx;"></u-image>
+			<!-- #ifdef H5 -->
+			<div v-if="isWeixin" style="width: 100%;height: 100%;position: fixed;top: 0;z-index: 999;background: url('../../static/images/open_guide.png') no-repeat center bottom / cover;"></div>
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<div v-if="isIos" @click="isIos=false" style="width: 100%;height: 100%;position: fixed;top: 0;z-index: 999;background: url('../../static/images/index_guide.png') no-repeat center bottom / 100%;background-color: rgba(0, 0, 0, 0.8);"></div>
+			<!-- #endif -->
 	</view>
 </template>
 
@@ -233,6 +240,8 @@
 				newVideList: [], //最新热播
 				videoInfo: [],
 				draw: Math.floor((Math.random() * 12) + 1),
+				isWeixin: false,
+				isIos: true,
 			};
 		},
 		onShareAppMessage(res) {
@@ -317,7 +326,17 @@
 					}
 				})
 			}
-
+			let u = navigator.userAgent;
+			if ( u.toLowerCase().indexOf('micromessenger') !== -1) {
+				this.isWeixin = true
+			}
+			// uni.removeStorageSync('isIos')
+			if ( u.indexOf('iPhone') > -1 && !uni.getStorageSync('isIos')) {
+				uni.setStorageSync('isIos', true)
+				this.isIos = true
+			} else {
+				this.isIos = false
+			}
 		},
 		onShow() {
 			//本周热门

pages/login/appEq.vue

@@ -1,12 +1,12 @@
 <template>
 	<view class="containers">
-		<image style="width: 100%;position: absolute;" src="../../static/images/appeq_bg.png" mode="widthFix"></image>
+		<div style="width: 100%;height: 85%;position: absolute;background: url('../../static/images/appeq_bg.png') no-repeat center bottom / cover;"></div>
 
-		<view style="text-align: center;position: relative;height: 100%;">
-			<image style="width: 124rpx;height: 124rpx;margin-top: 162rpx;border-radius:20upx;" src="../../static/images/appLogo.png"></image>
-			<view style="font-size: 40rpx;margin-top: 32rpx;color: #FFFFFF;font-weight: bold;">斯耀短剧APP</view>
+		<view style="text-align: center;position: relative;height: 100%;display: flex;flex-direction: column;align-items: center;justify-content: center;">
+			<image style="width: 124rpx;height: 124rpx;margin-top: -920rpx;border-radius:20upx;" src="../../static/images/appLogo.png"></image>
+			<view style="font-size: 40rpx;margin-top: 22rpx;color: #FFFFFF;font-weight: bold;">斯耀短剧APP{{isWeixin}}</view>
 			<view style="font-size: 28rpx;margin-top: 16rpx;color: #FFFFFF;font-weight: bold;">海量电子榨菜  免费又过瘾</view>
-			<button class="confirm-btn" @click="taobaoLogin">斯耀短剧APP</button>
+			<button class="confirm-btn" @click="taobaoLogin">{{confirmBtn}}</button>
 			
 		</view>
 		<view id="shareit" v-if="show_share" @tap="closeShare">
@@ -14,6 +14,9 @@
 			</image>
 			<view id="follow">点击右上角按钮，选择浏览器打开下载！</view>
 		</view>
+		<!-- #ifdef H5 -->
+		<div v-if="isWeixin" style="width: 100%;height: 100%;position: absolute;top: 0;background: url('../../static/images/open_guide.png') no-repeat center bottom / cover;"></div>
+		<!-- #endif -->
 	</view>
 </template>
 <script>
@@ -28,11 +31,22 @@
 				openShares: false,
 				relationId: '',
 				sending: false,
+				confirmBtn: '斯耀短剧APP',
+				isWeixin: false,
 			};
 		},
 		onLoad(e) {
-
-
+			let u = navigator.userAgent;
+			if ( u.indexOf('iPhone') > -1) {
+				// #ifdef H5
+				this.confirmBtn = "跳转网页版首页"
+				// #endif
+			}
+			
+			if ( u.toLowerCase().indexOf('micromessenger') !== -1) {
+				this.isWeixin = true
+			}
+		
 		},
 		methods: {
 			closeShare() {
@@ -81,6 +95,7 @@
 						}
 					});
 				} else {
+					
 					this.$Request.get('/app/common/type/50').then(res => {
 						if (res.code == 0) {
 							if (res.data && res.data.value) {
@@ -95,6 +110,9 @@
 										// #endif
 										// #ifdef H5
 										window.location.href = res.data.value;
+										// uni.switchTab({
+										// 	url: 'pages/index/index'
+										// })
 										// #endif
 									} else {
 										this.show_share = true;
@@ -112,7 +130,11 @@
 											// this.$queue.showToast('邀请码复制成功');
 										}
 									});
-									window.location.href = res.data.value;
+									
+									uni.switchTab({
+										url: '/pages/index/index'
+									})
+									// window.location.href = res.data.value;
 									// #endif
 								}
 							}
@@ -276,6 +298,6 @@
 		position: absolute;
 		left: 0;
 		right: 0;
-		bottom: 160rpx;
+		bottom: 70rpx;
 	}
 </style>

pages/login/registerApp.vue

@@ -45,6 +45,9 @@
 				<navigator url="/me/setting/xieyi" open-type="navigate" style="color: #37A6FF;">《用户协议》</navigator>
 			</view>
 		</view>
+		<!-- #ifdef H5 -->
+		<div v-if="isWeixin" style="width: 100%;height: 100%;position: fixed;top: 0;z-index: 999;background: url('../../static/images/open_guide.png') no-repeat center bottom / cover;"></div>
+		<!-- #endif -->
 	</view>
 </template>
 
@@ -63,6 +66,7 @@
 				invitation: '',
 				registerCode: '',
 				qdCodeion: '',
+				isWeixin: false,
 			};
 		},
 		onLoad(e) {
@@ -79,6 +83,10 @@
 					this.registerCode = res.data.value
 				}
 			});
+			let u = navigator.userAgent;
+			if ( u.toLowerCase().indexOf('micromessenger') !== -1) {
+				this.isWeixin = true
+			}
 		},
 		methods: {
 			isShowAgree() {