Commit ad77eea6 authored by 和慭琛's avatar 和慭琛

授权登录页 UI高保真还原 100%

parent d60c896d
...@@ -6,6 +6,13 @@ ...@@ -6,6 +6,13 @@
*/ */
"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
{
"path": "pages/index/success",
"style": {
"navigationBarTitleText": "下单"
}
},
{ {
"path": "pages/index/index", "path": "pages/index/index",
"style": { "style": {
...@@ -14,6 +21,14 @@ ...@@ -14,6 +21,14 @@
}, },
{
"path": "pages/login/wxlogin",
"style": {
"navigationBarTitleText": "授权登录"
}
},
{ {
"path": "pages/take/index", "path": "pages/take/index",
"style": { "style": {
...@@ -62,20 +77,9 @@ ...@@ -62,20 +77,9 @@
"style": { "style": {
"navigationBarTitleText": "下的单" "navigationBarTitleText": "下的单"
} }
},
{
"path": "pages/index/success",
"style": {
"navigationBarTitleText": "下单"
}
},
{
"path": "pages/login/wxlogin",
"style": {
"navigationBarTitleText": "授权登录"
}
} }
], ],
"globalStyle": { "globalStyle": {
......
<template> <template>
<view class=""> <view class="">
<view class="backView"> <view class="backView">
<button v-if="!isNewUser" class="loginBtn" open-type="getUserInfo" lang="zh_CN" @getuserinfo="getUserInfo"> <view class="noticeView">
<image class="noticeImage" :src="icon_notice" mode=""></image>
</view>
<button class="loginBtn" v-if="!isNewUser" open-type="getUserInfo" lang="zh_CN" @getuserinfo="getUserInfo">
<text class="u-font-32 white">立即登录</text> <text class="u-font-32 white">立即登录</text>
</button> </button>
<button v-if="isNewUser" class="loginBtn" open-type="getPhoneNumber" throttle-time="1000" @getphonenumber="getPhoneNumber"> <button class="loginBtn" v-if="isNewUser" open-type="getPhoneNumber" throttle-time="1000" @getphonenumber="getPhoneNumber">
<text class="u-font-32 white">授权登录</text> <text class="u-font-32 white">授权登录</text>
</button> </button>
<view class="cancelView">
<text class="cancelText" @click="cancelClick()">取消</text>
</view>
</view> </view>
</view> </view>
</template> </template>
...@@ -19,9 +25,11 @@ ...@@ -19,9 +25,11 @@
isNewUser:false, isNewUser:false,
unionID:'', unionID:'',
openID:'', openID:'',
icon_notice:''
} }
}, },
onLoad() { onLoad() {
this.icon_notice = getApp().globalData.icon_auth_notice
//this.domain_name = getApp().globalData.domain_Name //this.domain_name = getApp().globalData.domain_Name
console.log('当前域名:'+this.domain_name) console.log('当前域名:'+this.domain_name)
...@@ -261,6 +269,13 @@ ...@@ -261,6 +269,13 @@
}) })
}, },
//取消点击
cancelClick: function() {
uni.navigateBack({
})
},
/* /*
//微信授权 //微信授权
toLogin: async function(data) { toLogin: async function(data) {
...@@ -385,28 +400,56 @@ ...@@ -385,28 +400,56 @@
</script> </script>
<style> <style>
.backView{ .backView{
background-color: #FFFFFF; background-color: #FAFAFA;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
display: flex; display: flex;
align-items: center; flex-direction: column;
justify-content: center; }
.noticeView{
background-color: #FFFFFF;
width: 100%;
height: 470rpx;
}
.noticeImage{
background-color: #FFFFFF;
width: 528rpx;
height: 248rpx;
margin-top: 88rpx;
margin-left: 112rpx;
} }
.loginBtn{ .loginBtn{
background-color: #4CD964; background-color: #2272FF;
width: 400rpx; width: 380rpx;
height: 80rpx; height: 80rpx;
border-radius: 40rpx; border-radius: 40rpx;
margin-top: 226rpx;
display: flex;
align-items: center;
justify-content: center;
}
.cancelView{
width: 100%;
height: 88rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.cancelText{
color: #666666;
font-size: 28rpx;
}
.white{ .white{
color: #FFFFFF; color: #FFFFFF;
} }
......
{ {
"pages": [ "pages": [
"pages/index/success",
"pages/index/index", "pages/index/index",
"pages/login/wxlogin",
"pages/take/index", "pages/take/index",
"pages/take/finish", "pages/take/finish",
"pages/take/measure", "pages/take/measure",
"pages/take/rob", "pages/take/rob",
"pages/take/detail", "pages/take/detail",
"pages/index/record", "pages/index/record"
"pages/index/success",
"pages/login/wxlogin"
], ],
"subPackages": [], "subPackages": [],
"window": { "window": {
......
<view><view class="backView"><block wx:if="{{!isNewUser}}"><button class="loginBtn" open-type="getUserInfo" lang="zh_CN" data-event-opts="{{[['getuserinfo',[['getUserInfo',['$event']]]]]}}" bindgetuserinfo="__e"><text class="u-font-32 white">立即登录</text></button></block><block wx:if="{{isNewUser}}"><button class="loginBtn" open-type="getPhoneNumber" throttle-time="1000" data-event-opts="{{[['getphonenumber',[['getPhoneNumber',['$event']]]]]}}" bindgetphonenumber="__e"><text class="u-font-32 white">授权登录</text></button></block></view></view> <view><view class="backView"><view class="noticeView"><image class="noticeImage" src="{{icon_notice}}" mode></image></view><block wx:if="{{!isNewUser}}"><button class="loginBtn" open-type="getUserInfo" lang="zh_CN" data-event-opts="{{[['getuserinfo',[['getUserInfo',['$event']]]]]}}" bindgetuserinfo="__e"><text class="u-font-32 white">立即登录</text></button></block><block wx:if="{{isNewUser}}"><button class="loginBtn" open-type="getPhoneNumber" throttle-time="1000" data-event-opts="{{[['getphonenumber',[['getPhoneNumber',['$event']]]]]}}" bindgetphonenumber="__e"><text class="u-font-32 white">授权登录</text></button></block><view class="cancelView"><text data-event-opts="{{[['tap',[['cancelClick']]]]}}" class="cancelText" bindtap="__e">取消</text></view></view></view>
\ No newline at end of file \ No newline at end of file
.backView{ .backView{
background-color: #FFFFFF; background-color: #FAFAFA;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
...@@ -9,6 +9,33 @@ ...@@ -9,6 +9,33 @@
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
display: flex; display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
flex-direction: column;
}
.noticeView{
background-color: #FFFFFF;
width: 100%;
height: 470rpx;
}
.noticeImage{
background-color: #FFFFFF;
width: 528rpx;
height: 248rpx;
margin-top: 88rpx;
margin-left: 112rpx;
}
.loginBtn{
background-color: #2272FF;
width: 380rpx;
height: 80rpx;
-webkit-border-radius: 40rpx;
border-radius: 40rpx;
margin-top: 226rpx;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: center; -webkit-box-align: center;
-webkit-align-items: center; -webkit-align-items: center;
align-items: center; align-items: center;
...@@ -16,12 +43,9 @@ ...@@ -16,12 +43,9 @@
-webkit-justify-content: center; -webkit-justify-content: center;
justify-content: center; justify-content: center;
} }
.loginBtn{ .cancelView{
background-color: #4CD964; width: 100%;
width: 400rpx; height: 88rpx;
height: 80rpx;
-webkit-border-radius: 40rpx;
border-radius: 40rpx;
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
display: flex; display: flex;
...@@ -32,6 +56,10 @@ ...@@ -32,6 +56,10 @@
-webkit-justify-content: center; -webkit-justify-content: center;
justify-content: center; justify-content: center;
} }
.cancelText{
color: #666666;
font-size: 28rpx;
}
.white{ .white{
color: #FFFFFF; color: #FFFFFF;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment