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
df0b5559
Commit
df0b5559
authored
Mar 31, 2021
by
李俊赕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
编辑-take页面
parent
8a0fba89
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
5 deletions
+13
-5
list.vue
take-order/pages/photo/list.vue
+3
-2
take.vue
take-order/pages/photo/take.vue
+10
-3
No files found.
take-order/pages/photo/list.vue
View file @
df0b5559
...
@@ -93,8 +93,9 @@
...
@@ -93,8 +93,9 @@
const
globalData
=
getApp
().
globalData
const
globalData
=
getApp
().
globalData
globalData
.
photo
.
productList
=
result
globalData
.
photo
.
productList
=
result
this
.
dataList
=
result
this
.
dataList
=
result
var
item
=
result
[
0
]
let
item
=
result
[
0
]
globalData
.
photo
.
waterSetting
=
item
.
userWatermark
console
.
log
(
result
,
item
,
'item'
)
globalData
.
photo
.
waterSetting
=
item
&&
item
.
userWatermark
||
null
this
.
rightList
=
item
.
list
this
.
rightList
=
item
.
list
},
},
...
...
take-order/pages/photo/take.vue
View file @
df0b5559
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
:style=
"
{'width':750 + 'rpx','height': cameraHeight + 'rpx'}">
</canvas>
:style=
"
{'width':750 + 'rpx','height': cameraHeight + 'rpx'}">
</canvas>
<view
v-if=
"standardShow"
class=
"page-mask"
:z-index=
"10000"
>
<view
v-if=
"standardShow"
class=
"page-mask"
:z-index=
"10000"
>
<photo-standard
:currentItem=
"currentItem"
/>
<photo-standard
:currentItem=
"currentItem"
/>
<view
class=
"btn-close"
@
click=
"
standardShow = false
"
>
<view
class=
"btn-close"
@
click=
"
closeShadow
"
>
<image
class=
"icon icon-close"
mode=
"aspectFit"
src=
"/static/photo/icon-close.png"
>
<image
class=
"icon icon-close"
mode=
"aspectFit"
src=
"/static/photo/icon-close.png"
>
</cover-image>
</cover-image>
</view>
</view>
...
@@ -85,6 +85,7 @@
...
@@ -85,6 +85,7 @@
ratio
:
0
,
ratio
:
0
,
cameraChange
:
true
,
cameraChange
:
true
,
waterSetting
:
null
,
waterSetting
:
null
,
shadowInitShow
:
true
,
// 第一次进入页面需显示弹窗
}
}
},
},
onLoad
(
e
)
{
onLoad
(
e
)
{
...
@@ -158,6 +159,10 @@
...
@@ -158,6 +159,10 @@
// })
// })
},
},
methods
:
{
methods
:
{
closeShadow
(){
this
.
shadowInitShow
=
false
this
.
standardShow
=
true
},
goBack
()
{
goBack
()
{
uni
.
navigateBack
({
uni
.
navigateBack
({
delta
:
1
delta
:
1
...
@@ -199,11 +204,13 @@
...
@@ -199,11 +204,13 @@
this
.
cameraInfo
[
type
]
=
val
this
.
cameraInfo
[
type
]
=
val
},
},
initData
()
{
initData
()
{
this
.
standardShow
=
true
const
globalData
=
getApp
().
globalData
const
globalData
=
getApp
().
globalData
this
.
navHeight
=
globalData
.
navHeight
this
.
navHeight
=
globalData
.
navHeight
this
.
ratio
=
globalData
.
screenHeight
/
globalData
.
rpxScreenHeight
this
.
ratio
=
globalData
.
screenHeight
/
globalData
.
rpxScreenHeight
this
.
waterSetting
=
getApp
().
globalData
.
photo
.
waterSetting
this
.
waterSetting
=
globalData
.
photo
.
waterSetting
if
(
this
.
shadowInitShow
){
this
.
standardShow
=
true
}
// this.cameraHeight = globalData.rpxScreenHeight
// this.cameraHeight = globalData.rpxScreenHeight
},
},
baiduLocation
()
{
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