Merge branch 'dev-photo-v2'

take-order/common/api/cloud_rules.js

@@ -35,6 +35,10 @@ const db = uniCloud.database({
 	
 	/* 保存用户水印配置  {"token":"", "watermark": getUserWatemark返回的数据} */
 	let saveUserWatermark =  async (params = {}) => await uniCloud.callFunction({name: 'saveUserWatermark', data: params});
+	
+	/* 清空用户之前的图片 {"token":""} */
+	let cleanImage =  async (params = {}) => await uniCloud.callFunction({name: 'cleanImage', data: params});
+	
  	
  	const rulesApi = {
 		getAllProduct,
@@ -48,7 +52,8 @@ const db = uniCloud.database({
 		getGroupStandardV2,
 		saveImage,
 		getUserWatermark,
-		saveUserWatermark
+		saveUserWatermark,
+		cleanImage
  	}
  	return rulesApi
  }

take-order/uniCloud-tcb/cloudfunctions/cleanImage/cleanImage.param.json

 // 本文件中的json内容将在云函数【运行】时作为参数传给云函数。
 // 配置教程参考：https://uniapp.dcloud.net.cn/uniCloud/quickstart?id=runparam
-{"token":""
+{"token":"RTOKEN76ff64591f22ed633cbeb4ec55baee70f5343e8e"
 }
\ No newline at end of file

take-order/uniCloud-tcb/cloudfunctions/cleanImage/index.js

@@ -3,7 +3,7 @@ const {
 	getUserId
 } = require('user-common')
 exports.main = async (event, context) => {
-	let userId = getUserId(event.token)
+	let userId = await getUserId(event.token)
 	let result = {code: false, msg: "用户没有权限"}
 	if (userId) {
 		let res = await uniCloud.database().collection("user_upload_file").where({

take-order/uniCloud-tcb/cloudfunctions/cleanImage/package-lock.json

+{
+	"name": "cleanImage",
+	"version": "1.0.0",
+	"lockfileVersion": 1,
+	"requires": true,
+	"dependencies": {
+		"user-common": {
+			"version": "file:../common/user-common"
+		}
+	}
+}

take-order/uniCloud-tcb/cloudfunctions/cleanImage/package.json

+{
+	"name": "cleanImage",
+	"version": "1.0.0",
+	"description": "",
+	"main": "index.js",
+	"scripts": {
+		"test": "echo \"Error: no test specified\" && exit 1"
+	},
+	"author": "",
+	"license": "ISC",
+	"dependencies": {
+		"user-common": "file:../common/user-common"
+	}
+}