Skip to content

飞
飞鹤小程序
Commit 09ff4637 authored by zhangchenchen's avatar zhangchenchen
Browse files
Options

feat: 鹤小飞资源位样式调整

parent 3d83a00b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 7214 additions and 6827 deletions
api/brand.js
View file @ 09ff4637
import requestModule from './request.js'; import requestModule from './request.js';
const { const { api } = requestModule;
api
} = requestModule;
export const fetchBrandJSON = (type = 'brand_V1') => api.get('/c/front/content', { type });
export const fetchBrandJSON = () => api.get('/c/front/content',{type:'brand_V1'});
\ No newline at end of file
api/home.js
View file @ 09ff4637
import requestModule from './request.js'; import requestModule from './request.js';
const { const { api } = requestModule;
api
} = requestModule;
/** /**
* 获取首页信息 * 获取首页信息
...@@ -9,11 +7,9 @@ const { ...@@ -9,11 +7,9 @@ const {
*/ */
export const fetchHomeInfo = () => api.get('/c/user/index'); export const fetchHomeInfo = () => api.get('/c/user/index');
export const fetchCanEatIndex = () => api.get('/c/eat/index'); export const fetchCanEatIndex = () => api.get('/c/eat/index');
export const fetchCanEatJoin = (data) => api.post('/c/eat/join', data); export const fetchCanEatJoin = (data) => api.post('/c/eat/join', data);
export const fetchHomeJSON = () => api.get('/c/front/content', { type: 'home_V1' }); export const fetchHomeJSON = (type = 'home_V1') => api.get('/c/front/content', { type });
export const fetchGameActConfigJSON = () => api.get('/c/front/content', { type: 'gameActConfig' }); export const fetchGameActConfigJSON = () => api.get('/c/front/content', { type: 'gameActConfig' });
api/integral.js
View file @ 09ff4637
import requestModule from './request.js'; import requestModule from './request.js';
const { const { api } = requestModule;
api
} = requestModule;
/** /**
* 获取积分信息 * 获取积分信息
* @returns * @returns
*/ */
export const fetchIntegralJSON = () => api.get('/c/front/content',{type:'integral_V1'}); export const fetchIntegralJSON = (type = 'integral_V1') => api.get('/c/front/content', { type });
/** /**
* 获取生日礼接口 * 获取生日礼接口
...@@ -35,7 +33,7 @@ export const getResourceList = () => api.get('/c/resource/list'); ...@@ -35,7 +33,7 @@ export const getResourceList = () => api.get('/c/resource/list');
export const getSigninAndTaskInfoJSON = () => api.get('/c/activity/todo/list'); export const getSigninAndTaskInfoJSON = () => api.get('/c/activity/todo/list');
//签到接口 //签到接口
export const checkInJSON = (activityId) => api.post('/c/activity/todo/checkIn', {activityId}); export const checkInJSON = (activityId) => api.post('/c/activity/todo/checkIn', { activityId });
//获取秒杀列表 //获取秒杀列表
export const getSeckillList = () => api.get('/c/seckill/list'); export const getSeckillList = () => api.get('/c/seckill/list');
...@@ -43,7 +41,7 @@ export const getSeckillList = () => api.get('/c/seckill/list'); ...@@ -43,7 +41,7 @@ export const getSeckillList = () => api.get('/c/seckill/list');
export const taskCompleteJSON = (activityId) => api.post('/c/activity/todo/complete', { activityId }); export const taskCompleteJSON = (activityId) => api.post('/c/activity/todo/complete', { activityId });
//获取异业券接口 //获取异业券接口
export const getPointsBenefitCouponJSON = () => api.get('/c/resource/pointsBenefit/coupon'); export const getPointsBenefitCouponJSON = (type) => api.get('/c/resource/pointsBenefit/coupon', { type });
//查询任务结果接口 //查询任务结果接口
export const queryTodoResultJSON = (activityId) => api.get('/c/activity/todo/queryTodoResult'); export const queryTodoResultJSON = (activityId) => api.get('/c/activity/todo/queryTodoResult');
...@@ -52,16 +50,18 @@ export const queryTodoResultJSON = (activityId) => api.get('/c/activity/todo/que ...@@ -52,16 +50,18 @@ export const queryTodoResultJSON = (activityId) => api.get('/c/activity/todo/que
export const getOriginInviteHomeJSON = () => api.get('/c/activity/origin_invite/home'); export const getOriginInviteHomeJSON = () => api.get('/c/activity/origin_invite/home');
//邀请助力接口 //邀请助力接口
export const assistInviteJSON = (invitationCode, wxUnionId) => api.post('/c/activity/origin_invite/assist', { export const assistInviteJSON = (invitationCode, wxUnionId) =>
invitationCode, api.post('/c/activity/origin_invite/assist', {
wxUnionId invitationCode,
}); wxUnionId,
});
//获取邀请记录列表接口 //获取邀请记录列表接口
export const getInvitationListJSON = () => api.get('/c/activity/origin_invite/invitationList'); export const getInvitationListJSON = () => api.get('/c/activity/origin_invite/invitationList');
//邀请绑定接口 //邀请绑定接口
export const originInviteBindJSON = (unionId, shareCode) => api.post('/c/api/activity/originInviteBind', { export const originInviteBindJSON = (unionId, shareCode) =>
unionId, api.post('/c/api/activity/originInviteBind', {
shareCode unionId,
}); shareCode,
});
api/user.js
View file @ 09ff4637
import requestModule from './request.js'; import requestModule from './request.js';
const { const { api } = requestModule;
api
} = requestModule;
/** /**
* 获取用户信息 * 获取用户信息
...@@ -22,9 +20,10 @@ export const getGestationalWeeks = (dueDate) => api.get('/c/user/calGestationalW ...@@ -22,9 +20,10 @@ export const getGestationalWeeks = (dueDate) => api.get('/c/user/calGestationalW
* @param {*} code * @param {*} code
* @returns * @returns
*/ */
export const autoLoginByCode = (code) => api.get('/c/login/autologin', { export const autoLoginByCode = (code) =>
code, api.get('/c/login/autologin', {
}); code,
});
/** /**
* 手机号授权，调用微信手机号快速验证组件，获取encryptedData、iv、code * 手机号授权，调用微信手机号快速验证组件，获取encryptedData、iv、code
...@@ -46,18 +45,13 @@ export const fetchMemberInfo = () => api.get('/c/user/memberInfo'); ...@@ -46,18 +45,13 @@ export const fetchMemberInfo = () => api.get('/c/user/memberInfo');
*/ */
export const updateBabyInfo = (data) => api.post('/c/user/saveBaby', data); export const updateBabyInfo = (data) => api.post('/c/user/saveBaby', data);
export const fetchUserJSON = () => api.get('/c/front/content', { type: 'my_V1' }); export const fetchUserJSON = (type = 'my_V1') => api.get('/c/front/content', { type });
/** 查询用户是否参与生育补贴和鹤礼2.0*/ /** 查询用户是否参与生育补贴和鹤礼2.0*/
export const checkParticipation = (data) => api.get('/c/fertility/index', data); export const checkParticipation = (data) => api.get('/c/fertility/index', data);
export const doTerminate = () => api.post('/c/user/terminate'); export const doTerminate = () => api.post('/c/user/terminate');
/** /**
* 获取积分兑换记录列表（分页） * 获取积分兑换记录列表（分页）
* @param {Object} params - 请求参数 * @param {Object} params - 请求参数
...@@ -66,12 +60,10 @@ export const doTerminate = () => api.post('/c/user/terminate'); ...@@ -66,12 +60,10 @@ export const doTerminate = () => api.post('/c/user/terminate');
*/ */
export const getExchangeList = (params = {}) => api.get('/c/user/exchange/list', { params }); export const getExchangeList = (params = {}) => api.get('/c/user/exchange/list', { params });
/** /**
* *
* @param {orderNo} data * @param {orderNo} data
* @returns * @returns
*/ */
export const getOrderDetail = (data) => api.get('/c/order/detail', data); export const getOrderDetail = (data) => api.get('/c/order/detail', data);
...@@ -80,4 +72,4 @@ export const getOrderDetail = (data) => api.get('/c/order/detail', data); ...@@ -80,4 +72,4 @@ export const getOrderDetail = (data) => api.get('/c/order/detail', data);
* @param {Object} data - 宝宝额外信息 * @param {Object} data - 宝宝额外信息
* @returns {Promise} 接口响应 * @returns {Promise} 接口响应
*/ */
export const saveBabyExtra = (data) => api.post('/c/user/saveBabyExtra', data); export const saveBabyExtra = (data) => api.post('/c/user/saveBabyExtra', data);
\ No newline at end of file
pages/index/index.vue
View file @ 09ff4637
This diff is collapsed.
stores/global.js
View file @ 09ff4637
import { import { defineStore } from 'pinia';
defineStore
} from 'pinia';
const cuk = uni.getStorageSync('cuk') const cuk = uni.getStorageSync('cuk');
const openId = uni.getStorageSync('openId') const openId = uni.getStorageSync('openId');
const unionId = uni.getStorageSync('unionId') const unionId = uni.getStorageSync('unionId');
export const useGlobalStore = defineStore('global', { export const useGlobalStore = defineStore('global', {
state: () => { state: () => {
return { return {
cuk: cuk, // 用户登录后获取的凭证，调用接口时headers中携带 cuk: cuk, // 用户登录后获取的凭证，调用接口时headers中携带
curTabIndex: 0, // 当前Tab索引 curTabIndex: 0, // 当前Tab索引
isWxFriendCircle:false, isWxFriendCircle: false,
isShowLoading: false, isShowLoading: false,
openId: openId, openId: openId,
unionId: unionId, unionId: unionId,
baseUrl: '', baseUrl: '',
isShowInvitePrizePanel: false, // 是否显示邀请奖品弹窗 isShowInvitePrizePanel: false, // 是否显示邀请奖品弹窗
isShowTaskComplete: false, // 是否显示任务完成弹窗 isShowTaskComplete: false, // 是否显示任务完成弹窗
taskCompletePoints: 100, // 任务完成获得的积分 taskCompletePoints: 100, // 任务完成获得的积分
taskCompleteTitle: 'xxx', // 任务完成的任务名称 taskCompleteTitle: 'xxx', // 任务完成的任务名称
isShowTaskPop: false, // 是否显示任务弹窗 isShowTaskPop: false, // 是否显示任务弹窗
isShowTaskPerson: false, // 是否显示任务信息弹窗 isShowTaskPerson: false, // 是否显示任务信息弹窗
taskTodo: [], // 任务数据 taskTodo: [], // 任务数据
invateUseType: '', // 邀请用户类型 invateUseType: '', // 邀请用户类型
}; previewScene: {}, // 预览场景
}, };
actions: { },
setBaseUrl(url){ actions: {
this.baseUrl = url setBaseUrl(url) {
}, this.baseUrl = url;
/** },
* 设置用户cuk /**
* @param {Object} cuk * 设置用户cuk
*/ * @param {Object} cuk
setCuk(cuk,openId,unionId) { */
this.cuk = cuk; setCuk(cuk, openId, unionId) {
this.openId = openId; this.cuk = cuk;
this.unionId = unionId; this.openId = openId;
uni.setStorageSync('openId', openId); this.unionId = unionId;
uni.setStorageSync('unionId', unionId); uni.setStorageSync('openId', openId);
uni.setStorageSync('cuk', cuk); uni.setStorageSync('unionId', unionId);
}, uni.setStorageSync('cuk', cuk);
/** },
* 设置当前Tab索引 /**
* @param {number} index * 设置当前Tab索引
*/ * @param {number} index
setCurTabIndex(index) { */
this.curTabIndex = index; setCurTabIndex(index) {
}, this.curTabIndex = index;
},
/**
* 设置当前是否是小程序朋友圈单页环境
* @param {boolean} v
*/
setIsWxFriendCircle(v){
this.isWxFriendCircle = v
},
setIsShowLoading(v){
this.isShowLoading = v
},
/**
* 显示任务完成弹窗
* @param {number} points 获得的积分
* @param {string} taskTitle 任务名称
*/
showTaskComplete(points = 100, taskTitle = 'xxx') {
this.taskCompletePoints = points;
this.taskCompleteTitle = taskTitle;
this.isShowTaskComplete = true;
},
/**
* 显示任务弹窗
* @param {Array} taskTodo 任务数据
*/
showTaskPop(taskTodo = []) {
this.taskTodo = taskTodo;
this.isShowTaskPop = true;
},
/**
* 关闭任务弹窗
*/
closeTaskPop() {
this.isShowTaskPop = false;
},
/**
* 显示任务信息弹窗
*/
showTaskPerson() {
this.isShowTaskPerson = true;
},
/**
* 关闭任务信息弹窗
*/
closeTaskPerson() {
this.isShowTaskPerson = false;
},
/** /**
* 清除认证信息（注销时使用） * 设置当前是否是小程序朋友圈单页环境
*/ * @param {boolean} v
// clearAuthData() { */
// this.cuk = null; setIsWxFriendCircle(v) {
// this.openId = null; this.isWxFriendCircle = v;
// this.unionId = null; },
// // 清除本地存储 setIsShowLoading(v) {
// uni.removeStorageSync('cuk'); this.isShowLoading = v;
// uni.removeStorageSync('openId'); },
// uni.removeStorageSync('unionId');
// }, /**
}, * 显示任务完成弹窗
}); * @param {number} points 获得的积分
\ No newline at end of file * @param {string} taskTitle 任务名称
*/
showTaskComplete(points = 100, taskTitle = 'xxx') {
this.taskCompletePoints = points;
this.taskCompleteTitle = taskTitle;
this.isShowTaskComplete = true;
},
/**
* 显示任务弹窗
* @param {Array} taskTodo 任务数据
*/
showTaskPop(taskTodo = []) {
this.taskTodo = taskTodo;
this.isShowTaskPop = true;
},
/**
* 关闭任务弹窗
*/
closeTaskPop() {
this.isShowTaskPop = false;
},
/**
* 显示任务信息弹窗
*/
showTaskPerson() {
this.isShowTaskPerson = true;
},
/**
* 关闭任务信息弹窗
*/
closeTaskPerson() {
this.isShowTaskPerson = false;
},
/**
* 设置预览场景
* @param {*} page 页面名称，例如'home'、'brand'、'integral'、'my'
* @param {*} sceneValue 场景值，以页面名称开头，例如'home_1069'、'brand_1154'
*/
setPreviewScene(page, sceneValue) {
this.previewScene = {
[page]: sceneValue,
};
},
/**
* 获取预览场景
* @param {*} page 页面名称，例如'home'、'brand'、'integral'、'my'
* @returns 场景值，以页面名称开头，例如'home_1069'、'brand_1154'
*/
getPreviewScene(page) {
return this.previewScene[page];
},
/**
* 清除认证信息（注销时使用）
*/
// clearAuthData() {
// this.cuk = null;
// this.openId = null;
// this.unionId = null;
// // 清除本地存储
// uni.removeStorageSync('cuk');
// uni.removeStorageSync('openId');
// uni.removeStorageSync('unionId');
// },
},
});
stores/integral.js
View file @ 09ff4637
import { defineStore } from "pinia"; import { defineStore } from 'pinia';
import { getSigninAndTaskInfoJSON, checkInJSON, getSeckillList, getPointsBenefitCouponJSON, queryTodoResultJSON, getOriginInviteHomeJSON, assistInviteJSON, getInvitationListJSON, originInviteBindJSON } from "../api/integral"; import {
getSigninAndTaskInfoJSON,
checkInJSON,
getSeckillList,
getPointsBenefitCouponJSON,
queryTodoResultJSON,
getOriginInviteHomeJSON,
assistInviteJSON,
getInvitationListJSON,
originInviteBindJSON,
} from '../api/integral';
import signinAndTaskInfoMock from '../mock/getSigninAndTaskInMock.json'; import signinAndTaskInfoMock from '../mock/getSigninAndTaskInMock.json';
import checkInMock from '../mock/checkIndata.json'; import checkInMock from '../mock/checkIndata.json';
import pointsBenefitCouponMock from '../mock/pointsBenefitCoupon.json'; import pointsBenefitCouponMock from '../mock/pointsBenefitCoupon.json';
...@@ -7,7 +17,7 @@ import queryTodoResultMock from '../mock/queryTodoResult.json'; ...@@ -7,7 +17,7 @@ import queryTodoResultMock from '../mock/queryTodoResult.json';
import originInviteHomeMock from '../mock/originInviteHome.json'; import originInviteHomeMock from '../mock/originInviteHome.json';
import assistInviteMock from '../mock/assistInvite.json'; import assistInviteMock from '../mock/assistInvite.json';
import invitationListMock from '../mock/invitationList.json'; import invitationListMock from '../mock/invitationList.json';
export const useIntegralStore = defineStore("integral", { export const useIntegralStore = defineStore('integral', {
state: () => { state: () => {
return { return {
_signinAndTaskInfo: null, _signinAndTaskInfo: null,
...@@ -23,122 +33,139 @@ export const useIntegralStore = defineStore("integral", { ...@@ -23,122 +33,139 @@ export const useIntegralStore = defineStore("integral", {
}, },
actions: { actions: {
async getSigninAndTaskInfo(isdebug = false) { async getSigninAndTaskInfo(isdebug = false) {
if(isdebug) { if (isdebug) {
this._signinAndTaskInfo = signinAndTaskInfoMock; this._signinAndTaskInfo = signinAndTaskInfoMock;
return signinAndTaskInfoMock; return signinAndTaskInfoMock;
}else{ } else {
const res = await getSigninAndTaskInfoJSON(); const res = await getSigninAndTaskInfoJSON();
this._signinAndTaskInfo = res; this._signinAndTaskInfo = res;
return res; return res;
} }
}, },
async checkIn(activityId,isdebug = false) { async checkIn(activityId, isdebug = false) {
// if(isdebug) { // if(isdebug) {
// this._checkInData = checkInMock; // 存储到state中 // this._checkInData = checkInMock; // 存储到state中
// return checkInMock; // return checkInMock;
// }else{ // }else{
const res = await checkInJSON(activityId); const res = await checkInJSON(activityId);
this._checkInData = res; // 存储到state中 this._checkInData = res; // 存储到state中
return res; return res;
// } // }
}, },
async getSeckillData(isdebug = false) { async getSeckillData(isdebug = false) {
// if(isdebug) { // if(isdebug) {
// // 使用模拟数据结构 // // 使用模拟数据结构
// const mockSeckillData = { // const mockSeckillData = {
// sessions: [ // sessions: [
// { // {
// id: 1, // id: 1,
// status: 'ongoing', // status: 'ongoing',
// countdown: '01:58:59', // countdown: '01:58:59',
// timeTags: ['正在秒杀', '18:00开始', '20:00结束'], // timeTags: ['正在秒杀', '18:00开始', '20:00结束'],
// goods: [ // goods: [
// { // {
// id: 'good1', // id: 'good1',
// name: '商品名称商品名称商称商品名称商称商品名称商称商品名称商品...', // name: '商品名称商品名称商称商品名称商称商品名称商称商品名称商品...',
// points: 100, // points: 100,
// originalPoints: 500, // originalPoints: 500,
// image: '' // image: ''
// } // }
// ] // ]
// } // }
// ] // ]
// }; // };
// this._seckillData = mockSeckillData; // this._seckillData = mockSeckillData;
// return mockSeckillData; // return mockSeckillData;
// } else { // } else {
const res = await getSeckillList(); const res = await getSeckillList();
this._seckillData = res; this._seckillData = res;
return res; return res;
// } // }
}, },
async getPointsBenefitCoupon(isdebug = false) { async getPointsBenefitCoupon(type) {
// if(isdebug) { // if(isdebug) {
// this._pointsBenefitCoupon = pointsBenefitCouponMock; // this._pointsBenefitCoupon = pointsBenefitCouponMock;
// return pointsBenefitCouponMock; // return pointsBenefitCouponMock;
// }else{ // }else{
const res = await getPointsBenefitCouponJSON(); const res = await getPointsBenefitCouponJSON(type);
this._pointsBenefitCoupon = res; this._pointsBenefitCoupon = res;
return res; return res;
// } // }
}, },
async queryTodoResultServer(isdebug = false) { async queryTodoResultServer(isdebug = false) {
if(isdebug) { if (isdebug) {
this._queryTodoResult = queryTodoResultMock; this._queryTodoResult = queryTodoResultMock;
return queryTodoResultMock; return queryTodoResultMock;
}else{ } else {
const res = await queryTodoResultJSON(); const res = await queryTodoResultJSON();
this._queryTodoResult = res; this._queryTodoResult = res;
return res; return res;
} }
}, },
async getOriginInviteHome(isdebug = false) { async getOriginInviteHome(isdebug = false) {
if(isdebug) { if (isdebug) {
this._originInviteHome = originInviteHomeMock; this._originInviteHome = originInviteHomeMock;
return originInviteHomeMock; return originInviteHomeMock;
}else{ } else {
const res = await getOriginInviteHomeJSON(); const res = await getOriginInviteHomeJSON();
this._originInviteHome = res; this._originInviteHome = res;
return res; return res;
} }
}, },
async assistInvite(invitationCode, wxUnionId, isdebug = false) { async assistInvite(invitationCode, wxUnionId, isdebug = false) {
if(isdebug) { if (isdebug) {
this._assistInviteData = assistInviteMock; this._assistInviteData = assistInviteMock;
return assistInviteMock; return assistInviteMock;
}else{ } else {
const res = await assistInviteJSON(invitationCode, wxUnionId); const res = await assistInviteJSON(invitationCode, wxUnionId);
this._assistInviteData = res; this._assistInviteData = res;
return res; return res;
} }
}, },
async getInvitationList(isdebug = false) { async getInvitationList(isdebug = false) {
if(isdebug) { if (isdebug) {
this._invitationList = invitationListMock; this._invitationList = invitationListMock;
return invitationListMock; return invitationListMock;
}else{ } else {
const res = await getInvitationListJSON(); const res = await getInvitationListJSON();
this._invitationList = res; this._invitationList = res;
return res; return res;
} }
}, },
async originInviteBind(unionId, shareCode, isdebug = false) { async originInviteBind(unionId, shareCode, isdebug = false) {
const res = await originInviteBindJSON(unionId, shareCode); const res = await originInviteBindJSON(unionId, shareCode);
this._originInviteBindData = res; this._originInviteBindData = res;
return res; return res;
}, },
}, },
getters: { getters: {
signinAndTaskInfo : (state) => {return state._signinAndTaskInfo; }, signinAndTaskInfo: (state) => {
checkInData : (state) => {return state._checkInData; }, return state._signinAndTaskInfo;
seckillData : (state) => {return state._seckillData; }, },
pointsBenefitCoupon : (state) => {return state._pointsBenefitCoupon; }, checkInData: (state) => {
queryTodoResult : (state) => {return state._queryTodoResult; }, return state._checkInData;
originInviteHome : (state) => {return state._originInviteHome; }, },
assistInviteData : (state) => {return state._assistInviteData; }, seckillData: (state) => {
invitationList : (state) => {return state._invitationList; }, return state._seckillData;
originInviteBindData : (state) => {return state._originInviteBindData; }, },
pointsBenefitCoupon: (state) => {
return state._pointsBenefitCoupon;
},
queryTodoResult: (state) => {
return state._queryTodoResult;
},
originInviteHome: (state) => {
return state._originInviteHome;
},
assistInviteData: (state) => {
return state._assistInviteData;
},
invitationList: (state) => {
return state._invitationList;
},
originInviteBindData: (state) => {
return state._originInviteBindData;
},
}, },
}); });
\ No newline at end of file
stores/pageCfg.js
View file @ 09ff4637
This source diff could not be displayed because it is too large. You can view the blob instead.
views/Brand.vue
View file @ 09ff4637
...@@ -312,6 +312,7 @@ ...@@ -312,6 +312,7 @@
:appid="erqiPeizhi.appId1" :appid="erqiPeizhi.appId1"
:product-id="erqiPeizhi.productId1" :product-id="erqiPeizhi.productId1"
custom-content="true" custom-content="true"
class="store-product-container"
> >
<view class="ipcontainer"> <view class="ipcontainer">
<image <image
...@@ -329,8 +330,8 @@ ...@@ -329,8 +330,8 @@
> >
</image> </image>
<view class="ipcontext"> <view class="ipcontext">
<view class="ipcontext-title">{{ '竖版标题' }}</view> <view class="ipcontext-desc">{{ erqiPeizhi.ipTitle1 || '' }}</view>
<view class="ipcontext-desc">{{ '竖版描述' }}</view> <view class="ipcontext-title">{{ erqiPeizhi.ipDesc1 || '' }}</view>
</view> </view>
</view> </view>
</store-product> </store-product>
...@@ -343,26 +344,27 @@ ...@@ -343,26 +344,27 @@
:appid="erqiPeizhi.appId2" :appid="erqiPeizhi.appId2"
:product-id="erqiPeizhi.productId2" :product-id="erqiPeizhi.productId2"
custom-content="true" custom-content="true"
class="store-product-container"
> >
<view class="ipcontainer"> <view class="ipcontainer">
<image <view class="ipcontext">
:data-log="{ <view class="ipcontext-title">{{ erqiPeizhi.ipTitle2 || '' }}</view>
xcxClick: '品牌故事-三屏页面点击', <view class="ipcontext-desc">{{ erqiPeizhi.ipDesc2 || '' }}</view>
pageName: '品牌故事-三屏页面', </view>
buttonName: `${hexiaofeiNameList[1]}`, <image
}" :data-log="{
:src=" xcxClick: '品牌故事-三屏页面点击',
erqiPeizhi.ipImg2?.indexOf('http') === 0 pageName: '品牌故事-三屏页面',
? erqiPeizhi.ipImg2 buttonName: `${hexiaofeiNameList[1]}`,
: $baseUrl + erqiPeizhi.ipImg2 }"
" :src="
> erqiPeizhi.ipImg2?.indexOf('http') === 0
</image> ? erqiPeizhi.ipImg2
<view class="ipcontext"> : $baseUrl + erqiPeizhi.ipImg2
<view class="ipcontext-title">{{ '横版标题' }}</view> "
<view class="ipcontext-desc">{{ '横版描述' }}</view> >
</image>
</view> </view>
</view>
</store-product> </store-product>
</view> </view>
<view style="display: flex; justify-content: space-between; margin-top: 20rpx"> <view style="display: flex; justify-content: space-between; margin-top: 20rpx">
...@@ -491,7 +493,9 @@ import { fetchBrandJSON } from '../api/brand'; ...@@ -491,7 +493,9 @@ import { fetchBrandJSON } from '../api/brand';
import { jump, JumpType } from '../utils'; import { jump, JumpType } from '../utils';
import md from '../md'; import md from '../md';
import ExposureTracker from '../utils/exposure'; import ExposureTracker from '../utils/exposure';
import { useGlobalStore } from '@/stores/global.js';
const globalStore = useGlobalStore();
// 定义需要曝光检测的元素配置 // 定义需要曝光检测的元素配置
const EXPOSURE_CONFIGS = [ const EXPOSURE_CONFIGS = [
{ {
...@@ -600,7 +604,7 @@ export default { ...@@ -600,7 +604,7 @@ export default {
}, },
methods: { methods: {
async initBrandInfo() { async initBrandInfo() {
const { data } = await fetchBrandJSON(); const { data } = await fetchBrandJSON(globalStore.getPreviewScene('brand'));
if (data) { if (data) {
this.swiperList = data.swiperList || [ this.swiperList = data.swiperList || [
{ {
...@@ -1443,13 +1447,23 @@ export default { ...@@ -1443,13 +1447,23 @@ export default {
.ipcontainer { .ipcontainer {
position: relative; position: relative;
.ipcontext {
image,.ipcontext { display: flex;
position: absolute; flex-direction: column;
width: 100%; align-items: center;
height: 100%; justify-content: flex-start;
top: 0; font-size: 24rpx;
left: 0; text-align: center;
.ipcontext-desc,
.ipcontext-title {
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.ipcontext-title {
color: @color-gold-main;
}
} }
} }
...@@ -1464,34 +1478,53 @@ export default { ...@@ -1464,34 +1478,53 @@ export default {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.store-product-container {
display: flex;
justify-content: center;
align-items: center;
}
} }
.ip1 { .ip1 {
width: 288rpx; width: 288rpx;
height: 380rpx; height: 380rpx;
overflow: hidden; overflow: hidden;
.ipcontainer{ .ipcontainer {
width: 288 * 0.8rpx; display: flex;
height: 380 * 0.8rpx; flex-direction: column;
align-items: center;
justify-content: flex-start;
width: 268rpx;
.ipcontext {
width: 100%;
margin-top: 6rpx;
}
} }
image { image {
width: 288 * 0.8rpx; width: 213rpx;
height: 380 * 0.8rpx; height: 172rpx;
} }
} }
.ip2 { .ip2 {
width: 342rpx; width: 342rpx;
height: 201rpx; height: 201rpx;
.ipcontainer{ .ipcontainer {
width: 342 * 0.75rpx; height: 172rpx;
height: 201 * 0.75rpx; width: 322rpx;
display: flex;
flex-direction: row-reverse;
align-items: center;
justify-content: space-between;
.ipcontext {
width: 160rpx;
}
} }
image { image {
width: 342 * 0.75rpx; width: 162rpx;
height: 201 * 0.75rpx; height: 172rpx;
} }
} }
......
views/Home.vue
View file @ 09ff4637
This diff is collapsed.
views/Integral.vue
View file @ 09ff4637
This diff is collapsed.
views/My.vue
View file @ 09ff4637
This diff is collapsed.
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