diff --git a/app.json b/app.json
index d029af9..2effdc0 100644
--- a/app.json
+++ b/app.json
@@ -82,11 +82,7 @@
"pagePath": "pages/index/index",
"iconPath": "images/icon/home.png"
},
- {
- "text": "消息",
- "pagePath": "pages/message/message",
- "iconPath": "images/icon/home.png"
- },
+
{
"text": "服务",
"pagePath": "pages/serve/serve",
@@ -113,4 +109,4 @@
],
"plugins": {
}
-}
\ No newline at end of file
+}
diff --git a/pages/index/index.js b/pages/index/index.js
index e029962..b154bb3 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -189,7 +189,7 @@ Page({
},
navigateTo(e){
if(wx.getStorageSync('token')){
- if(e.currentTarget.dataset.url && e.currentTarget.dataset.url != '/subpages/OCRCard/pages/index/index'){
+ if(e.currentTarget.dataset.url && e.currentTarget.dataset.url != '/subpages/OCRCard/pages/index/index' && e.currentTarget.dataset.url != '/subpages/index/checkOutConfirm/index/index'){
if(e.currentTarget.dataset.url === '/pages/serve/serve'){
wx.switchTab({
url: '/pages/serve/serve',
@@ -198,7 +198,7 @@ Page({
wx.navigateTo({
url: e.currentTarget.dataset.url,
})
- }else if(e.currentTarget.dataset.url){
+ }else if(e.currentTarget.dataset.url === '/subpages/OCRCard/pages/index/index'){
if(!this.data.bindPhone){
if(this.data.userInfo.idCard){
wx.navigateTo({
@@ -214,7 +214,22 @@ Page({
url: '/pages/register/register',
})
}
-
+ }else if(e.currentTarget.dataset.url === '/subpages/index/checkOutConfirm/index/index'){
+ if(!this.data.bindPhone){
+ if(this.data.userInfo.idCard){
+ wx.navigateTo({
+ url: `/subpages/index/checkOutConfirm/index/index`,
+ })
+ }else{
+ wx.navigateTo({
+ url: `/subpages/OCRCard/pages/index/index?type=out`,
+ })
+ }
+ }else{
+ wx.navigateTo({
+ url: '/pages/register/register',
+ })
+ }
}
}
}
diff --git a/pages/serve/serve.wxml b/pages/serve/serve.wxml
index 9216004..285dc44 100644
--- a/pages/serve/serve.wxml
+++ b/pages/serve/serve.wxml
@@ -21,10 +21,10 @@
延租申请
-
+
-
+