feat(promotion): 添加装修模板类型参数支持
- 为 getUsedDiyTemplate 方法添加 type 参数 - 在平台模块中新增 uniPlatform 属性获取 - 重构装修模板适配逻辑以支持平台类型区分 - 更新请求参数传递方式以包含平台类型信息pull/174/head
parent
a5aae8480b
commit
db95ed1a90
|
|
@ -1,10 +1,13 @@
|
||||||
import request from '@/sheep/request';
|
import request from '@/sheep/request';
|
||||||
|
|
||||||
const DiyApi = {
|
const DiyApi = {
|
||||||
getUsedDiyTemplate: () => {
|
getUsedDiyTemplate: (type) => {
|
||||||
return request({
|
return request({
|
||||||
url: '/promotion/diy-template/used',
|
url: '/promotion/diy-template/used',
|
||||||
method: 'GET',
|
method: 'GET',
|
||||||
|
params: {
|
||||||
|
type
|
||||||
|
},
|
||||||
custom: {
|
custom: {
|
||||||
showError: false,
|
showError: false,
|
||||||
showLoading: false,
|
showLoading: false,
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,9 @@ const device = uni.getWindowInfo();
|
||||||
|
|
||||||
const os = uni.getDeviceInfo().platform;
|
const os = uni.getDeviceInfo().platform;
|
||||||
|
|
||||||
|
const uniSystemInfo= uni.getSystemInfoSync();
|
||||||
|
const uniPlatform = uniSystemInfo?.uniPlatform ?? 'default';
|
||||||
|
|
||||||
let name = '';
|
let name = '';
|
||||||
let provider = '';
|
let provider = '';
|
||||||
let platform = '';
|
let platform = '';
|
||||||
|
|
@ -54,7 +57,7 @@ platform = 'miniProgram';
|
||||||
provider = 'wechat';
|
provider = 'wechat';
|
||||||
// #endif
|
// #endif
|
||||||
|
|
||||||
// #ifdef MP-ALIPAY
|
// #ifdef MP-ALIPAY
|
||||||
name = 'alipayMiniProgram';
|
name = 'alipayMiniProgram';
|
||||||
platform = 'alipayMiniProgram';
|
platform = 'alipayMiniProgram';
|
||||||
provider = 'alipay';
|
provider = 'alipay';
|
||||||
|
|
@ -177,6 +180,7 @@ const _platform = {
|
||||||
os,
|
os,
|
||||||
provider,
|
provider,
|
||||||
platform,
|
platform,
|
||||||
|
uniPlatform,
|
||||||
useProvider,
|
useProvider,
|
||||||
checkUpdate,
|
checkUpdate,
|
||||||
checkNetwork,
|
checkNetwork,
|
||||||
|
|
|
||||||
|
|
@ -182,10 +182,11 @@ const adaptTenant = async () => {
|
||||||
|
|
||||||
/** 初始化装修模版 */
|
/** 初始化装修模版 */
|
||||||
const adaptTemplate = async (appTemplate, templateId) => {
|
const adaptTemplate = async (appTemplate, templateId) => {
|
||||||
|
let type = $platform.uniPlatform;
|
||||||
const { data: diyTemplate } = templateId
|
const { data: diyTemplate } = templateId
|
||||||
? // 查询指定模板,一般是预览时使用
|
? // 查询指定模板,一般是预览时使用
|
||||||
await DiyApi.getDiyTemplate(templateId)
|
await DiyApi.getDiyTemplate(templateId)
|
||||||
: await DiyApi.getUsedDiyTemplate();
|
: await DiyApi.getUsedDiyTemplate(type);
|
||||||
// 模板不存在
|
// 模板不存在
|
||||||
if (!diyTemplate) {
|
if (!diyTemplate) {
|
||||||
$router.error('TemplateError');
|
$router.error('TemplateError');
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue