diff --git a/App.vue b/App.vue
index 1150cd280aedcd0644db0945813bdadb5f008cde..85f4dce6f5a94d0d5427d74eb20ffaa437454540 100644
--- a/App.vue
+++ b/App.vue
@@ -14,9 +14,8 @@
//checkIsAgree(); APP端暂时先用原生默认生成的。目前,自定义方式启动vue界面时,原生层已经请求了部分权限这并不符合国家的法规
// #endif
- // #ifdef H5
- checkIsAgree();
- // 默认不开启。目前全球,仅欧盟国家有网页端同意隐私权限的需要。如果需要
+ // #ifdef H5
+ // checkIsAgree(); // 默认不开启。目前全球,仅欧盟国家有网页端同意隐私权限的需要。如果需要
// #endif
// #ifdef APP-PLUS
diff --git a/changelog.md b/changelog.md
index 55aa7d4761bc4bb7e61e4075eeff88e91e188003..a85c8fce1b65dd05a4b49c2d5853aee01f97dfab 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,5 @@
## 1.0.46(2021-08-05)
-删除多余文件
+清理多余文件
## 1.0.45(2021-08-05)
默认首页为nvue页面+fast
## 1.0.44(2021-08-05)
diff --git a/components/uni-quick-login/uni-quick-login.vue b/components/uni-quick-login/uni-quick-login.vue
index 57ee4d0417f5917a5c72c2a3817c8afdc4ff9bdb..378ae7085bb61bd59de74b0424ba595f9a1222bf 100644
--- a/components/uni-quick-login/uni-quick-login.vue
+++ b/components/uni-quick-login/uni-quick-login.vue
@@ -241,7 +241,7 @@
},
fail: (err) => {
uni.hideLoading()
- console.error(err);
+ console.log(err);
if (type == 'univerify') {
if (err.metadata && err.metadata.error_data) {
diff --git a/package.json b/package.json
index 3fe99cbed7f87ca313a89269003641c08ff8aec0..e1067901712e317c50794eda469a5438eb911581 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
},
"Vue": {
"vue2": "y",
- "vue3": "u"
+ "vue3": "y"
}
}
}
diff --git a/pages/list/detail.vue b/pages/list/detail.vue
index 76f3372d70f0f4e9f4572461e61c01af7f6cea5a..f66ecded92f60761fcf0831ec27c69f60e3c6c7f 100644
--- a/pages/list/detail.vue
+++ b/pages/list/detail.vue
@@ -83,7 +83,7 @@
},
onLoad(event) {
console.log(event);
- event = {"id":"60783c5cb781700001375672","title":"阿里小程序IDE官方内嵌uni-app,为开发者提供多端开发服务","excerpt":"阿里小程序IDE官方内嵌uni-app,为开发者提供多端开发服务","avatar":"https://vkceyugu.cdn.bspapp.com/VKCEYUGU-aliyun-gacrhzeynhss7c6d04/249516a0-3941-11eb-899d-733ae62bed2f.jpg"}
+ // event = {"id":"60783c5cb781700001375672","title":"阿里小程序IDE官方内嵌uni-app,为开发者提供多端开发服务","excerpt":"阿里小程序IDE官方内嵌uni-app,为开发者提供多端开发服务","avatar":"https://vkceyugu.cdn.bspapp.com/VKCEYUGU-aliyun-gacrhzeynhss7c6d04/249516a0-3941-11eb-899d-733ae62bed2f.jpg"}
//获取真实新闻id,通常 id 来自上一个页面
if (event.id) {
this.id = event.id
diff --git a/pages/list/list.nvue b/pages/list/list.nvue
index 07a35f3f466deb6e16bf33459faf1a57d68e1290..29acfe58408f2f798d2cf3170bfb8a43a4c59247 100644
--- a/pages/list/list.nvue
+++ b/pages/list/list.nvue
@@ -4,10 +4,12 @@
-
-
-
+
+
+
+
+
@@ -223,5 +225,14 @@
.f1 {
flex: 1;
+ }
+ .cover-search-bar{
+ height: 50px;
+ position: relative;
+ top: -50px;
+ margin-bottom: -50px;
+ /* #ifndef APP-NVUE */
+ z-index:999;
+ /* #endif */
}
\ No newline at end of file
diff --git a/pages/ucenter/ucenter.vue b/pages/ucenter/ucenter.vue
index a05cc82d3f5616feaeebbcaf8781bfc152698806..593b916d6de871bf5eaf87af6533be6dc06a0823 100644
--- a/pages/ucenter/ucenter.vue
+++ b/pages/ucenter/ucenter.vue
@@ -1,444 +1,431 @@
-
-
-
+
+
+
-
-
+
+
- {{userInfo.nickname||userInfo.username||userInfo.mobile}}
- 未登陆
-
-
-
-
-
- {{item.text}}
-
+ {{userInfo.nickname||userInfo.username||userInfo.mobile}}
+ 未登陆
+
+
+
+
+
+ {{item.text}}
+
-
-
-
-
-
-
-
-
-
-
-
+ background-color: #DD524D;
+ }
+
\ No newline at end of file
diff --git a/uni_modules/uni-sign-in/pages/demo/demo.vue b/uni_modules/uni-sign-in/pages/demo/demo.vue
new file mode 100644
index 0000000000000000000000000000000000000000..a7536cd85738cdd5308db3a54ef1b496157952c1
--- /dev/null
+++ b/uni_modules/uni-sign-in/pages/demo/demo.vue
@@ -0,0 +1,12 @@
+
+
+
+