Commit 0bb1f3ca authored by 和慭琛's avatar 和慭琛

UI改动

parent cf9ffb7f
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
@import 'uview-ui/index.scss'; @import 'uview-ui/index.scss';
</style> </style>
<script> <script>
export default { export default {
globalData: { globalData: {
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
//https://system.dev.banshouhui.com //https://system.dev.banshouhui.com
//测试环境 //测试环境
domain_Name: 'https://system.banshouhui.com', domain_Name: 'https://system.dev.banshouhui.com',
//http://192.168.0.208:8192 //http://192.168.0.208:8192
//小青本地环境 //小青本地环境
...@@ -56,6 +56,8 @@ ...@@ -56,6 +56,8 @@
icon_selected:'https://qn-static.banshouhui.com/selected.png', icon_selected:'https://qn-static.banshouhui.com/selected.png',
//关闭新 图标 //关闭新 图标
icon_close_new:'https://qn-static.banshouhui.com/close_new.png', icon_close_new:'https://qn-static.banshouhui.com/close_new.png',
//授权提示新 图标
icon_auth_notice_new:'https://qn-static.banshouhui.com/auth_notice_new.png',
//登录注册页-- //登录注册页--
//通过code获取用户信息(登录) //通过code获取用户信息(登录)
...@@ -173,7 +175,7 @@ ...@@ -173,7 +175,7 @@
} }
//*/ //*/
}, },
getProtocolContent: function() { getProtocolContent: function() {
...@@ -181,17 +183,17 @@ ...@@ -181,17 +183,17 @@
}, },
}, },
onHide: function() { onHide: function() {
console.log('App Hide') console.log('App Hide')
}, },
} }
</script> </script>
<style> <style>
/*每个页面公共css */ /*每个页面公共css */
</style> </style>
...@@ -14,6 +14,16 @@ ...@@ -14,6 +14,16 @@
}, },
{
"path": "pages/login/wxlogin",
"style": {
"navigationBarTitleText": "授权登录"
}
},
{ {
"path": "pages/take/index", "path": "pages/take/index",
"style": { "style": {
...@@ -96,16 +106,10 @@ ...@@ -96,16 +106,10 @@
"navigationBarTitleText": "下的单", "navigationBarTitleText": "下的单",
"enablePullDownRefresh": true "enablePullDownRefresh": true
} }
},
{
"path": "pages/login/wxlogin",
"style": {
"navigationBarTitleText": "授权登录"
}
} }
], ],
"globalStyle": { "globalStyle": {
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
</view> </view>
<view class="fatDivideLine"></view> <view class="fatDivideLine"></view>
<view class="itemView borderBottom"> <view class="itemView borderBottom">
<view class="itemTitleView borderBottom"> <view class="itemTitleView">
<text class="itemTitle">联系人</text> <text class="itemTitle">联系人</text>
<text class="itemRedStar">*</text> <text class="itemRedStar">*</text>
</view> </view>
...@@ -18,23 +18,38 @@ ...@@ -18,23 +18,38 @@
</view> </view>
<input class="itemInput" maxlength="15" v-model="phone" type="" value="" placeholder="请输入联系电话" placeholder-style='color:#CCCCCC;font-size:32rpx;'/> <input class="itemInput" maxlength="15" v-model="phone" type="" value="" placeholder="请输入联系电话" placeholder-style='color:#CCCCCC;font-size:32rpx;'/>
</view> </view>
<view class="fatDivideLine"></view>
<view class="locationView" @click="locationClick()"> <view class="locationView" @click="locationClick()">
<view class="locationTitleView"> <view class="locationTitleView">
<image class="locationIcon" :src="icon_location" mode=""></image> <image class="locationIcon" :src="icon_location" mode=""></image>
<text class="locationTitle">定位位置</text> <text class="locationTitle">定位位置</text>
</view> </view>
<view class="locationRightView"> <view class="locationRightView">
<text class="reLocationTitle">重新定位</text> <text class="reLocationTitle">定位</text>
<text class="locationText">{{location}}</text> <!--text class="locationText">{{location}}</text-->
</view> </view>
</view> </view>
<view class="itemView borderBottom"> <view class="newLocationTextView" v-if="location">
<text class="newLocationText">{{location}}</text>
</view>
<view class="newAddressView">
<view class="newAddressTitleView">
<text class="itemTitle">详细地址</text>
<text class="itemRedStar">*</text>
</view>
<view class="addressBackView">
<textarea class="addressTextAreaView" maxlength="200" v-model="address" auto-height="true" value="" placeholder="请输入详细服务地址" placeholder-style='color:#CCCCCC;font-size:28rpx;'/>
</view>
</view>
<view class="fatDivideLine"></view>
<!--view class="itemView borderBottom">
<view class="itemTitleView borderBottom"> <view class="itemTitleView borderBottom">
<text class="itemTitle">详细地址</text> <text class="itemTitle">详细地址</text>
<text class="itemRedStar">*</text> <text class="itemRedStar">*</text>
</view> </view>
<input class="itemInput" maxlength="200" v-model="address" type="" value="" placeholder="请输入详细服务地址" placeholder-style='color:#CCCCCC;font-size:32rpx;'/> <input class="itemInput" maxlength="200" v-model="address" type="" value="" placeholder="请输入详细服务地址" placeholder-style='color:#CCCCCC;font-size:32rpx;'/>
</view> </view-->
<view class="selectItemView"> <view class="selectItemView">
<view class="itemTitleView"> <view class="itemTitleView">
<text class="itemTitle">产品类型</text> <text class="itemTitle">产品类型</text>
...@@ -80,9 +95,12 @@ ...@@ -80,9 +95,12 @@
<image class="noticeImage" :src="icon_notice" mode=""></image> <image class="noticeImage" :src="icon_notice" mode=""></image>
</view--> </view-->
<view class="agreeView"> <view class="agreeView">
<image class="agreeIcon" @click="agreeClick(isAgree)" :src="isAgree == true ? icon_agree_yes : icon_agree_no " mode=""></image> <view class="agreeInnerView">
<text class="agreeTitle" @click="agreeClick(isAgree)">我已阅读并同意</text> <image class="agreeIcon" @click="agreeClick(isAgree)" :src="isAgree == true ? icon_agree_yes : icon_agree_no " mode=""></image>
<text class="agreeProtocol" @click="protocolClick()">《服务协议》</text> <text class="agreeTitle" @click="agreeClick(isAgree)">我已阅读并同意</text>
<text class="agreeProtocol" @click="protocolClick()">《服务协议》</text>
</view>
</view> </view>
<view class="bottomView"> <view class="bottomView">
<view class="bottomLeftView" @click="mineClick()"> <view class="bottomLeftView" @click="mineClick()">
...@@ -702,7 +720,7 @@ ...@@ -702,7 +720,7 @@
.itemTitleView{ .itemTitleView{
background-color: #FFFFFF; background-color: #FFFFFF;
width: 30%; width: 30%;
height: 104rpx; height: 102rpx;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
...@@ -716,6 +734,7 @@ ...@@ -716,6 +734,7 @@
background-color: #FFFFFF; background-color: #FFFFFF;
margin-left: 30rpx; margin-left: 30rpx;
font-size: 32rpx; font-size: 32rpx;
font-weight: bold;
color: #333333; color: #333333;
} }
...@@ -734,8 +753,8 @@ ...@@ -734,8 +753,8 @@
} }
.locationView { .locationView {
background-color: #FAFAFA; background-color: #FFFFFF;
height: 144rpx; height: 108rpx;
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
...@@ -744,16 +763,16 @@ ...@@ -744,16 +763,16 @@
} }
.locationTitleView{ .locationTitleView{
background-color: #FAFAFA; background-color: #FFFFFF;
width: 40%; width: 40%;
height: 104rpx; height: 108rpx;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
} }
.locationIcon { .locationIcon {
background-color: #FAFAFA; background-color: #FFFFFF;
margin-left: 30rpx; margin-left: 30rpx;
width: 36rpx; width: 36rpx;
height: 44rpx; height: 44rpx;
...@@ -766,7 +785,7 @@ ...@@ -766,7 +785,7 @@
} }
.locationRightView { .locationRightView {
background-color: #FAFAFA; background-color: #FFFFFF;
width: 60%; width: 60%;
height: 104rpx; height: 104rpx;
display: flex; display: flex;
...@@ -926,20 +945,21 @@ ...@@ -926,20 +945,21 @@
.agreeView{ .agreeView{
background-color: #FAFAFA; background-color: #FAFAFA;
width: 100%; width: 100%;
height: 400rpx; height: 100rpx;
margin-top: 0rpx; margin-top: 0rpx;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
padding-bottom: 104rpx; align-items: center;
justify-content: center;
padding-bottom: 404rpx;
} }
.agreeIcon{ .agreeIcon{
background-color: #F3F3F3; background-color: #F3F3F3;
margin-left: 30rpx; margin-top: 30rpx;
margin-top: 35rpx; width: 40rpx;
width: 32rpx; height: 40rpx;
height: 32rpx; border-radius: 20rpx;
border-radius: 16rpx;
} }
.agreeTitle{ .agreeTitle{
...@@ -1061,5 +1081,57 @@ ...@@ -1061,5 +1081,57 @@
justify-content: center; justify-content: center;
} }
.newAddressView{
background-color: #FFFFFF;
width: 100%;
display: flex;
flex-direction: column;
padding-bottom: 30rpx;
}
.newAddressTitleView{
height: 64rpx;
display: flex;
flex-direction: row;
}
.addressBackView{
background-color: #FFFFFF;
width: 690rpx;
border: 2rpx solid #F3F3F3;
margin-left: 30rpx;
padding-bottom: 24prx;
}
.addressTextAreaView{
background-color: #FFFFFF;
width: 640rpx;
height: 40rpx;
margin-top: 24rpx;
margin-left: 24rpx;
font-size: 28rpx;
line-height: 40rpx;
padding-bottom: 20rpx;
}
.newLocationTextView{
background-color: #FFFFFF;
display: flex;
padding-left: 30rpx;
padding-right: 30rpx;
padding-bottom: 30rpx;
}
.newLocationText{
font-size: 28rpx;
}
.agreeInnerView{
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
margin-top: 35rpx;
}
</style> </style>
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<view class=""> <view class="">
<view class="backView"> <view class="backView">
<view class="noticeView"> <view class="noticeView">
<image class="noticeImage" :src="icon_notice" mode=""></image> <image class="noticeImage" :src="icon_auth_notice_new" mode=""></image>
</view> </view>
<button class="loginBtn" v-if="!isNewUser" open-type="getUserInfo" lang="zh_CN" @getuserinfo="getUserInfo"> <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>
...@@ -26,11 +26,13 @@ ...@@ -26,11 +26,13 @@
unionID:'', unionID:'',
openID:'', openID:'',
icon_notice:'', icon_notice:'',
TimeID:-1 TimeID:-1,
icon_auth_notice_new:''
} }
}, },
onLoad() { onLoad() {
this.icon_notice = getApp().globalData.icon_auth_notice this.icon_notice = getApp().globalData.icon_auth_notice
this.icon_auth_notice_new = getApp().globalData.icon_auth_notice_new
//this.domain_name = getApp().globalData.domain_Name //this.domain_name = getApp().globalData.domain_Name
console.log('当前域名:'+this.domain_name) console.log('当前域名:'+this.domain_name)
...@@ -399,11 +401,12 @@ ...@@ -399,11 +401,12 @@
<style> <style>
.backView{ .backView{
background-color: #FAFAFA; background-color: #FFFFFF;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
...@@ -412,22 +415,24 @@ ...@@ -412,22 +415,24 @@
background-color: #FFFFFF; background-color: #FFFFFF;
width: 100%; width: 100%;
height: 470rpx; height: 470rpx;
display: flex;
flex-direction: column;
align-items: center;
} }
.noticeImage{ .noticeImage{
background-color: #FFFFFF; background-color: #FFFFFF;
width: 528rpx; width: 386rpx;
height: 248rpx; height: 270rpx;
margin-top: 88rpx; margin-top: 180rpx;
margin-left: 112rpx;
} }
.loginBtn{ .loginBtn{
background-color: #2272FF; background-color: #2272FF;
width: 380rpx; width: 390rpx;
height: 80rpx; height: 80rpx;
border-radius: 40rpx; border-radius: 40rpx;
margin-top: 226rpx; margin-top: 334rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
...@@ -435,7 +440,7 @@ ...@@ -435,7 +440,7 @@
.cancelView{ .cancelView{
width: 100%; width: 100%;
height: 88rpx; margin-top: 30rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
...@@ -443,7 +448,7 @@ ...@@ -443,7 +448,7 @@
.cancelText{ .cancelText{
color: #666666; color: #666666;
font-size: 28rpx; font-size: 32rpx;
} }
.white{ .white{
......
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