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
5f986d5b
Commit
5f986d5b
authored
Mar 29, 2021
by
李超鹏
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev-photo-v2' into dev-photo-v2
parents
47da2742
69f776e3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
list.vue
take-order/pages/photo/list.vue
+3
-3
setting.vue
take-order/pages/photo/setting.vue
+6
-1
No files found.
take-order/pages/photo/list.vue
View file @
5f986d5b
take-order/pages/photo/setting.vue
View file @
5f986d5b
...
@@ -131,6 +131,11 @@
...
@@ -131,6 +131,11 @@
'watermark'
:
this
.
result
'watermark'
:
this
.
result
}).
then
(
res
=>
{
}).
then
(
res
=>
{
console
.
log
(
res
)
console
.
log
(
res
)
if
(
res
.
result
==
true
)
{
const
photo
=
getApp
().
globalData
.
photo
photo
.
waterSetting
=
this
.
result
}
this
.
$nextTick
(
function
()
{
this
.
$nextTick
(
function
()
{
uni
.
hideLoading
();
uni
.
hideLoading
();
})
})
...
...
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