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

take-order/uniCloud-tcb/cloudfunctions/common/user-common/index.js

 async function getUserId(token) {
-	const res = await uniCloud.httpclient.request("https://system.banshouhui.com/wxh-worker-rest/rest/" + token +
+	const res = await uniCloud.httpclient.request("https://system.dev.banshouhui.com/wxh-worker-rest/rest/" +
+		token +
 		"/myinfo/id", {
-			method: 'GET'
+			method: 'GET',
+			dataType: 'text'
 		})
-	console.log(res.data)
-	return res && res.status === '200' ? res.data : token
+	return res && res.status === 200 ? res.data : token
 }
 
 module.exports = {

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

@@ -3,8 +3,8 @@
 // 配置教程参考：https://uniapp.dcloud.net.cn/uniCloud/quickstart?id=runparam
 
 {
-	"token": "",
+	"token": "RTOKENeb70458c5502c48838d5e4cf84900767fa010f00",
 	"classify_id": "79550af260555cc20afb34146966a2c4",
 	"system_id": "79550af260555cc20afb34156c94b32c",
-	"brand_id": "79550af260555cc20afb3417731a827c"
+	"brand_id": "28ee4e3e6063f2880d8956a013293a7f"
 }

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

@@ -25,7 +25,7 @@ exports.main = async (event, context) => {
 			})
 			.done(),
 		as: 'imageList'
-	}).match({"classify_id": event.classify_id, "system_id": event.system_id, "brand_id": event.brand_id}).end()
+	}).match({"classify_id": event.classify_id, "system_id": event.system_id, "brand_id": event.brand_id}).limit(100).end()
 	const watermarkC = uniCloud.database().collection("user_watermark").field({'_id': false})
 	let userWatermark = await watermarkC.where({
 		user_id: user_id,