diff --git a/manifest.json b/manifest.json
index faf23882b236cea6146d334615bc0a1095d0f2fc..ca7c8b529f55f102be8476369b9794ed1be04fff 100644
--- a/manifest.json
+++ b/manifest.json
@@ -86,8 +86,7 @@
"setting" : {
"urlCheck" : false
},
- "usingComponents" : true,
- "betterScopedSlots" : true
+ "usingComponents" : true
},
"mp-alipay" : {
"usingComponents" : true
diff --git a/pages.json b/pages.json
index 0ee9a9496f0c1a7c5c84d499df788dcaa96e8b9e..46f8a0dcf8ace10fbcd531e976f354459f6bfffe 100644
--- a/pages.json
+++ b/pages.json
@@ -24,8 +24,6 @@
"app-plus": {
"animationType": "none",
"popGesture": "none"
- // "navigationStyle": "custom",
- // "backgroundColor": "transparent",
}
}
}, {
@@ -76,13 +74,16 @@
}, {
"path": "pages/ucenter/about/about",
"style": {
- "navigationBarTitleText": "关于"
- // #ifdef APP-PLUS
- ,"app-plus": {
- "titleNView": {
- "buttons": [{"type": "share"}]
- }
- }
+ "navigationBarTitleText": "关于"
+ // #ifdef APP-PLUS
+ ,
+ "app-plus": {
+ "titleNView": {
+ "buttons": [{
+ "type": "share"
+ }]
+ }
+ }
// #endif
}
@@ -142,7 +143,6 @@
}, {
"path": "uni_modules/uni-id-users/pages/uni-id-users/edit",
- // "path": "pages/ucenter/edit/edit",
"style": {
"navigationBarTitleText": "编辑资料"
}
@@ -168,40 +168,28 @@
}
}, {
- "path": "pages/ucenter/help/help",
+ "path": "pages/test/test",
"style": {
- "navigationBarTitleText": "帮助",
+ "navigationBarTitleText": "",
"enablePullDownRefresh": false
}
+
+ }, {
+ "path": "pages/common/webview/webview",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "uni_modules/uni-login-page/pages/register/register",
+ "style": {
+ "navigationBarTitleText": "注册",
+ "enablePullDownRefresh": false
+ }
+
}
- ,{
- "path" : "pages/test/test",
- "style" :
- {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/common/webview/webview",
- "style" :
- {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "uni_modules/uni-login-page/pages/register/register",
- "style" :
- {
- "navigationBarTitleText": "注册",
- "enablePullDownRefresh": false
- }
-
- }
- ],
+ ],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "base-app",
@@ -209,22 +197,23 @@
"backgroundColor": "#F8F8F8"
},
"condition": {
- "list": [
- {
- "path": "pages/list/list"
- },
+ "list": [
+ {
+ "path": "pages/list/list"
+ },
{
"path": "uni_modules/uni-login-page/pages/index/index"
- },
- {
- "path": "pages/test/test"
- },
- {
- "path":"pages/ucenter/settings/settings"
- }
+ },
+ {
+ "path": "pages/test/test"
+ },
+ {
+ "path": "pages/ucenter/settings/settings"
+ }
],
- "current":1
- },
+
+ "current": 0
+},
"tabBar": {
"color": "#7A7E83",
"selectedColor": "#007AFF",
diff --git a/pages/ucenter/help/help.vue b/pages/ucenter/help/help.vue
deleted file mode 100644
index 2f5d377ae0f21dd5695043275ff4bd2872f7c355..0000000000000000000000000000000000000000
--- a/pages/ucenter/help/help.vue
+++ /dev/null
@@ -1,178 +0,0 @@
-
-
-
-
- {{ item.content }}
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/ucenter/ucenter.vue b/pages/ucenter/ucenter.vue
index 66fc6f8f18b6fe2787208275a7fb36a94152c176..aff95cbbb6b0477644b5355b6a3288abcd9cf106 100644
--- a/pages/ucenter/ucenter.vue
+++ b/pages/ucenter/ucenter.vue
@@ -8,9 +8,9 @@
-
-
- {{text}}
+
+
+ {{item.text}}
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 9b95ab23ae25e3be546a7b37d0575d50cdc8075f..1115f1c456bbeaa3312b3928269ff512d244a1cc 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
@@ -1,8 +1,8 @@
-
-
- {{text}}
+
+
+ {{item.text}}
diff --git a/uni_modules/uni-login-page/pages/index/index.vue b/uni_modules/uni-login-page/pages/index/index.vue
index 483df45d987f2d366d7c250c35163c24219a7f0d..d94180d9ff013738465ab0a461c9d1c3d019a469 100644
--- a/uni_modules/uni-login-page/pages/index/index.vue
+++ b/uni_modules/uni-login-page/pages/index/index.vue
@@ -1,6 +1,5 @@
-
@@ -10,13 +9,13 @@
-
-
-
-
-
-
+ v-model="formData.phone" maxlength="11" placeholder="请输入手机号">
+
+