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
9f3437c5
Commit
9f3437c5
authored
Mar 29, 2021
by
李俊赕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
edit-setting-take
parent
27008cb6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
7 deletions
+13
-7
setting.vue
take-order/pages/photo/setting.vue
+2
-1
take.vue
take-order/pages/photo/take.vue
+11
-6
No files found.
take-order/pages/photo/setting.vue
View file @
9f3437c5
...
...
@@ -132,7 +132,8 @@
}).
then
(
res
=>
{
console
.
log
(
res
)
if
(
res
.
result
==
true
)
{
const
photo
=
getApp
().
globalData
.
photo
const
photo
=
getApp
().
globalData
.
photo
console
.
log
(
this
.
result
,
'this.result'
)
photo
.
waterSetting
=
this
.
result
}
...
...
take-order/pages/photo/take.vue
View file @
9f3437c5
...
...
@@ -84,6 +84,7 @@
cameraHeight
:
1000
,
// (4 / 3 * 750) 图片比例4:3
ratio
:
0
,
cameraChange
:
true
,
waterSetting
:
null
,
}
},
onLoad
(
e
)
{
...
...
@@ -97,15 +98,18 @@
this
.
currentItem
=
photo
.
currentItem
},
computed
:
{
waterSetting
()
{
// photo.waterSetting
const
photo
=
getApp
().
globalData
.
photo
console
.
log
(
photo
.
waterSetting
,
'photo.waterSetting'
)
return
photo
.
waterSetting
||
null
},
//
waterSetting() {
//
// photo.waterSetting
//
const photo = getApp().globalData.photo
//
console.log(photo.waterSetting, 'photo.waterSetting')
//
return photo.waterSetting || null
//
},
titleTxt
(){
const
waterSetting
=
this
.
waterSetting
let
txt
=
''
if
(
!
waterSetting
||
!
waterSetting
.
lower_right
){
return
''
}
txt
=
waterSetting
.
lower_right
&&
waterSetting
.
lower_right
.
title_text
||
''
console
.
log
(
txt
,
'title_text'
,
'waterSetting'
,
waterSetting
)
return
txt
...
...
@@ -204,6 +208,7 @@
const
globalData
=
getApp
().
globalData
this
.
navHeight
=
globalData
.
navHeight
this
.
ratio
=
globalData
.
screenHeight
/
globalData
.
rpxScreenHeight
this
.
waterSetting
=
getApp
().
globalData
.
photo
.
waterSetting
// this.cameraHeight = globalData.rpxScreenHeight
},
baiduLocation
()
{
...
...
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