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
d19ab5f5
Commit
d19ab5f5
authored
Mar 29, 2021
by
李超鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复云函数问题
parent
dde5b61d
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
73 additions
and
37 deletions
+73
-37
index.js
...r/uniCloud-tcb/cloudfunctions/common/user-common/index.js
+2
-1
getGroupStandardV2.param.json
...unctions/getGroupStandardV2/getGroupStandardV2.param.json
+10
-0
index.js
...r/uniCloud-tcb/cloudfunctions/getGroupStandardV2/index.js
+1
-1
getUserWatermark.param.json
...oudfunctions/getUserWatermark/getUserWatermark.param.json
+1
-1
index.js
...der/uniCloud-tcb/cloudfunctions/getUserWatermark/index.js
+1
-1
index.js
take-order/uniCloud-tcb/cloudfunctions/saveImage/index.js
+1
-1
index.js
...er/uniCloud-tcb/cloudfunctions/saveUserWatermark/index.js
+2
-2
saveUserWatermark.param.json
...dfunctions/saveUserWatermark/saveUserWatermark.param.json
+1
-1
db_init.json
take-order/uniCloud-tcb/database/db_init.json
+54
-29
No files found.
take-order/uniCloud-tcb/cloudfunctions/common/user-common/index.js
View file @
d19ab5f5
...
@@ -3,7 +3,8 @@ async function getUserId(token) {
...
@@ -3,7 +3,8 @@ async function getUserId(token) {
"/myinfo/id"
,
{
"/myinfo/id"
,
{
method
:
'GET'
method
:
'GET'
})
})
return
res
?
res
.
data
:
""
console
.
log
(
res
.
data
)
return
res
&&
res
.
status
===
'200'
?
res
.
data
:
token
}
}
module
.
exports
=
{
module
.
exports
=
{
...
...
take-order/uniCloud-tcb/cloudfunctions/getGroupStandardV2/getGroupStandardV2.param.json
0 → 100644
View file @
d19ab5f5
//
本文件中的json内容将在云函数【运行】时作为参数传给云函数。
//
配置教程参考:https
:
//uniapp.dcloud.net.cn/uniCloud/quickstart?id=runparam
{
"token"
:
""
,
"classify_id"
:
"79550af260555cc20afb34146966a2c4"
,
"system_id"
:
"79550af260555cc20afb34156c94b32c"
,
"brand_id"
:
"79550af260555cc20afb3417731a827c"
}
take-order/uniCloud-tcb/cloudfunctions/getGroupStandardV2/index.js
View file @
d19ab5f5
...
@@ -6,7 +6,7 @@ exports.main = async (event, context) => {
...
@@ -6,7 +6,7 @@ exports.main = async (event, context) => {
const
db
=
uniCloud
.
database
();
const
db
=
uniCloud
.
database
();
const
_
=
db
.
command
const
_
=
db
.
command
const
$
=
db
.
command
.
aggregate
const
$
=
db
.
command
.
aggregate
const
user_id
=
getUserId
(
event
.
token
)
const
user_id
=
await
getUserId
(
event
.
token
)
let
res
=
await
db
.
collection
(
"standardV2"
).
aggregate
().
lookup
({
let
res
=
await
db
.
collection
(
"standardV2"
).
aggregate
().
lookup
({
from
:
'user_upload_file'
,
from
:
'user_upload_file'
,
let
:
{
let
:
{
...
...
take-order/uniCloud-tcb/cloudfunctions/getUserWatermark/getUserWatermark.param.json
View file @
d19ab5f5
...
@@ -3,6 +3,6 @@
...
@@ -3,6 +3,6 @@
//
配置教程参考:https
:
//uniapp.dcloud.net.cn/uniCloud/quickstart?id=runparam
//
配置教程参考:https
:
//uniapp.dcloud.net.cn/uniCloud/quickstart?id=runparam
{
{
"token"
:
""
"token"
:
"
666666666666
"
"system_id"
:
"79550af260555cc20afb34156c94b32c"
"system_id"
:
"79550af260555cc20afb34156c94b32c"
}
}
take-order/uniCloud-tcb/cloudfunctions/getUserWatermark/index.js
View file @
d19ab5f5
...
@@ -4,7 +4,7 @@ const {
...
@@ -4,7 +4,7 @@ const {
}
=
require
(
'user-common'
)
}
=
require
(
'user-common'
)
exports
.
main
=
async
(
event
,
context
)
=>
{
exports
.
main
=
async
(
event
,
context
)
=>
{
//event为客户端上传的参数
//event为客户端上传的参数
const
user_id
=
getUserId
(
event
.
token
)
const
user_id
=
await
getUserId
(
event
.
token
)
const
collection
=
uniCloud
.
database
().
collection
(
"user_watermark"
).
field
({
const
collection
=
uniCloud
.
database
().
collection
(
"user_watermark"
).
field
({
'_id'
:
false
'_id'
:
false
})
})
...
...
take-order/uniCloud-tcb/cloudfunctions/saveImage/index.js
View file @
d19ab5f5
...
@@ -4,7 +4,7 @@ const {
...
@@ -4,7 +4,7 @@ const {
}
=
require
(
'user-common'
)
}
=
require
(
'user-common'
)
exports
.
main
=
async
(
event
,
context
)
=>
{
exports
.
main
=
async
(
event
,
context
)
=>
{
//event为客户端上传的参数
//event为客户端上传的参数
let
workerId
=
getUserId
(
event
.
token
)
let
workerId
=
await
getUserId
(
event
.
token
)
if
(
workerId
)
{
if
(
workerId
)
{
await
uniCloud
.
database
().
collection
(
"user_upload_file"
).
add
({
await
uniCloud
.
database
().
collection
(
"user_upload_file"
).
add
({
"user_id"
:
workerId
,
"user_id"
:
workerId
,
...
...
take-order/uniCloud-tcb/cloudfunctions/saveUserWatermark/index.js
View file @
d19ab5f5
...
@@ -4,9 +4,9 @@ const {
...
@@ -4,9 +4,9 @@ const {
}
=
require
(
'user-common'
)
}
=
require
(
'user-common'
)
exports
.
main
=
async
(
event
,
context
)
=>
{
exports
.
main
=
async
(
event
,
context
)
=>
{
let
user_id
=
getUserId
(
event
.
token
)
let
user_id
=
await
getUserId
(
event
.
token
)
console
.
log
(
user_id
);
const
watermark
=
event
.
watermark
const
watermark
=
event
.
watermark
user_id
=
'12312313'
if
(
user_id
)
{
if
(
user_id
)
{
watermark
.
user_id
=
user_id
watermark
.
user_id
=
user_id
const
collection
=
uniCloud
.
database
().
collection
(
"user_watermark"
);
const
collection
=
uniCloud
.
database
().
collection
(
"user_watermark"
);
...
...
take-order/uniCloud-tcb/cloudfunctions/saveUserWatermark/saveUserWatermark.param.json
View file @
d19ab5f5
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
//
配置教程参考:https
:
//uniapp.dcloud.net.cn/uniCloud/quickstart?id=runparam
//
配置教程参考:https
:
//uniapp.dcloud.net.cn/uniCloud/quickstart?id=runparam
{
{
"token"
:
"
12312313
"
,
"token"
:
"
666666666666
"
,
"watermark"
:
{
"watermark"
:
{
"has_origin"
:
true
,
"has_origin"
:
true
,
"lower_right"
:
{
"lower_right"
:
{
...
...
take-order/uniCloud-tcb/database/db_init.json
View file @
d19ab5f5
...
@@ -200,43 +200,51 @@
...
@@ -200,43 +200,51 @@
"has_origin"
:
true
,
"has_origin"
:
true
,
"mid_text"
:
"现场拍照"
,
"mid_text"
:
"现场拍照"
,
"lower_right"
:
{
"lower_right"
:
{
"title_text"
:
""
,
"body"
:
[{
"body"
:
[{
"watemark_type"
:
"时间"
,
"watemark_type"
:
"时间"
,
"watemark_text"
:
"时间"
,
"watemark_text"
:
"时间"
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
true
},
{
},
{
"watemark_type"
:
"地址"
,
"watemark_type"
:
"地址"
,
"watemark_text"
:
"地址"
,
"watemark_text"
:
"地址"
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
true
},
{
},
{
"watemark_type"
:
"经度"
,
"watemark_type"
:
"经度"
,
"watemark_text"
:
"经度"
,
"watemark_text"
:
"经度"
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
true
},
{
},
{
"watemark_type"
:
"纬度"
,
"watemark_type"
:
"纬度"
,
"watemark_text"
:
"纬度"
,
"watemark_text"
:
"纬度"
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
true
},
{
},
{
"watemark_type"
:
"备注"
,
"watemark_type"
:
"备注"
,
"watemark_text"
:
""
,
"watemark_text"
:
""
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
false
},
{
},
{
"watemark_type"
:
"备注"
,
"watemark_type"
:
"备注"
,
"watemark_text"
:
""
,
"watemark_text"
:
""
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
false
},
{
},
{
"watemark_type"
:
"备注"
,
"watemark_type"
:
"备注"
,
"watemark_text"
:
""
,
"watemark_text"
:
""
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
false
},
{
},
{
"watemark_type"
:
"备注"
,
"watemark_type"
:
"备注"
,
"watemark_text"
:
""
,
"watemark_text"
:
""
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
false
},
{
},
{
"watemark_type"
:
"备注"
,
"watemark_type"
:
"备注"
,
"watemark_text"
:
""
,
"watemark_text"
:
""
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
false
}]
}]
}
}
},
{
},
{
...
@@ -245,43 +253,51 @@
...
@@ -245,43 +253,51 @@
"has_origin"
:
true
,
"has_origin"
:
true
,
"mid_text"
:
"现场拍照"
,
"mid_text"
:
"现场拍照"
,
"lower_right"
:
{
"lower_right"
:
{
"title_text"
:
""
,
"body"
:
[{
"body"
:
[{
"watemark_type"
:
"时间"
,
"watemark_type"
:
"时间"
,
"watemark_text"
:
"时间"
,
"watemark_text"
:
"时间"
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
true
},
{
},
{
"watemark_type"
:
"地址"
,
"watemark_type"
:
"地址"
,
"watemark_text"
:
"地址"
,
"watemark_text"
:
"地址"
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
true
},
{
},
{
"watemark_type"
:
"经度"
,
"watemark_type"
:
"经度"
,
"watemark_text"
:
"经度"
,
"watemark_text"
:
"经度"
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
true
},
{
},
{
"watemark_type"
:
"纬度"
,
"watemark_type"
:
"纬度"
,
"watemark_text"
:
"纬度"
,
"watemark_text"
:
"纬度"
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
true
},
{
},
{
"watemark_type"
:
"备注"
,
"watemark_type"
:
"备注"
,
"watemark_text"
:
""
,
"watemark_text"
:
""
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
false
},
{
},
{
"watemark_type"
:
"备注"
,
"watemark_type"
:
"备注"
,
"watemark_text"
:
""
,
"watemark_text"
:
""
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
false
},
{
},
{
"watemark_type"
:
"备注"
,
"watemark_type"
:
"备注"
,
"watemark_text"
:
""
,
"watemark_text"
:
""
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
false
},
{
},
{
"watemark_type"
:
"备注"
,
"watemark_type"
:
"备注"
,
"watemark_text"
:
""
,
"watemark_text"
:
""
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
false
},
{
},
{
"watemark_type"
:
"备注"
,
"watemark_type"
:
"备注"
,
"watemark_text"
:
""
,
"watemark_text"
:
""
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
false
}]
}]
}
}
},
{
},
{
...
@@ -294,39 +310,48 @@
...
@@ -294,39 +310,48 @@
"body"
:
[{
"body"
:
[{
"watemark_type"
:
"时间"
,
"watemark_type"
:
"时间"
,
"watemark_text"
:
"时间"
,
"watemark_text"
:
"时间"
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
true
},
{
},
{
"watemark_type"
:
"地址"
,
"watemark_type"
:
"地址"
,
"watemark_text"
:
"地址"
,
"watemark_text"
:
"地址"
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
true
},
{
},
{
"watemark_type"
:
"经度"
,
"watemark_type"
:
"经度"
,
"watemark_text"
:
"经度"
,
"watemark_text"
:
"经度"
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
true
},
{
},
{
"watemark_type"
:
"纬度"
,
"watemark_type"
:
"纬度"
,
"watemark_text"
:
"纬度"
,
"watemark_text"
:
"纬度"
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
true
},
{
},
{
"watemark_type"
:
"备注"
,
"watemark_type"
:
"备注"
,
"watemark_text"
:
""
,
"watemark_text"
:
""
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
false
},
{
},
{
"watemark_type"
:
"备注"
,
"watemark_type"
:
"备注"
,
"watemark_text"
:
""
,
"watemark_text"
:
""
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
false
},
{
},
{
"watemark_type"
:
"备注"
,
"watemark_type"
:
"备注"
,
"watemark_text"
:
""
,
"watemark_text"
:
""
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
false
},
{
},
{
"watemark_type"
:
"备注"
,
"watemark_type"
:
"备注"
,
"watemark_text"
:
""
,
"watemark_text"
:
""
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
false
},
{
},
{
"watemark_type"
:
"备注"
,
"watemark_type"
:
"备注"
,
"watemark_text"
:
""
,
"watemark_text"
:
""
,
"watemark_value"
:
""
"watemark_value"
:
""
,
"enable"
:
false
}]
}]
}
}
}
}
...
...
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