调整分享部分方法,修改点餐页分享
This commit is contained in:
@@ -62,7 +62,42 @@ export function wxShare(par) {
|
||||
}
|
||||
}
|
||||
|
||||
export async function returnQuery(query) {
|
||||
export async function returnCommonQuery() {
|
||||
const shopId = uni.cache.get('shopId')
|
||||
const shopUserInfo = uni.cache.get('shopUserInfo')
|
||||
const shopInfo = uni.cache.get('shopInfo')
|
||||
const inviteCode = await autoGetInviteCode({
|
||||
shopId: shopId,
|
||||
shopUserId: shopUserInfo.id
|
||||
})
|
||||
|
||||
const queryJson = {
|
||||
inviteCode: (inviteCode && inviteCode !== true) ? inviteCode : null,
|
||||
shopId,
|
||||
shopUserId: shopUserInfo.id,
|
||||
}
|
||||
return Promise.resolve(queryJson)
|
||||
}
|
||||
|
||||
export function jsonToUrl(json) {
|
||||
let result = ''
|
||||
for (let key in json) {
|
||||
if (json[key]) {
|
||||
if (result === '') {
|
||||
result += `${key}=${json[key]}`
|
||||
} else {
|
||||
result += `&${key}=${json[key]}`
|
||||
}
|
||||
}
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {Object} query 参数对象
|
||||
* @param {Array} showkeys 需要显示的key不包括公共参数
|
||||
*/
|
||||
export async function returnQuery(query, showkeys) {
|
||||
|
||||
|
||||
const shopId = uni.cache.get('shopId')
|
||||
@@ -88,7 +123,11 @@ export async function returnQuery(query) {
|
||||
}
|
||||
for (const key in currentOptions) {
|
||||
if (currentOptions.hasOwnProperty(key)) {
|
||||
queryJson[key] = encodeURIComponent(currentOptions[key])
|
||||
if (showkeys && Array.isArray(showkeys) && showkeys.includes(key)) {
|
||||
queryJson[key] = encodeURIComponent(currentOptions[key])
|
||||
} else {
|
||||
queryJson[key] = encodeURIComponent(currentOptions[key])
|
||||
}
|
||||
}
|
||||
}
|
||||
queryJson.shopId = shopId
|
||||
@@ -105,7 +144,7 @@ export async function returnQuery(query) {
|
||||
}
|
||||
}
|
||||
}
|
||||
return result
|
||||
return Promise.resolve(result)
|
||||
}
|
||||
|
||||
function parseQueryString(queryString) {
|
||||
@@ -211,7 +250,7 @@ export const shareMixin = {
|
||||
// queryJson.inviteCode = (inviteCode && inviteCode !== true) ? inviteCode : null
|
||||
// queryJson.shopUserId = shopUserInfo.id
|
||||
|
||||
const query = returnQuery()
|
||||
const query =await returnQuery()
|
||||
|
||||
|
||||
// 全局默认配置(可被页面覆盖)
|
||||
@@ -279,7 +318,7 @@ export const shareMixin = {
|
||||
// queryJson.inviteCode = (inviteCode && inviteCode !== true) ? inviteCode : null
|
||||
// queryJson.shopUserId = shopUserInfo.id
|
||||
|
||||
const query = returnQuery()
|
||||
const query = await returnQuery()
|
||||
|
||||
const defaultTimelineConfig = {
|
||||
title: shopInfo.shopName,
|
||||
|
||||
Reference in New Issue
Block a user