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

UI改动

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