diff --git a/pages.json b/pages.json
index a3c2ac302a5998e4f6e273fc0fb529256b15ff9d..d96d8b206de0ee57aa65fe4c4664d9ee5673e21d 100644
--- a/pages.json
+++ b/pages.json
@@ -44,12 +44,12 @@
"style": {
"navigationStyle": "custom"
}
- }, {
+ },
+ // #ifdef APP-PLUS
+ {
"path": "pages/ucenter/about/about",
"style": {
- "navigationBarTitleText": "关于"
- // #ifdef APP-PLUS
- ,
+ "navigationBarTitleText": "关于",
"app-plus": {
"titleNView": {
"buttons": [{
@@ -57,11 +57,8 @@
}]
}
}
- // #endif
}
-
},
- // #ifdef APP-PLUS
{
"path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup",
"style": {
@@ -78,6 +75,34 @@
}
}
},
+ {
+ "path": "pages/ucenter/invite/invite",
+ "style": {
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "uni_modules/uni-id-pages/pages/userinfo/deactivate/deactivate",
+ "style": {
+ "navigationBarTitleText": "注销账号"
+ }
+ },
+ // #endif
+ // #ifdef H5
+ {
+ "path": "uni_modules/uni-id-pages/pages/userinfo/cropImage/cropImage",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
+ {
+ "path": "uni_modules/uni-id-pages/pages/register/register-admin",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": "注册管理员账号"
+ }
+ },
// #endif
{
"path": "pages/uni-agree/uni-agree",
@@ -92,14 +117,6 @@
"style": {
"navigationBarTitleText": "设置"
}
-
- }, {
- "path": "pages/common/webview/webview",
- "style": {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
-
},
{
"path": "pages/ucenter/read-news-log/read-news-log",
@@ -107,24 +124,13 @@
"navigationBarTitleText": "阅读记录",
"enablePullDownRefresh": true
}
- }, {
- "path": "pages/ucenter/invite/invite",
- "style": {
- "navigationStyle": "custom",
- "enablePullDownRefresh": false
- }
-
- }, {
+ },
+ {
"path": "uni_modules/uni-feedback/pages/opendb-feedback/opendb-feedback",
"style": {
"navigationBarTitleText": "意见反馈",
"enablePullDownRefresh": false
}
- }, {
- "path": "uni_modules/uni-id-pages/pages/userinfo/deactivate/deactivate",
- "style": {
- "navigationBarTitleText": "注销账号"
- }
},
{
"path": "uni_modules/uni-id-pages/pages/userinfo/userinfo",
@@ -136,11 +142,6 @@
"style": {
"navigationBarTitleText": "绑定手机号码"
}
- }, {
- "path": "uni_modules/uni-id-pages/pages/userinfo/cropImage/cropImage",
- "style": {
- "navigationBarTitleText": ""
- }
}, {
"path": "uni_modules/uni-id-pages/pages/login/login-withoutpwd",
"style": {
@@ -188,20 +189,14 @@
"style": {
"navigationBarTitleText": "通过邮箱重置密码"
}
- }, {
- "path": "uni_modules/uni-id-pages/pages/register/register-admin",
- "style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": "注册管理员账号"
- }
- }
- ,{
- "path": "uni_modules/uni-id-pages/pages/userinfo/set-pwd/set-pwd",
- "style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": "设置密码"
- }
-}
+ },
+ {
+ "path": "uni_modules/uni-id-pages/pages/userinfo/set-pwd/set-pwd",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": "设置密码"
+ }
+ }
],
"globalStyle": {
// #ifdef H5
diff --git a/pages/common/webview/webview.vue b/pages/common/webview/webview.vue
deleted file mode 100644
index 9ecbe7812970e7d9cceec729b6638f8ff6149780..0000000000000000000000000000000000000000
--- a/pages/common/webview/webview.vue
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/pages/grid/grid.vue b/pages/grid/grid.vue
index 8d61ca4e02cde641aaa899c5c510ffa22e9d2c24..cd2df7e302b7fe2a58566a42a6efe6d019b7ced2 100644
--- a/pages/grid/grid.vue
+++ b/pages/grid/grid.vue
@@ -1,28 +1,30 @@
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+ {{$t('grid.grid')}}
+
+
@@ -42,16 +44,19 @@