Merge branch 'master' of https://gitee.com/dcloud/base-app

dc95d40c · 芊里 · 0f0ced16 · f3ddb896 · dc95d40c · dc95d40c
5 changed file
--- a/manifest.json
+++ b/manifest.json
@@ -87,7 +87,7 @@
            "urlCheck" : false
        },
        "usingComponents" : true,
-		"betterScopedSlots":true
+        "betterScopedSlots" : true
    },
    "mp-alipay" : {
        "usingComponents" : true
@@ -100,5 +100,8 @@
    },
    "uniStatistics" : {
        "enable" : false
+    },
+    "h5" : {
+        "template" : "template.h5.html"
    }
 }
--- a/pages.json
+++ b/pages.json
@@ -80,10 +80,7 @@
 				// #ifdef APP-PLUS
 				,"app-plus": {
 					"titleNView": {
-						"buttons": [{
-							"type": "share"
-						}],
-						"type": "transparent"
+						"buttons": [{"type": "share"}]
 					}
 				}
 				// #endif

--- a/pages/ucenter/about/about.vue
+++ b/pages/ucenter/about/about.vue
@@ -3,9 +3,10 @@
 		<view class="box">
 			<image class="logoImg" :src="about.logo"></image>
 			<text class="tip appName">{{about.appName}}</text>
-			<text class="tip" style="font-size:24upx;">Version {{version}}</text>
+			<text class="tip">Version {{version}}</text>
 			<!--Sansnn-uQRCode组件来源，插件市场：https://ext.dcloud.net.cn/plugin?id=1287 微调后-->
 			<Sansnn-uQRCode :text="about.download" :makeOnLoad="true" class="qrcode"></Sansnn-uQRCode>
+			<text class="tip">扫描二维码，您的朋友也可以下载{{about.appName}}客户端</text>
 		</view>
 		<view class="copyright">
 			<template v-for="(agreement,index) in about.agreements">
@@ -35,6 +36,9 @@ import uniShare from 'uni_modules/uni-share/js_sdk/uni-share.js';
 		},
 		created() {
 			this.about = baseappConfig.about
+			uni.setNavigationBarTitle({
+				title:'关于'+this.about.appName
+			})
 			this.year = (new Date).getFullYear()
 		},
 		onNavigationBarButtonTap() {
@@ -122,9 +126,12 @@ import uniShare from 'uni_modules/uni-share/js_sdk/uni-share.js';
 	height:160upx;
 	border-radius: 15px;
 }
+.tip{
+	font-size:24rpx;
+	margin-top: 10px;
+}
 .appName{
 	margin-top: 20px;
-	margin-bottom:5px;
 	font-size:42rpx;
 	font-weight: 500;
 }

--- a/template.h5.html
+++ b/template.h5.html
+<!DOCTYPE html>
+<html lang="zh-CN">
+	<head>
+		<meta charset="utf-8">
+		<meta http-equiv="X-UA-Compatible" content="IE=edge">
+		<meta name="viewport"
+			content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+		<title>
+			<%= htmlWebpackPlugin.options.title %>
+		</title>
+		<!-- 正式发布的时候使用，开发期间不启用。↓ -->
+		<!-- <script src="/h5/touch-emulator.js"></script>
+		<script>
+            TouchEmulator();
+			if (document.documentElement.clientWidth > 1024) {
+				window.location.href = '/h5/pcguide.html#'+location.pathname+location.search;
+			}
+		</script>
+        <style>
+            ::-webkit-scrollbar{
+                display: none;
+            }
+        </style>
+        <script>
+            var _hmt = _hmt || [];
+            (function() {
+                var hm = document.createElement("script");
+                hm.src = "https://hm.baidu.com/hm.js?";// 百度统计key
+                var s = document.getElementsByTagName("script")[0];
+                s.parentNode.insertBefore(hm, s);
+            })();
+        </script> -->
+		<!-- 正式发布的时候使用，开发期间不启用。↑ -->
+		<script>
+			// document.addEventListener('DOMContentLoaded', function() {
+			// 	document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
+			// })
+			
+			setTimeout(()=>{
+				document.querySelector('#gg').addEventListener('click',e=>{
+					console.log(e);
+					alert(12)
+				})
+			},1000)
+			
+		</script>
+		<link rel="stylesheet" href="<%= BASE_URL %>static/index.<%= VUE_APP_INDEX_CSS_HASH %>.css" />
+	</head>
+	<body>
+		<!-- 该文件为 H5 平台的模板 HTML，并非应用入口。 -->
+		<!-- 请勿在此文件编写页面代码或直接运行此文件。 -->
+		<!-- 详见文档：https://uniapp.dcloud.io/collocation/manifest?id=h5-template -->
+		<noscript>
+			<strong>Please enable JavaScript to continue.</strong>
+		</noscript>
+			<div id="gg" style="width: 99px;height: 99px;background-color: #007AFF;"
+				>下载app</div>
+			<div style="margin-top: 100px;" id="app"></div>
+		<!-- built files will be auto injected -->
+		<script>
+			/*BAIDU_STAT*/
+		</script>
+	</body>
+</html>
--- a/uni_modules/uni-login-page/components/uni-quick-login/uni-quick-login.vue
+++ b/uni_modules/uni-login-page/components/uni-quick-login/uni-quick-login.vue
@@ -115,12 +115,12 @@
 				console.log(arguments);
 				console.log('services',services);
 				let oauthService = this.oauthServices.find((service) => service.id == type)
-				// #ifdef APP-PLUS
-				//uni.showLoading({mask: true});
 				console.log(type);
+				
+				// #ifdef APP-PLUS
 				//请勿直接使用前端获取的unionid或openid直接用于登陆，前端的数据都是不可靠的
 				if(type=='weixin'){
-					oauthService.authorize(({code})=>{
+					return	oauthService.authorize(({code})=>{
 						console.log(code);
 						this.quickLogin({code},type)
 					},
@@ -129,6 +129,7 @@
 						console.log(err);
 					})
 				}
+				// #endif
 				
 				uni.login({
 					"provider": type,
@@ -174,7 +175,6 @@
 						}
 					}
 				})
-				// #endif
 			},
 			quickLogin(params,type){//联网验证登陆
 				console.log(params,type);
@@ -198,14 +198,11 @@
 						var delta = 0
 						//判断需要返回几层
 						let pages = getCurrentPages();
-						console.log(pages);
 						pages.forEach((page,index)=>{
-							console.log(pages[pages.length-index-1].route.split('/'));
 							if(pages[pages.length-index-1].route.split('/')[1] == 'uni-login-page'){
 								delta ++
 							}
 						})
-						console.log('delta:'+delta);
 						uni.navigateBack({delta})
 					}
 				},{showLoading:true})