Merge pull request 'gdpaoup' (#109) from gyh into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/109

components/index/video-item/index.vue

@@ -206,6 +206,9 @@ export default {
 				console.log(res)
 				if(res.errCode == 0) {
 					this.$emit("getArticlelist");
+                    // this.$u.toast(res.message);
+				} else {
+                    // this.$u.toast(res.message);
                 }
 			})
 		},

components/remaining/remaining.vue

@@ -4,8 +4,9 @@
 		<view v-if="type" id="video_mp4">
 			<view class="page-body">
 				<view class="page-section">
-					<video id="myVideo" :src=" 'https://' + vide0_url" :controls="controls" :autoplay="autoplayes" :loop="loop" @error="videoErrorCallback"
+					<video id="myVideo" :src=" 'https://' + vide0_url" autoplay controls="false" @error="videoErrorCallback"
 					 enable-danmu danmu-btn></video>
+                     <cover-view class="time">abc</cover-view>
 				</view>
 			</view>
 		</view>
@@ -17,10 +18,11 @@
 				<view class="uni-padding-wrap">
 					<view class="page-section swiper">
 						<view class="page-section-spacing">
-							<swiper class="swiper" :indicator-dots="true" :style="{height:heightOut+'px'}" :autoplay="false" :interval="3000" :duration="1000">
+							<swiper class="swiper" :indicator-dots="true" :style="{height:heightOut+'px'}" :autoplay="false" :interval="3000" :duration="1000" @animationfinish="">
 								<swiper-item v-for="(item,index) in list" :key="index">
 									<view class="swiper-item uni-bg-red">
 										<image :src=" 'https://' + item.launch_path"></image>
+                                        <view v-if="index == 3">立即体验</view>
 									</view>
 								</swiper-item> 
 							</swiper>
@@ -54,7 +56,6 @@
 				protocol: false,
 				heightOut: '',
 				imgurl: [],
-				loop: 'true',
 				vide0_url: '',
 				agreement: { // 用户协议内容
 					document_title: "",
@@ -67,28 +68,15 @@
 				src: '',
 				inputValue: '',
 				controls: false,
-				autoplayes: true,
 				list: [],
-				danmuList: [{
-						text: '第 1s 出现的弹幕',
-						color: '#ff0000',
-						time: 1
-					},
-					{
-						text: '第 3s 出现的弹幕',
-						color: '#ff00ff',
-						time: 3
-					}
-				],
 				background: ['color1', 'color2', 'color3'],
 				indicatorDots: true,
-				autoplay: true,
 				interval: 2000,
 				duration: 500
 			};
 		},
 		onReady: function(res) {
-			this.videoContext = uni.createVideoContext('myVideo')
+			this.videoContext = uni.createVideoContext('myVideo');
 		},
 		methods: {
 			apiwelcome() {
@@ -110,7 +98,6 @@
 					let vide0_url = res.data.start_page[0].launch_path
 					this.list = data_image;
 					this.vide0_url = vide0_url;
-					console.log(this.list)
 				})
 			},
 			// 3秒倒计时
@@ -120,7 +107,7 @@
 					if (this.remaining <= 0) {
 						clearInterval(this.timer);
 						console.log("完了")
-						this.type = !this.type
+						this.type = !this.type;
 						this.banner = !this.banner;
 					}
 				}, 1000);
@@ -152,7 +139,7 @@
 					key: 'launchFlag',
 					data: true,
 					success: function() {
-						console.log('error时存储launchFlag');
+						console.log('点击存储launchFlag');
 					}
 				});
 				uni.navigateTo({
@@ -161,7 +148,8 @@
 			},
 			// 视频引入
 			bindInputBlur: function(e) {
-				this.inputValue = e.target.value
+				this.inputValue = e.target.value;
+                console.log(e.target.value);
 			},
 			bindButtonTap: function() {
 				var that = this
@@ -192,18 +180,6 @@
 				}
 				return '#' + rgb.join('')
 			},
-			changeIndicatorDots(e) {
-				this.indicatorDots = !this.indicatorDots
-			},
-			changeAutoplay(e) {
-				this.autoplay = !this.autoplay
-			},
-			intervalChange(e) {
-				this.interval = e.target.value
-			},
-			durationChange(e) {
-				this.duration = e.target.value
-			},
 			refreshToken_function(){
 				this.$u.api.refreshToken({}).then((res) => {
 					console.log(res)
@@ -215,10 +191,10 @@
 			}
 	},
 	mounted() {
-		this.refreshToken_function()
+		this.refreshToken_function();
 		// 3秒倒计时调用
-		this.remaining_time()
+		this.remaining_time();
-		this.apiwelcome()
+		this.apiwelcome();
 	}
 	}
 </script>
@@ -228,7 +204,7 @@
 		// height: 400rpx;
 	}
 	.welcome_jumpes {
-		z-index: 10;
+		z-index: 10000;
 		position: absolute;
 		top: 80rpx;
 		right: 60rpx;
@@ -243,17 +219,21 @@
 	}
 
 	#myVideo {
+        width: 100%;
+        .time {
             position: absolute;
-		left: 0;
-		right: 0;
-		bottom: 0;
             top: 0;
-		margin: auto;
+            left: 0;
+            width: 10rpx;
+            height: 10rpx;
+            color: #fff;
+            font-size: 30rpx;
+        }
 	}
 
 	uni-video {
 		width: 100%;
-		height: auto;
+		height: 100%;
 	}
 
 	.uni-video-container {

manifest.json

@@ -97,6 +97,36 @@
                         "UniversalLinks" : "https://demo.dcloud.net.cn/ulink/"
                     }
                 }
+            },
+            "splashscreen" : {
+                "androidStyle" : "default",
+                "android" : {
+                    "hdpi" : "static/app/start/480x762.png",
+                    "xhdpi" : "static/app/start/720x1242.png",
+                    "xxhdpi" : "static/app/start/1080x1882.png"
+                },
+                "iosStyle" : "storyboard"
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "static/app/icon/72x72.png",
+                    "xhdpi" : "static/app/icon/96x96.png",
+                    "xxhdpi" : "static/app/icon/144x144.png",
+                    "xxxhdpi" : "static/app/icon/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "static/app/icon/192x192.png",
+                    "iphone" : {
+                        "app@2x" : "static/app/icon/144x144.png",
+                        "app@3x" : "static/app/icon/192x192.png",
+                        "spotlight@2x" : "static/app/icon/96x96.png",
+                        "spotlight@3x" : "static/app/icon/144x144.png",
+                        "settings@2x" : "static/app/icon/72x72.png",
+                        "settings@3x" : "static/app/icon/96x96.png",
+                        "notification@2x" : "static/app/icon/72x72.png",
+                        "notification@3x" : "static/app/icon/72x72.png"
+                    }
+                }
             }
         }
     },

pageA/login/login.vue

@@ -180,7 +180,6 @@
 							})
 							return false
 						} else {
-							console.log(123)
 							me.loginIn(res.data.token); //存储一个字符传值
 							// 缓存用户的信息
 							uni.setStorageSync('user_info',res.data);

pageA/register/register.vue

@@ -8,11 +8,11 @@
 				<view class="title">手机注册</view>
 				<view class="labales phones">
 					<!-- <text></text> -->
-					<input type="tel" placeholder="请输入您的手机号" v-model="member_mobile" />
+					<input type="tel" placeholder="请输入您的手机号" maxlength="11" v-model="member_mobile" />
 				</view>
 				<view class="labales">
 					<!-- <text></text> -->
-					<input type="tel" placeholder="请输入验证码" v-model="sms_code" />
+					<input type="tel" placeholder="请输入验证码" maxlength="6" v-model="sms_code" />
 					<!-- <text class="identifying" @click="apiwelcome()">获取验证码</text> -->
 					<!-- 验证码接口的引入 -->
 					<identifying @tochange="tochange" :smslog_type="smslog_type" :member_mobile="member_mobile" ></identifying>
@@ -24,17 +24,18 @@
 					<text class="pact_text" v-for="(item,index) in pact_text" :key="index" @click="pact_click(index)"> {{item.text}} </text>
 					<u-checkbox-group @change="checkboxGroupChange" size="27">
 						<u-checkbox @change="checkboxChange" v-model="item.checked" v-for="(item, index) in list" :key="index" :name="item.name"
-						 shape="circle" size="14" active-color="#19BE6B" ></u-checkbox>
+						 shape="circle" size="30" active-color="#19BE6B" ></u-checkbox>
 					</u-checkbox-group>
 				</view>
 			</view>
 			<!-- 注册 -->
 			<view class="more_Login">
 				<text></text>
-				<text class="other" @click="mask_u">其他方式登录</text>
+				<!-- <text class="other" @click="mask_u">其他方式登录</text> -->
 			</view>
 			<!-- denglu QQ weixin -->
-			<view class="u-btn" @click="loginIn">{{login}}</view>
+			<view class="u-btn" @click="loginIns">{{login}}</view>
+            <view class="go-login" @click="goLogin">已有账号，立即登录</view>
 			<u-mask :show="show" @click="show = false">
 				<view class="warp">
 					<view class="rect" @tap.stop>
@@ -56,7 +57,10 @@
 	</view>
 </template>
 <script>
-	import identifying from '@/components/logininput/identifying'
+	import identifying from '@/components/logininput/identifying';
+    import {
+    	mapMutations
+    } from 'vuex';
 	export default {
 		data() {
 			return {
@@ -89,6 +93,7 @@
 
 		},
 		methods: {
+            ...mapMutations(['loginIn']),
 			// 协议跳转
 			pact_click(index){
 				console.log(index)
@@ -97,7 +102,7 @@
 				});
 			},
 			// 用户注册
-			loginIn(){
+			loginIns(){
 				let type_phone = this.$u.test.mobile( this.member_mobile)
 				if( this.member_mobile == ''){
 					this.$refs.uToast.show({
@@ -129,18 +134,16 @@
 					
 					// console.log(res)
 					if(res.errCode == 0){
+                        //存储一个字符传值
+                        me.loginIn(res.data.token);
                         // 缓存用户的信息
-						uni.setStorage({
+                        uni.setStorageSync('user_info',res.data);
-						    key: 'token',
-						    data: res.data.token,
-						    success: function () {
-						        console.log('success');
                         // 跳转选择页面
+                        if (uni.getStorageSync("token")) {
                             uni.navigateTo({
-									url : '/pageA/topick/topick'
+                            	url: '/pageA/topick/topick'
                             })
                         }
-						});
 						// 注册返回参数
 						// this.$refs.uToast.show({
 						// 	title: res.message,
@@ -174,11 +177,14 @@
 			mask_u() {
 				this.show = !this.show
 			},
+            goLogin() {
+                this.$u.route("/pageA/login/login");
+            },
 			// 注册接口
 			tochange() {
 				// console.log("调用父组件的方法")
 				// console.log('2222',this._data.member_mobile)
-				let member_mobile = this._data.member_mobile
+				let member_mobile = this._data.member_mobile;
 				
 			}
 		},
@@ -314,6 +320,12 @@
 		border-color: rgba(255, 120, 15, 1) !important;
 		text-align: center;
 	}
+    .go-login {
+        margin-top: 26rpx;
+        text-align: center;
+        font-size: 26rpx;
+        color: #fff;
+    }
 
 	.warp {
 		display: flex;

pageB/photo/index.vue

@@ -59,7 +59,7 @@
 		<!-- 评论box -->
 		<u-popup v-model="is_edit" mode="bottom" border-radius="10" height="100rpx">
 			<view class="edit-box">
-				<input type="text" :placeholder="edit_text_other" :focus="is_focus" @focus="focus" v-model="send_value">
+				<input type="text" :placeholder="edit_text_other" :focus="is_focus" @focus="focus" v-model="send_value" autofocus>
 				<text @click="sendComment">发送</text>
 			</view>
 		</u-popup>

pages/index/index.vue

@@ -21,7 +21,7 @@
 					<scroll-view style="width:100%;height:100%" scroll-y="true">
 						<view class="box">
 							<!-- <indexad style="width:690rpx"></indexad> -->
-							<u-swiper mode="dot" :list="indexImageSwiper" name="adv_code"></u-swiper>
+							<u-swiper mode="dot" :list="indexImageSwiper" name="adv_code" @click="clickFImage"></u-swiper>
 							<view class="list">
 								<view>
 									<videoItem v-for="item in articleList.filter((_, index) => !(index&1))" :key="item.article_id" :item="item"
@@ -309,6 +309,7 @@
 				type,
 				id
 			}) {
+                console.log(type,id);
 				if (type == 0) return false;
 				// type 1 商品详情页, 2 店铺详情页
 				const url = type == 1 ? 'pageB/sdetails/index' : 'pageC/merchant/index';