Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
take_order
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
和慭琛
take_order
Commits
0bb1f3ca
Commit
0bb1f3ca
authored
Dec 21, 2020
by
和慭琛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UI改动
parent
cf9ffb7f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
137 additions
and
54 deletions
+137
-54
App.vue
take-order/App.vue
+15
-13
pages.json
take-order/pages.json
+12
-8
index.vue
take-order/pages/index/index.vue
+94
-22
wxlogin.vue
take-order/pages/login/wxlogin.vue
+16
-11
No files found.
take-order/App.vue
View file @
0bb1f3ca
...
@@ -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
>
take-order/pages.json
View file @
0bb1f3ca
...
@@ -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"
:
{
...
...
take-order/pages/index/index.vue
View file @
0bb1f3ca
...
@@ -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
:
10
4
rpx
;
height
:
10
2
rpx
;
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
:
30
rpx
;
margin-left
:
30
rpx
;
font-size
:
32
rpx
;
font-size
:
32
rpx
;
font-weight
:
bold
;
color
:
#333333
;
color
:
#333333
;
}
}
...
@@ -734,8 +753,8 @@
...
@@ -734,8 +753,8 @@
}
}
.locationView
{
.locationView
{
background-color
:
#F
AFAFA
;
background-color
:
#F
FFFFF
;
height
:
1
44
rpx
;
height
:
1
08
rpx
;
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
:
#F
AFAFA
;
background-color
:
#F
FFFFF
;
width
:
40%
;
width
:
40%
;
height
:
10
4
rpx
;
height
:
10
8
rpx
;
display
:
flex
;
display
:
flex
;
flex-direction
:
row
;
flex-direction
:
row
;
align-items
:
center
;
align-items
:
center
;
}
}
.locationIcon
{
.locationIcon
{
background-color
:
#F
AFAFA
;
background-color
:
#F
FFFFF
;
margin-left
:
30
rpx
;
margin-left
:
30
rpx
;
width
:
36
rpx
;
width
:
36
rpx
;
height
:
44
rpx
;
height
:
44
rpx
;
...
@@ -766,7 +785,7 @@
...
@@ -766,7 +785,7 @@
}
}
.locationRightView
{
.locationRightView
{
background-color
:
#F
AFAFA
;
background-color
:
#F
FFFFF
;
width
:
60%
;
width
:
60%
;
height
:
104
rpx
;
height
:
104
rpx
;
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
:
4
00
rpx
;
height
:
1
00
rpx
;
margin-top
:
0
rpx
;
margin-top
:
0
rpx
;
display
:
flex
;
display
:
flex
;
flex-direction
:
row
;
flex-direction
:
row
;
padding-bottom
:
104
rpx
;
align-items
:
center
;
justify-content
:
center
;
padding-bottom
:
404
rpx
;
}
}
.agreeIcon
{
.agreeIcon
{
background-color
:
#F3F3F3
;
background-color
:
#F3F3F3
;
margin-left
:
30
rpx
;
margin-top
:
30
rpx
;
margin-top
:
35
rpx
;
width
:
40
rpx
;
width
:
32
rpx
;
height
:
40
rpx
;
height
:
32
rpx
;
border-radius
:
20
rpx
;
border-radius
:
16
rpx
;
}
}
.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
:
30
rpx
;
}
.newAddressTitleView
{
height
:
64
rpx
;
display
:
flex
;
flex-direction
:
row
;
}
.addressBackView
{
background-color
:
#FFFFFF
;
width
:
690
rpx
;
border
:
2
rpx
solid
#F3F3F3
;
margin-left
:
30
rpx
;
padding-bottom
:
24
prx
;
}
.addressTextAreaView
{
background-color
:
#FFFFFF
;
width
:
640
rpx
;
height
:
40
rpx
;
margin-top
:
24
rpx
;
margin-left
:
24
rpx
;
font-size
:
28
rpx
;
line-height
:
40
rpx
;
padding-bottom
:
20
rpx
;
}
.newLocationTextView
{
background-color
:
#FFFFFF
;
display
:
flex
;
padding-left
:
30
rpx
;
padding-right
:
30
rpx
;
padding-bottom
:
30
rpx
;
}
.newLocationText
{
font-size
:
28
rpx
;
}
.agreeInnerView
{
display
:
flex
;
flex-direction
:
row
;
align-items
:
center
;
justify-content
:
center
;
margin-top
:
35
rpx
;
}
</
style
>
</
style
>
take-order/pages/login/wxlogin.vue
View file @
0bb1f3ca
...
@@ -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
:
#F
AFAFA
;
background-color
:
#F
FFFFF
;
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
:
470
rpx
;
height
:
470
rpx
;
display
:
flex
;
flex-direction
:
column
;
align-items
:
center
;
}
}
.noticeImage
{
.noticeImage
{
background-color
:
#FFFFFF
;
background-color
:
#FFFFFF
;
width
:
528
rpx
;
width
:
386
rpx
;
height
:
248
rpx
;
height
:
270
rpx
;
margin-top
:
88
rpx
;
margin-top
:
180
rpx
;
margin-left
:
112
rpx
;
}
}
.loginBtn
{
.loginBtn
{
background-color
:
#2272FF
;
background-color
:
#2272FF
;
width
:
3
8
0
rpx
;
width
:
3
9
0
rpx
;
height
:
80
rpx
;
height
:
80
rpx
;
border-radius
:
40
rpx
;
border-radius
:
40
rpx
;
margin-top
:
226
rpx
;
margin-top
:
334
rpx
;
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
:
88
rpx
;
margin-top
:
30
rpx
;
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
:
28
rpx
;
font-size
:
32
rpx
;
}
}
.white
{
.white
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment