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
d15d7909
Commit
d15d7909
authored
Mar 26, 2021
by
李俊赕
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev-photo-v2' of
https://git.banshouhui.com/heyinchen/take_order
into dev-photo-v2
parents
bfa7d813
cede1f71
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
0 deletions
+13
-0
cloud_rules.js
take-order/common/api/cloud_rules.js
+3
-0
index.js
...r/uniCloud-tcb/cloudfunctions/getGroupStandardV2/index.js
+10
-0
No files found.
take-order/common/api/cloud_rules.js
View file @
d15d7909
...
@@ -22,6 +22,8 @@ const db = uniCloud.database({
...
@@ -22,6 +22,8 @@ const db = uniCloud.database({
/* 查询有数据的系统 或者 品牌 数据 {"classify_id":"","system_id":"","field":"system_id|brand_id"}*/
/* 查询有数据的系统 或者 品牌 数据 {"classify_id":"","system_id":"","field":"system_id|brand_id"}*/
let
getRelationDictionary
=
async
(
params
=
{})
=>
await
uniCloud
.
callFunction
({
name
:
'getRelationDictionary'
,
data
:
params
});
let
getRelationDictionary
=
async
(
params
=
{})
=>
await
uniCloud
.
callFunction
({
name
:
'getRelationDictionary'
,
data
:
params
});
let
getRelationDictionaryV2
=
async
()
=>
await
uniCloud
.
callFunction
({
name
:
'getRelationDictionaryV2'
});
/* 查询规范 根据 分类、系统、品牌 {"token":"", "classify_id":"","system_id":"","brand_id":""} */
/* 查询规范 根据 分类、系统、品牌 {"token":"", "classify_id":"","system_id":"","brand_id":""} */
let
getGroupStandardV2
=
async
(
params
=
{})
=>
await
uniCloud
.
callFunction
({
name
:
'getGroupStandardV2'
,
data
:
params
});
let
getGroupStandardV2
=
async
(
params
=
{})
=>
await
uniCloud
.
callFunction
({
name
:
'getGroupStandardV2'
,
data
:
params
});
...
@@ -42,6 +44,7 @@ const db = uniCloud.database({
...
@@ -42,6 +44,7 @@ const db = uniCloud.database({
// 新接口
// 新接口
getClassifyDictionary
,
getClassifyDictionary
,
getRelationDictionary
,
getRelationDictionary
,
getRelationDictionaryV2
,
getGroupStandardV2
,
getGroupStandardV2
,
saveImage
,
saveImage
,
getUserWatermark
,
getUserWatermark
,
...
...
take-order/uniCloud-tcb/cloudfunctions/getGroupStandardV2/index.js
View file @
d15d7909
...
@@ -26,6 +26,15 @@ exports.main = async (event, context) => {
...
@@ -26,6 +26,15 @@ exports.main = async (event, context) => {
.
done
(),
.
done
(),
as
:
'imageList'
as
:
'imageList'
}).
end
()
}).
end
()
const
watermarkC
=
uniCloud
.
database
().
collection
(
"user_watermark"
).
field
({
'_id'
:
false
})
let
userWatermark
=
await
watermarkC
.
where
({
user_id
:
user_id
,
system_id
:
event
.
system_id
}).
get
()
if
(
!
userWatermark
.
data
||
userWatermark
.
data
.
length
<=
0
)
{
// 用户没有 获取模板
userWatermark
=
await
watermarkC
.
where
({
system_id
:
event
.
system_id
}).
get
()
}
let
userWatermarkData
=
userWatermark
.
data
[
0
]
let
data
=
res
.
data
let
data
=
res
.
data
const
map
=
new
Map
()
const
map
=
new
Map
()
for
(
let
i
=
0
;
i
<
data
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
data
.
length
;
i
++
)
{
...
@@ -38,6 +47,7 @@ exports.main = async (event, context) => {
...
@@ -38,6 +47,7 @@ exports.main = async (event, context) => {
data
[
i
].
images
=
data
[
i
].
images
.
split
(
","
)
data
[
i
].
images
=
data
[
i
].
images
.
split
(
","
)
map
.
set
(
key
,
{
map
.
set
(
key
,
{
type
:
key
,
type
:
key
,
userWatermark
:
userWatermarkData
,
list
:
[
data
[
i
]]
list
:
[
data
[
i
]]
})
})
}
}
...
...
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