Commit d15d7909 authored by 李俊赕's avatar 李俊赕

Merge branch 'dev-photo-v2' of https://git.banshouhui.com/heyinchen/take_order into dev-photo-v2

parents bfa7d813 cede1f71
......@@ -22,6 +22,8 @@ const db = uniCloud.database({
/* 查询有数据的系统 或者 品牌 数据 {"classify_id":"","system_id":"","field":"system_id|brand_id"}*/
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":""} */
let getGroupStandardV2 = async (params = {}) => await uniCloud.callFunction({name: 'getGroupStandardV2', data: params});
......@@ -42,6 +44,7 @@ const db = uniCloud.database({
// 新接口
getClassifyDictionary,
getRelationDictionary,
getRelationDictionaryV2,
getGroupStandardV2,
saveImage,
getUserWatermark,
......
......@@ -26,6 +26,15 @@ exports.main = async (event, context) => {
.done(),
as: 'imageList'
}).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
const map = new Map()
for (let i = 0; i < data.length; i++) {
......@@ -38,6 +47,7 @@ exports.main = async (event, context) => {
data[i].images = data[i].images.split(",")
map.set(key, {
type: key,
userWatermark: userWatermarkData,
list: [data[i]]
})
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment