Commit 0d337826 authored by 王能飞's avatar 王能飞

Merge branch 'c_client_taro-pack' into 'c_client_taro'

授权页面UI更新

See merge request !48
parents 41780097 4dec3d9c
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
"version": "1.0.0", "version": "1.0.0",
"private": true, "private": true,
"description": "测试项目", "description": "测试项目",
"title":"测试活动",
"phone":"",
"templateInfo": { "templateInfo": {
"name": "taro-ui", "name": "taro-ui",
"typescript": false, "typescript": false,
......
...@@ -11,8 +11,9 @@ function Auth(props) { ...@@ -11,8 +11,9 @@ function Auth(props) {
<View className={`${clspreFix}`}> <View className={`${clspreFix}`}>
<View className={`${clspreFix}__content`}> <View className={`${clspreFix}__content`}>
<View className={`${clspreFix}__img`}></View> <View className={`${clspreFix}__img`}></View>
<View className={`${clspreFix}__title`}>开启授权继续使用</View> <View className={`${clspreFix}__title`}>获取小程序用户授权</View>
<Text className={`${clspreFix}__subTitle`}>{`申请获取你的淘宝昵称及头像\n用于会员身份的核实及认证`}</Text> <Text className={`${clspreFix}__subTitle`}>{`申请获取淘宝昵称及头像等用户信息`}</Text>
<Text className={`${clspreFix}__subTitle2`}>{`为了更好的为您提供服务,请同意小程序授权`}</Text>
<View className={`${clspreFix}__btn`} onClick={clickAuthBtn}>立即授权</View> <View className={`${clspreFix}__btn`} onClick={clickAuthBtn}>立即授权</View>
<View className={`${clspreFix}__exct`} onClick={() => Taro.exit()}>退出程序</View> <View className={`${clspreFix}__exct`} onClick={() => Taro.exit()}>退出程序</View>
</View> </View>
......
...@@ -7,56 +7,77 @@ ...@@ -7,56 +7,77 @@
right: 0; right: 0;
bottom: 0; bottom: 0;
z-index: 20; z-index: 20;
background-color: #eee; // f1ebdd background-color: #EDEEEF; // f1ebdd
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
&__content { &__content {
width: 520px; width: 700px;
margin: 0 auto; margin: 0 auto;
} }
&__img { &__img {
width: 168px; width: 160px;
height: 168px; height: 160px;
margin: 0 auto 75px; margin: 0 auto 75px;
background-image: url('https://yun.dui88.com/dbad8bde-b2d5-41a8-ba62-94a9d42d624c.png'); background-image: url('https://yun.dui88.com/60d85a4d-e16e-4f20-ab65-8496f313a34b.png');
.image-property(cover, center center); .image-property(cover, center center);
background-repeat: no-repeat; background-repeat: no-repeat;
} }
&__title{ &__title{
color: #111111; font-size: 34px;
font-size: 32px; font-family: Adobe Heiti Std;
margin: 0 auto 24px; font-weight: normal;
color: #080808;
line-height: 42px;
text-align: center; text-align: center;
margin: 34px auto 0;
} }
&__subTitle { &__subTitle {
display: block; display: block;
line-height: 48px;
color: #757575;
font-size: 32px; font-size: 32px;
margin: 0 auto 70px; font-family: Adobe Heiti Std;
font-weight: normal;
color: #666666;
line-height: 49px;
text-align: center;
margin: 30px auto 0;
}
&__subTitle2 {
display: block;
font-size: 28px;
font-family: Adobe Heiti Std;
font-weight: normal;
color: #666666;
line-height: 49px;
margin: 86px auto 0;
text-align: center; text-align: center;
} }
&__btn { &__btn {
width: 496px; width: 575px;
height: 110px; height: 89px;
line-height: 110px; line-height: 89px;
border-radius: 60px; background: linear-gradient(90deg, #FE5200, #FF8E01);
color: #e1e1e1; border-radius: 45px;
background-color: rgb(17, 17, 17); font-size: 36px;
font-family: Alibaba;
font-weight: normal;
color: #FFFFFF;
text-align: center; text-align: center;
font-size: 28px; margin: 30px auto 0;
} }
&__exct { &__exct {
width: 496px; width: 575px;
height: 110px; height: 89px;
line-height: 110px; line-height: 89px;
border-radius: 60px; border: 2px solid #FF6C04;
color: #e1e1e1; border-radius: 45px;
background-color: rgb(17, 17, 17);
font-size: 36px;
font-family: Alibaba;
font-weight: normal;
color: #FE5600;
text-align: center; text-align: center;
font-size: 28px; margin: 36px auto 0;
margin-top: 20px;
} }
} }
\ No newline at end of file
...@@ -6,7 +6,6 @@ import * as configPackage from '../../package.json' ...@@ -6,7 +6,6 @@ import * as configPackage from '../../package.json'
* @param message * @param message
*/ */
export const cloundAlarm = async (message, env, requestType) => { export const cloundAlarm = async (message, env, requestType) => {
console.warn(configPackage)
const { title, author, phone } = configPackage const { title, author, phone } = configPackage
const envTxt = { const envTxt = {
'test': '测试环境', 'test': '测试环境',
......
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