Skip to content

飞
飞鹤小程序
Commit 351b6bf8 authored by 张九刚's avatar 张九刚
Browse files
Options

Merge branch 'dev' into feature/20250617home_md

parents e75531b1 7dcae207
Expand all Show whitespace changes
Inline Side-by-side
Showing with 639 additions and 2028 deletions
.DS_Store
View file @ 351b6bf8
No preview for this file type
a.json deleted 100644 → 0
View file @ e75531b1
This diff is collapsed.
api/request.js
View file @ 351b6bf8
...@@ -16,8 +16,8 @@ const { ...@@ -16,8 +16,8 @@ const {
// request.js // request.js
// 通常可以吧 baseUrl 单独放在一个 js 文件了 // 通常可以吧 baseUrl 单独放在一个 js 文件了
// const baseUrl = "http://172.16.224.178:7777/pmall"; // const baseUrl = "http://172.16.224.178:7777/pmall";
// const baseUrl = "https://momclub-uat.feihe.com/pmall";//测试环境 const baseUrl = "https://momclub-uat.feihe.com/pmall";//测试环境
const baseUrl = "https://momclub.feihe.com/pmall";//生产环境 // const baseUrl = "https://momclub.feihe.com/pmall";//生产环境
const request = (options = {}) => { const request = (options = {}) => {
// 在这里可以对请求头进行一些设置 // 在这里可以对请求头进行一些设置
......
b.json deleted 100644 → 0
View file @ e75531b1
This diff is collapsed.
components/RegisterLayer.vue
View file @ 351b6bf8
...@@ -279,7 +279,7 @@ const handleBabyInfoConfirm = throttleTap(async () => { ...@@ -279,7 +279,7 @@ const handleBabyInfoConfirm = throttleTap(async () => {
}; };
if (status.value !== 0) { if (status.value !== 0) {
req.dueDate = date.value; req.babyBirthday = date.value;
req.babyGender = gender.value; req.babyGender = gender.value;
req.babyType = fetus.value; req.babyType = fetus.value;
} }
......
mock/brand.js deleted 100644 → 0
View file @ e75531b1
This diff is collapsed.
mock/brand.json 0 → 100644
View file @ 351b6bf8
This diff is collapsed.
mock/brandtest.js deleted 100644 → 0
View file @ e75531b1
This diff is collapsed.
mock/home.js → mock/home.json
View file @ 351b6bf8
export const homeObj = { {
"voiceStory":{ "voiceStory":{
"link":{ "link":{
"type": 3, "type": 3,
...@@ -31,7 +31,7 @@ export const homeObj = { ...@@ -31,7 +31,7 @@ export const homeObj = {
"url": "homepage/banner3.jpg", "url": "homepage/banner3.jpg",
"link": { "link": {
"type": 2, "type": 2,
"url": "subPackages/xmhMainProcess/member/index?entrySource=xmh_wechatmp_points_recgoodsbot", "url": "subPackages/shopMainList/topicNew/index?id=1000898",
"extra": {"appId": "wx4205ec55b793245e", "envVersion": "release"} "extra": {"appId": "wx4205ec55b793245e", "envVersion": "release"}
} }
} }
......
mock/my.js
View file @ 351b6bf8
...@@ -26,8 +26,8 @@ export const myObj = { ...@@ -26,8 +26,8 @@ export const myObj = {
"title": "奶娃宝典", "title": "奶娃宝典",
"desc": "奶娃宝典", "desc": "奶娃宝典",
"link": { "link": {
"type": 3, "type": 1,
"url": "https://mom.feihe.com/babyWikipedia", "url": "/pages/library/ContentLibrary",
"extra": {} "extra": {}
} }
}, },
......
pages/library/ContentLibrary.vue
View file @ 351b6bf8
This diff is collapsed.
pages/person/person.vue
View file @ 351b6bf8
...@@ -373,7 +373,7 @@ const formItems = ref([ ...@@ -373,7 +373,7 @@ const formItems = ref([
required: false, required: false,
placeholder: "未选择", placeholder: "未选择",
type: "picker", type: "picker",
range: ["纯母乳", "混合喂养", "纯奶粉"], range: ["奶粉喂养", "母乳喂养", "母乳奶粉混合喂养"],
mode: "custom", mode: "custom",
}, },
{ {
...@@ -578,6 +578,9 @@ const onSubmit = async (e) => { ...@@ -578,6 +578,9 @@ const onSubmit = async (e) => {
hideLoading(); hideLoading();
if (res.success) { if (res.success) {
data?.id &&
userStore.setBabyNickCache(data?.id, formData.value.babyName);
uni.showToast({ uni.showToast({
title: "提交成功", title: "提交成功",
icon: "success", icon: "success",
......
pages/product/product.vue
View file @ 351b6bf8
...@@ -46,9 +46,12 @@ export default { ...@@ -46,9 +46,12 @@ export default {
this.contentImg = contentImg; this.contentImg = contentImg;
this.contentImgLen = contentImgLen; this.contentImgLen = contentImgLen;
this.shareTitle = shareTitle; this.shareTitle = shareTitle;
if(shareImg.indexOf('http') === -1){
this.shareImg = this.$baseUrl + shareImg; this.shareImg = this.$baseUrl + shareImg;
this.tabName = tabName; }else{
this.title = title; this.shareImg = shareImg;
}
// this.shareImg = "https://yun.duiba.com//fh/"+shareImg; // this.shareImg = "https://yun.duiba.com//fh/"+shareImg;
......
stores/user.js
View file @ 351b6bf8
...@@ -20,6 +20,7 @@ export const useUserStore = defineStore("userInfo", { ...@@ -20,6 +20,7 @@ export const useUserStore = defineStore("userInfo", {
userInfo: null, userInfo: null,
babyInfo: null, babyInfo: null,
memberInfo: null, memberInfo: null,
babyNickCache: [],
}; };
}, },
actions: { actions: {
...@@ -103,6 +104,16 @@ export const useUserStore = defineStore("userInfo", { ...@@ -103,6 +104,16 @@ export const useUserStore = defineStore("userInfo", {
} }
}, },
setBabyNickCache(id, name) {
const findIndex = this.babyNickCache.findIndex((item) => item.id === id);
console.log("this.babyNickCache", findIndex);
if (findIndex > -1) {
this.babyNickCache[findIndex].name = name;
} else {
this.babyNickCache.push({ id, name });
}
},
/** /**
* 获取宝宝信息 * 获取宝宝信息
*/ */
...@@ -111,6 +122,20 @@ export const useUserStore = defineStore("userInfo", { ...@@ -111,6 +122,20 @@ export const useUserStore = defineStore("userInfo", {
console.log("babyInfo", data); console.log("babyInfo", data);
if (data?.memberId !== "not_login") { if (data?.memberId !== "not_login") {
this.babyInfo = data; this.babyInfo = data;
console.log("this.11111", this.babyNickCache, data?.content?.id);
const findItem = this.babyNickCache.find(
(item) => item.id == data?.content?.id
);
if (data?.content?.id && findItem) {
this.babyInfo.babyName = findItem.name;
this.babyInfo.allBabyBaseInfo.forEach((item) => {
if (item.id == data?.content?.id) {
item.babyName = findItem.name;
}
});
}
} }
}, },
......
utils/index.js
View file @ 351b6bf8
...@@ -29,7 +29,7 @@ export function jump({ type, url, extra = {} }) { ...@@ -29,7 +29,7 @@ export function jump({ type, url, extra = {} }) {
appId: extra.appId || "", appId: extra.appId || "",
path: url, path: url,
extraData: extra.extraData || {}, extraData: extra.extraData || {},
envVersion: extra.envVersion || "trial", envVersion: extra.envVersion || "release",
success: extra.success, success: extra.success,
fail: extra.fail, fail: extra.fail,
}; };
......
views/Integral.vue
View file @ 351b6bf8
...@@ -105,18 +105,20 @@ ...@@ -105,18 +105,20 @@
<view class="header-row"> <view class="header-row">
<view class="integral-value"> <view class="integral-value">
<text class="integral-text">积分</text> <text class="integral-text">积分</text>
<text class="integral-total">{{ memberInfo.maxGrade ? `(累计${recentAnnualPointsTotal})` : `(累计${recentAnnualPointsTotal}/${nextGradeScoreRuleMin})` }}</text> <!-- <text class="integral-total">{{ memberInfo.maxGrade ? `(累计${recentAnnualPointsTotal})` : `(累计${recentAnnualPointsTotal}/${nextGradeScoreRuleMin})` }}</text>
<image <image
class="next-icon" class="next-icon"
v-if="!memberInfo.maxGrade" v-if="!memberInfo.maxGrade"
:src="$baseUrl + `integral/${tupianBanben}/nextLvTips.png`" :src="$baseUrl + `integral/${tupianBanben}/nextLvTips.png`"
mode="aspectFit" mode="aspectFit"
/> /> -->
</view> </view>
</view> </view>
<!-- 第二行 --> <!-- 第二行 -->
<view class="progress-bar1"> <view class="progress-bar1">
<image <text class="upLvTxt1">{{ upLvTxts[vipLevel]?.split('/')[0] }}<text class="upLvTxt2">{{ upLvTxts[vipLevel]?.split('/')[1] }}</text></text>
<!-- <image 预留进度条代码
:src="$baseUrl + `integral/${tupianBanben}/${vipIntegral?.progressBar?.barBgImg}`" :src="$baseUrl + `integral/${tupianBanben}/${vipIntegral?.progressBar?.barBgImg}`"
class="progress-bg1" class="progress-bg1"
/> />
...@@ -126,7 +128,7 @@ ...@@ -126,7 +128,7 @@
class="progress-img1" class="progress-img1"
:style="{ transform: `translateX(${(recentAnnualPointsTotal/nextGradeScoreRuleMin)*100 -100}%)` }" :style="{ transform: `translateX(${(recentAnnualPointsTotal/nextGradeScoreRuleMin)*100 -100}%)` }"
/> />
</view> </view> -->
</view> </view>
...@@ -144,10 +146,10 @@ ...@@ -144,10 +146,10 @@
class="info-row" class="info-row"
@click="integralDetailHandler" @click="integralDetailHandler"
> >
<text class="count-text">{{ `当前：${points}` }}</text> <text class="count-text">{{ `当前：${points} 积分` }}</text>
<text class="expire-text" <text class="expire-text"
v-if="willExpiredPoints > 0" v-if="willExpiredPoints > 0"
>{{`(有${willExpiredPoints ? willExpiredPoints : 0}积分将到期)`}}</text> >{{`(${willExpiredPoints ? willExpiredPoints : 0}积分将到期)`}}</text>
<image <image
class="integral-detail-arrow" class="integral-detail-arrow"
:src="$baseUrl + `integral/${tupianBanben}/integralArrow.png`" :src="$baseUrl + `integral/${tupianBanben}/integralArrow.png`"
...@@ -277,7 +279,7 @@ ...@@ -277,7 +279,7 @@
> >
<!-- <image <!-- <image
class="goods-img-bg"productIdUrl class="goods-img-bg"productIdUrl
:src="$baseUrl + `integral/1005/listItemImgBg.png`" :src="$baseUrl + `integral/1007/listItemImgBg.png`"
mode="aspectFit" mode="aspectFit"
/> --> /> -->
<view class="goods-item-container" @click="handleGoodsItemClick('xingpin',i)"> <view class="goods-item-container" @click="handleGoodsItemClick('xingpin',i)">
...@@ -400,7 +402,7 @@ ...@@ -400,7 +402,7 @@
import RegisterLayer from "../components/RegisterLayer.vue"; import RegisterLayer from "../components/RegisterLayer.vue";
const integralData = ref({ const integralData = ref({
"tupianBanben": "1005", "tupianBanben": "1007",
"swiper": [ "swiper": [
{ {
"bannerImg": "integralBannerBg0.png", "bannerImg": "integralBannerBg0.png",
...@@ -419,6 +421,13 @@ ...@@ -419,6 +421,13 @@
"imgPlatinum2.png", "imgPlatinum2.png",
"imgPlatinum3.png", "imgPlatinum3.png",
"imgPlatinum4.png" "imgPlatinum4.png"
],
"upLvTxts": [
"扫罐内码或下单有机会提升至/V2铂金会员",
"扫罐内码或下单有机会提升至/V3钻石会员",
"扫罐内码或下单有机会提升至/V4星光会员",
"扫罐内码或下单有机会提升至/V5星耀会员",
"已提升至最高等级/V5星耀会员"
] ]
}, },
"vipIntegral": { "vipIntegral": {
...@@ -594,7 +603,7 @@ ...@@ -594,7 +603,7 @@
], ],
"goodsListData": { "goodsListData": {
"listCommon": { "listCommon": {
"listItemImgBg": "integral/1005/listItemImgBg.png" "listItemImgBg": "integral/1007/listItemImgBg.png"
}, },
"tabInfo": { "tabInfo": {
"tabBg": "tapSelectBg.png", "tabBg": "tapSelectBg.png",
...@@ -637,8 +646,8 @@ ...@@ -637,8 +646,8 @@
}, },
{ {
"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star", "url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star",
"productId": "475427897333207101", "productId": "779457178234291713",
"skuId": "475427897333207102", "skuId": "779457178234291714",
"type": 2, "type": 2,
"extra": { "extra": {
"appId": "wx4205ec55b793245e", "appId": "wx4205ec55b793245e",
...@@ -1026,7 +1035,7 @@ ...@@ -1026,7 +1035,7 @@
"titles": [ "titles": [
"星飞帆4段儿童成长配...", "星飞帆4段儿童成长配...",
"星飞帆卓睿4段儿童配...", "星飞帆卓睿4段儿童配...",
"茁然纯牛奶（A2 β酪蛋...", "飞鹤臻贵儿童成长配方...",
"茁然 茁护儿童配方奶...", "茁然 茁护儿童配方奶...",
"经典爱本乳铁蛋白配方...", "经典爱本乳铁蛋白配方...",
"飞鹤茁然高钙奶酪泡芙...", "飞鹤茁然高钙奶酪泡芙...",
...@@ -1044,7 +1053,7 @@ ...@@ -1044,7 +1053,7 @@
"prices": [ "prices": [
"低至730积分+￥115", "低至730积分+￥115",
"低至865积分+￥195", "低至865积分+￥195",
"低至250积分+￥40", "低至1000积分+￥228",
"低至715积分+￥125", "低至715积分+￥125",
"低至560积分+￥102", "低至560积分+￥102",
"低至323积分+￥37.5", "低至323积分+￥37.5",
...@@ -1172,8 +1181,9 @@ ...@@ -1172,8 +1181,9 @@
// const integralData = ref({}); // const integralData = ref({});
const swiperData = ref(integralData.value.swiper);//banner图片 const swiperData = ref(integralData.value.swiper);//banner图片地方
const vipLvIcons = ref(integralData.value.viplv.imgs);//会员等级图标 const vipLvIcons = ref(integralData.value.viplv.imgs);//会员等级图标
const upLvTxts = ref(integralData.value.viplv.upLvTxts);//会员等级提升文字
const vipIntegral = ref(integralData.value.vipIntegral);//积分明细\ const vipIntegral = ref(integralData.value.vipIntegral);//积分明细\
const clickMore = ref(integralData.value.clickMore);//点击更多 const clickMore = ref(integralData.value.clickMore);//点击更多
const vipActive = ref(integralData.value.vipActive);//会员活动 const vipActive = ref(integralData.value.vipActive);//会员活动
...@@ -1669,7 +1679,7 @@ ...@@ -1669,7 +1679,7 @@
height: 154rpx; height: 154rpx;
// margin-left: 32rpx; // margin-left: 32rpx;
// margin-right: 32rpx; // margin-right: 32rpx;
// background: url('@{baseUrl}integral/1005/vipDetailBg.png') no-repeat center/cover; // background: url('@{baseUrl}integral/1007/vipDetailBg.png') no-repeat center/cover;
flex-direction: row; flex-direction: row;
position: relative; position: relative;
display: flex; display: flex;
...@@ -1724,7 +1734,7 @@ ...@@ -1724,7 +1734,7 @@
height: 37rpx; height: 37rpx;
margin-left: 10rpx; margin-left: 10rpx;
margin-top: 5rpx; margin-top: 5rpx;
// background: url('@{baseUrl}integral/1005/tabNowBg.png') no-repeat center/contain; // background: url('@{baseUrl}integral/1007/tabNowBg.png') no-repeat center/contain;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
...@@ -1760,7 +1770,7 @@ ...@@ -1760,7 +1770,7 @@
// flex: 1; // flex: 1;
height: 144rpx; height: 144rpx;
width: 492rpx; width: 492rpx;
// background: url('@{baseUrl}integral/1005/inteBarAreaBg.png') no-repeat center/cover; // background: url('@{baseUrl}integral/1007/inteBarAreaBg.png') no-repeat center/cover;
margin-left: 16rpx; margin-left: 16rpx;
// padding: 16rpx 24rpx; // padding: 16rpx 24rpx;
.integralClick { .integralClick {
...@@ -1801,28 +1811,42 @@ ...@@ -1801,28 +1811,42 @@
position: relative; position: relative;
width: 444rpx; // 根据图片宽度设置 width: 444rpx; // 根据图片宽度设置
height: 14rpx; // 根据图片高度设置 height: 14rpx; // 根据图片高度设置
margin: 14rpx auto 16rpx auto; // margin: 14rpx auto 16rpx auto;
.progress-bg1 {
margin-top: 0rpx; .upLvTxt1{
position: absolute; font-size: 20rpx;
width: 444rpx; color: #1d1e25;
height: 14rpx;
top: 0rpx;
left: 0rpx;
}
.progress-mask {
position: absolute;
width: 444rpx;
height: 14rpx;
overflow: hidden;
border-radius: 7rpx;
.progress-img1 {
position: absolute; position: absolute;
width: 444rpx; margin-left: 26rpx;
height: 14rpx; margin-top: 5rpx;
display: block;
.upLvTxt2{
color: #b27c1e;
font-size: 20rpx;
} }
} }
//预留进度条代码
// .progress-bg1 {
// margin-top: 0rpx;
// position: absolute;
// width: 444rpx;
// height: 14rpx;
// top: 0rpx;
// left: 0rpx;
// }
// .progress-mask {
// position: absolute;
// width: 444rpx;
// height: 14rpx;
// overflow: hidden;
// border-radius: 7rpx;
// .progress-img1 {
// position: absolute;
// width: 444rpx;
// height: 14rpx;
// display: block;
// }
// }
} }
...@@ -2004,8 +2028,8 @@ ...@@ -2004,8 +2028,8 @@
justify-content: center; justify-content: center;
&.active { &.active {
//https://duiba.oss-cn-hangzhou.aliyuncs.com/fh/integral/1005/tapSelectBg.png //https://duiba.oss-cn-hangzhou.aliyuncs.com/fh/integral/1007/tapSelectBg.png
// background-image: url('@{baseUrl}integral/1005/tapSelectBg.png'); // background-image: url('@{baseUrl}integral/1007/tapSelectBg.png');
background-size: 100% 100%; background-size: 100% 100%;
.tab-line1 { color: #1d1e25; } .tab-line1 { color: #1d1e25; }
.tab-line2 { color: #b27c1e; } .tab-line2 { color: #b27c1e; }
...@@ -2061,7 +2085,7 @@ ...@@ -2061,7 +2085,7 @@
position: relative; position: relative;
.goods-img { .goods-img {
width: 100%; width: 100%;
height: 300rpx; height: 365rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }
...@@ -2069,12 +2093,12 @@ ...@@ -2069,12 +2093,12 @@
width: 100%; width: 100%;
// height: auto; // height: auto;
margin-left: 20rpx; margin-left: 20rpx;
margin-bottom: 10rpx; // margin-bottom: 10rpx;
margin-top: 22rpx; margin-top: -48rpx;
.title-text1 { .title-text1 {
position: relative; position: relative;
width:100%; width:100%;
font-size: 26rpx; font-size: 28rpx;
color: #1d1e25; color: #1d1e25;
} }
} }
...@@ -2083,8 +2107,9 @@ ...@@ -2083,8 +2107,9 @@
.price-text { .price-text {
// height: auto; // height: auto;
position: relative; position: relative;
font-size: 24rpx; font-size: 28rpx;
color: #b27c1e; color: #b27c1e;
margin-top: 10rpx;
margin-left: 20rpx; margin-left: 20rpx;
.num { .num {
......
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