diff --git a/manifest.json b/manifest.json
index 6f9293fc98b3a052f09bc32ec2fab3a8da6d052f..faf23882b236cea6146d334615bc0a1095d0f2fc 100644
--- 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"
}
}
diff --git a/pages.json b/pages.json
index 178e1b4d04a456e34e23907d1c995b8b46a4bc09..d9c5b52ce98673077fb504191fe195325234b381 100644
--- 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
diff --git a/pages/ucenter/about/about.vue b/pages/ucenter/about/about.vue
index 608e29dce78d137e3967915ef59d88720bc4585c..b871c9c9e5b26669183909abb6642d24f82d1888 100644
--- a/pages/ucenter/about/about.vue
+++ b/pages/ucenter/about/about.vue
@@ -3,9 +3,10 @@
{{about.appName}}
- Version {{version}}
+ Version {{version}}
+ 扫描二维码，您的朋友也可以下载{{about.appName}}客户端
@@ -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;
}
diff --git a/template.h5.html b/template.h5.html
new file mode 100644
index 0000000000000000000000000000000000000000..0fc8271c3ad46ea9139d7130103ea60de0f2906f
--- /dev/null
+++ b/template.h5.html
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+ <%= htmlWebpackPlugin.options.title %>
+
+
+
+
+
+
+
+
+
+
+
+
+ 465
+
+
+
+
+
diff --git 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
index a3798f94af6f8b484c6feb490cbc4c691900aa7f..eb7842ae24b28eace6c0b00b7b51a6fecfde886a 100644
--- 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})