Skip to content

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

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

parent 3d83a00b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 7214 additions and 6827 deletions
api/brand.js
View file @ 09ff4637
import requestModule from './request.js';
const {
api
} = requestModule;
const { api } = requestModule;
export const fetchBrandJSON = () => api.get('/c/front/content',{type:'brand_V1'});
\ No newline at end of file
export const fetchBrandJSON = (type = 'brand_V1') => api.get('/c/front/content', { type });
api/home.js
View file @ 09ff4637
import requestModule from './request.js';
const {
api
} = requestModule;
const { api } = requestModule;
/**
* 获取首页信息
......@@ -9,11 +7,9 @@ const {
*/
export const fetchHomeInfo = () => api.get('/c/user/index');
export const fetchCanEatIndex = () => api.get('/c/eat/index');
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' });
api/integral.js
View file @ 09ff4637
import requestModule from './request.js';
const {
api
} = requestModule;
const { api } = requestModule;
/**
* 获取积分信息
* @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');
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');
......@@ -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 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');
......@@ -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 assistInviteJSON = (invitationCode, wxUnionId) => api.post('/c/activity/origin_invite/assist', {
export const assistInviteJSON = (invitationCode, wxUnionId) =>
api.post('/c/activity/origin_invite/assist', {
invitationCode,
wxUnionId
});
wxUnionId,
});
//获取邀请记录列表接口
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) =>
api.post('/c/api/activity/originInviteBind', {
unionId,
shareCode
});
shareCode,
});
api/user.js
View file @ 09ff4637
import requestModule from './request.js';
const {
api
} = requestModule;
const { api } = requestModule;
/**
* 获取用户信息
......@@ -22,9 +20,10 @@ export const getGestationalWeeks = (dueDate) => api.get('/c/user/calGestationalW
* @param {*} code
* @returns
*/
export const autoLoginByCode = (code) => api.get('/c/login/autologin', {
export const autoLoginByCode = (code) =>
api.get('/c/login/autologin', {
code,
});
});
/**
* 手机号授权，调用微信手机号快速验证组件，获取encryptedData、iv、code
......@@ -46,18 +45,13 @@ export const fetchMemberInfo = () => api.get('/c/user/memberInfo');
*/
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*/
export const checkParticipation = (data) => api.get('/c/fertility/index', data);
export const doTerminate = () => api.post('/c/user/terminate');
/**
* 获取积分兑换记录列表（分页）
* @param {Object} params - 请求参数
......@@ -66,8 +60,6 @@ export const doTerminate = () => api.post('/c/user/terminate');
*/
export const getExchangeList = (params = {}) => api.get('/c/user/exchange/list', { params });
/**
*
* @param {orderNo} data
......
pages/index/index.vue
View file @ 09ff4637
This diff is collapsed.
stores/global.js
View file @ 09ff4637
import {
defineStore
} from 'pinia';
import { defineStore } from 'pinia';
const cuk = uni.getStorageSync('cuk')
const openId = uni.getStorageSync('openId')
const unionId = uni.getStorageSync('unionId')
const cuk = uni.getStorageSync('cuk');
const openId = uni.getStorageSync('openId');
const unionId = uni.getStorageSync('unionId');
export const useGlobalStore = defineStore('global', {
state: () => {
return {
cuk: cuk, // 用户登录后获取的凭证，调用接口时headers中携带
curTabIndex: 0, // 当前Tab索引
isWxFriendCircle:false,
isWxFriendCircle: false,
isShowLoading: false,
openId: openId,
unionId: unionId,
......@@ -24,17 +22,18 @@ export const useGlobalStore = defineStore('global', {
isShowTaskPerson: false, // 是否显示任务信息弹窗
taskTodo: [], // 任务数据
invateUseType: '', // 邀请用户类型
previewScene: {}, // 预览场景
};
},
actions: {
setBaseUrl(url){
this.baseUrl = url
setBaseUrl(url) {
this.baseUrl = url;
},
/**
* 设置用户cuk
* @param {Object} cuk
*/
setCuk(cuk,openId,unionId) {
setCuk(cuk, openId, unionId) {
this.cuk = cuk;
this.openId = openId;
this.unionId = unionId;
......@@ -54,12 +53,12 @@ export const useGlobalStore = defineStore('global', {
* 设置当前是否是小程序朋友圈单页环境
* @param {boolean} v
*/
setIsWxFriendCircle(v){
this.isWxFriendCircle = v
setIsWxFriendCircle(v) {
this.isWxFriendCircle = v;
},
setIsShowLoading(v){
this.isShowLoading = v
setIsShowLoading(v) {
this.isShowLoading = v;
},
/**
......@@ -102,6 +101,24 @@ export const useGlobalStore = defineStore('global', {
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];
},
/**
* 清除认证信息（注销时使用）
......
stores/integral.js
View file @ 09ff4637
import { defineStore } from "pinia";
import { getSigninAndTaskInfoJSON, checkInJSON, getSeckillList, getPointsBenefitCouponJSON, queryTodoResultJSON, getOriginInviteHomeJSON, assistInviteJSON, getInvitationListJSON, originInviteBindJSON } from "../api/integral";
import { defineStore } from 'pinia';
import {
getSigninAndTaskInfoJSON,
checkInJSON,
getSeckillList,
getPointsBenefitCouponJSON,
queryTodoResultJSON,
getOriginInviteHomeJSON,
assistInviteJSON,
getInvitationListJSON,
originInviteBindJSON,
} from '../api/integral';
import signinAndTaskInfoMock from '../mock/getSigninAndTaskInMock.json';
import checkInMock from '../mock/checkIndata.json';
import pointsBenefitCouponMock from '../mock/pointsBenefitCoupon.json';
......@@ -7,7 +17,7 @@ import queryTodoResultMock from '../mock/queryTodoResult.json';
import originInviteHomeMock from '../mock/originInviteHome.json';
import assistInviteMock from '../mock/assistInvite.json';
import invitationListMock from '../mock/invitationList.json';
export const useIntegralStore = defineStore("integral", {
export const useIntegralStore = defineStore('integral', {
state: () => {
return {
_signinAndTaskInfo: null,
......@@ -23,23 +33,22 @@ export const useIntegralStore = defineStore("integral", {
},
actions: {
async getSigninAndTaskInfo(isdebug = false) {
if(isdebug) {
if (isdebug) {
this._signinAndTaskInfo = signinAndTaskInfoMock;
return signinAndTaskInfoMock;
}else{
} else {
const res = await getSigninAndTaskInfoJSON();
this._signinAndTaskInfo = res;
return res;
}
},
async checkIn(activityId,isdebug = false) {
async checkIn(activityId, isdebug = false) {
// if(isdebug) {
// this._checkInData = checkInMock; // 存储到state中
// return checkInMock;
// }else{
const res = await checkInJSON(activityId);
this._checkInData = res; // 存储到state中
return res;
// }
......@@ -74,51 +83,51 @@ export const useIntegralStore = defineStore("integral", {
return res;
// }
},
async getPointsBenefitCoupon(isdebug = false) {
async getPointsBenefitCoupon(type) {
// if(isdebug) {
// this._pointsBenefitCoupon = pointsBenefitCouponMock;
// return pointsBenefitCouponMock;
// }else{
const res = await getPointsBenefitCouponJSON();
const res = await getPointsBenefitCouponJSON(type);
this._pointsBenefitCoupon = res;
return res;
// }
},
async queryTodoResultServer(isdebug = false) {
if(isdebug) {
if (isdebug) {
this._queryTodoResult = queryTodoResultMock;
return queryTodoResultMock;
}else{
} else {
const res = await queryTodoResultJSON();
this._queryTodoResult = res;
return res;
}
},
async getOriginInviteHome(isdebug = false) {
if(isdebug) {
if (isdebug) {
this._originInviteHome = originInviteHomeMock;
return originInviteHomeMock;
}else{
} else {
const res = await getOriginInviteHomeJSON();
this._originInviteHome = res;
return res;
}
},
async assistInvite(invitationCode, wxUnionId, isdebug = false) {
if(isdebug) {
if (isdebug) {
this._assistInviteData = assistInviteMock;
return assistInviteMock;
}else{
} else {
const res = await assistInviteJSON(invitationCode, wxUnionId);
this._assistInviteData = res;
return res;
}
},
async getInvitationList(isdebug = false) {
if(isdebug) {
if (isdebug) {
this._invitationList = invitationListMock;
return invitationListMock;
}else{
} else {
const res = await getInvitationListJSON();
this._invitationList = res;
return res;
......@@ -131,14 +140,32 @@ export const useIntegralStore = defineStore("integral", {
},
},
getters: {
signinAndTaskInfo : (state) => {return state._signinAndTaskInfo; },
checkInData : (state) => {return state._checkInData; },
seckillData : (state) => {return state._seckillData; },
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; },
signinAndTaskInfo: (state) => {
return state._signinAndTaskInfo;
},
checkInData: (state) => {
return state._checkInData;
},
seckillData: (state) => {
return state._seckillData;
},
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;
},
},
});
stores/pageCfg.js
View file @ 09ff4637
import {
defineStore
} from "pinia";
import {
fetchUserJSON,
checkParticipation
} from "@/api/user";
import {
useUserStore
} from "./user";
import { defineStore } from 'pinia';
import { fetchUserJSON, checkParticipation } from '@/api/user';
import { useUserStore } from './user';
// 渠道名称配置
export const CHANNELS = {
......@@ -19,7 +12,7 @@ export const CHANNELS = {
hl2dsKS: '快手',
hl2dsWS: '微商城',
hl2dsTMC: '猫超',
hl2dsXHS: '小红书'
hl2dsXHS: '小红书',
};
// 获取渠道名称
......@@ -27,7 +20,7 @@ export function getChannelName(code) {
return CHANNELS[code] || '线上报名';
}
export const usePageCfgStore = defineStore("pageCfg", {
export const usePageCfgStore = defineStore('pageCfg', {
state: () => {
return {
toolList: [],
......@@ -42,10 +35,8 @@ export const usePageCfgStore = defineStore("pageCfg", {
};
},
actions: {
async fetchCfg() {
const {
data
} = await fetchUserJSON();
async fetchCfg(type) {
const { data } = await fetchUserJSON(type);
// const data = {
// "wheelOptionsYZ": [
......@@ -486,46 +477,52 @@ export const usePageCfgStore = defineStore("pageCfg", {
//-----------这部分是专门判断"生育补贴"和"鹤礼爱心"的逻辑-------------
const memberId = useUserStore().userInfo?.memberId;
const res = await checkParticipation()
const res = await checkParticipation();
// let res = {"code":"000000","data":{"channel":"DS","dsPlatform":"hl2dsXHS","fertilityJoined":true,"v2Joined":true},"message":"success","ok":true,"success":true};
console.log("生育补贴和鹤礼爱心是否参与::::", res);
if (memberId == 'not_login' || !res.data?.fertilityJoined) { //未登录或者未参与，就删除生育补贴配置项，不展示
tools = tools.filter(item => item.title !== "生育补贴");
console.log('生育补贴和鹤礼爱心是否参与::::', res);
if (memberId == 'not_login' || !res.data?.fertilityJoined) {
//未登录或者未参与，就删除生育补贴配置项，不展示
tools = tools.filter((item) => item.title !== '生育补贴');
}
if (memberId != 'not_login' && res.data?.v2Joined) { //已登录并且已报名
if (res.data?.channel == "DS") { //DS：表示线上报名,跳转链接换成本地页面的路径，并且有去查看按钮
if (memberId != 'not_login' && res.data?.v2Joined) {
//已登录并且已报名
if (res.data?.channel == 'DS') {
//DS：表示线上报名,跳转链接换成本地页面的路径，并且有去查看按钮
let channelName = getChannelName(res.data?.dsPlatform);
tools = tools.map(item =>
item.title === "鹤礼爱心" ? {
tools = tools.map((item) =>
item.title === '鹤礼爱心'
? {
...item,
link: {
...item.link,
type: 1, // type=1跳转本地页面
url: "/pages/heliaixinTools/heliaixinTools",
url: '/pages/heliaixinTools/heliaixinTools',
go_see: true, //有“去查看”按钮
channelName: channelName, //报名渠道的名称
},
}
} :
item
: item
);
} else { //线下报名,正常跳转,不用处理
} else {
//线下报名,正常跳转,不用处理
}
} else { //未登录或者未报名,跳转链接换成本地页面的链接
tools = tools.map(item =>
item.title === "鹤礼爱心" ? {
} else {
//未登录或者未报名,跳转链接换成本地页面的链接
tools = tools.map((item) =>
item.title === '鹤礼爱心'
? {
...item,
link: {
...item.link,
type: 1, // type=1跳转本地页面
url: "/pages/heliaixinTools/heliaixinTools"
url: '/pages/heliaixinTools/heliaixinTools',
},
}
} :
item
: item
);
}
console.log("tools---------::", tools)
console.log('tools---------::', tools);
this.toolList = tools;
//-----------这部分是专门判断"生育补贴"和"鹤礼爱心"的逻辑-------------
......
views/Brand.vue
View file @ 09ff4637
......@@ -312,6 +312,7 @@
:appid="erqiPeizhi.appId1"
:product-id="erqiPeizhi.productId1"
custom-content="true"
class="store-product-container"
>
<view class="ipcontainer">
<image
......@@ -329,8 +330,8 @@
>
</image>
<view class="ipcontext">
<view class="ipcontext-title">{{ '竖版标题' }}</view>
<view class="ipcontext-desc">{{ '竖版描述' }}</view>
<view class="ipcontext-desc">{{ erqiPeizhi.ipTitle1 || '' }}</view>
<view class="ipcontext-title">{{ erqiPeizhi.ipDesc1 || '' }}</view>
</view>
</view>
</store-product>
......@@ -343,8 +344,13 @@
:appid="erqiPeizhi.appId2"
:product-id="erqiPeizhi.productId2"
custom-content="true"
class="store-product-container"
>
<view class="ipcontainer">
<view class="ipcontext">
<view class="ipcontext-title">{{ erqiPeizhi.ipTitle2 || '' }}</view>
<view class="ipcontext-desc">{{ erqiPeizhi.ipDesc2 || '' }}</view>
</view>
<image
:data-log="{
xcxClick: '品牌故事-三屏页面点击',
......@@ -358,10 +364,6 @@
"
>
</image>
<view class="ipcontext">
<view class="ipcontext-title">{{ '横版标题' }}</view>
<view class="ipcontext-desc">{{ '横版描述' }}</view>
</view>
</view>
</store-product>
</view>
......@@ -491,7 +493,9 @@ import { fetchBrandJSON } from '../api/brand';
import { jump, JumpType } from '../utils';
import md from '../md';
import ExposureTracker from '../utils/exposure';
import { useGlobalStore } from '@/stores/global.js';
const globalStore = useGlobalStore();
// 定义需要曝光检测的元素配置
const EXPOSURE_CONFIGS = [
{
......@@ -600,7 +604,7 @@ export default {
},
methods: {
async initBrandInfo() {
const { data } = await fetchBrandJSON();
const { data } = await fetchBrandJSON(globalStore.getPreviewScene('brand'));
if (data) {
this.swiperList = data.swiperList || [
{
......@@ -1443,13 +1447,23 @@ export default {
.ipcontainer {
position: relative;
image,.ipcontext {
position: absolute;
.ipcontext {
display: flex;
flex-direction: column;
align-items: center;
justify-content: flex-start;
font-size: 24rpx;
text-align: center;
.ipcontext-desc,
.ipcontext-title {
width: 100%;
height: 100%;
top: 0;
left: 0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.ipcontext-title {
color: @color-gold-main;
}
}
}
......@@ -1464,34 +1478,53 @@ export default {
display: flex;
justify-content: center;
align-items: center;
.store-product-container {
display: flex;
justify-content: center;
align-items: center;
}
}
.ip1 {
width: 288rpx;
height: 380rpx;
overflow: hidden;
.ipcontainer{
width: 288 * 0.8rpx;
height: 380 * 0.8rpx;
.ipcontainer {
display: flex;
flex-direction: column;
align-items: center;
justify-content: flex-start;
width: 268rpx;
.ipcontext {
width: 100%;
margin-top: 6rpx;
}
}
image {
width: 288 * 0.8rpx;
height: 380 * 0.8rpx;
width: 213rpx;
height: 172rpx;
}
}
.ip2 {
width: 342rpx;
height: 201rpx;
.ipcontainer{
width: 342 * 0.75rpx;
height: 201 * 0.75rpx;
.ipcontainer {
height: 172rpx;
width: 322rpx;
display: flex;
flex-direction: row-reverse;
align-items: center;
justify-content: space-between;
.ipcontext {
width: 160rpx;
}
}
image {
width: 342 * 0.75rpx;
height: 201 * 0.75rpx;
width: 162rpx;
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