diff --git a/pages/handleLogin/index.json b/pages/handleLogin/index.json index 445dc6d..6d40fc3 100644 --- a/pages/handleLogin/index.json +++ b/pages/handleLogin/index.json @@ -6,7 +6,8 @@ "van-field": "@vant/weapp/field/index", "van-icon": "@vant/weapp/icon/index", "van-tab": "@vant/weapp/tab/index", - "van-tabs": "@vant/weapp/tabs/index" + "van-tabs": "@vant/weapp/tabs/index", + "navigator": "/components/navigator/index" }, - "navigationBarTitleText": "绑定商户" + "navigationStyle": "custom" } \ No newline at end of file diff --git a/pages/handleLogin/index.wxml b/pages/handleLogin/index.wxml index 5754b6b..d87f22d 100644 --- a/pages/handleLogin/index.wxml +++ b/pages/handleLogin/index.wxml @@ -1,5 +1,6 @@ + diff --git a/pages/qrCode/index.json b/pages/qrCode/index.json index d029aef..77a0fc3 100644 --- a/pages/qrCode/index.json +++ b/pages/qrCode/index.json @@ -1,7 +1,9 @@ { "usingComponents": { - "van-image": "@vant/weapp/image/index" + "van-image": "@vant/weapp/image/index", + "navigator": "/components/navigator/index" }, - "navigationBarTitleText": "二维码" + "navigationBarTitleText": "二维码", + "navigationStyle": "custom" } \ No newline at end of file diff --git a/pages/qrCode/index.wxml b/pages/qrCode/index.wxml index f7bafc4..159592e 100644 --- a/pages/qrCode/index.wxml +++ b/pages/qrCode/index.wxml @@ -8,7 +8,7 @@ --> - + diff --git a/pages/qrCode/index.wxss b/pages/qrCode/index.wxss index 321a5a7..9f4e542 100644 --- a/pages/qrCode/index.wxss +++ b/pages/qrCode/index.wxss @@ -1,7 +1,5 @@ /* pages/qrCode/index.wxss */ .wrapper { - width: 100vw; - height: 100vh; display: flex; justify-content: center; align-items: center; @@ -22,7 +20,6 @@ .tenement { display: flex; align-items: center; - } .name { @@ -33,4 +30,5 @@ margin: 50rpx 40rpx; display: flex; justify-content: center; + margin-top: 10vh; } \ No newline at end of file